Bug 1857999: Move XML stylesheet processing instructions to link elements. r=Gijs,webdriver-reviewers,settings-reviewers,application-update-reviewers,devtools-reviewers,places-reviewers,Standard8,whimboo,bytesized,ochameau

The result of running the automated script available at https://github.com/Mossop/depi Differential Revision: https://phabricator.services.mozilla.com/D190681
2023-10-18 07:04:41 +00:00 · 2023-10-18 07:04:41 +00:00 · be1eb3c4b8
--- a/browser/base/content/aboutDialog.xhtml
+++ b/browser/base/content/aboutDialog.xhtml
@ -4,10 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/aboutDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://branding/content/aboutDialog.css" type="text/css"?>
-
 <window xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        id="aboutDialog"
@ -28,6 +24,16 @@
 #endif

  <linkset>
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/content/aboutDialog.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://branding/content/aboutDialog.css"
+    />
+
    <html:link rel="localization" href="branding/brand.ftl"/>
    <html:link rel="localization" href="browser/aboutDialog.ftl"/>
  </linkset>
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@ -9,28 +9,10 @@
 <!-- The "global.css" stylesheet is imported first to allow other stylesheets to
     override rules using selectors with the same specificity. This applies to
     both "content" and "skin" packages, which bug 1385444 will unify later. -->
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>

 <!-- While these stylesheets are defined in Toolkit, they are only used in the
     main browser window, so we can load them here. Bug 1474241 is on file to
     consider moving these widgets to the "browser" folder. -->
-<?xml-stylesheet href="chrome://global/content/tabprompts.css" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/tabprompts.css" type="text/css"?>
-
-<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/tabbrowser.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/downloads/downloads.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-
-<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/downloads/downloads.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/searchbar.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/translations/panel.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css" type="text/css"?>

 <html id="main-window"
        xmlns:html="http://www.w3.org/1999/xhtml"
@ -59,6 +41,32 @@
        persist="screenX screenY width height sizemode"
        data-l10n-sync="true">
 <head>
+  <link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <link rel="stylesheet" href="chrome://global/content/tabprompts.css" />
+  <link rel="stylesheet" href="chrome://global/skin/tabprompts.css" />
+  <link rel="stylesheet" href="chrome://browser/content/browser.css" />
+  <link rel="stylesheet" href="chrome://browser/content/tabbrowser.css" />
+  <link
+    rel="stylesheet"
+    href="chrome://browser/content/downloads/downloads.css"
+  />
+  <link rel="stylesheet" href="chrome://browser/content/places/places.css" />
+  <link
+    rel="stylesheet"
+    href="chrome://browser/content/usercontext/usercontext.css"
+  />
+  <link rel="stylesheet" href="chrome://browser/skin/" />
+  <link rel="stylesheet" href="chrome://browser/skin/controlcenter/panel.css" />
+  <link
+    rel="stylesheet"
+    href="chrome://browser/skin/customizableui/panelUI.css"
+  />
+  <link rel="stylesheet" href="chrome://browser/skin/downloads/downloads.css" />
+  <link rel="stylesheet" href="chrome://browser/skin/searchbar.css" />
+  <link rel="stylesheet" href="chrome://browser/skin/translations/panel.css" />
+  <link rel="stylesheet" href="chrome://browser/skin/places/tree-icons.css" />
+  <link rel="stylesheet" href="chrome://browser/skin/places/editBookmark.css" />
+
  <link rel="localization" href="branding/brand.ftl"/>
  <link rel="localization" href="browser/allTabsMenu.ftl"/>
  <link rel="localization" href="browser/appmenu.ftl"/>
--- a/browser/base/content/hiddenWindowMac.xhtml
+++ b/browser/base/content/hiddenWindowMac.xhtml
@ -6,12 +6,14 @@
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #define HIDDEN_WINDOW

-<?xml-stylesheet href="chrome://browser/skin/webRTC-menubar-indicator.css" type="text/css"?>
-
 <window id="main-window"
        xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        data-l10n-sync="true">
+  <html:link
+    rel="stylesheet"
+    href="chrome://browser/skin/webRTC-menubar-indicator.css"
+  />

 #include macWindow.inc.xhtml

--- a/browser/base/content/pageinfo/pageInfo.xhtml
+++ b/browser/base/content/pageinfo/pageInfo.xhtml
@ -3,9 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-<?xml-stylesheet href="chrome://browser/content/pageinfo/pageInfo.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/pageInfo.css" type="text/css"?>
-
 <window id="main-window"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  xmlns:html="http://www.w3.org/1999/xhtml"
@ -19,6 +16,12 @@
  persist="screenX screenY width height sizemode">

  <linkset>
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/content/pageinfo/pageInfo.css"
+    />
+    <html:link rel="stylesheet" href="chrome://browser/skin/pageInfo.css" />
+
    <html:link rel="localization" href="browser/pageInfo.ftl"/>
  </linkset>
  #ifdef XP_MACOSX
--- a/browser/base/content/safeMode.xhtml
+++ b/browser/base/content/safeMode.xhtml
@ -4,9 +4,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://browser/content/safeMode.css"?>
-
 <window
  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -21,6 +18,12 @@
    buttonidextra1="refresh-profile"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/content/safeMode.css"
+      />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link rel="localization" href="browser/safeMode.ftl" />
    </linkset>
--- a/browser/base/content/sanitize.xhtml
+++ b/browser/base/content/sanitize.xhtml
@ -5,12 +5,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-<?xml-stylesheet href="chrome://browser/skin/sanitizeDialog.css"?>
-
-<?xml-stylesheet href="chrome://browser/content/sanitizeDialog.css"?>
-
 <!DOCTYPE window>

 <window
