--- a/syborg_stem/rom_content.csv	Sun Oct 10 13:40:53 2010 +0100
+++ b/syborg_stem/rom_content.csv	Sun Oct 10 13:45:56 2010 +0100
@@ -35,7 +35,9 @@
 PRIVATE\100012a5\policy\20021335.spd,/epoc32/data/z/private/100012a5/policy/20021335.spd,core/app/appmgmt.iby,app/devicecontrol,,,
 PRIVATE\100012a5\policy\2002677A.SPD,/epoc32/data/z/private/100012a5/policy/2002677a.spd,core/mw/scpdatabase.iby,mw/remotemgmt,,,
 Private\10003a3f\apps\ABOUT_reg.rsc,/epoc32/data/z/private/10003a3f/apps/about_reg.rsc,core/app/about.iby,app/utils,,,
+Private\10003a3f\apps\akncapserver_reg.rsc,/epoc32/data/z/private/10003a3f/apps/akncapserver_reg.rsc,core/mw/aknglobalui.iby,mw/classicui,,,
 private\10003a3f\apps\aknconf_reg.rsc,/epoc32/data/z/private/10003a3f/apps/aknconf_reg.rsc,core/tools/aknconf.iby,mw/classicui,,,
+Private\10003a3f\apps\aknnfysrv_reg.rsc,/epoc32/data/z/private/10003a3f/apps/aknnfysrv_reg.rsc,core/mw/aknglobalui.iby,mw/classicui,,,
 private\10003a3f\import\apps\ApplicationManagement_reg.RSC,/epoc32/data/z/private/10003a3f/apps/applicationmanagement_reg.rsc,core/app/appmgmt.iby,app/devicecontrol,,,
 Private\10003a3f\apps\appmngr2_reg.rsc,/epoc32/data/z/private/10003a3f/apps/appmngr2_reg.rsc,core/mw/appmngr2.iby,mw/appinstall,,,
 Private\10003a3f\import\apps\audiomessage_reg.rsc,/epoc32/data/z/private/10003a3f/apps/audiomessage_reg.rsc,core/app/audiomessage.iby,app/messaging,,,
@@ -50,6 +52,7 @@
 Private\10003a3f\import\apps\cameraapp_reg.rsc,/epoc32/data/z/private/10003a3f/apps/cameraapp_reg.rsc,core/app/cameraapp.iby,app/camera,,,
 private\10003a3f\import\apps\cbsuiapp_reg.rsc,/epoc32/data/z/private/10003a3f/apps/cbsuiapp_reg.rsc,core/mw/CbsUiApp.iby,mw/phonesrv,,,
 private\10003a3f\apps\ccaapp_reg.rsc,/epoc32/data/z/private/10003a3f/apps/ccaapp_reg.rsc,core/app/ccaapp.iby,app/contacts,,,
+Private\10003a3f\apps\CERTSAVER_reg.rsc,/epoc32/data/z/private/10003a3f/apps/certsaver_reg.rsc,core/mw/CertSaver.iby,mw/securitysrv,,,
 Private\10003a3f\import\apps\CodViewer_reg.rsc,/epoc32/data/z/private/10003a3f/apps/codviewer_reg.rsc,core/mw/CodHandler.iby,mw/web,,,
 Private\10003a3f\apps\ConnectionMonitorUi_reg.rsc,/epoc32/data/z/private/10003a3f/apps/connectionmonitorui_reg.rsc,core/mw/ConnectionMonitorUi.iby,mw/ipconnmgmt,,,
 Private\10003a3f\import\apps\ConnTest_reg.rsc,/epoc32/data/z/private/10003a3f/apps/conntest_reg.rsc,core/tools/ConnTest.iby,app/conntools,,,
@@ -72,6 +75,7 @@
 Private\10003a3f\apps\fotaserver_reg.rsc,/epoc32/data/z/private/10003a3f/apps/fotaserver_reg.rsc,core/mw/fotaserver.iby,mw/remotemgmt,,,
 Private\10003a3f\import\apps\FreestyleEmailUi_reg.rsc,/epoc32/data/z/private/10003a3f/apps/freestyleemailui_reg.rsc,core/app/freestyleemailui.iby,app/commonemail,,,
 Private\10003a3f\import\apps\fsmailserver_reg.rsc,/epoc32/data/z/private/10003a3f/apps/fsmailserver_reg.rsc,core/app/fsmailserver.iby,app/commonemail,,,
