diff --git a/data/.gitignore b/data/gtk2/.gitignore
similarity index 100%
rename from data/.gitignore
rename to data/gtk2/.gitignore
diff --git a/data/gtk2/libDesktop.pc.in b/data/gtk2/libDesktop.pc.in
new file mode 100644
index 0000000..f8f0873
--- /dev/null
+++ b/data/gtk2/libDesktop.pc.in
@@ -0,0 +1,11 @@
+prefix=@PREFIX@
+includedir=${prefix}/include
+exec_prefix=${prefix}
+libdir=${exec_prefix}/lib
+
+Name: @PACKAGE@
+Description: DeforaOS Desktop helper library
+Version: @VERSION@
+Requires: libSystem gtk+-2.0
+Cflags: -I${includedir}
+Libs: @RPATH@ -L${libdir} -lDesktop
diff --git a/data/gtk2/project.conf b/data/gtk2/project.conf
new file mode 100644
index 0000000..1f46a42
--- /dev/null
+++ b/data/gtk2/project.conf
@@ -0,0 +1,9 @@
+targets=libDesktop.pc
+dist=Makefile,libDesktop.pc.in
+
+#targets
+[libDesktop.pc]
+type=script
+script=../pkgconfig.sh
+depends=libDesktop.pc.in,../../config.sh
+install=
diff --git a/data/gtk3/.gitignore b/data/gtk3/.gitignore
new file mode 100644
index 0000000..8add5e9
--- /dev/null
+++ b/data/gtk3/.gitignore
@@ -0,0 +1 @@
+/libDesktop.pc
diff --git a/data/libDesktop.pc.in b/data/gtk3/libDesktop.pc.in
similarity index 100%
rename from data/libDesktop.pc.in
rename to data/gtk3/libDesktop.pc.in
diff --git a/data/gtk3/project.conf b/data/gtk3/project.conf
new file mode 100644
index 0000000..1f46a42
--- /dev/null
+++ b/data/gtk3/project.conf
@@ -0,0 +1,9 @@
+targets=libDesktop.pc
+dist=Makefile,libDesktop.pc.in
+
+#targets
+[libDesktop.pc]
+type=script
+script=../pkgconfig.sh
+depends=libDesktop.pc.in,../../config.sh
+install=
diff --git a/data/project.conf b/data/project.conf
index 9672c8a..12d37c2 100644
--- a/data/project.conf
+++ b/data/project.conf
@@ -1,8 +1,10 @@
-targets=libDesktop.pc
-dist=Makefile,libDesktop.pc.in,pkgconfig.sh
+subdirs=gtk3
+dist=Makefile,pkgconfig.sh
+mode=gtk3-debug
 
-[libDesktop.pc]
-type=script
-script=./pkgconfig.sh
-depends=libDesktop.pc.in,../config.sh
-install=
+#modes
+[mode::gtk2-debug]
+subdirs=gtk2
+
+[mode::gtk2-release]
+subdirs=gtk2
diff --git a/src/project.conf b/src/project.conf
index d50cb0d..0198031 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,14 +1,26 @@
 targets=libDesktop
 cppflags_force=-I ../include
-cflags=-W -Wall -g -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
-ldflags=-Wl,-z,relro -Wl,-z,now
-#for Gtk+ 2
-#cflags_force=`pkg-config --cflags libSystem gtk+-2.0` -fPIC
-#ldflags_force=`pkg-config --libs libSystem gtk+-2.0`
-#for Gtk+ 3
 cflags_force=`pkg-config --cflags libSystem gtk+-3.0` -fPIC
+cflags=-W -Wall -g -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
 ldflags_force=`pkg-config --libs libSystem gtk+-3.0`
+ldflags=-Wl,-z,relro -Wl,-z,now
 dist=Makefile,mimehandler.h
