diff -r b7b68fda01fc -r 6417401dfdf4 symbian3/single/sysdefs/sf3.svg
--- a/symbian3/single/sysdefs/sf3.svg	Tue Apr 13 18:38:54 2010 +0100
+++ b/symbian3/single/sysdefs/sf3.svg	Tue Apr 13 18:46:47 2010 +0100
@@ -1,7 +1,7 @@
 <?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 5156.2999999999975 825.2634607338003" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
- <title>Symbian OS ^3 System Model: %d %b %Y</title>
+<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 5085.7999999999975 826.9542039792772" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
+ <title>Symbian OS ^3 System Model: date</title>
  <defs>
   <style type="text/css">
     text.layer, text.package, text.collection, text.component,
@@ -424,15 +424,15 @@
  		}
 	]]></script>
  <g id="os" transform="translate(3.1999999999999993 399.83000000000004)" class="layer">
-  <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="227.03"/>
-  <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="227.03" height="9.3" x="-113.815">OS</text>
-  <g class="layer-detail" transform="translate(509.89999999999947 3.2)">
-   <rect x="-497.09999999999945" class="layer" y="-3.2" width="5133.899999999998" height="227.03"/>
+  <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(495.49999999999983 3.2)">
+   <rect x="-482.6999999999998" class="layer" y="-3.2" width="5063.399999999998" height="231.26000000000002"/>
    <g>
-    <g id="kernelhwsrv" class="package" transform="translate( 0 119.20000000000002)">
+    <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"/>
      <rect class="package" x="0" width="131.39999999999998" height="101.43" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="131.39999999999998" x="65.69999999999999" y="100.43">Kernel &amp; HW Services</text>
+     <text text-anchor="middle" class="package" width="131.39999999999998" x="65.69999999999999" y="100.42999999999999">Kernel &amp; HW Services</text>
      <g transform="translate(0 3.2)">
       <g id="brdbootldr" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -683,10 +683,10 @@
       </g>
      </g>
     </g>
-    <g id="boardsupport" class="package" transform="translate( 133.49999999999997 119.20000000000002)">
+    <g id="boardsupport" class="package" transform="translate( 133.49999999999997 123.43000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="101.43" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.43">Board Support</text>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="100.42999999999999">Board Support</text>
      <g transform="translate(0 3.2)">
       <g id="emulator" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -725,10 +725,10 @@
       </g>
      </g>
     </g>
-    <g id="buildtools" class="package" transform="translate( 163.49999999999997 119.20000000000002)">
+    <g id="buildtools" class="package" transform="translate( 163.49999999999997 123.43000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="45.6" height="101.43" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="45.6" x="22.8" y="100.43">Build Tools</text>
+     <text text-anchor="middle" class="package" width="45.6" x="22.8" y="100.42999999999999">Build Tools</text>
      <g transform="translate(0 3.2)">
       <g id="bldsystemtools" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
@@ -826,8 +826,8 @@
     </g>
     <g id="ossrv" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
-     <rect class="package" x="0" width="1029.599999999999" height="116.00000000000001" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="1029.599999999999" x="514.7999999999995" y="105" dy="0.375em">Generic OS Services</text>
+     <rect class="package" x="0" width="1029.599999999999" height="120.23000000000002" y="0" style="fill:tan;"/>
+     <text text-anchor="middle" class="package" width="1029.599999999999" x="514.7999999999995" y="119.23000000000002">Generic OS Services</text>
      <g transform="translate(0 3.2)">
       <g id="ossrv_pub" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="827.6999999999989"/>
@@ -1457,8 +1457,8 @@
        </g>
       </g>
       <g id="genericopenlibs" transform="translate(38.400000000000006 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">Generic Open Libraries</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Generic Open Libraries</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="cstdlib" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -1480,11 +1480,6 @@
          <use width="9.3" height="9.3" x="27.900000000000002" 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="32.550000000000004">POSIX Realtime Ext.</text>
         </g>
-        <g id="liboil" 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="37.2" 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="41.85">Liboil</text>
-        </g>
        </g>
       </g>
       <g id="lowlevellibsandfws" transform="translate(0 75.2)" class="collection">
@@ -1529,8 +1524,8 @@
     </g>
     <g id="persistentdata" class="package" transform="translate( 1031.699999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
-     <rect class="package" x="0" width="67.19999999999999" height="116.00000000000001" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="105" dy="0.375em">Persistent Data Services</text>
+     <rect class="package" x="0" width="67.19999999999999" height="120.23000000000002" y="0" style="fill:tan;"/>
+     <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="119.23000000000002">Persistent Data Services</text>
      <g transform="translate(0 3.2)">
       <g id="featuremgmt" transform="translate(0 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
@@ -1634,8 +1629,8 @@
     </g>
     <g id="devicesrv" class="package" transform="translate( 1100.9999999999989 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
-     <rect class="package" x="0" width="688.8000000000005" height="116.00000000000001" y="0" style="fill:tan;"/>
-     <text text-anchor="middle" class="package" width="688.8000000000005" x="344.40000000000026" y="105" dy="0.375em">Dev­ice Services</text>
+     <rect class="package" x="0" width="688.8000000000005" height="120.23000000000002" y="0" style="fill:tan;"/>
+     <text text-anchor="middle" class="package" width="688.8000000000005" x="344.40000000000026" y="119.23000000000002">Dev­ice Services</text>
      <g transform="translate(0 3.2)">
       <g id="devicesrv_pub" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="92.99999999999999"/>
@@ -2288,8 +2283,8 @@
     </g>
     <g id="security" class="package" transform="translate( 1791.8999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color1.mouseover" end="s8-color1.mouseout"/>
-     <rect class="package" x="0" width="93.3" height="116.00000000000001" y="0" style="fill:rgb(228,14,98);"/>
-     <text text-anchor="middle" class="package" width="93.3" x="46.65" y="105" dy="0.375em">OS Security</text>
+     <rect class="package" x="0" width="74.7" height="120.23000000000002" y="0" style="fill:rgb(228,14,98);"/>
+     <text text-anchor="middle" class="package" width="74.7" x="37.35" y="119.23000000000002">OS Security</text>
      <g transform="translate(0 3.2)">
       <g id="authenticationservices" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -2319,8 +2314,8 @@
        </g>
       </g>
       <g id="contentmgmt" transform="translate(38.400000000000006 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Content Manage­ment</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Content Manage­ment</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="contentaccessfwfordrm" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -2332,17 +2327,6 @@
          <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 2; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">CAF Recogniser Config</text>
         </g>
-        <g id="referencedrmagent" 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="18.6" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);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">Reference DRM Agent</text>
-        </g>
-        <g id="cafstreamingsupport" 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="27.900000000000002" 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="32.550000000000004">CAF Streaming Support</text>
-        </g>
        </g>
       </g>
       <g id="crypto" transform="translate(0 56.400000000000006)" class="collection">
@@ -2446,7 +2430,7 @@
         </g>
        </g>
       </g>
-      <g id="security_info" transform="translate(77.7 0)" class="collection">
+      <g id="security_info" transform="translate(59.10000000000001 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">OS Security Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -2460,10 +2444,10 @@
       </g>
      </g>
     </g>
-    <g id="lbs" class="package" transform="translate( 1887.2999999999995 0)">
+    <g id="lbs" class="package" transform="translate( 1868.6999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
-     <rect class="package" x="0" width="71.7" height="116.00000000000001" y="0" style="fill:whitesmoke;"/>
-     <text text-anchor="middle" class="package" width="71.7" x="35.85" y="115.00000000000001">Locating Services</text>
+     <rect class="package" x="0" width="71.7" height="120.23000000000002" y="0" style="fill:whitesmoke;"/>
+     <text text-anchor="middle" class="package" width="71.7" x="35.85" y="119.23000000000002">Locating Services</text>
      <g transform="translate(0 3.2)">
       <g id="datasourcemodules" transform="translate(0 56.400000000000006)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
@@ -2581,16 +2565,15 @@
          <use width="9.3" height="9.3" x="0" y="0" xlink:href="#BorderShape2" 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">Privacy Protocol Module</text>
         </g>
+        <g id="networkprotoutils" 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">Network Protocol Common Utilities</text>
+        </g>
         <g id="suplproxyprotocolmodule" 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="#BorderShape2" 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">SUPL Proxy Protocol Module</text>
-        </g>
-        <g id="suplprotocolmodule" 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="18.6" y="0" xlink:href="#BorderShape2" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <use width="9.3" height="9.3" x="18.6" y="0" style="fill:url(#PatternOverlay4); stroke: none; stroke-width: 0;" xlink:href="#BorderShape2"/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">SUPL Protocol Module</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">SUPL Proxy Protocol Module</text>
         </g>
         <g id="suplrrlpasn1" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -2623,10 +2606,10 @@
       </g>
      </g>
     </g>
