# HG changeset patch
# User William Roberts <williamr@symbian.org>
# Date 1272993000 -3600
# Node ID a60d972210e281452452437f3c16e7c9c4e803c4
# Parent  ee360c1ff51e3d32808b88dcf274622f8d5ae7f2
Update system_model.xml & SVGs to reflect most of the changes in the wk17 drop of S^3

diff -r ee360c1ff51e -r a60d972210e2 symbian3/single/sysdefs/full_system_model_3.0.xml
--- a/symbian3/single/sysdefs/full_system_model_3.0.xml	Tue May 04 18:07:57 2010 +0100
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml	Tue May 04 18:10:00 2010 +0100
@@ -4799,43 +4799,6 @@
 </component>
 </collection>
 </package>
-<package id="opensrv" level="specific" tech-domain="pr" name="Open Services" levels="prt lib server eng">
-<collection id="opensrv_plat" name="Open Services Platform Interfaces" level="eng">
-<component id="messagequeue_api" name="Message Queue API" introduced="^2" class="api" filter="s60">
-<unit bldFile="/mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection id="loudmouth" name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component id="loudmouth_build" filter="s60" name="Loudmouth Build" introduced="^2">
-<unit bldFile="/mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection id="libtelepathy" name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component id="libtelepathy_build" filter="s60" name="Telepathy Library Build" introduced="^2">
-<unit bldFile="/mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection id="telepathygabble" name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component id="telepathygabble_build" filter="s60" name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="/mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection id="isolationserver" name="Isolation Server" level="server">
-<component id="messagequeue" filter="s60" name="Message Queue" introduced="^2">
-<unit bldFile="/mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component id="isoserver" filter="s60" name="ISO Server" introduced="^2">
-<unit bldFile="/mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component id="isolationserver_build" filter="s60" 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>
-</package>
 <package id="remotemgmt" level="specific" tech-domain="dm" name="Remote Management" levels="plugin framework server generic specific">
 <collection id="remotemgmt_pub" name="Remote Management Public Interfaces" level="specific">
 <component id="synchronization_capability_api" name="Synchronization Capability API" class="api" filter="s60">
@@ -6270,10 +6233,6 @@
 </package>
 <package id="mmappfw" level="specific" tech-domain="mm" name="Multimedia App Framework" levels="fw utils if">
 <collection id="mmappfw_plat" name="Multimedia App Framework Platform Interfaces" level="if">
-<component id="mmappfw_plat_build" name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="/mw/mmappfw/mmappfw_plat"/>
-</component>
 <component id="collection_helper_api" name="Collection Helper API" introduced="^1" class="api" filter="s60">
 <unit bldFile="/mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
 </component>
@@ -6571,7 +6530,7 @@
 </collection>
 <collection id="qt_info" name="Qt Info" level="mw">
 <component id="qt_build" name="Qt Build" introduced="^2">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt/." qt:proFile="projects.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt" qt:proFile="projects.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
 </component>
 </collection>
 <collection id="qtdemos" name="Qt Demos" level="app">
@@ -8424,9 +8383,6 @@
 </component>
 </collection>
 <collection id="gfxtools" name="Graphics Tools" level="tool">
-<component id="gditools" filter="s60" name="GDI Tools" target="desktop">
-<unit bldFile="/mw/uitools/gfxtools/gditools/group"/>
-</component>
 <component id="color" filter="s60" name="Bitmap Colour Palette" target="desktop">
 <unit bldFile="/mw/uitools/gfxtools/color/group"/>
 </component>
@@ -11263,14 +11219,14 @@
 <!-- consider collapsing into a single component -->
 <component id="fileopserver" filter="s60" name="File Operations Server" purpose="development" target="device" class="tool">
 <meta rel="config">
-<not-defined condition="FILEBROWSER_LITE"/>
+<not-defined xmlns:qt="http://www.nokia.com/qt" condition="FILEBROWSER_LITE"/>
 </meta>
 <!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
 <!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
 </component>
 <component id="fileopclient" filter="s60" name="File Operations Client" purpose="development" target="device" class="tool">
 <meta rel="config">
-<not-defined condition="FILEBROWSER_LITE"/>
+<not-defined xmlns:qt="http://www.nokia.com/qt" condition="FILEBROWSER_LITE"/>
 </meta>
 <!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
 <!--<unit bldFile="filebrowser/fileopclient/group"/>-->
@@ -11305,15 +11261,12 @@
 </component>
 </collection>
 <collection id="stifui" name="STIF UI" level="generic">
-<component id="stifui_stifui" filter="s60" name="STIF UI" purpose="development" target="device">
-<unit bldFile="/app/rndtools/stifui/stifui/group"/>
-</component>
-<component id="uitestserverstarter" filter="s60" name="UI Test Server Starter" purpose="development" target="device">
-<unit bldFile="/app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component id="stifui_build" filter="s60" name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="/app/rndtools/stifui/group"/>
+<component id="stifui_avkon" filter="s60" name="STIF UI for Avkon" purpose="development">
+<unit bldFile="/app/rndtools/stifui/avkon/group"/>
+</component>
+<component id="stifui_qt" filter="s60,test" name="STIF UI for Qt" purpose="development">
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/app/rndtools/stifui/qt" qt:proFile="stifqtui.pro"/>
+<!-- marked as test until we know what to do with it -->
 </component>
 </collection>
 <collection id="memspyui" name="Memspy UI" level="generic">
diff -r ee360c1ff51e -r a60d972210e2 symbian3/single/sysdefs/sf3.svg
--- a/symbian3/single/sysdefs/sf3.svg	Tue May 04 18:07:57 2010 +0100
+++ b/symbian3/single/sysdefs/sf3.svg	Tue May 04 18:10:00 2010 +0100
@@ -8873,79 +8873,7 @@
       </g>
      </g>
     </g>
-    <g id="opensrv" class="package" transform="translate( 1703.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="33.3" height="97.2" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Open Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="opensrv_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">Open Services Platform Inter­faces</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="messagequeue_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">Message Queue API</text>
-        </g>
-       </g>
-      </g>
-      <g id="loudmouth" transform="translate(0 56.400000000000006)" 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">Loud­mouth</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="loudmouth_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="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">Loud­mouth Build</text>
-        </g>
-       </g>
-      </g>
-      <g id="libtelepathy" transform="translate(0 37.6)" 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">Telepathy Library</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="libtelepathy_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="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">Telepathy Library Build</text>
-        </g>
-       </g>
-      </g>
-      <g id="telepathygabble" transform="translate(17.7 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">Telepathy Gabble</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="telepathygabble_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="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">Telepathy Gabble Build</text>
-        </g>
-       </g>
-      </g>
-      <g id="isolationserver" transform="translate(0 18.8)" 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">Isolation Server</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="messagequeue" 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">Message Queue</text>
-        </g>
-        <g id="isoserver" 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">ISO Server</text>
-        </g>
-        <g id="isolationserver_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="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">Isloation Server Build</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="remotemgmt" class="package" transform="translate( 1738.5000000000005 0)">
+    <g id="remotemgmt" class="package" transform="translate( 1703.1000000000004 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="459.00000000000034" height="97.2" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="459.00000000000034" x="229.50000000000017" y="86.2" dy="0.375em">Remote Manage­ment</text>
@@ -9592,7 +9520,7 @@
       </g>
      </g>
     </g>