+Private\10003a3f\apps\GSApp_reg.rsc,/epoc32/data/z/private/10003a3f/apps/gsapp_reg.rsc,core/mw/gsapp.iby,mw/gsprofilesrv,,,
 Private\10003a3f\apps\homescreen_reg.rsc,/epoc32/data/z/private/10003a3f/apps/homescreen_reg.rsc,core/mw/idlefw.iby,mw/homescreensrv,,,
 Private\10003a3f\apps\HsBrowser_reg.rsc,/epoc32/data/z/private/10003a3f/apps/hsbrowser_reg.rsc,core/mw/hotspot.iby,mw/wirelessacc,,,
 Private\10003a3f\import\apps\iaupdate_reg.rsc,/epoc32/data/z/private/10003a3f/apps/iaupdate_reg.rsc,core/mw/iaupdate.iby,mw/appinstall,,,
@@ -727,6 +731,8 @@
 private\10207114\import\2000B12E\jing.skn,/epoc32/data/z/private/10207114/import/2000b12e/jing.skn,core/mw/aknskins.iby,mw/uiresources,,,
 Private\10207218\AKNMEMORYCARDUI.rsc,/epoc32/data/z/private/10207218/aknmemorycardui.rsc,language/mw/aknglobaluiresources.iby,mw/classicui,,,
 private\10207218\backup_registration.xml,/epoc32/data/z/private/10207218/backup_registration.xml,core/mw/aknglobalui.iby,mw/classicui,,,
+private\10207218\goomconfig.xml,/epoc32/data/z/private/10207218/goomconfig.xml,core/mw/goommonitor.iby,mw/uiaccelerator,,,
+private\10207218\oomconfig.xml,/epoc32/data/z/private/10207218/oomconfig.xml,core/mw/oommonitor.iby,mw/appsupport,,,
 private\1020728E\backup_registration.xml,/epoc32/data/z/private/1020728e/backup_registration.xml,core/mw/FeedsEngine.iby,mw/web,,,
 private\1020728E\default_feeds.xml,/epoc32/data/z/private/1020728e/default_feeds.xml,core/mw/FeedsEngine.iby,mw/web,,,
 private\102072c3\backup_registration.xml,/epoc32/data/z/private/102072c3/backup_registration.xml,core/app/mpxmusicplayer.iby,app/musicplayer,,,
@@ -2347,12 +2353,6 @@
 resource\xhtml\theme\js\functions.js,/epoc32/data/z/resource/xhtml/theme/js/functions.js,customer/app/help_themes.iby,mw/uiresources,,,
 resource\xhtml\theme\xsl\index2html.xslt,/epoc32/data/z/resource/xhtml/theme/xsl/index2html.xslt,customer/app/help_themes.iby,mw/uiresources,,,
 Resource\xml\expatcopyright.txt,/epoc32/data/z/resource/xml/expatcopyright.txt,xmlparserplugin.iby,os/xmlsrv,,,
-Private\10003a3f\apps\akncapserver_reg.rsc,/epoc32/data/z/system/../private/10003a3f/apps/akncapserver_reg.rsc,core/mw/aknglobalui.iby,(unknown),,,
-Private\10003a3f\apps\aknnfysrv_reg.rsc,/epoc32/data/z/system/../private/10003a3f/apps/aknnfysrv_reg.rsc,core/mw/aknglobalui.iby,(unknown),,,
-Private\10003a3f\apps\CERTSAVER_reg.rsc,/epoc32/data/z/system/../private/10003a3f/apps/certsaver_reg.rsc,core/mw/CertSaver.iby,(unknown),,,
-Private\10003a3f\apps\GSApp_reg.rsc,/epoc32/data/z/system/../private/10003a3f/apps/gsapp_reg.rsc,core/mw/gsapp.iby,(unknown),,,
-private\10207218\goomconfig.xml,/epoc32/data/z/system/../private/10207218/goomconfig.xml,core/mw/goommonitor.iby,(unknown),,,
-private\10207218\oomconfig.xml,/epoc32/data/z/system/../private/10207218/oomconfig.xml,core/mw/oommonitor.iby,(unknown),,,
 system\data\meshpreface1.cfg,/epoc32/data/z/system/data/meshpreface1.cfg,ced.iby,os/commsfw,,,
 system\data\nullsound.mp3,/epoc32/data/z/system/data/nullsound.mp3,core/app/mpxequalizerview.iby,app/musicplayer,,,
 system\data\sisregistry_5.4.txt,/epoc32/data/z/system/data/sisregistry_5.4.txt,swiconfig.iby,mw/appinstall,,,