diff --git a/mozilla/xpfe/browser/resources/content/linkToolbarOverlay.xul b/mozilla/xpfe/browser/resources/content/linkToolbarOverlay.xul
index 06ba0eda705..faa407575d8 100644
--- a/mozilla/xpfe/browser/resources/content/linkToolbarOverlay.xul
+++ b/mozilla/xpfe/browser/resources/content/linkToolbarOverlay.xul
@@ -40,7 +40,7 @@
 
 <?xml-stylesheet href="chrome://navigator/skin/linkToolbar.css" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
-<!DOCTYPE window SYSTEM "chrome://navigator/locale/linkToolbar.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://navigator/locale/linkToolbar.dtd">
 
 <overlay id="linkToolbarOverlay" 
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
index f6c9c92b486..84360eaaf8a 100644
--- a/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
+++ b/mozilla/xpfe/browser/resources/content/navigatorOverlay.xul
@@ -30,7 +30,7 @@
 <?xul-overlay href="chrome://global/content/charsetOverlay.xul"?>
 <?xul-overlay href="chrome://navigator/content/platformNavigationBindings.xul"?>
 
-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % navigatorDTD SYSTEM "chrome://navigator/locale/navigator.dtd" >
 %navigatorDTD;
 <!ENTITY % contentAreaCommandsDTD SYSTEM "chrome://communicator/locale/contentAreaCommands.dtd" >
diff --git a/mozilla/xpfe/browser/resources/content/turboDialog.xul b/mozilla/xpfe/browser/resources/content/turboDialog.xul
index f336dd8aa5a..36ae969314d 100644
--- a/mozilla/xpfe/browser/resources/content/turboDialog.xul
+++ b/mozilla/xpfe/browser/resources/content/turboDialog.xul
@@ -24,7 +24,7 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/dialogs.css" type="text/css"?>
 