-    <g id="dlnasrv" class="package" transform="translate( 2199.600000000001 0)">
+    <g id="dlnasrv" class="package" transform="translate( 2164.2000000000007 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="159.29999999999998" height="97.2" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="159.29999999999998" x="79.64999999999999" y="86.2" dy="0.375em">DLNA Services</text>
@@ -10384,7 +10312,7 @@
       </g>
      </g>
     </g>
-    <g id="imghandling" class="package" transform="translate( 2361.000000000001 0)">
+    <g id="imghandling" class="package" transform="translate( 2325.600000000001 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="27.900000000000002" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Image Handling</text>
@@ -10434,7 +10362,7 @@
       </g>
      </g>
     </g>
-    <g id="metadatasrv" class="package" transform="translate( 2391.000000000001 0)">
+    <g id="metadatasrv" class="package" transform="translate( 2355.600000000001 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="67.2" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="67.2" x="33.6" y="86.2" dy="0.375em">Legacy Metadata Services</text>
@@ -10502,7 +10430,7 @@
       </g>
      </g>
     </g>
-    <g id="mds" class="package" transform="translate( 2460.300000000001 0)">
+    <g id="mds" class="package" transform="translate( 2424.900000000001 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="143.7" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="143.7" x="71.85" y="96.2">Metadata Services</text>
@@ -10709,7 +10637,7 @@
       </g>
      </g>
     </g>
-    <g id="mmuifw" class="package" transform="translate( 2606.1000000000013 0)">
+    <g id="mmuifw" class="package" transform="translate( 2570.700000000001 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="148.8" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="148.8" x="74.4" y="86.2" dy="0.375em">Multi­media UI Fmwk.</text>
@@ -10908,7 +10836,7 @@
       </g>
      </g>
     </g>
-    <g id="videoutils" class="package" transform="translate( 2757.0000000000014 0)">
+    <g id="videoutils" class="package" transform="translate( 2721.6000000000013 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="45.6" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="45.6" x="22.8" y="96.2">Video Utils</text>
@@ -11228,7 +11156,7 @@
       </g>
      </g>
     </g>
-    <g id="camerasrv" class="package" transform="translate( 2804.700000000001 0)">
+    <g id="camerasrv" class="package" transform="translate( 2769.300000000001 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="109.79999999999998" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="109.79999999999998" x="54.89999999999999" y="96.2">Camera Services</text>
@@ -11342,131 +11270,126 @@
       </g>
      </g>
     </g>
-    <g id="mmappfw" class="package" transform="translate( 2916.6000000000013 0)">
+    <g id="mmappfw" class="package" transform="translate( 2881.200000000001 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="234.60000000000008" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="234.60000000000008" x="117.30000000000004" y="96.2">Multi­media App Fmwk.</text>
+     <rect class="package" x="0" width="225.30000000000007" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="225.30000000000007" x="112.65000000000003" y="96.2">Multi­media App Fmwk.</text>
      <g transform="translate(0 3.2)">
       <g id="mmappfw_plat" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="213.9000000000001"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="212.50000000000009" height="6.299999999999999">MM App FW Platform Inter­faces</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="mmappfw_plat_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="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">Multimedia App Framework Platform Interfaces Build</text>
-        </g>
+       <rect class="collection" x="0" y="0" height="15.6" width="204.60000000000008"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="203.20000000000007" height="6.299999999999999">MM App FW Platform Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="collection_helper_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="9.3" 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="13.950000000000001">Collection Helper API</text>
+         <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">Collection Helper API</text>
         </g>
         <g id="harvester_collection_mediator_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="18.6" 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="23.25">Harvester Collection Mediator API</text>
+         <use width="9.3" height="9.3" x="9.3" 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="13.950000000000001">Harvester Collection Mediator API</text>
         </g>
         <g id="harvester_metadata_extractor_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="27.900000000000002" 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="32.550000000000004">Harvester Metadata Extractor API</text>
+         <use width="9.3" height="9.3" x="18.6" 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="23.25">Harvester Metadata Extractor API</text>
         </g>
         <g id="harvester_server_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="37.2" 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="41.85">Harvester Server API</text>
+         <use width="9.3" height="9.3" x="27.900000000000002" 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="32.550000000000004">Harvester Server API</text>
         </g>
         <g id="harvester_utility_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="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">Harvester Utility API</text>
+         <use width="9.3" height="9.3" x="37.2" 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="41.85">Harvester Utility API</text>
         </g>
         <g id="playlist_engine_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="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">Playlist Engine API</text>
+        </g>
+        <g id="mtp_keys_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">Playlist Engine API</text>
-        </g>
-        <g id="mtp_keys_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="65.1" 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="69.75">MTP Keys API</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">MTP Keys API</text>
         </g>
         <g id="mpx_collection_common_definition_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="74.39999999999999" 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="79.05">MPX Collection Common Definition API</text>
+         <use width="9.3" height="9.3" x="65.1" 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="69.75">MPX Collection Common Definition API</text>
         </g>
         <g id="mpx_collection_utility_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="83.69999999999999" 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="88.35">MPX Collection Utility API</text>
+         <use width="9.3" height="9.3" x="74.39999999999999" 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="79.05">MPX Collection Utility API</text>
         </g>
         <g id="mpx_common_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="83.69999999999999" 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="88.35">MPX Common API</text>
+        </g>
+        <g id="mpx_common_definition_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="92.99999999999999" 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="97.64999999999999">MPX Common API</text>
-        </g>
-        <g id="mpx_common_definition_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">MPX Common Definition API</text>
+        </g>
+        <g id="mpx_playback_common_definition_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="102.29999999999998" 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="106.94999999999999">MPX Common Definition API</text>
-        </g>
-        <g id="mpx_playback_common_definition_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="111.59999999999998" 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="116.24999999999999">MPX Playback Common Definition API</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">MPX Playback Common Definition API</text>
         </g>
         <g id="mpx_playback_utility_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="120.89999999999998" 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="125.54999999999998">MPX Playback Utility API</text>
+         <use width="9.3" height="9.3" x="111.59999999999998" 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="116.24999999999999">MPX Playback Utility API</text>
         </g>
         <g id="mpx_base_view_plugins_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="130.2" 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="134.85">MPX Base View Plugins API</text>
+         <use width="9.3" height="9.3" x="120.89999999999998" 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="125.54999999999998">MPX Base View Plugins API</text>
         </g>
         <g id="mpx_view_utility_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="130.2" 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="134.85">MPX View Utility API</text>
+        </g>
+        <g id="mpx_albumart_utility_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="139.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="144.15">MPX View Utility API</text>
-        </g>
-        <g id="mpx_albumart_utility_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">MPX Album Art Utility API</text>
+        </g>
+        <g id="media_player_settings_engine_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="148.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="153.45000000000002">MPX Album Art Utility API</text>
-        </g>
-        <g id="media_player_settings_engine_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Media Player Settings Engine API</text>
+        </g>
+        <g id="mpx_backstepping_utility_api" 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="158.10000000000002" 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="162.75000000000003">Media Player Settings Engine API</text>
-        </g>
-        <g id="mpx_backstepping_utility_api" class="component placeholder">
+         <use width="9.3" height="9.3" x="158.10000000000002" y="0" style="fill:url(#PatternOverlay1); stroke: none; stroke-width: 0;" xlink:href="#Borderround"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">MPX Backstepping Utility API</text>
+        </g>
+        <g id="asx_parser_api" 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="167.40000000000003" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
          <use width="9.3" height="9.3" x="167.40000000000003" y="0" style="fill:url(#PatternOverlay1); stroke: none; stroke-width: 0;" xlink:href="#Borderround"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">MPX Backstepping Utility API</text>
