diff --git a/mozilla/suite/browser/navigator.js b/mozilla/suite/browser/navigator.js
index dc7d0d94b96..2abc9f87ed6 100644
--- a/mozilla/suite/browser/navigator.js
+++ b/mozilla/suite/browser/navigator.js
@@ -638,7 +638,7 @@ function OpenSearch(tabName, forceDialogFlag, searchStr)
 			}
 			else
 			{
-				window.openDialog("chrome://search/content/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName, searchStr);
+				window.openDialog("chrome://communicator/content/search/search.xul", "SearchWindow", "dialog=no,close,chrome,resizable", tabName, searchStr);
 			}
 		}
 		else 
@@ -831,7 +831,7 @@ function BrowserEditBookmarks()
     }
     gDisableBookmarks = true;
 
-    window.open("chrome://bookmarks/content/", "_blank", "chrome,menubar,resizable,scrollbars");
+    window.open("chrome://communicator/content/bookmarks/bookmarks.xul", "_blank", "chrome,menubar,resizable,scrollbars");
     setTimeout(enableBookmarks, 2000);
   }
 }
@@ -1069,17 +1069,17 @@ function BrowserEditBookmarks()
 
   function OpenMessenger()
   {
-	window.open("chrome://messenger/content/", "_blank", "chrome,menubar,toolbar,resizable");
+	window.open("chrome://messenger/content/messenger.xul", "_blank", "chrome,menubar,toolbar,resizable");
   }
 
   function OpenAddressbook()
   {
-	window.open("chrome://addressbook/content/", "_blank", "chrome,menubar,toolbar,resizable");
+	window.open("chrome://messenger/content/addressbook/addressbook.xul", "_blank", "chrome,menubar,toolbar,resizable");
   }
 
   function BrowserSendLink(pageUrl, pageTitle)
   {
-    window.openDialog( "chrome://messengercompose/content/", "_blank", 
+    window.openDialog( "chrome://messenger/content/messengercompose/messengercompose.xul", "_blank", 
                        "chrome,all,dialog=no",
                        "body='" + pageUrl + "',subject='" + pageTitle +
                        "',bodyislink=true");
@@ -1087,7 +1087,7 @@ function BrowserEditBookmarks()
 
   function BrowserSendPage(pageUrl, pageTitle)
   {
-    window.openDialog( "chrome://messengercompose/content/", "_blank", 
+    window.openDialog( "chrome://messenger/content/messengercompose/messengercompose.xul", "_blank", 
                        "chrome,all,dialog=no", 
                        "attachment='" + pageUrl + "',body='" + pageUrl +
                        "',subject='" + pageTitle + "',bodyislink=true");
diff --git a/mozilla/suite/browser/navigator.xul b/mozilla/suite/browser/navigator.xul
index 3951b31f1ad..e0341e3819e 100644
--- a/mozilla/suite/browser/navigator.xul
+++ b/mozilla/suite/browser/navigator.xul
@@ -21,10 +21,10 @@ Rights Reserved.
 Contributor(s): ______________________________________. -->
 
 
-<?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
+<?xml-stylesheet href="chrome://navigator/skin/navigator.css" type="text/css"?> 
 <?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
-<?xul-overlay href="chrome://sidebar/content/sidebarOverlay.xul"?>
+<?xul-overlay href="chrome://communicator/content/sidebar/sidebarOverlay.xul"?>
 <?xul-overlay href="chrome://navigator/content/NavSecurityOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://navigator/locale/navigator.dtd" >
diff --git a/mozilla/suite/browser/navigatorOverlay.xul b/mozilla/suite/browser/navigatorOverlay.xul
index 09c8c053010..b624182d2a6 100644
--- a/mozilla/suite/browser/navigatorOverlay.xul
+++ b/mozilla/suite/browser/navigatorOverlay.xul
@@ -185,7 +185,7 @@ Contributor(s): ______________________________________. -->
       <menuseparator/>
       <menuitem id="menu_selectAll"/>
       <menuseparator /> 
-      <menuitem id="menu_preferences" oncommand="goPreferences('navigator.xul', 'chrome://pref/content/pref-appearance.xul')"/>
+      <menuitem id="menu_preferences" oncommand="goPreferences('navigator.xul', 'chrome://communicator/content/pref/pref-appearance.xul')"/>
     </menupopup>
   </menu>
 
@@ -329,7 +329,7 @@ END of Deprecated -->
       <menuseparator /> 
       <menuitem value="&searchInternetCmd.label;" accesskey="&searchInternetCmd.accesskey;" oncommand="openTopWin('http://search.netscape.com/')"/>
       <menuitem value="&searchAllMailCmd.label;" accesskey="&searchAllMailCmd.accesskey;" disabled="true" oncommand=""/>
-      <menuitem value="&searchBookmarksHistoryCmd.label;" accesskey="&searchBookmarksHistoryCmd.accesskey;" oncommand="window.openDialog('chrome://bookmarks/content/bm-find.xul', 'FindBookmarksWindow', 'centerscreen,dialog=no,close,chrome,resizable');"/>
+      <menuitem value="&searchBookmarksHistoryCmd.label;" accesskey="&searchBookmarksHistoryCmd.accesskey;" oncommand="window.openDialog('chrome://communicator/content/bookmarks/bm-find.xul', 'FindBookmarksWindow', 'centerscreen,dialog=no,close,chrome,resizable');"/>
       <menuitem value="&searchAddressbookCmd.label;" accesskey="&searchAddressbookCmd.accesskey;" disabled="true" oncommand="OpenSearch('addressbook', true, null);"/>
 	</menupopup>
   </menu>
@@ -445,7 +445,7 @@ END of Deprecated -->
        </menupopup>
       </menu>
 
-     <menuitem value="&domviewer.label;" oncommand="window.content.location.href='chrome://domviewer/content/DOMDataSourceViewer.xul'"/>
+     <menuitem value="&domviewer.label;" oncommand="window.content.location.href='chrome://communicator/content/domviewer/DOMDataSourceViewer.xul'"/>
      <menuitem value="&browserbuster.label;" oncommand="window.content.location.href='http://komodo.mozilla.org/buster'"/>
      <!-- TEMPORARY UNTIL -edit WORKS TO STARTUP COMPOSER (bug 16789)  -->
      <menuitem value="Composer with Test Page" oncommand="window.openDialog('chrome://editor/content','_blank','chrome,all,dialog=no','chrome://editor/content/EditorInitPage.html')"/>
diff --git a/mozilla/suite/browser/viewSource.xul b/mozilla/suite/browser/viewSource.xul
index 6ae8538195a..b21ba103bb6 100644
--- a/mozilla/suite/browser/viewSource.xul
+++ b/mozilla/suite/browser/viewSource.xul
@@ -1,5 +1,5 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
+<?xml-stylesheet href="chrome://navigator/skin/navigator.css" type="text/css"?> 
 
 <!DOCTYPE window SYSTEM "chrome://navigator/locale/viewSource.dtd" >
 <window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"