diff -r cef7e00e6981 -r 354d5b0553f4 symbian3/single/sysdefs/sf3pkg.svg
--- a/symbian3/single/sysdefs/sf3pkg.svg	Fri May 28 17:31:40 2010 +0100
+++ b/symbian3/single/sysdefs/sf3pkg.svg	Sun May 30 16:37:01 2010 +0100
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?AdobeSVGViewer resolution="600"?>
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 2182.999999999999 688.8196960149995" class="package-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:m="http://exslt.org/math" version="1.1" onload="wrapalltext()" viewBox="-3.2 -3.2 2102.899999999999 686.7023744025573" class="package-fixed" onscroll="resized()" onzoom="resized()" onresize="resized()">
  <title>Symbian OS ^3 System Model: date</title>
  <defs>
   <style type="text/css">
@@ -431,8 +431,8 @@
  <g id="os" transform="translate(3.1999999999999993 395.6)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">OS</text>
-  <g class="layer-detail" transform="translate(373.2499999999997 3.2)">
-   <rect x="-360.4499999999997" class="layer" y="-3.2" width="2160.599999999999" height="222.8"/>
+  <g class="layer-detail" transform="translate(333.19999999999976 3.2)">
+   <rect x="-320.39999999999975" class="layer" y="-3.2" width="2080.499999999999" height="222.8"/>
    <g>
     <g id="kernelhwsrv" class="package" transform="translate( 0 119.20000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
@@ -566,8 +566,8 @@
  <g id="mw" transform="translate(3.1999999999999993 169.6)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="222.8"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="222.8" height="9.3" x="-111.7">Middleware</text>
-  <g class="layer-detail" transform="translate(52.84999999999995 3.2)">
-   <rect x="-40.049999999999955" class="layer" y="-3.2" width="2160.599999999999" height="222.8"/>
+  <g class="layer-detail" transform="translate(12.8 3.2)">
+   <rect x="0" class="layer" y="-3.2" width="2080.499999999999" height="222.8"/>
    <g>
     <g id="appsupport" class="package" transform="translate( 0 100.4)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
@@ -863,8 +863,8 @@
  <g id="app" transform="translate(3.1999999999999993 0)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="166.4"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="166.4" height="9.3" x="-83.5">Applications</text>
-  <g class="layer-detail" transform="translate(12.8 3.2)">
-   <rect x="0" class="layer" y="-3.2" width="2160.599999999999" height="166.4"/>
+  <g class="layer-detail" transform="translate(52.850000000000065 3.2)">
+   <rect x="-40.05000000000007" class="layer" y="-3.2" width="2080.499999999999" height="166.4"/>
    <g>
     <g id="location" class="package" transform="translate( 0 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color2.mouseover" end="s8-color2.mouseout"/>