-        </g>
-        <g id="asx_parser_api" class="component placeholder">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">ASX Parser API</text>
+        </g>
+        <g id="playback_helper_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="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="176.70000000000005" y="0" style="fill:url(#PatternOverlay1); stroke: none; stroke-width: 0;" xlink:href="#Borderround"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">ASX Parser API</text>
-        </g>
-        <g id="playback_helper_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Playback Helper API</text>
+        </g>
+        <g id="videoplaylist_utility_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="186.00000000000006" 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="190.65000000000006">Playback Helper API</text>
-        </g>
-        <g id="videoplaylist_utility_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Video Playlist Utility API</text>
+        </g>
+        <g id="mmappfw_plat_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="195.30000000000007" 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="199.95000000000007">Video Playlist Utility API</text>
-        </g>
-        <g id="mmappfw_plat_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="204.60000000000008" 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="209.25000000000009">Multimedia App Framework Platform Interface Build</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Multimedia App Framework Platform Interface Build</text>
         </g>
        </g>
       </g>
@@ -11564,7 +11487,7 @@
         </g>
        </g>
       </g>
-      <g id="mmappfw_info" transform="translate(216.00000000000009 0)" class="collection">
+      <g id="mmappfw_info" transform="translate(206.70000000000007 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">MM App FW Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -13422,7 +13345,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreensrv" class="package" transform="translate( 3153.3000000000015 0)">
+    <g id="homescreensrv" class="package" transform="translate( 3108.6000000000013 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="195.30000000000007" height="97.2" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="176.70000000000007" x="106.95000000000003" y="29.8" dy="0.375em">Home Screen Services</text>
@@ -13934,7 +13857,7 @@
       </g>
      </g>
     </g>
-    <g id="serviceapifw" class="package" transform="translate( 3350.7000000000016 0)">
+    <g id="serviceapifw" class="package" transform="translate( 3306.0000000000014 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="101.39999999999998" height="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="101.39999999999998" x="50.69999999999999" y="86.2" dy="0.375em">Service API Frame­work</text>
@@ -14034,7 +13957,7 @@
       </g>
      </g>
     </g>
-    <g id="serviceapi" class="package" transform="translate( 3454.2000000000016 0)">
+    <g id="serviceapi" class="package" transform="translate( 3409.5000000000014 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="120.89999999999998" height="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="120.89999999999998" x="60.44999999999999" y="96.2">Service API</text>
@@ -14112,7 +14035,7 @@
       </g>
      </g>
     </g>
-    <g id="web" class="package" transform="translate( 3577.2000000000016 0)">
+    <g id="web" class="package" transform="translate( 3532.5000000000014 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="328.8" height="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="328.8" x="164.4" y="86.2" dy="0.375em">Web</text>
@@ -14737,7 +14660,7 @@
       </g>
      </g>
     </g>
-    <g id="uitools" class="package" transform="translate( 3908.1000000000017 0)">
+    <g id="uitools" class="package" transform="translate( 3863.4000000000015 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="68.7" height="97.2" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">UI Tools</text>
@@ -14792,18 +14715,13 @@
        </g>
       </g>
       <g id="gfxtools" transform="translate(0 18.8)" 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">Graphics Tools</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="gditools" 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">GDI Tools</text>
-        </g>
+       <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">Graphics Tools</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="color" 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">Bitmap Colour Palette</text>
+         <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">Bitmap Colour Palette</text>
         </g>
        </g>
       </g>
@@ -14840,7 +14758,7 @@
         </g>
        </g>
       </g>
-      <g id="toollibraries" transform="translate(20.700000000000003 18.8)" class="collection placeholder">
+      <g id="toollibraries" transform="translate(17.7 18.8)" 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">Tool Libraries</text>
        <g transform="translate(0 6.299999999999999)"/>
@@ -19682,8 +19600,8 @@
     </g>
     <g id="rndtools" class="package" transform="translate( 2727.9000000000005 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="103.5" height="82.63000000000001" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="103.5" x="51.75" y="81.63000000000002">R&amp;D tools</text>
+     <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>
      <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"/>
@@ -19772,30 +19690,18 @@
        </g>
       </g>
       <g id="stifui" transform="translate(0 37.6)" 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">STIF UI</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="stifui_stifui" class="component">
+       <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">STIF UI</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="stifui_avkon" 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; "/>
          <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">STIF UI</text>
-        </g>
-        <g id="uitestserverstarter" 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">UI Test Server Starter</text>
-        </g>
-        <g id="stifui_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="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">STIF UI Build</text>
-        </g>
-       </g>
-      </g>
-      <g id="memspyui" transform="translate(30.000000000000004 37.6)" class="collection">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">STIF UI for Avkon</text>
+        </g>
+       </g>
+      </g>
+      <g id="memspyui" transform="translate(17.7 37.6)" 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">Memspy UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -19807,7 +19713,7 @@
         </g>
        </g>
       </g>
-      <g id="htiui" transform="translate(47.7 37.6)" class="collection">
+      <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)">
@@ -20050,7 +19956,7 @@
       </g>
       <g id="s8-color7">
        <rect class="cbox" height="3.1" width="15.5" fill="lightpink" x="46" y="3.1"/>
-       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="53.75" y="4.65">Productivity (13)</text>
+       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="53.75" y="4.65">Productivity (12)</text>
       </g>
       <g id="s8-color8">
        <rect class="cbox" height="3.1" width="15.5" fill="rgb(175,212,240)" x="61.5" y="3.1"/>
@@ -20107,7 +20013,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 (170)</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 (168)</text>
       </g>
      </g>
     </g>
@@ -20140,9 +20046,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">666 Collections</tspan>
-     <tspan dy="1em" x="265.17499999999995">2909 Components</tspan>
+     <tspan dy="-1em" x="265.17499999999995">109 Packages</tspan>
+     <tspan dy="1em" x="265.17499999999995">661 Collections</tspan>
+     <tspan dy="1em" x="265.17499999999995">2898 Components</tspan>
     </text>
    </g>
   </g>
diff -r ee360c1ff51e -r a60d972210e2 symbian3/single/sysdefs/sf3c.svg
--- a/symbian3/single/sysdefs/sf3c.svg	Tue May 04 18:07:57 2010 +0100
+++ b/symbian3/single/sysdefs/sf3c.svg	Tue May 04 18:10:00 2010 +0100
@@ -2180,39 +2180,7 @@
       </g>
      </g>
     </g>