-    <g id="commsfw" class="package" transform="translate( 1961.0999999999995 0)">
+    <g id="commsfw" class="package" transform="translate( 1942.4999999999993 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="66.30000000000001" height="116.00000000000001" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="66.30000000000001" x="33.150000000000006" y="115.00000000000001">Comms Frame­work</text>
+     <rect class="package" x="0" width="66.30000000000001" height="120.23000000000002" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="66.30000000000001" x="33.150000000000006" y="119.23000000000002">Comms Frame­work</text>
      <g transform="translate(0 3.2)">
       <g id="commsprocess" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -2790,10 +2773,10 @@
       </g>
      </g>
     </g>
-    <g id="networkingsrv" class="package" transform="translate( 2029.4999999999995 0)">
+    <g id="networkingsrv" class="package" transform="translate( 2010.8999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="170.70000000000002" height="116.00000000000001" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="170.70000000000002" x="85.35000000000001" y="105" dy="0.375em">Network­ing Services</text>
+     <rect class="package" x="0" width="170.70000000000002" height="120.23000000000002" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="170.70000000000002" x="85.35000000000001" y="119.23000000000002">Network­ing Services</text>
      <g transform="translate(0 3.2)">
       <g id="esockapiextensions" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -3050,10 +3033,10 @@
       </g>
      </g>
     </g>
-    <g id="wlan" class="package" transform="translate( 2202.2999999999997 0)">
+    <g id="wlan" class="package" transform="translate( 2183.6999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
-     <rect class="package" x="0" width="192.6" height="116.00000000000001" y="0" style="fill:moccasin;"/>
-     <text text-anchor="middle" class="package" width="192.6" x="96.3" y="86.2" dy="0.375em">WLAN</text>
+     <rect class="package" x="0" width="192.6" height="120.23000000000002" y="0" style="fill:moccasin;"/>
+     <text text-anchor="middle" class="package" width="192.6" x="96.3" y="119.23000000000002">WLAN</text>
      <g transform="translate(0 3.2)">
       <g id="wlan_plat" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="139.5"/>
@@ -3202,10 +3185,10 @@
       </g>
      </g>
     </g>
-    <g id="cellularsrv" class="package" transform="translate( 2396.9999999999995 0)">
+    <g id="cellularsrv" class="package" transform="translate( 2378.399999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
-     <rect class="package" x="0" width="101.39999999999998" height="116.00000000000001" y="0" style="fill:darkkhaki;"/>
-     <text text-anchor="middle" class="package" width="85.79999999999998" x="58.499999999999986" y="86.2" dy="0.375em">Cellular Baseband Services</text>
+     <rect class="package" x="0" width="101.39999999999998" height="120.23000000000002" y="0" style="fill:darkkhaki;"/>
+     <text text-anchor="middle" class="package" width="101.39999999999998" x="50.69999999999999" y="119.23000000000002">Cellular Baseband Services</text>
      <g transform="translate(0 3.2)">
       <g id="basebandabstraction" transform="translate(0 75.2)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -3432,10 +3415,10 @@
       </g>
      </g>
     </g>
-    <g id="bt" class="package" transform="translate( 2500.4999999999995 0)">
+    <g id="bt" class="package" transform="translate( 2481.899999999999 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="81" height="116.00000000000001" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="81" x="40.5" y="105" dy="0.375em">Blue­tooth</text>
+     <rect class="package" x="0" width="81" height="120.23000000000002" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="81" x="40.5" y="119.23000000000002">Blue­tooth</text>
      <g transform="translate(0 3.2)">
       <g id="bt_plat" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
@@ -3599,22 +3582,11 @@
       </g>
      </g>
     </g>
-    <g id="usb" class="package" transform="translate( 2583.5999999999995 0)">
+    <g id="usb" class="package" transform="translate( 2564.999999999999 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="33.3" height="116.00000000000001" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="33.3" x="16.65" y="105" dy="0.375em">USB</text>
-     <g transform="translate(0 3.2)">
-      <g id="usb_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">USB Platform Interfaces</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="usb_audio_stream_plugin_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">USB Audio Stream Plugin API</text>
-        </g>
-       </g>
-      </g>
+     <rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="119.23000000000002">USB</text>
+     <g transform="translate(0 3.2)">
       <g id="usbldd" transform="translate(0 75.2)" 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">USB Logical Dev­ice Drivers</text>
@@ -3637,7 +3609,7 @@
         </g>
        </g>
       </g>
-      <g id="usb_info" transform="translate(17.7 0)" class="collection">
+      <g id="usb_info" 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">USB Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -3651,10 +3623,10 @@
       </g>
      </g>
     </g>
-    <g id="mm" class="package" transform="translate( 2618.9999999999995 0)">
+    <g id="mm" class="package" transform="translate( 2594.999999999999 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="795.8999999999996" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="749.3999999999996" x="421.1999999999998" y="86.2" dy="0.375em">Multi­media</text>
+     <rect class="package" x="0" width="778.1999999999996" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="778.1999999999996" x="389.0999999999998" y="119.23000000000002">Multi­media</text>
      <g transform="translate(0 3.2)">
       <g id="mm_pub" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
@@ -4393,24 +4365,12 @@
         </g>
        </g>
       </g>
-      <g id="mmapitest" transform="translate(780.2999999999996 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">Multi­media API Tests</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="mmsvs" 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; "/>
-         <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">MM Verifica­tion Suite</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="imagingext" class="package" transform="translate( 3416.999999999999 0)">
+     </g>
+    </g>
+    <g id="imagingext" class="package" transform="translate( 3375.299999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-     <rect class="package" x="0" width="94.2" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="94.2" x="47.1" y="105" dy="0.375em">Imaging Exten­sions</text>
+     <rect class="package" x="0" width="94.2" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
+     <text text-anchor="middle" class="package" width="94.2" x="47.1" y="119.23000000000002">Imaging Exten­sions</text>
      <g transform="translate(0 3.2)">
       <g id="imagingext_pub" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -4493,10 +4453,10 @@
       </g>
      </g>
     </g>
-    <g id="graphics" class="package" transform="translate( 3513.2999999999993 0)">
+    <g id="graphics" class="package" transform="translate( 3471.599999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="113.1" height="116.00000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="97.5" x="64.35" y="29.8" dy="0.375em">Graphics</text>
+     <rect class="package" x="0" width="113.1" height="120.23000000000002" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="113.1" x="56.55" y="119.23000000000002">Graphics</text>
      <g transform="translate(0 3.2)">
       <g id="graphicsaccelaration" transform="translate(0 94)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -4793,10 +4753,10 @@
       </g>
      </g>
     </g>
-    <g id="textandloc" class="package" transform="translate( 3628.499999999999 0)">
+    <g id="textandloc" class="package" transform="translate( 3586.799999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-     <rect class="package" x="0" width="84" height="116.00000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="84" x="42" y="115.00000000000001">Text &amp; Localis­ation Services</text>
+     <rect class="package" x="0" width="84" height="120.23000000000002" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="84" x="42" y="119.23000000000002">Text &amp; Localis­ation Services</text>
      <g transform="translate(0 3.2)">
       <g id="textandloc_plat" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
@@ -4986,10 +4946,10 @@
       </g>
      </g>
     </g>
-    <g id="xmlsrv" class="package" transform="translate( 3714.599999999999 0)">
+    <g id="xmlsrv" class="package" transform="translate( 3672.8999999999987 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
-     <rect class="package" x="0" width="65.1" height="116.00000000000001" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="65.1" x="32.55" y="115.00000000000001">XML Services</text>
+     <rect class="package" x="0" width="65.1" height="120.23000000000002" y="0" style="fill:slateblue;"/>
+     <text text-anchor="middle" class="package" width="65.1" x="32.55" y="119.23000000000002">XML Services</text>
      <g transform="translate(0 3.2)">
       <g id="xmlsrv_plat" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
@@ -5101,10 +5061,10 @@
       </g>
      </g>
     </g>
-    <g id="deviceplatformrelease" class="package" transform="translate( 3781.799999999999 0)">
+    <g id="deviceplatformrelease" class="package" transform="translate( 3740.0999999999985 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-     <rect class="package" x="0" width="196.5" height="116.00000000000001" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="196.5" x="98.25" y="115.00000000000001">Dev­ice Platform Release</text>
+     <rect class="package" x="0" width="196.5" height="120.23000000000002" y="0" style="fill:darkgray;"/>
+     <text text-anchor="middle" class="package" width="196.5" x="98.25" y="119.23000000000002">Dev­ice Platform Release</text>
      <g transform="translate(0 3.2)">
       <g id="s60extras" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -5301,10 +5261,10 @@
       </g>
      </g>
     </g>
