--- a/symbian3/app/homescreentools/package_definition.xml	Tue May 25 11:17:36 2010 +0100
+++ b/symbian3/app/homescreentools/package_definition.xml	Wed May 26 17:18:20 2010 +0100
@@ -1,104 +1,26 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE SystemDefinition [
-<!ELEMENT SystemDefinition ( systemModel )>
-<!ATTLIST SystemDefinition
-  name CDATA #REQUIRED
-  schema CDATA #REQUIRED
->
-<!-- all paths are relative to the environment variable specified by the root attribute, or SOURCEROOT if not.  -->
-
-<!-- System Model Section of DTD -->
-<!ELEMENT systemModel (layer+)>
-
-<!ELEMENT layer (block* | collection*)*>
-<!-- Kernel Services, Base Services, OS Services, Etc -->
-<!ATTLIST layer
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
->
-
-<!ELEMENT block (subblock* | collection*)*>
- <!-- Generic OS services, Comms Services, etc -->
-<!ATTLIST block
-  levels NMTOKENS #IMPLIED
-  span CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT subblock (collection)*>
-<!-- Cellular Baseband Services, Networking Services, etc -->
-<!ATTLIST subblock
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
->
-
-<!ELEMENT collection (component)*>
-<!-- Screen Driver, Content Handling, etc -->
-<!ATTLIST collection
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  level NMTOKEN #IMPLIED
->
-
-<!ELEMENT component (unit)*>
-<!-- contains units or is a  package or prebuilt -->
-<!ATTLIST component
-  name CDATA #REQUIRED
-  long-name CDATA #IMPLIED
-  deprecated CDATA #IMPLIED
-  introduced CDATA #IMPLIED
-  contract CDATA #IMPLIED
-  plugin (Y|N) "N"
-  filter CDATA #IMPLIED
-  class NMTOKENS #IMPLIED
-  supports CDATA #IMPLIED
-  purpose ( optional | mandatory | development ) "optional"
->
-
-<!ELEMENT unit EMPTY >
-<!-- must be buildable (bld.inf) -->
-<!-- bldFile  may someday be removed in favour of mrp -->
-<!ATTLIST unit
-  mrp CDATA #IMPLIED
-  filter CDATA #IMPLIED
-  bldFile CDATA #IMPLIED
-  root CDATA #IMPLIED
-  version NMTOKEN #IMPLIED
-  prebuilt NMTOKEN #IMPLIED
-  late (Y|N) #IMPLIED
-  priority CDATA #IMPLIED
->
-]>
-<SystemDefinition name="Symbian^3" schema="2.0.1">
-  <systemModel>
-    <layer name="app" long-name="Applications" levels="services apps">
-      <block name="homescreentools" level="services" long-name="Home Screen Tools" levels="tool install">
-        <collection name="dtdinstaller" long-name="DTD Installer" level="install">
-          <!-- collection is really a component. Needs to be moved down a directory -->
-          <!-- this needs to be built first, does build order need to be forced with filters? -->
-          <component name="dtdinstaller_build" filter="s60" long-name="DTD Installer Build" class="tool PC">
-            <unit bldFile="/sf/app/homescreentools/dtdinstaller/group"/>
-          </component>
-        </collection>
-        <collection name="themeinstaller" long-name="Theme Installer" level="install">
-          <!-- collection is really a component. Needs to be moved down a directory -->
-          <component name="themeinstaller_build" filter="s60" long-name="Theme Installer Build" class="tool PC">
-            <unit bldFile="/sf/app/homescreentools/themeinstaller/group"/>
-          </component>
-        </collection>
-        <collection name="widgettools" long-name="Widget Tools" level="install">
-          <component name="hspluginpreinstaller" filter="s60" long-name="HS Plugin Preinstaller" introduced="^3" class="tool PC">
-            <unit bldFile="/sf/app/homescreentools/widgettools/hspluginspreinstaller/group"/>
-          </component>
-          <component name="wrtwidgetpreinstaller" filter="s60" long-name="WRT Widget Preinstaller" introduced="^3" class="tool PC">
-            <unit bldFile="/sf/app/homescreentools/widgettools/wrtwidgetpreinstaller/group"/>
-          </component>
-        </collection>
-      </block>
-    </layer>
-  </systemModel>
+<SystemDefinition schema="3.0.0">
+  <package id="homescreentools" name="Home Screen Tools" levels="tool install">
+    <collection id="dtdinstaller" name="DTD Installer" level="install">
+    	<!-- collection is really a component. Needs to be moved down a directory -->
+    	<!-- this needs to be built first, does build order need to be forced with filters? -->
+      <component id="dtdinstaller_build" filter="s60" name="DTD Installer Build" target="desktop" class="tool">
+        <unit bldFile="dtdinstaller/group"/>
+      </component>
+    </collection>
+    <collection id="themeinstaller" name="Theme Installer" level="install">
+    	<!-- collection is really a component. Needs to be moved down a directory -->
+      <component id="themeinstaller_build" filter="s60" name="Theme Installer Build" target="desktop" class="tool">
+        <unit bldFile="themeinstaller/group"/>
+      </component>
+    </collection>
+    <collection id="widgettools" name="Widget Tools" level="install">
+      <component id="hspluginpreinstaller" filter="s60" name="HS Plugin Preinstaller" target="desktop" class="tool" introduced="^3">
+        <unit bldFile="widgettools/hspluginspreinstaller/group"/>
+      </component>
+      <component id="wrtwidgetpreinstaller" filter="s60" name="WRT Widget Preinstaller" target="desktop" class="tool" introduced="^3">
+        <unit bldFile="widgettools/wrtwidgetpreinstaller/group"/>
+      </component>
+    </collection>
+  </package>
 </SystemDefinition>