diff --git a/src/qt4gui/recoll.pro.in b/src/qt4gui/recoll.pro.in
index 60484411..f11c704a 100644
--- a/src/qt4gui/recoll.pro.in
+++ b/src/qt4gui/recoll.pro.in
@@ -1,9 +1,9 @@
-TEMPLATE	= app
-LANGUAGE	= C++
+TEMPLATE        = app
+LANGUAGE        = C++
 
-CONFIG	+= qt warn_on thread release debug
+CONFIG  += qt warn_on thread release debug
 
-HEADERS	+= \
+HEADERS += \
         ../qtgui/advsearch_w.h \
         ../qtgui/confgui/confgui.h \
         ../qtgui/confgui/confguiindex.h \
@@ -16,7 +16,7 @@ HEADERS	+= \
         ../qtgui/spell_w.h \
         ../qtgui/ssearch_w.h \
         ../qtgui/uiprefs_w.h \
-        ../qtgui/viewaction_w.h
+        ../qtgui/viewaction_w.h \
 
 
 SOURCES += \
@@ -35,18 +35,18 @@ SOURCES += \
         ../qtgui/spell_w.cpp \
         ../qtgui/ssearch_w.cpp \
         ../qtgui/uiprefs_w.cpp \
-        ../qtgui/viewaction_w.cpp
-	
+        ../qtgui/viewaction_w.cpp \
 
 
-FORMS	= \
-        advsearch.ui \
-        rclmain.ui \
-        sort.ui \
-        spell.ui \
-        ssearchb.ui \
-        uiprefs.ui \
-        viewaction.ui
+
+FORMS   = \
+        ../qtgui/advsearch.ui \
+        ../qtgui/rclmain.ui \
+        ../qtgui/sort.ui \
+        ../qtgui/spell.ui \
+        ../qtgui/ssearchb.ui \
+        ../qtgui/uiprefs.ui \
+        ../qtgui/viewaction.ui \
 
 
 RESOURCES = recoll.qrc
@@ -61,27 +61,30 @@ unix {
            -lz
 
   INCLUDEPATH += ../common ../index ../internfile ../query ../unac \
-	      ../utils ../aspell ../rcldb ../qt4gui/.ui \
-	      ../qtgui ../../qtgui \
-	      ../qtgui/confgui ../../qtgui/confgui
+              ../utils ../aspell ../rcldb ../qt4gui/.ui \
+              ../qtgui ../../qtgui \
+              ../qtgui/confgui ../../qtgui/confgui
 
   POST_TARGETDEPS = ../lib/librcl.a
 }
 
 UNAME = $$system(uname -s)
 contains( UNAME, [lL]inux ) {
-          LIBS -= -liconv
+          LIBS -= -liconv 
+	  LIBS += -ldl -lX11
 }
 contains( UNAME, SunOS ) {
           LIBS += -ldl
 }
 
-TRANSLATIONS = ../qtgui/i18n/recoll_de.ts \
-	     ../qtgui/i18n/recoll_fr.ts \
-	     ../qtgui/i18n/recoll_it.ts \
-	     ../qtgui/i18n/recoll_ru.ts \
-	     ../qtgui/i18n/recoll_tr.ts \
-	     ../qtgui/i18n/recoll_uk.ts \
-	     ../qtgui/i18n/recoll_xx.ts
+TRANSLATIONS = \
+	     ../qtgui/i18n/recoll_de.ts \
+             ../qtgui/i18n/recoll_fr.ts \
+             ../qtgui/i18n/recoll_it.ts \
+             ../qtgui/i18n/recoll_ru.ts \
+             ../qtgui/i18n/recoll_tr.ts \
+             ../qtgui/i18n/recoll_uk.ts \
+             ../qtgui/i18n/recoll_xx.ts \
+
 
 QT += qt3support 
diff --git a/src/qtgui/recoll.pro.in b/src/qtgui/recoll.pro.in
index 0ccb3d79..fd0c1a68 100644
--- a/src/qtgui/recoll.pro.in
+++ b/src/qtgui/recoll.pro.in
@@ -1,63 +1,67 @@
-TEMPLATE	= app
-LANGUAGE	= C++
+TEMPLATE        = app
+LANGUAGE        = C++
 
-CONFIG	+= qt warn_on thread release debug
+CONFIG  += qt warn_on thread release debug
 
