Mercurial Mercurial > oss > MCL > sftools > fbf > projects > platforms / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update model after analysis of build 590, and remove mw/opensrv from sources.csv
authorWilliam Roberts <williamr@symbian.org>
Sun, 30 May 2010 16:37:01 +0100
changeset 607 354d5b0553f4
parent 606 cef7e00e6981
child 608 185f85ac1815
Update model after analysis of build 590, and remove mw/opensrv from sources.csv
symbian3/single/sources.csv file | annotate | diff | comparison | revisions
symbian3/single/sysdefs/full_system_model_3.0.xml file | annotate | diff | comparison | revisions
symbian3/single/sysdefs/sf3.svg file | annotate | diff | comparison | revisions
symbian3/single/sysdefs/sf3c.svg file | annotate | diff | comparison | revisions
symbian3/single/sysdefs/sf3lit.svg file | annotate | diff | comparison | revisions
symbian3/single/sysdefs/sf3pkg.svg file | annotate | diff | comparison | revisions
symbian3/single/sysdefs/system_model.xml file | annotate | diff | comparison | revisions
symbian3/single/sysdefs/system_model_3.0.xml file | annotate | diff | comparison | revisions 
--- a/symbian3/single/sources.csv	Fri May 28 17:31:40 2010 +0100
+++ b/symbian3/single/sources.csv	Sun May 30 16:37:01 2010 +0100
@@ -74,7 +74,6 @@
 http://developer.symbian.org/oss/MCL/sf/mw/mmuifw/,/sf/mw/mmuifw,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/mw/netprotocols/,/sf/mw/netprotocols,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/mw/networkingdm/,/sf/mw/networkingdm,branch,RCL_3,layers.sysdef.xml
-http://developer.symbian.org/oss/MCL/sf/mw/opensrv/,/sf/mw/opensrv,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/mw/phonesrv/,/sf/mw/phonesrv,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/FCL/sf/mw/platformtools/,/sf/mw/platformtools,branch,RCL_3,layers.sysdef.xml
 http://developer.symbian.org/oss/MCL/sf/mw/qt/,/sf/mw/qt,branch,RCL_3,layers.sysdef.xml
--- a/symbian3/single/sysdefs/full_system_model_3.0.xml	Fri May 28 17:31:40 2010 +0100
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml	Sun May 30 16:37:01 2010 +0100
@@ -2335,6 +2335,9 @@
 <component id="ecam_face_tracking_custom_api" name="ECam Face Tracking Custom API" class="api" filter="s60">
 <unit bldFile="/os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
 </component>
+<component id="ecam_use_case_hint_custom_api" name="ECam Use Case Hint Custom API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
+</component>
 </collection>
 <collection id="imageadaptationextensions" name="Image Adaptation Extensions" level="app-if">
 <component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
@@ -4692,7 +4695,7 @@
 <component id="im_cache_server_api" name="IM Cache Server API" class="api" filter="s60">
 <unit bldFile="/mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
 </component>
-<component id="presence_avabilitytext" name="Presence Avability Text" class="api" filter="s60">
+<component id="presence_avabilitytext" name="Presence Availbility Text" class="api" filter="s60">
 <unit bldFile="/mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
 </component>
 </collection>
@@ -4715,9 +4718,6 @@
 <component id="xmppsettingsfetcher" filter="s60" name="XMPP Settings Fetcher" introduced="^2">
 <unit bldFile="/mw/imsrv/imservices/xmppsettingsfetcher/group"/>
 </component>
-<component id="ossprotocoladaptation" filter="s60" name="OSS Protocol Adaptation" class="plugin" introduced="^2">
-<unit bldFile="/mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
 <component id="instantmessagingcache" filter="s60" name="Instant Messaging Cache" introduced="^2">
 <unit bldFile="/mw/imsrv/imservices/instantmessagingcache/group"/>
 </component>
@@ -8431,14 +8431,11 @@
 </component>
 </collection>
 </package>
+<!-- <package id="opensrv" level="specific" tech-domain="pr" href="../../../../mw/opensrv/package_definition.xml"/> -->
 </layer>
 <layer id="app" name="Applications" levels="services apps">
 <package id="location" level="apps" tech-domain="lo" name="Location Apps" levels="ui events loc apps">
-<collection id="loc_plat" name="Location Apps Platform Interfaces" level="apps">
-<component id="location_centre_api" name="Location Centre API" introduced="^3" class="api" filter="s60">
-<unit bldFile="/app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
+<collection id="loc_plat" name="Location Apps Platform Interfaces" level="apps"/>
 <collection id="loc_pub" name="Location Apps Public Interfaces" level="apps">
 <component id="landmarks_ui_selector_api" name="Landmarks UI Selector API" class="api" filter="s60">
 <unit bldFile="/app/location/loc_pub/landmarks_ui_selector_api/group"/>
@@ -8530,24 +8527,6 @@
 <unit bldFile="/app/location/mapnavproviderrefapp/group"/>
 </component>
 </collection>
-<collection id="locationcentre" name="Location Centre" level="loc">
-<component id="lcutils" name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="/app/location/locationcentre/lcutils/group"/>
-</component>
-<component id="lcservice" name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="/app/location/locationcentre/lcservice/group"/>
-</component>
-<component id="lcserver" name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="/app/location/locationcentre/lcserver/group"/>
-</component>
-<component id="lcapp" name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="/app/location/locationcentre/lcapp/group"/>
-</component>
-<component id="locationcentre_build" filter="s60" name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="/app/location/locationcentre/group"/>
-</component>
-</collection>
 </package>
 <package id="mmsharinguis" level="services" tech-domain="vc" name="Multimedia Sharing UIs" levels="base plugin if">
 <collection id="mmsharinguis_plat" name="Multimedia Sharing UIs Platform Interfaces" level="if">
@@ -9167,9 +9146,6 @@
 <component id="calcsoft" filter="s60" name="Calculator Application">
 <unit bldFile="/app/utils/extras/calcsoft/group"/>
 </component>
-<component id="converter" filter="s60" name="Unit Converter">
-<unit bldFile="/app/utils/extras/converter/group"/>
-</component>
 </collection>
 </package>
 <package id="contacts" level="apps" span="2" tech-domain="pr" name="Contacts Apps" levels="engine support services ui">
@@ -10361,65 +10337,7 @@
 </component>
 </collection>
 </package>
-<package id="videoeditor" level="apps" tech-domain="ma" name="Video Editor Apps" levels="engine ui">
-<collection id="videoeditor_plat" filter="s60" name="Video Editor Apps Platform Interfaces" level="ui">
-<component id="video_editor_engine_api" name="Video Editor Engine API" class="api" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection id="videditor" name="Video Editor" level="ui">
-<component id="videoeditorcommon" filter="s60" name="Video Editor Common" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component id="videoeditoruicomponents" filter="s60" name="Video Editor UI Components" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component id="simplevideoeditor" filter="s60" name="Simple Video Editor" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component id="simplecutvideo" filter="s60" name="Simple Cut Video" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component id="videoprovider" filter="s60" name="Video Provider" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component id="manualvideoeditor" filter="s60" name="Manual Video Editor" introduced="^2">
-<!--  uncomment when supported
-      	<meta rel="config">
-      		<defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
-      	</meta>
-        <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component id="videditor_build" filter="s60" name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="/app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection id="videoeditorengine" name="Video Editor Engine" level="engine">
-<component id="audioeditorengine" filter="s60" name="Audio Editor Engine" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component id="avcedit" filter="s60" name="AVC Editing" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component id="h263decoder" filter="s60" name="H.263 Decoder" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component id="mp3aacmaniplib" filter="s60" name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component id="vedtranscoder" filter="s60" name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component id="vedengine" filter="s60" name="Video Editor Engine" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component id="videoeditorengine_build" filter="s60" name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="/app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</package>
+<!-- <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/> -->
 <package id="videoplayer" level="apps" tech-domain="ma" name="Video Player Apps" levels="support plugin util apps">
 <collection id="videoplayer_plat" name="Video Player Apps Platform Interfaces" level="apps">
 <component id="videoplayer_startup_api" name="Video Player Startup API" class="api" filter="s60">
@@ -10768,7 +10686,6 @@
 </component>
 </collection>
 </package>
-<package id="internetradio" level="apps" tech-domain="ma" name="Internet Radio Apps"/>
 <package id="podcatcher" level="apps" tech-domain="ma" name="Podcatcher" levels="app">
 <collection id="podcatcher_info" name="Podcatcher" level="app">
 <component id="podcatcher_build" filter="sf_build" name="Podcatcher Build" introduced="^3">
@@ -10776,7 +10693,6 @@
 </component>
 </collection>
 </package>
-<package id="tv" level="services" tech-domain="ma" name="TV Apps"/>
 <package id="voicerec" level="apps" tech-domain="ma" name="Voice Recorder Apps">
 <!-- custom filter pref_test-->
 <collection id="voicerec_plat" name="Voice Recorder Apps Platform Interfaces">
@@ -11306,9 +11222,6 @@
 </component>
 </collection>
 <collection id="htiui" name="Harmonized Test Interface UI" level="generic">
-<component id="HtiCommPlugins" filter="s60" name="HTI Comm Plugins" purpose="development" target="device" class="plugin">
-<unit bldFile="/app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
 <component id="HtiServicePlugins" filter="s60" name="HTI Service Plugins" purpose="development" target="device" class="plugin">
 <!-- can only have a single unit. Should #include from a common bld.inf file -->
 <unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
--- a/symbian3/single/sysdefs/sf3.svg	Fri May 28 17:31:40 2010 +0100
+++ b/symbian3/single/sysdefs/sf3.svg	Sun May 30 16:37:01 2010 +0100
@@ -426,8 +426,8 @@
  <g id="os" transform="translate(3.1999999999999993 404.06)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="231.26000000000002"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="231.26000000000002" height="9.3" x="-115.93">OS</text>
-  <g class="layer-detail" transform="translate(496.09999999999974 3.2)">
-   <rect x="-483.2999999999997" class="layer" y="-3.2" width="5072.699999999998" height="231.26000000000002"/>
+  <g class="layer-detail" transform="translate(491.4500000000001 3.2)">
+   <rect x="-478.6500000000001" class="layer" y="-3.2" width="5072.699999999998" height="231.26000000000002"/>
    <g>
     <g id="kernelhwsrv" class="package" transform="translate( 0 123.43000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
@@ -4381,8 +4381,8 @@
     </g>
     <g id="imagingext" class="package" transform="translate( 3364.799999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="94.2" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="94.2" x="47.1" y="119.23000000000002">Imaging Exten­sions</text>
+     <rect class="package" x="0" width="103.49999999999999" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="103.49999999999999" x="51.74999999999999" y="119.23000000000002">Imaging Exten­sions</text>
      <g transform="translate(0 3.2)">
       <g id="imagingext_pub" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -4396,8 +4396,8 @@
        </g>
       </g>
       <g id="imagingext_plat" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Imaging Ext. Platform Inter­faces</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Imaging Ext. Platform Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="jpeg2000_icl_plugin_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -4429,9 +4429,14 @@
          <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">ECam Face Tracking Custom API</text>
         </g>
-       </g>
-      </g>
-      <g id="imageadaptationextensions" transform="translate(75.6 0)" class="collection">
+        <g id="ecam_use_case_hint_custom_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">ECam Use Case Hint Custom API</text>
+        </g>
+       </g>
+      </g>
+      <g id="imageadaptationextensions" transform="translate(84.89999999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Image Adapt. Ext.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4465,7 +4470,7 @@
       </g>
      </g>
     </g>
