MCL/sftools/fbf/projects/platforms: comparison symbian3/single/sysdefs/sf3lit.svg

equal deleted inserted replaced

-:b7b68fda01fc
+:6417401dfdf4
 <?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 4857.5 841.5442030129847" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 4902.5 847.4714176753633" class="component-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
-<title>Symbian OS ^3 System Model: %d %b %Y</title>
+<title>Symbian OS ^3 System Model: date</title>
 <defs>
 <style type="text/css">
 text.layer, text.package, text.collection, text.component,
 text.cbox, text.lgrp, text.label, text.lgd {
 		fill:black;
 		e.setAttribute('transform',trans);
 ]]><![CDATA[
 		}
 	]]></script>
 <g id="os" transform="translate(3.1999999999999993 418.63)" class="layer">
-<rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" 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="227.03" height="9.3" x="-113.815">OS</text>
+<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(516.9500000000005 3.2)">
+<g class="layer-detail" transform="translate(549.0500000000006 3.2)">
-<rect x="-504.15000000000055" class="layer" y="-3.2" width="4835.1" height="227.03"/>
+<rect x="-536.2500000000007" class="layer" y="-3.2" width="4880.1" 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="63.300000000000004" height="101.43" y="0" style="fill:tan;"/>
-<text text-anchor="middle" class="package" width="63.300000000000004" x="31.650000000000002" y="100.43">Kernel &amp; HW Services</text>
+<text text-anchor="middle" class="package" width="63.300000000000004" x="31.650000000000002" 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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Board Boot Loader</text>
 <g transform="translate(0 6.299999999999999)">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="boardsupport" class="package" transform="translate( 65.4 119.20000000000002)">
+<g id="boardsupport" class="package" transform="translate( 65.4 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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Emulator</text>
 <g transform="translate(0 6.299999999999999)">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="buildtools" class="package" transform="translate( 95.4 119.20000000000002)">
+<g id="buildtools" class="package" transform="translate( 95.4 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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Build System Tools</text>
 <g transform="translate(0 6.299999999999999)">
 </g>
 </g>
 </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="968.699999999999" height="116.00000000000001" y="0" style="fill:tan;"/>
+<rect class="package" x="0" width="999.599999999999" height="120.23000000000002" y="0" style="fill:tan;"/>
-<text text-anchor="middle" class="package" width="968.699999999999" x="484.3499999999995" y="105" dy="0.375em">Generic OS Services</text>
+<text text-anchor="middle" class="package" width="999.599999999999" x="499.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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="826.2999999999989" height="6.299999999999999">Generic OS Services Public Interfaces</text>
 <g transform="translate(0 6.299999999999999)">
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">SSL Library</text>
 </g>
 </g>
 </g>
 <g id="glib" transform="translate(847.499999999999 0)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<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="14.2" height="6.299999999999999">GLib</text>
+<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">GLib</text>
 <g transform="translate(0 6.299999999999999)">
-<g id="build" class="component">
+<g id="glibbackend" class="component">
-<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
+<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:rgb(93,155,205);stroke-width: 0.5; "/>
+<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">build</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">GLib Backend</text>
+</g>
+<g id="libglib" class="component">
+<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+<use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">GLib Library</text>
+</g>
+<g id="libgthread" 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">Libg Thread</text>
+</g>
+<g id="libgmodule" 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">Libg Module</text>
+</g>
+<g id="libgobject" 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">Libg Object</text>
 </g>
 </g>
 </g>
 <g id="stdcpp" transform="translate(20.700000000000003 37.6)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">C++ Standard Library</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
-<g id="ofdbus" transform="translate(865.1999999999989 0)" class="collection">
+<g id="ofdbus" transform="translate(896.0999999999989 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">Open Foundation D-Bus</text>
 <g transform="translate(0 6.299999999999999)">
 <g id="dbus" 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">Utility Library</text>
 </g>
 </g>
 </g>
-<g id="genericservices" transform="translate(885.899999999999 0)" class="collection">
+<g id="genericservices" transform="translate(916.7999999999989 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="65.1"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Generic Services</text>
 <g transform="translate(0 6.299999999999999)">
 <g id="s60compatibilityheaders" class="component">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Zip Compression Library</text>
 </g>
 </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"/>
+<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="45.1" height="6.299999999999999">Generic Open Libraries</text>
+<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"/>
 <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">C Standard Library</text>
 </g>
 <g id="posixrealtimeextensions" 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">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">
 <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
 <use width="9.3" height="9.3" x="18.6" 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="23.25">Generic Usability Library</text>
 </g>
 </g>
 </g>
-<g id="ossrv_info" transform="translate(953.099999999999 0)" class="collection">
+<g id="ossrv_info" transform="translate(983.999999999999 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">Generic OS Services Info</text>
 <g transform="translate(0 6.299999999999999)">
 <g id="ossrv_metadata" class="component">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="persistentdata" class="package" transform="translate( 970.799999999999 0)">
+<g id="persistentdata" class="package" transform="translate( 1001.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;"/>
+<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="105" dy="0.375em">Persistent Data Services</text>
+<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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Feature Management</text>
 <g transform="translate(0 6.299999999999999)">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="devicesrv" class="package" transform="translate( 1040.099999999999 0)">
+<g id="devicesrv" class="package" transform="translate( 1070.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="671.1000000000005" height="116.00000000000001" y="0" style="fill:tan;"/>
+<rect class="package" x="0" width="671.1000000000005" height="120.23000000000002" y="0" style="fill:tan;"/>
-<text text-anchor="middle" class="package" width="671.1000000000005" x="335.55000000000024" y="105" dy="0.375em">Device Services</text>
+<text text-anchor="middle" class="package" width="671.1000000000005" x="335.55000000000024" y="119.23000000000002">Device 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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="91.59999999999998" height="6.299999999999999">Device Services Public Interfaces</text>
 <g transform="translate(0 6.299999999999999)">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="security" class="package" transform="translate( 1713.2999999999995 0)">
+<g id="security" class="package" transform="translate( 1744.1999999999994 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);"/>
+<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="93.3" x="46.65" y="105" dy="0.375em">OS Security</text>
+<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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Authentication Services</text>
 <g transform="translate(0 6.299999999999999)">
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">User Prompt Utils</text>
 </g>
 </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"/>
+<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="35.800000000000004" height="6.299999999999999">Content Management</text>
+<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Content Management</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"/>
 <use width="9.3" height="9.3" x="0" 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="4.65">Content Access FW for DRM</text>
 </g>
 <g id="cafrecogniserconfig" 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: 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">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <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">ASN PKCS</text>
 </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)">
 <g id="security_metadata" class="component">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="lbs" class="package" transform="translate( 1808.6999999999996 0)">
+<g id="lbs" class="package" transform="translate( 1820.9999999999993 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="64.2" height="116.00000000000001" y="0" style="fill:whitesmoke;"/>
+<rect class="package" x="0" width="55.8" height="120.23000000000002" y="0" style="fill:whitesmoke;"/>
-<text text-anchor="middle" class="package" width="64.2" x="32.1" y="115.00000000000001">Locating Services</text>
+<text text-anchor="middle" class="package" width="55.8" x="27.9" 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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Generic Positioning Plugins</text>
 <g transform="translate(0 6.299999999999999)">
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Network Gateway</text>
 </g>
 </g>
 </g>
 <g id="networkprotocolmodules" transform="translate(17.7 37.6)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
+<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="45.1" height="6.299999999999999">Network Protocol Modules</text>
+<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Network Protocol Modules</text>
 <g transform="translate(0 6.299999999999999)">
 <g id="privacyprotocolmodule" 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="#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 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>
-</g>
 <g id="common" 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">common</text>
+</g>
+<g id="suplcontrolplaneprotocols" 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">common</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">suplcontrolplaneprotocols</text>
-</g>
-<g id="suplcontrolplaneprotocols" 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">suplcontrolplaneprotocols</text>
 </g>
 </g>
 </g>
 <g id="lbs_info" transform="translate(38.400000000000006 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="commsfw" class="package" transform="translate( 1874.9999999999995 0)">
