--- a/symbian3/mw/uitools/package_definition_3.0.xml	Wed Feb 03 19:36:09 2010 +0000
+++ b/symbian3/mw/uitools/package_definition_3.0.xml	Wed Feb 03 20:06:22 2010 +0000
@@ -1,6 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <SystemDefinition schema="3.0.0">
   <package id="uitools" name="UI Tools" levels="compile encode tool if">
+    <collection id="cdlcompilertoolkit" name="CDL Compiler Toolkit" level="compile">
+    	<!-- collection is actually a component. Needs to be moved down a directory -->
+      <component id="cdlcompilertoolkit_build" filter="s60" name="CDL Compiler Toolkit Build">
+        <unit bldFile="cdlcompilertoolkit/group"/>
+      </component>
+    </collection>
+    <collection id="cdlcompiler" name="CDL Compiler" level="compile">
+    	<!-- collection is actually a component. Needs to be moved down a directory -->
+      <component id="cdlcompiler_build" filter="s60" name="CDL Compiler Build">
+        <unit bldFile="cdlcompiler/group"/>
+      </component>
+    </collection>
     <collection id="gfxtools" name="Graphics Tools" level="tool">
       <component id="gditools" filter="s60" name="GDI Tools" target="desktop">
         <unit bldFile="gfxtools/gditools/group"/>
@@ -9,14 +21,26 @@
         <unit bldFile="gfxtools/color/group"/>
       </component>
     </collection>
+    <collection id="aknlayoutcompiler" name="Avkon Layout Compiler" level="compile">
+    	<!-- collection is actually a component. Needs to be moved down a directory -->
+      <component id="aknlayoutcompiler_build" filter="s60" name="Avkon Layout Compiler Build">
+        <unit bldFile="../uitools/aknlayoutcompiler/group"/>
+      </component>
+    </collection>
+    <collection id="skincompiler" name="Skin Compiler" level="compile">
+      <component id="aknskindesccompiler" filter="s60" name="Avkon Skin Descriptor Compiler">
+        <unit bldFile="skincompiler/AknSkinDescCompiler/group"/>
+      </component>
+    </collection>
     <collection id="reszip" name="Resource Zip" level="encode">
+    	<!-- collection is actually a component. Needs to be moved down a directory -->
       <component id="reszip_build" filter="s60" name="Resource Zip Build">
         <unit bldFile="reszip/group"/>
       </component>
     </collection>
     <collection id="toollibraries" name="Tool Libraries" level="tool"/>
     <collection id="svgtencoder" name="SVGT Encoder" level="encode">
-      <component id="svgtenc" filter="s60" name="SVGT Encoder" target="desktop">
+      <component id="svgtenc" filter="s60" name="Standalone SVGT Encoder" target="desktop">
         <unit bldFile="svgtencoder/svgtenc/standalone/group"/>
       </component>
     </collection>