diff --git a/project.conf b/project.conf
index 583aece..2126e2f 100644
--- a/project.conf
+++ b/project.conf
@@ -7,6 +7,19 @@ subdirs=data,doc,include,po,src/lib,src,src/plugins,src/widget,tests,tools
 targets=tests
 dist=Makefile,COPYING,README.md,TODO,config.ent,config.h,config.sh
 
+#modes
+[mode::debug]
+title=Debug
+
+[mode::embedded-debug]
+title=Debug (embedded UI)
+
+[mode::embedded-release]
+title=Release (embedded UI)
+
+[mode::release]
+title=Release
+
 #targets
 [tests]
 type=command
diff --git a/src/browser/project.conf b/src/browser/project.conf
index 64483ac..63e73f3 100644
--- a/src/browser/project.conf
+++ b/src/browser/project.conf
@@ -1,12 +1,23 @@
 targets=browser
 cppflags_force=-I../../include
-#cppflags=-D EMBEDDED
 cflags_force=`pkg-config --cflags libDesktop`
 cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
 ldflags_force=`pkg-config --libs libDesktop` -lintl -L$(OBJDIR)../lib -Wl,-rpath,$(PREFIX)/lib -lBrowser
 ldflags=-pie -Wl,-z,relro -Wl,-z,now
 dist=Makefile,browser.h,callbacks.h,window.h
 
+#modes
+[mode::embedded-debug]
+cppflags_force=-I../../include -DEMBEDDED
+
+[mode::embedded-release]
+cppflags_force=-I../../include -DEMBEDDED -DNDEBUG
+cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
+
+[mode::release]
+cppflags_force=-I../../include -DNDEBUG
+cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
+
 #targets
 [browser]
 type=binary
diff --git a/src/desktop/project.conf b/src/desktop/project.conf
index b753342..b943e4c 100644
--- a/src/desktop/project.conf
+++ b/src/desktop/project.conf
@@ -1,12 +1,23 @@
 targets=desktop,desktopctl,handler/mimeapp.o
 cppflags_force=-I../../include
-#cppflags=-D EMBEDDED
 cflags_force=`pkg-config --cflags libDesktop`
 cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
 ldflags_force=`pkg-config --libs libDesktop` -lintl
 ldflags=-pie -Wl,-z,relro -Wl,-z,now
 dist=Makefile,desktop.h,desktopicon.h,desktopiconwindow.h,handler.h,handler/applications.c,handler/categories.c,handler/files.c,handler/homescreen.c,handler/mimeapp.h
 
+#modes
+[mode::embedded-debug]
+cppflags_force=-I../../include -DEMBEDDED
+
+[mode::embedded-release]
+cppflags_force=-I../../include -DEMBEDDED -DNDEBUG
+cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
+
+[mode::release]
+cppflags_force=-I../../include -DNDEBUG
+cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
+
 #targets
 [desktop]
 type=binary
diff --git a/src/lib/project.conf b/src/lib/project.conf
index 57de86f..e6b7a4b 100644
--- a/src/lib/project.conf
+++ b/src/lib/project.conf
@@ -5,6 +5,18 @@ ldflags_force=`pkg-config --libs libDesktop` -lintl
 ldflags=-Wl,-z,relro -Wl,-z,now
 dist=Makefile
 
+#modes
+[mode::embedded-debug]
+cppflags_force=-DEMBEDDED
+
+[mode::embedded-release]
+cppflags_force=-DEMBEDDED -DNDEBUG
+cflags=-W -Wall -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
+
+[mode::release]
+cppflags_force=-DNDEBUG
+cflags=-W -Wall -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
+
 #targets
 [libBrowser]
 type=library
diff --git a/src/plugins/project.conf b/src/plugins/project.conf
index a015a7c..2b1ce04 100644
--- a/src/plugins/project.conf
+++ b/src/plugins/project.conf
@@ -1,12 +1,24 @@
 targets=backup,cvs,dirtree,favorites,git,make,places,preview,properties,selection,subversion,template,trash,undelete,volumes