@ -28,6 +22,20 @@
    </hbox>

    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/preferences.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/sanitizeDialog.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/content/sanitizeDialog.css"
+      />
+
      <html:link rel="localization" href="browser/sanitize.ftl" />
    </linkset>

--- a/browser/base/content/webext-panels.xhtml
+++ b/browser/base/content/webext-panels.xhtml
@ -5,10 +5,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css" type="text/css"?>
-
 <window id="webextpanels-window"
        xmlns:html="http://www.w3.org/1999/xhtml"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
@ -22,6 +18,13 @@
  <script src="chrome://global/content/editMenuOverlay.js"/>

  <linkset>
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <html:link rel="stylesheet" href="chrome://browser/skin/" />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/content/usercontext/usercontext.css"
+    />
+
    <html:link rel="localization" href="toolkit/branding/brandings.ftl"/>
    <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
    <html:link rel="localization" href="browser/browserContext.ftl"/>
--- a/browser/base/content/webrtcIndicator.xhtml
+++ b/browser/base/content/webrtcIndicator.xhtml
@ -3,9 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/webRTC-indicator.css" type="text/css"?>
-
 <!DOCTYPE html>

 <html
@ -16,6 +13,9 @@
  chromemargin="0,0,0,0"
 >
  <head>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <link rel="stylesheet" href="chrome://browser/skin/webRTC-indicator.css" />
+
    <link rel="localization" href="branding/brand.ftl" />
    <link rel="localization" href="browser/webrtcIndicator.ftl" />
    <title data-l10n-id="webrtc-indicator-title"></title>
--- a/browser/base/content/webrtcLegacyIndicator.xhtml
+++ b/browser/base/content/webrtcLegacyIndicator.xhtml
@ -4,9 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/webRTC-legacy-indicator.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window xmlns:html="http://www.w3.org/1999/xhtml"
@ -23,6 +20,12 @@
        orient="horizontal"
        >
  <linkset>
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/skin/webRTC-legacy-indicator.css"
+    />
+
    <html:link rel="localization" href="branding/brand.ftl"/>
    <html:link rel="localization" href="browser/webrtcIndicator.ftl"/>
  </linkset>
--- a/browser/components/downloads/content/contentAreaDownloadsView.xhtml
+++ b/browser/components/downloads/content/contentAreaDownloadsView.xhtml
@ -4,12 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://browser/content/downloads/contentAreaDownloadsView.css"?>
-<?xml-stylesheet href="chrome://browser/skin/downloads/contentAreaDownloadsView.css"?>
-<?xml-stylesheet href="chrome://browser/content/downloads/downloads.css"?>
-<?xml-stylesheet href="chrome://browser/skin/downloads/allDownloadsView.css"?>
-
 <!DOCTYPE window>

 <window id="contentAreaDownloadsView"
@ -19,6 +13,24 @@
        csp="default-src chrome:; img-src chrome: moz-icon:; object-src 'none'">

  <linkset>
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/content/downloads/contentAreaDownloadsView.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/skin/downloads/contentAreaDownloadsView.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/content/downloads/downloads.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/skin/downloads/allDownloadsView.css"
+    />
+
    <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
    <html:link rel="localization" href="browser/downloads.ftl" />
  </linkset>
--- a/browser/components/migration/content/migration.xhtml
+++ b/browser/components/migration/content/migration.xhtml
@ -3,8 +3,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
 <window id="migrationWizard"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        xmlns:html="http://www.w3.org/1999/xhtml"
@ -15,6 +13,8 @@
        style="min-width: 40em;"
        buttons="accept,cancel">
 <linkset>
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
  <html:link rel="localization" href="branding/brand.ftl"/>
  <html:link rel="localization" href="toolkit/global/wizard.ftl"/>
  <html:link rel="localization" href="browser/migration.ftl"/>
--- a/browser/components/places/content/bookmarkProperties.xhtml
+++ b/browser/components/places/content/bookmarkProperties.xhtml
@ -4,13 +4,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://global/content/commonDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/commonDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css"?>
-<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
-<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
-
 <!DOCTYPE window>

 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -24,6 +17,25 @@
        buttons="accept, cancel">

  <linkset>
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <html:link
+      rel="stylesheet"
+      href="chrome://global/content/commonDialog.css"
+    />
+    <html:link rel="stylesheet" href="chrome://global/skin/commonDialog.css" />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/skin/places/editBookmark.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/skin/places/tree-icons.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/content/places/places.css"
+    />
+
    <html:link rel="localization" href="browser/editBookmarkOverlay.ftl"/>
  </linkset>

--- a/browser/components/places/content/bookmarksSidebar.xhtml
+++ b/browser/components/places/content/bookmarksSidebar.xhtml
@ -3,12 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
-<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css"?>
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
-<?xml-stylesheet href="chrome://browser/skin/places/sidebar.css"?>
-
 <!DOCTYPE window>

 <window id="bookmarksPanel"
@ -27,6 +21,24 @@
  <script src="chrome://global/content/editMenuOverlay.js"/>

  <linkset>
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/content/places/places.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/content/usercontext/usercontext.css"
+    />
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/skin/places/tree-icons.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/skin/places/sidebar.css"
+    />
+
    <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
    <html:link rel="localization" href="browser/browser.ftl"/>
    <html:link rel="localization" href="browser/places.ftl"/>
--- a/browser/components/places/content/historySidebar.xhtml
+++ b/browser/components/places/content/historySidebar.xhtml
@ -3,12 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
-<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css"?>
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
-<?xml-stylesheet href="chrome://browser/skin/places/sidebar.css"?>
-
 <!DOCTYPE window>

 <window id="history-panel"
