diff --git a/mozilla/allmakefiles.sh b/mozilla/allmakefiles.sh
index fc0c2427c93..ec1866dbb44 100755
--- a/mozilla/allmakefiles.sh
+++ b/mozilla/allmakefiles.sh
@@ -892,6 +892,7 @@ browser/components/bookmarks/Makefile
 browser/components/bookmarks/public/Makefile
 browser/components/bookmarks/src/Makefile
 browser/components/build/Makefile
+browser/components/dirprovider/Makefile
 browser/components/history/Makefile
 browser/components/migration/Makefile
 browser/components/migration/public/Makefile
@@ -1021,7 +1022,6 @@ toolkit/themes/winstripe/help/Makefile
 toolkit/themes/winstripe/mozapps/Makefile
 toolkit/xre/Makefile
 toolkit/components/passwordmgr/resources/content/contents.rdf
-toolkit/mozapps/contents-content.rdf
 "
 
 
diff --git a/mozilla/browser/installer/unix/browser.jst b/mozilla/browser/installer/unix/browser.jst
index 8d2738c5689..80d6b32bdcf 100644
--- a/mozilla/browser/installer/unix/browser.jst
+++ b/mozilla/browser/installer/unix/browser.jst
@@ -89,12 +89,6 @@ if (verifyDiskSpace(communicatorFolder, srDest))
     var ignoreErr = dirCreate(pluginsFolder);
     logComment("dirCreate() returned: " + ignoreErr);
 
