diff --git a/cck/ib/Helpmenu.cpp b/cck/ib/Helpmenu.cpp
index 178e388ec2c6..5c861d8576e4 100644
--- a/cck/ib/Helpmenu.cpp
+++ b/cck/ib/Helpmenu.cpp
@@ -46,7 +46,10 @@ void CreateHelpMenu (void)
 
 		Hlp <<jsprefname<<"\n";
 	}
-	Hlp <<"     <RDF:li resource=\"urn:helpmenu:customizedHelp\" />\n";
+
+	Hlp << "	<menuitem label=\"" << HelpMenuName << "\"\n"; 
+	Hlp << "	 position=\"6\"\n"; 
+	Hlp << "	 oncommand=\"openTopWin('" << HelpMenuUrl << "');\" />\n";
 
 //	Hlp <<"<menuitem position=\"7\" value=\""<<HelpMenuName<<"\"\n\t";
 //	Hlp <<"oncommand=\"openTopWin('"<<HelpMenuUrl<<"')\" /> \n\t";
@@ -61,14 +64,6 @@ void CreateHelpMenu (void)
 		Hlp <<jsprefname<<"\n";
 	}
 
-	Hlp <<"<RDF:Description about=\"urn:helpmenu:customizedHelp\">\n";
-	Hlp	<<"	<NC:level>1</NC:level> \n";
-	Hlp <<"	<NC:title>"<<HelpMenuName<<"</NC:title> \n";
-	Hlp <<"	<NC:content>openTopWin('"<<HelpMenuUrl<<"')</NC:content>\n";
-	Hlp <<"</RDF:Description>\n";
-	Hlp <<"</RDF:RDF>\n";
-
-
 	Hlp.close();
 }
 
