--- a/symbian3/single/sysdefs/full_system_model_3.0.xml	Wed Apr 14 11:33:13 2010 +0100
+++ b/symbian3/single/sysdefs/full_system_model_3.0.xml	Wed Apr 14 11:37:05 2010 +0100
@@ -2741,9 +2741,15 @@
 <unit base="/os/deviceplatformrelease/sf_config/config"/>
 </component>
 <component id="cenrep" filter="sf_build" name="ConE Central Repository Config" class="config" purpose="development">
-<!-- will shoudl give the id/path something more unique than cenrep -->
+<!-- will should give the id/path something more unique than cenrep -->
 <unit bldFile="/os/deviceplatformrelease/sf_config/cenrep/group"/>
 </component>
+<component id="rombuild_syborg" filter="sf_build" name="Syborg iMaker Config" purpose="development" class="config">
+<unit bldFile="/os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
+</component>
+<component id="rombuild_zoom2" filter="sf_build" name="Zoom2 iMaker Config" purpose="development" class="config">
+<unit bldFile="/os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
+</component>
 </collection>
 <!-- should be located locally in buildplatforms/group 
     <collection id="s60bld" name="S60 Build">

--- a/symbian3/single/sysdefs/sf3.svg	Wed Apr 14 11:33:13 2010 +0100
+++ b/symbian3/single/sysdefs/sf3.svg	Wed Apr 14 11:37:05 2010 +0100
@@ -426,8 +426,8 @@
  <g id="os" transform="translate(3.1999999999999993 399.83000000000004)" class="layer">
   <rect x="0.3" y="0.3" width="9.3" rx="4.65" ry="4.65" class="layer" height="231.26000000000002"/>
   <text text-anchor="middle" dy="0.375em" class="layer" transform="rotate(-90)" y="4.95" width="231.26000000000002" height="9.3" x="-115.93">OS</text>
-  <g class="layer-detail" transform="translate(495.49999999999983 3.2)">
-   <rect x="-482.6999999999998" class="layer" y="-3.2" width="5063.399999999998" height="231.26000000000002"/>
+  <g class="layer-detail" transform="translate(486.19999999999965 3.2)">
+   <rect x="-473.39999999999964" class="layer" y="-3.2" width="5063.399999999998" height="231.26000000000002"/>
    <g>
     <g id="kernelhwsrv" class="package" transform="translate( 0 123.43000000000002)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color0.mouseover" end="s8-color0.mouseout"/>
@@ -5063,8 +5063,8 @@
     </g>
     <g id="deviceplatformrelease" class="package" transform="translate( 3740.0999999999985 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
-     <rect class="package" x="0" width="196.5" height="120.23000000000002" y="0" style="fill:darkgray;"/>
-     <text text-anchor="middle" class="package" width="196.5" x="98.25" y="119.23000000000002">Dev­ice Platform Release</text>
+     <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">
        <rect class="collection" x="0" y="0" height="15.6" width="15.6"/>
@@ -5194,8 +5194,8 @@
        </g>
       </g>
       <g id="sf_config" transform="translate(177.9 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">SF Config</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="37.2"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="35.800000000000004" height="6.299999999999999">SF Config</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="config" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -5209,6 +5209,18 @@
          <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-clipAll"/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">ConE Central Repository Config</text>
         </g>
+        <g id="rombuild_syborg" 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-clipAll" 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-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="23.25">Syborg iMaker Config</text>
+        </g>
+        <g id="rombuild_zoom2" 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-clipAll" style="fill:rgb(93,155,205);stroke-width: 0.5; "/>
+         <use width="9.3" height="9.3" x="27.900000000000002" y="0" style="fill:url(#Patternstriped-diag-up); stroke: none; stroke-width: 0;" xlink:href="#Borderbox-clipAll"/>
+         <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="32.550000000000004">Zoom2 iMaker Config</text>
+        </g>
        </g>
       </g>
       <g id="symbianosbld" transform="translate(0 37.6)" class="collection">
@@ -5261,7 +5273,7 @@
       </g>
      </g>
     </g>
-    <g id="osrndtools" class="package" transform="translate( 3938.6999999999985 0)">
+    <g id="osrndtools" class="package" transform="translate( 3957.2999999999984 0)">
      <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s8-color12.mouseover" end="s8-color12.mouseout"/>
      <rect class="package" x="0" width="159.29999999999998" height="120.23000000000002" y="0" style="fill:darkgray;"/>
      <text text-anchor="middle" class="package" width="159.29999999999998" x="79.64999999999999" y="119.23000000000002">OS R&amp;D tools</text>
@@ -20107,7 +20119,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 (167)</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 (169)</text>
       </g>
      </g>
     </g>