-HEADERS	+= \
-	advsearch_w.h \
-	spell_w.h \
-	preview_w.h \
-	rclmain_w.h \
-	reslist.h \
-	rclhelp.h \
-	sort_w.h \
-	searchclause_w.h \
-	ssearch_w.h \
-	uiprefs_w.h \
-        viewaction_w.h \
-        confgui/confgui.h \
-        confgui/confguiindex.h
+HEADERS += \
+        ../qtgui/advsearch_w.h \
+        ../qtgui/confgui/confgui.h \
+        ../qtgui/confgui/confguiindex.h \
+        ../qtgui/preview_w.h \
+        ../qtgui/rclhelp.h \
+        ../qtgui/rclmain_w.h \
+        ../qtgui/reslist.h \
+        ../qtgui/searchclause_w.h \
+        ../qtgui/sort_w.h \
+        ../qtgui/spell_w.h \
+        ../qtgui/ssearch_w.h \
+        ../qtgui/uiprefs_w.h \
+        ../qtgui/viewaction_w.h \
 
 
-SOURCES	+= \
-	guiutils.cpp \
-	idxthread.cpp \
-	main.cpp \
-	rclmain_w.cpp \
-	reslist.cpp \
-        advsearch_w.cpp \
-	rclhelp.cpp \
-	spell_w.cpp \
-        preview_w.cpp \
-        sort_w.cpp \
-	searchclause_w.cpp \
-        ssearch_w.cpp \
-        uiprefs_w.cpp \
-        viewaction_w.cpp \
-        confgui/confgui.cpp \
-        confgui/confguiindex.cpp
+SOURCES += \
+        ../qtgui/advsearch_w.cpp \
+        ../qtgui/confgui/confgui.cpp \
+        ../qtgui/confgui/confguiindex.cpp \
+        ../qtgui/guiutils.cpp \
+        ../qtgui/idxthread.cpp \
+        ../qtgui/main.cpp \
+        ../qtgui/preview_w.cpp \
+        ../qtgui/rclhelp.cpp \
+        ../qtgui/rclmain_w.cpp \
+        ../qtgui/reslist.cpp \
+        ../qtgui/searchclause_w.cpp \
+        ../qtgui/sort_w.cpp \
+        ../qtgui/spell_w.cpp \
+        ../qtgui/ssearch_w.cpp \
+        ../qtgui/uiprefs_w.cpp \
+        ../qtgui/viewaction_w.cpp \
 
-FORMS	= \
-	advsearch.ui \
-	spell.ui \
-	rclmain.ui \
-	sort.ui \
-	ssearchb.ui \
-	uiprefs.ui \
-	viewaction.ui
 
-IMAGES	= \
-	images/asearch.png \
-	images/d_firstpage.png \
-	images/d_nextpage.png \
-	images/d_prevpage.png \
-	images/d_spell.png \
-	images/firstpage.png \
-	images/history.png \
-	images/nextpage.png \
-	images/prevpage.png \
-	images/sortparms.png \
-	images/spell.png 
+
+FORMS   = \
+        ../qtgui/advsearch.ui \
+        ../qtgui/rclmain.ui \
+        ../qtgui/sort.ui \
+        ../qtgui/spell.ui \
+        ../qtgui/ssearchb.ui \
+        ../qtgui/uiprefs.ui \
+        ../qtgui/viewaction.ui \
+
+
+IMAGES  = \
+        ../qtgui/images/asearch.png \
+        ../qtgui/images/d_firstpage.png \
+        ../qtgui/images/d_nextpage.png \
+        ../qtgui/images/d_prevpage.png \
+        ../qtgui/images/d_spell.png \
+        ../qtgui/images/firstpage.png \
+        ../qtgui/images/history.png \
+        ../qtgui/images/nextpage.png \
+        ../qtgui/images/prevpage.png \
+        ../qtgui/images/sortparms.png \
+        ../qtgui/images/spell.png \
+
 
 unix {
   UI_DIR = .ui
@@ -69,22 +73,24 @@ unix {
            -lz
 
   INCLUDEPATH += ../common ../index ../internfile ../query ../unac \
-	      ../utils ../aspell ../rcldb confgui
+              ../utils ../aspell ../rcldb confgui
   POST_TARGETDEPS = ../lib/librcl.a
 }
 
 UNAME = $$system(uname -s)
 contains( UNAME, [lL]inux ) {
           LIBS -= -liconv
+	  LIBS += -ldl -lX11
 }
 contains( UNAME, SunOS ) {
           LIBS += -ldl
 }
 
-TRANSLATIONS = i18n/recoll_de.ts \
-	     i18n/recoll_fr.ts \
-	     i18n/recoll_it.ts \
-	     i18n/recoll_ru.ts \
-	     i18n/recoll_tr.ts  \
-	     i18n/recoll_uk.ts  \
-	     i18n/recoll_xx.ts
+TRANSLATIONS = \
+	     ../qtgui/i18n/recoll_de.ts \
+             ../qtgui/i18n/recoll_fr.ts \
+             ../qtgui/i18n/recoll_it.ts \
+             ../qtgui/i18n/recoll_ru.ts \
+             ../qtgui/i18n/recoll_tr.ts  \
+             ../qtgui/i18n/recoll_uk.ts  \
+             ../qtgui/i18n/recoll_xx.ts \