@ -28,6 +22,24 @@
  <script src="chrome://global/content/editMenuOverlay.js"/>

  <linkset>
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/content/places/places.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/content/usercontext/usercontext.css"
+    />
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/skin/places/tree-icons.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/skin/places/sidebar.css"
+    />
+
    <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
    <html:link rel="localization" href="browser/places.ftl"/>
  </linkset>
--- a/browser/components/places/content/places.xhtml
+++ b/browser/components/places/content/places.xhtml
@ -4,18 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
-<?xml-stylesheet href="chrome://browser/content/usercontext/usercontext.css"?>
-
-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
-<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css"?>
-<?xml-stylesheet href="chrome://browser/skin/places/organizer-shared.css"?>
-<?xml-stylesheet href="chrome://browser/skin/places/organizer.css"?>
-
-<?xml-stylesheet href="chrome://browser/content/downloads/downloads.css"?>
-<?xml-stylesheet href="chrome://browser/skin/downloads/allDownloadsView.css"?>
-
 <!DOCTYPE window>

 <window id="places"
@ -31,6 +19,40 @@
        persist="width height screenX screenY sizemode">

  <linkset>
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/content/places/places.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/content/usercontext/usercontext.css"
+    />
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/skin/places/tree-icons.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/skin/places/editBookmark.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/skin/places/organizer-shared.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/skin/places/organizer.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/content/downloads/downloads.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/skin/downloads/allDownloadsView.css"
+    />
+
    <html:link rel="localization" href="toolkit/global/textActions.ftl"/>
    <html:link rel="localization" href="browser/browserSets.ftl"/>
    <html:link rel="localization" href="browser/places.ftl"/>
--- a/browser/components/preferences/dialogs/addEngine.xhtml
+++ b/browser/components/preferences/dialogs/addEngine.xhtml
@ -3,10 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/preferences/dialogs/addEngine.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
-
 <window
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  xmlns:html="http://www.w3.org/1999/xhtml"
@ -21,6 +17,16 @@
    data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/content/preferences/dialogs/addEngine.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/preferences.css"
+      />
+
      <html:link rel="localization" href="browser/preferences/addEngine.ftl" />
    </linkset>

--- a/browser/components/preferences/dialogs/applicationManager.xhtml
+++ b/browser/components/preferences/dialogs/applicationManager.xhtml
@ -3,9 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/applications.css"?>
-
 <window
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  xmlns:html="http://www.w3.org/1999/xhtml"
@ -15,6 +12,12 @@
 >
  <dialog id="appManager" buttons="accept,cancel">
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/applications.css"
+      />
+
      <html:link
        rel="localization"
        href="browser/preferences/applicationManager.ftl"
--- a/browser/components/preferences/dialogs/blocklists.xhtml
+++ b/browser/components/preferences/dialogs/blocklists.xhtml
@ -4,9 +4,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
-
 <window
  id="BlocklistsDialog"
  data-l10n-id="blocklist-window2"
@ -23,6 +20,12 @@
    data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/preferences.css"
+      />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link rel="localization" href="browser/preferences/blocklists.ftl" />
    </linkset>
--- a/browser/components/preferences/dialogs/browserLanguages.xhtml
+++ b/browser/components/preferences/dialogs/browserLanguages.xhtml
@ -4,9 +4,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-
 <window
  type="child"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -21,6 +18,12 @@
    helpTopic="change-language"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/preferences.css"
+      />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link rel="localization" href="browser/preferences/languages.ftl" />
    </linkset>
--- a/browser/components/preferences/dialogs/clearSiteData.xhtml
+++ b/browser/components/preferences/dialogs/clearSiteData.xhtml
@ -4,10 +4,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/preferences/dialogs/clearSiteData.css" type="text/css"?>
-
 <window
  id="ClearSiteDataDialog"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -22,6 +18,16 @@
    data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/preferences.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/content/preferences/dialogs/clearSiteData.css"
+      />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link
        rel="localization"
--- a/browser/components/preferences/dialogs/colors.xhtml
+++ b/browser/components/preferences/dialogs/colors.xhtml
@ -5,9 +5,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-
 <window
  type="child"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -22,6 +19,12 @@
    helpTopic="prefs-fonts-and-colors"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/preferences.css"
+      />
+
      <html:link rel="localization" href="browser/preferences/colors.ftl" />
    </linkset>

--- a/browser/components/preferences/dialogs/connection.xhtml
+++ b/browser/components/preferences/dialogs/connection.xhtml
@ -4,9 +4,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-
 <window
  type="child"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -23,6 +20,12 @@
  >
    <!-- Used for extension-controlled lockdown message -->
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/preferences.css"
+      />
+
      <html:link rel="localization" href="browser/preferences/connection.ftl" />
      <html:link
        rel="localization"
--- a/browser/components/preferences/dialogs/containers.xhtml
+++ b/browser/components/preferences/dialogs/containers.xhtml
@ -4,9 +4,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/containers-dialog.css" type="text/css"?>
-
 <window
  id="ContainersDialog"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -23,6 +20,12 @@
    data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/containers-dialog.css"
+      />
+
      <html:link rel="localization" href="browser/preferences/containers.ftl" />
    </linkset>

--- a/browser/components/preferences/dialogs/dohExceptions.xhtml
+++ b/browser/components/preferences/dialogs/dohExceptions.xhtml
@ -4,10 +4,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/preferences/dialogs/sitePermissions.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
-
 <window
  id="DoHExceptionsDialog"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -23,6 +19,16 @@
    data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/content/preferences/dialogs/sitePermissions.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/preferences.css"
+      />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link
        rel="localization"