-    <g id="opensrv" class="package" transform="translate( 401.7 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="33.3" height="97.2" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Open Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="opensrv_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">Open Services Platform Inter­faces</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="loudmouth" transform="translate(0 56.400000000000006)" 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">Loud­mouth</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="libtelepathy" transform="translate(0 37.6)" 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">Telepathy Library</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="telepathygabble" 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">Telepathy Gabble</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="isolationserver" 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">Isolation Server</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-     </g>
-    </g>
-    <g id="remotemgmt" class="package" transform="translate( 437.09999999999997 0)">
+    <g id="remotemgmt" class="package" transform="translate( 401.7 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="68.7" height="97.2" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="86.2" dy="0.375em">Remote Manage­ment</text>
@@ -2350,7 +2318,7 @@
       </g>
      </g>
     </g>
-    <g id="dlnasrv" class="package" transform="translate( 507.9 0)">
+    <g id="dlnasrv" class="package" transform="translate( 472.5 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="86.4" height="97.2" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="86.4" x="43.2" y="86.2" dy="0.375em">DLNA Services</text>
@@ -2503,7 +2471,7 @@
       </g>
      </g>
     </g>
-    <g id="imghandling" class="package" transform="translate( 596.4 0)">
+    <g id="imghandling" class="package" transform="translate( 561 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="27.900000000000002" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Image Handling</text>
@@ -2525,7 +2493,7 @@
       </g>
      </g>
     </g>
-    <g id="metadatasrv" class="package" transform="translate( 626.4 0)">
+    <g id="metadatasrv" class="package" transform="translate( 591 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="33.3" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="86.2" dy="0.375em">Legacy Metadata Services</text>
@@ -2547,7 +2515,7 @@
       </g>
      </g>
     </g>
-    <g id="mds" class="package" transform="translate( 661.8 0)">
+    <g id="mds" class="package" transform="translate( 626.4 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="68.7" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">Metadata Services</text>
@@ -2599,7 +2567,7 @@
       </g>
      </g>
     </g>
-    <g id="mmuifw" class="package" transform="translate( 732.5999999999999 0)">
+    <g id="mmuifw" class="package" transform="translate( 697.1999999999999 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="51" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="86.2" dy="0.375em">Multi­media UI Fmwk.</text>
@@ -2641,7 +2609,7 @@
       </g>
      </g>
     </g>
-    <g id="videoutils" class="package" transform="translate( 785.6999999999999 0)">
+    <g id="videoutils" class="package" transform="translate( 750.3 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="33.3" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Video Utils</text>
@@ -2712,7 +2680,7 @@
       </g>
      </g>
     </g>
-    <g id="camerasrv" class="package" transform="translate( 821.0999999999999 0)">
+    <g id="camerasrv" class="package" transform="translate( 785.6999999999999 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="51" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="96.2">Camera Services</text>
@@ -2744,7 +2712,7 @@
       </g>
      </g>
     </g>
-    <g id="mmappfw" class="package" transform="translate( 874.1999999999999 0)">
+    <g id="mmappfw" class="package" transform="translate( 838.8 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="33.3" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Multi­media App Fmwk.</text>
@@ -3057,7 +3025,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreensrv" class="package" transform="translate( 909.5999999999999 0)">
+    <g id="homescreensrv" class="package" transform="translate( 874.1999999999999 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="97.2" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="35.4" x="33.3" y="86.2" dy="0.375em">Home Screen Services</text>
@@ -3156,7 +3124,7 @@
       </g>
      </g>
     </g>
-    <g id="serviceapifw" class="package" transform="translate( 962.6999999999999 0)">
+    <g id="serviceapifw" class="package" transform="translate( 927.3 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="33.3" height="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="86.2" dy="0.375em">Service API Frame­work</text>
@@ -3183,7 +3151,7 @@
       </g>
      </g>
     </g>
-    <g id="serviceapi" class="package" transform="translate( 998.0999999999999 0)">
+    <g id="serviceapi" class="package" transform="translate( 962.6999999999999 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="27.900000000000002" height="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Service API</text>
@@ -3195,7 +3163,7 @@
       </g>
      </g>
     </g>
-    <g id="web" class="package" transform="translate( 1028.1 0)">
+    <g id="web" class="package" transform="translate( 992.6999999999999 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="68.7" height="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="86.2" dy="0.375em">Web</text>
@@ -3271,7 +3239,7 @@
       </g>
      </g>
     </g>
-    <g id="uitools" class="package" transform="translate( 1098.8999999999999 0)">
+    <g id="uitools" class="package" transform="translate( 1063.4999999999998 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="68.7" height="97.2" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">UI Tools</text>
@@ -4596,7 +4564,7 @@
       </g>
       <g id="s8-color7">
        <rect class="cbox" height="3.1" width="15.5" fill="lightpink" x="15" y="3.0999999999999996"/>
-       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="22.75" y="4.65">Productivity (13)</text>
+       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="22.75" y="4.65">Productivity (12)</text>
       </g>
       <g id="s8-color8">
        <rect class="cbox" height="3.1" width="15.5" fill="rgb(175,212,240)" x="30.5" y="3.0999999999999996"/>
@@ -4621,8 +4589,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">666 Collections</tspan>
+     <tspan dy="-0.5em" x="243.275">109 Packages</tspan>
+     <tspan dy="1em" x="243.275">661 Collections</tspan>
     </text>
    </g>
   </g>
diff -r ee360c1ff51e -r a60d972210e2 symbian3/single/sysdefs/sf3lit.svg
--- a/symbian3/single/sysdefs/sf3lit.svg	Tue May 04 18:07:57 2010 +0100
+++ b/symbian3/single/sysdefs/sf3lit.svg	Tue May 04 18:10:00 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 4911.8 873.0221753722548" class="component-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 4894.1 872.3546042717193" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
  <title>Symbian OS ^3 System Model: date</title>
  <defs>
   <style type="text/css">
@@ -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(558.9500000000007 3.2)">
-   <rect x="-546.1500000000008" class="layer" y="-3.2" width="4889.400000000001" height="231.26000000000002"/>
+  <g class="layer-detail" transform="translate(550.1000000000008 3.2)">
+   <rect x="-537.3000000000009" 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"/>
@@ -5003,7 +5003,7 @@
   <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(12.8 3.2)">
-   <rect x="0" class="layer" y="-3.2" width="4889.400000000001" height="222.8"/>
+   <rect x="0" class="layer" y="-3.2" width="4871.700000000001" 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"/>
@@ -8088,56 +8088,7 @@
       </g>
      </g>
     </g>
-    <g id="opensrv" class="package" transform="translate( 1672.2000000000005 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="33.3" height="97.2" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Open Services</text>
-     <g transform="translate(0 3.2)">
-      <g id="opensrv_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">Open Services Platform Inter­faces</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="messagequeue_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">Message Queue API</text>
-        </g>
-       </g>
-      </g>
-      <g id="loudmouth" transform="translate(0 56.400000000000006)" 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">Loud­mouth</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="libtelepathy" transform="translate(0 37.6)" 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">Telepathy Library</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="telepathygabble" transform="translate(17.7 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">Telepathy Gabble</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="isolationserver" transform="translate(0 18.8)" 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">Isolation Server</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="messagequeue" 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">Message Queue</text>
-        </g>
-        <g id="isoserver" 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">ISO Server</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="remotemgmt" class="package" transform="translate( 1707.6000000000006 0)">
+    <g id="remotemgmt" class="package" transform="translate( 1672.2000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="449.70000000000033" height="97.2" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="449.70000000000033" x="224.85000000000016" y="86.2" dy="0.375em">Remote Manage­ment</text>
@@ -8692,7 +8643,7 @@
       </g>
      </g>
     </g>
