diff --git a/mozilla/suite/common/pref/pref-colors.xul b/mozilla/suite/common/pref/pref-colors.xul
index b5610caa41d..e37fbc38a05 100644
--- a/mozilla/suite/common/pref/pref-colors.xul
+++ b/mozilla/suite/common/pref/pref-colors.xul
@@ -38,78 +38,104 @@
  ***** END LICENSE BLOCK ***** -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<?xul-overlay href="chrome://communicator/content/pref/platformPrefOverlay.xul"?>
 
-<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-colors.dtd" >
+<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/pref/pref-colors.dtd">
 
-<page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      onload="parent.initPanel('chrome://communicator/content/pref/pref-colors.xul');"
-      headertitle="&pref.colors.title;">
+<overlay xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
+  <prefpane id="colors_pane"
+            label="&pref.colors.title;">
 
-  <script type="application/x-javascript">
-  <![CDATA[
-    var _elementIDs = ["foregroundText", "background", "browserUseSystemColors", "unvisitedLinks", "activeLinks", "visitedLinks", "browserUnderlineAnchors", "browserUseDocumentColors"];
-  ]]>
-  </script>
+    <preferences id="colors_preferences">
+      <preference id="browser.display.foreground_color"
+                  name="browser.display.foreground_color"
+                  type="string"/>
+      <preference id="browser.display.background_color"
+                  name="browser.display.background_color"
+                  type="string"/>
+      <preference id="browser.display.use_system_colors"
+                  name="browser.display.use_system_colors"
+                  type="bool"/>
+      <preference id="browser.anchor_color"
+                  name="browser.anchor_color"
+                  type="string"/>
+      <preference id="browser.active_color"
+                  name="browser.active_color"
+                  type="string"/>
+      <preference id="browser.visited_color"
+                  name="browser.visited_color"
+                  type="string"/>
+      <preference id="browser.underline_anchors"
+                  name="browser.underline_anchors"
+                  type="bool"/>
+      <preference id="browser.display.use_document_colors"
+                  name="browser.display.use_document_colors"
+                  type="bool"/>
+    </preferences>
+    <hbox>
+      <groupbox flex="1" id="pageColours">
+        <caption label="&color;"/>
+        <hbox align="center">
+          <label control="foregroundText" value="&textColor.label;"
+                 accesskey="&textColor.accesskey;" flex="1"/>
+          <colorpicker type="button" id="foregroundText" palettename="standard"
+                       preference="browser.display.foreground_color"/> 
+        </hbox>
+        <hbox align="center" style="margin-top: 5px">
+          <label control="background" value="&backgroundColor.label;"
+                 accesskey="&backgroundColor.accesskey;" flex="1"/>
+          <colorpicker type="button" id="background" palettename="standard"
+                       preference="browser.display.background_color"/>
+        </hbox>
+        <separator class="thin"/>
+        <hbox align="center">
+          <checkbox id="browserUseSystemColors"
+                    label="&useSystemColors.label;"
+                    accesskey="&useSystemColors.accesskey;"
+                    preference="browser.display.use_system_colors"/>
+        </hbox>
+      </groupbox>
+
+      <groupbox flex="1">
+        <caption label="&links;"/>
+        <hbox align="center">
+          <label control="unvisitedLinks" value="&linkColor.label;"
+                 accesskey="&linkColor.accesskey;" flex="1"/>
+          <colorpicker type="button" id="unvisitedLinks" palettename="standard"
+                       preference="browser.anchor_color"/>
+        </hbox>
+        <hbox align="center" style="margin-top: 5px">
+          <label control="activeLinks" value="&activeLinkColor.label;"
+                 accesskey="&activeLinkColor.accesskey;" flex="1"/>
+          <colorpicker type="button" id="activeLinks" palettename="standard"
+                       preference="browser.active_color"/>
+        </hbox>
+        <hbox align="center" style="margin-top: 5px">
+          <label control="visitedLinks" value="&visitedLinkColor.label;"
+                 accesskey="&visitedLinkColor.accesskey;" flex="1"/>
+          <colorpicker type="button" id="visitedLinks" palettename="standard"
+                       preference="browser.visited_color"/>
+        </hbox>
+        <separator class="thin"/>
+        <hbox align="center">
+          <checkbox id="browserUnderlineAnchors"
+                    label="&underlineLinks.label;"
+                    accesskey="&underlineLinks.accesskey;"
+                    preference="browser.underline_anchors"/>
+        </hbox>
+      </groupbox>
+    </hbox>
+
+    <groupbox>
+      <caption label="&someProvColors;"/>
+
+      <radiogroup id="browserUseDocumentColors"
+                  preference="browser.display.use_document_colors">
+        <radio value="true" label="&alwaysUseDocumentColors.label;"
+               accesskey="&alwaysUseDocumentColors.accesskey;"/>
+        <radio value="false" label="&useMyColors.label;"
+               accesskey="&useMyColors.accesskey;"/>        
+      </radiogroup>
 
