diff -r 11d3954df52a -r 627c4a0fd0e7 src/hbservers/hbthemeserver/hbthemeserver_generic_p_p.h
--- a/src/hbservers/hbthemeserver/hbthemeserver_generic_p_p.h	Thu May 27 13:10:59 2010 +0300
+++ b/src/hbservers/hbthemeserver/hbthemeserver_generic_p_p.h	Fri Jun 11 13:58:22 2010 +0300
@@ -70,7 +70,6 @@
     QByteArray handleSharedWidgetMLLookup(const QString &fileName,
                                           const QString &layout, const QString &section);
     void writeToClients(QByteArray &block);
-    void setThemeSelectionClient(QLocalSocket *socket);
 
     bool insertCssCacheItem(const QString &key,  HbCacheItem *item);
     HbCacheItem *cssCacheItem(const QString &key);
@@ -86,6 +85,8 @@
 	HbRenderingMode currentRenderingMode() const;
     void setCurrentRenderingMode(HbRenderingMode currentMode);
 
+    bool resolveThemePath(const QString &themeName, QString &themePath);
+
 //Debug Code for Test Purpose
 #ifdef HB_ICON_CACHE_DEBUG
     int cacheIconCount() const;
@@ -120,11 +121,13 @@
     QLabel statusLabel;
 #endif
     QLocalServer *server;
-    QLocalSocket *iThemeSelectionClient;
     QList<HbThemeServerSession *> sessionList;
     HbIconDataCache *iconCache;
     HbCache *cssCache;
 	HbRenderingMode renderMode;
+
+    QString iCurrentThemeName;
+    QString iCurrentThemePath;
 };
 
 class HbThemeServerSession : public QObject