+<g id="commsfw" class="package" transform="translate( 1878.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="57.00000000000001" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+<rect class="package" x="0" width="57.00000000000001" height="120.23000000000002" y="0" style="fill:moccasin;"/>
-<text text-anchor="middle" class="package" width="57.00000000000001" x="28.500000000000004" y="115.00000000000001">Comms Framework</text>
+<text text-anchor="middle" class="package" width="57.00000000000001" x="28.500000000000004" y="119.23000000000002">Comms Framework</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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Comms Process</text>
 <g transform="translate(0 6.299999999999999)">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="networkingsrv" class="package" transform="translate( 1934.0999999999995 0)">
+<g id="networkingsrv" class="package" transform="translate( 1937.9999999999993 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;"/>
+<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="105" dy="0.375em">Networking Services</text>
+<text text-anchor="middle" class="package" width="170.70000000000002" x="85.35000000000001" y="119.23000000000002">Networking 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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">ESock API Extensions</text>
 <g transform="translate(0 6.299999999999999)">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="wlan" class="package" transform="translate( 2106.8999999999996 0)">
+<g id="wlan" class="package" transform="translate( 2110.7999999999993 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="174.89999999999998" height="116.00000000000001" y="0" style="fill:moccasin;"/>
+<rect class="package" x="0" width="174.89999999999998" height="120.23000000000002" y="0" style="fill:moccasin;"/>
-<text text-anchor="middle" class="package" width="174.89999999999998" x="87.44999999999999" y="86.2" dy="0.375em">WLAN</text>
+<text text-anchor="middle" class="package" width="174.89999999999998" x="87.44999999999999" 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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="138.1" height="6.299999999999999">WLAN Platform Interfaces</text>
 <g transform="translate(0 6.299999999999999)">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="cellularsrv" class="package" transform="translate( 2283.8999999999996 0)">
+<g id="cellularsrv" class="package" transform="translate( 2287.7999999999993 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;"/>
+<rect class="package" x="0" width="101.39999999999998" height="120.23000000000002" 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>
+<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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Baseband Abstraction</text>
 <g transform="translate(0 6.299999999999999)">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="bt" class="package" transform="translate( 2387.3999999999996 0)">
+<g id="bt" class="package" transform="translate( 2391.2999999999993 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="65.1" height="116.00000000000001" y="0" style="fill:orchid;"/>
+<rect class="package" x="0" width="65.1" height="120.23000000000002" y="0" style="fill:orchid;"/>
-<text text-anchor="middle" class="package" width="65.1" x="32.55" y="105" dy="0.375em">Bluetooth</text>
+<text text-anchor="middle" class="package" width="65.1" x="32.55" y="119.23000000000002">Bluetooth</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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Bluetooth Platform Interfaces</text>
 <g transform="translate(0 6.299999999999999)">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="usb" class="package" transform="translate( 2454.5999999999995 0)">
+<g id="usb" class="package" transform="translate( 2458.499999999999 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;"/>
+<rect class="package" x="0" width="27.900000000000002" height="120.23000000000002" y="0" style="fill:orchid;"/>
-<text text-anchor="middle" class="package" width="33.3" x="16.65" y="105" dy="0.375em">USB</text>
+<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="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>
 <g id="usbmgmt" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">USB Management</text>
 <g transform="translate(0 6.299999999999999)">
 <g id="usbmgr" class="component">
 <use width="9.3" height="9.3" x="9.3" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipRT"/>
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">USB Class &amp; Manager Docs</text>
 </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)">
 <g id="usb_metadata" class="component">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="mm" class="package" transform="translate( 2489.9999999999995 0)">
+<g id="mm" class="package" transform="translate( 2488.499999999999 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);"/>
+<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="749.3999999999996" x="421.1999999999998" y="86.2" dy="0.375em">Multimedia</text>
+<text text-anchor="middle" class="package" width="778.1999999999996" x="389.0999999999998" y="119.23000000000002">Multimedia</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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">MM Public Interfaces</text>
 <g transform="translate(0 6.299999999999999)">
 <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">Mobile TV DVB-H Receiver HAI</text>
 </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">Multimedia 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 Verification Suite</text>
-</g>
-</g>
-</g>
 </g>
 </g>
-<g id="imagingext" class="package" transform="translate( 3287.999999999999 0)">
+<g id="imagingext" class="package" transform="translate( 3268.799999999999 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-<rect class="package" x="0" width="91.19999999999999" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
+<rect class="package" x="0" width="91.19999999999999" height="120.23000000000002" y="0" style="fill:rgb(175,212,240);"/>
-<text text-anchor="middle" class="package" width="91.19999999999999" x="45.599999999999994" y="105" dy="0.375em">Imaging Extensions</text>
+<text text-anchor="middle" class="package" width="91.19999999999999" x="45.599999999999994" y="119.23000000000002">Imaging Extensions</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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Imaging Ext. Public Interfaces</text>
 <g transform="translate(0 6.299999999999999)">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="graphics" class="package" transform="translate( 3381.2999999999993 0)">
+<g id="graphics" class="package" transform="translate( 3362.099999999999 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
-<rect class="package" x="0" width="95.4" height="116.00000000000001" y="0" style="fill:orange;"/>
+<rect class="package" x="0" width="95.4" height="120.23000000000002" y="0" style="fill:orange;"/>
-<text text-anchor="middle" class="package" width="76.80000000000001" x="57" y="29.8" dy="0.375em">Graphics</text>
+<text text-anchor="middle" class="package" width="95.4" x="47.7" 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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Graphics Acceleration</text>
 <g transform="translate(0 6.299999999999999)">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="textandloc" class="package" transform="translate( 3478.7999999999993 0)">
+<g id="textandloc" class="package" transform="translate( 3459.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="84.9" height="116.00000000000001" y="0" style="fill:orange;"/>
+<rect class="package" x="0" width="84.9" height="120.23000000000002" y="0" style="fill:orange;"/>
-<text text-anchor="middle" class="package" width="84.9" x="42.45" y="86.2" dy="0.375em">Text &amp; Localisation Services</text>
+<text text-anchor="middle" class="package" width="84.9" x="42.45" y="119.23000000000002">Text &amp; Localisation Services</text>
 <g transform="translate(0 3.2)">
 <g id="textandloc_plat" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Text &amp; Localisation Platform Interfaces</text>
 <g transform="translate(0 6.299999999999999)">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="xmlsrv" class="package" transform="translate( 3565.7999999999993 0)">
+<g id="xmlsrv" class="package" transform="translate( 3546.599999999999 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;"/>
+<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="115.00000000000001">XML Services</text>
+<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 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">XML Services Platform Interfaces</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="deviceplatformrelease" class="package" transform="translate( 3632.999999999999 0)">
+<g id="deviceplatformrelease" class="package" transform="translate( 3613.799999999999 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-<rect class="package" x="0" width="51" height="116.00000000000001" y="0" style="fill:darkgray;"/>
+<rect class="package" x="0" width="51" height="120.23000000000002" y="0" style="fill:darkgray;"/>
-<text text-anchor="middle" class="package" width="51" x="25.5" y="115.00000000000001">Device Platform Release</text>
+<text text-anchor="middle" class="package" width="51" x="25.5" y="119.23000000000002">Device Platform Release</text>
 <g transform="translate(0 3.2)">
 <g id="locfiles" 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">Locale Files</text>
 <g transform="translate(0 6.299999999999999)">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Version</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="osrndtools" class="package" transform="translate( 3686.099999999999 0)">
+<g id="osrndtools" class="package" transform="translate( 3666.8999999999987 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-<rect class="package" x="0" width="140.7" height="116.00000000000001" y="0" style="fill:darkgray;"/>
+<rect class="package" x="0" width="140.7" height="120.23000000000002" y="0" style="fill:darkgray;"/>
-<text text-anchor="middle" class="package" width="140.7" x="70.35" y="115.00000000000001">OS R&amp;D tools</text>
+<text text-anchor="middle" class="package" width="140.7" x="70.35" 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="120.89999999999998"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="119.49999999999997" height="6.299999999999999">STIF</text>
 <g transform="translate(0 6.299999999999999)">
 </g>
 <g id="mw" transform="translate(3.1999999999999993 192.63)" class="layer">
 <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
 <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">Middleware</text>
 <g class="layer-detail" transform="translate(12.8 3.2)">
-<rect x="0" class="layer" y="-3.2" width="4835.1" height="222.8"/>
+<rect x="0" class="layer" y="-3.2" width="4880.1" 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"/>
 <rect class="package" x="0" width="355.80000000000024" height="116.00000000000001" y="0" style="fill:slateblue;"/>
 <text text-anchor="middle" class="package" width="301.80000000000024" x="204.90000000000012" y="29.8" dy="0.375em">Generic App Support</text>
 </g>
 </g>
 </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;"/>
