--- a/radioapp/radioapplication/radioapplication.pro	Fri Jun 11 16:24:13 2010 +0100
+++ b/radioapp/radioapplication/radioapplication.pro	Thu Jul 22 16:33:45 2010 +0100
@@ -14,37 +14,48 @@
 # Description:
 #
 
+TMP_DIR_NAME = app
 include(../buildflags.pri)
 
 TEMPLATE        = app
-TARGET          = qtfmradio
+TARGET          = fmradio
 TRANSLATIONS    += fmradio.ts 
 
 symbian: {
     TARGET.CAPABILITY       = CAP_APPLICATION MultimediaDD
-    TARGET.VID              = VID_DEFAULT
-    TARGET.UID3             = 0x101FF976 # Old visual radio uid
+    TARGET.UID3             = 0x2002FF4E
     TARGET.EPOCSTACKSIZE    = 0x14000
     TARGET.EPOCHEAPSIZE     = 0x020000 0x2400000
+    SKINICON                = qtg_large_radio
+    ICON                    = resources/qtg_large_radio.svg # Fallback icon in case theme doesn't have one
+
+    LIBS                    += -lxqserviceutil
+
+    BLD_INF_RULES.prj_exports += "resources/fmradio.docml       /epoc32/release/winscw/udeb/z/resource/hb/splashml/fmradio.docml" \
+                                 "resources/fmradio.splashml    /epoc32/release/winscw/udeb/z/resource/hb/splashml/fmradio.splashml" \
+                                 "resources/fmradio.docml       /epoc32/data/z/resource/hb/splashml/fmradio.docml" \
+                                 "resources/fmradio.splashml    /epoc32/data/z/resource/hb/splashml/fmradio.splashml"
 }
 
 CONFIG      += hb service
+CONFIG      += mobility
+MOBILITY    = systeminfo
 
 # Service provider specific configuration.
 SERVICE.FILE = resources/service_conf.xml
 
 INCLUDEPATH += . inc
-INCLUDEPATH += ../commoninc
+INCLUDEPATH += ../../common
 INCLUDEPATH += ../radiouiengine/inc
 INCLUDEPATH += ../radiowidgets/inc
 
-LIBS        += -lradiouiengine
-LIBS        += -lradiowidgets
+LIBS        += -lfmradiouiengine
+LIBS        += -lfmradiowidgets
 
 # UI does not normally depend on the wrapper, but it does on two special cases
 # 1. Logging is enabled. The logger is in the wrapper module
 # 2. Radio is built for win32 target. The test window needs to access the wrapper
-LOGGING_ENABLED:LIBS += -lradioenginewrapper
+LOGGING_ENABLED:LIBS += -lfmradioenginewrapper
 
 # Sources
 HEADERS     += radioapplication.h
@@ -54,7 +65,7 @@
 
 # Win32 specific stuff
 win32: {
-    LIBS += -lradioenginewrapper
+    LIBS += -lfmradioenginewrapper
 
     HEADERS += testwindow_win32.h