-    <g id="graphics" class="package" transform="translate( 3461.099999999999 0)">
+    <g id="graphics" class="package" transform="translate( 3470.3999999999987 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="113.1" height="120.23000000000002" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="113.1" x="56.55" y="119.23000000000002">Graphics</text>
@@ -4765,7 +4770,7 @@
       </g>
      </g>
     </g>
-    <g id="textandloc" class="package" transform="translate( 3576.299999999999 0)">
+    <g id="textandloc" class="package" transform="translate( 3585.5999999999985 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="84" height="120.23000000000002" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="84" x="42" y="119.23000000000002">Text &amp; Localis­ation Services</text>
@@ -4958,7 +4963,7 @@
       </g>
      </g>
     </g>
-    <g id="xmlsrv" class="package" transform="translate( 3662.3999999999987 0)">
+    <g id="xmlsrv" class="package" transform="translate( 3671.6999999999985 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="65.1" height="120.23000000000002" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="65.1" x="32.55" y="119.23000000000002">XML Services</text>
@@ -5073,7 +5078,7 @@
       </g>
      </g>
     </g>
-    <g id="deviceplatformrelease" class="package" transform="translate( 3729.5999999999985 0)">
+    <g id="deviceplatformrelease" class="package" transform="translate( 3738.8999999999983 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="215.10000000000002" height="120.23000000000002" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="215.10000000000002" x="107.55000000000001" y="119.23000000000002">Dev­ice Platform Release</text>
@@ -5296,7 +5301,7 @@
       </g>
      </g>
     </g>
-    <g id="osrndtools" class="package" transform="translate( 3946.7999999999984 0)">
+    <g id="osrndtools" class="package" transform="translate( 3956.099999999998 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="159.29999999999998" height="120.23000000000002" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="159.29999999999998" x="79.64999999999999" y="119.23000000000002">OS R&amp;D tools</text>
@@ -8669,7 +8674,7 @@
         <g id="presence_avabilitytext" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Presence Avability Text</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Presence Availbility Text</text>
         </g>
        </g>
       </g>
@@ -8685,8 +8690,8 @@
        </g>
       </g>
       <g id="imservices" transform="translate(0 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">IM Services</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">IM Services</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="imfeatureplugin" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -8708,15 +8713,10 @@
          <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">XMPP Settings Fetcher</text>
         </g>
-        <g id="ossprotocoladaptation" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">OSS Protocol Adapt.</text>
-        </g>
         <g id="instantmessagingcache" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Instant Msg. Cache</text>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Instant Msg. Cache</text>
         </g>
        </g>
       </g>
@@ -14808,24 +14808,18 @@
  <g id="app" transform="translate(3.1999999999999993 0)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="174.86"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="174.86" height="9.3" x="-87.73">Applications</text>
-  <g class="layer-detail" transform="translate(746.8999999999987 3.2)">
-   <rect x="-734.0999999999988" class="layer" y="-3.2" width="5072.699999999998" height="174.86"/>
+  <g class="layer-detail" transform="translate(832.6999999999987 3.2)">
+   <rect x="-819.8999999999987" class="layer" y="-3.2" width="5072.699999999998" height="174.86"/>
    <g>
     <g id="location" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
-     <rect class="package" x="0" width="113.69999999999999" height="82.63000000000001" y="0" style="fill:whitesmoke;"/>
-     <text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="81.63000000000001">Location Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="loc_plat" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Location Apps Platform Interfaces</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="location_centre_api" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Location Centre API</text>
-        </g>
-       </g>
+     <rect class="package" x="0" width="107.1" height="82.63000000000001" y="0" style="fill:whitesmoke;"/>
+     <text text-anchor="middle" class="package" width="107.1" x="53.55" y="81.63000000000001">Location Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="loc_plat" transform="translate(0 0)" class="collection placeholder">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Apps Platform Interfaces</text>
+       <g transform="translate(0 6.299999999999999)"/>
       </g>
       <g id="loc_pub" transform="translate(17.7 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
@@ -14991,37 +14985,6 @@
         </g>
        </g>
       </g>
-      <g id="locationcentre" transform="translate(67.19999999999999 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Location Centre</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="lcutils" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Location Centre Utilities</text>
-        </g>
-        <g id="lcservice" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Location Centre Service Project</text>
-        </g>
-        <g id="lcserver" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Location Centre Server Project</text>
-        </g>
-        <g id="lcapp" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Location Centre Application</text>
-        </g>
-        <g id="locationcentre_build" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Location Centre Build</text>
-        </g>
-       </g>
-      </g>
      </g>
     </g>
     <g id="mmsharinguis" class="package" transform="translate( 0 85.83000000000001)">
@@ -15135,7 +15098,7 @@
       </g>
      </g>
     </g>
-    <g id="phone" class="package" transform="translate( 115.79999999999998 0)">
+    <g id="phone" class="package" transform="translate( 109.19999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
      <rect class="package" x="0" width="243.9" height="168.46" y="0" style="fill:darkkhaki;"/>
      <text text-anchor="middle" class="package" width="243.9" x="121.95" y="167.46">Phone Apps</text>
@@ -15398,7 +15361,7 @@
       </g>
      </g>
     </g>
-    <g id="videotelephony" class="package" transform="translate( 361.8 0)">
+    <g id="videotelephony" class="package" transform="translate( 355.20000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
      <rect class="package" x="0" width="36.300000000000004" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
      <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="81.63000000000001">Video Telephony Apps</text>
@@ -15475,7 +15438,7 @@
       </g>
      </g>
     </g>
-    <g id="iptelephony" class="package" transform="translate( 400.20000000000005 0)">
+    <g id="iptelephony" class="package" transform="translate( 393.6 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
      <rect class="package" x="0" width="113.69999999999999" height="82.63000000000001" y="0" style="fill:darkkhaki;"/>
      <text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="81.63000000000001">IP Telephony</text>
@@ -15699,7 +15662,7 @@
       </g>
      </g>
     </g>
-    <g id="settingsuis" class="package" transform="translate( 361.8 85.83000000000001)">
+    <g id="settingsuis" class="package" transform="translate( 355.20000000000005 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="46.5" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="46.5" x="23.25" y="81.63000000000002">Settings UIs</text>
@@ -15764,7 +15727,7 @@
       </g>
      </g>
     </g>
-    <g id="contentcontrol" class="package" transform="translate( 410.40000000000003 85.83000000000001)">
+    <g id="contentcontrol" class="package" transform="translate( 403.80000000000007 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="67.19999999999999" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="81.63000000000002">Content Control Daemons</text>
@@ -15829,7 +15792,7 @@
       </g>
      </g>
     </g>
-    <g id="devicecontrol" class="package" transform="translate( 479.70000000000005 85.83000000000001)">
+    <g id="devicecontrol" class="package" transform="translate( 473.1 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="113.69999999999999" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="81.63000000000002">Dev­ice Control Daemons</text>
@@ -16002,7 +15965,7 @@
       </g>
      </g>
     </g>
-    <g id="printing" class="package" transform="translate( 595.5 85.83000000000001)">
+    <g id="printing" class="package" transform="translate( 588.9 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="67.2" height="82.63000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="67.2" x="33.6" y="81.63000000000002">Printing</text>
@@ -16056,7 +16019,7 @@
       </g>
      </g>
     </g>
-    <g id="files" class="package" transform="translate( 516 0)">
+    <g id="files" class="package" transform="translate( 509.4 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="76.5" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="76.5" x="38.25" y="81.63000000000001">File Manager Apps</text>
@@ -16137,14 +16100,14 @@
       </g>
      </g>
     </g>
-    <g id="utils" class="package" transform="translate( 594.6 0)">
+    <g id="utils" class="package" transform="translate( 588 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Utility Apps</text>
      <g transform="translate(0 3.2)">
       <g id="extras" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Extras</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Extras</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="about" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -16156,16 +16119,11 @@
          <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Calculator App</text>
         </g>
-        <g id="converter" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Unit Converter</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="contacts" class="package" transform="translate( 664.8 0)">
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="contacts" class="package" transform="translate( 658.1999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="569.7000000000004" height="168.46" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="569.7000000000004" x="284.8500000000002" y="167.46">Contacts Apps</text>
@@ -16627,7 +16585,7 @@
       </g>
      </g>
     </g>
-    <g id="organizer" class="package" transform="translate( 1236.6000000000004 0)">
+    <g id="organizer" class="package" transform="translate( 1230.0000000000002 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="311.40000000000003" height="168.46" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="311.40000000000003" x="155.70000000000002" y="167.46">Organizer App Suite</text>
@@ -17100,7 +17058,7 @@
       </g>
      </g>
     </g>
-    <g id="messaging" class="package" transform="translate( 1550.1000000000004 0)">
+    <g id="messaging" class="package" transform="translate( 1543.5000000000002 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="356.7000000000001" height="168.46" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="356.7000000000001" x="178.35000000000005" y="167.46">Messag­ing Apps</text>
@@ -17522,7 +17480,7 @@
       </g>
      </g>
     </g>
-    <g id="commonemail" class="package" transform="translate( 1908.9000000000005 0)">
+    <g id="commonemail" class="package" transform="translate( 1902.3000000000004 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="158.10000000000002" height="168.46" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="158.10000000000002" x="79.05000000000001" y="167.46">Email Apps</text>
@@ -17785,7 +17743,7 @@
       </g>
      </g>
     </g>
-    <g id="conversations" class="package" transform="translate( 2069.1000000000004 0)">
+    <g id="conversations" class="package" transform="translate( 2062.5000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="142.8" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="142.8" x="71.4" y="81.63000000000001">Conversa­tion Apps</text>
@@ -17961,7 +17919,7 @@
       </g>
      </g>
     </g>
-    <g id="im" class="package" transform="translate( 2214.0000000000005 0)">
+    <g id="im" class="package" transform="translate( 2207.4000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Instant Msg. Apps</text>
@@ -17990,7 +17948,7 @@
       </g>
      </g>
     </g>
-    <g id="dictionary" class="package" transform="translate( 2069.1000000000004 85.83000000000001)">
+    <g id="dictionary" class="package" transform="translate( 2062.5000000000005 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Dictio­nary</text>
@@ -18019,7 +17977,7 @@
       </g>
      </g>
     </g>
-    <g id="camera" class="package" transform="translate( 2244.0000000000005 0)">
+    <g id="camera" class="package" transform="translate( 2237.4000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="57.00000000000001" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="57.00000000000001" x="28.500000000000004" y="81.63000000000001">Camera Apps</text>
@@ -18063,7 +18021,7 @@
       </g>
      </g>
     </g>
-    <g id="imgeditor" class="package" transform="translate( 2303.1000000000004 0)">
+    <g id="imgeditor" class="package" transform="translate( 2296.5000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="122.99999999999999" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="122.99999999999999" x="61.49999999999999" y="81.63000000000001">Image Editor Apps</text>
@@ -18178,108 +18136,7 @@
       </g>
      </g>
     </g>