+<rect class="package" x="0" width="289.5000000000001" 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>
+<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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Location Services Public Interfaces</text>
 <g transform="translate(0 6.299999999999999)">
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">BLID Application Satellite Info API</text>
 </g>
 </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"/>
+<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="212.50000000000009" height="6.299999999999999">Location Services Platform Interfaces</text>
+<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="221.8000000000001" height="6.299999999999999">Location Services Platform Interfaces</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"/>
 <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">Map and Navigation API</text>
 </g>
 <g id="location_local_variation_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="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">
 <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
 <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">aiwprovider</text>
 </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)">
 <g id="locationsysui" class="component">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
 </g>
 </g>
 </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="37.2" height="97.2" y="0" style="fill:moccasin;"/>
 <text text-anchor="middle" class="package" width="37.2" x="18.6" y="96.2">Wireless Access</text>
 <g transform="translate(0 3.2)">
 <g id="hsfw_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="vpnclient" class="package" transform="translate( 321.60000000000014 0)">
+<g id="vpnclient" class="package" transform="translate( 330.90000000000015 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>
 <g transform="translate(0 3.2)">
 <g id="vpnc_plat" transform="translate(0 18.8)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">help</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="ipappsrv" class="package" transform="translate( 584.1000000000003 0)">
+<g id="ipappsrv" class="package" transform="translate( 593.4000000000003 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="112.8" height="97.2" y="0" style="fill:darkkhaki;"/>
 <text text-anchor="middle" class="package" width="112.8" x="56.4" y="48.6" dy="0.375em">IP App Services</text>
 <g transform="translate(0 3.2)">
 <g id="ipappsrv_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="phonesrv" class="package" transform="translate( 699.0000000000002 0)">
+<g id="phonesrv" class="package" transform="translate( 708.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="391.8000000000003" height="97.2" y="0" style="fill:darkkhaki;"/>
 <text text-anchor="middle" class="package" width="355.5000000000003" x="214.05000000000015" y="86.2" dy="0.375em">Telephony &amp; SIM Services</text>
 <g transform="translate(0 3.2)">
 <g id="phonesrv_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="messagingmw" class="package" transform="translate( 1092.9000000000005 0)">
+<g id="messagingmw" class="package" transform="translate( 1102.2000000000005 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
 <rect class="package" x="0" width="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">Messaging Middleware</text>
 <g transform="translate(0 3.2)">
 <g id="msgfw_pub" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="imsrv" class="package" transform="translate( 1242.9000000000005 0)">
+<g id="imsrv" class="package" transform="translate( 1252.2000000000005 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
 <rect class="package" x="0" width="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>
 <g transform="translate(0 3.2)">
 <g id="imsrv_plat" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Branding Server</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="legacypresence" class="package" transform="translate( 1504.5000000000007 0)">
+<g id="legacypresence" class="package" transform="translate( 1513.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="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>
 <g transform="translate(0 3.2)">
 <g id="pressrv_plat" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SIMPLE Data Model Adapter</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="opensrv" class="package" transform="translate( 1662.9000000000005 0)">
+<g id="opensrv" class="package" transform="translate( 1672.2000000000005 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
 <rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:lightpink;"/>
 <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Open Services</text>
 <g transform="translate(0 3.2)">
 <g id="opensrv_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="remotemgmt" class="package" transform="translate( 1698.3000000000006 0)">
+<g id="remotemgmt" class="package" transform="translate( 1707.6000000000006 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="431.1000000000003" height="97.2" y="0" style="fill:darkseagreen;"/>
+<rect class="package" x="0" width="449.70000000000033" height="97.2" y="0" style="fill:darkseagreen;"/>
-<text text-anchor="middle" class="package" width="431.1000000000003" x="215.55000000000015" y="86.2" dy="0.375em">Remote Management</text>
+<text text-anchor="middle" class="package" width="449.70000000000033" x="224.85000000000016" y="86.2" dy="0.375em">Remote Management</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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Remote Mgmt. Public Interfaces</text>
 <g transform="translate(0 6.299999999999999)">
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Synchronization Capability API</text>
 </g>
 </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"/>
+<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="352.0000000000003" height="6.299999999999999">Remote Mgmt. Platform Interfaces</text>
+<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="370.6000000000003" height="6.299999999999999">Remote Mgmt. Platform Interfaces</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"/>
 <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">Common Agent util and definitions API</text>
 </g>
 <g id="dm_native_notifier_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="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">
 <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
 <g id="syncmlfw" transform="translate(0 37.6)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">SyncML Framework</text>
 <g transform="translate(0 6.299999999999999)"/>
 </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="37.2"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">Terminal Security</text>
 <g transform="translate(0 6.299999999999999)">
 <g id="scp" 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: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">server</text>
 </g>
 </g>
 </g>
-<g id="omaprovisioning" transform="translate(412.5000000000003 0)" class="collection">
+<g id="omaprovisioning" transform="translate(431.1000000000003 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 Provisioning</text>
 <g transform="translate(0 6.299999999999999)">
 <g id="pnputil" class="component">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="dlnasrv" class="package" transform="translate( 2131.500000000001 0)">
+<g id="dlnasrv" class="package" transform="translate( 2159.400000000001 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color5.mouseover" end="s8-color5.mouseout"/>
 <rect class="package" x="0" width="109.79999999999998" height="97.2" y="0" style="fill:orchid;"/>
 <text text-anchor="middle" class="package" width="109.79999999999998" x="54.89999999999999" y="86.2" dy="0.375em">DLNA Services</text>
 <g transform="translate(0 3.2)">
 <g id="dlnasrv_plat" transform="translate(0 0)" class="collection">
 <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">Bluetooth AVRCP</text>
 </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>
 <g transform="translate(0 6.299999999999999)">
 <g id="btservices_metadata" class="component">
 </g>
 </g>
 </g>
 <g id="shortlinkconn" class="package" transform="translate( 1740.6 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;"/>
+<rect class="package" x="0" width="74.39999999999999" 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>
+<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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="72.99999999999999" height="6.299999999999999">Shortlink Connectivity Platform Interfaces</text>
 <g transform="translate(0 6.299999999999999)">
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">USB OBEX Service Manager Client API</text>
 </g>
 </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"/>
+<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="100.89999999999998" height="6.299999999999999">Local Connectivity Service</text>
+<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"/>
 <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">Local Connectivity Daemon</text>
 <g id="dun" 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">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>
+<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="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>
 </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; "/>
+<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="88.35">Generic HID</text>
+<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; "/>
+<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="97.64999999999999">Headset</text>
+<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( 2243.400000000001 0)">
+<g id="imghandling" class="package" transform="translate( 2271.300000000001 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
 <rect class="package" x="0" width="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>
 <g transform="translate(0 3.2)">
 <g id="imagehandling_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="metadatasrv" class="package" transform="translate( 2273.400000000001 0)">
+<g id="metadatasrv" class="package" transform="translate( 2301.300000000001 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-<rect class="package" x="0" width="48.6" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+<rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
-<text text-anchor="middle" class="package" width="48.6" x="24.3" y="86.2" dy="0.375em">Legacy Metadata Services</text>
+<text text-anchor="middle" class="package" width="33.3" x="16.65" 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"/>
+<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="17.200000000000003" height="6.299999999999999">Legacy Metadata Services Public Interfaces</text>
+<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Legacy Metadata Services Public Interfaces</text>
 <g transform="translate(0 6.299999999999999)">
-<g id="content_listing_framework_api" class="component">
+<g id="media_fetch_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">Content Listing Framework API</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Media Fetch API</text>
 </g>
-<g id="media_fetch_api" class="component">
+</g>
-<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
+</g>
-<use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+<g id="metadatasrv_plat" transform="translate(17.7 0)" class="collection">
-<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>
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-</g>
+<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">Legacy Metadata Services Platform Interfaces</text>
-</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 Interfaces</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; "/>
-<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; "/>
-<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>
 </g>
 <g id="mediamanagementutilities" 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">Media Mgmt. Utilities</text>
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="mds" class="package" transform="translate( 2324.100000000001 0)">
+<g id="mds" class="package" transform="translate( 2336.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="122.1" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
 <text text-anchor="middle" class="package" width="122.1" x="61.05" y="96.2">Metadata Services</text>
 <g transform="translate(0 3.2)">
 <g id="mds_plat" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Watchdog</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="mmuifw" class="package" transform="translate( 2448.3000000000006 0)">