-  <hbox>
-    <groupbox flex="1" id="pageColours">
-      <caption label="&color;"/>
-      <hbox align="center">
-        <label control="foregroundText" value="&textColor.label;"
-               accesskey="&textColor.accesskey;" flex="1"/>
-        <colorpicker type="button" id="foregroundText" palettename="standard"
-                     prefstring="browser.display.foreground_color"/> 
-      </hbox>
-      <hbox align="center" style="margin-top: 5px">
-        <label control="background" value="&backgroundColor.label;"
-               accesskey="&backgroundColor.accesskey;" flex="1"/>
-        <colorpicker type="button" id="background" palettename="standard"
-                     prefstring="browser.display.background_color"/>
-      </hbox>
-      <separator class="thin"/>
-      <hbox align="center">
-        <checkbox id="browserUseSystemColors" label="&useSystemColors.label;" accesskey="&useSystemColors.accesskey;"
-                  prefstring="browser.display.use_system_colors"/>
-      </hbox>
     </groupbox>
-      
-    <groupbox flex="1">
-      <caption label="&links;"/>
-      <hbox align="center">
-        <label control="unvisitedLinks" value="&linkColor.label;"
-               accesskey="&linkColor.accesskey;" flex="1"/>
-        <colorpicker type="button" id="unvisitedLinks" palettename="standard"
-                     prefstring="browser.anchor_color"/>
-      </hbox>
-      <hbox align="center" style="margin-top: 5px">
-        <label control="activeLinks" value="&activeLinkColor.label;"
-               accesskey="&activeLinkColor.accesskey;" flex="1"/>
-        <colorpicker type="button" id="activeLinks" palettename="standard"
-                     prefstring="browser.active_color"/>
-      </hbox>
-      <hbox align="center" style="margin-top: 5px">
-        <label control="visitedLinks" value="&visitedLinkColor.label;"
-               accesskey="&visitedLinkColor.accesskey;" flex="1"/>
-        <colorpicker type="button" id="visitedLinks" palettename="standard"
-                     prefstring="browser.visited_color"/>
-      </hbox>
-      <separator class="thin"/>
-      <hbox align="center">
-        <checkbox id="browserUnderlineAnchors" label="&underlineLinks.label;" accesskey="&underlineLinks.accesskey;"
-                  prefstring="browser.underline_anchors"/>
-      </hbox>
-    </groupbox>
-  </hbox>
-  
-  <groupbox>
-    <caption label="&someProvColors;"/>
-  
-    <radiogroup id="browserUseDocumentColors"
-                preftype="bool" prefstring="browser.display.use_document_colors">
-      <radio value="true" label="&alwaysUseDocumentColors.label;" accesskey="&alwaysUseDocumentColors.accesskey;"/>
-      <radio value="false" label="&useMyColors.label;" accesskey="&useMyColors.accesskey;"/>        
-    </radiogroup>
-    
-  </groupbox>
-</page>
+  </prefpane>
+</overlay>
diff --git a/mozilla/suite/common/pref/preferences.xul b/mozilla/suite/common/pref/preferences.xul
index e9153cd4209..dd3dfd28abc 100644
--- a/mozilla/suite/common/pref/preferences.xul
+++ b/mozilla/suite/common/pref/preferences.xul
@@ -81,8 +81,13 @@
         <treechildren id="appearanceChildren">
           <treeitem label="&fonts.label;"
                     url="chrome://communicator/content/pref/pref-fonts.xul"/>
-          <treeitem label="&colors.label;"
+-->
+          <treeitem id="colorsItem"
+                    label="&colors.label;"
+                    helpTopic="appearance_pref_colors"
+                    prefpane="colors_pane"
                     url="chrome://communicator/content/pref/pref-colors.xul"/>
+<!--
           <treeitem label="&locales.label;"
                     url="chrome://communicator/content/pref/pref-locales.xul"/>
         </treechildren>
diff --git a/mozilla/suite/common/pref/preftree.xul b/mozilla/suite/common/pref/preftree.xul
index afa35f1fc53..f2191be0d2d 100644
--- a/mozilla/suite/common/pref/preftree.xul
+++ b/mozilla/suite/common/pref/preftree.xul
@@ -69,7 +69,7 @@
         </treeitem>
         <treeitem>
           <treerow>
-            <treecell url="chrome://communicator/content/pref/pref-colors.xul" label="&colors.label;"/> 
+            <treecell label="(Migrated: &colors.label;)"/> 
           </treerow>
         </treeitem>
         <treeitem>