@@ -986,127 +986,109 @@
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="40.8">Image Editor Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="videoeditor" class="package" transform="translate( 1121.3999999999999 0)">
-     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="40.8">Video Editor Apps</text>
-     <g transform="translate(0 3.2)"/>
-    </g>
-    <g id="videoplayer" class="package" transform="translate( 1201.4999999999998 0)">
+    <g id="videoplayer" class="package" transform="translate( 1121.3999999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="78.4">Video Player Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="photos" class="package" transform="translate( 1281.5999999999997 0)">
+    <g id="photos" class="package" transform="translate( 1201.4999999999998 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="78.4">Photos</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="musicplayer" class="package" transform="translate( 1361.6999999999996 0)">
+    <g id="musicplayer" class="package" transform="translate( 1281.5999999999997 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="78.4">Music Player Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="radio" class="package" transform="translate( 1441.7999999999995 0)">
+    <g id="radio" class="package" transform="translate( 1361.6999999999996 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="40.8">Radio Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="internetradio" class="package placeholder" transform="translate( 1521.8999999999994 0)">
-     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">Internet Radio Apps</text>
-     <g transform="translate(0 3.2)"/>
-    </g>
-    <g id="podcatcher" class="package" transform="translate( 1601.9999999999993 0)">
+    <g id="podcatcher" class="package" transform="translate( 1441.7999999999995 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">Podcatcher</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="tv" class="package placeholder" transform="translate( 881.1000000000001 81.60000000000001)">
-     <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
-     <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
-     <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="15.600000000000001">TV Apps</text>
-     <g transform="translate(0 3.2)"/>
-    </g>
-    <g id="voicerec" class="package" transform="translate( 1682.0999999999992 0)">
+    <g id="voicerec" class="package" transform="translate( 1521.8999999999994 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color9.mouseover" end="s8-color9.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:#ffff00;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">Voice Recorder Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="screensaver" class="package" transform="translate( 1762.1999999999991 0)">
+    <g id="screensaver" class="package" transform="translate( 1601.9999999999993 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="40.8">Screen Saver Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="homescreen" class="package" transform="translate( 1842.299999999999 0)">
+    <g id="homescreen" class="package" transform="translate( 1682.0999999999992 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="59.6">Home Screen Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="graphicsuis" class="package" transform="translate( 961.2000000000002 81.60000000000001)">
+    <g id="graphicsuis" class="package" transform="translate( 881.1000000000001 81.60000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="40.8">Graphics UIs</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="profile" class="package" transform="translate( 1922.399999999999 0)">
+    <g id="profile" class="package" transform="translate( 1762.1999999999991 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.2" dy="0.375em" height="15.600000000000001">Profiles</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="speechsrv" class="package" transform="translate( 1041.3 81.60000000000001)">
+    <g id="speechsrv" class="package" transform="translate( 961.2000000000002 81.60000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="59.6">Speech Recog­nition UIs</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="homescreentools" class="package" transform="translate( 1121.3999999999999 81.60000000000001)">
+    <g id="homescreentools" class="package" transform="translate( 1041.3 81.60000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="40.8">Home Screen Tools</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="webuis" class="package" transform="translate( 1201.4999999999998 81.60000000000001)">
+    <g id="webuis" class="package" transform="translate( 1121.3999999999999 81.60000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="40.8">Web UIs</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="jrt" class="package" transform="translate( 1281.5999999999997 81.60000000000001)">
+    <g id="jrt" class="package" transform="translate( 1201.4999999999998 81.60000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color11.mouseover" end="s8-color11.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:slateblue;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="78.4">Java Runtime</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="conntools" class="package" transform="translate( 1361.6999999999996 81.60000000000001)">
+    <g id="conntools" class="package" transform="translate( 1281.5999999999997 81.60000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color4.mouseover" end="s8-color4.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:moccasin;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="40.8">Connect­ivity Tools</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="rndtools" class="package" transform="translate( 1441.7999999999995 81.60000000000001)">
+    <g id="rndtools" class="package" transform="translate( 1361.6999999999996 81.60000000000001)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="78" height="78.4" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="38.19999999999999" dy="0.375em" height="78.4">R&amp;D tools</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="helps" class="package" transform="translate( 2002.4999999999989 0)">
+    <g id="helps" class="package" transform="translate( 1842.299999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="160" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="79" dy="0.375em" height="78.4">Help Apps</text>
      <g transform="translate(0 3.2)"/>
     </g>
-    <g id="techview" class="package" transform="translate( 2082.599999999999 0)">
+    <g id="techview" class="package" transform="translate( 1922.399999999999 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color10.mouseover" end="s8-color10.mouseout"/>
      <rect class="package" x="0" width="78" height="160" y="0" style="fill:orange;"/>
      <text text-anchor="middle" class="package" width="78" x="39" y="79" dy="0.375em" height="116.00000000000001">Techview</text>
@@ -1115,7 +1097,7 @@
    </g>
   </g>
  </g>
- <g id="legend-root" class="legend" transform="translate(1886.9894999999992 624.8000000000001) translate(292.8105 0) scale(5.955524135917256) translate(-292.8105)">
+ <g id="legend-root" class="legend" transform="translate(1806.8894999999993 624.8000000000001) translate(292.8105 0) scale(5.736679524812121) translate(-292.8105)">
   <text text-anchor="middle" class="title" x="276.47525" y="0">
    <tspan dy="0.75em" x="276.47525">Symbian OS ^3</tspan>
    <tspan dy="1em" x="276.47525">System Model</tspan>
@@ -1166,7 +1148,7 @@
       </g>
       <g id="s8-color9">
        <rect class="cbox" height="3.1" width="15.5" fill="#ffff00" x="154.5" y="-0.0000000000000002220446049250313"/>
-       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="162.25" y="1.5499999999999998">Multimedia Apps (11)</text>
+       <text text-anchor="middle" class="cbox" width="15.5" dy="0.375em" x="162.25" y="1.5499999999999998">Multimedia Apps (8)</text>
       </g>
       <g id="s8-color10">
        <rect class="cbox" height="3.1" width="15.5" fill="orange" x="170" y="-0.0000000000000002220446049250313"/>
@@ -1183,7 +1165,7 @@
      </g>
     </g>
     <text text-anchor="middle" class="label" dy="0.375em" x="241.82" y="1.5499999999999998">
-     <tspan dy="0em" x="241.82">110 Packages</tspan>
+     <tspan dy="0em" x="241.82">107 Packages</tspan>
     </text>
    </g>
   </g>