-    // register chrome
-    registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome", "classic.jar"), "skin/classic/browser/");
-
-    registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/autoconfig/");
-    registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/wallet/");
-
     if (err==SUCCESS)
     {
 	    err = performInstall(); 
diff --git a/mozilla/browser/installer/unix/reporter.jst b/mozilla/browser/installer/unix/reporter.jst
index c7feebe2247..4fb9698faf7 100644
--- a/mozilla/browser/installer/unix/reporter.jst
+++ b/mozilla/browser/installer/unix/reporter.jst
@@ -3,10 +3,6 @@ logComment("initInstall: " + err);
 
 addDirectory("", "$Version$", "bin", getFolder("Program"), "", true);
 
-var jarFolder = getFolder("Chrome", "reporter.jar");
-
-registerChrome(SKIN | DELAYED_CHROME, jarFolder, "skin/classic/reporter/");
-
 err = getLastError();
 if (err==SUCCESS)
     performInstall(); 
diff --git a/mozilla/browser/installer/windows/browser.jst b/mozilla/browser/installer/windows/browser.jst
index c04f506300f..c23a9afc55b 100644
--- a/mozilla/browser/installer/windows/browser.jst
+++ b/mozilla/browser/installer/windows/browser.jst
@@ -524,12 +524,6 @@ if(verifyDiskSpace(fProgram, srDest))
     // we don't want to fail on errors for the above two
     resetError();
 
-    // register chrome. Most chrome is in .manifest files now, as we migrate
-    registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome", "classic.jar"), "skin/classic/browser/");
-    
-    registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/autoconfig/");
-    registerChrome(CONTENT | DELAYED_CHROME, getFolder("Chrome","comm.jar"),"content/wallet/");
-
     // Create the uninstall folder. 
     err = File.dirCreate(getFolder("Program", "uninstall"));
     logComment("dirCreate() of Program/uninstall returned: " + err);
diff --git a/mozilla/browser/installer/windows/reporter.jst b/mozilla/browser/installer/windows/reporter.jst
index 563c8b7e8c6..c6bf746909b 100644
--- a/mozilla/browser/installer/windows/reporter.jst
+++ b/mozilla/browser/installer/windows/reporter.jst
@@ -3,10 +3,6 @@ logComment("initInstall: " + err);
 
 addDirectory("", "$Version$", "bin", getFolder("Program"), "", true);
 
-var jarFolder = getFolder("Chrome", "reporter.jar");
-
-registerChrome(SKIN | DELAYED_CHROME, jarFolder, "skin/classic/reporter/");
-
 err = getLastError();
 if (err==SUCCESS)
     performInstall(); 
diff --git a/mozilla/browser/themes/pinstripe/browser/contents.rdf b/mozilla/browser/themes/pinstripe/browser/contents.rdf
deleted file mode 100644
index 46d4bd4dbdd..00000000000
--- a/mozilla/browser/themes/pinstripe/browser/contents.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- List all the skins being supplied by this theme -->
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0" />
-  </RDF:Seq>
-
-  <!-- classic Information -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:browser"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version 1 of this
-       package. -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:browser"
-    chrome:skinVersion="1.5"/>
-</RDF:RDF>
diff --git a/mozilla/browser/themes/pinstripe/browser/jar.mn b/mozilla/browser/themes/pinstripe/browser/jar.mn
index 48cc23d9841..16db3810642 100644
--- a/mozilla/browser/themes/pinstripe/browser/jar.mn
+++ b/mozilla/browser/themes/pinstripe/browser/jar.mn
@@ -1,4 +1,5 @@
 classic.jar:
+% skin browser classic/1.0 %skin/classic/browser/
   skin/classic/browser/bookmark_toolbar_background.gif
   skin/classic/browser/bookmark-hover-left.png
   skin/classic/browser/bookmark-hover-mid.png
@@ -8,7 +9,6 @@ classic.jar:
   skin/classic/browser/bookmark-open-right.png
   skin/classic/browser/browser.css
   skin/classic/browser/browser.xml
-  skin/classic/browser/contents.rdf
   skin/classic/browser/find.png
   skin/classic/browser/find-bar-background.png
   skin/classic/browser/Go.png
diff --git a/mozilla/browser/themes/winstripe/browser/contents.rdf b/mozilla/browser/themes/winstripe/browser/contents.rdf
deleted file mode 100644
index 26b72c9d6a2..00000000000
--- a/mozilla/browser/themes/winstripe/browser/contents.rdf
+++ /dev/null
@@ -1,22 +0,0 @@
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- List all the skins being supplied by this theme -->
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0" />
-  </RDF:Seq>
-
-  <!-- classic/1.0 Information -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:browser"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version 1 of this
-       package. -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:browser"
-                   chrome:skinVersion="1.5"/>
-</RDF:RDF>
diff --git a/mozilla/browser/themes/winstripe/browser/jar.mn b/mozilla/browser/themes/winstripe/browser/jar.mn
index e397ad98fe6..4d9db63aae4 100644
--- a/mozilla/browser/themes/winstripe/browser/jar.mn
+++ b/mozilla/browser/themes/winstripe/browser/jar.mn
@@ -1,7 +1,7 @@
 classic.jar:
+% skin browser classic/1.0 %skin/classic/browser/
         skin/classic/browser/browser.css
         skin/classic/browser/browser.xml
-        skin/classic/browser/contents.rdf
         skin/classic/browser/Go.png
         skin/classic/browser/Go-rtl.png
         skin/classic/browser/Info.png
diff --git a/mozilla/extensions/reporter/jar.mn b/mozilla/extensions/reporter/jar.mn
index 940352c6a3f..d3cfe609552 100644
--- a/mozilla/extensions/reporter/jar.mn
+++ b/mozilla/extensions/reporter/jar.mn
@@ -4,9 +4,11 @@ reporter.jar:
 #ifdef MOZ_PHOENIX
 % overlay chrome://browser/content/browser.xul         chrome://reporter/content/reporterOverlay.xul
 % overlay chrome://global/content/customizeToolbar.xul chrome://reporter/content/reporterOverlay.xul
+% skin reporter classic/1.0 %skin/classic/reporter/
 #endif
 #else
  content/reporter/contents.rdf                           (resources/content/reporter/contents.rdf)
+ skin/classic/reporter/contents.rdf                      (resources/skin/classic/reporter/contents.rdf)
 #endif
  content/reporter/reportWizard.xul                       (resources/content/reporter/reportWizard.xul)
  content/reporter/reportWizard.js                        (resources/content/reporter/reportWizard.js)
@@ -15,7 +17,6 @@ reporter.jar:
  content/reporter/about.xul                              (resources/content/reporter/about.xul)
  content/reporter/error.xhtml                            (resources/content/reporter/error.xhtml)
  content/reporter/report.xhtml                           (resources/content/reporter/report.xhtml)
- skin/classic/reporter/contents.rdf                      (resources/skin/classic/reporter/contents.rdf)
  skin/classic/reporter/browserOverlay.css                (resources/skin/classic/reporter/browserOverlay.css)
  skin/classic/reporter/icon.png                          (resources/skin/classic/reporter/icon.png)
  skin/classic/reporter/reportResults.css                 (resources/skin/classic/reporter/reportResults.css)
diff --git a/mozilla/mail/installer/windows/basemail-win b/mozilla/mail/installer/windows/basemail-win
index 40c3668cdb3..72eb38bfbfa 100644
--- a/mozilla/mail/installer/windows/basemail-win
+++ b/mozilla/mail/installer/windows/basemail-win
@@ -120,6 +120,7 @@ bin\components\msgsmime.xpt
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
 bin\chrome\classic.jar
+bin\chrome\classic.manifest
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ; Default Profile Settings
diff --git a/mozilla/mail/installer/windows/mail.jst b/mozilla/mail/installer/windows/mail.jst
index 694bc27ce36..d596843db71 100644
--- a/mozilla/mail/installer/windows/mail.jst
+++ b/mozilla/mail/installer/windows/mail.jst
@@ -797,13 +797,6 @@ if(verifyDiskSpace(fProgram, srDest))
     // we don't want to fail on errors for the above two
     resetError();
 
-    registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"), "skin/classic/global/");
-    registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"), "skin/classic/communicator/");
-    registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"), "skin/classic/mozapps/");
-    registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"), "skin/classic/navigator/");
-    registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"), "skin/classic/editor/");
-    registerChrome(SKIN | DELAYED_CHROME, getFolder("Chrome","classic.jar"), "skin/classic/messenger/");
-
     // Create the uninstall folder. 
     err = File.dirCreate(getFolder("Program", "uninstall"));
     logComment("dirCreate() of Program/uninstall returned: " + err);
diff --git a/mozilla/mail/themes/pinstripe/editor/contents.rdf b/mozilla/mail/themes/pinstripe/editor/contents.rdf
deleted file mode 100644
index fe38ca15477..00000000000
--- a/mozilla/mail/themes/pinstripe/editor/contents.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- List all the skins being supplied by this theme -->
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0" />
-  </RDF:Seq>
-
-  <!-- classic Information -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:editor"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version 1 of this
-       package. -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:editor"
-#expand     chrome:skinVersion="__MOZILLA_SKIN_VERSION__"/>
-</RDF:RDF>
diff --git a/mozilla/mail/themes/pinstripe/editor/jar.mn b/mozilla/mail/themes/pinstripe/editor/jar.mn
index fd876b7b2f7..4cf48fb9ea7 100644
--- a/mozilla/mail/themes/pinstripe/editor/jar.mn
+++ b/mozilla/mail/themes/pinstripe/editor/jar.mn
@@ -1,4 +1,5 @@
 classic.jar:
+% skin editor classic/1.0 %skin/classic/editor/
   skin/classic/editor/editor.css
   skin/classic/editor/EditorDialog.css
   skin/classic/editor/EdImageMapPage.css
@@ -9,5 +10,3 @@ classic.jar:
   skin/classic/editor/icons/img-align-middle.gif
   skin/classic/editor/icons/img-align-right.gif
   skin/classic/editor/icons/img-align-top.gif
-* skin/classic/editor/contents.rdf
-
diff --git a/mozilla/mail/themes/pinstripe/mail/contents.rdf b/mozilla/mail/themes/pinstripe/mail/contents.rdf
deleted file mode 100644
index 29a2d1a9ed5..00000000000
--- a/mozilla/mail/themes/pinstripe/mail/contents.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- List all the skins being supplied by this theme -->
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0" />
-  </RDF:Seq>
-
-  <!-- classic Information -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:messenger"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version 1 of this
-       package. -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:messenger"
-#expand     chrome:skinVersion="__MOZILLA_SKIN_VERSION__"/>
-</RDF:RDF>
diff --git a/mozilla/mail/themes/pinstripe/mail/global-contents.rdf b/mozilla/mail/themes/pinstripe/mail/global-contents.rdf
deleted file mode 100644
index 319607aa96e..00000000000
--- a/mozilla/mail/themes/pinstripe/mail/global-contents.rdf
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- List all the skins being supplied by this theme -->
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0" />
-  </RDF:Seq>
-
-  <!-- classic Information -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0"
-        chrome:displayName="Mozilla Thunderbird"
-        chrome:accessKey="P"
-        chrome:author="mozilla.org"
-        chrome:authorURL="http://www.mozilla.org/projects/thunderbird/"
-        chrome:description="This is the default Mozilla Thunderbird theme. Select this theme to return to the original appearance."
-        chrome:name="classic/1.0"
-        chrome:image="Preview.png">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:global"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version 1 of this
-       package. -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:global"
-#expand chrome:skinVersion="__MOZILLA_SKIN_VERSION__">
-</RDF:RDF>
diff --git a/mozilla/mail/themes/pinstripe/mail/jar.mn b/mozilla/mail/themes/pinstripe/mail/jar.mn
index 2f56b066d81..c38cd2a2ce1 100644
--- a/mozilla/mail/themes/pinstripe/mail/jar.mn
+++ b/mozilla/mail/themes/pinstripe/mail/jar.mn
@@ -2,8 +2,7 @@ classic.jar:
      skin/classic/global/preview.png                  
      skin/classic/global/tree/treetwisty.png                        (icons/treetwisty.png) 
      skin/classic/global/tree/treetwisty-open.png                   (icons/treetwisty-open.png) 
-*    skin/classic/global/contents.rdf                               (global-contents.rdf)
-*    skin/classic/messenger/contents.rdf
+% skin messenger classic/1.0 %skin/classic/messenger/
      skin/classic/messenger/dialogs.css 
      skin/classic/messenger/messenger.css
      skin/classic/messenger/primaryToolbar.css
@@ -79,10 +78,10 @@ classic.jar:
      skin/classic/messenger/messengercompose/small-button-base.png   (compose/small-button-base.png)
      skin/classic/messenger/messengercompose/small-button-disabled.png        (compose/small-button-disabled.png)
      skin/classic/messenger/messengercompose/small-button-pressed.png         (compose/small-button-pressed.png)
+% skin messenger-newsblog classic/1.0 %skin/classic/messenger-newsblog/
      skin/classic/messenger-newsblog/feed-subscriptions.css         (newsblog/feed-subscriptions.css)
      skin/classic/messenger-newsblog/newsBlogOverlay.css            (newsblog/newsBlogOverlay.css)
      skin/classic/messenger-newsblog/icons/folder-search-rss.png    (newsblog/folder-search-rss.png)
-     skin/classic/messenger-newsblog/contents.rdf                   (newsblog/contents.rdf)
      skin/classic/messenger/preferences/preferences.css             (preferences/preferences.css)
      skin/classic/messenger/preferences/mail-options.png            (preferences/mail-options.png)
      skin/classic/messenger/smime/msgCompSMIMEOverlay.css           (smime/msgCompSMIMEOverlay.css)
diff --git a/mozilla/mail/themes/qute/editor/contents.rdf b/mozilla/mail/themes/qute/editor/contents.rdf
deleted file mode 100644
index fe38ca15477..00000000000
--- a/mozilla/mail/themes/qute/editor/contents.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- List all the skins being supplied by this theme -->
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0" />
-  </RDF:Seq>
-
-  <!-- classic Information -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:editor"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version 1 of this
-       package. -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:editor"
-#expand     chrome:skinVersion="__MOZILLA_SKIN_VERSION__"/>
-</RDF:RDF>
diff --git a/mozilla/mail/themes/qute/editor/jar.mn b/mozilla/mail/themes/qute/editor/jar.mn
index fd876b7b2f7..eef3f999045 100644
--- a/mozilla/mail/themes/qute/editor/jar.mn
+++ b/mozilla/mail/themes/qute/editor/jar.mn
@@ -1,4 +1,5 @@
 classic.jar:
+% skin editor classic/1.0 %skin/classic/editor/
   skin/classic/editor/editor.css
   skin/classic/editor/EditorDialog.css
   skin/classic/editor/EdImageMapPage.css
@@ -9,5 +10,4 @@ classic.jar:
   skin/classic/editor/icons/img-align-middle.gif
   skin/classic/editor/icons/img-align-right.gif
   skin/classic/editor/icons/img-align-top.gif
-* skin/classic/editor/contents.rdf
 
diff --git a/mozilla/mail/themes/qute/mail/contents.rdf b/mozilla/mail/themes/qute/mail/contents.rdf
deleted file mode 100644
index 29a2d1a9ed5..00000000000
--- a/mozilla/mail/themes/qute/mail/contents.rdf
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- List all the skins being supplied by this theme -->
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0" />
-  </RDF:Seq>
-
-  <!-- classic Information -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:messenger"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version 1 of this
-       package. -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:messenger"
-#expand     chrome:skinVersion="__MOZILLA_SKIN_VERSION__"/>
-</RDF:RDF>
diff --git a/mozilla/mail/themes/qute/mail/global-contents.rdf b/mozilla/mail/themes/qute/mail/global-contents.rdf
deleted file mode 100644
index d04e645921b..00000000000
--- a/mozilla/mail/themes/qute/mail/global-contents.rdf
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- List all the skins being supplied by this theme -->
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0" />
-  </RDF:Seq>
-
-  <!-- classic Information -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0"
-        chrome:displayName="Mozilla Thunderbird"
-        chrome:accessKey="P"
-        chrome:author="mozilla.org"
-        chrome:authorURL="http://www.mozilla.org/projects/thunderbird/"
-        chrome:description="This is the default Mozilla Thunderbird theme. Select this theme to return to the original appearance."
-        chrome:name="classic/1.0">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:global"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-  <!-- Version Information.  State that we work only with major version 1 of this
-       package. -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0:global"
-#expand chrome:skinVersion="__MOZILLA_SKIN_VERSION__">
-</RDF:RDF>
diff --git a/mozilla/mail/themes/qute/mail/jar.mn b/mozilla/mail/themes/qute/mail/jar.mn
index fea633b3c6e..2af46f75b4c 100644
--- a/mozilla/mail/themes/qute/mail/jar.mn
+++ b/mozilla/mail/themes/qute/mail/jar.mn
@@ -1,10 +1,9 @@
 classic.jar:
 +   skin/classic/global/tree.css
-*+  skin/classic/global/contents.rdf                         (global-contents.rdf)
 +   skin/classic/global/alerts/alert.css
-*   skin/classic/messenger/contents.rdf
     skin/classic/communicator/communicator.css
     skin/classic/communicator/smileys.css
+% skin messenger classic/1.0 %skin/classic/messenger/
     skin/classic/messenger/primaryToolbar.css
     skin/classic/messenger/accountCentral.css
     skin/classic/messenger/accountManage.css
@@ -42,7 +41,7 @@ classic.jar:
     skin/classic/messenger/messengercompose/compose-toolbar.png  (compose/compose-toolbar.png)
     skin/classic/messenger/messengercompose/compose-toolbar-small.png   (compose/compose-toolbar-small.png)
     skin/classic/messenger/messengercompose/format-buttons.png  (compose/format-buttons.png)
-    skin/classic/messenger-newsblog/contents.rdf                (newsblog/contents.rdf)
+% skin messenger-newsblog classic/1.0 %skin/classic/messenger-newsblog/
     skin/classic/messenger-newsblog/feed-subscriptions.css      (newsblog/feed-subscriptions.css)
     skin/classic/messenger-newsblog/newsBlogOverlay.css         (newsblog/newsBlogOverlay.css)
     skin/classic/messenger-newsblog/icons/rss-feed.png          (newsblog/rss-feed.png)
diff --git a/mozilla/toolkit/themes/pinstripe/communicator/contents.rdf b/mozilla/toolkit/themes/pinstripe/communicator/contents.rdf
deleted file mode 100644
index 6b1cead5d3f..00000000000
--- a/mozilla/toolkit/themes/pinstripe/communicator/contents.rdf
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- List all the skins being supplied by this theme -->
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0" />
-  </RDF:Seq>
-
-  <!-- classic Information -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:communicator"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-</RDF:RDF>
diff --git a/mozilla/toolkit/themes/pinstripe/communicator/jar.mn b/mozilla/toolkit/themes/pinstripe/communicator/jar.mn
index e665619af21..ac8a7eace29 100644
--- a/mozilla/toolkit/themes/pinstripe/communicator/jar.mn
+++ b/mozilla/toolkit/themes/pinstripe/communicator/jar.mn
@@ -1,3 +1,3 @@
 classic.jar:
+% skin communicator classic/1.0 %skin/classic/communicator/
         skin/classic/communicator/communicator.css
-        skin/classic/communicator/contents.rdf
diff --git a/mozilla/toolkit/themes/pinstripe/global/contents.rdf b/mozilla/toolkit/themes/pinstripe/global/contents.rdf
deleted file mode 100644
index 8dcc3903773..00000000000
--- a/mozilla/toolkit/themes/pinstripe/global/contents.rdf
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- List all the skins being supplied by this theme -->
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0" />
-  </RDF:Seq>
-
-  <!-- pinstripe Information -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0"
-        chrome:displayName="Mozilla Firebird Default"
-        chrome:accessKey="P"
-        chrome:author="Kevin Gerich (webmail@kmgerich.com)"
-        chrome:description="Mac OS X theme."
-        chrome:name="classic/1.0"
-        chrome:image="preview.gif">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:global"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-</RDF:RDF>
diff --git a/mozilla/toolkit/themes/pinstripe/global/jar.mn b/mozilla/toolkit/themes/pinstripe/global/jar.mn
index 43518bc3a43..6006bbc8df3 100644
--- a/mozilla/toolkit/themes/pinstripe/global/jar.mn
+++ b/mozilla/toolkit/themes/pinstripe/global/jar.mn
@@ -1,4 +1,5 @@
 classic.jar:
+% skin global classic/1.0 %skin/classic/global/
 +  skin/classic/global/10pct_transparent_grey.png
 +  skin/classic/global/10pct_transparent_pixel.png
 +  skin/classic/global/20pct_transparent_pixel.png
@@ -15,7 +16,6 @@ classic.jar:
 +  skin/classic/global/closetab.png
 +  skin/classic/global/colorpicker.css
 +  skin/classic/global/config.css
-+  skin/classic/global/contents.rdf
 +  skin/classic/global/customizeToolbar.css
 +  skin/classic/global/dialog.css
 +  skin/classic/global/filepicker.css
diff --git a/mozilla/toolkit/themes/pinstripe/help/contents.rdf b/mozilla/toolkit/themes/pinstripe/help/contents.rdf
deleted file mode 100644
index 10c861c33c4..00000000000
--- a/mozilla/toolkit/themes/pinstripe/help/contents.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-# List all the skins being supplied by this theme
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0" />
-  </RDF:Seq>
-
-# classic Information
-  <RDF:Description about="urn:mozilla:skin:classic/1.0">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:help"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
- </RDF:RDF>
diff --git a/mozilla/toolkit/themes/pinstripe/help/jar.mn b/mozilla/toolkit/themes/pinstripe/help/jar.mn
index 224c9d88f2d..5fa471d97b9 100644
--- a/mozilla/toolkit/themes/pinstripe/help/jar.mn
+++ b/mozilla/toolkit/themes/pinstripe/help/jar.mn
@@ -1,5 +1,5 @@
 classic.jar:
-* skin/classic/help/contents.rdf
+% skin help classic/1.0 %skin/classic/help/
   skin/classic/help/help.css
   skin/classic/help/Toolbar.png
 * skin/classic/help/helpFileLayout.css
diff --git a/mozilla/toolkit/themes/pinstripe/mozapps/contents.rdf b/mozilla/toolkit/themes/pinstripe/mozapps/contents.rdf
deleted file mode 100644
index 974cffc0c38..00000000000
--- a/mozilla/toolkit/themes/pinstripe/mozapps/contents.rdf
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:mozapps"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-</RDF:RDF>
diff --git a/mozilla/toolkit/themes/pinstripe/mozapps/jar.mn b/mozilla/toolkit/themes/pinstripe/mozapps/jar.mn
index 9b10f26bc51..2832564776d 100755
--- a/mozilla/toolkit/themes/pinstripe/mozapps/jar.mn
+++ b/mozilla/toolkit/themes/pinstripe/mozapps/jar.mn
@@ -1,4 +1,5 @@
 classic.jar:
+% skin mozapps classic/1.0 %skin/classic/mozapps/
   skin/classic/mozapps/downloads/progress-bar-paused.gif          (downloads/progress-bar-paused.gif)
   skin/classic/mozapps/downloads/progress-bar.gif                 (downloads/progress-bar.gif)
   skin/classic/mozapps/downloads/progress-remainder.gif           (downloads/progress-remainder.gif)
@@ -36,6 +37,3 @@ classic.jar:
   skin/classic/mozapps/update/update.png                          (update/update.png)
   skin/classic/mozapps/xpinstall/xpinstallItemGeneric.png         (xpinstall/xpinstallItemGeneric.png)
   skin/classic/mozapps/xpinstall/xpinstallConfirm.css             (xpinstall/xpinstallConfirm.css)
-  skin/classic/mozapps/contents.rdf
-  
-  
diff --git a/mozilla/toolkit/themes/qute/communicator/contents.rdf b/mozilla/toolkit/themes/qute/communicator/contents.rdf
deleted file mode 100644
index 6b1cead5d3f..00000000000
--- a/mozilla/toolkit/themes/qute/communicator/contents.rdf
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- List all the skins being supplied by this theme -->
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0" />
-  </RDF:Seq>
-
-  <!-- classic Information -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:communicator"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-</RDF:RDF>
diff --git a/mozilla/toolkit/themes/qute/communicator/jar.mn b/mozilla/toolkit/themes/qute/communicator/jar.mn
index a09d6ce6233..af6c71a401c 100644
--- a/mozilla/toolkit/themes/qute/communicator/jar.mn
+++ b/mozilla/toolkit/themes/qute/communicator/jar.mn
@@ -1,8 +1,8 @@
 classic.jar:
+% skin communicator classic/1.0 %skin/classic/communicator/
   skin/classic/communicator/brand.css
   skin/classic/communicator/button.css
   skin/classic/communicator/communicator.css
-  skin/classic/communicator/contents.rdf
   skin/classic/communicator/dialogs.css
   skin/classic/communicator/formatting.css
   skin/classic/communicator/plugins.css
diff --git a/mozilla/toolkit/themes/qute/global/contents.rdf b/mozilla/toolkit/themes/qute/global/contents.rdf
deleted file mode 100644
index 3d969f13892..00000000000
--- a/mozilla/toolkit/themes/qute/global/contents.rdf
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- List all the skins being supplied by this theme -->
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0" />
-  </RDF:Seq>
-
-  <!-- classic Information -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0"
-        chrome:displayName="Mozilla Thunderbird"
-        chrome:accessKey="P"
-        chrome:author="mozilla.org"
-        chrome:authorURL="http://www.mozilla.org/projects/thunderbird/"
-        chrome:description="This is the default Mozilla Thunderbird theme. Select this theme to return to the original appearance."
-        chrome:name="classic/1.0">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:global"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-</RDF:RDF>
diff --git a/mozilla/toolkit/themes/qute/global/jar.mn b/mozilla/toolkit/themes/qute/global/jar.mn
index 12bc036df92..a2ebafb195f 100644
--- a/mozilla/toolkit/themes/qute/global/jar.mn
+++ b/mozilla/toolkit/themes/qute/global/jar.mn
@@ -1,4 +1,5 @@
 classic.jar:
+% skin global classic/1.0 %skin/classic/global/
   skin/classic/global/arrow.css
   skin/classic/global/autocomplete.css
   skin/classic/global/browser.css
@@ -6,7 +7,6 @@ classic.jar:
   skin/classic/global/button.css
   skin/classic/global/checkbox.css
   skin/classic/global/colorpicker.css
-  skin/classic/global/contents.rdf
   skin/classic/global/customizeToolbar.css
   skin/classic/global/dialog.css
   skin/classic/global/expander.css
diff --git a/mozilla/toolkit/themes/qute/help/contents.rdf b/mozilla/toolkit/themes/qute/help/contents.rdf
deleted file mode 100644
index 10c861c33c4..00000000000
--- a/mozilla/toolkit/themes/qute/help/contents.rdf
+++ /dev/null
@@ -1,18 +0,0 @@
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-# List all the skins being supplied by this theme
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0" />
-  </RDF:Seq>
-
-# classic Information
-  <RDF:Description about="urn:mozilla:skin:classic/1.0">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:help"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
- </RDF:RDF>
diff --git a/mozilla/toolkit/themes/qute/help/jar.mn b/mozilla/toolkit/themes/qute/help/jar.mn
index 55a261fc2de..98821366390 100644
--- a/mozilla/toolkit/themes/qute/help/jar.mn
+++ b/mozilla/toolkit/themes/qute/help/jar.mn
@@ -1,5 +1,5 @@
 classic.jar:
-  skin/classic/help/contents.rdf    
+% skin help classic/1.0 %skin/classic/help/
   skin/classic/help/sidebar.css     
   skin/classic/help/sbtab-twisty.gif
   skin/classic/help/help.css     
diff --git a/mozilla/toolkit/themes/qute/mozapps/contents.rdf b/mozilla/toolkit/themes/qute/mozapps/contents.rdf
deleted file mode 100644
index 974cffc0c38..00000000000
--- a/mozilla/toolkit/themes/qute/mozapps/contents.rdf
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:chrome="http://www.mozilla.org/rdf/chrome#">
-
-  <!-- list all the packages being supplied by this jar -->
-  <RDF:Seq about="urn:mozilla:skin:root">
-    <RDF:li resource="urn:mozilla:skin:classic/1.0"/>
-  </RDF:Seq>
-
-  <!-- package information -->
-  <RDF:Description about="urn:mozilla:skin:classic/1.0">
-    <chrome:packages>
-      <RDF:Seq about="urn:mozilla:skin:classic/1.0:packages">
-        <RDF:li resource="urn:mozilla:skin:classic/1.0:mozapps"/>
-      </RDF:Seq>
-    </chrome:packages>
-  </RDF:Description>
-
-</RDF:RDF>
diff --git a/mozilla/toolkit/themes/qute/mozapps/jar.mn b/mozilla/toolkit/themes/qute/mozapps/jar.mn
index 5b006ed2575..8d06dda341f 100644
--- a/mozilla/toolkit/themes/qute/mozapps/jar.mn
+++ b/mozilla/toolkit/themes/qute/mozapps/jar.mn
@@ -1,5 +1,5 @@
 classic.jar:
-  skin/classic/mozapps/contents.rdf
+% skin mozapps classic/1.0 %skin/classic/mozapps/
   skin/classic/mozapps/downloads/downloadCleanup.png                (downloads/downloadCleanup.png)
   skin/classic/mozapps/downloads/downloadCleanupDisabled.png        (downloads/downloadCleanupDisabled.png)
   skin/classic/mozapps/downloads/downloadFader.png                  (downloads/downloadFader.png)