diff --git a/mozilla/build/mac/NGLayoutBuildList.pm b/mozilla/build/mac/NGLayoutBuildList.pm
index 26ee9dd8807..fc854b30a10 100644
--- a/mozilla/build/mac/NGLayoutBuildList.pm
+++ b/mozilla/build/mac/NGLayoutBuildList.pm
@@ -1231,6 +1231,7 @@ sub MakeResourceAliases()
     _InstallResources(":mozilla:xpfe:global:resources:content:MANIFEST",			"$global_chrome_dir:content:default");
     _InstallResources(":mozilla:xpfe:global:resources:content:mac:MANIFEST",		"$global_chrome_dir:content:default");
     _InstallResources(":mozilla:xpfe:global:resources:skin:MANIFEST",               "$global_chrome_dir:skin:default");
+	_InstallResources(":mozilla:xpfe:global:resources:skin:MANIFEST_CHROME",        "$global_chrome_dir");
 	_InstallResources(":mozilla:xpfe:global:resources:locale:MANIFEST",				"$global_chrome_dir:locale:en-US:", 0);
 	_InstallResources(":mozilla:xpfe:global:resources:locale:mac:MANIFEST",			"$global_chrome_dir:locale:en-US:", 0);
 
diff --git a/mozilla/editor/ui/composer/content/EditorAppShell.xul b/mozilla/editor/ui/composer/content/EditorAppShell.xul
index f26b20f5f9a..4b16866fd1f 100644
--- a/mozilla/editor/ui/composer/content/EditorAppShell.xul
+++ b/mozilla/editor/ui/composer/content/EditorAppShell.xul
@@ -25,7 +25,6 @@
    -    Sammy Ford
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
diff --git a/mozilla/editor/ui/composer/content/TextEditorAppShell.xul b/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
index c1212f52bf8..a7278e78647 100644
--- a/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
+++ b/mozilla/editor/ui/composer/content/TextEditorAppShell.xul
@@ -22,7 +22,6 @@
    - Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
diff --git a/mozilla/editor/ui/composer/content/sb-bookmarks-panel.xul b/mozilla/editor/ui/composer/content/sb-bookmarks-panel.xul
index 4767df82c31..93e25b6eda3 100644
--- a/mozilla/editor/ui/composer/content/sb-bookmarks-panel.xul
+++ b/mozilla/editor/ui/composer/content/sb-bookmarks-panel.xul
@@ -23,7 +23,6 @@
    -    Ben Goodger
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://bookmarks/skin/" type="text/css"?>
 
diff --git a/mozilla/editor/ui/composer/content/sb-file-panel.xul b/mozilla/editor/ui/composer/content/sb-file-panel.xul
index 1044525297b..bb557788443 100644
--- a/mozilla/editor/ui/composer/content/sb-file-panel.xul
+++ b/mozilla/editor/ui/composer/content/sb-file-panel.xul
@@ -23,7 +23,6 @@
    -    Ben Goodger
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://bookmarks/skin/" type="text/css"?>
 
diff --git a/mozilla/editor/ui/composer/content/sidebar-editor.xul b/mozilla/editor/ui/composer/content/sidebar-editor.xul
index 6d2c7b9f1e1..58c74576475 100644
--- a/mozilla/editor/ui/composer/content/sidebar-editor.xul
+++ b/mozilla/editor/ui/composer/content/sidebar-editor.xul
@@ -23,7 +23,6 @@
    -    Ben Goodger
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/sidebar-editor.dtd" >
diff --git a/mozilla/editor/ui/composer/content/viewsource.xul b/mozilla/editor/ui/composer/content/viewsource.xul
index 122e901e0fa..0944dd93fb2 100644
--- a/mozilla/editor/ui/composer/content/viewsource.xul
+++ b/mozilla/editor/ui/composer/content/viewsource.xul
@@ -23,7 +23,6 @@
    -    Sammy Ford
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
 
 <!DOCTYPE window SYSTEM "chrome://editor/locale/viewSource.dtd" >
diff --git a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
index c248a3aaa6a..73f6298c747 100644
--- a/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
+++ b/mozilla/editor/ui/dialogs/content/EdAdvancedEdit.xul
@@ -23,7 +23,6 @@
   -->
 
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
diff --git a/mozilla/editor/ui/dialogs/content/EdDialogTemplate.xul b/mozilla/editor/ui/dialogs/content/EdDialogTemplate.xul
index 2dda6e88284..83c07fb62f6 100644
--- a/mozilla/editor/ui/dialogs/content/EdDialogTemplate.xul
+++ b/mozilla/editor/ui/dialogs/content/EdDialogTemplate.xul
@@ -22,7 +22,6 @@
   -->
 
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
diff --git a/mozilla/editor/ui/dialogs/content/EdDictionary.xul b/mozilla/editor/ui/dialogs/content/EdDictionary.xul
index 9e9361dc972..99d7868d9c3 100644
--- a/mozilla/editor/ui/dialogs/content/EdDictionary.xul
+++ b/mozilla/editor/ui/dialogs/content/EdDictionary.xul
@@ -22,7 +22,6 @@
   -->
 
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorPersonalDictionary.dtd">
 
diff --git a/mozilla/editor/ui/dialogs/content/EdHLineProps.xul b/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
index 79f4112c900..a62b48585c9 100644
--- a/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdHLineProps.xul
@@ -21,7 +21,6 @@
    - Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
diff --git a/mozilla/editor/ui/dialogs/content/EdImageProps.xul b/mozilla/editor/ui/dialogs/content/EdImageProps.xul
index 58503f92de5..887c08149a3 100644
--- a/mozilla/editor/ui/dialogs/content/EdImageProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdImageProps.xul
@@ -23,7 +23,6 @@
    -   Brian King
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
diff --git a/mozilla/editor/ui/dialogs/content/EdInsSrc.xul b/mozilla/editor/ui/dialogs/content/EdInsSrc.xul
index d4837f1fe20..7e235127d24 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsSrc.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInsSrc.xul
@@ -22,7 +22,6 @@
    - Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
diff --git a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
index 4f9348634b4..9a28d2abc8b 100644
--- a/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
+++ b/mozilla/editor/ui/dialogs/content/EdInsertTable.xul
@@ -22,7 +22,6 @@
    - Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
diff --git a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
index d169233353a..fd22bef4bbb 100644
--- a/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdLinkProps.xul
@@ -22,7 +22,6 @@
    - Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
diff --git a/mozilla/editor/ui/dialogs/content/EdListProps.xul b/mozilla/editor/ui/dialogs/content/EdListProps.xul
index 92d1fb6898a..51d74e5bf77 100644
--- a/mozilla/editor/ui/dialogs/content/EdListProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdListProps.xul
@@ -22,7 +22,6 @@
   -->
 
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
diff --git a/mozilla/editor/ui/dialogs/content/EdMessage.xul b/mozilla/editor/ui/dialogs/content/EdMessage.xul
index a76fcbe481f..d9c41cb0839 100644
--- a/mozilla/editor/ui/dialogs/content/EdMessage.xul
+++ b/mozilla/editor/ui/dialogs/content/EdMessage.xul
@@ -22,7 +22,6 @@
    - Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 <!DOCTYPE window>
 <!-- dialog containing a control requiring initial setup -->
diff --git a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
index 88064d8d718..8503aa53686 100644
--- a/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdNamedAnchorProps.xul
@@ -22,7 +22,6 @@
    - Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
diff --git a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
index 3c6445ffaf2..525f41c8c38 100644
--- a/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
+++ b/mozilla/editor/ui/dialogs/content/EdSpellCheck.xul
@@ -22,7 +22,6 @@
    - Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 <!DOCTYPE window SYSTEM "chrome://editor/locale/EditorSpellCheck.dtd">
 
diff --git a/mozilla/editor/ui/dialogs/content/EdTableProps.xul b/mozilla/editor/ui/dialogs/content/EdTableProps.xul
index bb0237337fd..a6037643b2d 100644
--- a/mozilla/editor/ui/dialogs/content/EdTableProps.xul
+++ b/mozilla/editor/ui/dialogs/content/EdTableProps.xul
@@ -22,7 +22,6 @@
    - Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?> 
diff --git a/mozilla/extensions/irc/xul/tests/test3.xul b/mozilla/extensions/irc/xul/tests/test3.xul
index a1821d05307..7a18f8261c3 100644
--- a/mozilla/extensions/irc/xul/tests/test3.xul
+++ b/mozilla/extensions/irc/xul/tests/test3.xul
@@ -24,7 +24,6 @@
 
 <!DOCTYPE window>
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="test3.css" type="text/css"?>
 
 <!--
diff --git a/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul b/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul
index 3bde8caca3a..b6591955f0c 100644
--- a/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul
+++ b/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul
@@ -22,7 +22,6 @@
     Ben Goodger
 -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <!-- CHANGE THIS WHEN MOVING FILES -->
 <?xml-stylesheet href="chrome://wallet/skin/CookieViewer.css" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
diff --git a/mozilla/extensions/wallet/signonviewer/SignonViewer.xul b/mozilla/extensions/wallet/signonviewer/SignonViewer.xul
index 6f078e7d128..f96988e9e81 100644
--- a/mozilla/extensions/wallet/signonviewer/SignonViewer.xul
+++ b/mozilla/extensions/wallet/signonviewer/SignonViewer.xul
@@ -22,7 +22,6 @@
     Ben Goodger
 -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <!-- CHANGE THIS WHEN MOVING FILES -->
 <?xml-stylesheet href="chrome://wallet/skin/SignonViewer.css" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
diff --git a/mozilla/intl/strres/tests/strres-test.xul b/mozilla/intl/strres/tests/strres-test.xul
index da19c0eaa2f..02ff94a561e 100644
--- a/mozilla/intl/strres/tests/strres-test.xul
+++ b/mozilla/intl/strres/tests/strres-test.xul
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?> 
 <!-- DON'T localize: strres test cases -->
 
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
  
 <!DOCTYPE window> 
 	<!-- padding 0px is just a workaround for windows not displaying paddings correctly
diff --git a/mozilla/layout/html/document/src/ua.css b/mozilla/layout/html/document/src/ua.css
index be1bbc19ba3..4e88c772571 100644
--- a/mozilla/layout/html/document/src/ua.css
+++ b/mozilla/layout/html/document/src/ua.css
@@ -15,8 +15,9 @@
  * Reserved.
  */
 