-    <g id="videoeditor" class="package" transform="translate( 2428.2000000000003 0)">
-     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="82.79999999999998" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="82.79999999999998" x="41.39999999999999" y="81.63000000000001">Video Editor Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="videoeditor_plat" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Video Editor Apps Platform Inter­faces</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="video_editor_engine_api" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Editor Engine API</text>
-        </g>
-       </g>
-      </g>
-      <g id="videditor" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Video Editor</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="videoeditorcommon" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Editor Common</text>
-        </g>
-        <g id="videoeditoruicomponents" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Video Editor UI Cmp.</text>
-        </g>
-        <g id="simplevideoeditor" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Simple Video Editor</text>
-        </g>
-        <g id="simplecutvideo" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Simple Cut Video</text>
-        </g>
-        <g id="videoprovider" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Video Provider</text>
-        </g>
-        <g id="manualvideoeditor" class="component placeholder">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="46.5" y="0" style="fill:url(#PatternOverlay1); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Manual Video Editor</text>
-        </g>
-        <g id="videditor_build" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Video Editor Build</text>
-        </g>
-       </g>
-      </g>
-      <g id="videoeditorengine" transform="translate(0 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Video Editor Engine</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="audioeditorengine" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Audio Editor Engine</text>
-        </g>
-        <g id="avcedit" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">AVC Editing</text>
-        </g>
-        <g id="h263decoder" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">H.263 Decoder</text>
-        </g>
-        <g id="mp3aacmaniplib" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">MP3 &amp; AAC Manipulation Library</text>
-        </g>
-        <g id="vedtranscoder" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Video Editor Transcoder</text>
-        </g>
-        <g id="vedengine" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Video Editor Engine</text>
-        </g>
-        <g id="videoeditorengine_build" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Video Editor Engine Build</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="videoplayer" class="package" transform="translate( 2513.1000000000004 0)">
+    <g id="videoplayer" class="package" transform="translate( 2421.6000000000004 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="206.70000000000002" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="206.70000000000002" x="103.35000000000001" y="81.63000000000001">Video Player Apps</text>
@@ -18509,7 +18366,7 @@
       </g>
      </g>
     </g>
-    <g id="photos" class="package" transform="translate( 2721.9000000000005 0)">
+    <g id="photos" class="package" transform="translate( 2630.4000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="178.79999999999998" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="178.79999999999998" x="89.39999999999999" y="81.63000000000001">Photos</text>
@@ -18623,7 +18480,7 @@
       </g>
      </g>
     </g>
-    <g id="musicplayer" class="package" transform="translate( 2902.8000000000006 0)">
+    <g id="musicplayer" class="package" transform="translate( 2811.3000000000006 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="159.29999999999998" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="159.29999999999998" x="79.64999999999999" y="81.63000000000001">Music Player Apps</text>
@@ -18790,7 +18647,7 @@
       </g>
      </g>
     </g>
-    <g id="radio" class="package" transform="translate( 3064.2000000000007 0)">
+    <g id="radio" class="package" transform="translate( 2972.7000000000007 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="65.1" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="65.1" x="32.55" y="81.63000000000001">Radio Apps</text>
@@ -18838,13 +18695,7 @@
       </g>
      </g>
     </g>
-    <g id="internetradio" class="package placeholder" transform="translate( 3131.4000000000005 0)">
-     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="78" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000005" dy="0.375em" height="15.600000000000001">Internet Radio Apps</text>
-     <g transform="translate(0 3.2)"/>
-    </g>
-    <g id="podcatcher" class="package" transform="translate( 3211.5000000000005 0)">
+    <g id="podcatcher" class="package" transform="translate( 3039.9000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Podcatcher</text>
@@ -18862,13 +18713,7 @@
       </g>
      </g>
     </g>
-    <g id="tv" class="package placeholder" transform="translate( 2104.5000000000005 85.83000000000001)">
-     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="78" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000026" dy="0.375em" height="15.600000000000001">TV Apps</text>
-     <g transform="translate(0 3.2)"/>
-    </g>
-    <g id="voicerec" class="package" transform="translate( 3241.5000000000005 0)">
+    <g id="voicerec" class="package" transform="translate( 3069.9000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="54.00000000000001" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="54.00000000000001" x="27.000000000000004" y="81.63000000000001">Voice Recorder Apps</text>
@@ -18907,7 +18752,7 @@
       </g>
      </g>
     </g>
-    <g id="screensaver" class="package" transform="translate( 3297.6000000000004 0)">
+    <g id="screensaver" class="package" transform="translate( 3126.0000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Screen Saver Apps</text>
@@ -18949,7 +18794,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreen" class="package" transform="translate( 3327.6000000000004 0)">
+    <g id="homescreen" class="package" transform="translate( 3156.0000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="122.99999999999999" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="122.99999999999999" x="61.49999999999999" y="81.63000000000001">Home Screen Apps</text>
@@ -19075,7 +18920,7 @@
       </g>
      </g>
     </g>
-    <g id="graphicsuis" class="package" transform="translate( 2184.6000000000004 85.83000000000001)">
+    <g id="graphicsuis" class="package" transform="translate( 2097.9000000000005 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="45.6" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="45.6" x="22.8" y="81.63000000000002">Graphics UIs</text>
@@ -19114,7 +18959,7 @@
       </g>
      </g>
     </g>
-    <g id="profile" class="package" transform="translate( 3452.7000000000003 0)">
+    <g id="profile" class="package" transform="translate( 3281.1000000000004 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Profiles</text>
@@ -19154,7 +18999,7 @@
       </g>
      </g>
     </g>
-    <g id="speechsrv" class="package" transform="translate( 2232.3 85.83000000000001)">
+    <g id="speechsrv" class="package" transform="translate( 2145.6000000000004 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="326.70000000000016" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="326.70000000000016" x="163.35000000000008" y="81.63000000000002">Speech Recog­nition UIs</text>
@@ -19455,7 +19300,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreentools" class="package" transform="translate( 2561.1000000000004 85.83000000000001)">
+    <g id="homescreentools" class="package" transform="translate( 2474.4000000000005 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="54" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="54" x="27" y="81.63000000000002">Home Screen Tools</text>
@@ -19500,7 +19345,7 @@
       </g>
      </g>
     </g>
-    <g id="webuis" class="package" transform="translate( 2617.2000000000003 85.83000000000001)">
+    <g id="webuis" class="package" transform="translate( 2530.5000000000005 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="67.2" height="82.63000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="67.2" x="33.6" y="81.63000000000002">Web UIs</text>
@@ -19577,7 +19422,7 @@
       </g>
      </g>
     </g>
-    <g id="jrt" class="package" transform="translate( 2686.5000000000005 85.83000000000001)">
+    <g id="jrt" class="package" transform="translate( 2599.8000000000006 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Java Runtime</text>
@@ -19616,7 +19461,7 @@
       </g>
      </g>
     </g>
-    <g id="conntools" class="package" transform="translate( 2716.5000000000005 85.83000000000001)">
+    <g id="conntools" class="package" transform="translate( 2629.8000000000006 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Connect­ivity Tools</text>
@@ -19647,10 +19492,10 @@
       </g>
      </g>
     </g>
-    <g id="rndtools" class="package" transform="translate( 2746.5000000000005 85.83000000000001)">
+    <g id="rndtools" class="package" transform="translate( 2659.8000000000006 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-     <rect class="package" x="0" width="91.2" height="82.63000000000001" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="91.2" x="45.6" y="81.63000000000002">R&amp;D tools</text>
+     <rect class="package" x="0" width="81.9" height="82.63000000000001" y="0" style="fill:darkgray;"/>
+     <text text-anchor="middle" class="package" width="81.9" x="40.95" y="81.63000000000002">R&amp;D tools</text>
      <g transform="translate(0 3.2)">
       <g id="creator" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -19763,50 +19608,44 @@
        </g>
       </g>
       <g id="htiui" transform="translate(35.4 37.6)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Harmonized Test Inter­face UI</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="HtiCommPlugins" class="component">
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Harmonized Test Inter­face UI</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="HtiServicePlugins" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="0" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
          <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">HTI Comm Plugins</text>
-        </g>
-        <g id="HtiServicePlugins" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">HTI Service Plugins</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">HTI Service Plugins</text>
         </g>
         <g id="htidevicereboot" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">HTI Dev­ice Reboot</text>
+        </g>
+        <g id="htistartupwait" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
          <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">HTI Dev­ice Reboot</text>
-        </g>
-        <g id="htistartupwait" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">HTI Startup Wait</text>
+        </g>
+        <g id="htiadmin" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
          <use width="9.3" height="9.3" x="27.900000000000002" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">HTI Startup Wait</text>
-        </g>
-        <g id="htiadmin" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">HTI Admin</text>
+        </g>
+        <g id="htiui_build" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
          <use width="9.3" height="9.3" x="37.2" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">HTI Admin</text>
-        </g>
-        <g id="htiui_build" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="46.5" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">HTI UI Build</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="helps" class="package" transform="translate( 3505.8 0)">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">HTI UI Build</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="helps" class="package" transform="translate( 3334.2000000000003 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="168.46" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="167.46">Help Apps</text>
@@ -19847,7 +19686,7 @@
       </g>
      </g>
     </g>
-    <g id="techview" class="package" transform="translate( 3535.8 0)">
+    <g id="techview" class="package" transform="translate( 3364.2000000000003 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="68.7" height="168.46" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="167.46">Techview</text>
@@ -20013,7 +19852,7 @@
       </g>
       <g id="s8-color9">
        <rect class="cbox" height="3.1" width="15.5" fill="#ffff00" x="77" y="3.1"/>
-       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="84.75" y="4.65">Multimedia Apps (11)</text>
+       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="84.75" y="4.65">Multimedia Apps (8)</text>
       </g>
       <g id="s8-color10">
        <rect class="cbox" height="3.1" width="15.5" fill="orange" x="15" y="6.2"/>
@@ -20062,7 +19901,7 @@
       <g id="s4-overlay0" class="cmp placeholder">
        <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:grey;stroke-width: 0.5;"/>
        <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-       <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test Compo­nent (168)</text>
+       <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test Compo­nent (167)</text>
       </g>
      </g>
     </g>
@@ -20095,9 +19934,9 @@
      </g>
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="265.17499999999995" y="4.65">
-     <tspan dy="-1em" x="265.17499999999995">110 Packages</tspan>
-     <tspan dy="1em" x="265.17499999999995">662 Collections</tspan>
-     <tspan dy="1em" x="265.17499999999995">2905 Components</tspan>
+     <tspan dy="-1em" x="265.17499999999995">107 Packages</tspan>
+     <tspan dy="1em" x="265.17499999999995">658 Collections</tspan>
+     <tspan dy="1em" x="265.17499999999995">2882 Components</tspan>
     </text>
    </g>
   </g>
--- a/symbian3/single/sysdefs/sf3c.svg	Fri May 28 17:31:40 2010 +0100
+++ b/symbian3/single/sysdefs/sf3c.svg	Sun May 30 16:37:01 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?AdobeSVGViewer resolution="600"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 1400.8999999999999 690.4687448452171" class="collection-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 1333.1000000000004 688.4144807681579" class="collection-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
  <title>Symbian OS ^3 System Model: date</title>
  <defs>
   <style type="text/css">
@@ -431,8 +431,8 @@
  <g id="os" transform="translate(3.1999999999999993 404.06)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="231.26000000000002"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="231.26000000000002" height="9.3" x="-115.93">OS</text>
-  <g class="layer-detail" transform="translate(77.44999999999997 3.2)">
-   <rect x="-64.64999999999998" class="layer" y="-3.2" width="1378.4999999999998" height="231.26000000000002"/>
+  <g class="layer-detail" transform="translate(43.550000000000225 3.2)">
+   <rect x="-30.750000000000227" class="layer" y="-3.2" width="1310.7000000000003" height="231.26000000000002"/>
    <g>
     <g id="kernelhwsrv" class="package" transform="translate( 0 123.43000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
@@ -1512,8 +1512,8 @@
  <g id="mw" transform="translate(3.1999999999999993 178.06)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">Middleware</text>
-  <g class="layer-detail" transform="translate(46.69999999999975 3.2)">
-   <rect x="-33.89999999999975" class="layer" y="-3.2" width="1378.4999999999998" height="222.8"/>
+  <g class="layer-detail" transform="translate(12.8 3.2)">
+   <rect x="0" class="layer" y="-3.2" width="1310.7000000000003" height="222.8"/>
    <g>
     <g id="appsupport" class="package" transform="translate( 0 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