diff --git a/cck/ib/help1.txt b/cck/ib/help1.txt
index f1391a29af2a..067fbeaba4d6 100644
--- a/cck/ib/help1.txt
+++ b/cck/ib/help1.txt
@@ -1,42 +1,102 @@
-<?xml version="1.0"?>
-<!DOCTYPE RDF 
-[
-<!ENTITY helpMenu.label					"Help">
-<!ENTITY helpContentCmd.label				"Help Contents">
-
-<!ENTITY webBrowseCmd.label 				"Web Browsing">
-<!ENTITY emailCmd.label					"Mail and News">  
-<!ENTITY imCmd.label						"Instant Messenger">
-<!ENTITY composeCmd.label					"Composer">
-<!ENTITY customCmd.label					"Customization">  
-
-<!ENTITY privSecCmd.label			"Privacy and Security">  
-<!ENTITY secCmd.label			"Security Center">  
-<!ENTITY whatNewCmd.label			"What's New in Netscape 6?">  
-<!ENTITY newNetCmd.label			"New to the Net Tutorial">
-<!ENTITY feedBackCmd.label			"Feedback Center">
-<!ENTITY supportChannelCmd.label		"Netscape Technical Support"> 
-<!ENTITY interUsersCmd.label		"International Users">
-
-<!ENTITY helpAtCmd.label			"Netscape.com Help">
-] 
->
-
-<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-         xmlns:NC="http://home.netscape.com/NC-rdf#">
-
-<!-- root start  -->
-  <RDF:Seq ID="root">
-
-    <RDF:li resource="urn:helpmenu:help-contents" />
-    <RDF:li resource="urn:helpmenu:separator" />
-
-    <RDF:li resource="urn:helpmenu:whatsnew" />
-    <RDF:li resource="urn:helpmenu:newnet" />
-    <RDF:li resource="urn:helpmenu:support" />
-    <RDF:li resource="urn:helpmenu:security" />
-    <RDF:li resource="urn:helpmenu:intl" />
-
-    <RDF:li resource="urn:helpmenu:separator2" />
-
-    <RDF:li resource="urn:helpmenu:feedback" />
+<?xml version="1.0"?>
+
+<!DOCTYPE window SYSTEM "chrome://communicator/locale/communicatorOverlay.dtd">
+
+<overlay id="communicatorOverlay"
+         xmlns:html="http://www.w3.org/1999/xhtml"
+         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+         xmlns:NC="http://home.netscape.com/NC-rdf#" 
+         xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
+
+  <script language="JavaScript" href="chrome://global/content/globalOverlay.js"/>
+
+  <script>
+    if (this._elementIDs) {
+      this._elementIDs.push('myNetscapeButton');
+      this._elementIDs.push('net2phoneButton');
+      this._elementIDs.push('netscapeSearchButton');
+      this._elementIDs.push('netscapeShopButton');
+    }
+  </script>
+
+  <!-- for toolbar buttons in mail/editor -->
+  <menupopup id="printMenu">
+    <menuseparator class="nc" insertafter="printMenu"/>
+    <menu class="nc" label="&printPlusMenu.label;" insertafter="printMenuItem"
+          datasources="chrome://communicator-region/locale/communicatorOverlay.rdf"
+          ref="chrome://communicator-region/locale/communicatorOverlay.rdf#root"
+          rdf:containment="urn:clienturl:printplus">
+      <template>
+        <rule>
+          <menupopup>
+            <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#title" 
+                      url="rdf:http://home.netscape.com/NC-rdf#content" 
+                      oncommand="openTopWin(this.getAttribute('url')); 
+
+event.preventBubble();"/>
+          </menupopup>
+        </rule>
+      </template>
+      <menupopup/>
+    </menu>
+  </menupopup>
+
+  <!-- for toplevel menu items in navigator -->
+  <menupopup id="menu_FilePopup">
+    <menu id="navprintplus" class="nc" insertafter="printMenuItem" 
+
+label="&printPlusMenu.label;"
+          datasources="chrome://communicator-region/locale/communicatorOverlay.rdf"
+          ref="chrome://communicator-region/locale/communicatorOverlay.rdf#root"
+          rdf:containment="urn:clienturl:printplus">
+      <template>
+        <rule>
+          <menupopup>
+            <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#title" 
+                      url="rdf:http://home.netscape.com/NC-rdf#content" 
+                      oncommand="openTopWin(this.getAttribute('url'));"/>
+          </menupopup>
+        </rule>
+      </template>
+      <menupopup/>
+    </menu>
+  </menupopup>    
+
+  <!-- for toplevel menu items in editor -->
+  <menupopup id="fileMenu_Popup">
+    <menu class="nc" insertafter="printMenuItem" label="&printPlusMenu.label;"
+          datasources="chrome://communicator-region/locale/communicatorOverlay.rdf"
+          ref="chrome://communicator-region/locale/communicatorOverlay.rdf#root"
+          rdf:containment="urn:clienturl:printplus">
+      <template>
+        <rule>
+          <menupopup>
+            <menuitem uri="..." label="rdf:http://home.netscape.com/NC-rdf#title" 
+                      url="rdf:http://home.netscape.com/NC-rdf#content" 
+                      oncommand="openTopWin(this.getAttribute('url'));"/>
+          </menupopup>
+        </rule>
+      </template>
+      <menupopup/>
+    </menu>
+  </menupopup>    
+
+<menu id="menu_Help">
+  <menupopup id="helpPopup">
+    <menuitem label="&helpCmd.label;" 
+       accesskey="&helpCmd.accesskey;"
+       id="help"
+       oncommand="toOpenWindowByType('mozilla:help', 'chrome://help/content/help.xul');" />
+    <menuseparator position="2" />
+    <menuitem label="&whatNewCmd.label;" 
+       accesskey="&whatNewCmd.accesskey;" 
+       position="3"
+       oncommand="openTopWin('urn:clienturl:help:whatsnew');" />
+    <menuitem label="&feedBackCmd.label;" 
+       accesskey="&feedBackCmd.accesskey;" 
+       position="4" 
+       oncommand="openTopWin('urn:clienturl:help:feedback');" />
+    <menuitem label="&secCmd.label;" 
+       accesskey="&secCmd.accesskey;" 
+       position="5" 
+       oncommand="openTopWin('urn:clienturl:help:security');" />
diff --git a/cck/ib/help2.txt b/cck/ib/help2.txt
index dcb8085e34b1..597814d5e76b 100644
--- a/cck/ib/help2.txt
+++ b/cck/ib/help2.txt
@@ -1,58 +1,55 @@
-  </RDF:Seq>
-<!-- root end    -->
-
-<!-- Description -->
-<!-- help contents -->
-
-<RDF:Description about="urn:helpmenu:separator">
-    <NC:sep>y</NC:sep>
-</RDF:Description>
-
-<RDF:Description about="urn:helpmenu:separator2">
-    <NC:sep>y</NC:sep>
-</RDF:Description>
-
-<RDF:Description about="urn:helpmenu:help-contents">
-    <NC:level>1</NC:level>
-    <NC:title>&helpContentCmd.label;</NC:title>
-    <NC:content>toOpenWindowByType('help:main', 'chrome://communicator/content/help/help_main.xul')</NC:content>
-</RDF:Description>
-
- 
-
-  <RDF:Description about="urn:helpmenu:whatsnew">
-    <NC:level>1</NC:level>
-    <NC:title>&whatNewCmd.label;</NC:title> 
-    <NC:content>openTopWin('urn:clienturl:help:whatsnew')</NC:content>
-  </RDF:Description>
-
-  <RDF:Description about="urn:helpmenu:newnet">
-    <NC:level>1</NC:level>
-    <NC:title>&newNetCmd.label;</NC:title> 
-    <NC:content>openTopWin('urn:clienturl:help:newnethelp')</NC:content>
-  </RDF:Description>
-
-  <RDF:Description about="urn:helpmenu:support">
-    <NC:level>1</NC:level>
-    <NC:title>&supportChannelCmd.label;</NC:title> 
-    <NC:content>openTopWin('urn:clienturl:help:supporthelp')</NC:content>
-  </RDF:Description>
-
-  <RDF:Description about="urn:helpmenu:security">
-    <NC:level>1</NC:level>
-    <NC:title>&secCmd.label;</NC:title> 
-    <NC:content>openTopWin('urn:clienturl:help:security')</NC:content>
-  </RDF:Description>
-
-  <RDF:Description about="urn:helpmenu:intl">
-    <NC:level>1</NC:level>
-    <NC:title>&interUsersCmd.label;</NC:title> 
-    <NC:content>openTopWin('urn:clienturl:help:intlusers')</NC:content>
-  </RDF:Description>
-
-  <RDF:Description about="urn:helpmenu:feedback">
-    <NC:level>1</NC:level>
-    <NC:title>&feedBackCmd.label;</NC:title> 
-    <NC:content>openTopWin('urn:clienturl:help:feedback')</NC:content>
-  </RDF:Description>
-
+    <menuitem id="releaseUrl" hidden="true" />
+  </menupopup>
+</menu>
+
+
+<!-- hide/show elements from pref-navigator.xul -->
+<!-- 
+::::: there is a mapping from the name of the pref to the id of the element in xul 
+::::: browser.toolbars.showbutton.XXX maps to an element with an ID of XXX-button
+::::: so if you wanted to hide an element with ID of foobar-button you'd have a pref with 
+::::: browser.toolbars.showbutton.foobar
+::::: you also need to add a default start pref in mozilla tree at:
+::::: /modules/libpref/src/init/all.js
+-->
+  <titledbox id="prefShowButtons">
+     <box orient="vertical">
+          <checkbox allowevents="true"
+                        id="myNetscapeButton"
+                        label="&myNetscapeButton.label;"
+                        pref="true"
+                        preftype="bool"
+                        prefstring="browser.toolbars.showbutton.mynetscape"
+                        prefattribute = "checked"/>
+
+          <checkbox allowevents="true"
+                    id="net2phoneButton"
+                    label="&net2phoneButton.label;"
+                    pref="true"
+                    preftype="bool"
+                    prefstring="browser.toolbars.showbutton.net2phone"
+                    prefattribute = "checked"/>
+
+          <checkbox allowevents="true"
+                    id="netscapeShopButton"
+                    label="&netscapeShopButton.label;"
+                    pref="true"
+                    preftype="bool"
+                    prefstring="browser.toolbars.showbutton.netscapeshop"
+                    prefattribute = "checked"/>
+   </box>
+  </titledbox>
+
+      <box id="prefShowButtonsbox">
+          <checkbox allowevents="true"
+                    id="netscapeSearchButton"
+                    label="&netscapeSearchButton.label;"
+                    pref="true"
+                    preftype="bool"
+                    prefstring="browser.toolbars.showbutton.netscapesearch"
+                    prefattribute = "checked"
+                    insertafter="searchButton"/>
+      </box>
+
+</overlay>
+
diff --git a/cck/ib/script.ib b/cck/ib/script.ib
index 3f0f6b195450..35294e99b757 100644
--- a/cck/ib/script.ib
+++ b/cck/ib/script.ib
@@ -14,7 +14,7 @@ replaceXPI(deflenus.xpi,no.jar,bin/defaults/profile/bookmarks.html,%CustomBookma
 replaceXPI(regus.xpi,no.jar,bin/defaults/profile/US/bookmarks.html,%CustomBookmarkFile%)
 replaceXPI(deflenus.xpi,no.jar,bin/defaults/profile/panels.rdf,%SidebarPath%)
 replaceXPI(regus.xpi,no.jar,bin/defaults/profile/US/panels.rdf,%SidebarPath%)
-replaceXPI(regus.xpi,bin/chrome/US.jar,locale/US/communicator-region/helpMenu.rdf,%HlpRDF%)
+replaceXPI(browser.xpi,bin/chrome/comm.jar,content/communicator/communicatorOverlay.xul,%HlpRDF%)
 modifyDTD(langenus.xpi,bin/chrome/en-US.jar,locale/en-US/navigator/mainWindow.dtd,mainWindow.titlemodifier,%CompanyName%)
 modifyProperties(regus.xpi,bin/chrome/US.jar,locale/US/navigator-region/region.properties,browser.startup.homepage,%HomePageURL%)
 modifyProperties(regus.xpi,bin/chrome/US.jar,locale/US/navigator-region/region.properties,browser.throbber.url,%AnimatedLogoURL%)