+@import url(resource:/chrome/xul.css);
+@import url(chrome://global/skin/);
 @namespace url(http://www.w3.org/TR/REC-html40); /* set default namespace to HTML */
-@namespace xul url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul); /* namespace for XUL elements */
 
 html {
   display: block;
@@ -1376,127 +1377,3 @@ select[-moz-dropdown-active]:-moz-dropdown-list {
 
 :-moz-letter-frame {
 }
-
-xul|titledbutton {
-   display: block;
-   border:2px solid blue;
-}
-
-
-xul|thumb {
-   display: block;
-   background-color: rgb(206, 207, 206);
-   border: 2px outset rgb(156, 154, 156);
-   list-style-image: url(chrome://global/skin/scroll-thumb-horiz.gif)
-}
-
-xul|thumb:hover {
-   list-style-image: url(chrome://global/skin/scroll-thumb-horiz-hover.gif);
-}
-
-xul|thumb[disabled="true"] {
-   list-style-image: url(chrome://global/skin/scroll-thumb-horiz-disabled.gif);
-}
-
-xul|slider[align="vertical"] xul|thumb {
-   list-style-image: url(chrome://global/skin/scroll-thumb-vert.gif)
-}
-
-xul|slider[align="vertical"] xul|thumb:hover {
-   list-style-image: url(chrome://global/skin/scroll-thumb-vert-hover.gif);
-
-}
-
-xul|slider[align="vertical"] xul|thumb[disabled="true"] {
-   list-style-image: url(chrome://global/skin/scroll-thumb-vert-disabled.gif);
-}
-
-xul|thumb:active {
-   background-color: rgb(220, 210, 210);
-}
-
-xul|slider[align="vertical"] xul|thumb:active {
-   background-color: rgb(220, 210, 210);
-}
-
-
-xul|slider {
-   display: block;
-   border: 1px solid black;
-   background-color: rgb(240,240,240);
- //  background-image: url("resource:/res/samples/bg.jpg");
-}
-
-xul|scrollbarbutton {
-  display: inline;
-  vertical-align: bottom;
-  cursor: default;
-
-  border: 2px outset rgb(156, 154, 156);
-  background-color: rgb(206, 207, 206);
-  color:black; 
-
-  padding: 1px;
-}
-
-xul|scrollbarbutton:active {
-  border-style: inset;
-
-  padding-left: 2px;
-  padding-right: 0px;
-  padding-top: 2px;
-  padding-bottom: 0px;
-}
-
-xul|scrollbarbutton[type="decrement"] {
-   list-style-image: url(chrome://global/skin/scroll-left.gif)
-}
-
-xul|scrollbarbutton[type="decrement"]:hover {
-   list-style-image: url(chrome://global/skin/scroll-left-hover.gif)
-}
-
-xul|scrollbarbutton[type="decrement"][disabled="true"] {
-   list-style-image: url(chrome://global/skin/scroll-left-disabled.gif) 
-}
-
-xul|scrollbarbutton[type="increment"] {
-   list-style-image: url(chrome://global/skin/scroll-right.gif)
-}
-
-xul|scrollbarbutton[type="increment"]:hover {
-   list-style-image: url(chrome://global/skin/scroll-right-hover.gif)
-}
-
-xul|scrollbarbutton[type="increment"][disabled="true"] {
-   list-style-image: url(chrome://global/skin/scroll-right-disabled.gif) 
-}
-
-
-xul|scrollbar[align="vertical"] xul|scrollbarbutton[type="decrement"] {
-   list-style-image: url(chrome://global/skin/scrollUp.gif)
-}
-
-xul|scrollbar[align="vertical"] xul|scrollbarbutton[type="decrement"]:hover {
-   list-style-image: url(chrome://global/skin/scrollUp_mo.gif)
-}
-
-xul|scrollbar[align="vertical"] xul|scrollbarbutton[type="decrement"][disabled="true"] {
-   list-style-image: url(chrome://global/skin/scrollUp_dis.gif) 
-}
-
-xul|scrollbar[align="vertical"] xul|scrollbarbutton[type="increment"] {
-   list-style-image: url(chrome://global/skin/scrollDown.gif)
-}
-
-xul|scrollbar[align="vertical"] xul|scrollbarbutton[type="increment"]:hover {
-   list-style-image: url(chrome://global/skin/scrollDown_mo.gif)
-}
-
-xul|scrollbar[align="vertical"] xul|scrollbarbutton[type="increment"][disabled="true"] {
-   list-style-image: url(chrome://global/skin/scrollDown_dis.gif) 
-}
-
-xul|scrollbar[value="hidden"] {
-   visibility: hidden; /* should be collapse but for box frame */
-}
diff --git a/mozilla/layout/html/tests/table/bugs/bug12287.xul b/mozilla/layout/html/tests/table/bugs/bug12287.xul
index 50b3fecbef7..a2dcd4c3fc7 100644
--- a/mozilla/layout/html/tests/table/bugs/bug12287.xul
+++ b/mozilla/layout/html/tests/table/bugs/bug12287.xul
@@ -1,6 +1,5 @@
 <?xml version="1.0"?> <!-- -*- Mode: SGML; indent-tabs-mode: nil; -*- -->
 
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:html="http://www.w3.org/TR/REC-html40" align="vertical"
diff --git a/mozilla/layout/style/ua.css b/mozilla/layout/style/ua.css
index be1bbc19ba3..4e88c772571 100644
--- a/mozilla/layout/style/ua.css
+++ b/mozilla/layout/style/ua.css
@@ -15,8 +15,9 @@
  * Reserved.
  */
 
+@import url(resource:/chrome/xul.css);
+@import url(chrome://global/skin/);
 @namespace url(http://www.w3.org/TR/REC-html40); /* set default namespace to HTML */
-@namespace xul url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul); /* namespace for XUL elements */
 
 html {
   display: block;
@@ -1376,127 +1377,3 @@ select[-moz-dropdown-active]:-moz-dropdown-list {
 
 :-moz-letter-frame {
 }
-
-xul|titledbutton {
-   display: block;
-   border:2px solid blue;
-}
-
-
-xul|thumb {
-   display: block;
-   background-color: rgb(206, 207, 206);
-   border: 2px outset rgb(156, 154, 156);
-   list-style-image: url(chrome://global/skin/scroll-thumb-horiz.gif)
-}
-
-xul|thumb:hover {
-   list-style-image: url(chrome://global/skin/scroll-thumb-horiz-hover.gif);
-}
-
-xul|thumb[disabled="true"] {
-   list-style-image: url(chrome://global/skin/scroll-thumb-horiz-disabled.gif);
-}
-
-xul|slider[align="vertical"] xul|thumb {
-   list-style-image: url(chrome://global/skin/scroll-thumb-vert.gif)
-}
-
-xul|slider[align="vertical"] xul|thumb:hover {
-   list-style-image: url(chrome://global/skin/scroll-thumb-vert-hover.gif);
-
-}
-
-xul|slider[align="vertical"] xul|thumb[disabled="true"] {
-   list-style-image: url(chrome://global/skin/scroll-thumb-vert-disabled.gif);
-}
-
-xul|thumb:active {
-   background-color: rgb(220, 210, 210);
-}
-
-xul|slider[align="vertical"] xul|thumb:active {
-   background-color: rgb(220, 210, 210);
-}
-
-
-xul|slider {
-   display: block;
-   border: 1px solid black;
-   background-color: rgb(240,240,240);
- //  background-image: url("resource:/res/samples/bg.jpg");
-}
-
-xul|scrollbarbutton {
-  display: inline;
-  vertical-align: bottom;
-  cursor: default;
-
-  border: 2px outset rgb(156, 154, 156);
-  background-color: rgb(206, 207, 206);
-  color:black; 
-
-  padding: 1px;
-}
-
-xul|scrollbarbutton:active {
-  border-style: inset;
-
-  padding-left: 2px;
-  padding-right: 0px;
-  padding-top: 2px;
-  padding-bottom: 0px;
-}
-
-xul|scrollbarbutton[type="decrement"] {
-   list-style-image: url(chrome://global/skin/scroll-left.gif)
-}
-
-xul|scrollbarbutton[type="decrement"]:hover {
-   list-style-image: url(chrome://global/skin/scroll-left-hover.gif)
-}
-
-xul|scrollbarbutton[type="decrement"][disabled="true"] {
-   list-style-image: url(chrome://global/skin/scroll-left-disabled.gif) 
-}
-
-xul|scrollbarbutton[type="increment"] {
-   list-style-image: url(chrome://global/skin/scroll-right.gif)
-}
-
-xul|scrollbarbutton[type="increment"]:hover {
-   list-style-image: url(chrome://global/skin/scroll-right-hover.gif)
-}
-
-xul|scrollbarbutton[type="increment"][disabled="true"] {
-   list-style-image: url(chrome://global/skin/scroll-right-disabled.gif) 
-}
-
-
-xul|scrollbar[align="vertical"] xul|scrollbarbutton[type="decrement"] {
-   list-style-image: url(chrome://global/skin/scrollUp.gif)
-}
-
-xul|scrollbar[align="vertical"] xul|scrollbarbutton[type="decrement"]:hover {
-   list-style-image: url(chrome://global/skin/scrollUp_mo.gif)
-}
-
-xul|scrollbar[align="vertical"] xul|scrollbarbutton[type="decrement"][disabled="true"] {
-   list-style-image: url(chrome://global/skin/scrollUp_dis.gif) 
-}
-
-xul|scrollbar[align="vertical"] xul|scrollbarbutton[type="increment"] {
-   list-style-image: url(chrome://global/skin/scrollDown.gif)
-}
-
-xul|scrollbar[align="vertical"] xul|scrollbarbutton[type="increment"]:hover {
-   list-style-image: url(chrome://global/skin/scrollDown_mo.gif)
-}
-
-xul|scrollbar[align="vertical"] xul|scrollbarbutton[type="increment"][disabled="true"] {
-   list-style-image: url(chrome://global/skin/scrollDown_dis.gif) 
-}
-
-xul|scrollbar[value="hidden"] {
-   visibility: hidden; /* should be collapse but for box frame */
-}
diff --git a/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressing.xul b/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
index 88ce8011260..9b5b538e8a9 100644
--- a/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
+++ b/mozilla/mailnews/addrbook/prefs/resources/content/pref-addressing.xul
@@ -1,6 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://addressbook/locale/pref-addressing.dtd">
diff --git a/mozilla/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul b/mozilla/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul
index 83e38e41ee3..c202448c4ee 100644
--- a/mozilla/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul
+++ b/mozilla/mailnews/addrbook/resources/content/abAddressBookNameDialog.xul
@@ -18,7 +18,6 @@ Communications Corporation. Portions created by Netscape are
  Copyright (C) 1998-1999 Netscape Communications Corporation. All
 Rights Reserved.
 --> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://addressbook/locale/abAddressBookNameDialog.dtd">
diff --git a/mozilla/mailnews/addrbook/resources/content/abCardViewOverlay.xul b/mozilla/mailnews/addrbook/resources/content/abCardViewOverlay.xul
index ac2f16bfe85..76fe01f42d6 100644
--- a/mozilla/mailnews/addrbook/resources/content/abCardViewOverlay.xul
+++ b/mozilla/mailnews/addrbook/resources/content/abCardViewOverlay.xul
@@ -18,7 +18,6 @@ Communications Corporation. Portions created by Netscape are
  Copyright (C) 1998-1999 Netscape Communications Corporation. All
 Rights Reserved.
 --> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://addressbook/skin/" type="text/css"?> 
 
 <!DOCTYPE window SYSTEM "chrome://addressbook/locale/abCardViewOverlay.dtd">
diff --git a/mozilla/mailnews/addrbook/resources/content/abDirTreeOverlay.xul b/mozilla/mailnews/addrbook/resources/content/abDirTreeOverlay.xul
index dfd0dc9eede..2fbe366f0a9 100644
--- a/mozilla/mailnews/addrbook/resources/content/abDirTreeOverlay.xul
+++ b/mozilla/mailnews/addrbook/resources/content/abDirTreeOverlay.xul
@@ -18,7 +18,6 @@ Communications Corporation. Portions created by Netscape are
  Copyright (C) 1998-1999 Netscape Communications Corporation. All
 Rights Reserved.
 --> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://addressbook/skin/" type="text/css"?> 
 
 <!DOCTYPE window SYSTEM "chrome://addressbook/locale/abDirTreeOverlay.dtd">
diff --git a/mozilla/mailnews/addrbook/resources/content/abEditCardDialog.xul b/mozilla/mailnews/addrbook/resources/content/abEditCardDialog.xul
index d50c25a80ee..cd0dc796f17 100644
--- a/mozilla/mailnews/addrbook/resources/content/abEditCardDialog.xul
+++ b/mozilla/mailnews/addrbook/resources/content/abEditCardDialog.xul
@@ -18,7 +18,6 @@ Communications Corporation. Portions created by Netscape are
  Copyright (C) 1998-1999 Netscape Communications Corporation. All
 Rights Reserved.
 --> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://addressbook/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 <?xul-overlay href="chrome://addressbook/content/abCardOverlay.xul"?>
diff --git a/mozilla/mailnews/addrbook/resources/content/abNewCardDialog.xul b/mozilla/mailnews/addrbook/resources/content/abNewCardDialog.xul
index 2c47229fa5a..fb05bd1f800 100644
--- a/mozilla/mailnews/addrbook/resources/content/abNewCardDialog.xul
+++ b/mozilla/mailnews/addrbook/resources/content/abNewCardDialog.xul
@@ -18,7 +18,6 @@ Communications Corporation. Portions created by Netscape are
  Copyright (C) 1998-1999 Netscape Communications Corporation. All
 Rights Reserved.
 --> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://addressbook/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 <?xul-overlay href="chrome://addressbook/content/abCardOverlay.xul"?>
diff --git a/mozilla/mailnews/addrbook/resources/content/abResultsTreeOverlay.xul b/mozilla/mailnews/addrbook/resources/content/abResultsTreeOverlay.xul
index cbeecea2a14..20780d686fc 100644
--- a/mozilla/mailnews/addrbook/resources/content/abResultsTreeOverlay.xul
+++ b/mozilla/mailnews/addrbook/resources/content/abResultsTreeOverlay.xul
@@ -18,7 +18,6 @@ Communications Corporation. Portions created by Netscape are
  Copyright (C) 1998-1999 Netscape Communications Corporation. All
 Rights Reserved.
 --> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://addressbook/skin/" type="text/css"?> 
 
 <!DOCTYPE window SYSTEM "chrome://addressbook/locale/abResultsTreeOverlay.dtd">
diff --git a/mozilla/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul b/mozilla/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
index 73722b26466..de847710036 100644
--- a/mozilla/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
+++ b/mozilla/mailnews/addrbook/resources/content/abSelectAddressesDialog.xul
@@ -19,7 +19,6 @@ Communications Corporation. Portions created by Netscape are
 Rights Reserved.
 --> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://addressbook/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://addressbook/content/abDirTreeOverlay.xul"?>
 <?xul-overlay href="chrome://addressbook/content/abResultsTreeOverlay.xul"?>
diff --git a/mozilla/mailnews/addrbook/resources/content/addressbook.xul b/mozilla/mailnews/addrbook/resources/content/addressbook.xul
index c6892c18bba..a2106fb195d 100644
--- a/mozilla/mailnews/addrbook/resources/content/addressbook.xul
+++ b/mozilla/mailnews/addrbook/resources/content/addressbook.xul
@@ -18,7 +18,6 @@ Communications Corporation. Portions created by Netscape are
  Copyright (C) 1998-1999 Netscape Communications Corporation. All
 Rights Reserved.
 --> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://addressbook/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
diff --git a/mozilla/mailnews/base/prefs/resources/content/AccountManager.xul b/mozilla/mailnews/base/prefs/resources/content/AccountManager.xul
index 7c04d755415..97a0d7ef26d 100644
--- a/mozilla/mailnews/base/prefs/resources/content/AccountManager.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/AccountManager.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
diff --git a/mozilla/mailnews/base/prefs/resources/content/AccountWizard.xul b/mozilla/mailnews/base/prefs/resources/content/AccountWizard.xul
index 055fc4427b8..865f5d3749e 100644
--- a/mozilla/mailnews/base/prefs/resources/content/AccountWizard.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/AccountWizard.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
 
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-advanced.xul b/mozilla/mailnews/base/prefs/resources/content/am-advanced.xul
index 9f0a3ab2114..7ff01b3cfd3 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-advanced.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-advanced.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-advanced.dtd" >
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-copies.xul b/mozilla/mailnews/base/prefs/resources/content/am-copies.xul
index 298f63e4de5..07242821cbd 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-copies.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-copies.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-copies.dtd" >
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-main.xul b/mozilla/mailnews/base/prefs/resources/content/am-main.xul
index 57d45c149cb..b8044d96b39 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-main.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-main.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-main.dtd" >
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-server-top.xul b/mozilla/mailnews/base/prefs/resources/content/am-server-top.xul
index bffcc2a9aff..7a5ced47f0c 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-server-top.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-server-top.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-server-top.dtd" >
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-server.xul b/mozilla/mailnews/base/prefs/resources/content/am-server.xul
index 29eb6908bd9..8cc5e400827 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-server.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-server.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-server-top.dtd" >
diff --git a/mozilla/mailnews/base/prefs/resources/content/am-smtp.xul b/mozilla/mailnews/base/prefs/resources/content/am-smtp.xul
index 4e58a0e736a..0d1dc9fb10a 100644
--- a/mozilla/mailnews/base/prefs/resources/content/am-smtp.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/am-smtp.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-advanced.dtd" >
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-accname.xul b/mozilla/mailnews/base/prefs/resources/content/aw-accname.xul
index 441c9c75359..80c97cbe6e4 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-accname.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-accname.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
 
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-accounttype.xul b/mozilla/mailnews/base/prefs/resources/content/aw-accounttype.xul
index c760ed1839f..0d163975202 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-accounttype.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-accounttype.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
 
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-done.xul b/mozilla/mailnews/base/prefs/resources/content/aw-done.xul
index 754e66a4290..09ec6779512 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-done.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-done.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
 <!--
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-email.xul b/mozilla/mailnews/base/prefs/resources/content/aw-email.xul
index 5d09469719b..cad83f689ef 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-email.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-email.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
 
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-fullname.xul b/mozilla/mailnews/base/prefs/resources/content/aw-fullname.xul
index dae7bed3162..10d9e0013ee 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-fullname.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-fullname.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!--
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-identity.xul b/mozilla/mailnews/base/prefs/resources/content/aw-identity.xul
index 52afc881660..748a6b41279 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-identity.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-identity.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
 
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-intro.xul b/mozilla/mailnews/base/prefs/resources/content/aw-intro.xul
index 7e048ad5b0f..643ddff15ba 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-intro.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-intro.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!--
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-login.xul b/mozilla/mailnews/base/prefs/resources/content/aw-login.xul
index bc2e513dffe..642f31f9ac2 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-login.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-login.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
 
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-mailtype.xul b/mozilla/mailnews/base/prefs/resources/content/aw-mailtype.xul
index 7b27ec970aa..bc34090f91c 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-mailtype.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-mailtype.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!--
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-server.xul b/mozilla/mailnews/base/prefs/resources/content/aw-server.xul
index 5afe3f45f47..594544373ed 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-server.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-server.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/wizard.css" type="text/css"?>
 
diff --git a/mozilla/mailnews/base/prefs/resources/content/aw-smtp.xul b/mozilla/mailnews/base/prefs/resources/content/aw-smtp.xul
index 9d921eaba9e..51246c03ae4 100644
--- a/mozilla/mailnews/base/prefs/resources/content/aw-smtp.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/aw-smtp.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!--
diff --git a/mozilla/mailnews/base/prefs/resources/content/custreceipt.xul b/mozilla/mailnews/base/prefs/resources/content/custreceipt.xul
index 24addfa000e..6265f6f4673 100644
--- a/mozilla/mailnews/base/prefs/resources/content/custreceipt.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/custreceipt.xul
@@ -1,6 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/custreceipt.dtd">
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-diskspace.xul b/mozilla/mailnews/base/prefs/resources/content/pref-diskspace.xul
index 7271345b0d0..798bbafb0bf 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-diskspace.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-diskspace.xul
@@ -1,6 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-diskspace.dtd">
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul b/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
index 0d22a3bdef1..4725b306766 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-mailnews.xul
@@ -1,6 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-mailnews.dtd">
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul b/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul
index 86bc637cce2..8aa56ee421e 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-receipts.xul
@@ -1,6 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 
 
diff --git a/mozilla/mailnews/base/prefs/resources/content/pref-winsetting.xul b/mozilla/mailnews/base/prefs/resources/content/pref-winsetting.xul
index 2f0e989c595..19d2664ccba 100644
--- a/mozilla/mailnews/base/prefs/resources/content/pref-winsetting.xul
+++ b/mozilla/mailnews/base/prefs/resources/content/pref-winsetting.xul
@@ -1,6 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/pref-winsetting.dtd">
diff --git a/mozilla/mailnews/base/resources/content/3panemail.xul b/mozilla/mailnews/base/resources/content/3panemail.xul
index b3b1e87dcd3..778af47a6c5 100644
--- a/mozilla/mailnews/base/resources/content/3panemail.xul
+++ b/mozilla/mailnews/base/resources/content/3panemail.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> 
 
 <!--
diff --git a/mozilla/mailnews/base/resources/content/contentframe.xul b/mozilla/mailnews/base/resources/content/contentframe.xul
index 674a8f176a2..fe51bb0d489 100644
--- a/mozilla/mailnews/base/resources/content/contentframe.xul
+++ b/mozilla/mailnews/base/resources/content/contentframe.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://navigator/skin/contentframe.css" type="text/css"?> 
 <!--
  The contents of this file are subject to the Netscape Public
diff --git a/mozilla/mailnews/base/resources/content/folderPane.xul b/mozilla/mailnews/base/resources/content/folderPane.xul
index ccb88fe7372..e01a70e5b94 100644
--- a/mozilla/mailnews/base/resources/content/folderPane.xul
+++ b/mozilla/mailnews/base/resources/content/folderPane.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <!--
  The contents of this file are subject to the Netscape Public
  License Version 1.1 (the "License"); you may not use this file
diff --git a/mozilla/mailnews/base/resources/content/messagePane.xul b/mozilla/mailnews/base/resources/content/messagePane.xul
index 177cd9252d8..8bda7cfbd14 100644
--- a/mozilla/mailnews/base/resources/content/messagePane.xul
+++ b/mozilla/mailnews/base/resources/content/messagePane.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!DOCTYPE window>
diff --git a/mozilla/mailnews/base/resources/content/messenger.xul b/mozilla/mailnews/base/resources/content/messenger.xul
index 43f33a3ef50..124721ef517 100644
--- a/mozilla/mailnews/base/resources/content/messenger.xul
+++ b/mozilla/mailnews/base/resources/content/messenger.xul
@@ -18,7 +18,6 @@ Communications Corporation. Portions created by Netscape are
 Copyright (C) 1998-1999 Netscape Communications Corporation. All
 Rights Reserved.
 -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://navigator/skin/contentframe.css" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/globalOverlay.xul"?>
diff --git a/mozilla/mailnews/base/resources/content/newFolderNameDialog.xul b/mozilla/mailnews/base/resources/content/newFolderNameDialog.xul
index 2ebd86e2369..df38b0ce547 100644
--- a/mozilla/mailnews/base/resources/content/newFolderNameDialog.xul
+++ b/mozilla/mailnews/base/resources/content/newFolderNameDialog.xul
@@ -18,7 +18,6 @@ Communications Corporation. Portions created by Netscape are
  Copyright (C) 1998-1999 Netscape Communications Corporation. All
 Rights Reserved.
 --> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/newFolderNameDialog.dtd">
diff --git a/mozilla/mailnews/base/resources/content/sidebar-messenger.xul b/mozilla/mailnews/base/resources/content/sidebar-messenger.xul
index a45c916a8f1..e273847584e 100644
--- a/mozilla/mailnews/base/resources/content/sidebar-messenger.xul
+++ b/mozilla/mailnews/base/resources/content/sidebar-messenger.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/" type="text/css"?>
 <!--
  The contents of this file are subject to the Netscape Public
diff --git a/mozilla/mailnews/base/resources/content/subscribeDialog.xul b/mozilla/mailnews/base/resources/content/subscribeDialog.xul
index 906bff1d759..c27ee8c9dbf 100644
--- a/mozilla/mailnews/base/resources/content/subscribeDialog.xul
+++ b/mozilla/mailnews/base/resources/content/subscribeDialog.xul
@@ -18,7 +18,6 @@ Communications Corporation. Portions created by Netscape are
  Copyright (C) 1998-1999 Netscape Communications Corporation. All
 Rights Reserved.
 --> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/subscribeDialog.dtd">
diff --git a/mozilla/mailnews/base/resources/content/threadPane.xul b/mozilla/mailnews/base/resources/content/threadPane.xul
index bf101f0c19c..5a6f83d38f2 100644
--- a/mozilla/mailnews/base/resources/content/threadPane.xul
+++ b/mozilla/mailnews/base/resources/content/threadPane.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/threadPane.css" type="text/css"?>
 <!--
diff --git a/mozilla/mailnews/base/search/resources/content/FilterEditor.xul b/mozilla/mailnews/base/search/resources/content/FilterEditor.xul
index 90cdb8d5d0c..4f5045155d6 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterEditor.xul
+++ b/mozilla/mailnews/base/search/resources/content/FilterEditor.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/FilterEditor.dtd" >
diff --git a/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul b/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
index 0800098b7ff..8479927b98f 100644
--- a/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
+++ b/mozilla/mailnews/base/search/resources/content/FilterListDialog.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/FilterListDialog.dtd" >
diff --git a/mozilla/mailnews/base/search/resources/content/SearchDialog.xul b/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
index 7ddc5284be9..483c6d7f403 100644
--- a/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
+++ b/mozilla/mailnews/base/search/resources/content/SearchDialog.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!--
diff --git a/mozilla/mailnews/base/search/resources/content/SearchOptions.xul b/mozilla/mailnews/base/search/resources/content/SearchOptions.xul
index 9d149b72fad..5ac8536a932 100644
--- a/mozilla/mailnews/base/search/resources/content/SearchOptions.xul
+++ b/mozilla/mailnews/base/search/resources/content/SearchOptions.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!--
diff --git a/mozilla/mailnews/base/tests/accountmanager/AccountManagerTest.xul b/mozilla/mailnews/base/tests/accountmanager/AccountManagerTest.xul
index 798dcddc100..01130d7468c 100644
--- a/mozilla/mailnews/base/tests/accountmanager/AccountManagerTest.xul
+++ b/mozilla/mailnews/base/tests/accountmanager/AccountManagerTest.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messenger/skin/" type="text/css"?>
 
 <!DOCTYPE window>
diff --git a/mozilla/mailnews/compose/prefs/resources/content/pref-formatting.xul b/mozilla/mailnews/compose/prefs/resources/content/pref-formatting.xul
index b88485d7ab6..d40859db4c3 100644
--- a/mozilla/mailnews/compose/prefs/resources/content/pref-formatting.xul
+++ b/mozilla/mailnews/compose/prefs/resources/content/pref-formatting.xul
@@ -1,6 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messengercompose/locale/pref-formatting.dtd">
diff --git a/mozilla/mailnews/compose/prefs/resources/content/pref-messages.xul b/mozilla/mailnews/compose/prefs/resources/content/pref-messages.xul
index 2d924ff2783..04cb3848a18 100644
--- a/mozilla/mailnews/compose/prefs/resources/content/pref-messages.xul
+++ b/mozilla/mailnews/compose/prefs/resources/content/pref-messages.xul
@@ -1,6 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://messengercompose/locale/pref-messages.dtd">
diff --git a/mozilla/mailnews/compose/resources/content/MsgAttachPage.xul b/mozilla/mailnews/compose/resources/content/MsgAttachPage.xul
index e4de86daab1..40083804679 100644
--- a/mozilla/mailnews/compose/resources/content/MsgAttachPage.xul
+++ b/mozilla/mailnews/compose/resources/content/MsgAttachPage.xul
@@ -1,6 +1,5 @@
 <?xml version="1.0"?>
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://messengercompose/skin/" type="text/css"?>  
 
diff --git a/mozilla/mailnews/compose/resources/content/addressingWidgetOverlay.xul b/mozilla/mailnews/compose/resources/content/addressingWidgetOverlay.xul
index 7d59887f867..549eacdcb23 100644
--- a/mozilla/mailnews/compose/resources/content/addressingWidgetOverlay.xul
+++ b/mozilla/mailnews/compose/resources/content/addressingWidgetOverlay.xul
@@ -18,7 +18,6 @@ Communications Corporation. Portions created by Netscape are
  Copyright (C) 1998-1999 Netscape Communications Corporation. All
 Rights Reserved.
 --> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://messengercompose/skin/" type="text/css"?> 
 
 <!DOCTYPE window SYSTEM "chrome://messengercompose/locale/addressingWidgetOverlay.dtd">
diff --git a/mozilla/mailnews/compose/resources/content/messengercompose.xul b/mozilla/mailnews/compose/resources/content/messengercompose.xul
index dfe00fe23fa..1115a6e36b0 100644
--- a/mozilla/mailnews/compose/resources/content/messengercompose.xul
+++ b/mozilla/mailnews/compose/resources/content/messengercompose.xul
@@ -4,7 +4,6 @@
 <?xul-overlay href="chrome://messengercompose/content/addressingWidgetOverlay.xul"?>
 <?xul-overlay href="chrome://editor/content/editorOverlay.xul"?>
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://editor/skin/" type="text/css"?>
 
 <?xml-stylesheet href="chrome://messengercompose/skin/" type="text/css"?> 
diff --git a/mozilla/mailnews/news/resources/content/news-test.xul b/mozilla/mailnews/news/resources/content/news-test.xul
index 22022ae7cb2..ff3ff5fb81c 100644
--- a/mozilla/mailnews/news/resources/content/news-test.xul
+++ b/mozilla/mailnews/news/resources/content/news-test.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <window title="news test"
         id="news-test-window" xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/profile/Acctidl/am.xul b/mozilla/profile/Acctidl/am.xul
index 436d85e75b9..5340847467b 100644
--- a/mozilla/profile/Acctidl/am.xul
+++ b/mozilla/profile/Acctidl/am.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 <?xml-stylesheet href="pm.css" type="text/css"?>
 
 <window 
diff --git a/mozilla/profile/Acctidl/am2.xul b/mozilla/profile/Acctidl/am2.xul
index 62880733c7d..7e6c932553c 100644
--- a/mozilla/profile/Acctidl/am2.xul
+++ b/mozilla/profile/Acctidl/am2.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 <?xml-stylesheet href="pm.css" type="text/css"?>
 
 <window 
diff --git a/mozilla/profile/Acctidl/am2a.xul b/mozilla/profile/Acctidl/am2a.xul
index 431a7dc8c61..e2468642f9b 100644
--- a/mozilla/profile/Acctidl/am2a.xul
+++ b/mozilla/profile/Acctidl/am2a.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 <?xml-stylesheet href="pm.css" type="text/css"?>
 
 <window 
diff --git a/mozilla/profile/pref-migrator/resources/content/profileMigrationProgress.xul b/mozilla/profile/pref-migrator/resources/content/profileMigrationProgress.xul
index b2642ec1215..50c0eb8af25 100644
--- a/mozilla/profile/pref-migrator/resources/content/profileMigrationProgress.xul
+++ b/mozilla/profile/pref-migrator/resources/content/profileMigrationProgress.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://profile/locale/profileMigrationProgress.dtd" >
 
diff --git a/mozilla/profile/resources/content/createProfileWizard.xul b/mozilla/profile/resources/content/createProfileWizard.xul
index 66cb22ce1ac..955cc73554b 100644
--- a/mozilla/profile/resources/content/createProfileWizard.xul
+++ b/mozilla/profile/resources/content/createProfileWizard.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 <?xml-stylesheet href="chrome://profile/skin/createProfileWizard.css" type="text/css"?>
 
 
diff --git a/mozilla/profile/resources/content/deleteProfile.xul b/mozilla/profile/resources/content/deleteProfile.xul
index ad2dc47f69e..dfc0c2f8d32 100644
--- a/mozilla/profile/resources/content/deleteProfile.xul
+++ b/mozilla/profile/resources/content/deleteProfile.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 <?xml-stylesheet href="chrome://profile/skin/profileManager.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://profile/locale/profileManagerDelete.dtd" >
diff --git a/mozilla/profile/resources/content/migrateAllProfile.xul b/mozilla/profile/resources/content/migrateAllProfile.xul
index f9147bca884..4c168d82c3f 100644
--- a/mozilla/profile/resources/content/migrateAllProfile.xul
+++ b/mozilla/profile/resources/content/migrateAllProfile.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 <?xml-stylesheet href="chrome://profile/skin/profileManager.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://profile/locale/profileManagerMigrateAll.dtd" >
diff --git a/mozilla/profile/resources/content/newProfile1_1.xul b/mozilla/profile/resources/content/newProfile1_1.xul
index a7f097b7115..101c684de97 100644
--- a/mozilla/profile/resources/content/newProfile1_1.xul
+++ b/mozilla/profile/resources/content/newProfile1_1.xul
@@ -18,7 +18,6 @@
 
 -->
 
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 <?xml-stylesheet href="chrome://profile/skin/profileManager.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://profile/locale/newProfile1_1.dtd" >
diff --git a/mozilla/profile/resources/content/newProfile1_2.xul b/mozilla/profile/resources/content/newProfile1_2.xul
index c0ba40a094f..a2281ba7e39 100644
--- a/mozilla/profile/resources/content/newProfile1_2.xul
+++ b/mozilla/profile/resources/content/newProfile1_2.xul
@@ -18,7 +18,6 @@
 
 -->
 
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 <?xml-stylesheet href="chrome://profile/skin/profileManager.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://profile/locale/newProfile1_2.dtd" >
diff --git a/mozilla/profile/resources/content/profileManager.xul b/mozilla/profile/resources/content/profileManager.xul
index aa6fde50e82..62bb33a6983 100644
--- a/mozilla/profile/resources/content/profileManager.xul
+++ b/mozilla/profile/resources/content/profileManager.xul
@@ -18,7 +18,6 @@
 
 -->
 
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 <?xml-stylesheet href="chrome://profile/skin/profileManager.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://profile/locale/profileManager.dtd" >
diff --git a/mozilla/profile/resources/content/renameProfile.xul b/mozilla/profile/resources/content/renameProfile.xul
index 2c989ac1254..80b5fcb9059 100644
--- a/mozilla/profile/resources/content/renameProfile.xul
+++ b/mozilla/profile/resources/content/renameProfile.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 <?xml-stylesheet href="chrome://profile/skin/profileManager.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://profile/locale/profileManagerRename.dtd" >
diff --git a/mozilla/rdf/chrome/build/registry.rdf b/mozilla/rdf/chrome/build/registry.rdf
index 9404bfb1f8f..7fd3fd66f0a 100644
--- a/mozilla/rdf/chrome/build/registry.rdf
+++ b/mozilla/rdf/chrome/build/registry.rdf
@@ -8,7 +8,7 @@
     <skin> 
       <RDF:Description about="chrome://global/skin/">
 	    <base>resource:/chrome/global/skin/default/</base>
-        <main>xul.css</main> 
+        <main>skin.css</main> 
       </RDF:Description> 
     </skin> 
 	
diff --git a/mozilla/rdf/resources/dom-test-1.xul b/mozilla/rdf/resources/dom-test-1.xul
index 1712ce222ea..4d8c5a2ed1c 100644
--- a/mozilla/rdf/resources/dom-test-1.xul
+++ b/mozilla/rdf/resources/dom-test-1.xul
@@ -24,7 +24,6 @@
 
 -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <window
   xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/rdf/resources/dom-test-8.xul b/mozilla/rdf/resources/dom-test-8.xul
index 887584e2954..da2b570ea8a 100644
--- a/mozilla/rdf/resources/dom-test-8.xul
+++ b/mozilla/rdf/resources/dom-test-8.xul
@@ -25,7 +25,6 @@
 
 -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <window
   xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/rdf/tests/domds/resources/DOMDataSourceViewer.xul b/mozilla/rdf/tests/domds/resources/DOMDataSourceViewer.xul
index ba19d7d02a9..dd098b15106 100644
--- a/mozilla/rdf/tests/domds/resources/DOMDataSourceViewer.xul
+++ b/mozilla/rdf/tests/domds/resources/DOMDataSourceViewer.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="DOMDataSourceViewer.css" type="text/css"?>
 
 <window
diff --git a/mozilla/rdf/tests/domds/resources/DOMTree.xul b/mozilla/rdf/tests/domds/resources/DOMTree.xul
index 3e57a74da18..7528dc300e9 100644
--- a/mozilla/rdf/tests/domds/resources/DOMTree.xul
+++ b/mozilla/rdf/tests/domds/resources/DOMTree.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="DOMDataSourceViewer.css" type="text/css"?>
 
 <!DOCTYPE window>
diff --git a/mozilla/rdf/tests/dsds/DataSourceViewer.xul b/mozilla/rdf/tests/dsds/DataSourceViewer.xul
index fdc02ab3776..9f9f9794195 100644
--- a/mozilla/rdf/tests/dsds/DataSourceViewer.xul
+++ b/mozilla/rdf/tests/dsds/DataSourceViewer.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="DataSourceViewer.css" type="text/css"?>
 
 <window
diff --git a/mozilla/suite/browser/hiddenWindow.xul b/mozilla/suite/browser/hiddenWindow.xul
index d9e08195e23..7c7c2335d10 100644
--- a/mozilla/suite/browser/hiddenWindow.xul
+++ b/mozilla/suite/browser/hiddenWindow.xul
@@ -20,7 +20,6 @@ Rights Reserved.
 
 Contributor(s): ______________________________________. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
 
diff --git a/mozilla/suite/browser/navigator.xul b/mozilla/suite/browser/navigator.xul
index 1e881839ec8..044419863e6 100644
--- a/mozilla/suite/browser/navigator.xul
+++ b/mozilla/suite/browser/navigator.xul
@@ -21,7 +21,6 @@ Rights Reserved.
 Contributor(s): ______________________________________. -->
 
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://bookmarks/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
diff --git a/mozilla/suite/browser/viewSource.xul b/mozilla/suite/browser/viewSource.xul
index 55d5e740486..01d01761372 100644
--- a/mozilla/suite/browser/viewSource.xul
+++ b/mozilla/suite/browser/viewSource.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
 
 <!DOCTYPE window SYSTEM "chrome://navigator/locale/viewSource.dtd" >
diff --git a/mozilla/suite/common/bookmarks/bm-panel.xul b/mozilla/suite/common/bookmarks/bm-panel.xul
index 1b89e1bad41..dfe9b434abd 100644
--- a/mozilla/suite/common/bookmarks/bm-panel.xul
+++ b/mozilla/suite/common/bookmarks/bm-panel.xul
@@ -18,7 +18,6 @@
 
 -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <!-- <?xml-stylesheet href="chrome://sidebar/skin/" type="text/css"?> -->
 <?xml-stylesheet href="chrome://bookmarks/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://bookmarks/skin/bm-panel.css" type="text/css"?>
diff --git a/mozilla/suite/common/bookmarks/bm-props.xul b/mozilla/suite/common/bookmarks/bm-props.xul
index a2bfe913c2b..027183e8ce9 100644
--- a/mozilla/suite/common/bookmarks/bm-props.xul
+++ b/mozilla/suite/common/bookmarks/bm-props.xul
@@ -18,7 +18,6 @@
 
 -->
 
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://bookmarks/locale/bm-props.dtd" >
 <xul:window
diff --git a/mozilla/suite/common/directory/directory.xul b/mozilla/suite/common/directory/directory.xul
index abfacd4816d..a548a629325 100644
--- a/mozilla/suite/common/directory/directory.xul
+++ b/mozilla/suite/common/directory/directory.xul
@@ -18,7 +18,6 @@
 
 -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://directory/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://directory/locale/directory.dtd">
diff --git a/mozilla/suite/common/history/history.xul b/mozilla/suite/common/history/history.xul
index 734487c8d29..3e4b0db874b 100644
--- a/mozilla/suite/common/history/history.xul
+++ b/mozilla/suite/common/history/history.xul
@@ -18,7 +18,6 @@
 
 -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://history/skin/history.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://history/locale/history.dtd" >
diff --git a/mozilla/suite/common/pref/pref-advanced.xul b/mozilla/suite/common/pref/pref-advanced.xul
index 4ff5af2944e..c823fdc73d5 100644
--- a/mozilla/suite/common/pref/pref-advanced.xul
+++ b/mozilla/suite/common/pref/pref-advanced.xul
@@ -20,7 +20,6 @@
    Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-advanced.dtd" >
 
diff --git a/mozilla/suite/common/pref/pref-appearance.xul b/mozilla/suite/common/pref/pref-appearance.xul
index 17960ca8b34..82780731b15 100644
--- a/mozilla/suite/common/pref/pref-appearance.xul
+++ b/mozilla/suite/common/pref/pref-appearance.xul
@@ -22,7 +22,6 @@
    Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-appearance.dtd" >
 <window  xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/suite/common/pref/pref-applications.xul b/mozilla/suite/common/pref/pref-applications.xul
index de257dcf5ef..1bb6ba286b4 100644
--- a/mozilla/suite/common/pref/pref-applications.xul
+++ b/mozilla/suite/common/pref/pref-applications.xul
@@ -21,7 +21,6 @@
    Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-applications.dtd" >
 
 <xul:window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/suite/common/pref/pref-cache.xul b/mozilla/suite/common/pref/pref-cache.xul
index ce6907b379d..de55ae8175a 100644
--- a/mozilla/suite/common/pref/pref-cache.xul
+++ b/mozilla/suite/common/pref/pref-cache.xul
@@ -20,7 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-cache.dtd" >
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/suite/common/pref/pref-colors.xul b/mozilla/suite/common/pref/pref-colors.xul
index 7084f420eee..2b4e361a1c2 100644
--- a/mozilla/suite/common/pref/pref-colors.xul
+++ b/mozilla/suite/common/pref/pref-colors.xul
@@ -20,7 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-colors.dtd" >
 <xul:window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/suite/common/pref/pref-debug.xul b/mozilla/suite/common/pref/pref-debug.xul
index 4484626db8a..4cf5b4b0eaf 100644
--- a/mozilla/suite/common/pref/pref-debug.xul
+++ b/mozilla/suite/common/pref/pref-debug.xul
@@ -20,7 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-debug.dtd" >
 
diff --git a/mozilla/suite/common/pref/pref-download.xul b/mozilla/suite/common/pref/pref-download.xul
index 26e361b4712..4fa1759bd99 100644
--- a/mozilla/suite/common/pref/pref-download.xul
+++ b/mozilla/suite/common/pref/pref-download.xul
@@ -20,8 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-download.dtd" >
 
diff --git a/mozilla/suite/common/pref/pref-fonts.xul b/mozilla/suite/common/pref/pref-fonts.xul
index e77b590272d..8b2be5a1491 100644
--- a/mozilla/suite/common/pref/pref-fonts.xul
+++ b/mozilla/suite/common/pref/pref-fonts.xul
@@ -20,8 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-fonts.dtd" >
diff --git a/mozilla/suite/common/pref/pref-languages.xul b/mozilla/suite/common/pref/pref-languages.xul
index 16cb6d56653..56d58787321 100644
--- a/mozilla/suite/common/pref/pref-languages.xul
+++ b/mozilla/suite/common/pref/pref-languages.xul
@@ -20,8 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-languages.dtd" >
diff --git a/mozilla/suite/common/pref/pref-navigator.xul b/mozilla/suite/common/pref/pref-navigator.xul
index e2e9406ff82..7d6aa74f35c 100644
--- a/mozilla/suite/common/pref/pref-navigator.xul
+++ b/mozilla/suite/common/pref/pref-navigator.xul
@@ -20,7 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-navigator.dtd" >
 
diff --git a/mozilla/suite/common/pref/pref-offline.xul b/mozilla/suite/common/pref/pref-offline.xul
index 1b46abf424f..c8f32e946cd 100644
--- a/mozilla/suite/common/pref/pref-offline.xul
+++ b/mozilla/suite/common/pref/pref-offline.xul
@@ -22,8 +22,6 @@
    Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-offline.dtd" >
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/suite/common/pref/pref-proxies.xul b/mozilla/suite/common/pref/pref-proxies.xul
index dca7ef35aea..07a6540cfa4 100644
--- a/mozilla/suite/common/pref/pref-proxies.xul
+++ b/mozilla/suite/common/pref/pref-proxies.xul
@@ -20,7 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-proxies.dtd" >
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/suite/common/pref/pref-smart_browsing.xul b/mozilla/suite/common/pref/pref-smart_browsing.xul
index 86a5f6626fa..025718541af 100644
--- a/mozilla/suite/common/pref/pref-smart_browsing.xul
+++ b/mozilla/suite/common/pref/pref-smart_browsing.xul
@@ -20,7 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-smart_browsing.dtd" >
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/suite/common/pref/pref-smartupdate.xul b/mozilla/suite/common/pref/pref-smartupdate.xul
index 3a67a5b25d6..ea770e5dff1 100644
--- a/mozilla/suite/common/pref/pref-smartupdate.xul
+++ b/mozilla/suite/common/pref/pref-smartupdate.xul
@@ -1,6 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?> 
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-smartupdate.dtd" >
diff --git a/mozilla/suite/common/pref/preftree.xul b/mozilla/suite/common/pref/preftree.xul
index 2236407af18..92e75de97e6 100644
--- a/mozilla/suite/common/pref/preftree.xul
+++ b/mozilla/suite/common/pref/preftree.xul
@@ -22,7 +22,6 @@
    Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/preftree.dtd" >
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/suite/common/related/related-panel.xul b/mozilla/suite/common/related/related-panel.xul
index 9b464afd555..8fa3282301d 100644
--- a/mozilla/suite/common/related/related-panel.xul
+++ b/mozilla/suite/common/related/related-panel.xul
@@ -18,7 +18,6 @@
 
 -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://related/skin/related-panel.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://related/locale/related-panel.dtd" >
diff --git a/mozilla/suite/common/search/internetresults.xul b/mozilla/suite/common/search/internetresults.xul
index 01e4574a0e9..d176c65c66d 100644
--- a/mozilla/suite/common/search/internetresults.xul
+++ b/mozilla/suite/common/search/internetresults.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 <?xml-stylesheet href="internetresults.css" type="text/css"?>
 <?xml-stylesheet href="icons.css" type="text/css"?>
 
diff --git a/mozilla/suite/common/sidebar/customize-panel.xul b/mozilla/suite/common/sidebar/customize-panel.xul
index 040f02309b6..de064372ae2 100644
--- a/mozilla/suite/common/sidebar/customize-panel.xul
+++ b/mozilla/suite/common/sidebar/customize-panel.xul
@@ -17,7 +17,6 @@
   Reserved.
 
 -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/customize.css" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/customize-panel.css"
diff --git a/mozilla/suite/common/sidebar/customize.xul b/mozilla/suite/common/sidebar/customize.xul
index 71ec69c6e1f..bf2583b5cfd 100644
--- a/mozilla/suite/common/sidebar/customize.xul
+++ b/mozilla/suite/common/sidebar/customize.xul
@@ -17,7 +17,6 @@
   Reserved.
 
 -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/customize.css" type="text/css"?>
 
diff --git a/mozilla/suite/common/sidebar/preview.xul b/mozilla/suite/common/sidebar/preview.xul
index ba04ec798f7..382a5973ff4 100644
--- a/mozilla/suite/common/sidebar/preview.xul
+++ b/mozilla/suite/common/sidebar/preview.xul
@@ -17,7 +17,6 @@
   Reserved.
 
 -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/customize.css" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/preview.css" type="text/css"?>
diff --git a/mozilla/suite/debugQA/content/debugQATextEditorShell.xul b/mozilla/suite/debugQA/content/debugQATextEditorShell.xul
index c1212f52bf8..a7278e78647 100644
--- a/mozilla/suite/debugQA/content/debugQATextEditorShell.xul
+++ b/mozilla/suite/debugQA/content/debugQATextEditorShell.xul
@@ -22,7 +22,6 @@
    - Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://editor/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
diff --git a/mozilla/suite/debugQA/content/pref-debug.xul b/mozilla/suite/debugQA/content/pref-debug.xul
index 4484626db8a..4cf5b4b0eaf 100644
--- a/mozilla/suite/debugQA/content/pref-debug.xul
+++ b/mozilla/suite/debugQA/content/pref-debug.xul
@@ -20,7 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-debug.dtd" >
 
diff --git a/mozilla/webshell/tests/viewer/samples/checkboxTest.xul b/mozilla/webshell/tests/viewer/samples/checkboxTest.xul
index 50cedef86dd..d4e9120177a 100644
--- a/mozilla/webshell/tests/viewer/samples/checkboxTest.xul
+++ b/mozilla/webshell/tests/viewer/samples/checkboxTest.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://bookmarks/skin/" type="text/css"?> 
 
diff --git a/mozilla/webshell/tests/viewer/samples/toolbarTest1.xul b/mozilla/webshell/tests/viewer/samples/toolbarTest1.xul
index 68132dc27e7..d0cbc1d0087 100644
--- a/mozilla/webshell/tests/viewer/samples/toolbarTest1.xul
+++ b/mozilla/webshell/tests/viewer/samples/toolbarTest1.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
 
 <!DOCTYPE window> 
diff --git a/mozilla/xpfe/browser/resources/content/NetSupportConfirmCheckYN.xul b/mozilla/xpfe/browser/resources/content/NetSupportConfirmCheckYN.xul
index 6134fabd14b..11bd31cf395 100644
--- a/mozilla/xpfe/browser/resources/content/NetSupportConfirmCheckYN.xul
+++ b/mozilla/xpfe/browser/resources/content/NetSupportConfirmCheckYN.xul
@@ -20,7 +20,6 @@ Copyright (C) 1998-1999 Netscape Communications Corporation. All
 Rights Reserved.
 
 Contributor(s): ______________________________________. -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 
 
 <!DOCTYPE window SYSTEM "chrome://navigator/locale/NetSupportConfirmCheckYN.dtd" >
diff --git a/mozilla/xpfe/browser/resources/content/NetSupportConfirmYN.xul b/mozilla/xpfe/browser/resources/content/NetSupportConfirmYN.xul
index 7d32c6af547..ed1f80584ab 100644
--- a/mozilla/xpfe/browser/resources/content/NetSupportConfirmYN.xul
+++ b/mozilla/xpfe/browser/resources/content/NetSupportConfirmYN.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns:xul ="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
diff --git a/mozilla/xpfe/browser/resources/content/contentframe.xul b/mozilla/xpfe/browser/resources/content/contentframe.xul
index bf4e82634a7..49b3bab59fa 100644
--- a/mozilla/xpfe/browser/resources/content/contentframe.xul
+++ b/mozilla/xpfe/browser/resources/content/contentframe.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://navigator/skin/contentframe.css" type="text/css"?> 
 
 <!DOCTYPE window> 
diff --git a/mozilla/xpfe/browser/resources/content/navigator.xul b/mozilla/xpfe/browser/resources/content/navigator.xul
index 1e881839ec8..044419863e6 100644
--- a/mozilla/xpfe/browser/resources/content/navigator.xul
+++ b/mozilla/xpfe/browser/resources/content/navigator.xul
@@ -21,7 +21,6 @@ Rights Reserved.
 Contributor(s): ______________________________________. -->
 
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://bookmarks/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
diff --git a/mozilla/xpfe/browser/resources/content/openLocation.xul b/mozilla/xpfe/browser/resources/content/openLocation.xul
index 97a0e07ca57..1851c3b8e82 100644
--- a/mozilla/xpfe/browser/resources/content/openLocation.xul
+++ b/mozilla/xpfe/browser/resources/content/openLocation.xul
@@ -20,8 +20,7 @@ Rights Reserved.
 
 Contributor(s): ______________________________________. -->
 
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
- <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
+<?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!DOCTYPE window SYSTEM "chrome://navigator/locale/openLocation.dtd" >
             
diff --git a/mozilla/xpfe/browser/resources/content/unknownContent.xul b/mozilla/xpfe/browser/resources/content/unknownContent.xul
index 9e813984fe2..6fb452d08b8 100644
--- a/mozilla/xpfe/browser/resources/content/unknownContent.xul
+++ b/mozilla/xpfe/browser/resources/content/unknownContent.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/xpfe/browser/resources/content/viewSource.xul b/mozilla/xpfe/browser/resources/content/viewSource.xul
index 55d5e740486..01d01761372 100644
--- a/mozilla/xpfe/browser/resources/content/viewSource.xul
+++ b/mozilla/xpfe/browser/resources/content/viewSource.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
 
 <!DOCTYPE window SYSTEM "chrome://navigator/locale/viewSource.dtd" >
diff --git a/mozilla/xpfe/browser/samples/collapsing.xul b/mozilla/xpfe/browser/samples/collapsing.xul
index c0835eb67c8..d76ded26f60 100644
--- a/mozilla/xpfe/browser/samples/collapsing.xul
+++ b/mozilla/xpfe/browser/samples/collapsing.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="collapsing.css" type="text/css"?> 
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/xpfe/browser/samples/colorpicker.xul b/mozilla/xpfe/browser/samples/colorpicker.xul
index f47afcc36a3..4881dc3b30b 100644
--- a/mozilla/xpfe/browser/samples/colorpicker.xul
+++ b/mozilla/xpfe/browser/samples/colorpicker.xul
@@ -20,7 +20,6 @@
 -->
 
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <window title="Color Picker"
   xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/xpfe/browser/samples/dexanimdialog.xul b/mozilla/xpfe/browser/samples/dexanimdialog.xul
index a114c62e5b5..f76b6c02da5 100644
--- a/mozilla/xpfe/browser/samples/dexanimdialog.xul
+++ b/mozilla/xpfe/browser/samples/dexanimdialog.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <!DOCTYPE window>
 <!-- DO NOT LOCALIZE: this file is source documentation; not part of the build -->
 <!-- dialog containing a control requiring initial setup, including some
diff --git a/mozilla/xpfe/browser/samples/dexanimmaster.xul b/mozilla/xpfe/browser/samples/dexanimmaster.xul
index e891dbcbf63..c7580140595 100644
--- a/mozilla/xpfe/browser/samples/dexanimmaster.xul
+++ b/mozilla/xpfe/browser/samples/dexanimmaster.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <!DOCTYPE window>
 <!-- DO NOT LOCALIZE: this file is source documentation; not part of the build -->
 <!-- sample interface for bringing up a nonmodal dialog, including some
diff --git a/mozilla/xpfe/browser/samples/dexopenchrome.xul b/mozilla/xpfe/browser/samples/dexopenchrome.xul
index b519d3c192d..e147708ab8d 100644
--- a/mozilla/xpfe/browser/samples/dexopenchrome.xul
+++ b/mozilla/xpfe/browser/samples/dexopenchrome.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <!DOCTYPE window>
 <!-- DO NOT LOCALIZE: this file is source documentation; not part of the build -->
 <!-- Sample interface for bringing up and passing parameters to a dialog -->
diff --git a/mozilla/xpfe/browser/samples/dexparamdialog.xul b/mozilla/xpfe/browser/samples/dexparamdialog.xul
index 4ab1437a2ef..e2ac5aa4ac8 100644
--- a/mozilla/xpfe/browser/samples/dexparamdialog.xul
+++ b/mozilla/xpfe/browser/samples/dexparamdialog.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <!DOCTYPE window>
 <!-- DO NOT LOCALIZE: this file is source documentation; not part of the build -->
 <!-- dialog containing a control requiring initial setup, expecting
diff --git a/mozilla/xpfe/browser/samples/dexparammaster.xul b/mozilla/xpfe/browser/samples/dexparammaster.xul
index de34c89dcc8..63632dc4b35 100644
--- a/mozilla/xpfe/browser/samples/dexparammaster.xul
+++ b/mozilla/xpfe/browser/samples/dexparammaster.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <!DOCTYPE window>
 <!-- DO NOT LOCALIZE: this file is source documentation; not part of the build -->
 <!-- Sample interface for bringing up and passing parameters to a dialog -->
diff --git a/mozilla/xpfe/browser/samples/dexsimpledialog.xul b/mozilla/xpfe/browser/samples/dexsimpledialog.xul
index 3ee6c6c3c80..24dfc89e19a 100644
--- a/mozilla/xpfe/browser/samples/dexsimpledialog.xul
+++ b/mozilla/xpfe/browser/samples/dexsimpledialog.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <!DOCTYPE window>
 <!-- DO NOT LOCALIZE: this file is source documentation; not part of the build -->
 <!-- dialog containing a control requiring initial setup -->
diff --git a/mozilla/xpfe/browser/samples/dexsimplemaster.xul b/mozilla/xpfe/browser/samples/dexsimplemaster.xul
index 02e468b01d2..388625df6f3 100644
--- a/mozilla/xpfe/browser/samples/dexsimplemaster.xul
+++ b/mozilla/xpfe/browser/samples/dexsimplemaster.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <!DOCTYPE window>
 <!-- DO NOT LOCALIZE: this file is source documentation; not part of the build -->
 <!-- Simple sample interface for bringing up a dialog -->
diff --git a/mozilla/xpfe/browser/samples/hidetoolicon.xul b/mozilla/xpfe/browser/samples/hidetoolicon.xul
index 0a12f24eaf0..2f7b543aa74 100644
--- a/mozilla/xpfe/browser/samples/hidetoolicon.xul
+++ b/mozilla/xpfe/browser/samples/hidetoolicon.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="hidetoolicon.css" type="text/css"?> 
 
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/xpfe/browser/samples/tab.xul b/mozilla/xpfe/browser/samples/tab.xul
index 3fafa44c49d..0320335bc3b 100644
--- a/mozilla/xpfe/browser/samples/tab.xul
+++ b/mozilla/xpfe/browser/samples/tab.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 
 <!DOCTYPE window> 
 
diff --git a/mozilla/xpfe/browser/samples/xpmenu.xul b/mozilla/xpfe/browser/samples/xpmenu.xul
index 051d48c72d5..44d7590a838 100644
--- a/mozilla/xpfe/browser/samples/xpmenu.xul
+++ b/mozilla/xpfe/browser/samples/xpmenu.xul
@@ -21,7 +21,6 @@ Rights Reserved.
 Contributor(s): ______________________________________. -->
 
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 
 <window id="main-window" xmlns:html="http://www.w3.org/TR/REC-html40"
 	    xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
diff --git a/mozilla/xpfe/browser/src/downloadProgress.xul b/mozilla/xpfe/browser/src/downloadProgress.xul
index 08c43b54bda..5e8d7700a7d 100644
--- a/mozilla/xpfe/browser/src/downloadProgress.xul
+++ b/mozilla/xpfe/browser/src/downloadProgress.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://navigator/skin/downloadProgress.css" type="text/css"?> 
 
 <!DOCTYPE window> 
diff --git a/mozilla/xpfe/browser/src/navigator-test1.xul b/mozilla/xpfe/browser/src/navigator-test1.xul
index 3fdf0a224c0..ef8ac5bd436 100644
--- a/mozilla/xpfe/browser/src/navigator-test1.xul
+++ b/mozilla/xpfe/browser/src/navigator-test1.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://navigator/skin/" type="text/css"?> 
 
 <!DOCTYPE window> 
diff --git a/mozilla/xpfe/browser/src/skindemo.xul b/mozilla/xpfe/browser/src/skindemo.xul
index 040e232fea8..41b93041bf5 100644
--- a/mozilla/xpfe/browser/src/skindemo.xul
+++ b/mozilla/xpfe/browser/src/skindemo.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 
 
 <!DOCTYPE window> 
diff --git a/mozilla/xpfe/browser/src/status.xul b/mozilla/xpfe/browser/src/status.xul
index 9da14579784..ef92c3e9e79 100644
--- a/mozilla/xpfe/browser/src/status.xul
+++ b/mozilla/xpfe/browser/src/status.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 
 <!-- <!DOCTYPE window> -->
 
diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul b/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
index 1b89e1bad41..dfe9b434abd 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bm-panel.xul
@@ -18,7 +18,6 @@
 
 -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <!-- <?xml-stylesheet href="chrome://sidebar/skin/" type="text/css"?> -->
 <?xml-stylesheet href="chrome://bookmarks/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://bookmarks/skin/bm-panel.css" type="text/css"?>
diff --git a/mozilla/xpfe/components/bookmarks/resources/bm-props.xul b/mozilla/xpfe/components/bookmarks/resources/bm-props.xul
index a2bfe913c2b..027183e8ce9 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bm-props.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bm-props.xul
@@ -18,7 +18,6 @@
 
 -->
 
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://bookmarks/locale/bm-props.dtd" >
 <xul:window
diff --git a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
index 9fab80f50e3..7c7e30558da 100644
--- a/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
+++ b/mozilla/xpfe/components/bookmarks/resources/bookmarks.xul
@@ -18,7 +18,6 @@
 
 -->
 
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 <?xml-stylesheet href="chrome://bookmarks/skin/manage-bookmarks.css" type="text/css"?>
 <?xml-stylesheet href="chrome://bookmarks/skin/" type="text/css"?>
 
diff --git a/mozilla/xpfe/components/directory/directory.xul b/mozilla/xpfe/components/directory/directory.xul
index abfacd4816d..a548a629325 100644
--- a/mozilla/xpfe/components/directory/directory.xul
+++ b/mozilla/xpfe/components/directory/directory.xul
@@ -18,7 +18,6 @@
 
 -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://directory/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://directory/locale/directory.dtd">
diff --git a/mozilla/xpfe/components/find/resources/finddialog.xul b/mozilla/xpfe/components/find/resources/finddialog.xul
index 876a2c0ebab..bd4969effdd 100644
--- a/mozilla/xpfe/components/find/resources/finddialog.xul
+++ b/mozilla/xpfe/components/find/resources/finddialog.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?> 
 
 <!DOCTYPE window SYSTEM "chrome://global/locale/finddialog.dtd">
 <xul:window xmlns="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/xpfe/components/history/resources/history.xul b/mozilla/xpfe/components/history/resources/history.xul
index 734487c8d29..3e4b0db874b 100644
--- a/mozilla/xpfe/components/history/resources/history.xul
+++ b/mozilla/xpfe/components/history/resources/history.xul
@@ -18,7 +18,6 @@
 
 -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://history/skin/history.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://history/locale/history.dtd" >
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/PrefsWindow.xul b/mozilla/xpfe/components/prefwindow/resources/content/PrefsWindow.xul
index ba33eb08abb..c50492aeefa 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/PrefsWindow.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/PrefsWindow.xul
@@ -20,8 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
index 4ff5af2944e..c823fdc73d5 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-advanced.xul
@@ -20,7 +20,6 @@
    Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-advanced.dtd" >
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul
index 17960ca8b34..82780731b15 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-appearance.xul
@@ -22,7 +22,6 @@
    Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-appearance.dtd" >
 <window  xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
index de257dcf5ef..1bb6ba286b4 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-applications.xul
@@ -21,7 +21,6 @@
    Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-applications.dtd" >
 
 <xul:window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
index ce6907b379d..de55ae8175a 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-cache.xul
@@ -20,7 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-cache.dtd" >
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul
index 7084f420eee..2b4e361a1c2 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-colors.xul
@@ -20,7 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-colors.dtd" >
 <xul:window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-composer.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-composer.xul
index 784e29f8c4e..565c0077616 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-composer.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-composer.xul
@@ -20,8 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-composer.dtd" >
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul
index 4484626db8a..4cf5b4b0eaf 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-debug.xul
@@ -20,7 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-debug.dtd" >
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul
index 26e361b4712..4fa1759bd99 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-download.xul
@@ -20,8 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-download.dtd" >
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul
index e77b590272d..8b2be5a1491 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-fonts.xul
@@ -20,8 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-fonts.dtd" >
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul
index 16cb6d56653..56d58787321 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-languages.xul
@@ -20,8 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-languages.dtd" >
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
index e2e9406ff82..7d6aa74f35c 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-navigator.xul
@@ -20,7 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-navigator.dtd" >
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-offline.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-offline.xul
index 1b46abf424f..c8f32e946cd 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-offline.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-offline.xul
@@ -22,8 +22,6 @@
    Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-offline.dtd" >
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul
index dca7ef35aea..07a6540cfa4 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-proxies.xul
@@ -20,7 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-proxies.dtd" >
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-proxy-manual.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-proxy-manual.xul
index 863c33739c2..2a3677fc24a 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-proxy-manual.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-proxy-manual.xul
@@ -20,8 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-publish.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-publish.xul
index 7a270b747e4..9f65774527b 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-publish.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-publish.xul
@@ -20,8 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-publish.dtd" >
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 86a5f6626fa..025718541af 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-smart_browsing.xul
@@ -20,7 +20,6 @@
    
    Contributor(s): 
   -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-smart_browsing.dtd" >
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul b/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
index 3a67a5b25d6..ea770e5dff1 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/pref-smartupdate.xul
@@ -1,6 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/dialogs.css" type="text/css"?>
 <?xml-stylesheet href="chrome://pref/skin/pref.css" type="text/css"?> 
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/pref-smartupdate.dtd" >
diff --git a/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul b/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul
index 2236407af18..92e75de97e6 100644
--- a/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul
+++ b/mozilla/xpfe/components/prefwindow/resources/content/preftree.xul
@@ -22,7 +22,6 @@
    Contributor(s): 
   -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://pref/locale/preftree.dtd" >
 <window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/xpfe/components/regviewer/regviewer.xul b/mozilla/xpfe/components/regviewer/regviewer.xul
index 61be355306e..26d98544e3d 100644
--- a/mozilla/xpfe/components/regviewer/regviewer.xul
+++ b/mozilla/xpfe/components/regviewer/regviewer.xul
@@ -18,7 +18,6 @@
 
 -->
 
-<?xml-stylesheet type="text/css" href="chrome://global/skin/"?>
 <?xml-stylesheet type="text/css" href="chrome://regviewer/skin/" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://regviewer/locale/regviewer.dtd">
diff --git a/mozilla/xpfe/components/related/resources/related-panel.xul b/mozilla/xpfe/components/related/resources/related-panel.xul
index 9b464afd555..8fa3282301d 100644
--- a/mozilla/xpfe/components/related/resources/related-panel.xul
+++ b/mozilla/xpfe/components/related/resources/related-panel.xul
@@ -18,7 +18,6 @@
 
 -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://related/skin/related-panel.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://related/locale/related-panel.dtd" >
diff --git a/mozilla/xpfe/components/search/resources/find.xul b/mozilla/xpfe/components/search/resources/find.xul
index 6241f62c567..d70bcb65387 100644
--- a/mozilla/xpfe/components/search/resources/find.xul
+++ b/mozilla/xpfe/components/search/resources/find.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 
 
 <!DOCTYPE window
diff --git a/mozilla/xpfe/components/search/resources/findresults.xul b/mozilla/xpfe/components/search/resources/findresults.xul
index 0aa8c7a1acf..c07c13cad57 100644
--- a/mozilla/xpfe/components/search/resources/findresults.xul
+++ b/mozilla/xpfe/components/search/resources/findresults.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 <?xml-stylesheet href="findresults.css" type="text/css"?>
 
 
diff --git a/mozilla/xpfe/components/search/resources/internet.xul b/mozilla/xpfe/components/search/resources/internet.xul
index 608fb1cb3df..e871692eee5 100644
--- a/mozilla/xpfe/components/search/resources/internet.xul
+++ b/mozilla/xpfe/components/search/resources/internet.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 <?xml-stylesheet href="internet.css" type="text/css"?>
 <?xml-stylesheet href="icons.css" type="text/css"?>
 
diff --git a/mozilla/xpfe/components/search/resources/internetresults.xul b/mozilla/xpfe/components/search/resources/internetresults.xul
index 01e4574a0e9..d176c65c66d 100644
--- a/mozilla/xpfe/components/search/resources/internetresults.xul
+++ b/mozilla/xpfe/components/search/resources/internetresults.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 <?xml-stylesheet href="internetresults.css" type="text/css"?>
 <?xml-stylesheet href="icons.css" type="text/css"?>
 
diff --git a/mozilla/xpfe/components/search/resources/search.xul b/mozilla/xpfe/components/search/resources/search.xul
index a3343de2196..30e84aceb33 100644
--- a/mozilla/xpfe/components/search/resources/search.xul
+++ b/mozilla/xpfe/components/search/resources/search.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?>
 <?xml-stylesheet href="search.css" type="text/css"?>
 
 
diff --git a/mozilla/xpfe/components/sidebar/resources/customize-panel.xul b/mozilla/xpfe/components/sidebar/resources/customize-panel.xul
index 040f02309b6..de064372ae2 100644
--- a/mozilla/xpfe/components/sidebar/resources/customize-panel.xul
+++ b/mozilla/xpfe/components/sidebar/resources/customize-panel.xul
@@ -17,7 +17,6 @@
   Reserved.
 
 -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/customize.css" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/customize-panel.css"
diff --git a/mozilla/xpfe/components/sidebar/resources/customize.xul b/mozilla/xpfe/components/sidebar/resources/customize.xul
index 71ec69c6e1f..bf2583b5cfd 100644
--- a/mozilla/xpfe/components/sidebar/resources/customize.xul
+++ b/mozilla/xpfe/components/sidebar/resources/customize.xul
@@ -17,7 +17,6 @@
   Reserved.
 
 -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/customize.css" type="text/css"?>
 
diff --git a/mozilla/xpfe/components/sidebar/resources/flash.xul b/mozilla/xpfe/components/sidebar/resources/flash.xul
index 53ce838b7da..f8501c4c925 100644
--- a/mozilla/xpfe/components/sidebar/resources/flash.xul
+++ b/mozilla/xpfe/components/sidebar/resources/flash.xul
@@ -18,7 +18,6 @@
 
 -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/flash.css" type="text/css"?>
 
 <!DOCTYPE window SYSTEM "chrome://sidebar/locale/flash.dtd" >
@@ -38,7 +37,7 @@
         rdf:containment="http://home.netscape.com/NC-rdf#child" 
         onclick="OpenURL(event.target.parentNode.parentNode);">
 
-    <template>
+	<template>
       <treechildren>
         <treeitem uri="..." type="rdf:http://home.netscape.com/NC-rdf#type">
           <treerow>
@@ -47,6 +46,7 @@
         </treeitem>
       </treechildren>
     </template>
+	
   </tree>
   </html:div>
 </window>
diff --git a/mozilla/xpfe/components/sidebar/resources/preview.xul b/mozilla/xpfe/components/sidebar/resources/preview.xul
index ba04ec798f7..382a5973ff4 100644
--- a/mozilla/xpfe/components/sidebar/resources/preview.xul
+++ b/mozilla/xpfe/components/sidebar/resources/preview.xul
@@ -17,7 +17,6 @@
   Reserved.
 
 -->
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/customize.css" type="text/css"?>
 <?xml-stylesheet href="chrome://sidebar/skin/preview.css" type="text/css"?>
diff --git a/mozilla/xpfe/components/ucth/resources/unknownContent.xul b/mozilla/xpfe/components/ucth/resources/unknownContent.xul
index b36343e5ff9..15d94f3a4d1 100644
--- a/mozilla/xpfe/components/ucth/resources/unknownContent.xul
+++ b/mozilla/xpfe/components/ucth/resources/unknownContent.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 
 <!DOCTYPE window SYSTEM "chrome://global/locale/unknownContent.dtd">
 
diff --git a/mozilla/xpfe/components/xfer/resources/downloadProgress.xul b/mozilla/xpfe/components/xfer/resources/downloadProgress.xul
index 076efa0305e..9acd52328fe 100644
--- a/mozilla/xpfe/components/xfer/resources/downloadProgress.xul
+++ b/mozilla/xpfe/components/xfer/resources/downloadProgress.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 
 <!DOCTYPE window SYSTEM "chrome://global/locale/downloadProgress.dtd">
 
diff --git a/mozilla/xpfe/global/resources/content/charsetOverlay.xul b/mozilla/xpfe/global/resources/content/charsetOverlay.xul
index 61abb0f113e..edc73decf71 100644
--- a/mozilla/xpfe/global/resources/content/charsetOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/charsetOverlay.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://global/skin/tasksOverlay.css" type="text/css"?> 
 
 
diff --git a/mozilla/xpfe/global/resources/content/commonDialog.xul b/mozilla/xpfe/global/resources/content/commonDialog.xul
index e865d4afc70..a0aa2db55b6 100644
--- a/mozilla/xpfe/global/resources/content/commonDialog.xul
+++ b/mozilla/xpfe/global/resources/content/commonDialog.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 <!DOCTYPE window SYSTEM "chrome://global/locale/commonDialog.dtd">
 
diff --git a/mozilla/xpfe/global/resources/content/hiddenWindow.xul b/mozilla/xpfe/global/resources/content/hiddenWindow.xul
index d9e08195e23..7c7c2335d10 100644
--- a/mozilla/xpfe/global/resources/content/hiddenWindow.xul
+++ b/mozilla/xpfe/global/resources/content/hiddenWindow.xul
@@ -20,7 +20,6 @@ Rights Reserved.
 
 Contributor(s): ______________________________________. -->
 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://navigator/content/navigatorOverlay.xul"?>
 <?xul-overlay href="chrome://global/content/tasksOverlay.xul"?>
 
diff --git a/mozilla/xpfe/global/resources/content/selectDialog.xul b/mozilla/xpfe/global/resources/content/selectDialog.xul
index 114441a2ee6..6d900ee596f 100644
--- a/mozilla/xpfe/global/resources/content/selectDialog.xul
+++ b/mozilla/xpfe/global/resources/content/selectDialog.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 <!DOCTYPE window SYSTEM "chrome://global/locale/commonDialog.dtd">
  
diff --git a/mozilla/xpfe/global/resources/content/tasksOverlay.xul b/mozilla/xpfe/global/resources/content/tasksOverlay.xul
index c4763d7b26b..95fb6a33503 100644
--- a/mozilla/xpfe/global/resources/content/tasksOverlay.xul
+++ b/mozilla/xpfe/global/resources/content/tasksOverlay.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <?xml-stylesheet href="chrome://global/skin/tasksOverlay.css" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/tasksExtension.xul"?>
 
diff --git a/mozilla/xpfe/global/resources/skin/MANIFEST b/mozilla/xpfe/global/resources/skin/MANIFEST
index cd22daf7e74..8e8e036c088 100644
--- a/mozilla/xpfe/global/resources/skin/MANIFEST
+++ b/mozilla/xpfe/global/resources/skin/MANIFEST
@@ -1,6 +1,6 @@
 dialogs.css
 tasksOverlay.css
-xul.css
+skin.css
 lessCols.gif
 lessCols_mo.gif
 lessCols_dis.gif
diff --git a/mozilla/xpfe/global/resources/skin/MANIFEST_CHROME b/mozilla/xpfe/global/resources/skin/MANIFEST_CHROME
new file mode 100644
index 00000000000..176a637a885
--- /dev/null
+++ b/mozilla/xpfe/global/resources/skin/MANIFEST_CHROME
@@ -0,0 +1 @@
+xul.css
diff --git a/mozilla/xpfe/global/resources/skin/Makefile.in b/mozilla/xpfe/global/resources/skin/Makefile.in
index 89cec9ae1e9..5b869591252 100644
--- a/mozilla/xpfe/global/resources/skin/Makefile.in
+++ b/mozilla/xpfe/global/resources/skin/Makefile.in
@@ -25,7 +25,7 @@ include $(DEPTH)/config/autoconf.mk
 EXPORT_RESOURCE_CONTENT = \
 	$(srcdir)/dialogs.css \
 	$(srcdir)/tasksOverlay.css \
-	$(srcdir)/xul.css \
+	$(srcdir)/skin.css \
 	$(srcdir)/lessCols.gif \
 	$(srcdir)/lessCols_mo.gif \
 	$(srcdir)/lessCOls_dis.gif \
@@ -79,7 +79,12 @@ EXPORT_RESOURCE_CONTENT = \
 	$(srcdir)/TB_Tab_mo.gif \
 	$(NULL)
 
+EXPORT_CHROME =
+	$(srcdir)/xul.css \
+	$(NULL)
+
 include $(topsrcdir)/config/rules.mk
 
 install:: 
 	$(INSTALL) $(EXPORT_RESOURCE_CONTENT) $(DIST)/bin/chrome/global/skin/default
+	$(INSTALL) $(EXPORT_CHROME) $(DIST)/bin/chrome
diff --git a/mozilla/xpfe/global/resources/skin/dialogs.css b/mozilla/xpfe/global/resources/skin/dialogs.css
deleted file mode 100644
index fa8afa201f2..00000000000
--- a/mozilla/xpfe/global/resources/skin/dialogs.css
+++ /dev/null
@@ -1,56 +0,0 @@
-/** Contains style definitions for navigator dialogs
-		This file is experimental right now, but will sometime
-		be the base CSS file for all dialogs.
- **/
-
-
-table {
-  display: list;
-  cell-spacing: 2px;
-  cell-padding: 2px;
-  margin-top: 10;
-  margin-bottom: 10;
-  background: transparent;
-}
-
-tr.checkboxrow {
-	  vertical-align: middle;
-		cell-spacing: 20px;
-		cell-padding: 20px;
-}
-
-input {
-  vertical-align: middle;
-}
-
-td.fieldlabel {
-	text-align: right;
-/*	font-family: "Geneva"; */
-	font-size: 9pt;
-	font-weight: bold;
-	padding-right: 4px;
-}
-
-
-button.defaultbutton {
-/*	font-family: "Charcoal"; */
-	font-size: 12pt;
-	padding-left: 24px;
-	padding-right: 24px;
-	margin-left: 4px;
-	margin-right: 4px;
-}
-
-button.cancelbutton {
-/*	font-family: "Arial, Charcoal"; */
-	font-size: 12pt;
-	padding-left: 24px;
-	padding-right: 24px;
-	margin-left: 4px;
-	margin-right: 4px;
-}
-
-td.buttonlabel {
-/*	font-family: "Geneva"; */
-	font-size: 9pt;
-}
diff --git a/mozilla/xpfe/global/resources/skin/makefile.win b/mozilla/xpfe/global/resources/skin/makefile.win
index 961d6b9a0b3..94dc4dc0ce1 100644
--- a/mozilla/xpfe/global/resources/skin/makefile.win
+++ b/mozilla/xpfe/global/resources/skin/makefile.win
@@ -20,12 +20,13 @@ DEPTH=..\..\..\..
 include <$(DEPTH)\config\rules.mak>
 
 DISTBROWSER=$(DIST)\bin\chrome\global\skin\default
-
+DISTXUL=$(DIST)\bin\chrome
 
 install::
 	$(MAKE_INSTALL) dialogs.css $(DISTBROWSER)
 	$(MAKE_INSTALL) tasksOverlay.css $(DISTBROWSER)
-	$(MAKE_INSTALL) xul.css $(DISTBROWSER)
+	$(MAKE_INSTALL) xul.css $(DISTXUL)
+	$(MAKE_INSTALL) skin.css $(DISTBROWSER)
 	$(MAKE_INSTALL) lessCols.gif $(DISTBROWSER)
 	$(MAKE_INSTALL) lessCols_mo.gif $(DISTBROWSER)
 	$(MAKE_INSTALL) lessCols_dis.gif $(DISTBROWSER)
diff --git a/mozilla/xpfe/global/resources/skin/xul.css b/mozilla/xpfe/global/resources/skin/xul.css
index 431079e33f6..2326c65eeab 100644
--- a/mozilla/xpfe/global/resources/skin/xul.css
+++ b/mozilla/xpfe/global/resources/skin/xul.css
@@ -6,268 +6,11 @@
    CHANGES REVIEWED BY hyatt@netscape.com.
 **/
 
-window { 
-  background-color:#CCCCDD;
-  /*background-image: url(chrome://global/skin/bg.jpg); */
-  display: block; 
-  overflow: hidden;
-  font: 3mm tahoma,arial,helvetica,sans-serif;
-  padding: 0px;
-  height: 100%;
-  width: 100%;
-}
-
-window.dialog { 
-  background-color:#CCCCDD;
-  display: block; 
-  overflow: hidden;
-  font: 3mm tahoma,arial,helvetica,sans-serif;
-  /* There is a bug preventing this so this will not work property.
-  padding-left: 11px;
-  padding-right: 10px;
-  padding-top: 10px;
-  padding-bottom: 11px;
-  */
-}
-
-/* generic elements*/
-
-
-box {
-  	display: block;
-  	font: inherit;
-}
-
-template {
-	display: none;
-}
-
-div {
-	background-color:inherit;
-	background-image:inherit;
-}
-
-div.textline {
-	background-color:inherit;
-	background-image:inherit;
-}
-
-
-/*these are for separator lines in dialog windows or toolbars*/ 
-
-div.separator[align="horizontal"] { 
-	 width: 100%; 
-	 max-height: 2px; 
-	 vertical-align: middle; 
-	 border-bottom: 2px groove white; 
-	 margin-top: 0.5em; 
-	 margin-bottom: 0.5em; 
-	 margin-left: 0.25em; 
-	 margin-right: 0.25em; 
-} 
-
-div.separator[align="vertical"] { 
-	 height: 100%; 
-	 max-width: 2px; 
-	 border-right: 2px groove white; 
-	 background-color: yellow; 
-	 margin-left: 0.5em; 
-	 margin-right: 0.5em; 
-	 margin-top: 0.25em; 
-	 margin-bottom: 0.25em; 
-}
-
-
-spring {
-   display: block;
-}
-
-
-/* toolbar stuff*/
-
-
-toolbox { 
-      background-color:darkgray;
-      display: block;
-}
-
-
-:toolbox-normal {
-	background-color: #666699;
-	background-image: url("chrome://global/skin/TB_Tab.gif");
-	background-repeat: no-repeat;
-	color: lightgray;
-	border: solid darkGray 1px;
-
-}
-
-:toolbox-rollover {
-	background-color: #ccccff;
-	background-image: url("chrome://global/skin/TB_Tab_mo.gif");
-	background-repeat: no-repeat;
-	color: green;
-	border: outset #ccccff 1px;
-}
-
-toolbar {
-    display:block;
-    background-color: #CCCCDD;
-    border-bottom: 1px solid #9999cc;
-    font: inherit;
-    min-height: 2em;
-    width: 100%;
-}
-
-toolbar[collapsed="true"] {
-	display:none;
-}
-toolbar[hidden="true"] {
-	display:none;
-}
-
-
-
-/* misc input elements */
-
-fieldset {
-	margin-bottom: 6px;
-	margin-top: 5px;
-	margin-left: 6px;
-	margin-right: 5px;
-	padding: 5px; 
-	border: 2px groove white;
-}
-
-
-legend {
-	border: none;
-	margin-bottom: 5px;
-	margin-top: 0px;
-	margin-left: 4px;
-	margin-right: 3px;
-}
-
-label {
-	display: inline;
-	padding-bottom: 4px;
-	background-color: transparent;
-	background-image: inherit;
-	white-space: nowrap;
-}
-
-textarea {
-  border: 1px inset #DDDDDD;
-  padding-top: 1px;
-  padding-bottom: 2px;
-  padding-left: 4px;
-  padding-right: 3px;
-  margin-top: 1px;
-  margin-bottom: 2px;
-  margin-left: 4px;
-  margin-right: 3px;
-  background-color: white;
-  color: black;
-}
-
-input[type=text] {
-  border: 1px inset rgb(192, 192, 192);
-  padding-top: 3px;
-  padding-bottom: 2px;
-  padding-left: 4px;
-  padding-right: 3px;
-  margin-top: 0px;
-  margin-bottom: 2px;
-  margin-left: 4px;
-  margin-right: 3px;
-  background-color: white;
-  color: black;
-  min-height: 1.75em;
-}
-
-input[type=password] {
-  border: 1px inset rgb(192, 192, 192);
-  padding-top: 3px;
-  padding-bottom: 2px;
-  padding-left: 4px;
-  padding-right: 3px;
-  margin-top: 1px;
-  margin-bottom: 2px;
-  margin-left: 4px;
-  margin-right: 3px;
-  background-color: white;
-  color: black;
-  min-height: 1.75em;
-}
-
-input {
-  /*vertical-align: bottom;*/
-  /*border: 2px inset rgb(192, 192, 192);*/
-  background-color: transparent;
-  color: black;
-}
-
-input[type=radio] {
-  margin-left:   3px;   
-  margin-right:  5px;  
-  margin-top:    3px; 
-  margin-bottom: 3px; 
-  /* border: 2px inset rgb(192, 192, 192); */
-  background-color: inherit;
-  background-image: inherit;
-  color:black;
-  width:12px;
-  height:12px;
-}
-
-input[type=checkbox] {
-  margin-left:   3px;   
-  margin-right:  5px;  
-  margin-top:    3px; 
-  margin-bottom: 4px;
-  border: 1px inset rgb(192, 192, 192);
-  color:black;
-}
-
-checkbox {
-  margin-left:   3px;   
-  margin-right:  5px;  
-  margin-top:    3px; 
-  margin-bottom: 4px;
-  border: 1px inset white;
-  background-color: white;
-  color:black;
-  min-width: .7em;
-  min-height: .7em;
-}
-
-checkbox[depress] {
-   background-color: gray;
-   border: 1px inset white;
-}
-
-/* specify align="horizontal" for most common horizontal cases */
-progressmeter[align="horizontal"] {
-        height: 1em;        
-}
-
-progressmeter {
-        display: inline;
-        color : #9999CC; 
-        background-color: #CCCCDD;        
-}
-
-div.pmBackground {
-	border: 1px inset white; 
-	padding: 1px;
-	margin: 1em;
-	margin-bottom: 3px;
-	background-color: #CCCCCC;
-}
-
-:progressmeter-stripe {
-	color: #CCCCCC;
-}
+@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul); /* set default namespace to XUL */
 
+/** 
+ * All elements that have no visual representation
+ */
 commands, commandset, command {
 	display: none;
 }
@@ -280,13 +23,66 @@ observes {
 	display: none;
 }
 
-menubar {
-    display:block;
-    background-color: #CCCCDD;
-    border-bottom: 1px solid #9999cc;
-    font: inherit;
+template {
+	display: none;
 }
 
+/**********************************
+ * Window
+ **********************************/
+
+window { 
+  display: block; 
+  overflow: hidden;
+  height: 100%;
+  width: 100%;
+}
+
+/**********************************
+ * XUL widgets
+ **********************************/
+
+
+/******** Box *******/
+
+box {
+  	display: block;
+}
+
+
+/**
+ * Used as a space between things in boxes
+ */
+spring {
+   display: block;
+}
+
+/******* ToolBox & ToolBar *******/
+
+toolbox { 
+      display: block;
+}
+
+
+toolbar, menubar {
+    display:block;
+}
+
+toolbar[collapsed="true"] {
+	display:none;
+}
+toolbar[hidden="true"] {
+	display:none;
+}
+
+/****** Progress Meter ********/
+
+progressmeter {
+	display: inline;
+}
+
+/********* XP Menus ***********/
+
 menubar[collapsed="true"] {
 	display:none;
 }
@@ -295,23 +91,11 @@ menubar[hidden="true"] {
 }
 
 menu {
-	display: block;
-	font: inherit;
-	color: black;
-}
-
-menu[disabled="true"] {
-	color: #999999;
+   display: block;
 }
 
 menuitem {
-	display: block;
-	font: inherit;
-	color: black;
-}
-
-menuitem[disabled="true"] {
-	color: #999999;
+   display: block;
 }
 
 popupset {
@@ -334,20 +118,8 @@ popup[menugenerated="true"] {
   display: block;
 }
 
-menupopup {
-  font: inherit;
+menupopup, popup {
   visibility: hidden; 
-  background-color: #CCCCDD;
-  color: inherit;
-  border: 1px white outset;
-}
-
-popup {
-  font: inherit;
-  visibility: hidden; 
-  background-color: #CCCCDD;
-  color: inherit;
-  border: 1px white outset;
 }
 
 menupopup[menuactive="true"] {
@@ -358,402 +130,43 @@ popup[menuactive="true"] {
   visibility: visible;
 }
 
-menupopup > menu {
-  max-width: 400px;
-  min-width: 125px;
-  margin-left: 1px;
-  margin-right: 1px;
-  margin-top: 0px;
-  margin-bottom: 0px;
-}
-
-popup > menu {
-  max-width: 400px;
-  min-width: 125px;
-  margin-left: 1px;
-  margin-right: 1px;
-  margin-top: 0px;
-  margin-bottom: 0px;
-}
-
-menupopup > menuitem {
-  max-width: 400px;
-  min-width: 125px;
-  margin-left: 1px;
-  margin-right: 1px;
-  margin-top: 0px;
-  margin-bottom: 0px;
-}
-
-popup > menuitem {
-  max-width: 400px;
-  min-width: 125px;
-  margin-left: 1px;
-  margin-right: 1px;
-  margin-top: 0px;
-  margin-bottom: 0px;
-}
-
 menuseparator {
   display: block;
-  border-bottom: 1px white solid; 
-  border-top: 1px gray solid; 
-  margin: 2px;
 }
 
-/* titledbuttons are the preferred means of generating UI buttons in XUL (see below) */
-
-button {
-  display: inline;
-  color:black; 
-   /* -moz-border-radius: 2px; */
-  border: 1px outset white;
-  padding: 2px;
-  margin: 2px;
-	text-align: center;
-  font: inherit;
-	background-color: inherit;
-	background-image: inherit;
-	min-height: 1.25em;
-	max-height: 1.25em;
-	min-width: 7em;
-}
-
-button[default] {
-  font-weight: bold;
-}
-
-button:hover {
-  border: 1px outset white;
-	color:#333366;
-	text-decoration:underline;
-  padding: 2px;
-}
- 
-button:hover:-moz-outline {
-   border : 1px solid black;
-   color:#666699;
-   padding: 2px;
-}
- 
-button:active {
-
-  text-decoration:none;
-  border: 1px inset;
-
-  padding-left: 3px;
-  padding-right: 1px;
-  padding-top: 3px;
-  padding-bottom: 1px;
-}
-
-button:active:-moz-outline {
-   border : 1px solid black;
-
-}
- 
-button[disabled] {
-	background-color: inherit;
-	background-image: inherit;
-	border : 1px solid #999999;
-	color: #999999;
-	text-decoration: none;
-}
-
-/* titledbuttons recommended for use with most XUL UI */
+/******** Titled buttons **********/
 
 titledbutton {
   display: inline;
-  color:black; 
-   /* -moz-border-radius: 2px; */
-  border: 1px outset white;
-  padding: 2px;
-  margin: 2px;
-  text-align: center;
-  font: inherit;
-  background-color:inherit;
-  background-image: inherit;
 }
 
-window.dialog titledbutton{
-	min-width: 5em;
-}
-
-titledbutton[class~=popup] {
-	list-style-image:url(chrome://global/skin/TB_popup.gif);
-}
-
-titledbutton:hover {
-  border: 1px outset white;
-	color:#333366;
-	text-decoration:underline;
-  padding: 2px;
-}
- 
-titledbutton:hover:-moz-outline {
-   border : 1px solid black;
-   color:#666699;
-   padding: 2px;
-}
- 
-titledbutton:active {
-
-  text-decoration:none;
-  border: 1px inset;
-
-  padding-left: 3px;
-  padding-right: 1px;
-  padding-top: 3px;
-  padding-bottom: 1px;
-}
-
-titledbutton[toggled="1"] {
-  border: 1px white inset;
-
-  padding-left: 3px;
-  padding-right: 1px;
-  padding-top: 3px;
-  padding-bottom: 1px;
-}
-
-titledbutton[toggled="2"] {
-   background-color: lightgray;
-   border: 1px solid gray;
-}
-
-titledbutton[default] {
-	/* border-color: black; */
-	font-weight: bold;
-	list-style-image: url("chrome://global/skin/return.gif");
-	/* FIX ME - temporary workaround to offset the lack of a way to align text and image */
-	padding-right: 2em;
-}
-
-titledbutton:active:-moz-outline {
-   border : 1px solid black;
-
-}
- 
-titledbutton[disabled="true"] {
-	background-color:inherit;
-  	background-image: inherit;
-	border : 1px solid #999999;
-	color: #999999;
-	text-decoration: none;
-}
-
-titledbutton[disabled="true"]:hover {
-  	background-color:inherit;
-  	background-image: inherit;
-	border : 1px solid #999999;
-	color: #999999;
-	text-decoration: none;
-}
-
-titledbutton[disabled="true"]:active {
-  	background-color:inherit;
-  	background-image: inherit;
-	border : 1px solid #999999;
-	color: #999999;
-	text-decoration: none;
-}
-
-/* special class for plain titledbuttons */
-
-titledbutton[class~=plain] {
-  border: 1px solid transparent;
-  padding: 2px;
-  font: inherit;
-}
-
-titledbutton[class~=plain]:hover {
-  border: 1px solid transparent;
-  padding: 2px;
-  text-decoration: none;
-  color: inherit;
-}
- 
-titledbutton[class~=plain]:active {
-  border: 1px solid transparent;
-  padding: 2px;
-   text-decoration: none;
-  color: inherit;
-}
-
-titledbutton[class~=plain][disabled] {
-	border: 1px solid transparent;
-	padding: 2px;
-}
-
-titledbutton[class~=plain][disabled]:hover {
-	border: 1px solid transparent;
-	padding: 2px;
-}
-
-titledbutton[class~=plain][disabled]:active {
-	border: 1px solid transparent;
-	padding: 2px;
-}
-
-
-/* special class for borderless buttons */
-/* titled button on toolbars are automatically set to be borderless (see below) */
-
-titledbutton[class~=borderless] {
-  border: 1px solid transparent;
-}
- 
-titledbutton[class~=borderless]:hover {
-  border: 1px outset white;
-  color:#333366;
-  text-decoration: underline;
-}
-  
-titledbutton[class~=borderless]:hover:-moz-outline {
-  border : 1px solid black;
-}
-
-titledbutton[class~=borderless]:active {
-  text-decoration:none;
-  border: 1px inset;
-}
- 
-titledbutton[class~=borderless]:active:-moz-outline {
-  border : 1px solid black;
-}
- 
-titledbutton[class~=borderless][disabled] {
-  border: 1px solid transparent;
-}
-
-titledbutton[class~=borderless][disabled]:hover {
-  border: 1px solid transparent;
-}
-
-titledbutton[class~=borderless][disabled]:active {
-  border: 1px solid transparent;
-  padding: 2px;
-}
-
-
-treecell.image > titledbutton {
-  border: 1px solid transparent;
-  text-decoration: none;
-  margin: 0px;
-  padding: 0px;
-}
-
-treecell.image > titledbutton:hover {
-  border: 1px solid transparent;
-  text-decoration: none;
-  margin: 0px;
-  padding: 0px;
-}
- 
-treecell.image > titledbutton:active {
-  border: 1px solid transparent;
-  text-decoration: none;
-  margin: 0px;
-  padding: 0px;
-}
-
-/* as a convenience predefined for toolbar as being same as class borderless */
-
-toolbar titledbutton {
-  border: 1px solid transparent;
-}
-
-toolbar.main-bar titledbutton[align="bottom"]{
-	min-width: 3.5em;
-}
-
-toolbar titledbutton:hover {
-  border: 1px outset white;
-  color:#333366;
-  text-decoration: underline;
-}
- 
-toolbar titledbutton:hover:-moz-outline {
-   border : 1px solid black;
-}
- 
-toolbar titledbutton:active {
-  text-decoration:none;
-  border: 1px inset;
-}
-
-toolbar titledbutton:active:-moz-outline {
-   border : 1px solid black;
-}
- 
-toolbar titledbutton[disabled="true"] {
-	border: 1px solid transparent;
-}
-
-toolbar titledbutton[disabled="true"]:hover {
-	border: 1px solid transparent;
-}
-
-toolbar titledbutton[disabled="true"]:active {
-	border: 1px solid transparent;
-	padding: 2px;
-}
-
-/* tree related stuff */
+/******** Tree widget **********/
 
 tree {
  display: table;
- background-color: white;
- border: none;
- border-spacing: 0px;
- width: 100%;
  table-layout: fixed;
- font: inherit;
 }
 
 treeitem { 
  display: table-row-group; 
- font: inherit;
 } 
 
 treerow {
  display: table-row;
- font: inherit;
 }
 
 treehead { 
  display: table-header-group; 
- font: inherit;
 } 
 
 treechildren { 
  display: table-row-group;
- font: inherit; 
 } 
 
-treeitem[selected="true"] > treerow { 
- color: white;
- background-color: #666699;
- font: inherit; 
-}
-
 treecell { 
  display: table-cell; 
- white-space: nowrap;
- font: inherit;
- vertical-align: middle;
 } 
 
-treehead treerow treecell { 
- background-color: #666699; 
- border: thin darkgray solid; 
- color: white;
-} 
-
-.tree-button {
-  color: inherit;
-}
-
 treeitem > treechildren {
   visibility: collapse;
 }
@@ -766,646 +179,51 @@ treecol {
  display: table-column;
 }
 
-/* tabs related stuff */
+/********** Tab widget *********/
 
 tab { 
   display: inline;
-  cursor: default;
-
-  border: 1px outset white;
-  /* -moz-border-radius: 90; */
-
-  color:black; 
 }
 
 tab:active { 
   display: inline;
-  cursor: default;
-
-  border: 1px outset white;
-  /* -moz-border-radius: 90; */
-
-  color:red; 
 }
 
 tabbox { 
-  
-
-  /* border-bottom: 1px outset white; */
-}
-
-tabcontrol[align="vertical"] tabpanel + tabbox[align="horizontal"]  tab { 
-	/* bottom tabs */
-  border-left: 1px outset white;
-  border-right: 1px outset white;
-  border-top: none;
-  border-bottom: 1px outset white;
-  
-  padding-right: 3px;
-  padding-left: 3px;
-  padding-top: 1px;
-  padding-bottom: 3px;
-
-  margin-right: 2px;
-  margin-left: 2px;
-  margin-top: 1px;
-  margin-bottom: 1px;
-  
-}
-
-tabcontrol[align="vertical"] tabbox[align="horizontal"] tab { 
-  /* top tabs */
-  border-left: 1px outset white;
-  border-right: 1px outset white;
-  border-top: 1px outset white;
-  border-bottom: none;
-
-  padding-right: 3px;
-  padding-left: 3px;
-  padding-top: 3px;
-  padding-bottom: 1px;
-
-  margin-right: 2px;
-  margin-left: 2px;
-  margin-top: 1px;
-  margin-bottom: 1px;
-
-}
-
-tabcontrol[align="horizontal"] tabbox[align="vertical"] tab { 
-	/* left tabs */
-  border-left: 1px outset white;
-  border-right: none;
-  border-top: 1px outset white;
-  border-bottom: 1px outset white;
-  
-  padding-right: 1px;
-  padding-left: 3px;
-  padding-top: 3px;
-  padding-bottom: 3px;
-
-  margin-right: 1px;
-  margin-left: 1px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  
-}
-
-tabcontrol[align="horizontal"] tabpanel + tabbox[align="vertical"]  tab { 
-	/* right tabs */
-  border-left: none;
-  border-right: 1px outset white;
-  border-top: 1px outset white;
-  border-bottom: 1px outset white;
-  
-  padding-right: 3px;
-  padding-left: 1px;
-  padding-top: 3px;
-  padding-bottom: 3px;
-
-  margin-right: 1px;
-  margin-left: 1px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-  
-}
-
-
-tab:hover { 
- color: #000033;
- text-decoration:underline;
+  display: block;
 }
 
 tabcontrol { 
   display: block;
-  cursor: default;
-
-  border: none; 
 }
 
 :-moz-deck-hidden {
    visibility: hidden;
 }
 
-/* all the debug stuff is here */
-
-/* always debug 
-
-*:-moz-horizontal-box-debug {
-  border: 2px solid blue;
-  border-top-width: 10px;
-  padding: 2px;
-  color: white;
-}
-
-*:-moz-vertical-box-debug {
-  border: 2px solid red;
-  border-left-width: 10px;
-  padding: 2px;
-  color: white;
-}
-*/
-
-
-/* Conditional debug */
-
-*[debug="true"]:-moz-horizontal-box-debug {
-  border: 2px solid blue;
-  border-top-width: 10px;
-  color: white;
-  padding: 2px;
-  margin: 2px;
-}
-
-*[debug="true"]:-moz-vertical-box-debug {
-  border: 2px solid red;
-  border-left-width: 10px;
-  color: white;
-  padding: 2px;
-  margin: 2px;
-}
-
-*[debug="true"] *:-moz-horizontal-box-debug {
-  border: 2px solid blue;
-  border-top-width: 10px;
-  color: white;
-  padding: 2px;
-  margin: 2px;
-}
-
-*[debug="true"] *:-moz-vertical-box-debug {
-  border: 2px solid red;
-  border-left-width: 10px;
-  color: white;
-  padding: 2px;
-  margin: 2px;
-}
-
-
-/*
-box[debug] spring {
-   background-color: green;
-}
-
-box[debug] div{
-	background-color:inherit;
-	background-image:inherit;
-	border: 1px dashed yellow;
-}
-
-box[debug] div.textline {
-	background-color:inherit;
-	background-image:none;
-	border: 1px solid yellow;
-}
-
-box[debug] span{
-	background-color:inherit;
-	background-image:inherit;
-	border: 1px dotted yellow;
-}
-
-box[debug] button{
-	border: 1px outset yellow;
-}
-
-box[debug] button:active{
-	border: 1px inset yellow;
-}
-
-box[debug] titledbutton{
-	border: 1px outset yellow;
-}
-
-box[debug] titledbutton:active{
-	border: 1px inset yellow;
-}
-
-box[debug] legend {
-	border: 1px solid white;
-}
-
-box[debug] label {
-	border: 1px solid yellow;
-}
-
-box[debug] textarea {
-	border: 1px inset yellow;
-}
-
-box[debug] input[type=text]{
-	border: 2px inset yellow;
-}
-
-box[debug] input[type=password]{
-	border: 2px inset yellow;
-}
-
-box[debug] input{
-	border: 2px inset yellow;
-}
-
-box[debug] input[type=radio]{
-	border: 2px inset yellow;
-}
-
-box[debug] input[type=checkbox]{
-	border: 1px inset yellow;
-}
-
-box[debug] checkbox{
-	background-color: white;
-	border: 1px inset yellow;
-}
-
-box[debug] checkbox[depress]{
-	border: 1px inset yellow;
-}
-
-box[debug] div.pmBackground {
-	border: 1px inset yellow; 
-	padding: 1px;
-	background-color: #CCCCCC;
-}
-
-box[debug] progressmeter {
-        display:inline;
-        border: 1px yellow;
-        color : #9999CC;         
-}
-*/
+/********* XP Scrollbar *********/
 
 thumb {
-   background-color: rgb(206, 207, 206);
-   border: 2px outset rgb(156, 154, 156);
-   list-style-image: url("chrome://global/skin/scroll-thumb-horiz.gif")
-}
-
-thumb:hover {
-   list-style-image: url("chrome://global/skin/scroll-thumb-horiz-hover.gif");
-}
-
-thumb[disabled="true"] {
-   list-style-image: url("chrome://global/skin/scroll-thumb-horiz-disabled.gif");
-}
-
-slider[align="vertical"] thumb {
-   background-color: rgb(206,207,206);
-   list-style-image: url("chrome://global/skin/scroll-thumb-vert.gif")
-}
-
-slider[align="vertical"] thumb:hover {
-   list-style-image: url("chrome://global/skin/scroll-thumb-vert-hover.gif");
-}
-
-slider[align="vertical"] thumb[disabled="true"] {
-   list-style-image: url("chrome://global/skin/scroll-thumb-vert-disabled.gif");
-}
-
-thumb:active {
-   background-color: rgb(220, 210, 210);
+   display: block;
 }
 
 slider {
-   border: 1px solid black;
-   background-color: rgb(240,240,240);
+   display: block;
 }
 
-
 scrollbarbutton {
   display: inline;
-  vertical-align: bottom;
-  cursor: default;
-
-  border: 2px outset rgb(156, 154, 156);
-  background-color: rgb(206, 207, 206);
-  color:black; 
-
-  padding: 1px;
 }
 
-scrollbarbutton:active {
-  border-style: inset;
-
-  padding-left: 2px;
-  padding-right: 0px;
-  padding-top: 2px;
-  padding-bottom: 0px;
-}
-
-scrollbarbutton.decrement {
-   list-style-image: url("chrome://global/skin/scrollLeft.gif")
-}
-
-scrollbarbutton.decrement:hover {
-   list-style-image: url("chrome://global/skin/scrollLeft-hover.gif")
-}
-
-scrollbarbutton.decrement[disabled="true"] {
-   list-style-image: url("chrome://global/skin/scrollLeft-disabled.gif") 
-}
-
-scrollbarbutton.increment {
-   list-style-image: url("chrome://global/skin/scrollRight.gif")
-}
-
-scrollbarbutton.increment:hover {
-   list-style-image: url("chrome://global/skin/scrollRight-hover.gif")
-}
-
-scrollbarbutton.increment[disabled="true"] {
-   list-style-image: url("chrome://global/skin/scrollRight-disabled.gif") 
-}
-
-
-scrollbar[align="vertical"] scrollbarbutton.decrement {
-   list-style-image: url("chrome://global/skin/scrollUp.gif")
-}
-
-scrollbar[align="vertical"] scrollbarbutton.decrement:hover {
-   list-style-image: url("chrome://global/skin/scrollUp_mo.gif")
-}
-
-scrollbar[align="vertical"] scrollbarbutton.decrement[disabled="true"] {
-   list-style-image: url("chrome://global/skin/scrollUp_dis.gif") 
-}
-
-scrollbar[align="vertical"] scrollbarbutton.increment {
-   list-style-image: url("chrome://global/skin/scrollDown.gif")
-}
-
-scrollbar[align="vertical"] scrollbarbutton.increment:hover {
-   list-style-image: url("chrome://global/skin/scrollDown_mo.gif")
-}
-
-scrollbar[align="vertical"] scrollbarbutton.increment[disabled="true"] {
-   list-style-image: url("chrome://global/skin/scrollDown_dis.gif") 
-}
-
-treepusher.increment {
-   list-style-image: url("chrome://global/skin/moreCols_mo.gif")
-}
-
-treepusher.increment:hover {
-   list-style-image: url("chrome://global/skin/moreCols_mo.gif")
-}
-
-treepusher.increment[disabled="true"] {
-   list-style-image: url("chrome://global/skin/moreCols_dis.gif")
-}
-
-treepusher.decrement {
-   list-style-image: url("chrome://global/skin/lessCols_mo.gif")
-}
-
-treepusher.decrement:hover {
-   list-style-image: url("chrome://global/skin/lessCols_mo.gif")
-}
-
-treepusher.decrement[disabled="true"] {
-   list-style-image: url("chrome://global/skin/lessCols_dis.gif")
+scrollbar[value="hidden"] {
+   visibility: hidden;
 }
 
 splitter {
    display: block;
-   cursor: arrow;
-   min-width: 5px;
-   min-height: 5px;
-}
-
-splitter[state="dragging"] {
-   background-color: rgb(150,150,150);
 }
 
 grippy {
-   border: 1px outset white;
-   list-style-image: url(chrome://global/skin/grippy-horizontal-before.gif);
-   background-color: rgb(198,198,198);
    display: block;
 }
 
-grippy:hover {
-   background-color: rgb(220, 210, 210);
-}
-
-window > splitter > grippy {
-   list-style-image: url(chrome://global/skin/grippy-horizontal-before.gif);
-}
-
-window > splitter[state="collapsed"] > grippy {
-   list-style-image: url(chrome://global/skin/grippy-horizontal-after.gif);
-}
-
-window > splitter[collapse="after"] > grippy {
-   list-style-image: url(chrome://global/skin/grippy-horizontal-after.gif);
-}
-
-window > splitter[collapse="after"][state="collapsed"] > grippy {
-   list-style-image: url(chrome://global/skin/grippy-horizontal-before.gif);
-}
-
-window[align="vertical"] > splitter > grippy {
-   list-style-image: url(chrome://global/skin/grippy-vertical-before.gif);
-}
-
-window[align="vertical"] > splitter[collapse="after"] > grippy {
-   list-style-image: url(chrome://global/skin/grippy-vertical-after.gif);
-}
-
-window[align="vertical"] > splitter[state="collapsed"] > grippy {
-   list-style-image: url(chrome://global/skin/grippy-vertical-after.gif);
-}
-
-window[align="vertical"] > splitter[collapse="after"][state="collapsed"] > grippy {
-   list-style-image: url(chrome://global/skin/grippy-vertical-before.gif);
-}
-
-box > splitter > grippy {
-   list-style-image: url(chrome://global/skin/grippy-horizontal-before.gif);
-}
-
-box > splitter[state="collapsed"] > grippy {
-   list-style-image: url(chrome://global/skin/grippy-horizontal-after.gif);
-}
-
-
-box > splitter[collapse="after"] > grippy {
-   list-style-image: url(chrome://global/skin/grippy-horizontal-after.gif);
-}
-
-box > splitter[collapse="after"][state="collapsed"] > grippy {
-   list-style-image: url(chrome://global/skin/grippy-horizontal-before.gif);
-}
-
-box[align="vertical"] > splitter > grippy {
-   list-style-image: url(chrome://global/skin/grippy-vertical-before.gif);
-}
-
-box[align="vertical"] > splitter[collapse="after"] > grippy {
-   list-style-image: url(chrome://global/skin/grippy-vertical-after.gif);
-}
-
-box[align="vertical"] > splitter[state="collapsed"] > grippy {
-   list-style-image: url(chrome://global/skin/grippy-vertical-after.gif);
-}
-
-box[align="vertical"] > splitter[collapse="after"][state="collapsed"] > grippy {
-   list-style-image: url(chrome://global/skin/grippy-vertical-before.gif);
-}
-
-.tree-icon {
-  width: 100%;
-}
-
-.tree-button {
- margin: 0px;
- padding: 0px;
- border: none;
- width: 100%;
- list-style-image: inherit;
-}
-
-.tree-button[flex] {
-  width: 10px;
-}
-
-treecell {
- vertical-align: middle;
-}
-
-treeitem > treerow > treecell > .tree-icon > .twisty {
- border: none;
- padding: 0px;
- margin: 0px;
- width: 16px;
- list-style-image: url("chrome://global/skin/closedtwisty.gif");
- visibility: visible;
-}
-
-.twisty:hover {
- text-decoration: none;
-}
-
-.twisty:active {
- text-decoration: none;
-}
-
-treeitem[empty="true"] > treerow > treecell > .tree-icon > titledbutton.twisty {
- list-style-image: none;
-}
-
-treeitem > treerow > treecell > .tree-icon > .twisty[disabled="true"] {
- list-style-image: none;
-}
-
-treeitem[container="true"][open="true"] > treerow > treecell > .tree-icon > .twisty {
- list-style-image: url("chrome://global/skin/opentwisty.gif");
-}
-
-
-menubar > menu {
-  border: 1px solid transparent;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  padding-left: 3px;
-  padding-right: 3px;
-  margin-top: 2px;
-  margin-bottom: 2px;
-}
-
-menupopup > menu {
-  border: 1px solid transparent;
-  padding: 2px;
-}
-
-menupopup > menuitem {
-  border: 1px solid transparent;
-  padding: 2px;
-}
-
-popup > menuitem {
-  border: 1px solid transparent;
-  padding: 2px;
-}
-
-menubar > menu[menuactive="true"] {
-  border: 1px outset white;
-  color:#333366;
-}
-
-menubar > menu[menuactive="true"][open="true"] {
-  border: 1px inset;
-}
-
-menupopup > menu[menuactive="true"] {
-  background-color: #666699;
-  color: white;
-}
-
-popup > menu[menuactive="true"] {
-  background-color: #666699;
-  color: white;
-}
-
-menupopup > menuitem[menuactive="true"] {
-  background-color: #666699;
-  color: white;
-}
-
-popup > menuitem[menuactive="true"] {
-  background-color: #666699;
-  color: white;
-}
-
-.menu-right {
-  padding: 0px;
-  border: 0px;
-  width: 10px;
-  margin-left: 6px;
-  margin-right: 0px;
-}
-
-.menu-left {
-  color: inherit;
-  padding: 0px;
-  border: 0px;
-  width: 13px;
-  margin-right: 2px;
-}
-
-.menubar-left {
-  color: inherit;
-  padding: 0px;
-  border: 0px;
-  margin-right: 2px;
-}
-
-.menu-text {
-  color: inherit;
-  padding: 0px;
-  border: 0px;
-  margin-right: 2px;
-}
-
-.menubar-text {
-  color: inherit;
-  padding: 0px;
-  border: 0px;
-  margin-right: 2px;
-}
-
-menuitem > .menu-right {
-  list-style-image: none;
-}
-
-menuitem > .menu-left {
-  list-style-image: none;
-}
-
-menu > .menu-right {
-  list-style-image: url("chrome://global/skin/menuArrow.gif");
-}
-
-menu[menuactive="true"] > .menu-right {
-  list-style-image: url("chrome://global/skin/menuArrow_mo.gif");
-}
diff --git a/mozilla/xpinstall/res/content/progress.xul b/mozilla/xpinstall/res/content/progress.xul
index c464195c66e..e5295a82b86 100644
--- a/mozilla/xpinstall/res/content/progress.xul
+++ b/mozilla/xpinstall/res/content/progress.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/" type="text/css"?> 
 <!DOCTYPE window SYSTEM "chrome://xpinstall/locale/progress.dtd" >
 
 <xul:window xmlns:html="http://www.w3.org/TR/REC-html40"
diff --git a/mozilla/xpinstall/res/content/xpistatus.xul b/mozilla/xpinstall/res/content/xpistatus.xul
index 64792e49b82..6a764bb9775 100644
--- a/mozilla/xpinstall/res/content/xpistatus.xul
+++ b/mozilla/xpinstall/res/content/xpistatus.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?> 
 <?xml-stylesheet href="resource:/res/xpinstall/xpistatus.css" type="text/css"?> 
 <!DOCTYPE window SYSTEM "chrome://xpinstall/locale/xpistatus.dtd" >
 
diff --git a/mozilla/xpinstall/res/xpistatus.xul b/mozilla/xpinstall/res/xpistatus.xul
index d6e94f136d8..7f3914e4b7e 100644
--- a/mozilla/xpinstall/res/xpistatus.xul
+++ b/mozilla/xpinstall/res/xpistatus.xul
@@ -1,5 +1,4 @@
 <?xml version="1.0"?> 
-<?xml-stylesheet href="chrome://global/skin/xul.css" type="text/css"?> 
 <?xml-stylesheet href="resource:/res/xpinstall/xpistatus.css" type="text/css"?> 
 
 <!DOCTYPE window