-    <g id="dlnasrv" class="package" transform="translate( 2159.400000000001 0)">
+    <g id="dlnasrv" class="package" transform="translate( 2124.000000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="109.79999999999998" height="97.2" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="109.79999999999998" x="54.89999999999999" y="86.2" dy="0.375em">DLNA Services</text>
@@ -9331,7 +9282,7 @@
       </g>
      </g>
     </g>
-    <g id="imghandling" class="package" transform="translate( 2271.300000000001 0)">
+    <g id="imghandling" class="package" transform="translate( 2235.900000000001 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="27.900000000000002" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Image Handling</text>
@@ -9375,7 +9326,7 @@
       </g>
      </g>
     </g>
-    <g id="metadatasrv" class="package" transform="translate( 2301.300000000001 0)">
+    <g id="metadatasrv" class="package" transform="translate( 2265.900000000001 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="33.3" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="86.2" dy="0.375em">Legacy Metadata Services</text>
@@ -9415,7 +9366,7 @@
       </g>
      </g>
     </g>
-    <g id="mds" class="package" transform="translate( 2336.700000000001 0)">
+    <g id="mds" class="package" transform="translate( 2301.300000000001 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="122.1" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="122.1" x="61.05" y="96.2">Metadata Services</text>
@@ -9573,7 +9524,7 @@
       </g>
      </g>
     </g>
-    <g id="mmuifw" class="package" transform="translate( 2460.900000000001 0)">
+    <g id="mmuifw" class="package" transform="translate( 2425.500000000001 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="148.8" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="148.8" x="74.4" y="86.2" dy="0.375em">Multi­media UI Fmwk.</text>
@@ -9737,7 +9688,7 @@
       </g>
      </g>
     </g>
-    <g id="videoutils" class="package" transform="translate( 2611.800000000001 0)">
+    <g id="videoutils" class="package" transform="translate( 2576.400000000001 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="39.300000000000004" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="39.300000000000004" x="19.650000000000002" y="96.2">Video Utils</text>
@@ -10042,7 +9993,7 @@
       </g>
      </g>
     </g>
-    <g id="camerasrv" class="package" transform="translate( 2653.200000000001 0)">
+    <g id="camerasrv" class="package" transform="translate( 2617.800000000001 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="92.09999999999998" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="92.09999999999998" x="46.04999999999999" y="96.2">Camera Services</text>
@@ -10133,7 +10084,7 @@
       </g>
      </g>
     </g>
-    <g id="mmappfw" class="package" transform="translate( 2747.400000000001 0)">
+    <g id="mmappfw" class="package" transform="translate( 2712.000000000001 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="176.70000000000005" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="176.70000000000005" x="88.35000000000002" y="96.2">Multi­media App Fmwk.</text>
@@ -10523,8 +10474,8 @@
     </g>
     <g id="qt" class="package" transform="translate( 2345.4000000000005 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="89.4" height="116.00000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="89.4" x="44.7" y="115.00000000000003">Qt</text>
+     <rect class="package" x="0" width="71.7" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="71.7" x="35.85" y="115.00000000000003">Qt</text>
      <g transform="translate(0 3.2)">
       <g id="src" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -10537,22 +10488,17 @@
         </g>
        </g>
       </g>
-      <g id="." transform="translate(17.7 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">.</text>
-       <g transform="translate(0 6.299999999999999)"/>
-      </g>
-      <g id="demos" transform="translate(35.4 0)" class="collection placeholder">
+      <g id="demos" transform="translate(17.7 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">demos</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="examples" transform="translate(53.099999999999994 0)" class="collection placeholder">
+      <g id="examples" transform="translate(35.4 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">examples</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="tests" transform="translate(70.8 0)" class="collection">
+      <g id="tests" transform="translate(53.099999999999994 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">tests</text>
        <g transform="translate(0 6.299999999999999)">
@@ -10570,7 +10516,7 @@
       </g>
      </g>
     </g>
-    <g id="classicui" class="package" transform="translate( 2436.9000000000005 100.4)">
+    <g id="classicui" class="package" transform="translate( 2419.2000000000007 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="1511.0999999999988" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="1511.0999999999988" x="755.5499999999994" y="115.00000000000003">Classic UI</text>
@@ -11538,7 +11484,7 @@
       </g>
      </g>
     </g>
-    <g id="svgt" class="package" transform="translate( 3950.099999999999 100.4)">
+    <g id="svgt" class="package" transform="translate( 3932.399999999999 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="27.900000000000002" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">SVG Tiny</text>
@@ -11572,7 +11518,7 @@
       </g>
      </g>
     </g>
-    <g id="uiaccelerator" class="package" transform="translate( 3980.099999999999 100.4)">
+    <g id="uiaccelerator" class="package" transform="translate( 3962.399999999999 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="55.8" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="55.8" x="27.9" y="115.00000000000003">UI Accel­erator</text>
@@ -11626,7 +11572,7 @@
       </g>
      </g>
     </g>
-    <g id="uiresources" class="package" transform="translate( 4037.999999999999 100.4)">
+    <g id="uiresources" class="package" transform="translate( 4020.2999999999993 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="262.8" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="262.8" x="131.4" y="105" dy="0.375em">UI Resources</text>
@@ -11872,7 +11818,7 @@
       </g>
      </g>
     </g>
-    <g id="hapticsservices" class="package" transform="translate( 4302.9 100.4)">
+    <g id="hapticsservices" class="package" transform="translate( 4285.2 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="46.5" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="46.5" x="23.25" y="115.00000000000003">Haptics Services</text>
@@ -11947,7 +11893,7 @@
       </g>
      </g>
     </g>
-    <g id="gsprofilesrv" class="package" transform="translate( 4351.5 100.4)">
+    <g id="gsprofilesrv" class="package" transform="translate( 4333.8 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="104.39999999999998" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="104.39999999999998" x="52.19999999999999" y="105" dy="0.375em">General Settings &amp; Profiles Services</text>
@@ -12058,7 +12004,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreensrv" class="package" transform="translate( 2926.200000000001 0)">
+    <g id="homescreensrv" class="package" transform="translate( 2890.800000000001 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="195.30000000000007" height="97.2" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="179.70000000000007" x="105.45000000000003" y="86.2" dy="0.375em">Home Screen Services</text>
@@ -12259,7 +12205,7 @@
       </g>
      </g>
     </g>
-    <g id="appinstall" class="package" transform="translate( 4458 100.4)">
+    <g id="appinstall" class="package" transform="translate( 4440.3 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="157.49999999999997" height="116.00000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="157.49999999999997" x="78.74999999999999" y="115.00000000000003">App Install­ation</text>
@@ -12437,7 +12383,7 @@
       </g>
      </g>
     </g>
-    <g id="serviceapifw" class="package" transform="translate( 3123.6000000000013 0)">
+    <g id="serviceapifw" class="package" transform="translate( 3088.200000000001 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="83.69999999999999" height="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="83.69999999999999" x="41.849999999999994" y="86.2" dy="0.375em">Service API Frame­work</text>
@@ -12527,7 +12473,7 @@
       </g>
      </g>
     </g>