+<g id="mmuifw" class="package" transform="translate( 2460.900000000001 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
 <rect class="package" x="0" width="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">Multimedia UI Fmwk.</text>
 <g transform="translate(0 3.2)">
 <g id="mmuifw_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="videoutils" class="package" transform="translate( 2599.2000000000007 0)">
+<g id="videoutils" class="package" transform="translate( 2611.800000000001 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
 <rect class="package" x="0" width="39.300000000000004" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
 <text text-anchor="middle" class="package" width="39.300000000000004" x="19.650000000000002" y="96.2">Video Utils</text>
 <g transform="translate(0 3.2)">
 <g id="videoutils_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="mmmw" class="package" transform="translate( 1845 100.4)">
+<g id="mmmw" class="package" transform="translate( 1817.1 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="308.1000000000001" height="116.00000000000001" y="0" style="fill:rgb(175,212,240);"/>
 <text text-anchor="middle" class="package" width="308.1000000000001" x="154.05000000000004" y="115.00000000000003">Multimedia Middleware</text>
 <g transform="translate(0 3.2)">
 <g id="mmmw_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="helix" class="package" transform="translate( 2155.2000000000003 100.4)">
+<g id="helix" class="package" transform="translate( 2127.3 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>
 <g transform="translate(0 3.2)">
 <g id="helix_ren" transform="translate(0 56.400000000000006)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="camerasrv" class="package" transform="translate( 2640.600000000001 0)">
+<g id="camerasrv" class="package" transform="translate( 2653.200000000001 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
 <rect class="package" x="0" width="92.09999999999998" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
 <text text-anchor="middle" class="package" width="92.09999999999998" x="46.04999999999999" y="96.2">Camera Services</text>
 <g transform="translate(0 3.2)">
 <g id="camerasrv_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="mmappfw" class="package" transform="translate( 2734.8000000000006 0)">
+<g id="mmappfw" class="package" transform="translate( 2747.400000000001 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color8.mouseover" end="s8-color8.mouseout"/>
-<rect class="package" x="0" width="195.30000000000007" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
+<rect class="package" x="0" width="176.70000000000005" height="97.2" y="0" style="fill:rgb(175,212,240);"/>
-<text text-anchor="middle" class="package" width="195.30000000000007" x="97.65000000000003" y="96.2">Multimedia App Fmwk.</text>
+<text text-anchor="middle" class="package" width="176.70000000000005" x="88.35000000000002" y="96.2">Multimedia 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="195.30000000000007"/>
+<rect class="collection" x="0" y="0" height="15.6" width="176.70000000000005"/>
-<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="193.90000000000006" height="6.299999999999999">MM App FW Platform Interfaces</text>
+<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="175.30000000000004" height="6.299999999999999">MM App FW Platform Interfaces</text>
 <g transform="translate(0 6.299999999999999)">
 <g id="collection_helper_api" class="component">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
 <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Collection Helper API</text>
 <g id="media_player_settings_engine_api" class="component">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
 <use width="9.3" height="9.3" x="148.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Media Player Settings Engine API</text>
 </g>
-<g id="mpx_backstepping_utility_api" class="component">
+<g id="playback_helper_api" class="component">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
 <use width="9.3" height="9.3" x="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">MPX Backstepping Utility API</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="162.75000000000003">Playback Helper API</text>
 </g>
-<g id="asx_parser_api" class="component">
+<g id="videoplaylist_utility_api" class="component">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
 <use width="9.3" height="9.3" x="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">ASX Parser API</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">Video Playlist Utility API</text>
-</g>
-<g id="playback_helper_api" class="component">
-<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-<use width="9.3" height="9.3" x="176.70000000000005" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="181.35000000000005">Playback Helper API</text>
-</g>
-<g id="videoplaylist_utility_api" class="component">
-<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
-<use width="9.3" height="9.3" x="186.00000000000006" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
-<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="190.65000000000006">Video Playlist Utility API</text>
 </g>
 </g>
 </g>
 <g id="mpx" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="inputmethods" class="package" transform="translate( 2185.2000000000003 100.4)">
+<g id="inputmethods" class="package" transform="translate( 2157.3 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="195.30000000000007" height="116.00000000000001" y="0" style="fill:orange;"/>
+<rect class="package" x="0" width="176.70000000000005" 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>
+<text text-anchor="middle" class="package" width="176.70000000000005" x="88.35000000000002" 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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Input Methods Public Interfaces</text>
 <g transform="translate(0 6.299999999999999)">
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">Avkon FEP UI Interface API</text>
 </g>
 </g>
 </g>
 <g id="textinput" transform="translate(0 18.8)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="195.30000000000007"/>
+<rect class="collection" x="0" y="0" height="15.6" width="176.70000000000005"/>
-<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="193.90000000000006" height="6.299999999999999">Text Input</text>
+<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="175.30000000000004" height="6.299999999999999">Text Input</text>
 <g transform="translate(0 6.299999999999999)">
 <g id="akninputlanguage" 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">Avkon Input Language</text>
 </g>
-<g id="ptihangulcore" class="component">
+<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="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">PIT Hangul Core</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Pen Input Arc</text>
 </g>
-<g id="ptikoreanqwertycore" class="component">
+<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="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">PTI Korean QWERTY Core</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Pen Input Common Controls</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="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 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="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 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="46.5" y="0" xlink:href="#BorderShape2" style="fill:#32cd99;stroke-width: 0.5; "/>
+<use width="9.3" height="9.3" x="27.900000000000002" 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 Handwriting Recognition Box</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Chinese Handwriting Recognition 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="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 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="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 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="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 Virtual Keyboard</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Pen Input Generic Handwriting Recognition</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="65.1" 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="69.75">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="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 Handwriting Recognition</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="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 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="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 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="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 Virtual Keyboard</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">Japanese Handwriting Recognition Box</text>
 </g>
-<g id="peninputcommonctrlsjp" class="component">
+<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="92.99999999999999" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+<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 Common Controls Japanese</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">Japanese Virtual Keyboard</text>
 </g>
-<g id="peninputhwrboxjp" class="component">
+<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="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 Handwriting Recognition Box</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">Pen Input Generic ITU-T</text>
 </g>
-<g id="peninputvkbjp" class="component">
+<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="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 Virtual Keyboard</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="116.24999999999999">Pen Input Handwriting Recognition Training UI</text>
 </g>
-<g id="peninputgenericitut" class="component">
+<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="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>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="125.54999999999998">Pen Input Chinese Full Screen Handwriting Recognition</text>
 </g>
-<g id="peninputhwrtrui" class="component">
+<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="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">Pen Input Handwriting Recognition Training UI</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="134.85">Pen Input Korean Virtual Keyboard</text>
 </g>
-<g id="peninputhwrfscn" class="component">
+<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="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 Chinese Full Screen Handwriting Recognition</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="144.15">Pen Input Finger Handwriting Recognition</text>
 </g>
-<g id="peninputvkbkr" class="component">
+<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="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 Korean Virtual Keyboard</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="153.45000000000002">Pen Input Split ITU-T</text>
 </g>
-<g id="peninputfingerhwr" class="component">
+<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="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 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 Split QWERTY</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="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="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="GSLangPlugin" 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="186.00000000000006" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+<use width="9.3" height="9.3" x="167.40000000000003" 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="190.65000000000006">GSLangPlugin</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="172.05000000000004">GSLangPlugin</text>
 </g>
 </g>
 </g>
 <g id="fep" transform="translate(0 37.6)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="classicui" class="package" transform="translate( 2382.6000000000004 100.4)">
