diff -r 4b422c146eb7 -r 621e7a39919a symbian3/single/sysdefs/sf3.svg
--- a/symbian3/single/sysdefs/sf3.svg	Fri Apr 23 16:01:34 2010 +0100
+++ b/symbian3/single/sysdefs/sf3.svg	Fri Apr 23 16:14:45 2010 +0100
@@ -2557,33 +2557,18 @@
        </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"/>
-       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="45.1" height="6.299999999999999">Network Protocol Modules</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="18.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="17.200000000000003" height="6.299999999999999">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>
-        <g id="networkprotoutils" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="9.3" y="0" xlink:href="#Borderbox" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
-         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">Network Protocol Common Utilities</text>
-        </g>
-        <g id="suplproxyprotocolmodule" class="component">
-         <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <use width="9.3" height="9.3" x="18.6" 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="23.25">SUPL Proxy Protocol Module</text>
-        </g>
         <g id="suplrrlpasn1" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color3.mouseover" end="s9-color3.mouseout"/>
-         <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">SUPL RRLP ASN1 Parser</text>
-        </g>
-        <g id="suplrrlpprotocol" 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">SUPL RRLP Protocol Module</text>
+         <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">SUPL RRLP ASN1 Parser</text>
         </g>
        </g>
       </g>
@@ -3413,6 +3398,18 @@
        <text text-anchor="middle" dy="0.375em" class="collection" y="7.8" x="7.8" width="14.2" height="15.6">Telephony API Tests</text>
        <g transform="translate(0 6.299999999999999)"/>
       </g>
+      <g id="wapstack" transform="translate(77.7 0)" class="collection">
+       <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="14.2" height="6.299999999999999">WAP Stack</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="wapmessageapi" 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">WAP Message API</text>
+        </g>
+       </g>
+      </g>
      </g>
     </g>
     <g id="bt" class="package" transform="translate( 2481.899999999999 0)">
@@ -5066,7 +5063,7 @@
      <rect class="package" x="0" width="215.10000000000002" height="120.23000000000002" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="215.10000000000002" x="107.55000000000001" y="119.23000000000002">Dev­ice Platform Release</text>
      <g transform="translate(0 3.2)">
-      <g id="s60extras" transform="translate(0 18.8)" class="collection">
+      <g id="s60extras" 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">S60 Extras</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5078,7 +5075,7 @@
         </g>
        </g>
       </g>
-      <g id="locfiles" transform="translate(17.7 18.8)" class="collection">
+      <g id="locfiles" transform="translate(17.7 37.6)" class="collection">
        <rect class="collection" x="0" y="0" height="15.6" width="158.10000000000002"/>
        <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="156.70000000000002" height="6.299999999999999">Locale Files</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5170,7 +5167,7 @@
         </g>
        </g>
       </g>
-      <g id="version" transform="translate(0 0)" class="collection">
+      <g id="version" 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">Version</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5182,7 +5179,7 @@
         </g>
        </g>
       </g>
-      <g id="helps_loc2" transform="translate(17.7 0)" class="collection">
+      <g id="helps_loc2" transform="translate(17.7 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">Helps Locale 2</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5193,7 +5190,7 @@
         </g>
        </g>
       </g>
-      <g id="sf_config" transform="translate(177.9 18.8)" class="collection">
+      <g id="sf_config" transform="translate(177.9 37.6)" 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">SF Config</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5223,7 +5220,18 @@
         </g>
        </g>
       </g>
-      <g id="symbianosbld" transform="translate(0 37.6)" class="collection">
+      <g id="s60bld" 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">S60 Build</text>
+       <g transform="translate(0 6.299999999999999)">
+        <g id="buildplatforms" class="component">
+         <set attributeName="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">Build Platforms</text>
+        </g>
+       </g>
+      </g>
+      <g id="symbianosbld" transform="translate(0 56.400000000000006)" 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">Symbian OS Build</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5247,7 +5255,7 @@
         </g>
        </g>
       </g>
-      <g id="foundation_system" transform="translate(35.4 0)" class="collection">
+      <g id="foundation_system" transform="translate(35.4 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">Found­ation System</text>
        <g transform="translate(0 6.299999999999999)">
@@ -5259,7 +5267,7 @@
         </g>
        </g>
       </g>
-      <g id="deviceplatformrelease_info" transform="translate(53.099999999999994 0)" class="collection">
+      <g id="deviceplatformrelease_info" transform="translate(53.099999999999994 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">Dev­ice Platform Release Info</text>
        <g transform="translate(0 6.299999999999999)">
@@ -6677,15 +6685,15 @@
          <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">OMA SUPL ASN Codec Plugin API</text>
         </g>
-        <g id="location_local_variation_api" class="component">
+        <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="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">
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="209.25000000000009">Query and Notification 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="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>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="218.5500000000001">Location Local Variation API</text>
         </g>
        </g>
       </g>
@@ -17114,7 +17122,7 @@
         </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; "/>
+         <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; "/>
          <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>
@@ -20119,7 +20127,7 @@
       <g id="s4-overlay0" class="cmp placeholder">
        <use width="9.3" height="9.3" x="0" y="0" xlink:href="#Borderbox" style="fill:grey;stroke-width: 0.5;"/>
        <use width="9.3" height="9.3" x="0" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox"/>
-       <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test Compo­nent (169)</text>
+       <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="4.65">Test Compo­nent (170)</text>
       </g>
      </g>
     </g>
@@ -20153,8 +20161,8 @@
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="265.17499999999995" y="4.65">
      <tspan dy="-1em" x="265.17499999999995">110 Packages</tspan>
-     <tspan dy="1em" x="265.17499999999995">666 Collections</tspan>
-     <tspan dy="1em" x="265.17499999999995">2911 Components</tspan>
+     <tspan dy="1em" x="265.17499999999995">668 Collections</tspan>
+     <tspan dy="1em" x="265.17499999999995">2910 Components</tspan>
     </text>
    </g>
   </g>