--- a/browser/components/preferences/dialogs/fonts.xhtml
+++ b/browser/components/preferences/dialogs/fonts.xhtml
@ -5,9 +5,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-
 <window
  type="child"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -22,6 +19,12 @@
    helpTopic="prefs-fonts-and-colors"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/preferences.css"
+      />
+
      <html:link rel="localization" href="browser/preferences/fonts.ftl" />
    </linkset>

--- a/browser/components/preferences/dialogs/languages.xhtml
+++ b/browser/components/preferences/dialogs/languages.xhtml
@ -4,9 +4,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-
 <window
  type="child"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -22,6 +19,12 @@
    helpTopic="prefs-languages"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/preferences.css"
+      />
+
      <html:link rel="localization" href="browser/preferences/languages.ftl" />
    </linkset>

--- a/browser/components/preferences/dialogs/permissions.xhtml
+++ b/browser/components/preferences/dialogs/permissions.xhtml
@ -4,10 +4,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/preferences/dialogs/sitePermissions.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
-
 <window
  id="PermissionsDialog"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -25,6 +21,16 @@
    data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/content/preferences/dialogs/sitePermissions.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/preferences.css"
+      />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link
        rel="localization"
--- a/browser/components/preferences/dialogs/sanitize.xhtml
+++ b/browser/components/preferences/dialogs/sanitize.xhtml
@ -5,9 +5,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-
 <!DOCTYPE window>

 <window
@ -22,6 +19,12 @@
 >
  <dialog buttons="accept,cancel,help" helpTopic="prefs-clear-private-data">
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/preferences.css"
+      />
+
      <html:link rel="localization" href="browser/sanitize.ftl" />
      <html:link rel="localization" href="branding/brand.ftl" />
    </linkset>
--- a/browser/components/preferences/dialogs/selectBookmark.xhtml
+++ b/browser/components/preferences/dialogs/selectBookmark.xhtml
@ -3,11 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://browser/content/places/places.css"?>
-
-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://browser/skin/places/tree-icons.css"?>
-
 <window
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  xmlns:html="http://www.w3.org/1999/xhtml"
@ -18,6 +13,16 @@
 >
  <dialog id="selectBookmarkDialog">
    <linkset>
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/content/places/places.css"
+      />
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/places/tree-icons.css"
+      />
+
      <html:link
        rel="localization"
        href="browser/preferences/selectBookmark.ftl"
--- a/browser/components/preferences/dialogs/siteDataRemoveSelected.xhtml
+++ b/browser/components/preferences/dialogs/siteDataRemoveSelected.xhtml
@ -4,9 +4,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/siteDataSettings.css" type="text/css"?>
-
 <window id="SiteDataRemoveSelectedDialog"
        width="500"
        data-l10n-id="site-data-removing-dialog"
@ -18,6 +15,12 @@
        data-l10n-attrs="buttonlabelaccept">

  <linkset>
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <html:link
+      rel="stylesheet"
+      href="chrome://browser/skin/preferences/siteDataSettings.css"
+    />
+
    <html:link rel="localization" href="browser/preferences/siteDataSettings.ftl"/>
  </linkset>

--- a/browser/components/preferences/dialogs/siteDataSettings.xhtml
+++ b/browser/components/preferences/dialogs/siteDataSettings.xhtml
@ -4,10 +4,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/siteDataSettings.css" type="text/css"?>
-
 <window
  id="SiteDataSettingsDialog"
  data-l10n-id="site-data-settings-window"
@ -25,6 +21,16 @@
    data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/preferences.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/siteDataSettings.css"
+      />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link
        rel="localization"
--- a/browser/components/preferences/dialogs/sitePermissions.xhtml
+++ b/browser/components/preferences/dialogs/sitePermissions.xhtml
@ -4,10 +4,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/content/preferences/dialogs/sitePermissions.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
-
 <window
  id="SitePermissionsDialog"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -24,6 +20,16 @@
    data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/content/preferences/dialogs/sitePermissions.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/preferences.css"
+      />
+
      <html:link
        rel="localization"
        href="browser/preferences/preferences.ftl"
--- a/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
+++ b/browser/components/preferences/dialogs/syncChooseWhatToSync.xhtml
@ -5,8 +5,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-
 <window
  type="child"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -22,6 +20,8 @@
    data-l10n-attrs="buttonlabelaccept, buttonlabelextra2"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
      <html:link
        rel="localization"
        href="browser/preferences/preferences.ftl"
--- a/browser/components/preferences/dialogs/translationExceptions.xhtml
+++ b/browser/components/preferences/dialogs/translationExceptions.xhtml
@ -6,9 +6,6 @@

 <!-- TODO (Bug 1817084) Remove this file when we disable the extension -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
-
 <window
  id="TranslationDialog"
  data-l10n-id="translation-window2"
@ -25,6 +22,12 @@
    data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/preferences.css"
+      />
+
      <html:link
        rel="localization"
        href="browser/preferences/translation.ftl"
--- a/browser/components/preferences/dialogs/translations.xhtml
+++ b/browser/components/preferences/dialogs/translations.xhtml
@ -4,9 +4,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css" type="text/css"?>
-
 <window
  id="TranslationsDialog"
  data-l10n-id="translations-settings-title"
@ -23,6 +20,12 @@
    data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/preferences.css"
+      />
+
      <html:link rel="localization" href="browser/translations.ftl" />
    </linkset>

--- a/browser/components/preferences/fxaPairDevice.xhtml
+++ b/browser/components/preferences/fxaPairDevice.xhtml
@ -5,9 +5,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/fxaPairDevice.css" type="text/css"?>
-
 <window
  id="fxaPairDeviceDialog"
  type="child"