+<g id="qt" class="package" transform="translate( 2336.1000000000004 100.4)">
+<set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
+<rect class="package" x="0" width="89.4" height="116.00000000000001" y="0" style="fill:orange;"/>
+<text text-anchor="middle" class="package" width="89.4" x="44.7" y="115.00000000000003">Qt</text>
+<g transform="translate(0 3.2)">
+<g id="src" transform="translate(0 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">src</text>
+<g transform="translate(0 6.299999999999999)">
+<g id="s60installs" 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">s60installs</text>
+</g>
+</g>
+</g>
+<g id="." transform="translate(17.7 0)" class="collection placeholder">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">.</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="demos" transform="translate(35.4 0)" class="collection placeholder">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">demos</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="examples" transform="translate(53.099999999999994 0)" class="collection placeholder">
+<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">examples</text>
+<g transform="translate(0 6.299999999999999)"/>
+</g>
+<g id="tests" transform="translate(70.8 0)" class="collection">
+<rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">tests</text>
+<g transform="translate(0 6.299999999999999)">
+<g id="auto" 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">auto</text>
+</g>
+<g id="benchmarks" 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">benchmarks</text>
+</g>
+</g>
+</g>
+</g>
+</g>
+<g id="classicui" class="package" transform="translate( 2427.6000000000004 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>
 <g transform="translate(0 3.2)">
 <g id="classicui_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="svgt" class="package" transform="translate( 3895.799999999999 100.4)">
+<g id="svgt" class="package" transform="translate( 3940.799999999999 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>
 <g transform="translate(0 3.2)">
 <g id="svgt_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="uiaccelerator" class="package" transform="translate( 3925.799999999999 100.4)">
+<g id="uiaccelerator" class="package" transform="translate( 3970.799999999999 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 Accelerator</text>
 <g transform="translate(0 3.2)">
 <g id="uiaccelerator_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="uiresources" class="package" transform="translate( 3983.699999999999 100.4)">
+<g id="uiresources" class="package" transform="translate( 4028.699999999999 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
 <rect class="package" x="0" width="262.8" height="116.00000000000001" y="0" style="fill:orange;"/>
 <text text-anchor="middle" class="package" width="262.8" x="131.4" y="105" dy="0.375em">UI Resources</text>
 <g transform="translate(0 3.2)">
 <g id="uiresources_pub" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Help Themes</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="hapticsservices" class="package" transform="translate( 4248.5999999999995 100.4)">
+<g id="hapticsservices" class="package" transform="translate( 4293.5999999999995 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
 <rect class="package" x="0" width="46.5" height="116.00000000000001" y="0" style="fill:orange;"/>
 <text text-anchor="middle" class="package" width="46.5" x="23.25" y="115.00000000000003">Haptics Services</text>
 <g transform="translate(0 3.2)">
 <g id="hapticsservices_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="gsprofilesrv" class="package" transform="translate( 4297.2 100.4)">
+<g id="gsprofilesrv" class="package" transform="translate( 4342.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="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>
 <g transform="translate(0 3.2)">
 <g id="gsprofilesrv_pub" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="homescreensrv" class="package" transform="translate( 2932.2000000000007 0)">
+<g id="homescreensrv" class="package" transform="translate( 2926.200000000001 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;"/>
+<rect class="package" x="0" width="195.30000000000007" height="97.2" y="0" style="fill:orange;"/>
-<text text-anchor="middle" class="package" width="189.00000000000009" x="110.10000000000004" y="86.2" dy="0.375em">Home Screen Services</text>
+<text text-anchor="middle" class="package" width="179.70000000000007" x="105.45000000000003" y="86.2" 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"/>
+<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="203.20000000000007" height="6.299999999999999">Home Screen Services Platform Interfaces</text>
+<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="193.90000000000006" height="6.299999999999999">Home Screen Services Platform Interfaces</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"/>
 <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">AI Content Model API</text>
 <g id="hs_widget_publisher_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="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>
+<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_settings_api" class="component">
+<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>
+<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 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>
 </g>
 </g>
 </g>
 <g id="xcfw" transform="translate(0 56.400000000000006)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <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">Content Harvester</text>
 </g>
 </g>
 </g>
-<g id="contextutility" transform="translate(17.7 18.8)" class="collection placeholder">
-<rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
-<text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Context Utility</text>
-<g transform="translate(0 6.299999999999999)"/>
-</g>
 <g id="contentcontrolsrv" transform="translate(47.7 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">Content Control Service</text>
 <g transform="translate(0 6.299999999999999)">
 <g id="ccsrv" class="component">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="appinstall" class="package" transform="translate( 4403.7 100.4)">
+<g id="appinstall" class="package" transform="translate( 4448.7 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
 <rect class="package" x="0" width="157.49999999999997" height="116.00000000000001" y="0" style="fill:slateblue;"/>
 <text text-anchor="middle" class="package" width="157.49999999999997" x="78.74999999999999" y="115.00000000000003">App Installation</text>
 <g transform="translate(0 3.2)">
 <g id="appinstall_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="serviceapifw" class="package" transform="translate( 3138.900000000001 0)">
+<g id="serviceapifw" class="package" transform="translate( 3123.6000000000013 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
 <rect class="package" x="0" width="83.69999999999999" height="97.2" y="0" style="fill:slateblue;"/>
 <text text-anchor="middle" class="package" width="83.69999999999999" x="41.849999999999994" y="86.2" dy="0.375em">Service API Framework</text>
 <g transform="translate(0 3.2)">
 <g id="serviceapifw_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="serviceapi" class="package" transform="translate( 3224.700000000001 0)">
+<g id="serviceapi" class="package" transform="translate( 3209.4000000000015 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
 <rect class="package" x="0" width="111.59999999999998" height="97.2" y="0" style="fill:slateblue;"/>
 <text text-anchor="middle" class="package" width="111.59999999999998" x="55.79999999999999" y="96.2">Service API</text>
 <g transform="translate(0 3.2)">
 <g id="serviceproviders" transform="translate(0 37.6)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="web" class="package" transform="translate( 3338.400000000001 0)">
+<g id="web" class="package" transform="translate( 3323.1000000000013 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="292.5" height="97.2" y="0" style="fill:slateblue;"/>
+<rect class="package" x="0" width="301.8" height="97.2" y="0" style="fill:slateblue;"/>
-<text text-anchor="middle" class="package" width="292.5" x="146.25" y="86.2" dy="0.375em">Web</text>
+<text text-anchor="middle" class="package" width="301.8" x="150.9" 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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="54.4" height="6.299999999999999">Web Public Interfaces</text>
 <g transform="translate(0 6.299999999999999)">
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="51.15">Settings API</text>
 </g>
 </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"/>
+<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="156.70000000000002" height="6.299999999999999">Web Platform Interfaces</text>
+<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="166.00000000000003" height="6.299999999999999">Web Platform Interfaces</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"/>
 <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">AIW Browser Provider API</text>
 <g id="download_mgr_client_api_extn" class="component">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
 <use width="9.3" height="9.3" x="55.8" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Download Manager Client API Extension</text>
 </g>
+<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">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="65.1" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+<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="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="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; "/>
+<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="79.05">Launcher API</text>
+<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; "/>
+<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="88.35">Multipart Parser API</text>
+<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; "/>
+<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="97.64999999999999">Recent URL Store API</text>
+<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; "/>
+<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="106.94999999999999">Scheme Handler Plugin API</text>
+<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; "/>
+<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="116.24999999999999">Scriptable Plugin API</text>
+<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; "/>
+<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="125.54999999999998">Web Utils 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="130.2" y="0" xlink:href="#Borderround" style="fill:#32cd99;stroke-width: 0.5; "/>
+<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="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="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; "/>
+<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="144.15">XML Parser API</text>
+<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; "/>
+<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="153.45000000000002">State Machine Gesture Framework API </text>
+<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="browserutilities" transform="translate(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="111.59999999999998"/>
 <use width="9.3" height="9.3" x="111.59999999999998" 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="116.24999999999999">memoryplugin</text>
 </g>
 </g>
 </g>
-<g id="codhandler" transform="translate(218.10000000000002 0)" class="collection">
+<g id="codhandler" transform="translate(227.40000000000003 0)" class="collection">
 <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">Content Object Descriptor Handler</text>
 <g transform="translate(0 6.299999999999999)">
 <g id="codeng" class="component">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Web Widget Framework</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="websrv" class="package" transform="translate( 4563.3 100.4)">
+<g id="websrv" class="package" transform="translate( 4608.3 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
 <rect class="package" x="0" width="241.80000000000013" height="116.00000000000001" y="0" style="fill:slateblue;"/>
 <text text-anchor="middle" class="package" width="241.80000000000013" x="120.90000000000006" y="115.00000000000003">Web Services</text>
 <g transform="translate(0 3.2)">
 <g id="websrv_pub" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="platformtools" class="package" transform="translate( 4807.200000000001 100.4)">