+mode=gtk3-debug
+
+#modes
+[mode::gtk2-debug]
+cflags_force=`pkg-config --cflags libSystem gtk+-2.0` -fPIC
+ldflags_force=`pkg-config --libs libSystem gtk+-2.0`
+
+[mode::gtk2-release]
+cppflags_force=-I ../include -DNDEBUG
+cflags_force=`pkg-config --cflags libSystem gtk+-2.0` -fPIC
+cflags=-W -Wall -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
+ldflags_force=`pkg-config --libs libSystem gtk+-2.0`
+
+[mode::gtk3-release]
+cppflags_force=-I ../include -DNDEBUG
+cflags=-W -Wall -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
 
 #targets
 [libDesktop]
diff --git a/tests/project.conf b/tests/project.conf
index b2ef3b9..6d3227f 100644
--- a/tests/project.conf
+++ b/tests/project.conf
@@ -2,13 +2,25 @@ targets=clint.log,fixme.log,htmllint.log,mime,mimehandler,tests.log,widget,xmlli
 cppflags_force=-I ../include
 cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
 ldflags=-pie -Wl,-z,relro -Wl,-z,now
-#for Gtk+ 2
-#cflags_force=`pkg-config --cflags libSystem gtk+-2.0`
-#ldflags_force=`pkg-config --libs libSystem gtk+-2.0` $(OBJDIR)../src/libDesktop.a
-#for Gtk+ 3
 cflags_force=`pkg-config --cflags libSystem gtk+-3.0`
 ldflags_force=`pkg-config --libs libSystem gtk+-3.0` $(OBJDIR)../src/libDesktop.a
 dist=Makefile,applications/Root.desktop,applications/Widget.desktop,clint.sh,fixme.sh,htmllint.sh,pkgconfig.sh,tests.sh,xmllint.sh
+mode=gtk3-debug
+
+#modes
+[mode::gtk2-debug]
+cflags_force=`pkg-config --cflags libSystem gtk+-2.0`
+ldflags_force=`pkg-config --libs libSystem gtk+-2.0` $(OBJDIR)../src/libDesktop.a
+
+[mode::gtk2-release]
+cppflags_force=-I ../include -DNDEBUG
+cflags_force=`pkg-config --cflags libSystem gtk+-2.0`
+cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
+ldflags_force=`pkg-config --libs libSystem gtk+-2.0` $(OBJDIR)../src/libDesktop.a
+
+[mode::gtk3-release]
+cppflags_force=-I ../include -DNDEBUG
+cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
 
 #targets
 [clint.log]
diff --git a/tools/project.conf b/tools/project.conf
index d54fdb0..27fdd8f 100644
--- a/tools/project.conf
+++ b/tools/project.conf
@@ -1,14 +1,26 @@
 targets=widget
 cppflags_force=-I ../include
-cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
-ldflags=-pie -Wl,-z,relro -Wl,-z,now
-#for Gtk+ 2
-#cflags_force=`pkg-config --cflags libSystem gtk+-2.0`
-#ldflags_force=`pkg-config --libs libSystem gtk+-2.0` -L $(OBJDIR)../src -lDesktop
-#for Gtk+ 3
 cflags_force=`pkg-config --cflags libSystem gtk+-3.0`
+cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
 ldflags_force=`pkg-config --libs libSystem gtk+-3.0` -L $(OBJDIR)../src -lDesktop
+ldflags=-pie -Wl,-z,relro -Wl,-z,now
 dist=Makefile,subst.sh
+mode=gtk3-debug
+
+#modes
+[mode::gtk2-debug]
+cflags_force=`pkg-config --cflags libSystem gtk+-2.0`
+ldflags_force=`pkg-config --libs libSystem gtk+-2.0` -L $(OBJDIR)../src -lDesktop
+
+[mode::gtk2-release]
+cppflags_force=-I ../include -DNDEBUG
+cflags_force=`pkg-config --cflags libSystem gtk+-2.0`
+cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
+ldflags_force=`pkg-config --libs libSystem gtk+-2.0` -L $(OBJDIR)../src -lDesktop
+
+[mode::gtk3-release]
+cppflags_force=-I ../include -DNDEBUG
+cflags=-W -Wall -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
 
 #targets
 [widget]