diff --git a/admin/Makefile.am b/admin/Makefile.am
index c4dd47821..1b2590905 100644
--- a/admin/Makefile.am
+++ b/admin/Makefile.am
@@ -17,10 +17,10 @@
 
 admin_srcdir = $(top_srcdir)/admin
 
-noinst_PROGRAMS += vgsuppression
-vgsuppression_SOURCES = $(admin_srcdir)/vgsuppression.c
-vgsuppression_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
-vgsuppression_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) -ldl
+#noinst_PROGRAMS += vgsuppression
+#vgsuppression_SOURCES = $(admin_srcdir)/vgsuppression.c
+#vgsuppression_CPPFLAGS = $(AM_CPPFLAGS) -std=gnu99 -Wall -Werror
+#vgsuppression_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS) -ldl
 
 noinst_PROGRAMS += rsvg-convert
 rsvg_convert_SOURCES = $(admin_srcdir)/rsvg-convert.c
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 4fa85a9c4..5aedc564e 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -24,6 +24,7 @@ lumigui_CPPFLAGS = $(AM_CPPFLAGS)					\
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\"	\
 	-DPACKAGE_SRC_DIR=\""$(srcdir)"\"				\
 	-DPACKAGE_DATA_DIR=\""$(datadir)"\"				\
+	-DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\"" \
 	$(LUMIERA_GUI_CFLAGS)
 
 bin_PROGRAMS += lumigui
@@ -100,13 +101,25 @@ lumigui_SOURCES =								\
 	$(lumigui_srcdir)/output/xvdisplayer.cpp				\
 	$(lumigui_srcdir)/output/xvdisplayer.hpp
 
+lumigui_SOURCES +=                             \
+	$(lumiera_srcdir)/lumiera/guifacade.cpp     \
+	$(lumiera_srcdir)/lumiera/configfacade.cpp  \
+	$(lumiera_srcdir)/lumiera/appstate.cpp      \
+	$(lumiera_srcdir)/lumiera/option.cpp        \
+	$(lumiera_srcdir)/lumiera/subsys.cpp        \
+	$(lumiera_srcdir)/lumiera/interfaceproxy.cpp    \
+	$(lumiera_srcdir)/lumiera/nobugcfg.cpp      
+
 lumigui_LDFLAGS =
 # $(LIBS) $(X_PRE_LIBS) $(X_LIBS) $(X_EXTRA_LIBS)
-lumigui_LDADD = $(LUMIERA_GUI_LIBS) liblumiera.la $(NOBUGMT_LUMIERA_LIBS)
+lumigui_LDADD = liblumierabackend.la liblumieraproc.la liblumiera.la \
+                $(LUMIERA_GUI_LIBS) $(NOBUGMT_LUMIERA_LIBS) -lboost_program_options-mt -lboost_regex-mt
 
 lumigui_DEPENDENCIES =				\
 	$(top_builddir)/lumiera_ui.rc		\
-	$(top_builddir)/liblumiera.la
+	$(top_builddir)/liblumiera.la        \
+	$(top_builddir)/liblumierabackend.la \
+	$(top_builddir)/liblumieraproc.la    
 
 $(top_builddir)/lumiera_ui.rc:
 	cp $(lumigui_srcdir)/lumiera_ui.rc $(top_builddir)
diff --git a/src/tool/Makefile.am b/src/tool/Makefile.am
index c4fea4e86..b3db1a817 100644
--- a/src/tool/Makefile.am
+++ b/src/tool/Makefile.am
@@ -20,8 +20,16 @@ lumitool_srcdir = $(top_srcdir)/src/tool
 noinst_PROGRAMS += luidgen
 
 luidgen_CFLAGS = $(CFLAGS) -std=gnu99 -Wall -Werror
-luidgen_CPPFLAGS = -I$(top_srcdir)/src/
-luidgen_SOURCES =                                               \
-	  $(lumitool_srcdir)/luidgen.c
+luidgen_CPPFLAGS = -I$(top_srcdir)/src/             \
+	-DLUMIERA_CONFIG_PATH="\"$(pkgdatadir)/config\""   
+luidgen_SOURCES =                                   \
+	$(lumitool_srcdir)/luidgen.c
 
-luidgen_LDADD = liblumiera.la $(NOBUGMT_LUMIERA_LIBS)
+luidgen_SOURCES +=                             \
+	$(lumiera_srcdir)/lumiera/appstate.cpp      \
+	$(lumiera_srcdir)/lumiera/configfacade.cpp  \
+	$(lumiera_srcdir)/lumiera/subsys.cpp        \
+	$(lumiera_srcdir)/lumiera/nobugcfg.cpp
+          
+
+luidgen_LDADD = liblumiera.la liblumieraproc.la -lboost_regex-mt -ldl $(NOBUGMT_LUMIERA_LIBS)
diff --git a/tests/lib/Makefile.am b/tests/lib/Makefile.am
index 12a83de18..473cd5e18 100644
--- a/tests/lib/Makefile.am
+++ b/tests/lib/Makefile.am
@@ -34,7 +34,7 @@ test_lib_LDADD =									\
 	liblumiera.a									\
 	$(NOBUGMT_LUMIERA_LIBS) -ldl -lboost_program_options-mt -lboost_regex-mt
 
-test_common_SOURCES =						\
+test_lib_SOURCES =						\
 	$(testlib_srcdir)/allocationclustertest.cpp		\
 	$(testlib_srcdir)/appconfigtest.cpp			\
 	$(testlib_srcdir)/customsharedptrtest.cpp		\