Bug 1859273 - Port bug 1857999 to Thunderbird - Stop using xml-stylesheet processing instructions for styling non-test xhtml documents. r=freaktechnik

Using https://github.com/Mossop/depi find -name "*.xhtml" -not -path "./suite/*" > /tmp/depi/filelist.txt node index.js path-to/comm/ Differential Revision: https://phabricator.services.mozilla.com/D191114 --HG-- extra : amend_source : 9b289924f64aa4b22a9ebfaaf3c8853bc1d2f69d extra : absorb_source : 3aa297db246dfd7ebcbac5d8465f4b639c054c54
2023-10-18 11:00:28 +01:00 · 2023-10-18 11:00:28 +01:00 · e46ee7e77a
--- a/.prettierignore
+++ b/.prettierignore
@ -45,7 +45,6 @@ mailnews/test/data/alias-9.json


 # Ignore preprocessed xhtml/html files
-calendar/base/content/dialogs/calendar-event-dialog.xhtml
 calendar/base/content/widgets/*.xhtml
 mail/base/content/about3Pane.xhtml
 mail/base/content/aboutDialog.xhtml
@ -81,7 +80,6 @@ mailnews/base/prefs/content/am-addressing.xhtml
 mailnews/base/prefs/content/am-copies.xhtml
 mailnews/base/prefs/content/am-identity-edit.xhtml
 mailnews/import/content/aboutImport.xhtml
-mailnews/search/content/CustomHeaders.xhtml
 mailnews/search/content/FilterEditor.xhtml

 # Chat template files that are space sensitive
--- a/calendar/base/content/dialogs/calendar-alarm-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-alarm-dialog.xhtml
@ -3,15 +3,7 @@
   - 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://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/contextMenu.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/calendar-alarm-dialog.css" type="text/css"?>
-
 <!DOCTYPE html SYSTEM "chrome://calendar/locale/calendar.dtd">
-
 <html
  id="calendar-alarm-dialog"
  xmlns="http://www.w3.org/1999/xhtml"
@ -27,6 +19,12 @@
 >
  <head>
    <title>&calendar.alarm.title.label;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/calendar-alarm-dialog.css" />
    <script defer="defer" src="chrome://calendar/content/calendar-item-editing.js"></script>
    <script defer="defer" src="chrome://calendar/content/widgets/calendar-alarm-widget.js"></script>
    <script defer="defer" src="chrome://calendar/content/calApplicationUtils.js"></script>
--- a/calendar/base/content/dialogs/calendar-conflicts-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-conflicts-dialog.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 type="text/css" href="chrome://messenger/skin/messenger.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-views.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/colors.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/themeableDialog.css"?>
-
 <html
  id="calendar-conflicts-dialog"
  xmlns="http://www.w3.org/1999/xhtml"
@ -19,6 +14,11 @@
  scrolling="false"
 >
  <head>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/calendar-views.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+
    <link rel="localization" href="branding/brand.ftl" />
    <script defer="defer" src="chrome://calendar/content/widgets/mouseoverPreviews.js"></script>
    <script defer="defer" src="chrome://messenger/content/dialogShadowDom.js"></script>
--- a/calendar/base/content/dialogs/calendar-creation.xhtml
+++ b/calendar/base/content/dialogs/calendar-creation.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 type="text/css" href="chrome://messenger/skin/messenger.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/colors.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/themeableDialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-creation.css"?>
-
 <!-- TODO: messenger.dtd is used for the "Next" button; some relocation is needed. -->
 <!DOCTYPE html [ <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendarCreation.dtd"> %dtd1;
 <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" >
@ -28,6 +22,12 @@
 >
  <head>
    <title>&wizard.title;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/calendar-creation.css" />
+
    <link rel="localization" href="toolkit/global/wizard.ftl" />
    <script defer="defer" src="chrome://messenger/content/globalOverlay.js"></script>
    <script defer="defer" src="chrome://global/content/editMenuOverlay.js"></script>
--- a/calendar/base/content/dialogs/calendar-error-prompt.xhtml
+++ b/calendar/base/content/dialogs/calendar-error-prompt.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://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE html [ <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd"> %dtd1;
 <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" >
 %dtd2; ]>
@ -20,6 +16,9 @@
 >
  <head>
    <title>&calendar.error.title;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
    <script defer="defer" src="chrome://messenger/content/globalOverlay.js"></script>
    <script defer="defer" src="chrome://global/content/editMenuOverlay.js"></script>
    <script defer="defer" src="chrome://messenger/content/dialogShadowDom.js"></script>
--- a/calendar/base/content/dialogs/calendar-event-dialog-attendees.xhtml
+++ b/calendar/base/content/dialogs/calendar-event-dialog-attendees.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 type="text/css" href="chrome://messenger/skin/messenger.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-views.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-attendees.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/widgets/minimonth.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog-attendees.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/datetimepickers.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/shared/input-fields.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/themeableDialog.css"?>
-
 <!DOCTYPE html [ <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar.dtd"> %dtd1;
 <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd" >
 %dtd2; ]>
@ -29,6 +19,18 @@
 >
  <head>
    <title>&invite.title.label;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/calendar-views.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/calendar-attendees.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/widgets/minimonth.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css" />
+    <link
+      rel="stylesheet"
+      href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog-attendees.css"
+    />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/datetimepickers.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/shared/input-fields.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
    <script defer="defer" src="chrome://messenger/content/globalOverlay.js"></script>
    <script defer="defer" src="chrome://global/content/editMenuOverlay.js"></script>
    <script defer="defer" src="chrome://messenger/content/dialogShadowDom.js"></script>
--- a/calendar/base/content/dialogs/calendar-event-dialog-recurrence.xhtml
+++ b/calendar/base/content/dialogs/calendar-event-dialog-recurrence.xhtml
@ -3,17 +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://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/messenger.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-daypicker.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/widgets/minimonth.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/datetimepickers.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/contextMenu.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/themeableDialog.css"?>
-
 <!DOCTYPE html [ <!ENTITY % dialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
 %dialogDTD; ]>
 <html
@ -28,6 +17,17 @@
 >
  <head>
    <title>&recurrence.title.label;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/calendar-daypicker.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/widgets/minimonth.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/calendar-event-dialog.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/datetimepickers.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+
    <link rel="localization" href="calendar/calendar-recurrence-dialog.ftl" />
    <script defer="defer" src="chrome://messenger/content/dialogShadowDom.js"></script>
    <script defer="defer" src="chrome://calendar/content/calendar-dialog-utils.js"></script>
--- a/calendar/base/content/dialogs/calendar-event-dialog-reminder.xhtml
+++ b/calendar/base/content/dialogs/calendar-event-dialog-reminder.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 type="text/css" href="chrome://messenger/skin/messenger.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-alarms.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/widgets/minimonth.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/datetimepickers.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/contextMenu.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/colors.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/themeableDialog.css"?>
-
 <!DOCTYPE window SYSTEM "chrome://calendar/locale/dialogs/calendar-event-dialog-reminder.dtd">

 <window
@ -27,6 +17,16 @@
 >
  <dialog>
    <linkset>
+      <html:link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+      <html:link rel="stylesheet" href="chrome://calendar/skin/shared/calendar-alarms.css" />
+      <html:link rel="stylesheet" href="chrome://calendar/skin/shared/widgets/minimonth.css" />
+      <html:link rel="stylesheet" href="chrome://calendar/skin/calendar-event-dialog.css" />
+      <html:link rel="stylesheet" href="chrome://calendar/skin/shared/datetimepickers.css" />
+      <html:link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+      <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+      <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+      <html:link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+
      <html:link rel="localization" href="calendar/calendar-event-dialog-reminder.ftl" />
    </linkset>

--- a/calendar/base/content/dialogs/calendar-event-dialog-timezone.xhtml
+++ b/calendar/base/content/dialogs/calendar-event-dialog-timezone.xhtml
@ -3,14 +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 type="text/css" href="chrome://messenger/skin/messenger.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-timezone-highlighter.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/widgets/minimonth.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/datetimepickers.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/contextMenu.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/themeableDialog.css"?>
-
 <!DOCTYPE html [ <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd"> %dtd1;
 <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" >
 %dtd2;
@ -27,6 +19,13 @@
 >
  <head>
    <title>&timezone.title.label;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/calendar-event-dialog.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/calendar-timezone-highlighter.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/widgets/minimonth.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/datetimepickers.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
    <script defer="defer" src="chrome://messenger/content/dialogShadowDom.js"></script>
    <script defer="defer" src="chrome://calendar/content/widgets/calendar-minimonth.js"></script>
    <script defer="defer" src="chrome://calendar/content/calendar-dialog-utils.js"></script>
--- a/calendar/base/content/dialogs/calendar-event-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-event-dialog.xhtml
--- a/calendar/base/content/dialogs/calendar-ics-file-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-ics-file-dialog.xhtml
@ -3,18 +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 type="text/css" href="chrome://messenger/skin/messenger.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-alarms.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-attendees.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/searchBox.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-item-summary.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/contextMenu.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/themeableDialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/dialogs/calendar-ics-file-dialog.css"?>
-
 <html
  id="calendar-ics-file-dialog"
  xmlns="http://www.w3.org/1999/xhtml"
@ -26,6 +14,21 @@
 >
  <head>
    <title data-l10n-id="calendar-ics-file-window-title"></title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/calendar-alarms.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/calendar-attendees.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/searchBox.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/calendar-event-dialog.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/calendar-item-summary.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+    <link
+      rel="stylesheet"
+      href="chrome://calendar/skin/shared/dialogs/calendar-ics-file-dialog.css"
+    />
+
    <link rel="localization" href="calendar/calendar-editable-item.ftl" />
    <link rel="localization" href="calendar/calendar-ics-file-dialog.ftl" />
    <script src="chrome://messenger/content/dialogShadowDom.js"></script>
--- a/calendar/base/content/dialogs/calendar-invitations-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-invitations-dialog.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 type="text/css" href="chrome://messenger/skin/messenger.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-invitations-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/colors.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/themeableDialog.css"?>
-
 <!DOCTYPE html [ <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/calendar-invitations-dialog.dtd">
 %dtd1; ]>

@ -24,6 +19,11 @@
 >
  <head>
    <title>&calendar.invitations.dialog.invitations.text;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/calendar-invitations-dialog.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+
    <link rel="localization" href="calendar/calendar-invitations-dialog.ftl" />
    <script defer="defer" src="chrome://messenger/content/dialogShadowDom.js"></script>
    <script defer="defer" src="chrome://calendar/content/calendar-ui-utils.js"></script>
--- a/calendar/base/content/dialogs/calendar-itip-identity-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-itip-identity-dialog.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 type="text/css" href="chrome://messenger/skin/messenger.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/dialogs/calendar-itip-identity-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/contextMenu.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/colors.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/themeableDialog.css"?>
-
 <!DOCTYPE html>

 <html
@ -20,6 +14,15 @@
  <head>
    <title data-l10n-id="calendar-itip-identity-dialog-title"></title>

+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link
+      rel="stylesheet"
+      href="chrome://calendar/skin/shared/dialogs/calendar-itip-identity-dialog.css"
+    />
+    <link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+
    <link rel="localization" href="calendar/calendar-itip-identity-dialog.ftl" />

    <script defer="defer" src="chrome://calendar/content/calendar-ui-utils.js"></script>
--- a/calendar/base/content/dialogs/calendar-migration-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-migration-dialog.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/. -->

-<!-- Style sheets -->
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-
 <!DOCTYPE html [ <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 <!ENTITY % migrationDtd SYSTEM "chrome://calendar/locale/migration.dtd">
@ -21,6 +18,8 @@
 >
  <head>
    <title>&migration.title;</title>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
+
    <link rel="localization" href="toolkit/global/wizard.ftl" />
    <script defer="defer" src="chrome://calendar/content/import-export.js"></script>
    <script defer="defer" src="chrome://calendar/content/calendar-migration-dialog.js"></script>
--- a/calendar/base/content/dialogs/calendar-occurrence-prompt.xhtml
+++ b/calendar/base/content/dialogs/calendar-occurrence-prompt.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://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/shared/calendar-occurrence-prompt.css" type="text/css"?>
-
 <!DOCTYPE html SYSTEM "chrome://calendar/locale/calendar-occurrence-prompt.dtd">
 <html
  id="calendar-occurrence-prompt"
@ -19,6 +14,10 @@
 >
  <head>
    <title><!-- windowtitle.${itemType}.${action} --></title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/calendar-occurrence-prompt.css" />
    <script defer="defer" src="chrome://messenger/content/dialogShadowDom.js"></script>
    <script defer="defer" src="chrome://calendar/content/calendar-occurrence-prompt.js"></script>
  </head>
--- a/calendar/base/content/dialogs/calendar-properties-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-properties-dialog.xhtml
@ -3,13 +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://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/contextMenu.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/shared/calendar-properties-dialog.css" type="text/css"?>
-
 <!DOCTYPE html [ <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd"> %dtd1;
 <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd" >
 %dtd2;
@ -31,6 +24,12 @@
 >
  <head>
    <title>&calendar.server.dialog.title.edit;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/calendar-properties-dialog.css" />
    <script defer="defer" src="chrome://messenger/content/globalOverlay.js"></script>
    <script defer="defer" src="chrome://global/content/editMenuOverlay.js"></script>
    <script defer="defer" src="chrome://messenger/content/dialogShadowDom.js"></script>
--- a/calendar/base/content/dialogs/calendar-providerUninstall-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-providerUninstall-dialog.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 type="text/css" href="chrome://global/skin/global.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-providerUninstall-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/widgets/calendar-widgets.css"?>
-
 <!DOCTYPE html SYSTEM "chrome://calendar/locale/provider-uninstall.dtd">
 <html
  id="calendar-provider-uninstall-dialog"
@ -21,6 +17,12 @@
 >
  <head>
    <title>&providerUninstall.title;</title>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <link
+      rel="stylesheet"
+      href="chrome://calendar/skin/shared/calendar-providerUninstall-dialog.css"
+    />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/widgets/calendar-widgets.css" />
    <script defer="defer" src="chrome://calendar/content/calendar-ui-utils.js"></script>
    <script
      defer="defer"
--- a/calendar/base/content/dialogs/calendar-summary-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-summary-dialog.xhtml
@ -3,19 +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 type="text/css" href="chrome://messenger/skin/messenger.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-alarms.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-attendees.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/primaryToolbar.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-item-summary.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/contextMenu.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/colors.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/themeableDialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/dialogs/calendar-summary-dialog.css"?>
-
 <!DOCTYPE html [ <!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd">
 <!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd" >
 <!ENTITY % dialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd" >
@ -34,6 +21,22 @@
 >
  <head>
    <title><!-- item title --></title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/calendar-alarms.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/calendar-attendees.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/calendar-event-dialog.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/primaryToolbar.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/calendar-item-summary.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+    <link
+      rel="stylesheet"
+      href="chrome://calendar/skin/shared/dialogs/calendar-summary-dialog.css"
+    />
+
    <link rel="localization" href="toolkit/global/textActions.ftl" />
    <link rel="localization" href="calendar/calendar-summary-dialog.ftl" />
    <link rel="localization" href="calendar/calendar-editable-item.ftl" />
--- a/calendar/base/content/dialogs/calendar-uri-redirect-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-uri-redirect-dialog.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://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <html
  id="calendar-uri-redirect-dialog"
  xmlns="http://www.w3.org/1999/xhtml"
@ -20,6 +16,10 @@
 >
  <head>
    <title data-l10n-id="calendar-uri-redirect-window-title"></title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+
    <link rel="localization" href="calendar/calendar-uri-redirect-dialog.ftl" />
    <script defer="defer" src="chrome://messenger/content/dialogShadowDom.js"></script>
    <script defer="defer" src="chrome://calendar/content/calendar-uri-redirect-dialog.js"></script>
--- a/calendar/base/content/dialogs/chooseCalendarDialog.xhtml
+++ b/calendar/base/content/dialogs/chooseCalendarDialog.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://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/dialogs/chooseCalendarDialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/colors.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/themeableDialog.css"?>
-
 <!-- DTD File with all strings specific to the file -->
 <!DOCTYPE window SYSTEM "chrome://calendar/locale/calendar.dtd">

@ -21,6 +16,14 @@
  lightweightthemes="true"
  persist="screenX screenY height width"
 >
+  <html:link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://calendar/skin/shared/dialogs/chooseCalendarDialog.css"
+  />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+
  <dialog buttons="accept,cancel">
    <script src="chrome://calendar/content/calendar-ui-utils.js" />
    <script src="chrome://calendar/content/chooseCalendarDialog.js" />
--- a/calendar/base/content/dialogs/publishDialog.xhtml
+++ b/calendar/base/content/dialogs/publishDialog.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 type="text/css" href="chrome://messenger/skin/messenger.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/colors.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/themeableDialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/publishDialog.css"?>
-
 <!DOCTYPE html [ <!ENTITY % dtd1 SYSTEM "chrome://calendar/locale/global.dtd"> %dtd1;
 <!ENTITY % dtd2 SYSTEM "chrome://calendar/locale/calendar.dtd">
 %dtd2; ]>
@ -23,6 +18,10 @@
 >
  <head>
    <title>&calendar.publish.dialog.title;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/publishDialog.css" />
    <script defer="defer" src="chrome://messenger/content/dialogShadowDom.js"></script>
    <script defer="defer" src="chrome://calendar/content/publishDialog.js"></script>
  </head>
--- a/calendar/base/content/item-editing/calendar-item-iframe.xhtml
+++ b/calendar/base/content/item-editing/calendar-item-iframe.xhtml
@ -3,19 +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/. -->

-<!-- XXX some of these css files may not be needed here. -->
-<?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-alarms.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/widgets/minimonth.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/calendar-attendees.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/datetimepickers.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/primaryToolbar.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/messenger.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/contextMenu.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/themeableDialog.css"?>
-
 <!DOCTYPE html [ <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 <!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd">
 <!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd">
@ -33,6 +20,18 @@
 >
  <head>
    <title></title>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/calendar-alarms.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/widgets/minimonth.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/calendar-attendees.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/calendar-event-dialog.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/datetimepickers.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/primaryToolbar.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+    <link rel="stylesheet" href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+
    <link rel="localization" href="toolkit/global/textActions.ftl" />
    <link rel="localization" href="calendar/calendar-editable-item.ftl" />
    <link rel="localization" href="calendar/calendar-widgets.ftl" />
--- a/calendar/base/content/preferences/editCategory.xhtml
+++ b/calendar/base/content/preferences/editCategory.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 html>
 <html
  xmlns="http://www.w3.org/1999/xhtml"
@ -14,6 +12,8 @@
 >
  <head>
    <title><!-- category-new-label / category-edit-label --></title>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
+
    <link rel="localization" href="calendar/category-dialog.ftl" />
    <script defer="defer" src="chrome://messenger/content/globalOverlay.js"></script>
    <script defer="defer" src="chrome://global/content/editMenuOverlay.js"></script>
--- a/chat/content/otr-add-fingerprint.xhtml
+++ b/chat/content/otr-add-fingerprint.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://chat/skin/otrFingerprintDialog.css" type="text/css"?>
-
 <!DOCTYPE html>
 <html
  xmlns="http://www.w3.org/1999/xhtml"
@ -18,6 +15,9 @@
 >
  <head>
    <title data-l10n-id="otr-add-finger-title"></title>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <link rel="stylesheet" href="chrome://chat/skin/otrFingerprintDialog.css" />
+
    <link rel="localization" href="messenger/otr/add-finger.ftl" />
    <script
      defer="defer"
--- a/chat/content/otr-auth.xhtml
+++ b/chat/content/otr-auth.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://messenger/skin/messenger.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
-
 <!DOCTYPE html>
 <html
  xmlns="http://www.w3.org/1999/xhtml"
@ -16,6 +12,10 @@
 >
  <head>
    <title><!-- auth-title --></title>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+
    <link rel="localization" href="messenger/otr/auth.ftl" />
    <script
      defer="defer"
--- a/chat/content/otr-finger.xhtml
+++ b/chat/content/otr-finger.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 html>
 <html
  xmlns="http://www.w3.org/1999/xhtml"
@ -14,6 +12,7 @@
 >
  <head>
    <title data-l10n-id="otr-finger-title"></title>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
    <link rel="localization" href="messenger/otr/finger.ftl" />
    <script defer="defer" src="chrome://chat/content/otr-finger.js"></script>
  </head>
--- a/mail/base/content/FilterListDialog.xhtml
+++ b/mail/base/content/FilterListDialog.xhtml
@ -3,15 +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://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/icons.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/contextMenu.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/searchBox.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/filterDialog.css" type="text/css"?>
-
 <!DOCTYPE html [
  <!ENTITY % filtersDTD SYSTEM "chrome://messenger/locale/FilterListDialog.dtd">%filtersDTD;
 ]>
@ -25,6 +16,14 @@
      style="min-width: 800px; min-height: 500px;">
 <head>
  <title>&window.title;</title>
+  <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/icons.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/folderMenus.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/searchBox.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/filterDialog.css" />
  <script defer="defer" src="chrome://messenger/content/globalOverlay.js"></script>
  <script defer="defer" src="chrome://global/content/editMenuOverlay.js"></script>
  <script defer="defer" src="chrome://messenger/content/searchWidgets.js"></script>
--- a/mail/base/content/SearchDialog.xhtml
+++ b/mail/base/content/SearchDialog.xhtml
@ -5,14 +5,6 @@

 #filter substitution
 #define SEARCH_WINDOW
-<?xml-stylesheet href="chrome://messenger/skin/searchDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/tagColors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/contextMenu.css" type="text/css"?>

 <!DOCTYPE html [
  <!ENTITY % messengerDTD SYSTEM "chrome://messenger/locale/messenger.dtd" >
@ -32,6 +24,14 @@
      persist="screenX screenY width height sizemode">
 <head>
  <title>&searchDialogTitle.label;</title>
+  <link rel="stylesheet" href="chrome://messenger/skin/searchDialog.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/folderPane.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/tagColors.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/folderMenus.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
  <script defer="defer" src="chrome://messenger/content/globalOverlay.js"></script>
  <script defer="defer" src="chrome://global/content/editMenuOverlay.js"></script>
  <script defer="defer" src="chrome://messenger/content/searchWidgets.js"></script>
--- a/mail/base/content/aboutDialog.xhtml
+++ b/mail/base/content/aboutDialog.xhtml
@ -5,10 +5,6 @@

 #filter substitution

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/content/aboutDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://branding/content/aboutDialog.css" type="text/css"?>
-
 <!DOCTYPE html>
 <html id="aboutDialog" xmlns="http://www.w3.org/1999/xhtml"
      xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -17,6 +13,10 @@

 <head>
  <title data-l10n-id="about-dialog-title"></title>
+  <link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <link rel="stylesheet" href="chrome://messenger/content/aboutDialog.css" />
+  <link rel="stylesheet" href="chrome://branding/content/aboutDialog.css" />
+
  <link rel="localization" href="branding/brand.ftl"/>
  <link rel="localization" href="messenger/aboutDialog.ftl"/>
  <script defer="true" src="chrome://messenger/content/aboutDialog.js"></script>
--- a/mail/base/content/browserRequest.xhtml
+++ b/mail/base/content/browserRequest.xhtml
@ -4,12 +4,6 @@
    # 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://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/tabmail.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/searchBox.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/browserRequest.css" type="text/css"?>
-
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
@ -35,6 +29,15 @@
  <script src="chrome://messenger/content/viewZoomOverlay.js"/>
  <script src="chrome://messenger/content/browserRequest.js"/>

+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/tabmail.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/searchBox.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/browserRequest.css"
+  />
+
  <html:link rel="localization" href="messenger/messenger.ftl"/>

  <keyset id="mainKeyset">
--- a/mail/base/content/commonDialog.xhtml
+++ b/mail/base/content/commonDialog.xhtml
@ -3,13 +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"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window
@ -23,6 +16,25 @@
 >
  <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="stylesheet" href="chrome://messenger/skin/colors.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/variables.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/themeableDialog.css"
+      />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link rel="localization" href="toolkit/global/commonDialog.ftl" />
    </linkset>
--- a/mail/base/content/compactFoldersDialog.xhtml
+++ b/mail/base/content/compactFoldersDialog.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://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window
@ -24,6 +20,16 @@
    data-l10n-attrs="buttonlabelaccept, buttonlabelcancel, buttonlabelextra1, buttonaccesskeyaccept, buttonaccesskeycancel, buttonaccesskeyextra1"
  >
    <linkset>
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/messenger.css"
+      />
+      <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/themeableDialog.css"
+      />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link rel="localization" href="messenger/compactFoldersDialog.ftl" />
    </linkset>
--- a/mail/base/content/customizeToolbar.xhtml
+++ b/mail/base/content/customizeToolbar.xhtml
@ -7,20 +7,6 @@
 <!DOCTYPE dialog [ <!ENTITY % customizeToolbarDTD SYSTEM "chrome://messenger/locale/customizeToolbar.dtd">
 %customizeToolbarDTD; ]>

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/customizeToolbar.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/icons.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/messageHeader.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/primaryToolbar.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/chat.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/messengercompose/messengercompose.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/calendar-task-view.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/shared/calendar-toolbar.css" type="text/css"?>
-
 <window
  id="CustomizeToolbarWindow"
  title="&dialog.title;"
@ -33,6 +19,44 @@
  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://messenger/skin/customizeToolbar.css"
+  />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/icons.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/messageHeader.css"
+  />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/primaryToolbar.css"
+  />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/chat.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/messengercompose/messengercompose.css"
+  />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+  <html:link
+    rel="stylesheet"
+    href="chrome://calendar/skin/calendar-task-view.css"
+  />
+  <html:link
+    rel="stylesheet"
+    href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css"
+  />
+  <html:link
+    rel="stylesheet"
+    href="chrome://calendar/skin/shared/calendar-toolbar.css"
+  />
+
  <script src="chrome://messenger/content/customizeToolbar.js" />
  <script src="chrome://messenger/content/mailCore.js" />
  <stringbundle
--- a/mail/base/content/glodaFacetViewWrapper.xhtml
+++ b/mail/base/content/glodaFacetViewWrapper.xhtml
@ -3,12 +3,13 @@
   - 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" type="text/css"?>
 <window
  id="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" />
+
  <script src="chrome://messenger/content/viewZoomOverlay.js" />
  <script>
    <![CDATA[
--- a/mail/base/content/messageWindow.xhtml
+++ b/mail/base/content/messageWindow.xhtml
@ -5,20 +5,6 @@

 #filter substitution

-<?xml-stylesheet href="chrome://messenger/skin/messageWindow.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/popupPanel.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/messageHeader.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/icons.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/attachmentList.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/searchBox.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/panelUI.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/contextMenu.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/calendar.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/shared/calendar-toolbar.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/openpgp/inlineNotification.css" type="text/css"?>
-
 <!DOCTYPE html [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
@ -75,6 +61,26 @@
      fullscreenbutton="true">
 <head>
  <title>&titledefault.label;@PRE_RELEASE_SUFFIX@</title>
+  <link rel="stylesheet" href="chrome://messenger/skin/messageWindow.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/popupPanel.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/messageHeader.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/icons.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/folderMenus.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/attachmentList.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/searchBox.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/panelUI.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+  <link rel="stylesheet" href="chrome://calendar/skin/calendar.css" />
+  <link
+    rel="stylesheet"
+    href="chrome://calendar/skin/shared/calendar-toolbar.css"
+  />
+  <link
+    rel="stylesheet"
+    href="chrome://messenger/skin/openpgp/inlineNotification.css"
+  />
+
  <link rel="localization" href="branding/brand.ftl" />
  <link rel="localization" href="messenger/messenger.ftl" />
  <link rel="localization" href="toolkit/main-window/findbar.ftl" />
--- a/mail/base/content/messenger.xhtml
+++ b/mail/base/content/messenger.xhtml
@ -5,43 +5,6 @@

 #filter substitution
 #define MAIN_WINDOW
-<?xml-stylesheet href="chrome://messenger/skin/mailWindow1.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/tagColors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/glodacomplete.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/tabmail.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/popupPanel.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/chat.css" type="text/css"?>
-<?xml-stylesheet href="chrome://chat/skin/imtooltip.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/messageHeader.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/icons.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/attachmentList.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/searchBox.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/panelUI.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/contextMenu.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/openpgp/inlineNotification.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/spacesToolbar.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/unifiedToolbar.css" type="text/css"?>
-
-<!-- Calendar CSS -->
-<?xml-stylesheet href="chrome://calendar/skin/calendar.css" type="text/css"?>
-
-<?xml-stylesheet href="chrome://calendar/skin/calendar-event-dialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css" type="text/css"?>
-
-<?xml-stylesheet href="chrome://calendar/skin/today-pane.css" type="text/css"?>
-
-<?xml-stylesheet href="chrome://calendar/skin/calendar-unifinder.css" type="text/css"?>
-
-<?xml-stylesheet href="chrome://calendar/skin/calendar-task-tree.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/calendar-task-view.css" type="text/css"?>
-
-<?xml-stylesheet href="chrome://calendar/skin/calendar-views.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/shared/calendar-alarms.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/shared/widgets/minimonth.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/widgets/calendar-widgets.css" type="text/css"?>

 # All DTD information is stored in a separate file so that it can be shared by
 # hiddenWindowMac.xhtml.
@ -70,6 +33,61 @@
      fullscreenbutton="true"
      calendar-deactivated="">
 <head>
+  <link rel="stylesheet" href="chrome://messenger/skin/mailWindow1.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/tagColors.css" />
+  <link
+    rel="stylesheet"
+    href="chrome://messenger/skin/shared/glodacomplete.css"
+  />
+  <link rel="stylesheet" href="chrome://messenger/skin/tabmail.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/popupPanel.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/chat.css" />
+  <link rel="stylesheet" href="chrome://chat/skin/imtooltip.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/messageHeader.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/icons.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/folderMenus.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/attachmentList.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/searchBox.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/panelUI.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <link
+    rel="stylesheet"
+    href="chrome://messenger/skin/openpgp/inlineNotification.css"
+  />
+  <link rel="stylesheet" href="chrome://messenger/skin/spacesToolbar.css" />
+  <link
+    rel="stylesheet"
+    href="chrome://messenger/skin/shared/unifiedToolbar.css"
+  />
+  <link rel="stylesheet" href="chrome://calendar/skin/calendar.css" />
+  <link
+    rel="stylesheet"
+    href="chrome://calendar/skin/calendar-event-dialog.css"
+  />
+  <link
+    rel="stylesheet"
+    href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css"
+  />
+  <link rel="stylesheet" href="chrome://calendar/skin/today-pane.css" />
+  <link rel="stylesheet" href="chrome://calendar/skin/calendar-unifinder.css" />
+  <link rel="stylesheet" href="chrome://calendar/skin/calendar-task-tree.css" />
+  <link rel="stylesheet" href="chrome://calendar/skin/calendar-task-view.css" />
+  <link rel="stylesheet" href="chrome://calendar/skin/calendar-views.css" />
+  <link
+    rel="stylesheet"
+    href="chrome://calendar/skin/shared/calendar-alarms.css"
+  />
+  <link
+    rel="stylesheet"
+    href="chrome://calendar/skin/shared/widgets/minimonth.css"
+  />
+  <link
+    rel="stylesheet"
+    href="chrome://calendar/skin/widgets/calendar-widgets.css"
+  />
+
  <link rel="localization" href="branding/brand.ftl" />
  <link rel="localization" href="messenger/shortcuts.ftl" />
  <link rel="localization" href="messenger/messenger.ftl" />
--- a/mail/base/content/multimessageview.xhtml
+++ b/mail/base/content/multimessageview.xhtml
@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/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
@ -40,6 +39,8 @@
      type="text/css"
      href="chrome://messenger/skin/multimessageview.css"
    />
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
+
    <link rel="localization" href="messenger/multimessageview.ftl" />
    <title data-l10n-id="multi-message-window-title"></title>
    <script src="chrome://messenger/content/multimessageview.js" />
--- a/mail/base/content/newTagDialog.xhtml
+++ b/mail/base/content/newTagDialog.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://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -17,6 +12,14 @@
        lightweightthemes="true"
        style="min-width: 25em;"
        onload="onLoad();">
+  <html:link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
 <dialog>

  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
--- a/mail/base/content/profileDowngrade.xhtml
+++ b/mail/base/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://messenger/skin/profileDowngrade.css" type="text/css"?>
-
 <!DOCTYPE html [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
@ -18,6 +15,8 @@
      scrolling="false">
 <head>
  <title>&window.title;</title>
+  <link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/profileDowngrade.css" />
  <script defer="defer" src="chrome://global/content/customElements.js"></script>
  <script defer="defer" src="profileDowngrade.js"></script>
 </head>
--- a/mail/base/content/sanitize.xhtml
+++ b/mail/base/content/sanitize.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://messenger/skin/variables.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/sanitizeDialog.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/contextMenu.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css"?>
-
 <!DOCTYPE window [
  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
  <!ENTITY % sanitizeDTD SYSTEM "chrome://messenger/locale/sanitize.dtd">
@ -26,6 +19,19 @@
        style="min-width: &dialog.width;"
        lightweightthemes="true"
        onload="gSanitizePromptDialog.init();">
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/shared/sanitizeDialog.css"
+  />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
 <dialog id="SanitizeDialog"
        dlgbuttons="accept,cancel">

--- a/mail/base/content/systemIntegrationDialog.xhtml
+++ b/mail/base/content/systemIntegrationDialog.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"?>
-
 <!DOCTYPE window>

 <window
@ -23,6 +21,8 @@
    <script src="chrome://messenger/content/systemIntegrationDialog.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/mail/base/content/troubleshootMode.xhtml
+++ b/mail/base/content/troubleshootMode.xhtml
@ -6,8 +6,6 @@
 <!DOCTYPE window [ <!ENTITY % utilityDTD SYSTEM "chrome://communicator/locale/utilityOverlay.dtd">
 %utilityDTD; ]>

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-
 <window
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
  xmlns:html="http://www.w3.org/1999/xhtml"
@ -27,6 +25,8 @@
    <script src="chrome://messenger/content/troubleshootMode.js" />

    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link rel="localization" href="messenger/troubleshootMode.ftl" />
    </linkset>
--- a/mail/base/content/viewSource.xhtml
+++ b/mail/base/content/viewSource.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://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/contextMenu.css" type="text/css"?>
-
 <!DOCTYPE window [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd" >
 %brandDTD;
@ -30,6 +27,9 @@
        persist="screenX screenY width height sizemode">

 <linkset>
+  <html:link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+
  <html:link rel="localization" href="branding/brand.ftl"/>
  <html:link rel="localization" href="messenger/messenger.ftl"/>
  <html:link rel="localization" href="messenger/menubar.ftl"/>
--- a/mail/base/test/browser/files/menulist.xhtml
+++ b/mail/base/test/browser/files/menulist.xhtml
@ -1,8 +1,9 @@
 <?xml version="1.0"?>
-<?xml-stylesheet type="text/css" href="chrome://global/skin/global.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/menulist.css"?>

 <window align="start" 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://messenger/skin/menulist.css" />
+
  <button id="before" label="I'm just a button" onclick="alert('I\'m a button!')"/>

  <menulist>
--- a/mail/components/activity/content/activity.xhtml
+++ b/mail/components/activity/content/activity.xhtml
@ -9,12 +9,6 @@
 #endif
 #endif

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/activity/activity.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css"?>
-
 <!DOCTYPE html [
 <!ENTITY % activityManagerDTD SYSTEM "chrome://messenger/locale/activity.dtd">
 %activityManagerDTD;
@ -30,7 +24,11 @@
      lightweightthemes="true">
 <head>
  <title>&activity.title;</title>
-
+  <link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/activity/activity.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
  <script defer="defer" src="chrome://messenger/content/activity.js"></script>
  <script defer="defer" src="chrome://messenger/content/activity-widgets.js"></script>
 </head>
--- a/mail/components/addrbook/content/abContactsPanel.xhtml
+++ b/mail/components/addrbook/content/abContactsPanel.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://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/searchBox.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/addressbook/abContactsPanel.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/contextMenu.css" type="text/css"?>
-
 <!DOCTYPE window [ <!ENTITY % abResultsPaneDTD SYSTEM "chrome://messenger/locale/addressbook/abResultsPane.dtd">
 %abResultsPaneDTD;
 <!ENTITY % abContactsPanelDTD SYSTEM "chrome://messenger/locale/addressbook/abContactsPanel.dtd" >
@ -25,6 +19,18 @@
  onload="AbPanelLoad();"
  onunload="AbPanelUnload();"
 >
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/searchBox.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/addressbook/abContactsPanel.css"
+  />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+
  <html:link
    rel="localization"
    href="messenger/addressbook/aboutAddressBook.ftl"
--- a/mail/components/addrbook/content/abEditListDialog.xhtml
+++ b/mail/components/addrbook/content/abEditListDialog.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://messenger/skin/addressbook/cardDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
-
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/abMailListDialog.dtd">

 <window
@ -18,6 +14,16 @@
  ondragover="DragOverAddressListTree(event);"
  ondrop="DropOnAddressListTree(event);"
 >
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/addressbook/cardDialog.css"
+  />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/shared/grid-layout.css"
+  />
+
  <dialog id="ablistWindow">
    <script src="chrome://messenger/content/globalOverlay.js" />
    <script src="chrome://global/content/editMenuOverlay.js" />
--- a/mail/components/addrbook/content/abMailListDialog.xhtml
+++ b/mail/components/addrbook/content/abMailListDialog.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://messenger/skin/addressbook/cardDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
-
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/addressbook/abMailListDialog.dtd">

 <window
@ -18,6 +14,16 @@
  ondragover="DragOverAddressListTree(event);"
  ondrop="DropOnAddressListTree(event);"
 >
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/addressbook/cardDialog.css"
+  />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/shared/grid-layout.css"
+  />
+
  <dialog id="ablistWindow">
    <script src="chrome://messenger/content/globalOverlay.js" />
    <script src="chrome://global/content/editMenuOverlay.js" />
--- a/mail/components/addrbook/content/abSearchDialog.xhtml
+++ b/mail/components/addrbook/content/abSearchDialog.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://messenger/skin/searchDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/addressbook/abResultsPane.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/abSearchDialog.css" type="text/css"?>
-
 <!DOCTYPE window [
  <!ENTITY % abResultsPaneDTD SYSTEM "chrome://messenger/locale/addressbook/abResultsPane.dtd">
  %abResultsPaneDTD;
@ -28,6 +22,21 @@
        style="min-width: 52em; min-height: 34em;"
        lightweightthemes="true"
        persist="screenX screenY width height sizemode">
+  <html:link rel="stylesheet" href="chrome://messenger/skin/searchDialog.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/addressbook/abResultsPane.css"
+  />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/abSearchDialog.css"
+  />
+
  <html:link rel="localization" href="messenger/addressbook/aboutAddressBook.ftl" />

  <script src="chrome://messenger/content/globalOverlay.js"/>
--- a/mail/components/cloudfile/content/selectDialog.xhtml
+++ b/mail/components/cloudfile/content/selectDialog.xhtml
@ -4,14 +4,20 @@
   - 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://messenger/skin/cloudfileSelectDialog.css" type="text/css"?>
 <!DOCTYPE window>

 <window
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  xmlns:html="http://www.w3.org/1999/xhtml"
  onload="cloudfileDialogOnLoad();"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/cloudfileSelectDialog.css"
+  />
+
  <dialog>
    <script
      type="application/javascript"
--- a/mail/components/compose/content/dialogs/EdAdvancedEdit.xhtml
+++ b/mail/components/compose/content/dialogs/EdAdvancedEdit.xhtml
@ -6,14 +6,6 @@
 <!-- first checkin of the year 2000!      -->
 <!-- Ben Goodger, 12:50AM, 01/00/00 NZST  -->

-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/menulist.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/EdAdvancedEdit.dtd">

 <window
@ -24,6 +16,17 @@
  lightweightthemes="true"
  onload="Startup()"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+  <html:link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/menulist.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
  <dialog id="advancedEditDlg">
    <script src="chrome://messenger/content/globalOverlay.js" />
    <script src="chrome://global/content/editMenuOverlay.js" />
--- a/mail/components/compose/content/dialogs/EdColorPicker.xhtml
+++ b/mail/components/compose/content/dialogs/EdColorPicker.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://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/EdColorPicker.dtd">

 <window
@ -18,6 +12,15 @@
  lightweightthemes="true"
  onload="Startup()"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
  <dialog>
    <script src="chrome://messenger/content/messengercompose/editorUtilities.js" />
    <script src="chrome://messenger/content/messengercompose/EdDialogCommon.js" />
--- a/mail/components/compose/content/dialogs/EdColorProps.xhtml
+++ b/mail/components/compose/content/dialogs/EdColorProps.xhtml
@ -3,13 +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://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window [ <!ENTITY % edColorPropertiesDTD SYSTEM "chrome://messenger/locale/messengercompose/EditorColorProperties.dtd">
 %edColorPropertiesDTD;
 <!ENTITY % composeEditorOverlayDTD SYSTEM "chrome://messenger/locale/messengercompose/mailComposeEditorOverlay.dtd">
@ -24,6 +17,16 @@
  lightweightthemes="true"
  onload="Startup()"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
  <dialog>
    <script src="chrome://messenger/content/globalOverlay.js" />
    <script src="chrome://global/content/editMenuOverlay.js" />
--- a/mail/components/compose/content/dialogs/EdConvertToTable.xhtml
+++ b/mail/components/compose/content/dialogs/EdConvertToTable.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" type="text/css"?>
-<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/EdConvertToTable.dtd">

 <window
@ -21,6 +14,16 @@
  lightweightthemes="true"
  style="min-width: 20em"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
  <dialog>
    <script src="chrome://messenger/content/globalOverlay.js" />
    <script src="chrome://global/content/editMenuOverlay.js" />
--- a/mail/components/compose/content/dialogs/EdDictionary.xhtml
+++ b/mail/components/compose/content/dialogs/EdDictionary.xhtml
@ -3,14 +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://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/EditorPersonalDictionary.dtd">
 <window
  id="dictionaryDlg"
@ -22,6 +14,20 @@
  lightweightthemes="true"
  onload="Startup()"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/shared/grid-layout.css"
+  />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
  <dialog
    buttonlabelaccept="&CloseButton.label;"
    buttonaccesskeyaccept="&CloseButton.accessKey;"
--- a/mail/components/compose/content/dialogs/EdHLineProps.xhtml
+++ b/mail/components/compose/content/dialogs/EdHLineProps.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" type="text/css"?>
-<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window [ <!ENTITY % edHLineProperties SYSTEM "chrome://messenger/locale/messengercompose/EditorHLineProperties.dtd">
 %edHLineProperties;
 <!ENTITY % edDialogOverlay SYSTEM "chrome://messenger/locale/messengercompose/EdDialogOverlay.dtd">
@ -23,6 +16,16 @@
  lightweightthemes="true"
  onload="Startup()"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
  <dialog>
    <script src="chrome://messenger/content/globalOverlay.js" />
    <script src="chrome://global/content/editMenuOverlay.js" />
--- a/mail/components/compose/content/dialogs/EdImageProps.xhtml
+++ b/mail/components/compose/content/dialogs/EdImageProps.xhtml
@ -3,14 +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://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
-
 <!DOCTYPE window [ <!ENTITY % edImageProperties SYSTEM "chrome://messenger/locale/messengercompose/EditorImageProperties.dtd">
 %edImageProperties;
 <!ENTITY % composeEditorOverlayDTD SYSTEM "chrome://messenger/locale/messengercompose/mailComposeEditorOverlay.dtd">
@ -28,6 +20,20 @@
  lightweightthemes="true"
  onload="Startup()"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/shared/grid-layout.css"
+  />
+
  <dialog id="imageDlg" buttons="accept,cancel" style="width: 60ch">
    <script src="chrome://messenger/content/globalOverlay.js" />
    <script src="chrome://global/content/editMenuOverlay.js" />
--- a/mail/components/compose/content/dialogs/EdInsSrc.xhtml
+++ b/mail/components/compose/content/dialogs/EdInsSrc.xhtml
@ -3,13 +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://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/messengercompose/EditorInsertSource.dtd">
 <html
  xmlns="http://www.w3.org/1999/xhtml"
@ -21,6 +14,13 @@
 >
  <head>
    <title>&windowTitle.label;</title>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+
    <link rel="localization" href="branding/brand.ftl" />
    <script
      defer="defer"
--- a/mail/components/compose/content/dialogs/EdInsertChars.xhtml
+++ b/mail/components/compose/content/dialogs/EdInsertChars.xhtml
@ -3,14 +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://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/EdInsertChars.css" type="text/css"?>
-
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/EditorInsertChars.dtd">

 <window
@ -22,6 +14,23 @@
  lightweightthemes="true"
  style="min-width: 20em"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/shared/grid-layout.css"
+  />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/shared/EdInsertChars.css"
+  />
+
  <dialog
    id="insertCharsDlg"
    buttonlabelaccept="&insertButton.label;"
--- a/mail/components/compose/content/dialogs/EdInsertMath.xhtml
+++ b/mail/components/compose/content/dialogs/EdInsertMath.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" type="text/css"?>
-<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/EditorInsertMath.dtd">

 <window
@ -19,6 +13,15 @@
  lightweightthemes="true"
  onload="Startup();"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
  <dialog
    buttonlabelaccept="&insertButton.label;"
    buttonaccesskeyaccept="&insertButton.accesskey;"
--- a/mail/components/compose/content/dialogs/EdInsertTOC.xhtml
+++ b/mail/components/compose/content/dialogs/EdInsertTOC.xhtml
@ -3,13 +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://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/EditorInsertTOC.dtd">

 <window
@ -20,6 +13,16 @@
  lightweightthemes="true"
  oncancel="window.close(); return true;"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
  <dialog>
    <script src="chrome://messenger/content/globalOverlay.js" />
    <script src="chrome://global/content/editMenuOverlay.js" />
--- a/mail/components/compose/content/dialogs/EdInsertTable.xhtml
+++ b/mail/components/compose/content/dialogs/EdInsertTable.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" type="text/css"?>
-<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window [ <!ENTITY % edInsertTable SYSTEM "chrome://messenger/locale/messengercompose/EditorInsertTable.dtd">
 %edInsertTable;
 <!ENTITY % edDialogOverlay SYSTEM "chrome://messenger/locale/messengercompose/EdDialogOverlay.dtd">
@ -23,6 +16,16 @@
  lightweightthemes="true"
  onload="Startup()"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
  <dialog>
    <!-- Methods common to all editor dialogs -->
    <script src="chrome://messenger/content/messengercompose/editorUtilities.js" />
--- a/mail/components/compose/content/dialogs/EdLinkProps.xhtml
+++ b/mail/components/compose/content/dialogs/EdLinkProps.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" type="text/css"?>
-<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window [ <!ENTITY % linkPropertiesDTD SYSTEM "chrome://messenger/locale/messengercompose/EditorLinkProperties.dtd">
 %linkPropertiesDTD;
 <!ENTITY % composeEditorOverlayDTD SYSTEM "chrome://messenger/locale/messengercompose/mailComposeEditorOverlay.dtd">
@ -26,6 +19,16 @@
  onload="Startup()"
  style="min-height: 26em"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
  <dialog id="linkDlg" style="width: 50ch">
    <script src="chrome://messenger/content/globalOverlay.js" />
    <script src="chrome://global/content/editMenuOverlay.js" />
--- a/mail/components/compose/content/dialogs/EdListProps.xhtml
+++ b/mail/components/compose/content/dialogs/EdListProps.xhtml
@ -3,13 +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://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window [ <!ENTITY % edListProperties SYSTEM "chrome://messenger/locale/messengercompose/EditorListProperties.dtd">
 %edListProperties;
 <!ENTITY % edDialogOverlay SYSTEM "chrome://messenger/locale/messengercompose/EdDialogOverlay.dtd">
@ -22,6 +15,16 @@
  lightweightthemes="true"
  onload="Startup()"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
  <dialog>
    <script src="chrome://messenger/content/globalOverlay.js" />
    <script src="chrome://global/content/editMenuOverlay.js" />
--- a/mail/components/compose/content/dialogs/EdNamedAnchorProps.xhtml
+++ b/mail/components/compose/content/dialogs/EdNamedAnchorProps.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" type="text/css"?>
-<?xml-stylesheet href="chrome://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window [ <!ENTITY % edNamedAnchorProperties SYSTEM "chrome://messenger/locale/messengercompose/EdNamedAnchorProperties.dtd">
 %edNamedAnchorProperties;
 <!ENTITY % edDialogOverlay SYSTEM "chrome://messenger/locale/messengercompose/EdDialogOverlay.dtd">
@ -23,6 +16,16 @@
  lightweightthemes="true"
  onload="Startup()"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
  <dialog>
    <script src="chrome://messenger/content/globalOverlay.js" />
    <script src="chrome://global/content/editMenuOverlay.js" />
--- a/mail/components/compose/content/dialogs/EdReplace.xhtml
+++ b/mail/components/compose/content/dialogs/EdReplace.xhtml
@ -4,14 +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://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/EditorReplace.dtd">

 <window
@ -23,6 +15,20 @@
  lightweightthemes="true"
  onload="onLoad()"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/shared/grid-layout.css"
+  />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
  <dialog buttons="cancel">
    <!-- Methods common to all editor dialogs -->
    <script src="chrome://messenger/content/messengercompose/editorUtilities.js" />
--- a/mail/components/compose/content/dialogs/EdSpellCheck.xhtml
+++ b/mail/components/compose/content/dialogs/EdSpellCheck.xhtml
@ -4,14 +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://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/messengercompose/EditorSpellCheck.dtd">

 <!-- dialog containing a control requiring initial setup -->
@ -24,6 +16,20 @@
  lightweightthemes="true"
  onload="Startup()"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/shared/grid-layout.css"
+  />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
  <dialog buttons="cancel">
    <script src="chrome://messenger/content/globalOverlay.js" />
    <script src="chrome://global/content/editMenuOverlay.js" />
--- a/mail/components/compose/content/dialogs/EdTableProps.xhtml
+++ b/mail/components/compose/content/dialogs/EdTableProps.xhtml
@ -4,14 +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://editor/skin/EditorDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window [ <!ENTITY % edTableProperties SYSTEM "chrome://messenger/locale/messengercompose/EditorTableProperties.dtd">
 %edTableProperties;
 <!ENTITY % edDialogOverlay SYSTEM "chrome://messenger/locale/messengercompose/EdDialogOverlay.dtd">
@ -24,6 +16,20 @@
  lightweightthemes="true"
  onload="Startup()"
 >
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://editor/skin/EditorDialog.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/shared/grid-layout.css"
+  />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
  <dialog
    id="tableDlg"
    buttons="accept,extra1,cancel"
--- a/mail/components/compose/content/messengercompose.xhtml
+++ b/mail/components/compose/content/messengercompose.xhtml
@ -3,15 +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://messenger/skin/messengercompose/messengercompose.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/icons.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/folderMenus.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/attachmentList.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/menulist.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/contextMenu.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/inContentDialog.css" type="text/css"?>
-
 <!DOCTYPE html [
  <!ENTITY % messengercomposeDTD SYSTEM "chrome://messenger/locale/messengercompose/messengercompose.dtd" >
  %messengercomposeDTD;
@ -50,6 +41,18 @@
      fullscreenbutton="true">
 <head>
  <title>&msgComposeWindow.title;</title>
+  <link
+    rel="stylesheet"
+    href="chrome://messenger/skin/messengercompose/messengercompose.css"
+  />
+  <link rel="stylesheet" href="chrome://messenger/skin/icons.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/folderMenus.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/attachmentList.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/menulist.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/inContentDialog.css" />
+
  <link rel="localization" href="branding/brand.ftl"/>
  <link rel="localization" href="messenger/messenger.ftl" />
  <link rel="localization" href="messenger/messengercompose/messengercompose.ftl" />
--- a/mail/components/downloads/content/aboutDownloads.xhtml
+++ b/mail/components/downloads/content/aboutDownloads.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://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/messenger.css"?>
-<?xml-stylesheet href="chrome://global/skin/in-content/common.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/downloads/aboutDownloads.css"?>
-
 <!DOCTYPE html [
 <!ENTITY % aboutDownloadsDTD SYSTEM "chrome://messenger/locale/aboutDownloads.dtd">
 %aboutDownloadsDTD;
@ -25,6 +20,14 @@
  <script defer="defer" src="chrome://messenger/content/downloads/aboutDownloads.js"></script>
  <meta http-equiv="Content-Security-Policy" content="default-src chrome:; img-src chrome: moz-icon:; object-src 'none'; script-src chrome: 'unsafe-inline'" />
  <meta name="color-scheme" content="light dark" />
+  <link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+  <link rel="stylesheet" href="chrome://global/skin/in-content/common.css" />
+  <link
+    rel="stylesheet"
+    href="chrome://messenger/skin/downloads/aboutDownloads.css"
+  />
+
  <link rel="icon" href="chrome://messenger/skin/icons/new/compact/download.svg" />
 </head>
 <html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
--- a/mail/components/extensions/extensionPopup.xhtml
+++ b/mail/components/extensions/extensionPopup.xhtml
@ -3,15 +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/skin/popup.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/tabmail.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/searchBox.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/browserRequest.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/extensionPopup.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/contextMenu.css" type="text/css"?>
-
 <!DOCTYPE html [
  <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
  %brandDTD;
@ -26,6 +17,15 @@
      scrolling="false">
 <head>
  <title data-l10n-id="extension-popup-default-title"></title>
+  <link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <link rel="stylesheet" href="chrome://global/skin/popup.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/tabmail.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/searchBox.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/browserRequest.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/extensionPopup.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+
  <link rel="localization" href="branding/brand.ftl"/>
  <link rel="localization" href="toolkit/global/textActions.ftl" />
  <link rel="localization" href="messenger/messenger.ftl" />
--- a/mail/components/im/content/addbuddy.xhtml
+++ b/mail/components/im/content/addbuddy.xhtml
@ -3,12 +3,7 @@
   - 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://messenger/skin/imMenulist.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/addbuddy.dtd">
-
 <html
  id="addBuddyDialog"
  xmlns="http://www.w3.org/1999/xhtml"
@ -18,6 +13,9 @@
 >
  <head>
    <title>&addBuddyWindow.title;</title>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/imMenulist.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
    <script
      defer="defer"
      src="chrome://messenger/content/globalOverlay.js"
--- a/mail/components/im/content/am-im.xhtml
+++ b/mail/components/im/content/am-im.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://messenger/skin/accountManage.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
-
 <!DOCTYPE window [ <!ENTITY % imDTD SYSTEM "chrome://messenger/locale/am-im.dtd">
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %imDTD; %brandDTD; ]>
@ -25,6 +22,15 @@
  <script src="chrome://messenger/content/am-im.js" />

  <linkset>
+    <html:link
+      rel="stylesheet"
+      href="chrome://messenger/skin/accountManage.css"
+    />
+    <html:link
+      rel="stylesheet"
+      href="chrome://messenger/skin/shared/grid-layout.css"
+    />
+
    <html:link rel="localization" href="branding/brand.ftl" />
    <html:link rel="localization" href="messenger/preferences/am-im.ftl" />
    <html:link rel="localization" href="messenger/otr/am-im-otr.ftl" />
--- a/mail/components/im/content/imAccountWizard.xhtml
+++ b/mail/components/im/content/imAccountWizard.xhtml
@ -3,13 +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://messenger/skin/accountWizard.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/chat.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE html [ <!ENTITY % accountWizardDTD SYSTEM "chrome://messenger/locale/imAccountWizard.dtd">
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %accountWizardDTD; %brandDTD; ]>
@ -24,6 +17,16 @@
 >
  <head>
    <title>&windowTitle.label;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/accountWizard.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/chat.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+    <link
+      rel="stylesheet"
+      href="chrome://messenger/skin/shared/grid-layout.css"
+    />
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+
    <link rel="localization" href="toolkit/global/wizard.ftl" />
    <script
      defer="defer"
--- a/mail/components/im/content/imAccounts.xhtml
+++ b/mail/components/im/content/imAccounts.xhtml
@ -1,15 +1,7 @@
-<?xml-stylesheet href="chrome://global/skin/global.css" type="text/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/. -->

-<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/imRichlistbox.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/imAccounts.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/chat.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE html [ <!ENTITY % accountsDTD SYSTEM "chrome://chat/locale/accounts.dtd">
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 <!ENTITY % chatDTD SYSTEM "chrome://messenger/locale/chat.dtd">
@ -27,6 +19,13 @@
 >
  <head>
    <title>&accountsWindow.title;</title>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/imRichlistbox.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/imAccounts.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/chat.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
    <script
      defer="defer"
      src="chrome://messenger/content/globalOverlay.js"
--- a/mail/components/im/content/joinchat.xhtml
+++ b/mail/components/im/content/joinchat.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://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/menulist.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/joinchat.css" type="text/css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/joinChat.dtd">

 <html
@ -19,6 +14,10 @@
 >
  <head>
    <title>&joinChatWindow.title;</title>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/menulist.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/joinchat.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
    <script
      defer="defer"
      src="chrome://messenger/content/globalOverlay.js"
--- a/mail/components/migration/content/migration.xhtml
+++ b/mail/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://messenger/skin/messenger.css" type="text/css"?>
-
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/migration/migration.dtd" >

 <window id="migrationWizard"
@ -17,6 +15,8 @@
        branded="true"
        buttons="accept,cancel">
  <linkset>
+    <html:link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+
    <html:link rel="localization" href="toolkit/global/wizard.ftl"/>
    <html:link rel="localization" href="messenger/importDialog.ftl"/>
  </linkset>
--- a/mail/components/newmailaccount/content/accountProvisioner.xhtml
+++ b/mail/components/newmailaccount/content/accountProvisioner.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://messenger/skin/accountSetup.css" type="text/css"?>
-
 <!DOCTYPE html>

 <html id="accountProvisioner" xmlns="http://www.w3.org/1999/xhtml">
@ -16,6 +14,8 @@
      href="chrome://messenger/skin/icons/new/compact/new-mail.svg"
    />

+    <link rel="stylesheet" href="chrome://messenger/skin/accountSetup.css" />
+
    <link rel="localization" href="branding/brand.ftl" />
    <link rel="localization" href="messenger/accountProvisioner.ftl" />

--- a/mail/components/preferences/applicationManager.xhtml
+++ b/mail/components/preferences/applicationManager.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"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/preferences/applications.css"?>
-
 <!DOCTYPE window>

 <window
@ -43,6 +39,16 @@
    />

    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/input-fields.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/preferences/applications.css"
+      />
+
      <html:link
        rel="localization"
        href="messenger/preferences/application-manager.ftl"
--- a/mail/components/preferences/attachmentReminder.xhtml
+++ b/mail/components/preferences/attachmentReminder.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"?>
-
 <!DOCTYPE window>

 <window
@ -19,6 +17,8 @@
    <script src="chrome://messenger/content/preferences/attachmentReminder.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/mail/components/preferences/colors.xhtml
+++ b/mail/components/preferences/colors.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"?>
-
 <!DOCTYPE window>

 <window type="child"
@ -15,6 +13,8 @@
          dlgbuttons="accept,cancel">

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

--- a/mail/components/preferences/connection.xhtml
+++ b/mail/components/preferences/connection.xhtml
@ -5,9 +5,6 @@

 <!DOCTYPE window>

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css"?>
-
 <window
  type="child"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -18,6 +15,12 @@
 >
  <dialog id="ConnectionsDialog" dlgbuttons="accept,cancel">
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/input-fields.css"
+      />
+
      <html:link
        rel="localization"
        href="messenger/preferences/connection.ftl"
--- a/mail/components/preferences/cookies.xhtml
+++ b/mail/components/preferences/cookies.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://messenger/skin/input-fields.css"?>
-
 <!DOCTYPE dialog>

 <window id="CookiesDialog"
@ -25,6 +22,12 @@
                src="chrome://messenger/locale/preferences/preferences.properties"/>

  <linkset>
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <html:link
+      rel="stylesheet"
+      href="chrome://messenger/skin/input-fields.css"
+    />
+
    <html:link rel="localization" href="messenger/preferences/cookies.ftl"/>
  </linkset>

--- a/mail/components/preferences/dockoptions.xhtml
+++ b/mail/components/preferences/dockoptions.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"?>
-
 <!DOCTYPE window>

 <window type="child"
@ -16,6 +14,8 @@
          dlgbuttons="accept,cancel">

    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
      <html:link rel="localization" href="messenger/preferences/dock-options.ftl"/>
    </linkset>
    <hbox orient="vertical">
--- a/mail/components/preferences/fonts.xhtml
+++ b/mail/components/preferences/fonts.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 https://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-
 <!DOCTYPE html>
 <html
  id="FontsDialog"
@ -18,6 +16,8 @@
 >
  <head>
    <title data-l10n-id="fonts-dialog-title"></title>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
+
    <link rel="localization" href="messenger/preferences/fonts.ftl" />
    <script
      defer="defer"
--- a/mail/components/preferences/messengerLanguages.xhtml
+++ b/mail/components/preferences/messengerLanguages.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"?>
-
 <window
  type="child"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -15,6 +13,8 @@
 >
  <dialog id="MessengerLanguagesDialog" 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"
--- a/mail/components/preferences/notifications.xhtml
+++ b/mail/components/preferences/notifications.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"?>
-
 <!DOCTYPE window>

 <window
@ -15,6 +13,8 @@
 >
  <dialog id="NotificationsDialog" dlgbuttons="accept,cancel">
    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+
      <html:link
        rel="localization"
        href="messenger/preferences/notifications.ftl"
--- a/mail/components/preferences/offline.xhtml
+++ b/mail/components/preferences/offline.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"?>
-
 <!DOCTYPE window>

 <window
@ -19,6 +17,8 @@
    <script src="chrome://messenger/content/preferences/offline.js" />

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

--- a/mail/components/preferences/passwordManager.xhtml
+++ b/mail/components/preferences/passwordManager.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 https://mozilla.org/MPL/2.0/. -->

-<?xml-stylesheet href="chrome://global/skin/global.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/preferences/passwordmgr.css"?>
-
 <window
  id="SignonViewerDialog"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -16,6 +13,12 @@
  persist="width height"
 >
  <linkset>
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <html:link
+      rel="stylesheet"
+      href="chrome://messenger/skin/shared/preferences/passwordmgr.css"
+    />
+
    <html:link rel="localization" href="branding/brand.ftl" />
    <html:link
      rel="localization"
--- a/mail/components/preferences/permissions.xhtml
+++ b/mail/components/preferences/permissions.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://messenger/skin/input-fields.css"?>
-
 <!DOCTYPE dialog>

 <window
@ -26,6 +23,12 @@
  <script src="chrome://messenger/content/preferences/permissions.js" />

  <linkset>
+    <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <html:link
+      rel="stylesheet"
+      href="chrome://messenger/skin/input-fields.css"
+    />
+
    <html:link
      rel="localization"
      href="messenger/preferences/permissions.ftl"
--- a/mail/components/preferences/preferences.xhtml
+++ b/mail/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/popup.css"?>
-<?xml-stylesheet href="chrome://global/skin/autocomplete.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/input-fields.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/preferences/applications.css"?>
-<?xml-stylesheet href="chrome://global/skin/in-content/common.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/preferences/preferences.css"?>
-<?xml-stylesheet href="chrome://calendar/skin/shared/calendar-preferences.css" type="text/css"?>
-<?xml-stylesheet href="chrome://calendar/skin/calendar.css"?>
-
 <!DOCTYPE html [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
@ -35,6 +25,25 @@
  <title data-l10n-id="preferences-doc-title2"></title>
  <meta http-equiv="Content-Security-Policy" content="default-src chrome:; connect-src *; script-src chrome: 'unsafe-inline'; img-src chrome: moz-icon: https: data:; style-src chrome: data: 'unsafe-inline'; object-src 'none'" />
  <meta name="color-scheme" content="light dark" />
+  <link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <link rel="stylesheet" href="chrome://global/skin/popup.css" />
+  <link rel="stylesheet" href="chrome://global/skin/autocomplete.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <link
+    rel="stylesheet"
+    href="chrome://messenger/skin/preferences/applications.css"
+  />
+  <link rel="stylesheet" href="chrome://global/skin/in-content/common.css" />
+  <link
+    rel="stylesheet"
+    href="chrome://messenger/skin/preferences/preferences.css"
+  />
+  <link
+    rel="stylesheet"
+    href="chrome://calendar/skin/shared/calendar-preferences.css"
+  />
+  <link rel="stylesheet" href="chrome://calendar/skin/calendar.css" />
+
  <link rel="localization" href="branding/brand.ftl" />
  <link rel="localization" href="messenger/preferences/preferences.ftl" />
  <link rel="localization" href="messenger/preferences/fonts.ftl" />
--- a/mail/components/preferences/receipts.xhtml
+++ b/mail/components/preferences/receipts.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"?>
-
 <!DOCTYPE window>

 <window
@ -19,6 +17,8 @@
    <script src="chrome://messenger/content/preferences/receipts.js" />

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

--- a/mail/components/preferences/tagDialog.xhtml
+++ b/mail/components/preferences/tagDialog.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://messenger/skin/input-fields.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -14,6 +11,9 @@
        data-l10n-id="tag-dialog-window"
        style="min-width: 25em;"
        onload="onLoad();">
+  <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+
 <dialog>

  <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
--- a/mail/extensions/am-e2e/am-e2e.xhtml
+++ b/mail/extensions/am-e2e/am-e2e.xhtml
@ -3,14 +3,19 @@
   - 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://messenger/skin/accountManage.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/openpgp/inlineNotification.css" type="text/css"?>
-
 <!DOCTYPE window SYSTEM "chrome://messenger/locale/am-smime.dtd">

 <window xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
        xmlns:html="http://www.w3.org/1999/xhtml"
        onload="parent.onPanelLoaded('am-e2e.xhtml');">
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/accountManage.css"
+  />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/openpgp/inlineNotification.css"
+  />

  <script src="chrome://messenger/content/globalOverlay.js"/>
  <script src="chrome://global/content/editMenuOverlay.js"/>
--- a/mail/extensions/mailviews/content/mailViewList.xhtml
+++ b/mail/extensions/mailviews/content/mailViewList.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://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window [ <!ENTITY % mailViewLisDTD SYSTEM "chrome://messenger/locale/mailViewList.dtd">
 %mailViewLisDTD;
 <!ENTITY % FilterListDialogDTD SYSTEM "chrome://messenger/locale/FilterListDialog.dtd">
@ -25,6 +21,13 @@
  height="340"
  persist="screenX screenY width height"
 >
+  <html:link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
  <dialog buttons="accept">
    <script src="chrome://messenger/content/mailViewList.js" />
    <script src="chrome://messenger/content/dialogShadowDom.js" />
--- a/mail/extensions/mailviews/content/mailViewSetup.xhtml
+++ b/mail/extensions/mailviews/content/mailViewSetup.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://messenger/skin/shared/input-fields.css" type="text/css" ?>
-<?xml-stylesheet href="chrome://messenger/skin/searchDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window [
  <!ENTITY % mailViewDTD SYSTEM "chrome://messenger/locale/mailViewSetup.dtd">
  %mailViewDTD;
@ -26,6 +20,18 @@
        title="&mailViewSetupTitle.label;"
        style="min-width: 52em; min-height: 22em;"
        persist="screenX screenY width height">
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/shared/input-fields.css"
+  />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/searchDialog.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://messenger/skin/themeableDialog.css"
+  />
+
 <dialog buttons="accept,cancel">

  <script src="chrome://messenger/content/globalOverlay.js"/>
--- a/mail/extensions/openpgp/content/ui/backupKeyPassword.xhtml
+++ b/mail/extensions/openpgp/content/ui/backupKeyPassword.xhtml
@ -3,13 +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://messenger/skin/contextMenu.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/openpgp/inlineNotification.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/openpgp/backupKeyPassword.css" type="text/css"?>
-
 <html
  xmlns="http://www.w3.org/1999/xhtml"
  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -19,6 +12,19 @@
 >
  <head>
    <title data-l10n-id="set-password-window-title"></title>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/accountManage.css" />
+    <link
+      rel="stylesheet"
+      href="chrome://messenger/skin/openpgp/inlineNotification.css"
+    />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+    <link
+      rel="stylesheet"
+      href="chrome://messenger/skin/openpgp/backupKeyPassword.css"
+    />
+
    <link rel="localization" href="messenger/openpgp/backupKeyPassword.ftl" />
    <script defer="defer" src="chrome://messenger/content/globalOverlay.js" />
    <script defer="defer" src="chrome://global/content/editMenuOverlay.js" />
--- a/mail/extensions/openpgp/content/ui/changeExpiryDlg.xhtml
+++ b/mail/extensions/openpgp/content/ui/changeExpiryDlg.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://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/openpgp/inlineNotification.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/openpgp/changeExpiryDlg.css" type="text/css"?>
 <html
  xmlns="http://www.w3.org/1999/xhtml"
  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -17,6 +12,18 @@
 >
  <head>
    <title data-l10n-id="openpgp-change-expiry-title"></title>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/accountManage.css" />
+    <link
+      rel="stylesheet"
+      href="chrome://messenger/skin/openpgp/inlineNotification.css"
+    />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+    <link
+      rel="stylesheet"
+      href="chrome://messenger/skin/openpgp/changeExpiryDlg.css"
+    />
+
    <link rel="localization" href="messenger/openpgp/changeExpiryDlg.ftl" />
    <script
      defer="defer"
--- a/mail/extensions/openpgp/content/ui/composeKeyStatus.xhtml
+++ b/mail/extensions/openpgp/content/ui/composeKeyStatus.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://global/skin/global.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/openpgp/openPgpComposeStatus.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/variables.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <window
  data-l10n-id="openpgp-compose-key-status-title"
  xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@ -35,6 +29,21 @@
    <script src="chrome://messenger/content/dialogShadowDom.js" />

    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/openpgp/openPgpComposeStatus.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/variables.css"
+      />
+      <html:link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/themeableDialog.css"
+      />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link
        rel="localization"
--- a/mail/extensions/openpgp/content/ui/confirmPubkeyImport.xhtml
+++ b/mail/extensions/openpgp/content/ui/confirmPubkeyImport.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://messenger/skin/openpgp/confirmPubkeyImport.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/openpgp/inlineNotification.css" type="text/css"?>
-
 <!DOCTYPE window>

 <window
@ -22,6 +18,16 @@
    <script src="chrome://openpgp/content/ui/confirmPubkeyImport.js" />

    <linkset>
+      <html:link rel="stylesheet" href="chrome://global/skin/global.css" />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/openpgp/confirmPubkeyImport.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/openpgp/inlineNotification.css"
+      />
+
      <html:link rel="localization" href="branding/brand.ftl" />
      <html:link rel="localization" href="messenger/openpgp/openpgp.ftl" />
      <html:link
--- a/Показать больше
+++ b/Показать больше