@ -20,6 +17,12 @@
 >
  <dialog id="fxaPairDeviceDialog1" buttons="accept">
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://browser/skin/preferences/fxaPairDevice.css"
+      />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link
        rel="localization"
--- a/browser/components/preferences/preferences.xhtml
+++ b/browser/components/preferences/preferences.xhtml
@ -3,16 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this file,
   - You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-
-<?xml-stylesheet href="chrome://global/skin/in-content/common.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/preferences.css"?>
-<?xml-stylesheet href="chrome://browser/content/preferences/dialogs/handlers.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/applications.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/search.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/containers.css"?>
-<?xml-stylesheet href="chrome://browser/skin/preferences/privacy.css"?>
-
 <!DOCTYPE html>

 <html xmlns="http://www.w3.org/1999/xhtml"
@ -27,6 +17,27 @@
  <title data-l10n-id="settings-page-title"></title>

  <meta name="color-scheme" content="light dark" />
+  <link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <link rel="stylesheet" href="chrome://global/skin/in-content/common.css" />
+  <link
+    rel="stylesheet"
+    href="chrome://browser/skin/preferences/preferences.css"
+  />
+  <link
+    rel="stylesheet"
+    href="chrome://browser/content/preferences/dialogs/handlers.css"
+  />
+  <link
+    rel="stylesheet"
+    href="chrome://browser/skin/preferences/applications.css"
+  />
+  <link rel="stylesheet" href="chrome://browser/skin/preferences/search.css" />
+  <link
+    rel="stylesheet"
+    href="chrome://browser/skin/preferences/containers.css"
+  />
+  <link rel="stylesheet" href="chrome://browser/skin/preferences/privacy.css" />
+
  <link rel="localization" href="branding/brand.ftl"/>
  <link rel="localization" href="browser/browser.ftl"/>
    <!-- Used by fontbuilder.js -->
--- a/browser/components/shell/content/setDesktopBackground.xhtml
+++ b/browser/components/shell/content/setDesktopBackground.xhtml
@ -4,9 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://browser/skin/setDesktopBackground.css" type="text/css"?>
-
 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        xmlns:html="http://www.w3.org/1999/xhtml"
        windowtype="Shell:SetDesktopBackground"
@ -15,6 +12,12 @@
        style="min-width: 30em;">

 <linkset>
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://browser/skin/setDesktopBackground.css"
+  />
+
  <html:link rel="localization" href="browser/setDesktopBackground.ftl"/>
 </linkset>

--- a/devtools/client/framework/toolbox-window.xhtml
+++ b/devtools/client/framework/toolbox-window.xhtml
@ -3,8 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
 <!-- minwidth=50 is sum width of chevron and meatball menu button. -->
 <window
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -16,6 +14,8 @@
  height="320"
  persist="screenX screenY width height sizemode"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
  <tooltip id="aHTMLTooltip" page="true" />
  <script src="resource://devtools/client/framework/toolbox-window.js" />
 </window>
--- a/devtools/client/framework/toolbox.xhtml
+++ b/devtools/client/framework/toolbox.xhtml
@ -2,11 +2,6 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/toolbox.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/content/shared/components/NotificationBox.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/content/framework/components/DebugTargetErrorPage.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/content/framework/components/ChromeDebugToolbar.css" type="text/css"?>

 <!DOCTYPE window>
 <window
@ -16,6 +11,21 @@
  role="application"
 >
  <linkset>
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <html:link rel="stylesheet" href="chrome://devtools/skin/toolbox.css" />
+    <html:link
+      rel="stylesheet"
+      href="chrome://devtools/content/shared/components/NotificationBox.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://devtools/content/framework/components/DebugTargetErrorPage.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://devtools/content/framework/components/ChromeDebugToolbar.css"
+    />
+
    <html:link rel="localization" href="devtools/client/tooltips.ftl" />
  </linkset>

--- a/devtools/client/storage/index.xhtml
+++ b/devtools/client/storage/index.xhtml
@ -2,11 +2,6 @@
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/storage.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/content/shared/components/SidebarToggle.css" type="text/css"?>

 <!DOCTYPE window>

@ -14,6 +9,18 @@
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  xmlns:html="http://www.w3.org/1999/xhtml"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://devtools/content/shared/widgets/widgets.css"
+  />
+  <html:link rel="stylesheet" href="chrome://devtools/skin/widgets.css" />
+  <html:link rel="stylesheet" href="chrome://devtools/skin/storage.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://devtools/content/shared/components/SidebarToggle.css"
+  />
+
  <html:link rel="localization" href="devtools/client/storage.ftl" />

  <script src="chrome://devtools/content/shared/theme-switching.js" />
--- a/devtools/client/styleeditor/index.xhtml
+++ b/devtools/client/styleeditor/index.xhtml
@ -4,20 +4,26 @@
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 <!DOCTYPE window>

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/content/shared/widgets/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/content/shared/toolbarbutton.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/chart.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/widgets.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/splitview.css" type="text/css"?>
-<?xml-stylesheet href="chrome://devtools/skin/styleeditor.css" type="text/css"?>
-
 <window
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  xmlns:html="http://www.w3.org/1999/xhtml"
  id="style-editor-chrome-window"
 >
  <linkset>
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <html:link
+      rel="stylesheet"
+      href="chrome://devtools/content/shared/widgets/widgets.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://devtools/content/shared/toolbarbutton.css"
+    />
+    <html:link rel="stylesheet" href="chrome://devtools/skin/chart.css" />
+    <html:link rel="stylesheet" href="chrome://devtools/skin/widgets.css" />
+    <html:link rel="stylesheet" href="chrome://devtools/skin/splitview.css" />
+    <html:link rel="stylesheet" href="chrome://devtools/skin/styleeditor.css" />
+
    <html:link rel="localization" href="toolkit/global/textActions.ftl" />
    <html:link rel="localization" href="devtools/client/styleeditor.ftl" />
  </linkset>