-    <g id="osrndtools" class="package" transform="translate( 3980.3999999999987 0)">
+    <g id="osrndtools" class="package" transform="translate( 3938.6999999999985 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-     <rect class="package" x="0" width="159.29999999999998" height="116.00000000000001" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="159.29999999999998" x="79.64999999999999" y="115.00000000000001">OS R&amp;D tools</text>
+     <rect class="package" x="0" width="159.29999999999998" height="120.23000000000002" y="0" style="fill:darkgray;"/>
+     <text text-anchor="middle" class="package" width="159.29999999999998" x="79.64999999999999" y="119.23000000000002">OS R&amp;D tools</text>
      <g transform="translate(0 3.2)">
       <g id="stif" transform="translate(0 18.8)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="139.5"/>
@@ -5526,7 +5486,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="5133.899999999998" height="222.8"/>
+   <rect x="0" class="layer" y="-3.2" width="5063.399999999998" 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"/>
@@ -6557,8 +6517,8 @@
     </g>
     <g id="locationsrv" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
-     <rect class="package" x="0" width="280.2000000000001" height="97.2" y="0" style="fill:whitesmoke;"/>
-     <text text-anchor="middle" class="package" width="280.2000000000001" x="140.10000000000005" y="96.2">Location Services</text>
+     <rect class="package" x="0" width="289.5000000000001" height="97.2" y="0" style="fill:whitesmoke;"/>
+     <text text-anchor="middle" class="package" width="289.5000000000001" x="144.75000000000006" y="96.2">Location Services</text>
      <g transform="translate(0 3.2)">
       <g id="locsrv_pub" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
@@ -6592,8 +6552,8 @@
        </g>
       </g>
       <g id="locsrv_plat" transform="translate(48.6 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">Location Services Platform Inter­faces</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="223.2000000000001"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="221.8000000000001" height="6.299999999999999">Location Services Platform Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="map_and_navigation_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -6710,6 +6670,11 @@
          <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">Location Local Variation API</text>
         </g>
+        <g id="query_and_notification_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="213.9000000000001" 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="218.5500000000001">Query and Notification API</text>
+        </g>
        </g>
       </g>
       <g id="genericpositioningplugins" transform="translate(0 56.400000000000006)" class="collection">
@@ -6765,7 +6730,7 @@
         </g>
        </g>
       </g>
-      <g id="locationsystemui" transform="translate(264.6000000000001 0)" class="collection">
+      <g id="locationsystemui" transform="translate(273.9000000000001 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Location System UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -7537,7 +7502,7 @@
       </g>
      </g>
     </g>
-    <g id="wirelessacc" class="package" transform="translate( 282.3000000000001 0)">
+    <g id="wirelessacc" class="package" transform="translate( 291.60000000000014 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="65.1" height="97.2" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="65.1" x="32.55" y="96.2">Wireless Access</text>
@@ -7643,7 +7608,7 @@
       </g>
      </g>
     </g>
-    <g id="vpnclient" class="package" transform="translate( 349.5000000000001 0)">
+    <g id="vpnclient" class="package" transform="translate( 358.8000000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="260.40000000000015" height="97.2" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="260.40000000000015" x="130.20000000000007" y="96.2">VPN Client</text>
@@ -7865,7 +7830,7 @@
       </g>
      </g>
     </g>
-    <g id="ipappsrv" class="package" transform="translate( 612.0000000000003 0)">
+    <g id="ipappsrv" class="package" transform="translate( 621.3000000000003 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
      <rect class="package" x="0" width="115.8" height="97.2" y="0" style="fill:darkkhaki;"/>
      <text text-anchor="middle" class="package" width="115.8" x="57.9" y="48.6" dy="0.375em">IP App Services</text>
@@ -7984,7 +7949,7 @@
       </g>
      </g>
     </g>
-    <g id="phonesrv" class="package" transform="translate( 729.9000000000003 0)">
+    <g id="phonesrv" class="package" transform="translate( 739.2000000000003 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color3.mouseover" end="s8-color3.mouseout"/>
      <rect class="package" x="0" width="409.50000000000034" height="97.2" y="0" style="fill:darkkhaki;"/>
      <text text-anchor="middle" class="package" width="373.20000000000033" x="222.90000000000018" y="86.2" dy="0.375em">Telephony &amp; SIM Services</text>
@@ -8382,7 +8347,7 @@
       </g>
      </g>
     </g>
-    <g id="messagingmw" class="package" transform="translate( 1141.5000000000005 0)">
+    <g id="messagingmw" class="package" transform="translate( 1150.8000000000006 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="147.89999999999998" height="97.2" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="147.89999999999998" x="73.94999999999999" y="96.2">Messag­ing Middle­ware</text>
@@ -8532,7 +8497,7 @@
       </g>
      </g>
     </g>
-    <g id="imsrv" class="package" transform="translate( 1291.5000000000005 0)">
+    <g id="imsrv" class="package" transform="translate( 1300.8000000000006 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="259.50000000000017" height="97.2" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="259.50000000000017" x="129.75000000000009" y="86.2" dy="0.375em">Instant Msg. &amp; Presence Services</text>
@@ -8733,7 +8698,7 @@
       </g>
      </g>
     </g>
-    <g id="legacypresence" class="package" transform="translate( 1553.1000000000006 0)">
+    <g id="legacypresence" class="package" transform="translate( 1562.4000000000008 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="156.29999999999995" height="97.2" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="156.29999999999995" x="78.14999999999998" y="96.2">Legacy Presence Services</text>
@@ -8899,7 +8864,7 @@
       </g>
      </g>
     </g>
-    <g id="opensrv" class="package" transform="translate( 1711.5000000000005 0)">
+    <g id="opensrv" class="package" transform="translate( 1720.8000000000006 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="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>
@@ -8971,10 +8936,10 @@
       </g>
      </g>
     </g>
-    <g id="remotemgmt" class="package" transform="translate( 1746.9000000000005 0)">
+    <g id="remotemgmt" class="package" transform="translate( 1756.2000000000007 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="440.4000000000003" height="97.2" y="0" style="fill:darkseagreen;"/>
-     <text text-anchor="middle" class="package" width="440.4000000000003" x="220.20000000000016" y="86.2" dy="0.375em">Remote Manage­ment</text>
+     <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>
      <g transform="translate(0 3.2)">
       <g id="remotemgmt_pub" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -8988,8 +8953,8 @@
        </g>
       </g>
       <g id="remotemgmt_plat" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="353.40000000000026"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="352.0000000000003" height="6.299999999999999">Remote Mgmt. Platform Inter­faces</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="372.0000000000003"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="370.6000000000003" height="6.299999999999999">Remote Mgmt. Platform Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="common_agent_util_and_definitions_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -9181,6 +9146,16 @@
          <use width="9.3" height="9.3" x="344.10000000000025" 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="348.7500000000002">DM Native Notifier API</text>
         </g>
+        <g id="syncml_ds_error_reporting_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="353.40000000000026" 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="358.05000000000024">SyncML DS Error Reporting API</text>
+        </g>
+        <g id="syncml_ds_customization_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="362.7000000000003" 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="367.35000000000025">SyncML DS Customization API</text>
+        </g>
        </g>
       </g>
       <g id="policymanagement" transform="translate(0 18.8)" class="collection">
@@ -9220,7 +9195,7 @@
         </g>
        </g>
       </g>
-      <g id="terminalsecurity" transform="translate(373.2000000000003 0)" class="collection">
+      <g id="terminalsecurity" transform="translate(391.8000000000003 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Terminal Security</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9251,7 +9226,7 @@
         </g>
        </g>
       </g>
-      <g id="omaprovisioning" transform="translate(421.8000000000003 0)" class="collection">
+      <g id="omaprovisioning" transform="translate(440.4000000000003 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">OMA Provision­ing</text>
        <g transform="translate(0 6.299999999999999)">
@@ -9608,7 +9583,7 @@
       </g>
      </g>
     </g>
-    <g id="dlnasrv" class="package" transform="translate( 2189.400000000001 0)">
+    <g id="dlnasrv" class="package" transform="translate( 2217.300000000001 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>
@@ -10115,6 +10090,22 @@
         </g>
        </g>
       </g>
+      <g id="atcommands" 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">AT Commands</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="modematplugin" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Modem AT Plugin</text>
+        </g>
+        <g id="lccustomplugin" class="component">
+         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">LC Custom Plugin</text>
+        </g>
+       </g>
+      </g>
       <g id="btservices_info" transform="translate(161.39999999999998 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">BT Services Info</text>
@@ -10287,8 +10278,8 @@
     </g>
     <g id="shortlinkconn" class="package" transform="translate( 1885.7999999999997 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
-     <rect class="package" x="0" width="102.29999999999998" height="116.00000000000001" y="0" style="fill:orchid;"/>
-     <text text-anchor="middle" class="package" width="102.29999999999998" x="51.14999999999999" y="115.00000000000003">Shortlink Connectivity</text>
+     <rect class="package" x="0" width="74.39999999999999" height="116.00000000000001" y="0" style="fill:orchid;"/>
+     <text text-anchor="middle" class="package" width="74.39999999999999" x="37.199999999999996" y="115.00000000000003">Shortlink Connectivity</text>
      <g transform="translate(0 3.2)">
       <g id="shortlinkconn_plat" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