-    <g id="serviceapi" class="package" transform="translate( 3209.4000000000015 0)">
+    <g id="serviceapi" class="package" transform="translate( 3174.0000000000014 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="111.59999999999998" height="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="111.59999999999998" x="55.79999999999999" y="96.2">Service API</text>
@@ -12600,7 +12546,7 @@
       </g>
      </g>
     </g>
-    <g id="web" class="package" transform="translate( 3323.1000000000013 0)">
+    <g id="web" class="package" transform="translate( 3287.700000000001 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="301.8" height="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="301.8" x="150.9" y="86.2" dy="0.375em">Web</text>
@@ -12927,7 +12873,7 @@
       </g>
      </g>
     </g>
-    <g id="websrv" class="package" transform="translate( 4617.6 100.4)">
+    <g id="websrv" class="package" transform="translate( 4599.900000000001 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="241.80000000000013" height="116.00000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="241.80000000000013" x="120.90000000000006" y="115.00000000000003">Web Services</text>
@@ -13111,7 +13057,7 @@
       </g>
      </g>
     </g>
-    <g id="platformtools" class="package" transform="translate( 4861.500000000001 100.4)">
+    <g id="platformtools" class="package" transform="translate( 4843.800000000001 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="27.900000000000002" height="116.00000000000001" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Platform Tools</text>
@@ -13134,7 +13080,7 @@
       </g>
      </g>
     </g>
-    <g id="uitools" class="package" transform="translate( 3627.0000000000014 0)">
+    <g id="uitools" class="package" transform="translate( 3591.6000000000013 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="68.7" height="97.2" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="96.2">UI Tools</text>
@@ -13177,18 +13123,13 @@
        <g transform="translate(0 6.299999999999999)"/>
       </g>
       <g id="gfxtools" transform="translate(0 18.8)" 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">Graphics Tools</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="gditools" 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">GDI Tools</text>
-        </g>
+       <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">Graphics Tools</text>
+       <g transform="translate(0 6.299999999999999)">
         <g id="color" 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">Bitmap Colour Palette</text>
+         <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">Bitmap Colour Palette</text>
         </g>
        </g>
       </g>
@@ -13232,8 +13173,8 @@
  <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(839.8999999999992 3.2)">
-   <rect x="-827.0999999999992" class="layer" y="-3.2" width="4889.400000000001" height="189.43"/>
+  <g class="layer-detail" transform="translate(831.0499999999993 3.2)">
+   <rect x="-818.2499999999993" 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"/>
@@ -17424,8 +17365,8 @@
     </g>
     <g id="rndtools" class="package" transform="translate( 2512.2000000000007 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="84.9" height="82.63000000000001" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="84.9" x="42.45" 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 placeholder">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -17458,28 +17399,22 @@
        <g transform="translate(0 6.299999999999999)"/>
       </g>
       <g id="stifui" transform="translate(0 37.6)" 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">STIF UI</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="uitestserverstarter" 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; "/>
-         <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">UI Test Server Starter</text>
-        </g>
-        <g id="stifui" 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="9.3" y="0" xlink:href="#Borderbox" 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="13.950000000000001">stifui</text>
-        </g>
-       </g>
-      </g>
-      <g id="memspyui" transform="translate(20.700000000000003 37.6)" class="collection placeholder">
+       <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">STIF UI</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="avkon" 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="#Borderbox" 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">avkon</text>
+        </g>
+       </g>
+      </g>
+      <g id="memspyui" transform="translate(17.7 37.6)" 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">Memspy UI</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
-      <g id="htiui" transform="translate(38.400000000000006 37.6)" class="collection">
+      <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)">
@@ -17595,8 +17530,8 @@
  <g id="tools" 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="22"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="22" height="9.3" x="-11.3">tools</text>
-  <g class="layer-detail" transform="translate(2418.5000000000005 3.2)">
-   <rect x="-2405.7000000000003" class="layer" y="-3.2" width="4889.400000000001" height="22"/>
+  <g class="layer-detail" transform="translate(2409.6500000000005 3.2)">
+   <rect x="-2396.8500000000004" class="layer" y="-3.2" width="4871.700000000001" height="22"/>
    <g>
     <g id="buildplatforms" class="package placeholder" transform="translate( 0 0)">
      <rect class="package" x="0" width="78" height="15.600000000000001" y="0" style="fill:grey;"/>
@@ -17606,7 +17541,7 @@
    </g>
   </g>
  </g>
- <g id="legend-root" class="legend" transform="translate(4605.279500000001 681.49) translate(303.3205 0) scale(12.946305970087748) translate(-303.3205)">
+ <g id="legend-root" class="legend" transform="translate(4587.579500000001 681.49) translate(303.3205 0) scale(12.899622676344002) translate(-303.3205)">
   <text text-anchor="middle" class="title" x="286.98525" y="0">
    <tspan dy="0.75em" x="286.98525">Symbian OS ^3</tspan>
    <tspan dy="1em" x="286.98525">System Model</tspan>
@@ -17649,7 +17584,7 @@
       </g>
       <g id="s8-color7">
        <rect class="cbox" height="3.1" width="15.5" fill="lightpink" x="46" y="3.1"/>
-       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="53.75" y="4.65">Productivity (13)</text>
+       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="53.75" y="4.65">Productivity (12)</text>
       </g>
       <g id="s8-color8">
        <rect class="cbox" height="3.1" width="15.5" fill="rgb(175,212,240)" x="61.5" y="3.1"/>
@@ -17697,7 +17632,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 (140)</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 (139)</text>
       </g>
      </g>
     </g>
@@ -17730,9 +17665,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">605 Collections</tspan>
-     <tspan dy="1em" x="250.875">2542 Components</tspan>
+     <tspan dy="-1em" x="250.875">108 Packages</tspan>
+     <tspan dy="1em" x="250.875">599 Collections</tspan>
+     <tspan dy="1em" x="250.875">2537 Components</tspan>
     </text>
    </g>
   </g>
diff -r ee360c1ff51e -r a60d972210e2 symbian3/single/sysdefs/sf3pkg.svg
--- a/symbian3/single/sysdefs/sf3pkg.svg	Tue May 04 18:07:57 2010 +0100
+++ b/symbian3/single/sysdefs/sf3pkg.svg	Tue May 04 18:10:00 2010 +0100
@@ -659,13 +659,7 @@
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="59.6">Legacy Presence Services</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="opensrv" class="package" transform="translate( 640.8000000000001 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="78" height="97.2" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="78.4">Open Services</text>
-     <g transform="translate(0 3.2)"/>
-    </g>
-    <g id="remotemgmt" class="package" transform="translate( 720.9000000000001 0)">
+    <g id="remotemgmt" class="package" transform="translate( 640.8000000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="78" height="97.2" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="97.2">Remote Manage­ment</text>
@@ -689,7 +683,7 @@
      <text text-anchor="middle" class="package" width="78" x="39" y="57.00000000000003" dy="0.375em" height="97.2">Service Discovery &amp; Usage</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="dlnasrv" class="package" transform="translate( 801.0000000000001 0)">
+    <g id="dlnasrv" class="package" transform="translate( 720.9000000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="78" height="97.2" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="97.2">DLNA Services</text>
@@ -713,31 +707,31 @@
      <text text-anchor="middle" class="package" width="78" x="39" y="57.00000000000003" dy="0.375em" height="97.2">Shortlink Connectivity</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="imghandling" class="package" transform="translate( 881.1000000000001 0)">