--- a/layout/tools/layout-debug/ui/content/layoutdebug.xhtml
+++ b/layout/tools/layout-debug/ui/content/layoutdebug.xhtml
@ -8,8 +8,6 @@

 <!DOCTYPE window>

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css" ?>
-
 <!--

  NOTE:  Because this window is used for layout regression tests, the
@ -35,6 +33,8 @@
  screenY="4"
 >
  <linkset>
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
    <html:link rel="localization" href="layoutdebug/layoutdebug.ftl" />
  </linkset>

--- a/remote/marionette/chrome/test.xhtml
+++ b/remote/marionette/chrome/test.xhtml
@ -3,8 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
 <!DOCTYPE window [ ]>
 <window
  id="winTest"
@ -13,6 +11,8 @@
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  xmlns:html="http://www.w3.org/1999/xhtml"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
  <dialog id="dia">
    <vbox id="things">
      <input
--- a/remote/marionette/chrome/test_dialog.xhtml
+++ b/remote/marionette/chrome/test_dialog.xhtml
@ -6,13 +6,13 @@
 <!DOCTYPE testdialog [ <!ENTITY % dialogDTD SYSTEM "chrome://remote/content/marionette/test_dialog.dtd">
 %dialogDTD; ]>

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
 <window
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  xmlns:html="http://www.w3.org/1999/xhtml"
  title="&testDialog.title;"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
  <dialog id="testDialog" buttons="accept,cancel">
    <vbox flex="1" style="min-width: 300px; min-height: 500px">
      <label>&settings.label;</label>
--- a/remote/marionette/chrome/test_menupopup.xhtml
+++ b/remote/marionette/chrome/test_menupopup.xhtml
@ -3,14 +3,14 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
 <!DOCTYPE window [ ]>
 <window
  id="test-window"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  xmlns:html="http://www.w3.org/1999/xhtml"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
  <popupset id="options-popupset">
    <menupopup id="options-menupopup" position="before_end">
      <menuitem id="option-enabled" type="checkbox" label="enabled" />
--- a/remote/marionette/chrome/test_no_xul.xhtml
+++ b/remote/marionette/chrome/test_no_xul.xhtml
@ -5,14 +5,14 @@

 <!-- Test file for a non XUL window by using a XHTML document instead.  -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
 <html
  id="winTest"
  xmlns:html="http://www.w3.org/1999/xhtml"
  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  xmlns="http://www.w3.org/1999/xhtml"
 >
+  <link rel="stylesheet" href="chrome://global/skin/global.css" />
+
  <head>
    <title>Title Test</title>
  </head>
--- a/security/manager/pki/resources/content/certManager.xhtml
+++ b/security/manager/pki/resources/content/certManager.xhtml
@ -3,9 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://pippki/content/certManager.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window
@ -18,6 +15,12 @@
 >
  <dialog id="certmanager" buttons="accept">
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://pippki/content/certManager.css"
+      />
+
      <html:link
        rel="localization"
        href="security/certificates/certManager.ftl"
--- a/security/manager/pki/resources/content/changepassword.xhtml
+++ b/security/manager/pki/resources/content/changepassword.xhtml
@ -3,8 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window
@ -15,6 +13,8 @@
 >
  <dialog id="set_password" buttons="accept,cancel">
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
      <html:link rel="localization" href="security/pippki/pippki.ftl" />
    </linkset>

--- a/security/manager/pki/resources/content/clientauthask.xhtml
+++ b/security/manager/pki/resources/content/clientauthask.xhtml
@ -3,9 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://pippki/content/clientauthask.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window
@ -20,6 +17,12 @@
    buttonidcancel="client-auth-send-no-certificate"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://pippki/content/clientauthask.css"
+      />
+
      <html:link rel="localization" href="security/pippki/pippki.ftl" />
    </linkset>

--- a/security/manager/pki/resources/content/deletecert.xhtml
+++ b/security/manager/pki/resources/content/deletecert.xhtml
@ -3,9 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://pippki/content/deletecert.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window
@ -17,6 +14,12 @@
 >
  <dialog id="deleteCertificate" buttons="accept,cancel">
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://pippki/content/deletecert.css"
+      />
+
      <html:link
        rel="localization"
        href="security/certificates/certManager.ftl"
--- a/security/manager/pki/resources/content/device_manager.xhtml
+++ b/security/manager/pki/resources/content/device_manager.xhtml
@ -3,8 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
 <!DOCTYPE dialog>

 <window
@ -18,6 +16,8 @@
 >
  <dialog id="devicemanager" buttons="accept">
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
      <html:link
        rel="localization"
        href="security/certificates/deviceManager.ftl"
--- a/security/manager/pki/resources/content/downloadcert.xhtml
+++ b/security/manager/pki/resources/content/downloadcert.xhtml
@ -3,8 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window
@ -16,6 +14,8 @@
 >
  <dialog id="download_cert" buttons="accept,cancel">
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
      <html:link rel="localization" href="security/pippki/pippki.ftl" />
    </linkset>

--- a/security/manager/pki/resources/content/editcacert.xhtml
+++ b/security/manager/pki/resources/content/editcacert.xhtml
@ -3,8 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window
@ -15,6 +13,8 @@
 >
  <dialog id="editCaCert" buttons="accept,cancel">
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
      <html:link
        rel="localization"
        href="security/certificates/certManager.ftl"