@@ -10337,8 +10328,8 @@
        </g>
       </g>
       <g id="localconnectivityservice" transform="translate(0 56.400000000000006)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="102.29999999999998"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="100.89999999999998" height="6.299999999999999">Local Connectivity Service</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Local Connectivity Service</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="locod" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -10365,41 +10356,26 @@
          <use width="9.3" height="9.3" x="37.2" 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="41.85">Dial Up Networking</text>
         </g>
-        <g id="lccustomplugin" class="component">
+        <g id="lcstylustap" 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="46.5" y="0" xlink:href="#BorderShape2" 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="51.15">LC Custom Plugins</text>
-        </g>
-        <g id="lcstylustap" 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="55.8" y="0" xlink:href="#BorderShape2" 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="60.449999999999996">LC Stylus Tap Plugins</text>
-        </g>
-        <g id="legacymodemplugin" 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="65.1" y="0" xlink:href="#BorderShape2" 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="69.75">Legacy Modem Plugin</text>
-        </g>
-        <g id="modematplugin" 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="74.39999999999999" y="0" xlink:href="#BorderShape2" 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="79.05">Modem AT Plugin</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">LC Stylus Tap Plugins</text>
         </g>
         <g id="generichid" 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="83.69999999999999" 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="88.35">Generic HID</text>
+         <use width="9.3" height="9.3" x="55.8" 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="60.449999999999996">Generic HID</text>
         </g>
         <g id="headset" 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="92.99999999999999" 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="97.64999999999999">Headset</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="imghandling" class="package" transform="translate( 2350.800000000001 0)">
+         <use width="9.3" height="9.3" x="65.1" 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="69.75">Headset</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="imghandling" class="package" transform="translate( 2378.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="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>
@@ -10449,18 +10425,19 @@
       </g>
      </g>
     </g>
-    <g id="metadatasrv" class="package" transform="translate( 2380.800000000001 0)">
+    <g id="metadatasrv" class="package" transform="translate( 2408.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="48.6" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
-     <text text-anchor="middle" class="package" width="48.6" x="24.3" y="86.2" dy="0.375em">Legacy Metadata Services</text>
+     <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>
      <g transform="translate(0 3.2)">
       <g id="metadatasrv_pub" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Legacy Metadata Services Public Inter­faces</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="content_listing_framework_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; "/>
+       <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">Legacy Metadata Services Public Inter­faces</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="content_listing_framework_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="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="0" 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="4.65">Content Listing Framework API</text>
         </g>
         <g id="media_fetch_api" class="component">
@@ -10468,27 +10445,39 @@
          <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">Media Fetch API</text>
         </g>
-       </g>
-      </g>
-      <g id="metadatasrv_plat" transform="translate(20.700000000000003 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Legacy Metadata Services Platform Inter­faces</text>
+        <g id="metadatasrv_pub_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="#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">Legacy Metadata Services Public Interface Build</text>
+        </g>
+       </g>
+      </g>
+      <g id="metadatasrv_plat" transform="translate(30.000000000000004 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Legacy Metadata Services Platform Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="media_fetch_implementation_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">Media Fetch Implementation API</text>
         </g>
-        <g id="content_listing_framework_collection_manager_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; "/>
+        <g id="content_listing_framework_collection_manager_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="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="9.3" 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="13.950000000000001">Content Listing Framework Collection Manager API</text>
         </g>
-        <g id="content_listing_framework_extended_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; "/>
+        <g id="content_listing_framework_extended_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="18.6" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="18.6" 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="23.25">Content Listing Framework Extended API</text>
         </g>
+        <g id="metadatasrv_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="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">Legacy Metadata Services Platform Interface Build</text>
+        </g>
        </g>
       </g>
       <g id="mediamanagementutilities" transform="translate(0 18.8)" class="collection">
@@ -10504,7 +10493,7 @@
       </g>
      </g>
     </g>
-    <g id="mds" class="package" transform="translate( 2431.500000000001 0)">
+    <g id="mds" class="package" transform="translate( 2478.0000000000014 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>
@@ -10711,7 +10700,7 @@
       </g>
      </g>
     </g>
-    <g id="mmuifw" class="package" transform="translate( 2577.300000000001 0)">
+    <g id="mmuifw" class="package" transform="translate( 2623.8000000000015 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>
@@ -10910,7 +10899,7 @@
       </g>
      </g>
     </g>
-    <g id="videoutils" class="package" transform="translate( 2728.200000000001 0)">
+    <g id="videoutils" class="package" transform="translate( 2774.7000000000016 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>
@@ -10975,7 +10964,7 @@
       </g>
      </g>
     </g>
-    <g id="mmmw" class="package" transform="translate( 1990.1999999999998 100.4)">
+    <g id="mmmw" class="package" transform="translate( 1962.2999999999997 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
      <rect class="package" x="0" width="317.4000000000001" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="317.4000000000001" x="158.70000000000005" y="115.00000000000003">Multi­media Middle­ware</text>
@@ -11212,7 +11201,7 @@
       </g>
      </g>
     </g>
-    <g id="helix" class="package" transform="translate( 2309.7 100.4)">
+    <g id="helix" class="package" transform="translate( 2281.7999999999997 100.4)">
      <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="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="115.00000000000003">Helix</text>
@@ -11230,7 +11219,7 @@
       </g>
      </g>
     </g>
-    <g id="camerasrv" class="package" transform="translate( 2775.900000000001 0)">
+    <g id="camerasrv" class="package" transform="translate( 2822.4000000000015 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>
@@ -11344,14 +11333,14 @@
       </g>
      </g>
     </g>
-    <g id="mmappfw" class="package" transform="translate( 2887.800000000001 0)">
+    <g id="mmappfw" class="package" transform="translate( 2934.3000000000015 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="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>
+     <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>
      <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="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>
+       <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"/>
@@ -11443,14 +11432,16 @@
          <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">
+        <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="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">
+        <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="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">
@@ -11463,6 +11454,11 @@
          <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>
+        </g>
        </g>
       </g>
       <g id="mpx" transform="translate(0 37.6)" class="collection">
@@ -11559,7 +11555,7 @@
         </g>
        </g>
       </g>
-      <g id="mmappfw_info" transform="translate(206.70000000000007 0)" class="collection">
+      <g id="mmappfw_info" transform="translate(216.00000000000009 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)">
@@ -11579,10 +11575,10 @@
       </g>
      </g>
     </g>
-    <g id="inputmethods" class="package" transform="translate( 2339.7 100.4)">
+    <g id="inputmethods" class="package" transform="translate( 2311.7999999999997 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="213.9000000000001" height="116.00000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="213.9000000000001" x="106.95000000000005" y="115.00000000000003">Input Methods</text>
+     <rect class="package" x="0" width="195.30000000000007" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="195.30000000000007" x="97.65000000000003" y="115.00000000000003">Input Methods</text>
      <g transform="translate(0 3.2)">
       <g id="inputmethods_pub" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
@@ -11657,8 +11653,8 @@
        </g>
       </g>
       <g id="textinput" transform="translate(0 18.8)" 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">Text Input</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="195.30000000000007"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="193.90000000000006" height="6.299999999999999">Text Input</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="ptienginev2" class="component placeholder">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -11671,110 +11667,100 @@
          <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">Avkon Input Language</text>
         </g>
-        <g id="ptihangulcore" 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">PIT Hangul Core</text>
-        </g>
-        <g id="ptikoreanqwertycore" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">PTI Korean QWERTY Core</text>
-        </g>
         <g id="peninputarc" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Pen Input Arc</text>
+         <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">Pen Input Arc</text>
         </g>
         <g id="peninputcommonctrls" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Pen Input Common Controls</text>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Pen Input Common Controls</text>
         </g>
         <g id="peninputhwrboxcn" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Chinese Handwriting Recog­nition Box</text>
+         <use width="9.3" height="9.3" x="37.2" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Chinese Handwriting Recog­nition Box</text>
         </g>
         <g id="peninputvkbcn" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Chinese Virtual Keyboard</text>
+         <use width="9.3" height="9.3" x="46.5" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Chinese Virtual Keyboard</text>
         </g>
         <g id="peninputcommonlayout" 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="#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="79.05">Pen Input Common Layout</text>
+         <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Pen Input Common Layout</text>
         </g>
         <g id="peninputgenerichwr" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Pen Input Generic Handwriting Recog­nition</text>
+         <use width="9.3" height="9.3" x="65.1" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Pen Input Generic Handwriting Recog­nition</text>
         </g>
         <g id="peninputgenericvkb" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Pen Input Generic Virtual Keyboard</text>
+         <use width="9.3" height="9.3" x="74.39999999999999" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Pen Input Generic Virtual Keyboard</text>
         </g>
         <g id="peninputcommonctrlsjp" 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="#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="106.94999999999999">Pen Input Common Controls Japanese</text>