+    <g id="imghandling" class="package" transform="translate( 801.0000000000001 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="78" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="59.6">Image Handling</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="metadatasrv" class="package" transform="translate( 961.2000000000002 0)">
+    <g id="metadatasrv" class="package" transform="translate( 881.1000000000001 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="78" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="97.2">Legacy Metadata Services</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="mds" class="package" transform="translate( 1041.3 0)">
+    <g id="mds" class="package" transform="translate( 961.2000000000002 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="78" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="78.4">Metadata Services</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="mmuifw" class="package" transform="translate( 1121.3999999999999 0)">
+    <g id="mmuifw" class="package" transform="translate( 1041.3 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="78" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="97.2">Multi­media UI Fmwk.</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="videoutils" class="package" transform="translate( 1201.4999999999998 0)">
+    <g id="videoutils" class="package" transform="translate( 1121.3999999999999 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="78" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="59.6">Video Utils</text>
@@ -755,13 +749,13 @@
      <text text-anchor="middle" class="package" width="78" x="39" y="57.00000000000003" dy="0.375em" height="97.2">Helix</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="camerasrv" class="package" transform="translate( 1281.5999999999997 0)">
+    <g id="camerasrv" class="package" transform="translate( 1201.4999999999998 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="78" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="59.6">Camera Services</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="mmappfw" class="package" transform="translate( 1361.6999999999996 0)">
+    <g id="mmappfw" class="package" transform="translate( 1281.5999999999997 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="78" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="59.6">Multi­media App Fmwk.</text>
@@ -815,7 +809,7 @@
      <text text-anchor="middle" class="package" width="78" x="39" y="57.00000000000003" dy="0.375em" height="116.00000000000001">General Settings &amp; Profiles Services</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="homescreensrv" class="package" transform="translate( 1441.7999999999995 0)">
+    <g id="homescreensrv" class="package" transform="translate( 1361.6999999999996 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="97.2">Home Screen Services</text>
@@ -827,19 +821,19 @@
      <text text-anchor="middle" class="package" width="78" x="39" y="57.00000000000003" dy="0.375em" height="78.4">App Install­ation</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="serviceapifw" class="package" transform="translate( 1521.8999999999994 0)">
+    <g id="serviceapifw" class="package" transform="translate( 1441.7999999999995 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="78" height="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="97.2">Service API Frame­work</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="serviceapi" class="package" transform="translate( 1601.9999999999993 0)">
+    <g id="serviceapi" class="package" transform="translate( 1521.8999999999994 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="78" height="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="78.4">Service API</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="web" class="package" transform="translate( 1682.0999999999992 0)">
+    <g id="web" class="package" transform="translate( 1601.9999999999993 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="78" height="97.2" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="97.2">Web</text>
@@ -857,7 +851,7 @@
      <text text-anchor="middle" class="package" width="78" x="39" y="57.00000000000003" dy="0.375em" height="15.600000000000001">Platform Tools</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="uitools" class="package" transform="translate( 1762.1999999999991 0)">
+    <g id="uitools" class="package" transform="translate( 1682.0999999999992 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="78" height="97.2" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="78.4">UI Tools</text>
@@ -1158,7 +1152,7 @@
       </g>
       <g id="s8-color7">
        <rect class="cbox" height="3.1" width="15.5" fill="lightpink" x="123.5" y="-0.0000000000000002220446049250313"/>
-       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="131.25" y="1.5499999999999998">Productivity (13)</text>
+       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="131.25" y="1.5499999999999998">Productivity (12)</text>
       </g>
       <g id="s8-color8">
        <rect class="cbox" height="3.1" width="15.5" fill="rgb(175,212,240)" x="139" y="-0.0000000000000002220446049250313"/>
@@ -1183,7 +1177,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">109 Packages</tspan>
     </text>
    </g>
   </g>
diff -r ee360c1ff51e -r a60d972210e2 symbian3/single/sysdefs/system_model.xml
--- a/symbian3/single/sysdefs/system_model.xml	Tue May 04 18:07:57 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml	Tue May 04 18:10:00 2010 +0100
@@ -4650,43 +4650,6 @@
 </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>
 <block name="remotemgmt" level="specific" long-name="Remote Management" levels="plugin framework server generic specific">
 <collection name="remotemgmt_pub" long-name="Remote Management Public Interfaces" level="specific">
 <component name="synchronization_capability_api" long-name="Synchronization Capability API" filter="s60" class="api">
@@ -6018,10 +5981,6 @@
 </block>
 <block name="mmappfw" level="specific" long-name="Multimedia App Framework" levels="fw utils if">
 <collection name="mmappfw_plat" long-name="Multimedia App Framework Platform Interfaces" level="if">
-<component name="mmappfw_plat_build" long-name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="mw/mmappfw/mmappfw_plat"/>
-</component>
 <component name="collection_helper_api" long-name="Collection Helper API" introduced="^1" filter="s60" class="api">
 <unit bldFile="mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
 </component>
@@ -6287,25 +6246,25 @@
 </collection>
 <collection name="qt_info" long-name="Qt Info" level="mw">
 <component name="qt_build" long-name="Qt Build" introduced="^2">
-<unit bldFile="mw/qt/."/>
+<unit bldFile="mw/qt" proFile="projects.pro" qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
 </component>
 </collection>
 <collection name="qtdemos" long-name="Qt Demos" level="app">
 <component name="qtdemos_build" long-name="Qt Demos Build" introduced="^2" filter="qtdemos">
-<unit bldFile="mw/qt/demos"/>
+<unit bldFile="mw/qt/demos" proFile="demos.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="qtexamples" long-name="Qt Examples" level="app">
 <component name="qtexamples_build" long-name="Qt Examples Build" introduced="^2" filter="qtexamples">
-<unit bldFile="mw/qt/examples"/>
+<unit bldFile="mw/qt/examples" proFile="examples.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 <collection name="qt_tests" long-name="Qt Tests" level="app">
 <component name="qttestsauto" long-name="Qt Automated Tests" introduced="^2" filter="qttestsauto">
-<unit bldFile="mw/qt/tests/auto"/>
+<unit bldFile="mw/qt/tests/auto" proFile="qtpauto.pro"/>
 </component>
 <component name="qttestsbenchmarks" long-name="Qt Benchmarks Tests" introduced="^2" filter="qttestsbenchmarks">
-<unit bldFile="mw/qt/tests/benchmarks"/>
+<unit bldFile="mw/qt/tests/benchmarks" proFile="benchmarks.pro" qmakeArgs="-r"/>
 </component>
 </collection>
 </block>
@@ -7959,9 +7918,6 @@
 </component>
 </collection>
 <collection name="gfxtools" long-name="Graphics Tools" level="tool">
-<component name="gditools" filter="s60" long-name="GDI Tools" class="PC">
-<unit bldFile="mw/uitools/gfxtools/gditools/group"/>
-</component>
 <component name="color" filter="s60" long-name="Bitmap Colour Palette" class="PC">
 <unit bldFile="mw/uitools/gfxtools/color/group"/>
 </component>
@@ -10728,15 +10684,8 @@
 </component>
 </collection>
 <collection name="stifui" long-name="STIF UI" level="generic">