--- a/security/manager/pki/resources/content/exceptionDialog.xhtml
+++ b/security/manager/pki/resources/content/exceptionDialog.xhtml
@ -3,9 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://pippki/content/exceptionDialog.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window windowtype="mozilla:exceptiondialog"
@ -19,6 +16,12 @@
        defaultButton="extra2">

  <linkset>
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <html:link
+      rel="stylesheet"
+      href="chrome://pippki/content/exceptionDialog.css"
+    />
+
    <html:link rel="localization" href="branding/brand.ftl"/>
    <html:link rel="localization" href="security/certificates/certManager.ftl"/>
  </linkset>
--- a/security/manager/pki/resources/content/load_device.xhtml
+++ b/security/manager/pki/resources/content/load_device.xhtml
@ -3,8 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window
@ -14,6 +12,8 @@
 >
  <dialog id="loaddevice" buttons="accept,cancel">
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
      <html:link
        rel="localization"
        href="security/certificates/deviceManager.ftl"
--- a/security/manager/pki/resources/content/resetpassword.xhtml
+++ b/security/manager/pki/resources/content/resetpassword.xhtml
@ -3,8 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window
@ -20,6 +18,8 @@
    defaultButton="cancel"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
      <html:link rel="localization" href="security/pippki/pippki.ftl" />
    </linkset>

--- a/security/manager/pki/resources/content/setp12password.xhtml
+++ b/security/manager/pki/resources/content/setp12password.xhtml
@ -3,8 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window
@ -16,6 +14,8 @@
 >
  <dialog id="setp12password" buttons="accept,cancel">
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
      <html:link rel="localization" href="security/pippki/pippki.ftl" />
    </linkset>

--- a/toolkit/components/alerts/alert.xhtml
+++ b/toolkit/components/alerts/alert.xhtml
@ -5,9 +5,6 @@

 <!DOCTYPE window>

-<?xml-stylesheet href="chrome://global/content/alerts/alert.css" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/alert.css" type="text/css"?>
-
 <window
  id="alertNotification"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -20,6 +17,12 @@
  onbeforeunload="onAlertBeforeUnload();"
 >
  <linkset>
+    <xhtml:link
+      rel="stylesheet"
+      href="chrome://global/content/alerts/alert.css"
+    />
+    <xhtml:link rel="stylesheet" href="chrome://global/skin/alert.css" />
+
    <xhtml:link rel="localization" href="toolkit/global/alert.ftl" />
  </linkset>

--- a/toolkit/components/apppicker/content/appPicker.xhtml
+++ b/toolkit/components/apppicker/content/appPicker.xhtml
@ -4,9 +4,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/appPicker.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window
@ -24,6 +21,9 @@
    defaultButton="accept"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link rel="stylesheet" href="chrome://global/skin/appPicker.css" />
+
      <html:link rel="localization" href="toolkit/global/appPicker.ftl" />
    </linkset>
    <script src="chrome://global/content/appPicker.js" />
--- a/toolkit/components/printing/content/printPageSetup.xhtml
+++ b/toolkit/components/printing/content/printPageSetup.xhtml
@ -5,10 +5,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/in-content/common.css"?>
-<?xml-stylesheet href="chrome://global/skin/printPageSetup.css" type="text/css"?>
-
 <window
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  xmlns:html="http://www.w3.org/1999/xhtml"
@ -22,6 +18,16 @@
 >
  <dialog id="printPageSetupDialog">
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://global/skin/in-content/common.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://global/skin/printPageSetup.css"
+      />
+
      <html:link rel="localization" href="toolkit/printing/printDialogs.ftl" />
    </linkset>

--- a/toolkit/components/prompts/content/commonDialog.xhtml
+++ b/toolkit/components/prompts/content/commonDialog.xhtml
@ -3,10 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://global/content/commonDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://global/skin/commonDialog.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window
@ -20,6 +16,16 @@
 >
  <dialog id="commonDialog" buttonpack="end">
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://global/content/commonDialog.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://global/skin/commonDialog.css"
+      />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link rel="localization" href="toolkit/global/commonDialog.ftl" />
    </linkset>
--- a/toolkit/components/prompts/content/selectDialog.xhtml
+++ b/toolkit/components/prompts/content/selectDialog.xhtml
@ -4,13 +4,14 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
 <!DOCTYPE window>

 <window
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  xmlns:html="http://www.w3.org/1999/xhtml"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
  <dialog>
    <script src="chrome://global/content/selectDialog.js" />
    <keyset id="dialogKeys" />
--- a/toolkit/content/resetProfile.xhtml
+++ b/toolkit/content/resetProfile.xhtml
@ -4,11 +4,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://global/content/commonDialog.css"?>
-<?xml-stylesheet href="chrome://global/skin/commonDialog.css"?>
-<?xml-stylesheet href="chrome://global/content/resetProfile.css"?>
-
 <window
  id="resetProfileDialogWindow"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -25,6 +20,20 @@
    <!-- The empty onload event handler is a hack to get the accept button text applied by Fluent. -->

    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://global/content/commonDialog.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://global/skin/commonDialog.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://global/content/resetProfile.css"
+      />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link rel="localization" href="toolkit/global/resetProfile.ftl" />
    </linkset>
--- a/toolkit/content/resetProfileProgress.xhtml
+++ b/toolkit/content/resetProfileProgress.xhtml
@ -6,9 +6,6 @@

 <!DOCTYPE window>

-<?xml-stylesheet href="chrome://global/content/resetProfile.css"?>
-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-
 <window
  id="resetProfileProgressDialog"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -18,6 +15,12 @@
 >
  <vbox>
    <linkset>