+         <use width="9.3" height="9.3" x="83.69999999999999" 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="88.35">Pen Input Common Controls Japanese</text>
         </g>
         <g id="peninputhwrboxjp" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Japanese Handwriting Recog­nition Box</text>
+         <use width="9.3" height="9.3" x="92.99999999999999" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Japanese Handwriting Recog­nition Box</text>
         </g>
         <g id="peninputvkbjp" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Japanese Virtual Keyboard</text>
+         <use width="9.3" height="9.3" x="102.29999999999998" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Japanese Virtual Keyboard</text>
         </g>
         <g id="gslangplugin" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">GS Language Plugin</text>
+        </g>
+        <g id="peninputgenericitut" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Pen Input Generic ITU-T</text>
+        </g>
+        <g id="peninputhwrtrui" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">GS Language Plugin</text>
-        </g>
-        <g id="peninputgenericitut" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Pen Input Handwriting Recognition Training UI</text>
+        </g>
+        <g id="peninputhwrfscn" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Pen Input Generic ITU-T</text>
-        </g>
-        <g id="peninputhwrtrui" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Pen Input Chinese Full Screen Handwriting Recognition</text>
+        </g>
+        <g id="peninputvkbkr" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Pen Input Handwriting Recognition Training UI</text>
-        </g>
-        <g id="peninputhwrfscn" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Pen Input Korean Virtual Keyboard</text>
+        </g>
+        <g id="peninputfingerhwr" 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="158.10000000000002" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Pen Input Chinese Full Screen Handwriting Recognition</text>
-        </g>
-        <g id="peninputvkbkr" 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="167.40000000000003" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Pen Input Korean Virtual Keyboard</text>
-        </g>
-        <g id="peninputfingerhwr" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Pen Input Finger Handwriting Recognition</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Pen Input Finger Handwriting Recognition</text>
         </g>
         <g id="peninputsplititut" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Pen Input Split ITU-T</text>
+         <use width="9.3" height="9.3" x="167.40000000000003" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Pen Input Split ITU-T</text>
         </g>
         <g id="peninputsplitqwerty" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="199.95000000000007">Pen Input Split QWERTY</text>
+         <use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Pen Input Split QWERTY</text>
         </g>
         <g id="textinput_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="#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="209.25000000000009">Text Input Build</text>
+         <use width="9.3" height="9.3" x="186.00000000000006" 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="190.65000000000006">Text Input Build</text>
         </g>
        </g>
       </g>
@@ -11808,13 +11794,74 @@
       </g>
      </g>
     </g>
