diff -r 11d3954df52a -r 627c4a0fd0e7 src/hbapps/hbthemechanger/themechangermain.cpp
--- a/src/hbapps/hbthemechanger/themechangermain.cpp	Thu May 27 13:10:59 2010 +0300
+++ b/src/hbapps/hbthemechanger/themechangermain.cpp	Fri Jun 11 13:58:22 2010 +0300
@@ -28,11 +28,6 @@
 #include "themechangerdefs.h"
 #include "themeselectionlist.h"
 #include <QTextStream>
-#ifdef Q_OS_SYMBIAN
-#include "themeclientsymbian.h"
-#else
-#include "themeclientqt.h"
-#endif
 
 #ifdef THEME_CHANGER_TIMER_LOG
 void debugOutput(QtMsgType type, const char *msg)
@@ -70,15 +65,8 @@
     // Includes decorators such as signal strength and battery life indicator.
     HbMainWindow mainWindow;
     
-#ifdef Q_OS_SYMBIAN
-    ThemeClientSymbian* client = new ThemeClientSymbian();
-#else
-    // Create the theme server that does the notifiation to all the QT apps
-    ThemeClientQt* client = new ThemeClientQt();
-#endif
-
     // Show the list of themes available
-    ThemeSelectionList *themelist=new ThemeSelectionList(client);
+    ThemeSelectionList *themelist=new ThemeSelectionList();
     themelist->displayThemes();
     
     mainWindow.addView( themelist );