-<!DOCTYPE window [
+<!DOCTYPE dialog [
   <!ENTITY % turboDialogDTD SYSTEM "chrome://navigator/locale/turboDialog.dtd" >
   %turboDialogDTD;
   <!ENTITY % dialogOverlayDTD SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd" >
diff --git a/mozilla/xpfe/browser/resources/content/unix/platformNavigationBindings.xul b/mozilla/xpfe/browser/resources/content/unix/platformNavigationBindings.xul
index 5edb9ec23ec..c9917d0858e 100644
--- a/mozilla/xpfe/browser/resources/content/unix/platformNavigationBindings.xul
+++ b/mozilla/xpfe/browser/resources/content/unix/platformNavigationBindings.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 
-<!DOCTYPE window SYSTEM "chrome://navigator-platform/locale/platformNavigationBindings.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://navigator-platform/locale/platformNavigationBindings.dtd">
 
 <overlay id="platformNavigationBindings"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/mozilla/xpfe/browser/resources/content/viewSourceOverlay.xul b/mozilla/xpfe/browser/resources/content/viewSourceOverlay.xul
index 7acc3fadad0..5c87e804e15 100644
--- a/mozilla/xpfe/browser/resources/content/viewSourceOverlay.xul
+++ b/mozilla/xpfe/browser/resources/content/viewSourceOverlay.xul
@@ -37,7 +37,7 @@
 
 <?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
 
-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % sourceDTD SYSTEM "chrome://navigator/locale/viewSource.dtd" >
diff --git a/mozilla/xpfe/communicator/resources/content/askViewZoom.xul b/mozilla/xpfe/communicator/resources/content/askViewZoom.xul
index cdcf893274a..ab6c6281736 100644
--- a/mozilla/xpfe/communicator/resources/content/askViewZoom.xul
+++ b/mozilla/xpfe/communicator/resources/content/askViewZoom.xul
@@ -36,7 +36,7 @@
 
 <?xml-stylesheet href="chrome://navigator/skin/navigator.css" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/askViewZoom.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/askViewZoom.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   id="askViewZoom"
diff --git a/mozilla/xpfe/communicator/resources/content/contentAreaContextOverlay.xul b/mozilla/xpfe/communicator/resources/content/contentAreaContextOverlay.xul
index 99a6d984a5a..26e60e5f7ab 100644
--- a/mozilla/xpfe/communicator/resources/content/contentAreaContextOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/contentAreaContextOverlay.xul
@@ -20,7 +20,7 @@
    - Contributor(s):
    -   Blake Ross <blakeross@telocity.com>
    -->
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/contentAreaCommands.dtd" >
+<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/contentAreaCommands.dtd" >
 <overlay id="contentAreaContextOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 
diff --git a/mozilla/xpfe/communicator/resources/content/mac/platformCommunicatorOverlay.xul b/mozilla/xpfe/communicator/resources/content/mac/platformCommunicatorOverlay.xul
index 800818683b0..f602be41f93 100644
--- a/mozilla/xpfe/communicator/resources/content/mac/platformCommunicatorOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/mac/platformCommunicatorOverlay.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <!-- mac version of platformCommunicatorOverlay.xul -->
 
-<!DOCTYPE window [
+<!DOCTYPE overlay [
 
 <!ENTITY % platformCommunicationDTD SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
 %platformCommunicationDTD;
diff --git a/mozilla/xpfe/communicator/resources/content/openLocation.xul b/mozilla/xpfe/communicator/resources/content/openLocation.xul
index 575d546bbeb..f0a09f1168a 100644
--- a/mozilla/xpfe/communicator/resources/content/openLocation.xul
+++ b/mozilla/xpfe/communicator/resources/content/openLocation.xul
@@ -27,7 +27,7 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window [
+<!DOCTYPE dialog [
   <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
   %brandDTD;
   <!ENTITY % openDialogDTD SYSTEM "chrome://communicator/locale/openLocation.dtd" >
diff --git a/mozilla/xpfe/communicator/resources/content/os2/platformCommunicatorOverlay.xul b/mozilla/xpfe/communicator/resources/content/os2/platformCommunicatorOverlay.xul
index 0c4c716f75e..8cc9172a3c5 100644
--- a/mozilla/xpfe/communicator/resources/content/os2/platformCommunicatorOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/os2/platformCommunicatorOverlay.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <!-- os2 version of platformCommunicatorOverlay.xul -->
 
-<!DOCTYPE window [
+<!DOCTYPE overlay [
 
 <!ENTITY % platformCommunicationDTD SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
 %platformCommunicationDTD;
diff --git a/mozilla/xpfe/communicator/resources/content/printPageSetup.xul b/mozilla/xpfe/communicator/resources/content/printPageSetup.xul
index 1ba6c96964f..7cf3ae68033 100644
--- a/mozilla/xpfe/communicator/resources/content/printPageSetup.xul
+++ b/mozilla/xpfe/communicator/resources/content/printPageSetup.xul
@@ -31,7 +31,7 @@ Contributor(s):
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/printing.css" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/printPageSetup.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/printPageSetup.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="onLoad();"
diff --git a/mozilla/xpfe/communicator/resources/content/taskbarOverlay.xul b/mozilla/xpfe/communicator/resources/content/taskbarOverlay.xul
index efd9f56ec92..2a01844d84b 100644
--- a/mozilla/xpfe/communicator/resources/content/taskbarOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/taskbarOverlay.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> 
 
-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % taskbarDTD SYSTEM "chrome://communicator/locale/taskbarOverlay.dtd" >
diff --git a/mozilla/xpfe/communicator/resources/content/tasksOverlay.xul b/mozilla/xpfe/communicator/resources/content/tasksOverlay.xul
index d51de3da1a9..0bd231ffed7 100644
--- a/mozilla/xpfe/communicator/resources/content/tasksOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/tasksOverlay.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <?xml-stylesheet href="chrome://communicator/skin/tasksOverlay.css" type="text/css"?> 
 
-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % tasksDTD SYSTEM "chrome://communicator/locale/tasksOverlay.dtd" >
 %tasksDTD;
 ]>
diff --git a/mozilla/xpfe/communicator/resources/content/unix/platformCommunicatorOverlay.xul b/mozilla/xpfe/communicator/resources/content/unix/platformCommunicatorOverlay.xul
index f144322f426..334419860a4 100644
--- a/mozilla/xpfe/communicator/resources/content/unix/platformCommunicatorOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/unix/platformCommunicatorOverlay.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <!-- unix version of platformCommunicatorOverlay.xul -->
 
-<!DOCTYPE window [
+<!DOCTYPE overlay [
 
 <!ENTITY % platformCommunicationDTD SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
 %platformCommunicationDTD;
diff --git a/mozilla/xpfe/communicator/resources/content/utilityOverlay.xul b/mozilla/xpfe/communicator/resources/content/utilityOverlay.xul
index 98039919610..53d8415e31e 100644
--- a/mozilla/xpfe/communicator/resources/content/utilityOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/utilityOverlay.xul
@@ -2,7 +2,7 @@
 
 <?xul-overlay href="chrome://communicator/content/platformCommunicatorOverlay.xul"?>
 
-<!DOCTYPE window [
+<!DOCTYPE overlay [
 
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
 %brandDTD;
diff --git a/mozilla/xpfe/communicator/resources/content/viewZoomOverlay.xul b/mozilla/xpfe/communicator/resources/content/viewZoomOverlay.xul
index a5eae72b7ef..2a4f93586fa 100644
--- a/mozilla/xpfe/communicator/resources/content/viewZoomOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/viewZoomOverlay.xul
@@ -34,7 +34,7 @@
    - GPL.
   -->
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/viewZoomOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/viewZoomOverlay.dtd">
 
 <overlay id="viewZoomOverlay"
          xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/mozilla/xpfe/communicator/resources/content/win/platformCommunicatorOverlay.xul b/mozilla/xpfe/communicator/resources/content/win/platformCommunicatorOverlay.xul
index ff9abe23230..0a5b1220c6f 100644
--- a/mozilla/xpfe/communicator/resources/content/win/platformCommunicatorOverlay.xul
+++ b/mozilla/xpfe/communicator/resources/content/win/platformCommunicatorOverlay.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <!-- win version of platformCommunicatorOverlay.xul -->
 
-<!DOCTYPE window [
+<!DOCTYPE overlay [
 
 <!ENTITY % platformCommunicationDTD SYSTEM "chrome://communicator-platform/locale/platformCommunicatorOverlay.dtd">
 %platformCommunicationDTD;
diff --git a/mozilla/xpfe/components/bookmarks/resources/addBookmark.xul b/mozilla/xpfe/components/bookmarks/resources/addBookmark.xul
index b7895efd0a1..02089deb099 100644
--- a/mozilla/xpfe/components/bookmarks/resources/addBookmark.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/addBookmark.xul
@@ -29,7 +29,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css"?>
 <?xml-stylesheet href="chrome://communicator/content/bookmarks/bookmarks.css" type="text/css"?>
 
-<!DOCTYPE window [
+<!DOCTYPE dialog [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % addBookmarkDTD SYSTEM "chrome://communicator/locale/bookmarks/addBookmark.dtd">
diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul b/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
index a7eac734430..6e6a75190a8 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
@@ -34,7 +34,7 @@
 <?xul-overlay href="chrome://communicator/content/tasksOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/bookmarks/bookmarks.dtd">
 
 <page id="bookmarksPanel"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-props.xul b/mozilla/xpfe/components/bookmarks/resources/bm-props.xul
index 16a874da75a..09a59fcced7 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bm-props.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bm-props.xul
@@ -25,7 +25,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/bookmarks/bookmarks.css" type="text/css"?>
 
-<!DOCTYPE window [
+<!DOCTYPE dialog [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % bmpropsDTD SYSTEM "chrome://communicator/locale/bookmarks/bm-props.dtd">
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.xul b/mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.xul
index 9acd41707eb..b97c26f8a0c 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarksOverlay.xul
@@ -24,7 +24,7 @@
     Ben Goodger <ben@netscape.com> (Original Author) 
 -->
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/bookmarksOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/bookmarks/bookmarksOverlay.dtd">
 
 <overlay id="bookmarksOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/mozilla/xpfe/components/bookmarks/resources/findBookmark.xul b/mozilla/xpfe/components/bookmarks/resources/findBookmark.xul
index b4d3b302cc7..e1327c23b9d 100644
--- a/mozilla/xpfe/components/bookmarks/resources/findBookmark.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/findBookmark.xul
@@ -29,7 +29,7 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/"?>
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/bookmarks/findBookmark.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/bookmarks/findBookmark.dtd">
 
 <dialog id="findBookmarkWindow" style="width: 36em;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/mozilla/xpfe/components/bookmarks/resources/pref-bookmarks.xul b/mozilla/xpfe/components/bookmarks/resources/pref-bookmarks.xul
index 50fb0552db1..4c8772d3fbb 100644
--- a/mozilla/xpfe/components/bookmarks/resources/pref-bookmarks.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/pref-bookmarks.xul
@@ -22,7 +22,7 @@
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % prefBookmarkDTD SYSTEM "chrome://communicator/locale/bookmarks/pref-bookmarks.dtd">
diff --git a/mozilla/xpfe/components/directory/directory.xul b/mozilla/xpfe/components/directory/directory.xul
index 8c144027ce9..847ec798a11 100644
--- a/mozilla/xpfe/components/directory/directory.xul
+++ b/mozilla/xpfe/components/directory/directory.xul
@@ -25,7 +25,7 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/directory/directory.css" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/directory/directory.dtd">
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/directory/directory.dtd">
 
 <page
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/mozilla/xpfe/components/filepicker/res/content/filepicker.xul b/mozilla/xpfe/components/filepicker/res/content/filepicker.xul
index 6106358e7da..0edf91c7103 100644
--- a/mozilla/xpfe/components/filepicker/res/content/filepicker.xul
+++ b/mozilla/xpfe/components/filepicker/res/content/filepicker.xul
@@ -28,7 +28,7 @@
 
 <?xml-stylesheet href="chrome://global/skin/filepicker.css" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://global/locale/filepicker.dtd" >
+<!DOCTYPE dialog SYSTEM "chrome://global/locale/filepicker.dtd" >
 
 <dialog id="main-window"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/mozilla/xpfe/components/find/resources/finddialog.xul b/mozilla/xpfe/components/find/resources/finddialog.xul
index d08f3901240..cf0c1207572 100644
--- a/mozilla/xpfe/components/find/resources/finddialog.xul
+++ b/mozilla/xpfe/components/find/resources/finddialog.xul
@@ -31,7 +31,7 @@ Contributor(s):
 
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://global/locale/finddialog.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://global/locale/finddialog.dtd">
 
 <dialog id="findDialog"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/mozilla/xpfe/components/history/resources/findHistory.xul b/mozilla/xpfe/components/history/resources/findHistory.xul
index a42566cff87..c7c0b39c4dd 100644
--- a/mozilla/xpfe/components/history/resources/findHistory.xul
+++ b/mozilla/xpfe/components/history/resources/findHistory.xul
@@ -27,7 +27,7 @@
   -->
 
 <?xml-stylesheet href="chrome://communicator/skin/"?>
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/history/findHistory.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/history/findHistory.dtd">
 
 <dialog id="findHistoryWindow" style="width: 36em;"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/mozilla/xpfe/components/history/resources/history-panel.xul b/mozilla/xpfe/components/history/resources/history-panel.xul
index 638e7fdc9f4..77eb28a8dd4 100644
--- a/mozilla/xpfe/components/history/resources/history-panel.xul
+++ b/mozilla/xpfe/components/history/resources/history-panel.xul
@@ -27,7 +27,7 @@
 <?xul-overlay href="chrome://communicator/content/history/historyTreeOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/utilityOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/history/history.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/history/history.dtd" >
 
 <page id="history-panel" orient="vertical"
       xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul b/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul
index de34b89ca04..f30c48a04c9 100644
--- a/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul
+++ b/mozilla/xpfe/components/history/resources/historyTreeOverlay.xul
@@ -24,7 +24,7 @@
     Alec Flett <alecf@netscape.com>
 -->
 
-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % historyDTD SYSTEM "chrome://communicator/locale/history/historyTreeOverlay.dtd" >
 %historyDTD;
 <!ENTITY % contentAreaCommandsDTD SYSTEM "chrome://communicator/locale/contentAreaCommands.dtd" >
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
index f7914b078a7..b48049d5224 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
@@ -22,7 +22,7 @@
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
 %brandDTD;
 <!ENTITY % prefAdvancedDTD SYSTEM "chrome://communicator/locale/pref/pref-advanced.dtd"> %prefAdvancedDTD;
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul
index 6977f1bffbb..f38427bc84a 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul
@@ -24,7 +24,7 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % prefAppearanceDTD SYSTEM "chrome://communicator/locale/pref/pref-appearance.dtd" >
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul
index ea0dd3edfde..8fc75990878 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications-edit.xul
@@ -25,7 +25,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/"?>
 <?xml-stylesheet href="chrome://communicator/skin/prefpanels.css" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-applications-edit.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/pref/pref-applications-edit.dtd">
 
 <dialog id="pickAppHandler"
         style="width: 30em;"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
index 6fa02c213fd..572aa999603 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
@@ -24,7 +24,7 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-applications.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-applications.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
index 275e978400c..191347e85de 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
@@ -24,7 +24,7 @@
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % prefCacheDTD SYSTEM "chrome://communicator/locale/pref/pref-cache.dtd" >
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-charset.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-charset.xul
index 95217582a13..2f1509be0cf 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-charset.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-charset.xul
@@ -21,7 +21,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://communicator/skin/sidebar/customize.css" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-charset.dtd" >
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/pref/pref-charset.dtd" >
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         title="&charset.customize.title.label;"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul
index 022c6243ffa..dfa6a555da4 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul
@@ -25,7 +25,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xul-overlay href="chrome://communicator/content/pref/platformPrefOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-colors.dtd" >
+<!DOCTYPE page 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');"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul
index 648e73bf7c4..00f1989ff96 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul
@@ -22,7 +22,7 @@
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-debug.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-debug.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://communicator/content/pref/pref-debug.xul');"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug1.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug1.xul
index 1e7b12fae49..311e459d6f9 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug1.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug1.xul
@@ -22,7 +22,7 @@
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-debug1.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-debug1.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://communicator/content/pref/pref-debug1.xul');"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug2.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug2.xul
index 37f27f8fa0d..92a429c2be2 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug2.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug2.xul
@@ -22,7 +22,7 @@
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-debug2.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-debug2.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://communicator/content/pref/pref-debug2.xul');"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul
index e31bb3c2b69..026e4feb5a7 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul
@@ -24,7 +24,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-download.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-download.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://communicator/content/pref/pref-download.xul');"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul
index 1d3f0639df2..150b605728e 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul
@@ -22,7 +22,7 @@
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-fonts.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-fonts.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://communicator/content/pref/pref-fonts.xul');"
       headertitle="&lHeader;">
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-history.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-history.xul
index 2a01a65c395..6abdd32a38e 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-history.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-history.xul
@@ -24,7 +24,7 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-history.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-history.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://communicator/content/pref/pref-history.xul');"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-http.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-http.xul
index f4ed1c7d835..b4ec4a963e7 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-http.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-http.xul
@@ -39,7 +39,7 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-http.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-http.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://communicator/content/pref/pref-http.xul');checkPipelining();checkPipeliningProxy();"
       headertitle="&lHeader;">
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages-add.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages-add.xul
index 160a8811ad0..25f4d178a05 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages-add.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages-add.xul
@@ -22,7 +22,7 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-languages.dtd" >
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/pref/pref-languages.dtd" >
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       title="&languages.customize.add.title.label;"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul
index 7bc2e987012..d649aa9c01c 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul
@@ -20,7 +20,7 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-languages.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-languages.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="Init();"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
index bd32e035fbb..bc5cdfcc1b2 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-mousewheel.xul
@@ -25,7 +25,7 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?> 
 
-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % platformDTD SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd" >
 %platformDTD;
 <!ENTITY % prefMousewheelDTD SYSTEM "chrome://communicator/locale/pref/pref-mousewheel.dtd" >
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
index 9bdd65191fd..d99c416f465 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
@@ -25,7 +25,7 @@
 <?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
 <?xul-overlay href="chrome://communicator/content/pref/platformPrefOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-navigator.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-navigator.dtd" >
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       id="pref-navigator"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-offline.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-offline.xul
index 74c60a6e4e8..ec00290e98b 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-offline.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-offline.xul
@@ -24,7 +24,7 @@
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % offlineDTD SYSTEM "chrome://communicator/locale/pref/pref-offline.dtd" >
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-policies.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-policies.xul
index 77e5499ad9f..2bc2254c6d4 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-policies.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-policies.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % policiesDTD SYSTEM "chrome://communicator/locale/pref/pref-policies.dtd" >
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul
index 8a48f0e1a9b..0945b05d89b 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul
@@ -25,7 +25,7 @@
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-proxies.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-proxies.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://communicator/content/pref/pref-proxies.xul');"
       headertitle="&lHeader;">
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-scripts.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-scripts.xul
index d8f5db2223b..636372c1781 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-scripts.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-scripts.xul
@@ -38,7 +38,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xul-overlay href="chrome://communicator/content/communicatorOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-scripts.dtd">
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-scripts.dtd">
 
 <page id="scriptsAndWindowPanel" xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://communicator/content/pref/pref-scripts.xul');"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-search.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-search.xul
index 50a0eaac95c..d95e7fb8ff2 100755
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-search.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-search.xul
@@ -22,7 +22,7 @@
   -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-search.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-search.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://communicator/content/pref/pref-search.xul');checkEngine()"
       headertitle="&lHeader;">
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-security.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-security.xul
index 8b8310041d9..5f51b2f50f9 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-security.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-security.xul
@@ -22,7 +22,7 @@
    -->
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-security.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-security.dtd" >
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://communicator/content/pref/pref-security.xul');"
       headertitle="&lHeader;">
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing-ac.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing-ac.xul
index 443f90e8ff3..b3462a625e7 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing-ac.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing-ac.xul
@@ -22,7 +22,7 @@
      Joe Hewitt <hewitt@netscape.com>
   -->
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-smart_browsing.dtd" >
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/pref/pref-smart_browsing.dtd" >
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/prefpanels.css" type="text/css"?>
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
index c03aa8902c8..eba8f497cee 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
@@ -26,7 +26,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/prefpanels.css" type="text/css"?>
 
-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % prefSmartBrowsingDTD SYSTEM "chrome://communicator/locale/pref/pref-smart_browsing.dtd" >
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
index 576c6be861b..02dd2c4fd44 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?> 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-smartupdate.dtd" >
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-smartupdate.dtd" >
  
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://communicator/content/pref/pref-smartupdate.xul'); initUpdateNotifications();"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-tabs.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-tabs.xul
index 80d619700be..076141e85c9 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-tabs.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-tabs.xul
@@ -23,7 +23,7 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref-tabs.dtd">
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/pref/pref-tabs.dtd">
 
 <page xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       onload="parent.initPanel('chrome://communicator/content/pref/pref-tabs.xul');
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.xul
index 4b3b14d9311..28aa85b17e3 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-themes.xul
@@ -24,7 +24,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/prefpanels.css" type="text/css"?>
 
-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % themesDTD SYSTEM "chrome://communicator/locale/pref/pref-themes.dtd" >
 %themesDTD;
 <!ENTITY % regionDTD SYSTEM "chrome://global-region/locale/region.dtd" >
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-winhooks.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
index a7c15f8b0d9..728a6ba6799 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-winhooks.xul
@@ -25,7 +25,7 @@
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window [
+<!DOCTYPE page [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
 %brandDTD;
 <!ENTITY % platformDTD SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd" >
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref.xul
index c9cc4fa250c..e1e81d18d12 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref.xul
@@ -3,7 +3,7 @@
 
 <?xul-overlay href="chrome://communicator/content/pref/preftree.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/pref.dtd" >
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/pref/pref.dtd" >
 
 
 <!-- This dialog has a fixed size and is not resizable. 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul b/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul
index 7bdf060c60b..63ff5addb54 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul
@@ -25,7 +25,7 @@
 
 <?xul-overlay href="chrome://communicator/content/pref/platformPrefOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/pref/preftree.dtd" >
+<!DOCTYPE overlay SYSTEM "chrome://communicator/locale/pref/preftree.dtd" >
 
 <overlay id="prefTreeOverlay"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/unix/platformPrefOverlay.xul b/mozilla/xpfe/components/prefwindow/resources/content/unix/platformPrefOverlay.xul
index 0b12b19e464..fe1f571df7e 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/unix/platformPrefOverlay.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/unix/platformPrefOverlay.xul
@@ -23,7 +23,7 @@
      Ben Goodger <ben@netscape.com>
   -->
 
-<!DOCTYPE window SYSTEM "chrome://communicator-platform/locale/pref/platformPrefOverlay.dtd">  
+<!DOCTYPE overlay SYSTEM "chrome://communicator-platform/locale/pref/platformPrefOverlay.dtd">  
   
 <overlay id="platformPreferencesOverlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/win/platformPrefOverlay.xul b/mozilla/xpfe/components/prefwindow/resources/content/win/platformPrefOverlay.xul
index c47c233c94f..e0ad31b4cdf 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/win/platformPrefOverlay.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/win/platformPrefOverlay.xul
@@ -24,7 +24,7 @@
      Bill Law    <law@netscape.com>
   -->
 
-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd">
 %brandDTD;
 <!ENTITY % platformPrefOverlayDTD SYSTEM "chrome://communicator-platform/locale/pref/platformPrefOverlay.dtd">  
diff --git a/mozilla/xpfe/components/search/resources/internetresults.xul b/mozilla/xpfe/components/search/resources/internetresults.xul
index 9c1823b205c..9745ac87dcc 100644
--- a/mozilla/xpfe/components/search/resources/internetresults.xul
+++ b/mozilla/xpfe/components/search/resources/internetresults.xul
@@ -3,7 +3,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/search/search.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/search/internetresults.css" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/search/internetresults.dtd">
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/search/internetresults.dtd">
 
 <page onload="onLoadInternetResults();"
       xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/mozilla/xpfe/components/search/resources/search-editor.xul b/mozilla/xpfe/components/search/resources/search-editor.xul
index 024f052d954..c28665e9367 100644
--- a/mozilla/xpfe/components/search/resources/search-editor.xul
+++ b/mozilla/xpfe/components/search/resources/search-editor.xul
@@ -29,7 +29,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/search/search.css" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/search/search-editor.css" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/search/search-editor.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/search/search-editor.dtd">
 
 <dialog title="&window.title.label;" id="search-editor-window"
         xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/mozilla/xpfe/components/sidebar/resources/PageNotFound.xul b/mozilla/xpfe/components/sidebar/resources/PageNotFound.xul
index 8d6ab5f4bdc..f2ed9521c2b 100644
--- a/mozilla/xpfe/components/sidebar/resources/PageNotFound.xul
+++ b/mozilla/xpfe/components/sidebar/resources/PageNotFound.xul
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/sidebar/sidebarOverlay.dtd">
+<!DOCTYPE page SYSTEM "chrome://communicator/locale/sidebar/sidebarOverlay.dtd">
 
 <page xmlns ="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <description class="header">&sidebar.pagenotfound.label;</description>
diff --git a/mozilla/xpfe/components/sidebar/resources/customize.xul b/mozilla/xpfe/components/sidebar/resources/customize.xul
index cead8f1edf1..940b102c640 100644
--- a/mozilla/xpfe/components/sidebar/resources/customize.xul
+++ b/mozilla/xpfe/components/sidebar/resources/customize.xul
@@ -23,7 +23,7 @@
 <?xml-stylesheet href="chrome://communicator/skin/sidebar/customize.css"
   type="text/css"?>
 
-<!DOCTYPE window [
+<!DOCTYPE dialog [
 <!ENTITY % customizeDTD SYSTEM "chrome://communicator/locale/sidebar/customize.dtd" >
 %customizeDTD;
 <!ENTITY % brandDTD SYSTEM "chrome://global/locale/brand.dtd" >
diff --git a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul
index f949f394bce..9fb3feb7896 100644
--- a/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul
+++ b/mozilla/xpfe/components/sidebar/resources/sidebarOverlay.xul
@@ -22,7 +22,7 @@
 <?xml-stylesheet href="chrome://communicator/content/sidebar/sidebarOverlay.css" type="text/css"?> 
 <?xml-stylesheet href="chrome://global/skin/button.css" type="text/css"?> 
 
-<!DOCTYPE window [
+<!DOCTYPE overlay [
 <!ENTITY % sidebarOverlayDTD SYSTEM "chrome://communicator/locale/sidebar/sidebarOverlay.dtd" >
 %sidebarOverlayDTD;
 ]>
diff --git a/mozilla/xpfe/components/timebomb/resources/content/expireText.xul b/mozilla/xpfe/components/timebomb/resources/content/expireText.xul
index 7fa7fcd6c15..318dab32d76 100644
--- a/mozilla/xpfe/components/timebomb/resources/content/expireText.xul
+++ b/mozilla/xpfe/components/timebomb/resources/content/expireText.xul
@@ -23,7 +23,7 @@ Contributor(s):
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-<!DOCTYPE window [
+<!DOCTYPE dialog [
 <!ENTITY % commRegionDTD SYSTEM "chrome://communicator-region/locale/region.dtd" >
 %commRegionDTD;
 <!ENTITY % timebombDTD SYSTEM "chrome://communicator/locale/timebomb/timebomb.dtd">
diff --git a/mozilla/xpfe/components/timebomb/resources/content/warn.xul b/mozilla/xpfe/components/timebomb/resources/content/warn.xul
index 034e11dfeb5..525ba6533b7 100644
--- a/mozilla/xpfe/components/timebomb/resources/content/warn.xul
+++ b/mozilla/xpfe/components/timebomb/resources/content/warn.xul
@@ -23,7 +23,7 @@ Contributor(s):
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-<!DOCTYPE window [
+<!DOCTYPE dialog [
 <!ENTITY % commRegionDTD SYSTEM "chrome://communicator-region/locale/region.dtd" >
 %commRegionDTD;
 <!ENTITY % timebombDTD SYSTEM "chrome://communicator/locale/timebomb/timebomb.dtd">
diff --git a/mozilla/xpfe/global/resources/content/charsetDetectorsOverlay.xul b/mozilla/xpfe/global/resources/content/charsetDetectorsOverlay.xul
index 4578f73656a..1df7308d7fa 100644
--- a/mozilla/xpfe/global/resources/content/charsetDetectorsOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/charsetDetectorsOverlay.xul
@@ -20,7 +20,7 @@ Rights Reserved.
 Contributor(s): ______________________________________. -->
 
 
-<!DOCTYPE window SYSTEM "chrome://global/locale/charsetDetectorsOverlay.dtd" >
+<!DOCTYPE overlay SYSTEM "chrome://global/locale/charsetDetectorsOverlay.dtd" >
 
 <overlay id="charsetDetectorsOverlay"
      xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/mozilla/xpfe/global/resources/content/dialogOverlay.xul b/mozilla/xpfe/global/resources/content/dialogOverlay.xul
index 187e0d9d461..38a11371fb8 100644
--- a/mozilla/xpfe/global/resources/content/dialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/dialogOverlay.xul
@@ -2,7 +2,7 @@
 
 <?xul-overlay href="chrome://global/content/platformDialogOverlay.xul"?>
 
-<!DOCTYPE window SYSTEM "chrome://global/locale/dialogOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://global/locale/dialogOverlay.dtd">
 
 <overlay id="dialogOverlay"
 		 xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/mozilla/xpfe/global/resources/content/mac/platformDialogOverlay.xul b/mozilla/xpfe/global/resources/content/mac/platformDialogOverlay.xul
index dcf2e7093d7..821f33e587c 100644
--- a/mozilla/xpfe/global/resources/content/mac/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/mac/platformDialogOverlay.xul
@@ -21,7 +21,7 @@
    -->
 <!-- mac version of platformDialogOverlay.xul -->
 
-<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">
 
 <overlay id="platformDialogOverlay"
              xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul b/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul
index bc02bca034d..1383ef7e64c 100644
--- a/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/os2/platformDialogOverlay.xul
@@ -22,7 +22,7 @@
 
 <!-- os2 version of platformDialogOverlay.xul -->
 
-<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">
 
 <overlay id="platformDialogOverlay"
              xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/mozilla/xpfe/global/resources/content/printPageSetup.xul b/mozilla/xpfe/global/resources/content/printPageSetup.xul
index 1ba6c96964f..7cf3ae68033 100644
--- a/mozilla/xpfe/global/resources/content/printPageSetup.xul
+++ b/mozilla/xpfe/global/resources/content/printPageSetup.xul
@@ -31,7 +31,7 @@ Contributor(s):
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://communicator/skin/printing.css" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://communicator/locale/printPageSetup.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://communicator/locale/printPageSetup.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="onLoad();"
diff --git a/mozilla/xpfe/global/resources/content/printdialog.xul b/mozilla/xpfe/global/resources/content/printdialog.xul
index 5ff1a970e89..233ba084d7d 100644
--- a/mozilla/xpfe/global/resources/content/printdialog.xul
+++ b/mozilla/xpfe/global/resources/content/printdialog.xul
@@ -29,7 +29,7 @@ Contributor(s):
 -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://global/locale/printdialog.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://global/locale/printdialog.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="onLoad();"
diff --git a/mozilla/xpfe/global/resources/content/selectDialog.xul b/mozilla/xpfe/global/resources/content/selectDialog.xul
index cb90a727ac7..c6bbf0a9978 100644
--- a/mozilla/xpfe/global/resources/content/selectDialog.xul
+++ b/mozilla/xpfe/global/resources/content/selectDialog.xul
@@ -21,7 +21,7 @@ Rights Reserved.
 Contributor(s): ______________________________________. -->
 
 <?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?> 
-<!DOCTYPE window SYSTEM "chrome://global/locale/commonDialog.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://global/locale/commonDialog.dtd">
  
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" 
       onload="selectDialogOnLoad()"
diff --git a/mozilla/xpfe/global/resources/content/unix/platformDialogOverlay.xul b/mozilla/xpfe/global/resources/content/unix/platformDialogOverlay.xul
index 2e1751a1073..db954790937 100644
--- a/mozilla/xpfe/global/resources/content/unix/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/unix/platformDialogOverlay.xul
@@ -21,7 +21,7 @@
    -->
 <!-- unix version of platformDialogOverlay.xul -->
 
-<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">
 
 <overlay id="platformDialogOverlay"
              xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/mozilla/xpfe/global/resources/content/unix/printjoboptions.xul b/mozilla/xpfe/global/resources/content/unix/printjoboptions.xul
index b1c03ead561..5f52b89a3c5 100644
--- a/mozilla/xpfe/global/resources/content/unix/printjoboptions.xul
+++ b/mozilla/xpfe/global/resources/content/unix/printjoboptions.xul
@@ -28,7 +28,7 @@ Contributor(s):
 -->
 
 <?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-<!DOCTYPE window SYSTEM "chrome://global-platform/locale/printjoboptions.dtd">
+<!DOCTYPE dialog SYSTEM "chrome://global-platform/locale/printjoboptions.dtd">
 
 <dialog xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   onload="onLoad();"
diff --git a/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul b/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul
index 7fd065e6076..7d24e3004ad 100644
--- a/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/win/platformDialogOverlay.xul
@@ -22,7 +22,7 @@
 
 <!-- win version of platformDialogOverlay.xul -->
 
-<!DOCTYPE window SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://global-platform/locale/platformDialogOverlay.dtd">
 
 <overlay id="platformDialogOverlay"
              xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/mozilla/xpfe/global/resources/content/wizardOverlay.xul b/mozilla/xpfe/global/resources/content/wizardOverlay.xul
index f9ac75300f2..581210c6992 100644
--- a/mozilla/xpfe/global/resources/content/wizardOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/wizardOverlay.xul
@@ -1,6 +1,6 @@
 <?xml version="1.0"?> 
 
-<!DOCTYPE window SYSTEM "chrome://global/locale/wizardOverlay.dtd">
+<!DOCTYPE overlay SYSTEM "chrome://global/locale/wizardOverlay.dtd">
 
 <?xml-stylesheet href="chrome://global/skin/wizardOverlay.css" type="text/css"?>