--- a/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Tue Apr 20 15:20:20 2010 +0100
+++ b/symbian4/os/deviceplatformrelease/foundation_system/system_model/system_definition.xml	Tue Apr 20 15:23:40 2010 +0100
@@ -101,7 +101,7 @@
 <SystemDefinition schema="3.0.0">
   <systemModel name="Symbian^4">
     <layer id="adaptation" name="Adaptation" levels="low mw high">
-      <package id="stubs" tech-domain="hb" level="high" href="../../../../adaptation/stubs/package_definition_3.0.xml"/>
+      <package id="stubs" tech-domain="hb" level="high" span="2"  href="../../../../adaptation/stubs/package_definition.xml"/>
       <package id="beagleboard" tech-domain="hb" level="low" href="../../../../adaptation/beagleboard/package_definition_3.0.xml"/>
       <package id="qemu" tech-domain="hb" level="low" href="../../../../adaptation/qemu/package_definition_3.0.xml"/>
     </layer>
@@ -165,7 +165,7 @@
       <package id="inputmethods" level="generic" tech-domain="ui" href="../../../../mw/inputmethods/package_definition_3.0.xml"/>
       <package id="qt" level="generic" tech-domain="ui" href="../../../../mw/qt/package_definition_3.0.xml"/>
       <package id="qtextensions" level="generic" tech-domain="ui" href="../../../../mw/qtextensions/package_definition_3.0.xml"/>
-      <package id="hb" level="generic" tech-domain="ui" name="Orbit" href="../../../../mw/hb/package_definition_3.0.xml"/>/>
+      <package id="hb" level="generic" tech-domain="ui" href="../../../../mw/hb/package_definition_3.0.xml"/>/>
       <package id="classicui" level="generic" tech-domain="ui" href="../../../../mw/classicui/package_definition_3.0.xml"/>
       <package id="svgt" level="generic" tech-domain="ui" href="../../../../mw/svgt/package_definition_3.0.xml"/>
       <package id="uiaccelerator" level="generic" tech-domain="ui" href="../../../../mw/uiaccelerator/package_definition_3.0.xml"/>
@@ -180,14 +180,13 @@
       <package id="serviceapi" level="specific" tech-domain="rt" href="../../../../mw/serviceapi/package_definition_3.0.xml"/>
       <package id="web" level="specific" tech-domain="rt" href="../../../../mw/web/package_definition_3.0.xml"/>
       <package id="websrv" level="generic" tech-domain="rt" href="../../../../mw/websrv/package_definition_3.0.xml"/>
+      <package id="webruntime" level="specific" tech-domain="rt" href="../../../../mw/webruntime/package_definition_3.0.xml"/>
       <package id="platformtools" level="generic" tech-domain="to" href="../../../../mw/platformtools/package_definition_3.0.xml"/>
       <package id="uitools" level="specific" tech-domain="to" href="../../../../mw/uitools/package_definition_3.0.xml"/>
     </layer>
     <layer id="app" name="Applications" levels="services apps">
       <package id="location" level="apps" tech-domain="lo" href="../../../../app/location/package_definition_3.0.xml"/>  <!-- pending removal -->
-      <package id="mmsharinguis" level="services" tech-domain="vc" href="../../../../app/mmsharinguis/package_definition_3.0.xml"/>
       <package id="phone" level="apps" span="2" tech-domain="vc" href="../../../../app/phone/package_definition_3.0.xml"/>
-      <package id="videotelephony" level="apps" tech-domain="vc" href="../../../../app/videotelephony/package_definition_3.0.xml"/>
       <package id="settingsuis" level="services" tech-domain="dm" href="../../../../app/settingsuis/package_definition_3.0.xml"/>
       <package id="contentcontrol" level="services" tech-domain="dm" href="../../../../app/contentcontrol/package_definition_3.0.xml"/>
       <package id="firsttimeuse" level="apps" tech-domain="dm" href="../../../../app/firsttimeuse/package_definition_3.0.xml"/>
@@ -209,7 +208,6 @@
       <package id="internetradio" level="apps" tech-domain="ma" href="../../../../app/internetradio/package_definition_3.0.xml"/>
       <package id="homescreen" level="apps" tech-domain="ui" href="../../../../app/homescreen/package_definition_3.0.xml"/>
       <package id="homescreentools" level="services" tech-domain="ui" href="../../../../app/homescreentools/package_definition_3.0.xml"/>
-      <package id="webuis" level="services" tech-domain="rt" href="../../../../app/webuis/package_definition_3.0.xml"/>
       <package id="jrt" level="services" tech-domain="rt" href="../../../../app/jrt/package_definition_3.0.xml"/>
       <package id="conntools" level="services" tech-domain="dc" href="../../../../app/conntools/package_definition_3.0.xml"/>
       <package id="rndtools" level="services" tech-domain="to" href="../../../../app/rndtools/package_definition_3.0.xml"/>