+<g id="platformtools" class="package" transform="translate( 4852.200000000001 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>
 <g transform="translate(0 3.2)">
 <g id="gfxconversion" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="uitools" class="package" transform="translate( 3633.000000000001 0)">
+<g id="uitools" class="package" transform="translate( 3627.0000000000014 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>
 <g transform="translate(0 3.2)">
 <g id="uitools_pub" transform="translate(0 0)" class="collection">
 </g>
 </g>
 <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="189.43"/>
 <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="189.43" height="9.3" x="-95.015">Applications</text>
-<g class="layer-detail" transform="translate(800.2999999999993 3.2)">
+<g class="layer-detail" transform="translate(836.7499999999991 3.2)">
-<rect x="-787.4999999999993" class="layer" y="-3.2" width="4835.1" height="189.43"/>
+<rect x="-823.9499999999991" class="layer" y="-3.2" width="4880.1" height="189.43"/>
 <g>
 <g id="location" class="package" transform="translate( 0 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
 <rect class="package" x="0" width="107.1" height="97.2" y="0" style="fill:whitesmoke;"/>
 <text text-anchor="middle" class="package" width="107.1" x="53.55" y="96.2">Location Apps</text>
 </g>
 </g>
 </g>
 <g id="contentcontrol" class="package" transform="translate( 394.50000000000006 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
-<rect class="package" x="0" width="67.19999999999999" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
+<rect class="package" x="0" width="48.6" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
-<text text-anchor="middle" class="package" width="67.19999999999999" x="33.599999999999994" y="81.63000000000002">Content Control Daemons</text>
+<text text-anchor="middle" class="package" width="48.6" x="24.3" y="81.63000000000002">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"/>
+<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="45.1" height="6.299999999999999">Content Control Daemons Platforn Interfaces</text>
+<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Content Control Daemons Platforn Interfaces</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"/>
 <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">OMA DS PreSync Plugin API</text>
 <g id="ds_folder_util_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">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 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">Data Sync DCMO Adapter</text>
 <g transform="translate(0 6.299999999999999)"/>
 </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)">
 <g id="omadsappui" class="component">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="devicecontrol" class="package" transform="translate( 463.80000000000007 100.4)">
+<g id="devicecontrol" class="package" transform="translate( 445.20000000000005 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color6.mouseover" end="s8-color6.mouseout"/>
 <rect class="package" x="0" width="101.39999999999998" height="82.63000000000001" y="0" style="fill:darkseagreen;"/>
 <text text-anchor="middle" class="package" width="101.39999999999998" x="50.69999999999999" y="81.63000000000002">Device Control Daemons</text>
 <g transform="translate(0 3.2)">
 <g id="devicediagnostics" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="printing" class="package" transform="translate( 567.3000000000001 100.4)">
+<g id="printing" class="package" transform="translate( 548.7 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="27.900000000000002" height="82.63000000000001" y="0" style="fill:orchid;"/>
 <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Printing</text>
 <g transform="translate(0 3.2)">
 <g id="imageprint" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 <g id="contacts" class="package" transform="translate( 605.6999999999999 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="183.03" y="0" style="fill:lightpink;"/>
+<rect class="package" x="0" width="569.7000000000004" height="183.03" y="0" style="fill:lightpink;"/>
-<text text-anchor="middle" class="package" width="579.0000000000003" x="289.50000000000017" y="182.03">Contacts Apps</text>
+<text text-anchor="middle" class="package" width="569.7000000000004" x="284.8500000000002" y="182.03">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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="63.699999999999996" height="6.299999999999999">Contacts Apps Public Interfaces</text>
 <g transform="translate(0 6.299999999999999)">
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="60.449999999999996">Speed Dial Utility Control API</text>
 </g>
 </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"/>
+<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="445.0000000000004" height="6.299999999999999">Contacts Apps Platform Interfaces</text>
+<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="435.7000000000004" height="6.299999999999999">Contacts Apps Platform Interfaces</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"/>
 <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">Virtual Phonebook Store API</text>
 <g id="phonebook_2_ui_utilities_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">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>
+<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_launch_api" class="component">
+<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>
+<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="cca_view_plugin_api" class="component">
+<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>
+<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_client_api" class="component">
+<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>
+<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_utils_api" class="component">
+<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>
+<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_adapters_api" class="component">
+<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>
+<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="predictivesearch_algorithm_api" class="component">
+<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>
+<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 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>
 </g>
 </g>
 </g>
 <g id="contactextensions" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <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">Predefined Contacts</text>
 </g>
 </g>
 </g>
-<g id="logsui" transform="translate(515.7000000000004 0)" class="collection placeholder">
+<g id="logsui" transform="translate(506.4000000000004 0)" class="collection placeholder">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Logs UI</text>
 <g transform="translate(0 6.299999999999999)"/>
 </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">Phonebook UI</text>
 <g transform="translate(0 6.299999999999999)">
 <g id="phonebook" 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: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">adapters</text>
 </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)">
 <g id="contacts_metadata" class="component">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="organizer" class="package" transform="translate( 1186.8000000000002 0)">
+<g id="organizer" class="package" transform="translate( 1177.5000000000002 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
 <rect class="package" x="0" width="289.80000000000007" height="183.03" y="0" style="fill:lightpink;"/>
 <text text-anchor="middle" class="package" width="289.80000000000007" x="144.90000000000003" y="182.03">Organizer App Suite</text>
 <g transform="translate(0 3.2)">
 <g id="organizer_plat" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">App Engines Docs</text>
 </g>
 </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"/>
+<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="17.200000000000003" height="6.299999999999999">PIM App Support</text>
+<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"/>
 <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">vCard &amp; vCal</text>
 </g>
 <g id="chinesecalendarconverter" 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">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(274.20000000000005 0)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="messaging" class="package" transform="translate( 1478.7000000000003 0)">
+<g id="messaging" class="package" transform="translate( 1469.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="356.7000000000001" height="183.03" y="0" style="fill:lightpink;"/>
 <text text-anchor="middle" class="package" width="356.7000000000001" x="178.35000000000005" y="182.03">Messaging Apps</text>
 <g transform="translate(0 3.2)">
 <g id="msg_pub" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="commonemail" class="package" transform="translate( 1837.5000000000005 0)">
+<g id="commonemail" class="package" transform="translate( 1828.2000000000005 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
 <rect class="package" x="0" width="148.8" height="183.03" y="0" style="fill:lightpink;"/>
 <text text-anchor="middle" class="package" width="148.8" x="74.4" y="182.03">Email Apps</text>
 <g transform="translate(0 3.2)">
 <g id="email_pub" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Email Widget API</text>
 </g>
 </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"/>
+<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="26.500000000000004" height="6.299999999999999">Email Apps Platform Interfaces</text>
+<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">Email Apps Platform Interfaces</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"/>
 <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">Email Client API</text>
 </g>
 <g id="email_setup_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="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">
 <rect class="collection" x="0" y="0" height="15.6" width="74.39999999999999"/>
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">IPS SOS Always Online Plugin</text>
 </g>
 </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"/>
+<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="26.500000000000004" height="6.299999999999999">Email Contacts</text>
+<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"/>
 <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">Contact Action Service</text>
 </g>
 <g id="contactactionmenu" 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">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">
 <rect class="collection" x="0" y="0" height="15.6" width="148.8"/>
 <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">MR URL Parser Plugin</text>
 </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="27.900000000000002"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Email UIs</text>
 <g transform="translate(0 6.299999999999999)">
 <g id="emailui" class="component">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="conversations" class="package" transform="translate( 1988.4000000000005 0)">
+<g id="conversations" class="package" transform="translate( 1979.1000000000006 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
 <rect class="package" x="0" width="106.50000000000001" height="97.2" y="0" style="fill:lightpink;"/>
 <text text-anchor="middle" class="package" width="106.50000000000001" x="53.25000000000001" y="96.2">Conversation Apps</text>
 <g transform="translate(0 3.2)">
 <g id="conversations_plat" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">IM Status Pane Indicator Plugin</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="im" class="package" transform="translate( 2097.0000000000005 0)">