-<component name="stifui_stifui" filter="s60" long-name="STIF UI" purpose="development">
-<unit bldFile="app/rndtools/stifui/stifui/group"/>
-</component>
-<component name="uitestserverstarter" filter="s60" long-name="UI Test Server Starter" purpose="development">
-<unit bldFile="app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component name="stifui_build" filter="s60" long-name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="app/rndtools/stifui/group"/>
+<component name="stifui_avkon" filter="s60" long-name="STIF UI for Avkon" purpose="development">
+<unit bldFile="app/rndtools/stifui/avkon/group"/>
 </component>
 </collection>
 <collection name="memspyui" long-name="Memspy UI" level="generic">
diff -r ee360c1ff51e -r a60d972210e2 symbian3/single/sysdefs/system_model_3.0.xml
--- a/symbian3/single/sysdefs/system_model_3.0.xml	Tue May 04 18:07:57 2010 +0100
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Tue May 04 18:10:00 2010 +0100
@@ -4686,43 +4686,6 @@
 </component>
 </collection>
 </package>
-<package id="opensrv" level="specific" tech-domain="pr" name="Open Services" levels="prt lib server eng">
-<collection id="opensrv_plat" name="Open Services Platform Interfaces" level="eng">
-<component id="messagequeue_api" name="Message Queue API" introduced="^2" class="api" filter="s60">
-<unit bldFile="/mw/opensrv/opensrv_plat/messagequeue_api/group"/>
-</component>
-</collection>
-<collection id="loudmouth" name="Loudmouth" level="prt">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component id="loudmouth_build" filter="s60" name="Loudmouth Build" introduced="^2">
-<unit bldFile="/mw/opensrv/loudmouth/group"/>
-</component>
-</collection>
-<collection id="libtelepathy" name="Telepathy Library" level="lib">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component id="libtelepathy_build" filter="s60" name="Telepathy Library Build" introduced="^2">
-<unit bldFile="/mw/opensrv/libtelepathy/group"/>
-</component>
-</collection>
-<collection id="telepathygabble" name="Telepathy Gabble" level="eng">
-<!-- collection is really a component so it needs to be moved down a directory -->
-<component id="telepathygabble_build" filter="s60" name="Telepathy Gabble Build" introduced="^2">
-<unit bldFile="/mw/opensrv/telepathygabble/group"/>
-</component>
-</collection>
-<collection id="isolationserver" name="Isolation Server" level="server">
-<component id="messagequeue" filter="s60" name="Message Queue" introduced="^2">
-<unit bldFile="/mw/opensrv/isolationserver/messagequeue/group"/>
-</component>
-<component id="isoserver" filter="s60" name="ISO Server" introduced="^2">
-<unit bldFile="/mw/opensrv/isolationserver/isoserver/group"/>
-</component>
-<component id="isolationserver_build" filter="s60" 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>
-</package>
 <package id="remotemgmt" level="specific" tech-domain="dm" name="Remote Management" levels="plugin framework server generic specific">
 <collection id="remotemgmt_pub" name="Remote Management Public Interfaces" level="specific">
 <component id="synchronization_capability_api" name="Synchronization Capability API" class="api" filter="s60">
@@ -6143,10 +6106,6 @@
 </package>
 <package id="mmappfw" level="specific" tech-domain="mm" name="Multimedia App Framework" levels="fw utils if">
 <collection id="mmappfw_plat" name="Multimedia App Framework Platform Interfaces" level="if">
-<component id="mmappfw_plat_build" name="Multimedia App Framework Platform Interfaces Build" introduced="^1" filter="s60">
-<!-- this is no longer necessary when confguration is put in place -->
-<unit bldFile="/mw/mmappfw/mmappfw_plat"/>
-</component>
 <component id="collection_helper_api" name="Collection Helper API" introduced="^1" class="api" filter="s60">
 <unit bldFile="/mw/mmappfw/mmappfw_plat/collection_helper_api/group"/>
 </component>
@@ -6442,7 +6401,7 @@
 </collection>
 <collection id="qt_info" name="Qt Info" level="mw">
 <component id="qt_build" name="Qt Build" introduced="^2">
-<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt/." qt:proFile="projects.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
+<unit xmlns:qt="http://www.nokia.com/qt" bldFile="/mw/qt" qt:proFile="projects.pro" qt:qmakeArgs="&quot;QMAKE_MOC=/epoc32/tools/qt/moc.exe&quot; &quot;QMAKE_RCC=/epoc32/tools/qt/rcc.exe&quot; &quot;QMAKE_UIC=/epoc32/tools/qt/uic.exe&quot; -r"/>
 </component>
 </collection>
 <collection id="qtdemos" name="Qt Demos" level="app">
@@ -8288,9 +8247,6 @@
 </component>
 </collection>
 <collection id="gfxtools" name="Graphics Tools" level="tool">
-<component id="gditools" filter="s60" name="GDI Tools" target="desktop">
-<unit bldFile="/mw/uitools/gfxtools/gditools/group"/>
-</component>
 <component id="color" filter="s60" name="Bitmap Colour Palette" target="desktop">
 <unit bldFile="/mw/uitools/gfxtools/color/group"/>
 </component>
@@ -11095,14 +11051,14 @@
 <!-- consider collapsing into a single component -->
 <component id="fileopserver" filter="s60" name="File Operations Server" purpose="development" target="device" class="tool">
 <meta rel="config">
-<not-defined condition="FILEBROWSER_LITE"/>
+<not-defined xmlns:qt="http://www.nokia.com/qt" condition="FILEBROWSER_LITE"/>
 </meta>
 <!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
 <!-- <unit bldFile="filebrowser/fileopserver/group"/>-->
 </component>
 <component id="fileopclient" filter="s60" name="File Operations Client" purpose="development" target="device" class="tool">
 <meta rel="config">
-<not-defined condition="FILEBROWSER_LITE"/>
+<not-defined xmlns:qt="http://www.nokia.com/qt" condition="FILEBROWSER_LITE"/>
 </meta>
 <!-- uncomment the unit when configuration is in place, it's currently #included from filebrowser_build -->
 <!--<unit bldFile="filebrowser/fileopclient/group"/>-->
@@ -11137,16 +11093,10 @@
 </component>
 </collection>
 <collection id="stifui" name="STIF UI" level="generic">
-<component id="stifui_stifui" filter="s60" name="STIF UI" purpose="development" target="device">
-<unit bldFile="/app/rndtools/stifui/stifui/group"/>
-</component>
-<component id="uitestserverstarter" filter="s60" name="UI Test Server Starter" purpose="development" target="device">
-<unit bldFile="/app/rndtools/stifui/uitestserverstarter/group"/>
-</component>
-<component id="stifui_build" filter="s60" name="STIF UI Build" purpose="development">
-<!-- can this be split up into the other components or made a ROM component? -->
-<unit bldFile="/app/rndtools/stifui/group"/>
-</component>
+<component id="stifui_avkon" filter="s60" name="STIF UI for Avkon" purpose="development">
+<unit bldFile="/app/rndtools/stifui/avkon/group"/>
+</component>
+
 </collection>
 <collection id="memspyui" name="Memspy UI" level="generic">
 <!-- collection is really a component. Should move down a directory -->