@@ -3302,15 +3302,15 @@
  <g id="app" transform="translate(3.1999999999999993 0)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="174.86"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="174.86" height="9.3" x="-87.73">Applications</text>
-  <g class="layer-detail" transform="translate(12.8 3.2)">
-   <rect x="0" class="layer" y="-3.2" width="1378.4999999999998" height="174.86"/>
+  <g class="layer-detail" transform="translate(36.65000000000025 3.2)">
+   <rect x="-23.85000000000025" class="layer" y="-3.2" width="1310.7000000000003" height="174.86"/>
    <g>
     <g id="location" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
      <rect class="package" x="0" width="104.1" height="82.63000000000001" y="0" style="fill:whitesmoke;"/>
      <text text-anchor="middle" class="package" width="104.1" x="52.05" y="81.63000000000001">Location Apps</text>
      <g transform="translate(0 3.2)">
-      <g id="loc_plat" transform="translate(0 0)" class="collection">
+      <g id="loc_plat" transform="translate(0 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Apps Platform Interfaces</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -3360,11 +3360,6 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Map &amp; Nav Provider Ref App</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="locationcentre" transform="translate(17.7 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Centre</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
      </g>
     </g>
     <g id="mmsharinguis" class="package" transform="translate( 0 85.83000000000001)">
@@ -4005,29 +4000,7 @@
       </g>
      </g>
     </g>
-    <g id="videoeditor" class="package" transform="translate( 808.8 0)">
-     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Video Editor Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="videoeditor_plat" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Editor Apps Platform Inter­faces</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="videditor" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Editor</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="videoeditorengine" transform="translate(0 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Video Editor Engine</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="videoplayer" class="package" transform="translate( 844.1999999999999 0)">
+    <g id="videoplayer" class="package" transform="translate( 808.8 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Video Player Apps</text>
@@ -4069,7 +4042,7 @@
       </g>
      </g>
     </g>
-    <g id="photos" class="package" transform="translate( 879.5999999999999 0)">
+    <g id="photos" class="package" transform="translate( 844.1999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Photos</text>
@@ -4086,7 +4059,7 @@
       </g>
      </g>
     </g>
-    <g id="musicplayer" class="package" transform="translate( 914.9999999999999 0)">
+    <g id="musicplayer" class="package" transform="translate( 879.5999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Music Player Apps</text>
@@ -4118,7 +4091,7 @@
       </g>
      </g>
     </g>
-    <g id="radio" class="package" transform="translate( 968.0999999999999 0)">
+    <g id="radio" class="package" transform="translate( 932.6999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Radio Apps</text>
@@ -4130,13 +4103,7 @@
       </g>
      </g>
     </g>
-    <g id="internetradio" class="package placeholder" transform="translate( 998.0999999999999 0)">
-     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="78" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000005" dy="0.375em" height="15.600000000000001">Internet Radio Apps</text>
-     <g transform="translate(0 3.2)"/>
-    </g>
-    <g id="podcatcher" class="package" transform="translate( 1078.1999999999998 0)">
+    <g id="podcatcher" class="package" transform="translate( 962.6999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Podcatcher</text>
@@ -4148,13 +4115,7 @@
       </g>
      </g>
     </g>
-    <g id="tv" class="package placeholder" transform="translate( 654.9 85.83000000000001)">
-     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="78" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000026" dy="0.375em" height="15.600000000000001">TV Apps</text>
-     <g transform="translate(0 3.2)"/>
-    </g>
-    <g id="voicerec" class="package" transform="translate( 1108.1999999999998 0)">
+    <g id="voicerec" class="package" transform="translate( 992.6999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Voice Recorder Apps</text>
@@ -4176,7 +4137,7 @@
       </g>
      </g>
     </g>
-    <g id="screensaver" class="package" transform="translate( 1161.2999999999997 0)">
+    <g id="screensaver" class="package" transform="translate( 1045.7999999999997 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Screen Saver Apps</text>
@@ -4193,7 +4154,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreen" class="package" transform="translate( 1191.2999999999997 0)">
+    <g id="homescreen" class="package" transform="translate( 1075.7999999999997 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000001">Home Screen Apps</text>
@@ -4220,7 +4181,7 @@
       </g>
      </g>
     </g>
-    <g id="graphicsuis" class="package" transform="translate( 735 85.83000000000001)">
+    <g id="graphicsuis" class="package" transform="translate( 654.9 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Graphics UIs</text>
@@ -4237,7 +4198,7 @@
       </g>
      </g>
     </g>
-    <g id="profile" class="package" transform="translate( 1226.6999999999998 0)">
+    <g id="profile" class="package" transform="translate( 1111.1999999999998 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Profiles</text>
@@ -4259,7 +4220,7 @@
       </g>
      </g>
     </g>
-    <g id="speechsrv" class="package" transform="translate( 770.4 85.83000000000001)">
+    <g id="speechsrv" class="package" transform="translate( 690.3 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000002">Speech Recog­nition UIs</text>
@@ -4286,7 +4247,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreentools" class="package" transform="translate( 823.5 85.83000000000001)">
+    <g id="homescreentools" class="package" transform="translate( 743.4 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000002">Home Screen Tools</text>
@@ -4308,7 +4269,7 @@
       </g>
      </g>
     </g>
-    <g id="webuis" class="package" transform="translate( 876.6 85.83000000000001)">
+    <g id="webuis" class="package" transform="translate( 796.5 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Web UIs</text>
@@ -4330,7 +4291,7 @@
       </g>
      </g>
     </g>
-    <g id="jrt" class="package" transform="translate( 912 85.83000000000001)">
+    <g id="jrt" class="package" transform="translate( 831.9 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Java Runtime</text>
@@ -4347,7 +4308,7 @@
       </g>
      </g>
     </g>
-    <g id="conntools" class="package" transform="translate( 942 85.83000000000001)">
+    <g id="conntools" class="package" transform="translate( 861.9 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Connect­ivity Tools</text>
@@ -4364,7 +4325,7 @@
       </g>
      </g>
     </g>
-    <g id="rndtools" class="package" transform="translate( 972 85.83000000000001)">
+    <g id="rndtools" class="package" transform="translate( 891.9 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000002">R&amp;D tools</text>
@@ -4416,7 +4377,7 @@
       </g>
      </g>
     </g>
-    <g id="helps" class="package" transform="translate( 1279.7999999999997 0)">
+    <g id="helps" class="package" transform="translate( 1164.2999999999997 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="168.46" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="167.46">Help Apps</text>
@@ -4438,7 +4399,7 @@
       </g>
      </g>
     </g>
-    <g id="techview" class="package" transform="translate( 1309.7999999999997 0)">
+    <g id="techview" class="package" transform="translate( 1194.2999999999997 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="68.7" height="168.46" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="167.46">Techview</text>
@@ -4533,7 +4494,7 @@
    </g>
   </g>
  </g>
- <g id="legend-root" class="legend" transform="translate(1101.9795 641.7200000000001) translate(295.7205 0) scale(3.781137932608662) translate(-295.7205)">
+ <g id="legend-root" class="legend" transform="translate(1034.1795000000002 641.7200000000001) translate(295.7205 0) scale(3.5977214971569444) translate(-295.7205)">
   <text text-anchor="middle" class="title" x="279.38525000000004" y="0">
    <tspan dy="0.75em" x="279.38525000000004">Symbian OS ^3</tspan>
    <tspan dy="1em" x="279.38525000000004">System Model</tspan>
@@ -4584,7 +4545,7 @@
       </g>
       <g id="s8-color9">
        <rect class="cbox" height="3.1" width="15.5" fill="#ffff00" x="46" y="3.0999999999999996"/>
-       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="53.75" y="4.65">Multimedia Apps (11)</text>
+       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="53.75" y="4.65">Multimedia Apps (8)</text>
       </g>
       <g id="s8-color10">
        <rect class="cbox" height="3.1" width="15.5" fill="orange" x="61.5" y="3.0999999999999996"/>
@@ -4601,8 +4562,8 @@
      </g>
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="243.275" y="3.0999999999999996">
-     <tspan dy="-0.5em" x="243.275">110 Packages</tspan>
-     <tspan dy="1em" x="243.275">662 Collections</tspan>
+     <tspan dy="-0.5em" x="243.275">107 Packages</tspan>
+     <tspan dy="1em" x="243.275">658 Collections</tspan>
     </text>
    </g>
   </g>
--- a/symbian3/single/sysdefs/sf3lit.svg	Fri May 28 17:31:40 2010 +0100
+++ b/symbian3/single/sysdefs/sf3lit.svg	Sun May 30 16:37:01 2010 +0100
@@ -426,8 +426,8 @@
  <g id="os" transform="translate(3.1999999999999993 443.83000000000004)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="231.26000000000002"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="231.26000000000002" height="9.3" x="-115.93">OS</text>
-  <g class="layer-detail" transform="translate(545.9000000000008 3.2)">
-   <rect x="-533.1000000000008" class="layer" y="-3.2" width="4871.700000000001" height="231.26000000000002"/>
+  <g class="layer-detail" transform="translate(541.2500000000009 3.2)">
+   <rect x="-528.450000000001" class="layer" y="-3.2" width="4871.700000000001" height="231.26000000000002"/>
    <g>
     <g id="kernelhwsrv" class="package" transform="translate( 0 123.43000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
@@ -4106,8 +4106,8 @@
     </g>
     <g id="imagingext" class="package" transform="translate( 3266.699999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="91.19999999999999" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="91.19999999999999" x="45.599999999999994" y="119.23000000000002">Imaging Exten­sions</text>
+     <rect class="package" x="0" width="100.49999999999999" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="100.49999999999999" x="50.24999999999999" y="119.23000000000002">Imaging Exten­sions</text>
      <g transform="translate(0 3.2)">
       <g id="imagingext_pub" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -4121,8 +4121,8 @@
        </g>
       </g>
       <g id="imagingext_plat" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Imaging Ext. Platform Inter­faces</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Imaging Ext. Platform Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="jpeg2000_icl_plugin_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -4154,9 +4154,14 @@
          <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">ECam Face Tracking Custom API</text>
         </g>
-       </g>
-      </g>
-      <g id="imageadaptationextensions" transform="translate(75.6 0)" class="collection">
+        <g id="ecam_use_case_hint_custom_api" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">ECam Use Case Hint Custom API</text>
+        </g>
+       </g>
+      </g>
+      <g id="imageadaptationextensions" transform="translate(84.89999999999999 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Image Adapt. Ext.</text>
        <g transform="translate(0 6.299999999999999)">
@@ -4185,7 +4190,7 @@
       </g>
      </g>
     </g>
-    <g id="graphics" class="package" transform="translate( 3359.999999999999 0)">
+    <g id="graphics" class="package" transform="translate( 3369.299999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="95.4" height="120.23000000000002" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="95.4" x="47.7" y="119.23000000000002">Graphics</text>
@@ -4476,7 +4481,7 @@
       </g>
      </g>
     </g>
-    <g id="textandloc" class="package" transform="translate( 3457.499999999999 0)">
+    <g id="textandloc" class="package" transform="translate( 3466.799999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="84.9" height="120.23000000000002" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="84.9" x="42.45" y="119.23000000000002">Text &amp; Localis­ation Services</text>
@@ -4626,7 +4631,7 @@
       </g>
      </g>
     </g>
-    <g id="xmlsrv" class="package" transform="translate( 3544.499999999999 0)">
+    <g id="xmlsrv" class="package" transform="translate( 3553.799999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="65.1" height="120.23000000000002" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="65.1" x="32.55" y="119.23000000000002">XML Services</text>
@@ -4717,7 +4722,7 @@
       </g>
      </g>
     </g>
-    <g id="deviceplatformrelease" class="package" transform="translate( 3611.699999999999 0)">
+    <g id="deviceplatformrelease" class="package" transform="translate( 3620.9999999999986 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="119.23000000000002">Dev­ice Platform Release</text>
@@ -4822,7 +4827,7 @@
       </g>
      </g>
     </g>
-    <g id="osrndtools" class="package" transform="translate( 3664.799999999999 0)">
+    <g id="osrndtools" class="package" transform="translate( 3674.0999999999985 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="140.7" height="120.23000000000002" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="140.7" x="70.35" y="119.23000000000002">OS R&amp;D tools</text>
@@ -7934,7 +7939,7 @@
         <g id="presence_avabilitytext" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="232.5000000000001" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Presence Avability Text</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="237.15000000000012">Presence Availbility Text</text>
         </g>
        </g>
       </g>
@@ -7944,8 +7949,8 @@
        <g transform="translate(0 6.299999999999999)"/>
       </g>
       <g id="imservices" transform="translate(0 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">IM Services</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">IM Services</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="imfeatureplugin" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -7967,15 +7972,10 @@
          <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">XMPP Settings Fetcher</text>
         </g>
-        <g id="ossprotocoladaptation" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">OSS Protocol Adapt.</text>
-        </g>
         <g id="instantmessagingcache" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Instant Msg. Cache</text>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Instant Msg. Cache</text>
         </g>
        </g>
       </g>
@@ -13189,26 +13189,15 @@
  <g id="app" transform="translate(3.1999999999999993 25.2)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="189.43"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="189.43" height="9.3" x="-95.015">Applications</text>
-  <g class="layer-detail" transform="translate(784.8499999999992 3.2)">
-   <rect x="-772.0499999999993" class="layer" y="-3.2" width="4871.700000000001" height="189.43"/>
+  <g class="layer-detail" transform="translate(826.8499999999997 3.2)">
+   <rect x="-814.0499999999997" class="layer" y="-3.2" width="4871.700000000001" height="189.43"/>
    <g>
     <g id="location" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
-     <rect class="package" x="0" width="107.1" height="97.2" y="0" style="fill:whitesmoke;"/>
-     <text text-anchor="middle" class="package" width="107.1" x="53.55" y="96.2">Location Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="loc_plat" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Location Apps Platform Interfaces</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="location_centre_api" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Location Centre API</text>
-        </g>
-       </g>
-      </g>
-      <g id="loc_pub" transform="translate(17.7 0)" class="collection">
+     <rect class="package" x="0" width="89.4" height="97.2" y="0" style="fill:whitesmoke;"/>
+     <text text-anchor="middle" class="package" width="89.4" x="44.7" y="96.2">Location Apps</text>
+     <g transform="translate(0 3.2)">
+      <g id="loc_pub" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Location Apps Public Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
@@ -13307,17 +13296,17 @@
         </g>
        </g>
       </g>
-      <g id="locationlandmarksrefappfors60" transform="translate(38.400000000000006 0)" class="collection placeholder">
+      <g id="locationlandmarksrefappfors60" transform="translate(20.700000000000003 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Land­marks Ref App for S60</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="locationlandmarksuirefapp" transform="translate(56.10000000000001 0)" class="collection placeholder">
+      <g id="locationlandmarksuirefapp" transform="translate(38.400000000000006 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Land­marks UI Ref App</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="locationsatviewrefapp" transform="translate(73.80000000000001 0)" class="collection placeholder">
+      <g id="locationsatviewrefapp" transform="translate(56.10000000000001 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Location Satellite View Ref App</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -13327,37 +13316,11 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Simula­tion PSY Config­urator</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="mapnavproviderrefapp" transform="translate(91.5 0)" class="collection placeholder">
+      <g id="mapnavproviderrefapp" transform="translate(73.80000000000001 0)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Map &amp; Nav Provider Ref App</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="locationcentre" transform="translate(57.9 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Location Centre</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="lcutils" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Location Centre Utilities</text>
-        </g>
-        <g id="lcservice" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Location Centre Service Project</text>
-        </g>
-        <g id="lcserver" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Location Centre Server Project</text>
-        </g>
-        <g id="lcapp" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Location Centre Application</text>
-        </g>
-       </g>
-      </g>
      </g>
     </g>
     <g id="mmsharinguis" class="package" transform="translate( 0 100.4)">
@@ -13455,7 +13418,7 @@
       </g>
      </g>
     </g>
-    <g id="phone" class="package" transform="translate( 109.19999999999999 0)">
+    <g id="phone" class="package" transform="translate( 91.5 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
      <rect class="package" x="0" width="243.9" height="183.03" y="0" style="fill:darkkhaki;"/>
      <text text-anchor="middle" class="package" width="243.9" x="121.95" y="182.03">Phone Apps</text>
@@ -13718,7 +13681,7 @@
       </g>
      </g>
     </g>
-    <g id="videotelephony" class="package" transform="translate( 355.20000000000005 0)">
+    <g id="videotelephony" class="package" transform="translate( 337.5 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
      <rect class="package" x="0" width="36.300000000000004" height="97.2" y="0" style="fill:darkkhaki;"/>
      <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="96.2">Video Telephony Apps</text>
@@ -13789,7 +13752,7 @@
       </g>
      </g>
     </g>
-    <g id="iptelephony" class="package" transform="translate( 393.6 0)">
+    <g id="iptelephony" class="package" transform="translate( 375.9 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
      <rect class="package" x="0" width="110.69999999999997" height="97.2" y="0" style="fill:darkkhaki;"/>
      <text text-anchor="middle" class="package" width="65.09999999999997" x="78.14999999999999" y="86.2" dy="0.375em">IP Telephony</text>
@@ -13992,7 +13955,7 @@
       </g>
      </g>
     </g>
-    <g id="settingsuis" class="package" transform="translate( 355.20000000000005 100.4)">
+    <g id="settingsuis" class="package" transform="translate( 337.5 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="37.2" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="37.2" x="18.6" y="81.63000000000002">Settings UIs</text>
@@ -14052,7 +14015,7 @@
       </g>
      </g>
     </g>
-    <g id="contentcontrol" class="package" transform="translate( 394.50000000000006 100.4)">
+    <g id="contentcontrol" class="package" transform="translate( 376.8 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="67.19999999999999" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="81.63000000000002">Content Control Daemons</text>
@@ -14111,7 +14074,7 @@
       </g>
      </g>
     </g>
-    <g id="devicecontrol" class="package" transform="translate( 463.80000000000007 100.4)">
+    <g id="devicecontrol" class="package" transform="translate( 446.1 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="95.1" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="95.1" x="47.55" y="81.63000000000002">Dev­ice Control Daemons</text>
@@ -14269,7 +14232,7 @@
       </g>
      </g>
     </g>
-    <g id="printing" class="package" transform="translate( 561.0000000000001 100.4)">
+    <g id="printing" class="package" transform="translate( 543.3000000000001 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="57.900000000000006" height="82.63000000000001" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="57.900000000000006" x="28.950000000000003" y="81.63000000000002">Printing</text>
@@ -14318,7 +14281,7 @@
       </g>
      </g>
     </g>
-    <g id="files" class="package" transform="translate( 506.4 0)">
+    <g id="files" class="package" transform="translate( 488.69999999999993 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="67.19999999999999" height="97.2" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="96.2">File Manager Apps</text>
@@ -14388,14 +14351,14 @@
       </g>
      </g>
     </g>
-    <g id="utils" class="package" transform="translate( 575.6999999999999 0)">
+    <g id="utils" class="package" transform="translate( 557.9999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="97.2" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Utility Apps</text>
      <g transform="translate(0 3.2)">
       <g id="extras" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Extras</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Extras</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="about" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -14407,16 +14370,11 @@
          <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Calculator App</text>
         </g>
-        <g id="converter" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Unit Converter</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="contacts" class="package" transform="translate( 621.0000000000001 0)">
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="contacts" class="package" transform="translate( 603.3000000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="569.7000000000004" height="183.03" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="569.7000000000004" x="284.8500000000002" y="182.03">Contacts Apps</text>
@@ -14843,7 +14801,7 @@
       </g>
      </g>
     </g>
-    <g id="organizer" class="package" transform="translate( 1192.8000000000004 0)">
+    <g id="organizer" class="package" transform="translate( 1175.1000000000004 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="289.80000000000007" height="183.03" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="289.80000000000007" x="144.90000000000003" y="182.03">Organizer App Suite</text>
@@ -15259,7 +15217,7 @@
       </g>
      </g>
     </g>
-    <g id="messaging" class="package" transform="translate( 1484.7000000000005 0)">
+    <g id="messaging" class="package" transform="translate( 1467.0000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="356.7000000000001" height="183.03" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="356.7000000000001" x="178.35000000000005" y="182.03">Messag­ing Apps</text>
@@ -15604,7 +15562,7 @@
       </g>
      </g>
     </g>
-    <g id="commonemail" class="package" transform="translate( 1843.5000000000007 0)">
+    <g id="commonemail" class="package" transform="translate( 1825.8000000000006 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="148.8" height="183.03" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="148.8" x="74.4" y="182.03">Email Apps</text>
@@ -15828,7 +15786,7 @@
       </g>
      </g>
     </g>
-    <g id="conversations" class="package" transform="translate( 1994.4000000000008 0)">
+    <g id="conversations" class="package" transform="translate( 1976.7000000000007 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="106.50000000000001" height="97.2" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="106.50000000000001" x="53.25000000000001" y="96.2">Conversa­tion Apps</text>
@@ -15954,7 +15912,7 @@
       </g>
      </g>
     </g>
-    <g id="im" class="package" transform="translate( 2103.000000000001 0)">
+    <g id="im" class="package" transform="translate( 2085.3000000000006 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="97.2" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Instant Msg. Apps</text>
@@ -15977,7 +15935,7 @@
       </g>
      </g>
     </g>
-    <g id="dictionary" class="package" transform="translate( 1994.4000000000008 100.4)">
+    <g id="dictionary" class="package" transform="translate( 1976.7000000000007 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Dictio­nary</text>
@@ -16000,7 +15958,7 @@
       </g>
      </g>
     </g>
-    <g id="camera" class="package" transform="translate( 2133.000000000001 0)">
+    <g id="camera" class="package" transform="translate( 2115.3000000000006 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="39.300000000000004" height="97.2" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="39.300000000000004" x="19.650000000000002" y="96.2">Camera Apps</text>
@@ -16039,7 +15997,7 @@
       </g>
      </g>
     </g>
-    <g id="imgeditor" class="package" transform="translate( 2174.400000000001 0)">
+    <g id="imgeditor" class="package" transform="translate( 2156.7000000000007 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="113.69999999999999" height="97.2" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="96.2">Image Editor Apps</text>
@@ -16144,92 +16102,7 @@
       </g>
      </g>
     </g>
-    <g id="videoeditor" class="package" transform="translate( 2290.200000000001 0)">
-     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="64.2" height="97.2" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="64.2" x="32.1" y="96.2">Video Editor Apps</text>
-     <g transform="translate(0 3.2)">
-      <g id="videoeditor_plat" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Video Editor Apps Platform Inter­faces</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="video_editor_engine_api" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Editor Engine API</text>
-        </g>
-       </g>
-      </g>
-      <g id="videditor" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Video Editor</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="videoeditorcommon" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Editor Common</text>
-        </g>
-        <g id="videoeditoruicomponents" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Video Editor UI Cmp.</text>
-        </g>
-        <g id="simplevideoeditor" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Simple Video Editor</text>
-        </g>
-        <g id="simplecutvideo" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Simple Cut Video</text>
-        </g>
-        <g id="videoprovider" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Video Provider</text>
-        </g>
-       </g>
-      </g>
-      <g id="videoeditorengine" transform="translate(0 18.8)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Video Editor Engine</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="audioeditorengine" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Audio Editor Engine</text>
-        </g>
-        <g id="avcedit" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">AVC Editing</text>
-        </g>
-        <g id="h263decoder" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">H.263 Decoder</text>
-        </g>
-        <g id="mp3aacmaniplib" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">MP3 &amp; AAC Manipulation Library</text>
-        </g>
-        <g id="vedtranscoder" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Video Editor Transcoder</text>
-        </g>
-        <g id="vedengine" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Video Editor Engine</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="videoplayer" class="package" transform="translate( 2356.5000000000014 0)">
+    <g id="videoplayer" class="package" transform="translate( 2272.500000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="206.70000000000002" height="97.2" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="178.8" x="117.30000000000001" y="11" dy="0.375em">Video Player Apps</text>
@@ -16479,7 +16352,7 @@
       </g>
      </g>
     </g>
-    <g id="photos" class="package" transform="translate( 2565.3000000000015 0)">
+    <g id="photos" class="package" transform="translate( 2481.300000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="160.19999999999996" height="97.2" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="160.19999999999996" x="80.09999999999998" y="96.2">Photos</text>
@@ -16583,7 +16456,7 @@
       </g>
      </g>
     </g>
-    <g id="musicplayer" class="package" transform="translate( 2727.6000000000017 0)">
+    <g id="musicplayer" class="package" transform="translate( 2643.600000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="132.29999999999998" height="97.2" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="132.29999999999998" x="66.14999999999999" y="96.2">Music Player Apps</text>
@@ -16693,7 +16566,7 @@
       </g>
      </g>
     </g>
-    <g id="radio" class="package" transform="translate( 2862.000000000002 0)">
+    <g id="radio" class="package" transform="translate( 2778.000000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="55.8" height="97.2" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="55.8" x="27.9" y="96.2">Radio Apps</text>
@@ -16736,13 +16609,13 @@
       </g>
      </g>
     </g>
-    <g id="podcatcher" class="package placeholder" transform="translate( 2919.900000000002 0)">
+    <g id="podcatcher" class="package placeholder" transform="translate( 2835.900000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="97.2" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="15.600000000000001">Podcatcher</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="voicerec" class="package" transform="translate( 3000.000000000002 0)">
+    <g id="voicerec" class="package" transform="translate( 2916.000000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="36.300000000000004" height="97.2" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="96.2">Voice Recorder Apps</text>
@@ -16770,13 +16643,13 @@
       </g>
      </g>
     </g>
-    <g id="screensaver" class="package placeholder" transform="translate( 3038.400000000002 0)">
+    <g id="screensaver" class="package placeholder" transform="translate( 2954.400000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="97.2" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="45.03">Screen Saver Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="homescreen" class="package" transform="translate( 3118.500000000002 0)">
+    <g id="homescreen" class="package" transform="translate( 3034.500000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="113.69999999999999" height="97.2" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="96.2">Home Screen Apps</text>
@@ -16892,7 +16765,7 @@
       </g>
      </g>
     </g>
-    <g id="graphicsuis" class="package" transform="translate( 2029.8000000000009 100.4)">
+    <g id="graphicsuis" class="package" transform="translate( 2012.1000000000008 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="45.6" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="45.6" x="22.8" y="81.63000000000002">Graphics UIs</text>
@@ -16931,7 +16804,7 @@
       </g>
      </g>
     </g>
-    <g id="profile" class="package" transform="translate( 3234.300000000002 0)">
+    <g id="profile" class="package" transform="translate( 3150.300000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Profiles</text>
@@ -16965,7 +16838,7 @@
       </g>
      </g>
     </g>
-    <g id="speechsrv" class="package" transform="translate( 2077.500000000001 100.4)">
+    <g id="speechsrv" class="package" transform="translate( 2059.8000000000006 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="290.40000000000015" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="290.40000000000015" x="145.20000000000007" y="81.63000000000002">Speech Recog­nition UIs</text>
@@ -17245,7 +17118,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreentools" class="package" transform="translate( 2370.000000000001 100.4)">
+    <g id="homescreentools" class="package" transform="translate( 2352.3000000000006 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="54" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="54" x="27" y="81.63000000000002">Home Screen Tools</text>
@@ -17278,7 +17151,7 @@
       </g>
      </g>
     </g>
-    <g id="webuis" class="package" transform="translate( 2426.100000000001 100.4)">
+    <g id="webuis" class="package" transform="translate( 2408.4000000000005 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="36.300000000000004" height="82.63000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="81.63000000000002">Web UIs</text>
@@ -17333,7 +17206,7 @@
       </g>
      </g>
     </g>
-    <g id="jrt" class="package" transform="translate( 2464.500000000001 100.4)">
+    <g id="jrt" class="package" transform="translate( 2446.8000000000006 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Java Runtime</text>
@@ -17366,7 +17239,7 @@
       </g>
      </g>
     </g>
-    <g id="conntools" class="package" transform="translate( 2494.500000000001 100.4)">
+    <g id="conntools" class="package" transform="translate( 2476.8000000000006 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Connect­ivity Tools</text>
@@ -17390,10 +17263,10 @@
       </g>
      </g>
     </g>
-    <g id="rndtools" class="package" transform="translate( 2524.500000000001 100.4)">
+    <g id="rndtools" class="package" transform="translate( 2506.8000000000006 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-     <rect class="package" x="0" width="81.9" height="82.63000000000001" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="81.9" x="40.95" y="81.63000000000002">R&amp;D tools</text>
+     <rect class="package" x="0" width="72.60000000000001" height="82.63000000000001" y="0" style="fill:darkgray;"/>
+     <text text-anchor="middle" class="package" width="72.60000000000001" x="36.300000000000004" y="81.63000000000002">R&amp;D tools</text>
      <g transform="translate(0 3.2)">
       <g id="creator" transform="translate(0 56.400000000000006)" class="collection placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -17442,44 +17315,38 @@
        <g transform="translate(0 6.299999999999999)"/>
       </g>
       <g id="htiui" transform="translate(35.4 37.6)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Harmonized Test Inter­face UI</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="HtiCommPlugins" class="component">
+       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Harmonized Test Inter­face UI</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="HtiServicePlugins" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="0" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
          <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">HTI Comm Plugins</text>
-        </g>
-        <g id="HtiServicePlugins" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">HTI Service Plugins</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">HTI Service Plugins</text>
         </g>
         <g id="htidevicereboot" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">HTI Dev­ice Reboot</text>
+        </g>
+        <g id="htistartupwait" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="18.6" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
          <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">HTI Dev­ice Reboot</text>
-        </g>
-        <g id="htistartupwait" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">HTI Startup Wait</text>
+        </g>
+        <g id="htiadmin" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
          <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
          <use width="9.3" height="9.3" x="27.900000000000002" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">HTI Startup Wait</text>
-        </g>
-        <g id="htiadmin" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="37.2" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">HTI Admin</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="helps" class="package" transform="translate( 3269.700000000002 0)">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">HTI Admin</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="helps" class="package" transform="translate( 3185.700000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="183.03" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="182.03">Help Apps</text>
@@ -17514,7 +17381,7 @@
       </g>
      </g>
     </g>
-    <g id="techview" class="package" transform="translate( 3299.700000000002 0)">
+    <g id="techview" class="package" transform="translate( 3215.700000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="183.03" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="182.03">Techview</text>
@@ -17619,7 +17486,7 @@
       </g>
       <g id="s8-color9">
        <rect class="cbox" height="3.1" width="15.5" fill="#ffff00" x="77" y="3.1"/>
-       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="84.75" y="4.65">Multimedia Apps (9)</text>
+       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="84.75" y="4.65">Multimedia Apps (8)</text>
       </g>
       <g id="s8-color10">
        <rect class="cbox" height="3.1" width="15.5" fill="orange" x="15" y="6.2"/>
@@ -17659,7 +17526,7 @@
       <g id="s4-overlay0" class="cmp placeholder">
        <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:grey;stroke-width: 0.5;"/>
        <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-       <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test Compo­nent (139)</text>
+       <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test Compo­nent (138)</text>
       </g>
      </g>
     </g>
@@ -17692,9 +17559,9 @@
      </g>
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="250.875" y="4.65">
-     <tspan dy="-1em" x="250.875">109 Packages</tspan>
-     <tspan dy="1em" x="250.875">599 Collections</tspan>
-     <tspan dy="1em" x="250.875">2541 Components</tspan>
+     <tspan dy="-1em" x="250.875">108 Packages</tspan>
+     <tspan dy="1em" x="250.875">594 Collections</tspan>
+     <tspan dy="1em" x="250.875">2522 Components</tspan>
     </text>
    </g>
   </g>
--- a/symbian3/single/sysdefs/sf3pkg.svg	Fri May 28 17:31:40 2010 +0100
+++ b/symbian3/single/sysdefs/sf3pkg.svg	Sun May 30 16:37:01 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?AdobeSVGViewer resolution="600"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 2182.999999999999 688.8196960149995" class="package-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 2102.899999999999 686.7023744025573" class="package-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
  <title>Symbian OS ^3 System Model: date</title>
  <defs>
   <style type="text/css">
@@ -431,8 +431,8 @@
  <g id="os" transform="translate(3.1999999999999993 395.6)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">OS</text>
-  <g class="layer-detail" transform="translate(373.2499999999997 3.2)">
-   <rect x="-360.4499999999997" class="layer" y="-3.2" width="2160.599999999999" height="222.8"/>
+  <g class="layer-detail" transform="translate(333.19999999999976 3.2)">
+   <rect x="-320.39999999999975" class="layer" y="-3.2" width="2080.499999999999" height="222.8"/>
    <g>
     <g id="kernelhwsrv" class="package" transform="translate( 0 119.20000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
@@ -566,8 +566,8 @@
  <g id="mw" transform="translate(3.1999999999999993 169.6)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">Middleware</text>
-  <g class="layer-detail" transform="translate(52.84999999999995 3.2)">
-   <rect x="-40.049999999999955" class="layer" y="-3.2" width="2160.599999999999" height="222.8"/>
+  <g class="layer-detail" transform="translate(12.8 3.2)">
+   <rect x="0" class="layer" y="-3.2" width="2080.499999999999" height="222.8"/>
    <g>
     <g id="appsupport" class="package" transform="translate( 0 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
@@ -863,8 +863,8 @@
  <g id="app" transform="translate(3.1999999999999993 0)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="166.4"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="166.4" height="9.3" x="-83.5">Applications</text>
-  <g class="layer-detail" transform="translate(12.8 3.2)">
-   <rect x="0" class="layer" y="-3.2" width="2160.599999999999" height="166.4"/>
+  <g class="layer-detail" transform="translate(52.850000000000065 3.2)">
+   <rect x="-40.05000000000007" class="layer" y="-3.2" width="2080.499999999999" height="166.4"/>
    <g>
     <g id="location" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
@@ -986,127 +986,109 @@
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="40.8">Image Editor Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="videoeditor" class="package" transform="translate( 1121.3999999999999 0)">
-     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="40.8">Video Editor Apps</text>
-     <g transform="translate(0 3.2)"/>
-    </g>
-    <g id="videoplayer" class="package" transform="translate( 1201.4999999999998 0)">
+    <g id="videoplayer" class="package" transform="translate( 1121.3999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="78.4">Video Player Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="photos" class="package" transform="translate( 1281.5999999999997 0)">
+    <g id="photos" class="package" transform="translate( 1201.4999999999998 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="78.4">Photos</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="musicplayer" class="package" transform="translate( 1361.6999999999996 0)">
+    <g id="musicplayer" class="package" transform="translate( 1281.5999999999997 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="78.4">Music Player Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="radio" class="package" transform="translate( 1441.7999999999995 0)">
+    <g id="radio" class="package" transform="translate( 1361.6999999999996 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="40.8">Radio Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="internetradio" class="package placeholder" transform="translate( 1521.8999999999994 0)">
-     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">Internet Radio Apps</text>
-     <g transform="translate(0 3.2)"/>
-    </g>
-    <g id="podcatcher" class="package" transform="translate( 1601.9999999999993 0)">
+    <g id="podcatcher" class="package" transform="translate( 1441.7999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">Podcatcher</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="tv" class="package placeholder" transform="translate( 881.1000000000001 81.60000000000001)">
-     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="15.600000000000001">TV Apps</text>
-     <g transform="translate(0 3.2)"/>
-    </g>
-    <g id="voicerec" class="package" transform="translate( 1682.0999999999992 0)">
+    <g id="voicerec" class="package" transform="translate( 1521.8999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">Voice Recorder Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="screensaver" class="package" transform="translate( 1762.1999999999991 0)">
+    <g id="screensaver" class="package" transform="translate( 1601.9999999999993 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="40.8">Screen Saver Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="homescreen" class="package" transform="translate( 1842.299999999999 0)">
+    <g id="homescreen" class="package" transform="translate( 1682.0999999999992 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="59.6">Home Screen Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="graphicsuis" class="package" transform="translate( 961.2000000000002 81.60000000000001)">
+    <g id="graphicsuis" class="package" transform="translate( 881.1000000000001 81.60000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="40.8">Graphics UIs</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="profile" class="package" transform="translate( 1922.399999999999 0)">
+    <g id="profile" class="package" transform="translate( 1762.1999999999991 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">Profiles</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="speechsrv" class="package" transform="translate( 1041.3 81.60000000000001)">
+    <g id="speechsrv" class="package" transform="translate( 961.2000000000002 81.60000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="59.6">Speech Recog­nition UIs</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="homescreentools" class="package" transform="translate( 1121.3999999999999 81.60000000000001)">
+    <g id="homescreentools" class="package" transform="translate( 1041.3 81.60000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="40.8">Home Screen Tools</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="webuis" class="package" transform="translate( 1201.4999999999998 81.60000000000001)">
+    <g id="webuis" class="package" transform="translate( 1121.3999999999999 81.60000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="40.8">Web UIs</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="jrt" class="package" transform="translate( 1281.5999999999997 81.60000000000001)">
+    <g id="jrt" class="package" transform="translate( 1201.4999999999998 81.60000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="78.4">Java Runtime</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="conntools" class="package" transform="translate( 1361.6999999999996 81.60000000000001)">
+    <g id="conntools" class="package" transform="translate( 1281.5999999999997 81.60000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="40.8">Connect­ivity Tools</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="rndtools" class="package" transform="translate( 1441.7999999999995 81.60000000000001)">
+    <g id="rndtools" class="package" transform="translate( 1361.6999999999996 81.60000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="78.4">R&amp;D tools</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="helps" class="package" transform="translate( 2002.4999999999989 0)">
+    <g id="helps" class="package" transform="translate( 1842.299999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="160" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="79" dy="0.375em" height="78.4">Help Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="techview" class="package" transform="translate( 2082.599999999999 0)">
+    <g id="techview" class="package" transform="translate( 1922.399999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="160" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="79" dy="0.375em" height="116.00000000000001">Techview</text>
@@ -1115,7 +1097,7 @@
    </g>
   </g>
  </g>
- <g id="legend-root" class="legend" transform="translate(1886.9894999999992 624.8000000000001) translate(292.8105 0) scale(5.955524135917256) translate(-292.8105)">
+ <g id="legend-root" class="legend" transform="translate(1806.8894999999993 624.8000000000001) translate(292.8105 0) scale(5.736679524812121) translate(-292.8105)">
   <text text-anchor="middle" class="title" x="276.47525" y="0">
    <tspan dy="0.75em" x="276.47525">Symbian OS ^3</tspan>
    <tspan dy="1em" x="276.47525">System Model</tspan>
@@ -1166,7 +1148,7 @@
       </g>
       <g id="s8-color9">
        <rect class="cbox" height="3.1" width="15.5" fill="#ffff00" x="154.5" y="-0.0000000000000002220446049250313"/>
-       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="162.25" y="1.5499999999999998">Multimedia Apps (11)</text>
+       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="162.25" y="1.5499999999999998">Multimedia Apps (8)</text>
       </g>
       <g id="s8-color10">
        <rect class="cbox" height="3.1" width="15.5" fill="orange" x="170" y="-0.0000000000000002220446049250313"/>
@@ -1183,7 +1165,7 @@
      </g>
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="241.82" y="1.5499999999999998">
-     <tspan dy="0em" x="241.82">110 Packages</tspan>
+     <tspan dy="0em" x="241.82">107 Packages</tspan>
     </text>
    </g>
   </g>
--- a/symbian3/single/sysdefs/system_model.xml	Fri May 28 17:31:40 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml	Sun May 30 16:37:01 2010 +0100
@@ -1,5 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE SystemDefinition [
 <!ELEMENT SystemDefinition ( systemModel )>
 <!ATTLIST SystemDefinition
   name CDATA #REQUIRED
@@ -73,7 +72,7 @@
   priority CDATA #IMPLIED
 >
 ]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
+<SystemDefinition schema="2.0.1" name="Symbian^3">
 <systemModel>
 <layer name="adaptation" long-name="Adaptation" levels="low mw high">
 <block name="stubs" level="high" long-name="Stubs" levels="stub">
@@ -2264,6 +2263,9 @@
 <component name="ecam_face_tracking_custom_api" long-name="ECam Face Tracking Custom API" filter="s60" class="api">
 <unit bldFile="os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
 </component>
+<component name="ecam_use_case_hint_custom_api" long-name="ECam Use Case Hint Custom API" filter="s60" class="api">
+<unit bldFile="os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
+</component>
 </collection>
 <collection name="imageadaptationextensions" long-name="Image Adaptation Extensions" level="app-if">
 <component name="iclextjpegapi" filter="s60" long-name="ICL Extension JPEG API">
@@ -4544,7 +4546,7 @@
 <component name="im_cache_server_api" long-name="IM Cache Server API" filter="s60" class="api">
 <unit bldFile="mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
 </component>
-<component name="presence_avabilitytext" long-name="Presence Avability Text" filter="s60" class="api">
+<component name="presence_avabilitytext" long-name="Presence Availbility Text" filter="s60" class="api">
 <unit bldFile="mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
 </component>
 </collection>
@@ -4567,9 +4569,6 @@
 <component name="xmppsettingsfetcher" filter="s60" long-name="XMPP Settings Fetcher" introduced="^2">
 <unit bldFile="mw/imsrv/imservices/xmppsettingsfetcher/group"/>
 </component>
-<component name="ossprotocoladaptation" filter="s60" long-name="OSS Protocol Adaptation" introduced="^2" plugin="Y">
-<unit bldFile="mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
 <component name="instantmessagingcache" filter="s60" long-name="Instant Messaging Cache" introduced="^2">
 <unit bldFile="mw/imsrv/imservices/instantmessagingcache/group"/>
 </component>
@@ -7967,51 +7966,11 @@
 </component>
 </collection>
 </block>
-<block name="opensrv" level="specific" long-name="Open Services" levels="prt lib server eng">
-<collection name="opensrv_plat" long-name="Open Services Platform Interfaces" level="eng">
-<component name="messagequeue_api" long-name="Message Queue API" introduced="^2" filter="s60" class="api">
-<unit bldFile="mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection name="loudmouth" long-name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="loudmouth_build" filter="s60" long-name="Loudmouth Build" introduced="^2">
-<unit bldFile="mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection name="libtelepathy" long-name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="libtelepathy_build" filter="s60" long-name="Telepathy Library Build" introduced="^2">
-<unit bldFile="mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection name="telepathygabble" long-name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component name="telepathygabble_build" filter="s60" long-name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection name="isolationserver" long-name="Isolation Server" level="server">
-<component name="messagequeue" filter="s60" long-name="Message Queue" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component name="isoserver" filter="s60" long-name="ISO Server" introduced="^2">
-<unit bldFile="mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component name="isolationserver_build" filter="s60" long-name="Isloation Server Build" introduced="^2">
-<!-- needs #includes removed. either move the exports to another component or make this a ROM component -->
-<unit bldFile="mw/opensrv/isolationserver/group"/>
-</component>
-</collection>
-</block>
+<!-- <package id="opensrv" level="specific" tech-domain="pr" href="../../../../mw/opensrv/package_definition.xml"/> -->
 </layer>
 <layer name="app" long-name="Applications" levels="services apps">
 <block name="location" level="apps" long-name="Location Apps" levels="ui events loc apps">
-<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="apps">
-<component name="location_centre_api" long-name="Location Centre API" introduced="^3" filter="s60" class="api">
-<unit bldFile="app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
+<collection name="loc_plat" long-name="Location Apps Platform Interfaces" level="apps"/>
 <collection name="loc_pub" long-name="Location Apps Public Interfaces" level="apps">
 <component name="landmarks_ui_selector_api" long-name="Landmarks UI Selector API" filter="s60" class="api">
 <unit bldFile="app/location/loc_pub/landmarks_ui_selector_api/group"/>
@@ -8103,24 +8062,6 @@
 <unit bldFile="app/location/mapnavproviderrefapp/group"/>
 </component>
 </collection>
-<collection name="locationcentre" long-name="Location Centre" level="loc">
-<component name="lcutils" long-name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcutils/group"/>
-</component>
-<component name="lcservice" long-name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcservice/group"/>
-</component>
-<component name="lcserver" long-name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcserver/group"/>
-</component>
-<component name="lcapp" long-name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="app/location/locationcentre/lcapp/group"/>
-</component>
-<component name="locationcentre_build" filter="s60" long-name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="app/location/locationcentre/group"/>
-</component>
-</collection>
 </block>
 <block name="mmsharinguis" level="services" long-name="Multimedia Sharing UIs" levels="base plugin if">
 <collection name="mmsharinguis_plat" long-name="Multimedia Sharing UIs Platform Interfaces" level="if">
@@ -8736,9 +8677,6 @@
 <component name="calcsoft" filter="s60" long-name="Calculator Application">
 <unit bldFile="app/utils/extras/calcsoft/group"/>
 </component>
-<component name="converter" filter="s60" long-name="Unit Converter">
-<unit bldFile="app/utils/extras/converter/group"/>
-</component>
 </collection>
 </block>
 <block name="contacts" level="apps" span="2" long-name="Contacts Apps" levels="engine support services ui">
@@ -9902,65 +9840,7 @@
 </component>
 </collection>
 </block>
-<block name="videoeditor" level="apps" long-name="Video Editor Apps" levels="engine ui">
-<collection name="videoeditor_plat" long-name="Video Editor Apps Platform Interfaces" level="ui">
-<component name="video_editor_engine_api" long-name="Video Editor Engine API" introduced="^2" class="api">
-<unit bldFile="app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection name="videditor" long-name="Video Editor" level="ui">
-<component name="videoeditorcommon" filter="s60" long-name="Video Editor Common" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component name="videoeditoruicomponents" filter="s60" long-name="Video Editor UI Components" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component name="simplevideoeditor" filter="s60" long-name="Simple Video Editor" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component name="simplecutvideo" filter="s60" long-name="Simple Cut Video" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component name="videoprovider" filter="s60" long-name="Video Provider" introduced="^2">
-<unit bldFile="app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component name="manualvideoeditor" filter="s60" long-name="Manual Video Editor" introduced="^2" class="placeholder">
-<!--  uncomment when supported
-      	<meta rel="config">
-      		<defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
-      	</meta>
-        <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component name="videditor_build" filter="s60" long-name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection name="videoeditorengine" long-name="Video Editor Engine" level="engine">
-<component name="audioeditorengine" filter="s60" long-name="Audio Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component name="avcedit" filter="s60" long-name="AVC Editing" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component name="h263decoder" filter="s60" long-name="H.263 Decoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component name="mp3aacmaniplib" filter="s60" long-name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component name="vedtranscoder" filter="s60" long-name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component name="vedengine" filter="s60" long-name="Video Editor Engine" introduced="^2">
-<unit bldFile="app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component name="videoeditorengine_build" filter="s60" long-name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</block>
+<!-- <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/> -->
 <block name="videoplayer" level="apps" long-name="Video Player Apps" levels="support plugin util apps">
 <collection name="videoplayer_plat" long-name="Video Player Apps Platform Interfaces" level="apps">
 <component name="videoplayer_startup_api" long-name="Video Player Startup API" filter="s60" class="api">
@@ -10761,9 +10641,6 @@
 </component>
 </collection>
 <collection name="htiui" long-name="Harmonized Test Interface UI" level="generic">
-<component name="HtiCommPlugins" filter="s60" long-name="HTI Comm Plugins" purpose="development" plugin="Y">
-<unit bldFile="app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
 <component name="HtiServicePlugins" filter="s60" long-name="HTI Service Plugins" purpose="development" plugin="Y">
 <!-- can only have a single unit. Should #include from a common bld.inf file -->
 <unit bldFile="app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
--- a/symbian3/single/sysdefs/system_model_3.0.xml	Fri May 28 17:31:40 2010 +0100
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Sun May 30 16:37:01 2010 +0100
@@ -2246,6 +2246,9 @@
 <component id="ecam_face_tracking_custom_api" name="ECam Face Tracking Custom API" class="api" filter="s60">
 <unit bldFile="/os/imagingext/imagingext_plat/ecam_face_tracking_custom_api/group"/>
 </component>
+<component id="ecam_use_case_hint_custom_api" name="ECam Use Case Hint Custom API" class="api" filter="s60">
+<unit bldFile="/os/imagingext/imagingext_plat/ecam_use_case_hint_custom_api/group"/>
+</component>
 </collection>
 <collection id="imageadaptationextensions" name="Image Adaptation Extensions" level="app-if">
 <component id="iclextjpegapi" filter="s60" name="ICL Extension JPEG API">
@@ -4579,7 +4582,7 @@
 <component id="im_cache_server_api" name="IM Cache Server API" class="api" filter="s60">
 <unit bldFile="/mw/imsrv/imsrv_plat/im_cache_server_api/group"/>
 </component>
-<component id="presence_avabilitytext" name="Presence Avability Text" class="api" filter="s60">
+<component id="presence_avabilitytext" name="Presence Availbility Text" class="api" filter="s60">
 <unit bldFile="/mw/imsrv/imsrv_plat/presence_avabilitytext/group"/>
 </component>
 </collection>
@@ -4602,9 +4605,6 @@
 <component id="xmppsettingsfetcher" filter="s60" name="XMPP Settings Fetcher" introduced="^2">
 <unit bldFile="/mw/imsrv/imservices/xmppsettingsfetcher/group"/>
 </component>
-<component id="ossprotocoladaptation" filter="s60" name="OSS Protocol Adaptation" class="plugin" introduced="^2">
-<unit bldFile="/mw/imsrv/imservices/ossprotocoladaptation/group"/>
-</component>
 <component id="instantmessagingcache" filter="s60" name="Instant Messaging Cache" introduced="^2">
 <unit bldFile="/mw/imsrv/imservices/instantmessagingcache/group"/>
 </component>
@@ -8295,14 +8295,11 @@
 </component>
 </collection>
 </package>
+<!-- <package id="opensrv" level="specific" tech-domain="pr" href="../../../../mw/opensrv/package_definition.xml"/> -->
 </layer>
 <layer id="app" name="Applications" levels="services apps">
 <package id="location" level="apps" tech-domain="lo" name="Location Apps" levels="ui events loc apps">
-<collection id="loc_plat" name="Location Apps Platform Interfaces" level="apps">
-<component id="location_centre_api" name="Location Centre API" introduced="^3" class="api" filter="s60">
-<unit bldFile="/app/location/loc_plat/location_centre_api/group"/>
-</component>
-</collection>
+<collection id="loc_plat" name="Location Apps Platform Interfaces" level="apps"/>
 <collection id="loc_pub" name="Location Apps Public Interfaces" level="apps">
 <component id="landmarks_ui_selector_api" name="Landmarks UI Selector API" class="api" filter="s60">
 <unit bldFile="/app/location/loc_pub/landmarks_ui_selector_api/group"/>
@@ -8394,24 +8391,6 @@
 <unit bldFile="/app/location/mapnavproviderrefapp/group"/>
 </component>
 </collection>
-<collection id="locationcentre" name="Location Centre" level="loc">
-<component id="lcutils" name="Location Centre Utilities" filter="s60" introduced="^3">
-<unit bldFile="/app/location/locationcentre/lcutils/group"/>
-</component>
-<component id="lcservice" name="Location Centre Service Project" filter="s60" introduced="^3">
-<unit bldFile="/app/location/locationcentre/lcservice/group"/>
-</component>
-<component id="lcserver" name="Location Centre Server Project" filter="s60" introduced="^3">
-<unit bldFile="/app/location/locationcentre/lcserver/group"/>
-</component>
-<component id="lcapp" name="Location Centre Application" filter="s60" introduced="^3">
-<unit bldFile="/app/location/locationcentre/lcapp/group"/>
-</component>
-<component id="locationcentre_build" filter="s60" name="Location Centre Build" introduced="^3">
-<!-- consider distributing this into the other components or collapsing into a single component -->
-<unit bldFile="/app/location/locationcentre/group"/>
-</component>
-</collection>
 </package>
 <package id="mmsharinguis" level="services" tech-domain="vc" name="Multimedia Sharing UIs" levels="base plugin if">
 <collection id="mmsharinguis_plat" name="Multimedia Sharing UIs Platform Interfaces" level="if">
@@ -9031,9 +9010,6 @@
 <component id="calcsoft" filter="s60" name="Calculator Application">
 <unit bldFile="/app/utils/extras/calcsoft/group"/>
 </component>
-<component id="converter" filter="s60" name="Unit Converter">
-<unit bldFile="/app/utils/extras/converter/group"/>
-</component>
 </collection>
 </package>
 <package id="contacts" level="apps" span="2" tech-domain="pr" name="Contacts Apps" levels="engine support services ui">
@@ -10221,65 +10197,7 @@
 </component>
 </collection>
 </package>
-<package id="videoeditor" level="apps" tech-domain="ma" name="Video Editor Apps" levels="engine ui">
-<collection id="videoeditor_plat" filter="s60" name="Video Editor Apps Platform Interfaces" level="ui">
-<component id="video_editor_engine_api" name="Video Editor Engine API" class="api" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditor_plat/video_editor_engine_api/group"/>
-</component>
-</collection>
-<collection id="videditor" name="Video Editor" level="ui">
-<component id="videoeditorcommon" filter="s60" name="Video Editor Common" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/videoeditorcommon/group"/>
-</component>
-<component id="videoeditoruicomponents" filter="s60" name="Video Editor UI Components" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/videoeditoruicomponents/group"/>
-</component>
-<component id="simplevideoeditor" filter="s60" name="Simple Video Editor" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/simplevideoeditor/group"/>
-</component>
-<component id="simplecutvideo" filter="s60" name="Simple Cut Video" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/simplecutvideo/group"/>
-</component>
-<component id="videoprovider" filter="s60" name="Video Provider" introduced="^2">
-<unit bldFile="/app/videoeditor/videditor/videoprovider/group"/>
-</component>
-<component id="manualvideoeditor" filter="s60" name="Manual Video Editor" introduced="^2">
-<!--  uncomment when supported
-      	<meta rel="config">
-      		<defined condition="__INCLUDE_MANUAL_VIDEO_EDITOR__"/>
-      	</meta>
-        <unit bldFile="videditor/manualvideoeditor/group"/> -->
-</component>
-<component id="videditor_build" filter="s60" name="Video Editor Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="/app/videoeditor/videditor/group"/>
-</component>
-</collection>
-<collection id="videoeditorengine" name="Video Editor Engine" level="engine">
-<component id="audioeditorengine" filter="s60" name="Audio Editor Engine" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/audioeditorengine/group"/>
-</component>
-<component id="avcedit" filter="s60" name="AVC Editing" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/avcedit/group"/>
-</component>
-<component id="h263decoder" filter="s60" name="H.263 Decoder" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/h263decoder/group"/>
-</component>
-<component id="mp3aacmaniplib" filter="s60" name="MP3 and AAC Manipulation Library" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/mp3aacmaniplib/group"/>
-</component>
-<component id="vedtranscoder" filter="s60" name="Video Editor Transcoder" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/vedtranscoder/group"/>
-</component>
-<component id="vedengine" filter="s60" name="Video Editor Engine" introduced="^2">
-<unit bldFile="/app/videoeditor/videoeditorengine/vedengine/group"/>
-</component>
-<component id="videoeditorengine_build" filter="s60" name="Video Editor Engine Build" introduced="^2">
-<!-- can the exports be distributed to the other components? Or should this be collapsed into one component?-->
-<unit bldFile="/app/videoeditor/videoeditorengine/group"/>
-</component>
-</collection>
-</package>
+<!-- <package id="videoeditor" level="apps" tech-domain="ma" href="../../../../app/videoeditor/package_definition.xml"/> -->
 <package id="videoplayer" level="apps" tech-domain="ma" name="Video Player Apps" levels="support plugin util apps">
 <collection id="videoplayer_plat" name="Video Player Apps Platform Interfaces" level="apps">
 <component id="videoplayer_startup_api" name="Video Player Startup API" class="api" filter="s60">
@@ -10608,7 +10526,6 @@
 </component>
 </collection>
 </package>
-<package id="internetradio" level="apps" tech-domain="ma" name="Internet Radio Apps"/>
 <package id="podcatcher" level="apps" tech-domain="ma" name="Podcatcher" levels="app">
 <collection id="podcatcher_info" name="Podcatcher" level="app">
 <component id="podcatcher_build" filter="sf_build" name="Podcatcher Build" introduced="^3">
@@ -10616,7 +10533,6 @@
 </component>
 </collection>
 </package>
-<package id="tv" level="services" tech-domain="ma" name="TV Apps"/>
 <package id="voicerec" level="apps" tech-domain="ma" name="Voice Recorder Apps">
 <!-- custom filter pref_test-->
 <collection id="voicerec_plat" name="Voice Recorder Apps Platform Interfaces">
@@ -11135,9 +11051,6 @@
 </component>
 </collection>
 <collection id="htiui" name="Harmonized Test Interface UI" level="generic">
-<component id="HtiCommPlugins" filter="s60" name="HTI Comm Plugins" purpose="development" target="device" class="plugin">
-<unit bldFile="/app/rndtools/htiui/HtiCommPlugins/HtiBtCommPlugin/group"/>
-</component>
 <component id="HtiServicePlugins" filter="s60" name="HTI Service Plugins" purpose="development" target="device" class="plugin">
 <!-- can only have a single unit. Should #include from a common bld.inf file -->
 <unit bldFile="/app/rndtools/htiui/HtiServicePlugins/HtiAppServicePlugin/group"/>
MCL/sftools/fbf/projects/platforms