+<g id="im" class="package" transform="translate( 2087.7000000000007 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
 <rect class="package" x="0" width="27.900000000000002" height="97.2" y="0" style="fill:lightpink;"/>
 <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="96.2">Instant Msg. Apps</text>
 <g transform="translate(0 3.2)">
 <g id="im_plat" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Wireless Village Settings Eng.</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="dictionary" class="package" transform="translate( 1988.4000000000005 100.4)">
+<g id="dictionary" class="package" transform="translate( 1979.1000000000006 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color7.mouseover" end="s8-color7.mouseout"/>
 <rect class="package" x="0" width="33.3" height="82.63000000000001" y="0" style="fill:lightpink;"/>
 <text text-anchor="middle" class="package" width="33.3" x="16.65" y="81.63000000000002">Dictionary</text>
 <g transform="translate(0 3.2)">
 <g id="dictionary_plat" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">User Dictionary</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="camera" class="package" transform="translate( 2127.0000000000005 0)">
+<g id="camera" class="package" transform="translate( 2117.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="39.300000000000004" height="97.2" y="0" style="fill:#ffff00;"/>
 <text text-anchor="middle" class="package" width="39.300000000000004" x="19.650000000000002" y="96.2">Camera Apps</text>
 <g transform="translate(0 3.2)">
 <g id="camera_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="imgeditor" class="package" transform="translate( 2168.4000000000005 0)">
+<g id="imgeditor" class="package" transform="translate( 2159.100000000001 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
 <rect class="package" x="0" width="113.69999999999999" height="97.2" y="0" style="fill:#ffff00;"/>
 <text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="96.2">Image Editor Apps</text>
 <g transform="translate(0 3.2)">
 <g id="imgeditor_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="videoeditor" class="package" transform="translate( 2284.2000000000007 0)">
+<g id="videoeditor" class="package" transform="translate( 2274.900000000001 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
 <rect class="package" x="0" width="64.2" height="97.2" y="0" style="fill:#ffff00;"/>
 <text text-anchor="middle" class="package" width="64.2" x="32.1" y="96.2">Video Editor Apps</text>
 <g transform="translate(0 3.2)">
 <g id="videoeditor_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="videoplayer" class="package" transform="translate( 2350.500000000001 0)">
+<g id="videoplayer" class="package" transform="translate( 2341.200000000001 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
 <rect class="package" x="0" width="206.70000000000002" height="97.2" y="0" style="fill:#ffff00;"/>
-<text text-anchor="middle" class="package" width="167.4" x="123.00000000000001" y="86.2" dy="0.375em">Video Player Apps</text>
+<text text-anchor="middle" class="package" width="178.8" x="117.30000000000001" y="11" dy="0.375em">Video Player Apps</text>
 <g transform="translate(0 3.2)">
 <g id="videoplayer_plat" transform="translate(0 18.8)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">Video Player Apps Platform Interfaces</text>
 <g transform="translate(0 6.299999999999999)">
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">File Details Dialog</text>
 </g>
 </g>
 </g>
 <g id="videoplayerapp" transform="translate(30.000000000000004 18.8)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+<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="26.500000000000004" height="6.299999999999999">Video Player App</text>
+<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"/>
 <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">Lightweight Player</text>
 </g>
 <g id="mpxvideoplayer" 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">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(0 56.400000000000006)" class="collection">
 <rect class="collection" x="0" y="0" height="15.6" width="46.5"/>
 <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">Video Playback Views</text>
 </g>
 </g>
 </g>
-<g id="homescreenplugins" transform="translate(0 0)" class="collection">
+<g id="tsrc" transform="translate(0 0)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
-<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">homescreenplugins</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="tsrc" 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">tsrc</text>
 <g transform="translate(0 6.299999999999999)">
 <g id="VCXTestCommon" class="component">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="photos" class="package" transform="translate( 2559.300000000001 0)">
+<g id="photos" class="package" transform="translate( 2550.0000000000014 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-<rect class="package" x="0" width="178.79999999999998" height="97.2" y="0" style="fill:#ffff00;"/>
+<rect class="package" x="0" width="160.19999999999996" height="97.2" y="0" style="fill:#ffff00;"/>
-<text text-anchor="middle" class="package" width="178.79999999999998" x="89.39999999999999" y="96.2">Photos</text>
+<text text-anchor="middle" class="package" width="160.19999999999996" x="80.09999999999998" y="96.2">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"/>
 <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Photos Platform Interfaces</text>
 <g transform="translate(0 6.299999999999999)">
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Views Metadata Dialog API</text>
 </g>
 </g>
 </g>
 <g id="photosgallery" transform="translate(48.6 0)" class="collection">
-<rect class="collection" x="0" y="0" height="15.6" width="130.2"/>
+<rect class="collection" x="0" y="0" height="15.6" width="111.59999999999998"/>
-<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="128.79999999999998" height="6.299999999999999">Photos Gallery</text>
+<text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="110.19999999999997" height="6.299999999999999">Photos Gallery</text>
 <g transform="translate(0 6.299999999999999)">
 <g id="logging" 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">Photos Logging</text>
 <g id="slideshow" 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">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="27.900000000000002" 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="32.550000000000004">Gallery Content Harvester Plugin</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Memory 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="37.2" 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="41.85">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="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">Memory 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="55.8" y="0" xlink:href="#Borderbox" style="fill:#32cd99;stroke-width: 0.5; "/>
+<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="60.449999999999996">Photos Image Viewer</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="41.85">Photos Image Viewer</text>
 </g>
 <g id="help" 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="#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="51.15">help</text>
+</g>
+<g id="common" 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="#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">common</text>
+</g>
+<g id="commonui" 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="#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">help</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="69.75">commonui</text>
 </g>
-<g id="common" class="component">
+<g id="collectionframework" 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="#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="79.05">common</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="79.05">collectionframework</text>
 </g>
-<g id="commonui" class="component">
+<g id="icons" 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">commonui</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="88.35">icons</text>
 </g>
-<g id="collectionframework" class="component">
+<g id="viewframework" 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">collectionframework</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="97.64999999999999">viewframework</text>
 </g>
-<g id="icons" class="component">
+<g id="gallery" 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="102.29999999999998" 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="106.94999999999999">icons</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="106.94999999999999">gallery</text>
-</g>
-<g id="viewframework" 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="111.59999999999998" 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="116.24999999999999">viewframework</text>
-</g>
-<g id="gallery" 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="120.89999999999998" 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="125.54999999999998">gallery</text>
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="musicplayer" class="package" transform="translate( 2740.200000000001 0)">
+<g id="musicplayer" class="package" transform="translate( 2712.3000000000015 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
 <rect class="package" x="0" width="132.29999999999998" height="97.2" y="0" style="fill:#ffff00;"/>
 <text text-anchor="middle" class="package" width="132.29999999999998" x="66.14999999999999" y="96.2">Music Player Apps</text>
 <g transform="translate(0 3.2)">
 <g id="musicplayer_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="radio" class="package" transform="translate( 2874.6000000000013 0)">
+<g id="radio" class="package" transform="translate( 2846.7000000000016 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
 <rect class="package" x="0" width="55.8" height="97.2" y="0" style="fill:#ffff00;"/>
 <text text-anchor="middle" class="package" width="55.8" x="27.9" y="96.2">Radio Apps</text>
 <g transform="translate(0 3.2)">
 <g id="fmradio" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="voicerec" class="package" transform="translate( 2932.5000000000014 0)">
+<g id="voicerec" class="package" transform="translate( 2904.6000000000017 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
 <rect class="package" x="0" width="36.300000000000004" height="97.2" y="0" style="fill:#ffff00;"/>
 <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="96.2">Voice Recorder Apps</text>
 <g transform="translate(0 3.2)">
 <g id="voicerec_plat" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Voice Recorder</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="screensaver" class="package placeholder" transform="translate( 2970.9000000000015 0)">
+<g id="screensaver" class="package placeholder" transform="translate( 2943.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="78" height="97.2" y="0" style="fill:orange;"/>
 <text text-anchor="middle" class="package" width="78" x="39" y="47.6" dy="0.375em" height="45.03">Screen Saver Apps</text>
 <g transform="translate(0 3.2)"/>
 </g>