@@ -20142,7 +20154,7 @@
     <text text-anchor="middle" class="label" dy="0.375em" x="265.17499999999995" y="4.65">
      <tspan dy="-1em" x="265.17499999999995">110 Packages</tspan>
      <tspan dy="1em" x="265.17499999999995">666 Collections</tspan>
-     <tspan dy="1em" x="265.17499999999995">2909 Components</tspan>
+     <tspan dy="1em" x="265.17499999999995">2911 Components</tspan>
     </text>
    </g>
   </g>

--- a/symbian3/single/sysdefs/sf3lit.svg	Wed Apr 14 11:33:13 2010 +0100
+++ b/symbian3/single/sysdefs/sf3lit.svg	Wed Apr 14 11:37:05 2010 +0100
@@ -4733,8 +4733,8 @@
        <g transform="translate(0 6.299999999999999)"/>
       </g>
       <g id="sf_config" transform="translate(17.7 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">SF Config</text>
+       <rect class="collection" x="0" y="0" height="15.6" width="27.900000000000002"/>
+       <text text-anchor="start" dy="1em" class="collection" y="0" x="1.4" width="26.500000000000004" height="6.299999999999999">SF Config</text>
        <g transform="translate(0 6.299999999999999)">
         <g id="config" class="component">
          <set attributeName="opacity" attributeType="XML" to="0.5" fill="remove" begin="s9-color2.mouseover" end="s9-color2.mouseout"/>
@@ -4748,6 +4748,11 @@
          <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-clipAll"/>
          <text text-anchor="middle" dy="0.375em" class="component" y="4.800000000000001" width="9.3" height="9.3" x="13.950000000000001">ConE Central Repository Config</text>
         </g>
+        <g id="rombuild" 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">rombuild</text>
+        </g>
        </g>
       </g>
       <g id="symbianosbld" transform="translate(0 56.400000000000006)" class="collection">
@@ -17691,7 +17696,7 @@
     <text text-anchor="middle" class="label" dy="0.375em" x="250.875" y="4.65">
      <tspan dy="-1em" x="250.875">108 Packages</tspan>
      <tspan dy="1em" x="250.875">603 Collections</tspan>
-     <tspan dy="1em" x="250.875">2539 Components</tspan>
+     <tspan dy="1em" x="250.875">2540 Components</tspan>
     </text>
    </g>
   </g>

--- a/symbian3/single/sysdefs/system_model.xml	Wed Apr 14 11:33:13 2010 +0100
+++ b/symbian3/single/sysdefs/system_model.xml	Wed Apr 14 11:37:05 2010 +0100
@@ -2654,9 +2654,15 @@
 <collection name="sf_config" long-name="SF Config" level="mid">
 <component name="config" filter="s60" long-name="Config" purpose="development" class="config"/>
 <component name="cenrep" filter="sf_build" long-name="ConE Central Repository Config" purpose="development" class="config">
-<!-- will shoudl give the id/path something more unique than cenrep -->
+<!-- will should give the id/path something more unique than cenrep -->
 <unit bldFile="os/deviceplatformrelease/sf_config/cenrep/group"/>
 </component>
+<component name="rombuild_syborg" filter="sf_build" long-name="Syborg iMaker Config" purpose="development" class="config">
+<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
+</component>
+<component name="rombuild_zoom2" filter="sf_build" long-name="Zoom2 iMaker Config" purpose="development" class="config">
+<unit bldFile="os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
+</component>
 </collection>
 <!-- should be located locally in buildplatforms/group 
     <collection id="s60bld" name="S60 Build">

--- a/symbian3/single/sysdefs/system_model_3.0.xml	Wed Apr 14 11:33:13 2010 +0100
+++ b/symbian3/single/sysdefs/system_model_3.0.xml	Wed Apr 14 11:37:05 2010 +0100
@@ -2644,9 +2644,15 @@
 <unit base="/os/deviceplatformrelease/sf_config/config"/>
 </component>
 <component id="cenrep" filter="sf_build" name="ConE Central Repository Config" class="config" purpose="development">
-<!-- will shoudl give the id/path something more unique than cenrep -->
+<!-- will should give the id/path something more unique than cenrep -->
 <unit bldFile="/os/deviceplatformrelease/sf_config/cenrep/group"/>
 </component>
+<component id="rombuild_syborg" filter="sf_build" name="Syborg iMaker Config" purpose="development" class="config">
+<unit bldFile="/os/deviceplatformrelease/sf_config/rombuild/syborg/group"/>
+</component>
+<component id="rombuild_zoom2" filter="sf_build" name="Zoom2 iMaker Config" purpose="development" class="config">
+<unit bldFile="/os/deviceplatformrelease/sf_config/rombuild/zoom2/group"/>
+</component>
 </collection>
 <!-- should be located locally in buildplatforms/group 
     <collection id="s60bld" name="S60 Build">