-cppflags_force=-I ../../include
-cppflags=
+cppflags_force=-I../../include
 cflags_force=`pkg-config --cflags libDesktop` -fPIC
 cflags=-W -Wall -g -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
 ldflags_force=`pkg-config --libs libDesktop`
 ldflags=-Wl,-z,relro -Wl,-z,now
 dist=Makefile,common.c
 
+#modes
+[mode::embedded-debug]
+cppflags_force=-DEMBEDDED
+
+[mode::embedded-release]
+cppflags_force=-DEMBEDDED -DNDEBUG
+cflags=-W -Wall -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
+
+[mode::release]
+cppflags_force=-DNDEBUG
+cflags=-W -Wall -O2 -D_FORTIFY_SOURCE=2 -fstack-protector
+
+#targets
 [backup]
 type=plugin
 sources=backup.c
diff --git a/src/project.conf b/src/project.conf
index c4d9aea..566653c 100644
--- a/src/project.conf
+++ b/src/project.conf
@@ -1,17 +1,28 @@
 subdirs=browser,desktop
 targets=copy,delete,move,open,properties,view
 cppflags_force=-I../include
-#cppflags=-D EMBEDDED
 cflags_force=`pkg-config --cflags libDesktop`
 cflags=-W -Wall -g -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
 ldflags_force=`pkg-config --libs libDesktop` -lintl
 ldflags=-pie -Wl,-z,relro -Wl,-z,now
 dist=Makefile,common.c,common.h
 
+#modes
+[mode::embedded-debug]
+cppflags_force=-I../include -DEMBEDDED
+
+[mode::embedded-release]
+cppflags_force=-I../include -DEMBEDDED -DNDEBUG
+cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
+
+[mode::release]
+cppflags_force=-I../include -DNDEBUG
+cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
+
+#targets
 [copy]
 type=binary
 sources=copy.c
-cppflags=-I../include
 ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(PREFIX)/lib -lBrowser
 depends=$(OBJDIR)lib/libBrowser.a
 install=$(BINDIR)
@@ -22,7 +33,6 @@ depends=../include/Browser/vfs.h
 [delete]
 type=binary
 sources=delete.c
-cppflags=-I../include
 ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(PREFIX)/lib -lBrowser
 depends=$(OBJDIR)lib/libBrowser.a
 install=$(BINDIR)
@@ -33,7 +43,6 @@ depends=../include/Browser/vfs.h
 [move]
 type=binary
 sources=move.c
-cppflags=-I../include
 ldflags=-L$(OBJDIR)lib -Wl,-rpath,$(PREFIX)/lib -lBrowser
 depends=$(OBJDIR)lib/libBrowser.a
 install=$(BINDIR)
diff --git a/tests/project.conf b/tests/project.conf
index 8b96199..b3ee82b 100644
--- a/tests/project.conf
+++ b/tests/project.conf
@@ -6,6 +6,18 @@ ldflags_force=`pkg-config --libs libDesktop`
 ldflags=-pie -Wl,-z,relro -Wl,-z,now
 dist=Makefile,clint.sh,embedded.sh,fixme.sh,htmllint.sh,pkgconfig.sh,tests.sh,xmllint.sh
 
+#modes
+[mode::embedded-debug]
+cppflags_force=-DEMBEDDED
+
+[mode::embedded-release]
+cppflags_force=-DEMBEDDED -DNDEBUG
+cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
+
+[mode::release]
+cppflags_force=-DNDEBUG
+cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
+
 #targets
 [clint.log]
 type=script
diff --git a/tools/project.conf b/tools/project.conf
index 95acd7f..c8ca694 100644
--- a/tools/project.conf
+++ b/tools/project.conf
@@ -5,6 +5,19 @@ ldflags_force=`pkg-config --libs libDesktop`
 ldflags=-pie -Wl,-z,relro -Wl,-z,now
 dist=Makefile,subst.sh
 
+#modes
+[mode::embedded-debug]
+cppflags_force=-DEMBEDDED
+
+[mode::embedded-release]
+cppflags_force=-DEMBEDDED -DNDEBUG
+cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
+
+[mode::release]
+cppflags_force=-DNDEBUG
+cflags=-W -Wall -O2 -fPIE -D_FORTIFY_SOURCE=2 -fstack-protector
+
+#targets
 [dirtree]
 type=binary
 sources=dirtree.c