-<g id="homescreen" class="package" transform="translate( 3051.0000000000014 0)">
+<g id="homescreen" class="package" transform="translate( 3023.1000000000017 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
 <rect class="package" x="0" width="113.69999999999999" height="97.2" y="0" style="fill:orange;"/>
 <text text-anchor="middle" class="package" width="113.69999999999999" x="56.849999999999994" y="96.2">Home Screen Apps</text>
 <g transform="translate(0 3.2)">
 <g id="homescreen_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="graphicsuis" class="package" transform="translate( 2023.8000000000006 100.4)">
+<g id="graphicsuis" class="package" transform="translate( 2014.5000000000007 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
 <rect class="package" x="0" width="45.6" height="82.63000000000001" y="0" style="fill:orange;"/>
 <text text-anchor="middle" class="package" width="45.6" x="22.8" y="81.63000000000002">Graphics UIs</text>
 <g transform="translate(0 3.2)">
 <g id="graphicsuis_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="profile" class="package" transform="translate( 3166.8000000000015 0)">
+<g id="profile" class="package" transform="translate( 3138.900000000002 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
 <rect class="package" x="0" width="33.3" height="97.2" y="0" style="fill:orange;"/>
 <text text-anchor="middle" class="package" width="33.3" x="16.65" y="96.2">Profiles</text>
 <g transform="translate(0 3.2)">
 <g id="profile_plat" transform="translate(0 18.8)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">help</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="speechsrv" class="package" transform="translate( 2071.5000000000005 100.4)">
+<g id="speechsrv" class="package" transform="translate( 2062.2000000000007 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
 <rect class="package" x="0" width="290.40000000000015" height="82.63000000000001" y="0" style="fill:orange;"/>
 <text text-anchor="middle" class="package" width="290.40000000000015" x="145.20000000000007" y="81.63000000000002">Speech Recognition UIs</text>
 <g transform="translate(0 3.2)">
 <g id="speechsrv_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="homescreentools" class="package" transform="translate( 2364.0000000000005 100.4)">
+<g id="homescreentools" class="package" transform="translate( 2354.7000000000007 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
 <rect class="package" x="0" width="54" height="82.63000000000001" y="0" style="fill:orange;"/>
 <text text-anchor="middle" class="package" width="54" x="27" y="81.63000000000002">Home Screen Tools</text>
 <g transform="translate(0 3.2)">
 <g id="dtdinstaller" transform="translate(0 0)" class="collection placeholder">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="webuis" class="package" transform="translate( 2420.1000000000004 100.4)">
+<g id="webuis" class="package" transform="translate( 2410.8000000000006 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
 <rect class="package" x="0" width="36.300000000000004" height="82.63000000000001" y="0" style="fill:slateblue;"/>
 <text text-anchor="middle" class="package" width="36.300000000000004" x="18.150000000000002" y="81.63000000000002">Web UIs</text>
 <g transform="translate(0 3.2)">
 <g id="browserui" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="jrt" class="package" transform="translate( 2458.5000000000005 100.4)">
+<g id="jrt" class="package" transform="translate( 2449.2000000000007 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
 <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:slateblue;"/>
 <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Java Runtime</text>
 <g transform="translate(0 3.2)">
 <g id="jrt_plat" transform="translate(0 0)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="conntools" class="package" transform="translate( 2488.5000000000005 100.4)">
+<g id="conntools" class="package" transform="translate( 2479.2000000000007 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
 <rect class="package" x="0" width="27.900000000000002" height="82.63000000000001" y="0" style="fill:moccasin;"/>
 <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="81.63000000000002">Connectivity Tools</text>
 <g transform="translate(0 3.2)">
 <g id="nettools" transform="translate(0 0)" class="collection">
 <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Emulator LAN</text>
 <g transform="translate(0 6.299999999999999)"/>
 </g>
 </g>
 </g>
-<g id="rndtools" class="package" transform="translate( 2518.5000000000005 100.4)">
+<g id="rndtools" class="package" transform="translate( 2509.2000000000007 100.4)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
 <rect class="package" x="0" width="84.9" height="82.63000000000001" y="0" style="fill:darkgray;"/>
 <text text-anchor="middle" class="package" width="84.9" x="42.45" y="81.63000000000002">R&amp;D tools</text>
 <g transform="translate(0 3.2)">
 <g id="creator" transform="translate(0 56.400000000000006)" class="collection placeholder">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="helps" class="package" transform="translate( 3202.2000000000016 0)">
+<g id="helps" class="package" transform="translate( 3174.300000000002 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
 <rect class="package" x="0" width="27.900000000000002" height="183.03" y="0" style="fill:orange;"/>
 <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="182.03">Help Apps</text>
 <g transform="translate(0 3.2)">
 <g id="csxhelp" transform="translate(0 18.8)" class="collection placeholder">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="techview" class="package" transform="translate( 3232.2000000000016 0)">
+<g id="techview" class="package" transform="translate( 3204.300000000002 0)">
 <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
 <rect class="package" x="0" width="27.900000000000002" height="183.03" y="0" style="fill:orange;"/>
 <text text-anchor="middle" class="package" width="27.900000000000002" x="13.950000000000001" y="182.03">Techview</text>
 <g transform="translate(0 3.2)">
 <g id="buildverification" transform="translate(0 94)" class="collection">
 </g>
 </g>
 </g>
 </g>
 </g>
-<g id="legend-root" class="legend" transform="translate(4550.9795 652.0600000000001) translate(303.3205 0) scale(12.803091119789137) translate(-303.3205)">
+<g id="legend-root" class="legend" transform="translate(4595.9795 656.2900000000002) translate(303.3205 0) scale(12.92177745981561) translate(-303.3205)">
 <text text-anchor="middle" class="title" x="286.98525" y="0">
 <tspan dy="0.75em" x="286.98525">Symbian OS ^3</tspan>
 <tspan dy="1em" x="286.98525">System Model</tspan>
-<tspan font-style="italic" dy="1em" id="release-version" x="286.98525">%d %b %Y</tspan>
+<tspan font-style="italic" dy="1em" id="release-version" x="286.98525" font-weight="normal">date</tspan>
 </text>
 <g id="legend-box">
 <rect class="legend" rx="5" ry="5" height="14.3" width="270.65" x="0" y="0"/>
 <g transform="translate(5 2.5)">
 <text text-anchor="start" class="lgd" dy="0.375em" x="0" y="4.65">Key</text>
 <rect class="cbox" height="3.1" width="15.5" fill="#ffff00" x="77" y="3.1"/>
 <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="84.75" y="4.65">Multimedia Apps (8)</text>
 </g>
 <g id="s8-color10">
 <rect class="cbox" height="3.1" width="15.5" fill="orange" x="15" y="6.2"/>
-<text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="22.75" y="7.75">User Interface (18)</text>
+<text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="22.75" y="7.75">User Interface (19)</text>
 </g>
 <g id="s8-color11">
 <rect class="cbox" height="3.1" width="15.5" fill="slateblue" x="30.5" y="6.2"/>
 <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="38.25" y="7.75">Runtimes and Web (9)</text>
 </g>
 <g transform="translate(150.3 0)">
 <g transform="translate(0 0)">
 <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 Component (141)</text>
+<text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test Component (139)</text>
 </g>
 </g>
 </g>
 <g transform="translate(164.6 0)">
 <g transform="translate(0 0)">
 <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">Deprecated 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">Deprecated in TB 9.1 (4)</text>
 </g>
 </g>
 </g>
 <g transform="translate(178.89999999999998 0)">
 <text text-anchor="end" class="label" dy="0.375em" x="3.5" y="4.65" width="3.5">Usage:</text>
 <use width="9.3" height="9.3" x="47.900000000000006" y="0" xlink:href="#Borderround" style="fill:grey;stroke-width: 0.5;"/>
 <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="52.550000000000004">Interface</text>
 </g>
 </g>
 <text text-anchor="middle" class="label" dy="0.375em" x="250.875" y="4.65">
-<tspan dy="-1em" x="250.875">107 Packages</tspan>
+<tspan dy="-1em" x="250.875">108 Packages</tspan>
-<tspan dy="1em" x="250.875">601 Collections</tspan>
+<tspan dy="1em" x="250.875">603 Collections</tspan>
-<tspan dy="1em" x="250.875">2553 Components</tspan>
+<tspan dy="1em" x="250.875">2539 Components</tspan>
 </text>
 </g>
 </g>
 </g>
 <g id="Zoom" onload="resized()">

changeset 476	6417401dfdf4
parent 453	d5b0fa109a95
child 478	5aabe25a7133