+      <html:link
+        rel="stylesheet"
+        href="chrome://global/content/resetProfile.css"
+      />
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link rel="localization" href="toolkit/global/resetProfile.ftl" />
    </linkset>
--- a/toolkit/mozapps/downloads/content/unknownContentType.xhtml
+++ b/toolkit/mozapps/downloads/content/unknownContentType.xhtml
@ -4,9 +4,6 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://mozapps/skin/downloads/unknownContentType.css" type="text/css"?>
-
 <window id="unknownContentTypeWindow"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        xmlns:html="http://www.w3.org/1999/xhtml"
@ -20,6 +17,12 @@
        persist="screenX screenY"
        aria-describedby="intro location whichIs type from source unknownPrompt">
 <linkset>
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://mozapps/skin/downloads/unknownContentType.css"
+  />
+
  <html:link rel="localization" href="branding/brand.ftl"/>
  <html:link rel="localization" href="toolkit/global/unknownContentType.ftl"/>
 </linkset>
--- a/toolkit/mozapps/handling/content/appChooser.xhtml
+++ b/toolkit/mozapps/handling/content/appChooser.xhtml
@ -1,7 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://mozapps/content/handling/handler.css"?>
-<?xml-stylesheet href="chrome://mozapps/skin/handling/handling.css"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
@ -24,6 +21,16 @@
    data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://mozapps/content/handling/handler.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://mozapps/skin/handling/handling.css"
+      />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link rel="localization" href="toolkit/global/handlerDialog.ftl" />
    </linkset>
--- a/toolkit/mozapps/handling/content/permissionDialog.xhtml
+++ b/toolkit/mozapps/handling/content/permissionDialog.xhtml
@ -1,6 +1,4 @@
 <?xml version="1.0"?>
-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://mozapps/content/handling/handler.css"?>
 <!-- This Source Code Form is subject to the terms of the Mozilla Public
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
@ -18,6 +16,12 @@
    data-l10n-attrs="buttonlabelaccept, buttonaccesskeyaccept"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://mozapps/content/handling/handler.css"
+      />
+
      <html:link rel="localization" href="toolkit/global/handlerDialog.ftl" />
    </linkset>

--- a/toolkit/mozapps/preferences/changemp.xhtml
+++ b/toolkit/mozapps/preferences/changemp.xhtml
@ -4,8 +4,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
 <window
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  xmlns:html="http://www.w3.org/1999/xhtml"
@ -17,6 +15,8 @@
    <script src="chrome://mozapps/content/preferences/changemp.js" />

    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link
        rel="localization"
--- a/toolkit/mozapps/preferences/removemp.xhtml
+++ b/toolkit/mozapps/preferences/removemp.xhtml
@ -3,8 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
 <window
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  xmlns:html="http://www.w3.org/1999/xhtml"
@ -16,6 +14,8 @@
    <script src="chrome://mozapps/content/preferences/removemp.js" />

    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link
        rel="localization"
--- a/toolkit/mozapps/update/content/history.xhtml
+++ b/toolkit/mozapps/update/content/history.xhtml
@ -6,9 +6,6 @@

 <!DOCTYPE window>

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://mozapps/skin/update/updates.css"?>
-
 <window
  windowtype="Update:History"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -26,6 +23,12 @@
    data-l10n-attrs="buttonlabelcancel"
  >
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://mozapps/skin/update/updates.css"
+      />
+
      <html:link rel="localization" href="toolkit/updates/history.ftl" />
    </linkset>

--- a/toolkit/mozapps/update/content/updateElevation.xhtml
+++ b/toolkit/mozapps/update/content/updateElevation.xhtml
@ -6,9 +6,6 @@

 <!-- This is temporary until bug 1521632 is fixed -->

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://mozapps/skin/update/updates.css"?>
-
 <window windowtype="Update:Elevation"
        type="child"
        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -26,6 +23,9 @@
  <script src="chrome://mozapps/content/update/updateElevation.js"/>

 <linkset>
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://mozapps/skin/update/updates.css" />
+
  <html:link rel="localization" href="branding/brand.ftl"/>
  <html:link rel="localization" href="toolkit/updates/elevation.ftl"/>
 </linkset>
--- a/toolkit/profile/content/createProfileWizard.xhtml
+++ b/toolkit/profile/content/createProfileWizard.xhtml
@ -3,8 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
 <!DOCTYPE wizard>

 <window
@ -17,6 +15,8 @@
  data-l10n-attrs="style"
 >
  <linkset>
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
    <html:link rel="localization" href="branding/brand.ftl" />
    <html:link
      rel="localization"
--- a/toolkit/profile/content/profileDowngrade.xhtml
+++ b/toolkit/profile/content/profileDowngrade.xhtml
@ -3,9 +3,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://mozapps/skin/profileDowngrade.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -15,6 +12,12 @@
        data-l10n-attrs="title,style"
        onload="init()">
 <linkset>
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://mozapps/skin/profileDowngrade.css"
+  />
+
  <html:link rel="localization" href="branding/brand.ftl"/>
  <html:link rel="localization" href="toolkit/global/profileDowngrade.ftl"/>
 </linkset>
--- a/toolkit/profile/content/profileSelection.xhtml
+++ b/toolkit/profile/content/profileSelection.xhtml
@ -6,8 +6,6 @@
   - License, v. 2.0. If a copy of the MPL was not distributed with this
   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://mozapps/skin/profileSelection.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window
@ -27,6 +25,11 @@
    buttonidcancel="profile-selection-button-cancel"
  >
    <linkset>
+      <html:link
+        rel="stylesheet"
+        href="chrome://mozapps/skin/profileSelection.css"
+      />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link
        rel="localization"