-    <g id="qt" class="package placeholder" transform="translate( 2555.7 100.4)">
+    <g id="qt" class="package" transform="translate( 2509.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="78" height="116.00000000000001" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="57.00000000000003" dy="0.375em" height="15.600000000000001">Qt</text>
-     <g transform="translate(0 3.2)"/>
-    </g>
-    <g id="classicui" class="package" transform="translate( 2635.7999999999997 100.4)">
+     <rect class="package" x="0" width="54" height="116.00000000000001" y="0" style="fill:orange;"/>
+     <text text-anchor="middle" class="package" width="54" x="27" y="115.00000000000003">Qt</text>
+     <g transform="translate(0 3.2)">
+      <g id="qtconf" 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">Qt Config</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="qt_deviceconfiguration" 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-clipAll" 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">Qt Device Configuration</text>
+        </g>
+       </g>
+      </g>
+      <g id="qt_info" transform="translate(0 18.8)" 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">Qt Info</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="qt_build" 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">Qt Build</text>
+        </g>
+       </g>
+      </g>
+      <g id="qtdemos" 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">Qt Demos</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="qtdemos_build" 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">Qt Demos Build</text>
+        </g>
+       </g>
+      </g>
+      <g id="qtexamples" 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">Qt Examples</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="qtexamples_build" 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">Qt Examples Build</text>
+        </g>
+       </g>
+      </g>
+      <g id="qt_tests" transform="translate(35.4 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">Qt Tests</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="qttestsauto" 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">Qt Automated Tests</text>
+        </g>
+        <g id="qttestsbenchmarks" 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">Qt Benchmarks Tests</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="classicui" class="package" transform="translate( 2565.2999999999997 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>
@@ -12806,7 +12853,7 @@
       </g>
      </g>
     </g>
-    <g id="svgt" class="package" transform="translate( 4148.999999999999 100.4)">
+    <g id="svgt" class="package" transform="translate( 4078.4999999999986 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>
@@ -12845,7 +12892,7 @@
       </g>
      </g>
     </g>
-    <g id="uiaccelerator" class="package" transform="translate( 4178.999999999999 100.4)">
+    <g id="uiaccelerator" class="package" transform="translate( 4108.499999999999 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>
@@ -12904,7 +12951,7 @@
       </g>
      </g>
     </g>
-    <g id="uiresources" class="package" transform="translate( 4236.899999999999 100.4)">
+    <g id="uiresources" class="package" transform="translate( 4166.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="280.5" height="116.00000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="280.5" x="140.25" y="105" dy="0.375em">UI Resources</text>
@@ -13169,7 +13216,7 @@
       </g>
      </g>
     </g>
-    <g id="hapticsservices" class="package" transform="translate( 4519.499999999999 100.4)">
+    <g id="hapticsservices" class="package" transform="translate( 4448.999999999999 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">Haptics Services</text>
@@ -13255,7 +13302,7 @@
       </g>
      </g>
     </g>
-    <g id="gsprofilesrv" class="package" transform="translate( 4577.399999999999 100.4)">
+    <g id="gsprofilesrv" class="package" transform="translate( 4506.899999999999 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>
@@ -13366,14 +13413,14 @@
       </g>
      </g>
     </g>
-    <g id="homescreensrv" class="package" transform="translate( 3115.200000000001 0)">
+    <g id="homescreensrv" class="package" transform="translate( 3171.000000000002 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="204.60000000000008" height="97.2" y="0" style="fill:orange;"/>
-     <text text-anchor="middle" class="package" width="168.30000000000007" x="120.45000000000005" y="29.8" dy="0.375em">Home Screen Services</text>
+     <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>
      <g transform="translate(0 3.2)">
       <g id="homescreensrv_plat" transform="translate(0 0)" class="collection">
-       <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">Home Screen Services Platform Inter­faces</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="195.30000000000007"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="193.90000000000006" height="6.299999999999999">Home Screen Services Platform Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="ai_content_model_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -13470,20 +13517,15 @@
          <use width="9.3" height="9.3" x="167.40000000000003" 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="172.05000000000004">Home Screen Publishing API</text>
         </g>
-        <g id="context_utility_api" class="component">
+        <g id="hs_settings_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; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">UI Context Utility API</text>
-        </g>
-        <g id="hs_settings_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">HS Settings API</text>
+        </g>
+        <g id="hs_content_control_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">HS Settings API</text>
-        </g>
-        <g id="hs_content_control_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="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">HS Content Control API</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">HS Content Control API</text>
         </g>
        </g>
       </g>
@@ -13645,17 +13687,6 @@
         </g>
        </g>
       </g>
-      <g id="contextutility" transform="translate(20.700000000000003 18.8)" 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">Context Utility</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="contextutility_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">Context Utility Build</text>
-        </g>
-       </g>
-      </g>
       <g id="contentcontrolsrv" transform="translate(66.3 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">Content Control Service</text>
@@ -13694,7 +13725,7 @@
       </g>
      </g>
     </g>
-    <g id="appinstall" class="package" transform="translate( 4683.899999999999 100.4)">
+    <g id="appinstall" class="package" transform="translate( 4613.399999999999 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="166.79999999999998" height="116.00000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="166.79999999999998" x="83.39999999999999" y="115.00000000000003">App Install­ation</text>
@@ -13894,7 +13925,7 @@
       </g>
      </g>
     </g>
-    <g id="serviceapifw" class="package" transform="translate( 3321.9000000000015 0)">
+    <g id="serviceapifw" class="package" transform="translate( 3368.400000000002 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>
@@ -13994,7 +14025,7 @@
       </g>
      </g>
     </g>
-    <g id="serviceapi" class="package" transform="translate( 3425.4000000000015 0)">
+    <g id="serviceapi" class="package" transform="translate( 3471.900000000002 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>
@@ -14072,10 +14103,10 @@
       </g>
      </g>
     </g>
-    <g id="web" class="package" transform="translate( 3548.4000000000015 0)">
+    <g id="web" class="package" transform="translate( 3594.900000000002 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="319.50000000000006" height="97.2" y="0" style="fill:slateblue;"/>
-     <text text-anchor="middle" class="package" width="319.50000000000006" x="159.75000000000003" y="86.2" dy="0.375em">Web</text>
+     <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>
      <g transform="translate(0 3.2)">
       <g id="web_pub" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="55.8"/>
@@ -14114,8 +14145,8 @@
        </g>
       </g>
       <g id="web_plat" transform="translate(57.9 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="158.10000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="156.70000000000002" height="6.299999999999999">Web Platform Inter­faces</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="167.40000000000003"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="166.00000000000003" height="6.299999999999999">Web Platform Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="aiw_browser_provider_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -14152,59 +14183,64 @@
          <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">Download Manager Client API Extension</text>
         </g>
-        <g id="feeds_engine_api" class="component">
+        <g id="download_path_plugin_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">Feeds Engine API</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">Download Path Plugin API</text>
+        </g>
+        <g id="feeds_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="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">Feeds Engine API</text>
         </g>
         <g id="launcher_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">Launcher API</text>
+         <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">Launcher API</text>
         </g>
         <g id="multipart_parser_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">Multipart Parser API</text>
+         <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">Multipart Parser API</text>
         </g>
         <g id="recent_url_store_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">Recent URL Store API</text>
+         <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">Recent URL Store API</text>
         </g>
         <g id="scheme_handler_plugin_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">Scheme Handler Plugin 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">Scheme Handler Plugin API</text>
         </g>
         <g id="scriptable_plugin_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">Scriptable Plugin 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">Scriptable Plugin API</text>
         </g>
         <g id="webutils_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">Web Utils API</text>
-        </g>
-        <g id="widget_registry_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">Widget Registry API</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Web Utils API</text>
+        </g>
+        <g id="widget_registry_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">Widget Registry API</text>
         </g>
         <g id="xml_parser_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">XML Parser API</text>
+         <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">XML Parser API</text>
         </g>
         <g id="stmgesturefw_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">State Machine Gesture Framework API </text>
-        </g>
-       </g>
-      </g>
-      <g id="web_info" transform="translate(218.10000000000002 0)" class="collection">
+         <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">State Machine Gesture Framework API </text>
+        </g>
+       </g>
+      </g>
+      <g id="web_info" transform="translate(227.40000000000003 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">Web Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -14363,7 +14399,7 @@
         </g>
        </g>
       </g>
-      <g id="codhandler" transform="translate(235.80000000000004 0)" class="collection">
+      <g id="codhandler" transform="translate(245.10000000000005 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="83.69999999999999"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="82.29999999999998" height="6.299999999999999">Content Object Descriptor Handler</text>
        <g transform="translate(0 6.299999999999999)">
@@ -14469,7 +14505,7 @@
       </g>
      </g>
     </g>
-    <g id="websrv" class="package" transform="translate( 4852.799999999998 100.4)">
+    <g id="websrv" class="package" transform="translate( 4782.299999999998 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="251.10000000000014" height="116.00000000000001" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="251.10000000000014" x="125.55000000000007" y="115.00000000000003">Web Services</text>
@@ -14669,7 +14705,7 @@
       </g>
      </g>
     </g>
-    <g id="platformtools" class="package" transform="translate( 5105.999999999998 100.4)">
+    <g id="platformtools" class="package" transform="translate( 5035.499999999998 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>
@@ -14692,7 +14728,7 @@
       </g>
      </g>
     </g>
-    <g id="uitools" class="package" transform="translate( 3870.0000000000014 0)">
+    <g id="uitools" class="package" transform="translate( 3925.800000000002 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>
@@ -14819,8 +14855,8 @@
  <g id="app" transform="translate(3.1999999999999993 0)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="170.63000000000002"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="170.63000000000002" height="9.3" x="-85.61500000000001">Applications</text>
-  <g class="layer-detail" transform="translate(793.5499999999988 3.2)">
-   <rect x="-780.7499999999989" class="layer" y="-3.2" width="5133.899999999998" height="170.63000000000002"/>
+  <g class="layer-detail" transform="translate(777.3499999999985 3.2)">
+   <rect x="-764.5499999999986" class="layer" y="-3.2" width="5063.399999999998" height="170.63000000000002"/>
    <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"/>
@@ -15777,12 +15813,12 @@
     </g>
     <g id="contentcontrol" class="package" transform="translate( 410.40000000000003 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
-     <rect class="package" x="0" width="67.19999999999999" height="78.4" y="0" style="fill:darkseagreen;"/>
-     <text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="77.4">Content Control Daemons</text>
+     <rect class="package" x="0" width="48.6" height="78.4" y="0" style="fill:darkseagreen;"/>
+     <text text-anchor="middle" class="package" width="48.6" x="24.3" y="77.4">Content Control Daemons</text>
      <g transform="translate(0 3.2)">
       <g id="contentctrl_plat" transform="translate(0 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Content Control Daemons Platforn Inter­faces</text>
+       <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">Content Control Daemons Platforn Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="oma_ds_presync_plugin_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -15799,16 +15835,6 @@
          <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">DS Folder Util API</text>
         </g>
-        <g id="adapter_customization_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">Adapter Customization API</text>
-        </g>
-        <g id="ds_data_modification_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">DS Data Modification API</text>
-        </g>
        </g>
       </g>
       <g id="dsdcmoadapter" transform="translate(0 18.8)" class="collection">
@@ -15822,7 +15848,7 @@
         </g>
        </g>
       </g>
-      <g id="omads" transform="translate(48.6 0)" class="collection">
+      <g id="omads" transform="translate(30.000000000000004 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">OMA Data Sync</text>
        <g transform="translate(0 6.299999999999999)">
@@ -15840,7 +15866,7 @@
       </g>
      </g>
     </g>
-    <g id="devicecontrol" class="package" transform="translate( 479.70000000000005 85.83000000000001)">
+    <g id="devicecontrol" class="package" transform="translate( 461.1 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
      <rect class="package" x="0" width="113.69999999999999" height="78.4" y="0" style="fill:darkseagreen;"/>
      <text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="77.4">Dev­ice Control Daemons</text>
@@ -16018,7 +16044,7 @@
       </g>
      </g>
     </g>
-    <g id="printing" class="package" transform="translate( 595.5 85.83000000000001)">
+    <g id="printing" class="package" transform="translate( 576.9 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
      <rect class="package" x="0" width="37.2" height="78.4" y="0" style="fill:orchid;"/>
      <text text-anchor="middle" class="package" width="37.2" x="18.6" y="77.4">Printing</text>
@@ -16160,10 +16186,10 @@
       </g>
      </g>
     </g>
-    <g id="contacts" class="package" transform="translate( 634.8 0)">
+    <g id="contacts" class="package" transform="translate( 624.6 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="579.0000000000003" height="164.23000000000002" y="0" style="fill:lightpink;"/>
-     <text text-anchor="middle" class="package" width="579.0000000000003" x="289.50000000000017" y="163.23000000000002">Contacts Apps</text>
+     <rect class="package" x="0" width="569.7000000000004" height="164.23000000000002" y="0" style="fill:lightpink;"/>
+     <text text-anchor="middle" class="package" width="569.7000000000004" x="284.8500000000002" y="163.23000000000002">Contacts Apps</text>
      <g transform="translate(0 3.2)">
       <g id="contacts_pub" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
@@ -16207,8 +16233,8 @@
        </g>
       </g>
       <g id="contacts_plat" transform="translate(67.19999999999999 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="446.4000000000004"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="445.0000000000004" height="6.299999999999999">Contacts Apps Platform Inter­faces</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="437.10000000000036"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="435.7000000000004" height="6.299999999999999">Contacts Apps Platform Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="virtual_phonebook_store_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -16410,45 +16436,40 @@
          <use width="9.3" height="9.3" x="362.7000000000003" 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="367.35000000000025">Phonebook 2 UI Utilities API</text>
         </g>
-        <g id="phonebook_2_contact_related_icon_customization_api" class="component">
+        <g id="cca_launch_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="372.0000000000003" 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="376.65000000000026">Phonebook 2 Contact Related Icon Customization API</text>
-        </g>
-        <g id="cca_launch_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="376.65000000000026">CCA Launch API</text>
+        </g>
+        <g id="cca_view_plugin_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="381.3000000000003" 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="385.9500000000003">CCA Launch API</text>
-        </g>
-        <g id="cca_view_plugin_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="385.9500000000003">CCA View Plugin API</text>
+        </g>
+        <g id="predictivesearch_client_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="390.6000000000003" 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="395.2500000000003">CCA View Plugin API</text>
-        </g>
-        <g id="predictivesearch_client_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="395.2500000000003">Predictive Search Client API</text>
+        </g>
+        <g id="predictivesearch_utils_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="399.9000000000003" 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="404.5500000000003">Predictive Search Client API</text>
-        </g>
-        <g id="predictivesearch_utils_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="404.5500000000003">Predictive Search Utils API</text>
+        </g>
+        <g id="predictivesearch_adapters_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="409.20000000000033" 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="413.8500000000003">Predictive Search Utils API</text>
-        </g>
-        <g id="predictivesearch_adapters_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="413.8500000000003">Predictive Search Adapters API</text>
+        </g>
+        <g id="predictivesearch_algorithm_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="418.50000000000034" 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="423.1500000000003">Predictive Search Adapters API</text>
-        </g>
-        <g id="predictivesearch_algorithm_api" class="component">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="423.1500000000003">Predictive Search Algorithm API</text>
+        </g>
+        <g id="phonebook_2_rcl_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="427.80000000000035" 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="432.45000000000033">Predictive Search Algorithm API</text>
-        </g>
-        <g id="phonebook_2_rcl_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="437.10000000000036" 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="441.75000000000034">Phonebook 2 RCL API</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="432.45000000000033">Phonebook 2 RCL API</text>
         </g>
        </g>
       </g>
@@ -16463,7 +16484,7 @@
         </g>
        </g>
       </g>
-      <g id="logsui" transform="translate(515.7000000000004 0)" class="collection">
+      <g id="logsui" transform="translate(506.4000000000004 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">Logs UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -16474,7 +16495,7 @@
         </g>
        </g>
       </g>
-      <g id="phonebookui" transform="translate(533.4000000000003 0)" class="collection">
+      <g id="phonebookui" transform="translate(524.1000000000004 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Phone­book UI</text>
        <g transform="translate(0 6.299999999999999)">
@@ -16613,7 +16634,7 @@
         </g>
        </g>
       </g>
-      <g id="contacts_info" transform="translate(563.4000000000003 0)" class="collection">
+      <g id="contacts_info" transform="translate(554.1000000000004 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">Contacts Apps Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -16627,7 +16648,7 @@
       </g>
      </g>
     </g>
-    <g id="organizer" class="package" transform="translate( 1215.9 0)">
+    <g id="organizer" class="package" transform="translate( 1196.4000000000003 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="311.40000000000003" height="164.23000000000002" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="311.40000000000003" x="155.70000000000002" y="163.23000000000002">Organizer App Suite</text>
@@ -17066,8 +17087,8 @@
        </g>
       </g>
       <g id="pimappsupport" transform="translate(0 75.2)" 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">PIM App Support</text>
+       <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">PIM App Support</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="vcardandvcal" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
@@ -17079,6 +17100,11 @@
          <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">Chinese Calendar Cnvrter.</text>
         </g>
+        <g id="chinesecalendaralg" 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="18.6" 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="23.25">Chinese Calendar Algorithm</text>
+        </g>
        </g>
       </g>
       <g id="organizer_info" transform="translate(295.8 0)" class="collection">
@@ -17095,7 +17121,7 @@
       </g>
      </g>
     </g>
-    <g id="messaging" class="package" transform="translate( 1529.4 0)">
+    <g id="messaging" class="package" transform="translate( 1509.9000000000003 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="356.7000000000001" height="164.23000000000002" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="356.7000000000001" x="178.35000000000005" y="163.23000000000002">Messag­ing Apps</text>
@@ -17517,7 +17543,7 @@
       </g>
      </g>
     </g>
-    <g id="commonemail" class="package" transform="translate( 1888.2000000000003 0)">
+    <g id="commonemail" class="package" transform="translate( 1868.7000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="158.10000000000002" height="164.23000000000002" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="158.10000000000002" x="79.05000000000001" y="163.23000000000002">Email Apps</text>
@@ -17534,8 +17560,8 @@
        </g>
       </g>
       <g id="email_plat" transform="translate(17.7 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Email Apps Platform Inter­faces</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Email Apps Platform Inter­faces</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="email_client_api" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -17547,11 +17573,6 @@
          <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">Email Setup Plugin API</text>
         </g>
-        <g id="email_crkeys_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">Email CenRep Keys API</text>
-        </g>
        </g>
       </g>
       <g id="emailservices" transform="translate(0 56.400000000000006)" class="collection">
@@ -17627,8 +17648,8 @@
        </g>
       </g>
       <g id="emailcontacts" 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">Email Contacts</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Email Contacts</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="contactactionservice" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -17640,11 +17661,6 @@
          <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Contact Action Menu</text>
         </g>
-        <g id="remotecontactlookup" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Remote Contact Lookup</text>
-        </g>
        </g>
       </g>
       <g id="meetingrequest" transform="translate(0 18.8)" class="collection">
@@ -17738,7 +17754,7 @@
         </g>
        </g>
       </g>
-      <g id="emailuis" transform="translate(47.7 0)" class="collection">
+      <g id="emailuis" transform="translate(38.400000000000006 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Email UIs</text>
        <g transform="translate(0 6.299999999999999)">
@@ -17770,7 +17786,7 @@
         </g>
        </g>
       </g>
-      <g id="commonemail_info" transform="translate(96.3 0)" class="collection">
+      <g id="commonemail_info" transform="translate(87 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">Email Apps Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -17790,7 +17806,7 @@
       </g>
      </g>
     </g>
-    <g id="conversations" class="package" transform="translate( 2048.4000000000005 0)">
+    <g id="conversations" class="package" transform="translate( 2028.9000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="142.8" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="142.8" x="71.4" y="81.63000000000001">Conversa­tion Apps</text>
@@ -17966,7 +17982,7 @@
       </g>
      </g>
     </g>
-    <g id="im" class="package" transform="translate( 2193.3 0)">
+    <g id="im" class="package" transform="translate( 2173.8000000000006 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Instant Msg. Apps</text>
@@ -17995,7 +18011,7 @@
       </g>
      </g>
     </g>
-    <g id="dictionary" class="package" transform="translate( 2048.4000000000005 85.83000000000001)">
+    <g id="dictionary" class="package" transform="translate( 2028.9000000000005 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
      <rect class="package" x="0" width="33.3" height="78.4" y="0" style="fill:lightpink;"/>
      <text text-anchor="middle" class="package" width="33.3" x="16.65" y="77.4">Dictio­nary</text>
@@ -18024,7 +18040,7 @@
       </g>
      </g>
     </g>
-    <g id="camera" class="package" transform="translate( 2223.3 0)">
+    <g id="camera" class="package" transform="translate( 2203.8000000000006 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="57.00000000000001" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="57.00000000000001" x="28.500000000000004" y="81.63000000000001">Camera Apps</text>
@@ -18068,7 +18084,7 @@
       </g>
      </g>
     </g>
-    <g id="imgeditor" class="package" transform="translate( 2282.4 0)">
+    <g id="imgeditor" class="package" transform="translate( 2262.9000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="122.99999999999999" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="122.99999999999999" x="61.49999999999999" y="81.63000000000001">Image Editor Apps</text>
@@ -18183,7 +18199,7 @@
       </g>
      </g>
     </g>
-    <g id="videoeditor" class="package" transform="translate( 2407.5 0)">
+    <g id="videoeditor" class="package" transform="translate( 2388.0000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="82.79999999999998" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="82.79999999999998" x="41.39999999999999" y="81.63000000000001">Video Editor Apps</text>
@@ -18284,7 +18300,7 @@
       </g>
      </g>
     </g>
-    <g id="videoplayer" class="package" transform="translate( 2492.4 0)">
+    <g id="videoplayer" class="package" transform="translate( 2472.9000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="206.70000000000002" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="206.70000000000002" x="103.35000000000001" y="81.63000000000001">Video Player Apps</text>
@@ -18432,27 +18448,6 @@
         </g>
        </g>
       </g>
-      <g id="videoplayer_homescreenplugins" 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">Videoplayer Homescreen Plugins</text>
-       <g transform="translate(0 6.299999999999999)">
-        <g id="videosuiteconf" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="0" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Video Suite Configuration</text>
-        </g>
-        <g id="videoahlplugin" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Video Player Action Handler</text>
-        </g>
-        <g id="videochplugin" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Video Player Content Harvester </text>
-        </g>
-       </g>
-      </g>
       <g id="mediasettings" transform="translate(0 56.400000000000006)" 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">Media Settings</text>
@@ -18487,8 +18482,8 @@
        </g>
       </g>
       <g id="videoplayerapp" transform="translate(30.000000000000004 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Video Player App</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Video Player App</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="lwplayer" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -18500,14 +18495,9 @@
          <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">MPX Video Player</text>
         </g>
-        <g id="videoplayerlauncher" 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">Video Player Launcher</text>
-        </g>
-       </g>
-      </g>
-      <g id="videoplayback" transform="translate(30.000000000000004 37.6)" class="collection">
+       </g>
+      </g>
+      <g id="videoplayback" transform="translate(0 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">Video Playback Plugins</text>
        <g transform="translate(0 6.299999999999999)">
@@ -18540,10 +18530,10 @@
       </g>
      </g>
     </g>
-    <g id="photos" class="package" transform="translate( 2701.2000000000003 0)">
+    <g id="photos" class="package" transform="translate( 2681.7000000000007 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="197.4" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="197.4" x="98.7" y="81.63000000000001">Photos</text>
+     <rect class="package" x="0" width="178.79999999999998" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
+     <text text-anchor="middle" class="package" width="178.79999999999998" x="89.39999999999999" y="81.63000000000001">Photos</text>
      <g transform="translate(0 3.2)">
       <g id="photos_plat" transform="translate(0 0)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
@@ -18577,8 +18567,8 @@
        </g>
       </g>
       <g id="photosgallery" transform="translate(48.6 0)" class="collection">
-       <rect class="collection" x="0" y="0" height="15.6" width="148.8"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="147.4" height="6.299999999999999">Photos Gallery</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="130.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="128.79999999999998" height="6.299999999999999">Photos Gallery</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="photosgallery_help" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -18635,36 +18625,26 @@
          <use width="9.3" height="9.3" x="92.99999999999999" 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="97.64999999999999">Slideshow</text>
         </g>
-        <g id="contentharvesterplugin" class="component">
+        <g id="memoryplugin" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Gallery Content Harvester Plugin</text>
-        </g>
-        <g id="photossuite" 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="#Borderbox-clipAll" 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">Photos Suite</text>
-        </g>
-        <g id="memoryplugin" 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="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Mem­ory Plugin</text>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Mem­ory Plugin</text>
         </g>
         <g id="imgvwr" 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="#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="134.85">Photos Image Viewer</text>
+         <use width="9.3" height="9.3" x="111.59999999999998" 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="116.24999999999999">Photos Image Viewer</text>
         </g>
         <g id="photosgallery_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="139.5" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Photos Gallery Build</text>
-        </g>
-       </g>
-      </g>
-     </g>
-    </g>
-    <g id="musicplayer" class="package" transform="translate( 2900.7000000000003 0)">
+         <use width="9.3" height="9.3" x="120.89999999999998" 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="125.54999999999998">Photos Gallery Build</text>
+        </g>
+       </g>
+      </g>
+     </g>
+    </g>
+    <g id="musicplayer" class="package" transform="translate( 2862.600000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="159.29999999999998" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="159.29999999999998" x="79.64999999999999" y="81.63000000000001">Music Player Apps</text>
@@ -18831,7 +18811,7 @@
       </g>
      </g>
     </g>
-    <g id="radio" class="package" transform="translate( 3062.1000000000004 0)">
+    <g id="radio" class="package" transform="translate( 3024.000000000001 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="65.1" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="65.1" x="32.55" y="81.63000000000001">Radio Apps</text>
@@ -18879,19 +18859,19 @@
       </g>
      </g>
     </g>
-    <g id="internetradio" class="package placeholder" transform="translate( 3129.3 0)">
+    <g id="internetradio" class="package placeholder" transform="translate( 3091.2000000000007 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="40.315000000000005" dy="0.375em" height="15.600000000000001">Internet Radio Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="tv" class="package placeholder" transform="translate( 2083.8 85.83000000000001)">
+    <g id="tv" class="package placeholder" transform="translate( 2064.3000000000006 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">TV Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="voicerec" class="package" transform="translate( 3209.4 0)">
+    <g id="voicerec" class="package" transform="translate( 3171.3000000000006 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="54.00000000000001" height="82.63000000000001" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="54.00000000000001" x="27.000000000000004" y="81.63000000000001">Voice Recorder Apps</text>
@@ -18930,7 +18910,7 @@
       </g>
      </g>
     </g>
-    <g id="screensaver" class="package" transform="translate( 3265.5 0)">
+    <g id="screensaver" class="package" transform="translate( 3227.4000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000001">Screen Saver Apps</text>
@@ -18972,7 +18952,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreen" class="package" transform="translate( 3295.5 0)">
+    <g id="homescreen" class="package" transform="translate( 3257.4000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="122.99999999999999" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="122.99999999999999" x="61.49999999999999" y="81.63000000000001">Home Screen Apps</text>
@@ -19098,7 +19078,7 @@
       </g>
      </g>
     </g>
-    <g id="graphicsuis" class="package" transform="translate( 2163.9 85.83000000000001)">
+    <g id="graphicsuis" class="package" transform="translate( 2144.4000000000005 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="45.6" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="45.6" x="22.8" y="77.4">Graphics UIs</text>
@@ -19137,7 +19117,7 @@
       </g>
      </g>
     </g>
-    <g id="profile" class="package" transform="translate( 3420.6 0)">
+    <g id="profile" class="package" transform="translate( 3382.5000000000005 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="51" height="82.63000000000001" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="51" x="25.5" y="81.63000000000001">Profiles</text>
@@ -19177,7 +19157,7 @@
       </g>
      </g>
     </g>
-    <g id="speechsrv" class="package" transform="translate( 2211.6 85.83000000000001)">
+    <g id="speechsrv" class="package" transform="translate( 2192.1000000000004 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="326.70000000000016" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="326.70000000000016" x="163.35000000000008" y="77.4">Speech Recog­nition UIs</text>
@@ -19478,7 +19458,7 @@
       </g>
      </g>
     </g>
-    <g id="homescreentools" class="package" transform="translate( 2540.4 85.83000000000001)">
+    <g id="homescreentools" class="package" transform="translate( 2520.9000000000005 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="54" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="54" x="27" y="77.4">Home Screen Tools</text>
@@ -19523,7 +19503,7 @@
       </g>
      </g>
     </g>
-    <g id="webuis" class="package" transform="translate( 2596.5 85.83000000000001)">
+    <g id="webuis" class="package" transform="translate( 2577.0000000000005 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="67.2" height="78.4" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="67.2" x="33.6" y="77.4">Web UIs</text>
@@ -19600,7 +19580,7 @@
       </g>
      </g>
     </g>
-    <g id="jrt" class="package" transform="translate( 2665.8 85.83000000000001)">
+    <g id="jrt" class="package" transform="translate( 2646.3000000000006 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="37.2" height="78.4" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="37.2" x="18.6" y="48.6" dy="0.375em">Java Runtime</text>
@@ -19669,7 +19649,7 @@
       </g>
      </g>
     </g>
-    <g id="conntools" class="package" transform="translate( 2705.1000000000004 85.83000000000001)">
+    <g id="conntools" class="package" transform="translate( 2685.600000000001 85.83000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="78.4" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="77.4">Connect­ivity Tools</text>
@@ -19700,7 +19680,7 @@
       </g>
      </g>
     </g>
-    <g id="rndtools" class="package" transform="translate( 2735.1000000000004 85.83000000000001)">
+    <g id="rndtools" class="package" transform="translate( 2715.600000000001 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="78.4" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="87.9" x="59.55" y="67.4" dy="0.375em">R&amp;D tools</text>
@@ -19871,7 +19851,7 @@
       </g>
      </g>
     </g>
-    <g id="helps" class="package" transform="translate( 3473.7 0)">
+    <g id="helps" class="package" transform="translate( 3435.6000000000004 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="27.900000000000002" height="164.23000000000002" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="163.23000000000002">Help Apps</text>
@@ -19912,7 +19892,7 @@
       </g>
      </g>
     </g>
-    <g id="techview" class="package" transform="translate( 3503.7 0)">
+    <g id="techview" class="package" transform="translate( 3465.6000000000004 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="68.7" height="164.23000000000002" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="68.7" x="34.35" y="163.23000000000002">Techview</text>
@@ -20027,11 +20007,11 @@
    </g>
   </g>
  </g>
- <g id="legend-root" class="legend" transform="translate(4835.479499999998 633.2600000000002) translate(317.6205 0) scale(12.979262988377636) translate(-317.6205)">
+ <g id="legend-root" class="legend" transform="translate(4764.979499999998 637.4900000000001) translate(317.6205 0) scale(12.801692585963432) translate(-317.6205)">
   <text text-anchor="middle" class="title" x="301.28525" y="0">
    <tspan dy="0.75em" x="301.28525">Symbian OS ^3</tspan>
    <tspan dy="1em" x="301.28525">System Model</tspan>
-   <tspan font-style="italic" dy="1em" id="release-version" x="301.28525">%d %b %Y</tspan>
+   <tspan font-style="italic" dy="1em" id="release-version" x="301.28525" font-weight="normal">date</tspan>
   </text>
   <g id="legend-box">
    <rect class="legend" rx="5" ry="5" height="14.3" width="284.95" x="0" y="0"/>
@@ -20127,7 +20107,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 (169)</text>
+       <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test Compo­nent (167)</text>
       </g>
      </g>
     </g>
@@ -20136,7 +20116,7 @@
       <g id="s5-overlay1" 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(#PatternOverlay4); 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">Depre­cated in TB 9.1 (5)</text>
+       <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Depre­cated in TB 9.1 (4)</text>
       </g>
      </g>
     </g>
@@ -20161,8 +20141,8 @@
     </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">664 Collections</tspan>
-     <tspan dy="1em" x="265.17499999999995">2916 Components</tspan>
+     <tspan dy="1em" x="265.17499999999995">666 Collections</tspan>
+     <tspan dy="1em" x="265.17499999999995">2909 Components</tspan>
     </text>
    </g>
   </g>