From e46ee7e77a9f40328a64b296b6583fef02836eaa Mon Sep 17 00:00:00 2001
From: Magnus Melin <mkmelin+mozilla@iki.fi>
Date: Wed, 18 Oct 2023 11:00:28 +0100
Subject: [PATCH] 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
---
 .prettierignore                               |    2 -
 .../dialogs/calendar-alarm-dialog.xhtml       |   14 +-
 .../dialogs/calendar-conflicts-dialog.xhtml   |   10 +-
 .../content/dialogs/calendar-creation.xhtml   |   12 +-
 .../dialogs/calendar-error-prompt.xhtml       |    7 +-
 .../calendar-event-dialog-attendees.xhtml     |   22 +-
 .../calendar-event-dialog-recurrence.xhtml    |   22 +-
 .../calendar-event-dialog-reminder.xhtml      |   20 +-
 .../calendar-event-dialog-timezone.xhtml      |   15 +-
 .../dialogs/calendar-event-dialog.xhtml       | 1138 +++++++++--------
 .../dialogs/calendar-ics-file-dialog.xhtml    |   27 +-
 .../dialogs/calendar-invitations-dialog.xhtml |   10 +-
 .../calendar-itip-identity-dialog.xhtml       |   15 +-
 .../dialogs/calendar-migration-dialog.xhtml   |    5 +-
 .../dialogs/calendar-occurrence-prompt.xhtml  |    9 +-
 .../dialogs/calendar-properties-dialog.xhtml  |   13 +-
 .../calendar-providerUninstall-dialog.xhtml   |   10 +-
 .../dialogs/calendar-summary-dialog.xhtml     |   29 +-
 .../calendar-uri-redirect-dialog.xhtml        |    8 +-
 .../dialogs/chooseCalendarDialog.xhtml        |   13 +-
 .../base/content/dialogs/publishDialog.xhtml  |    9 +-
 .../item-editing/calendar-item-iframe.xhtml   |   25 +-
 .../content/preferences/editCategory.xhtml    |    4 +-
 chat/content/otr-add-fingerprint.xhtml        |    6 +-
 chat/content/otr-auth.xhtml                   |    8 +-
 chat/content/otr-finger.xhtml                 |    3 +-
 mail/base/content/FilterListDialog.xhtml      |   17 +-
 mail/base/content/SearchDialog.xhtml          |   16 +-
 mail/base/content/aboutDialog.xhtml           |    8 +-
 mail/base/content/browserRequest.xhtml        |   15 +-
 mail/base/content/commonDialog.xhtml          |   26 +-
 mail/base/content/compactFoldersDialog.xhtml  |   14 +-
 mail/base/content/customizeToolbar.xhtml      |   52 +-
 mail/base/content/glodaFacetViewWrapper.xhtml |    3 +-
 mail/base/content/messageWindow.xhtml         |   34 +-
 mail/base/content/messenger.xhtml             |   92 +-
 mail/base/content/multimessageview.xhtml      |    3 +-
 mail/base/content/newTagDialog.xhtml          |   13 +-
 mail/base/content/profileDowngrade.xhtml      |    5 +-
 mail/base/content/sanitize.xhtml              |   20 +-
 .../content/systemIntegrationDialog.xhtml     |    4 +-
 mail/base/content/troubleshootMode.xhtml      |    4 +-
 mail/base/content/viewSource.xhtml            |    6 +-
 mail/base/test/browser/files/menulist.xhtml   |    5 +-
 .../activity/content/activity.xhtml           |   12 +-
 .../addrbook/content/abContactsPanel.xhtml    |   18 +-
 .../addrbook/content/abEditListDialog.xhtml   |   14 +-
 .../addrbook/content/abMailListDialog.xhtml   |   14 +-
 .../addrbook/content/abSearchDialog.xhtml     |   21 +-
 .../cloudfile/content/selectDialog.xhtml      |   10 +-
 .../content/dialogs/EdAdvancedEdit.xhtml      |   19 +-
 .../content/dialogs/EdColorPicker.xhtml       |   15 +-
 .../content/dialogs/EdColorProps.xhtml        |   17 +-
 .../content/dialogs/EdConvertToTable.xhtml    |   17 +-
 .../content/dialogs/EdDictionary.xhtml        |   22 +-
 .../content/dialogs/EdHLineProps.xhtml        |   17 +-
 .../content/dialogs/EdImageProps.xhtml        |   22 +-
 .../compose/content/dialogs/EdInsSrc.xhtml    |   14 +-
 .../content/dialogs/EdInsertChars.xhtml       |   25 +-
 .../content/dialogs/EdInsertMath.xhtml        |   15 +-
 .../compose/content/dialogs/EdInsertTOC.xhtml |   17 +-
 .../content/dialogs/EdInsertTable.xhtml       |   17 +-
 .../compose/content/dialogs/EdLinkProps.xhtml |   17 +-
 .../compose/content/dialogs/EdListProps.xhtml |   17 +-
 .../content/dialogs/EdNamedAnchorProps.xhtml  |   17 +-
 .../compose/content/dialogs/EdReplace.xhtml   |   22 +-
 .../content/dialogs/EdSpellCheck.xhtml        |   22 +-
 .../content/dialogs/EdTableProps.xhtml        |   22 +-
 .../compose/content/messengercompose.xhtml    |   21 +-
 .../downloads/content/aboutDownloads.xhtml    |   13 +-
 .../extensions/extensionPopup.xhtml           |   18 +-
 mail/components/im/content/addbuddy.xhtml     |    8 +-
 mail/components/im/content/am-im.xhtml        |   12 +-
 .../im/content/imAccountWizard.xhtml          |   17 +-
 mail/components/im/content/imAccounts.xhtml   |   15 +-
 mail/components/im/content/joinchat.xhtml     |    9 +-
 .../migration/content/migration.xhtml         |    4 +-
 .../content/accountProvisioner.xhtml          |    4 +-
 .../preferences/applicationManager.xhtml      |   14 +-
 .../preferences/attachmentReminder.xhtml      |    4 +-
 mail/components/preferences/colors.xhtml      |    4 +-
 mail/components/preferences/connection.xhtml  |    9 +-
 mail/components/preferences/cookies.xhtml     |    9 +-
 mail/components/preferences/dockoptions.xhtml |    4 +-
 mail/components/preferences/fonts.xhtml       |    4 +-
 .../preferences/messengerLanguages.xhtml      |    4 +-
 .../preferences/notifications.xhtml           |    4 +-
 mail/components/preferences/offline.xhtml     |    4 +-
 .../preferences/passwordManager.xhtml         |    9 +-
 mail/components/preferences/permissions.xhtml |    9 +-
 mail/components/preferences/preferences.xhtml |   29 +-
 mail/components/preferences/receipts.xhtml    |    4 +-
 mail/components/preferences/tagDialog.xhtml   |    6 +-
 mail/extensions/am-e2e/am-e2e.xhtml           |   11 +-
 .../mailviews/content/mailViewList.xhtml      |   11 +-
 .../mailviews/content/mailViewSetup.xhtml     |   18 +-
 .../content/ui/backupKeyPassword.xhtml        |   20 +-
 .../openpgp/content/ui/changeExpiryDlg.xhtml  |   17 +-
 .../openpgp/content/ui/composeKeyStatus.xhtml |   21 +-
 .../content/ui/confirmPubkeyImport.xhtml      |   14 +-
 .../content/ui/enigmailKeyImportInfo.xhtml    |   17 +-
 .../content/ui/enigmailKeyManager.xhtml       |   26 +-
 .../openpgp/content/ui/enigmailMsgBox.xhtml   |   22 +-
 .../openpgp/content/ui/keyDetailsDlg.xhtml    |   11 +-
 .../openpgp/content/ui/keyWizard.xhtml        |   31 +-
 .../content/ui/oneRecipientStatus.xhtml       |    9 +-
 .../content/abAddressBookNameDialog.xhtml     |    7 +-
 .../addrbook/content/abCardDAVDialog.xhtml    |    8 +-
 .../content/abCardDAVProperties.xhtml         |    8 +-
 .../prefs/content/pref-directory-add.xhtml    |   13 +-
 .../prefs/content/pref-editdirectories.xhtml  |    3 +-
 mailnews/base/content/folderProps.xhtml       |   16 +-
 mailnews/base/content/junkLog.xhtml           |    4 +-
 mailnews/base/content/markByDate.xhtml        |   10 +-
 mailnews/base/content/msgAccountCentral.xhtml |    4 +-
 .../content/msgSelectOfflineFolders.xhtml     |   12 +-
 mailnews/base/content/msgSynchronize.xhtml    |    7 +-
 mailnews/base/content/newFolderDialog.xhtml   |   17 +-
 mailnews/base/content/newmailalert.xhtml      |    3 +-
 .../base/content/renameFolderDialog.xhtml     |   10 +-
 mailnews/base/content/shutdownWindow.xhtml    |   15 +-
 mailnews/base/content/subscribe.xhtml         |   16 +-
 .../base/content/virtualFolderListEdit.xhtml  |   15 +-
 .../content/virtualFolderProperties.xhtml     |   21 +-
 .../base/prefs/content/AccountWizard.xhtml    |   22 +-
 .../base/prefs/content/SmtpServerEdit.xhtml   |    5 +-
 .../base/prefs/content/am-addressing.xhtml    |    5 +-
 .../prefs/content/am-archiveoptions.xhtml     |    7 +-
 mailnews/base/prefs/content/am-copies.xhtml   |    7 +-
 .../prefs/content/am-identities-list.xhtml    |    9 +-
 .../base/prefs/content/am-identity-edit.xhtml |   12 +-
 mailnews/base/prefs/content/am-junk.xhtml     |    7 +-
 mailnews/base/prefs/content/am-main.xhtml     |    4 +-
 mailnews/base/prefs/content/am-offline.xhtml  |    4 +-
 .../prefs/content/am-server-advanced.xhtml    |    8 +-
 mailnews/base/prefs/content/am-server.xhtml   |    7 +-
 .../content/am-serverwithnoidentities.xhtml   |    4 +-
 mailnews/base/prefs/content/am-smtp.xhtml     |    4 +-
 .../base/prefs/content/removeAccount.xhtml    |    4 +-
 mailnews/compose/content/sendProgress.xhtml   |    8 +-
 mailnews/extensions/mdn/am-mdn.xhtml          |    4 +-
 .../extensions/newsblog/am-newsblog.xhtml     |   12 +-
 .../newsblog/feed-subscriptions.xhtml         |   23 +-
 .../newsblog/feedAccountWizard.xhtml          |   10 +-
 .../extensions/smime/certFetchingStatus.xhtml |    6 +-
 mailnews/extensions/smime/certpicker.xhtml    |    3 +-
 .../smime/msgCompSecurityInfo.xhtml           |   15 +-
 mailnews/jar.mn                               |    2 +-
 mailnews/news/content/downloadheaders.xhtml   |   11 +-
 mailnews/search/content/CustomHeaders.xhtml   |  134 +-
 mailnews/search/content/FilterEditor.xhtml    |   19 +-
 mailnews/search/content/viewLog.xhtml         |    4 +-
 152 files changed, 1808 insertions(+), 1423 deletions(-)

diff --git a/.prettierignore b/.prettierignore
index 7a21795f61..c8358bec05 100644
--- 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
diff --git a/calendar/base/content/dialogs/calendar-alarm-dialog.xhtml b/calendar/base/content/dialogs/calendar-alarm-dialog.xhtml
index 02591f4810..7ced20e7d3 100644
--- 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>
diff --git a/calendar/base/content/dialogs/calendar-conflicts-dialog.xhtml b/calendar/base/content/dialogs/calendar-conflicts-dialog.xhtml
index 868df36248..f4b22f2473 100644
--- 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>
diff --git a/calendar/base/content/dialogs/calendar-creation.xhtml b/calendar/base/content/dialogs/calendar-creation.xhtml
index 7ae66d3af9..d6d4ffc957 100644
--- 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>
diff --git a/calendar/base/content/dialogs/calendar-error-prompt.xhtml b/calendar/base/content/dialogs/calendar-error-prompt.xhtml
index 8454809bd1..ce881479b3 100644
--- 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>
diff --git a/calendar/base/content/dialogs/calendar-event-dialog-attendees.xhtml b/calendar/base/content/dialogs/calendar-event-dialog-attendees.xhtml
index 964dd050c5..4880fc2f70 100644
--- 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>
diff --git a/calendar/base/content/dialogs/calendar-event-dialog-recurrence.xhtml b/calendar/base/content/dialogs/calendar-event-dialog-recurrence.xhtml
index f762a3b3ef..b8f7b319a4 100644
--- 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>
diff --git a/calendar/base/content/dialogs/calendar-event-dialog-reminder.xhtml b/calendar/base/content/dialogs/calendar-event-dialog-reminder.xhtml
index 64fe13ff77..a6b066df7a 100644
--- 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>
 
diff --git a/calendar/base/content/dialogs/calendar-event-dialog-timezone.xhtml b/calendar/base/content/dialogs/calendar-event-dialog-timezone.xhtml
index 8ec36bfce8..f62c28d274 100644
--- 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>
diff --git a/calendar/base/content/dialogs/calendar-event-dialog.xhtml b/calendar/base/content/dialogs/calendar-event-dialog.xhtml
index 8029ff3174..3c657697c5 100644
--- a/calendar/base/content/dialogs/calendar-event-dialog.xhtml
+++ b/calendar/base/content/dialogs/calendar-event-dialog.xhtml
@@ -3,582 +3,634 @@
    - 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/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/shared/dialogs/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://calendar/skin/calendar-event-dialog.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/primaryToolbar.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/contextMenu.css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/themeableDialog.css"?>
-#ifdef MOZ_SUITE
-<?xml-stylesheet type="text/css" href="chrome://communicator/skin/communicator.css"?>
-#endif
-
-<!DOCTYPE window [
-    <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
-    <!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd">
-    <!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd">
-    <!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
-    %brandDTD;
-    %globalDTD;
-    %calendarDTD;
-    %eventDialogDTD;
-]>
+<!DOCTYPE window [ <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
+<!ENTITY % globalDTD SYSTEM "chrome://calendar/locale/global.dtd">
+<!ENTITY % calendarDTD SYSTEM "chrome://calendar/locale/calendar.dtd">
+<!ENTITY % eventDialogDTD SYSTEM "chrome://calendar/locale/calendar-event-dialog.dtd">
+%brandDTD; %globalDTD; %calendarDTD; %eventDialogDTD; ]>
 
 <!-- Dialog id is changed during execution to allow different Window-icons
      on this dialog. document.loadOverlay() will not work on this one. -->
-<window id="calendar-event-window"
-        title="&event.title.label;"
-        icon="calendar-general-dialog"
-        windowtype="Calendar:EventDialog"
-        onload="onLoadCalendarItemPanel();"
-        onunload="onUnloadCalendarItemPanel();"
-        persist="screenX screenY width height"
-        lightweightthemes="true"
-        xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-        xmlns:html="http://www.w3.org/1999/xhtml">
+<window
+  id="calendar-event-window"
+  title="&event.title.label;"
+  icon="calendar-general-dialog"
+  windowtype="Calendar:EventDialog"
+  onload="onLoadCalendarItemPanel();"
+  onunload="onUnloadCalendarItemPanel();"
+  persist="screenX screenY width height"
+  lightweightthemes="true"
+  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://messenger/skin/messenger.css" />
+  <html:link rel="stylesheet" href="chrome://calendar/skin/shared/widgets/minimonth.css" />
+  <html:link rel="stylesheet" href="chrome://calendar/skin/shared/calendar-attendees.css" />
+  <html:link
+    rel="stylesheet"
+    href="chrome://calendar/skin/shared/dialogs/calendar-event-dialog.css"
+  />
+  <html:link rel="stylesheet" href="chrome://calendar/skin/calendar-event-dialog.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/primaryToolbar.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
+  <html:link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+  <dialog>
+    <!-- Javascript includes -->
+    <script src="chrome://calendar/content/calendar-item-panel.js" />
+    <script src="chrome://calendar/content/calendar-dialog-utils.js" />
+    <script src="chrome://calendar/content/calendar-ui-utils.js" />
+    <script src="chrome://messenger/content/globalOverlay.js" />
+    <script src="chrome://messenger/content/toolbarIconColor.js" />
+    <script src="chrome://messenger/content/customizable-toolbar.js" />
 
-<dialog>
+    <stringbundle id="languageBundle" src="chrome://global/locale/languageNames.properties" />
 
-  <!-- Javascript includes -->
-  <script src="chrome://calendar/content/calendar-item-panel.js"/>
-  <script src="chrome://calendar/content/calendar-dialog-utils.js"/>
-  <script src="chrome://calendar/content/calendar-ui-utils.js"/>
-  <script src="chrome://messenger/content/globalOverlay.js"/>
-  <script src="chrome://messenger/content/toolbarIconColor.js"/>
-  <script src="chrome://messenger/content/customizable-toolbar.js"/>
-
-  <stringbundle id="languageBundle" src="chrome://global/locale/languageNames.properties"/>
-
-  <!-- Command updater -->
-  <commandset id="globalEditMenuItems"
-              commandupdater="true"
-              events="focus"
-              oncommandupdate="goUpdateGlobalEditMenuItems()"/>
-  <commandset id="selectEditMenuItems"
-              commandupdater="true"
-              events="select"
-              oncommandupdate="goUpdateSelectEditMenuItems()"/>
-  <commandset id="undoEditMenuItems"
-              commandupdater="true"
-              events="undo"
-              oncommandupdate="goUpdateUndoEditMenuItems()"/>
-  <commandset id="clipboardEditMenuItems"
-              commandupdater="true"
-              events="clipboard"
-              oncommandupdate="goUpdatePasteMenuItems()"/>
-
-  <!-- Commands -->
-  <commandset id="itemCommands">
-
-    <!-- Item menu -->
-    <command id="cmd_item_new_event"
-             oncommand="openNewEvent()"/>
-    <command id="cmd_item_new_task"
-             oncommand="openNewTask()"/>
-    <command id="cmd_item_new_message"
-             oncommand="openNewMessage()"/>
-    <command id="cmd_item_close"
-             oncommand="cancelDialog()"/>
-    <command id="cmd_save"
-             disable-on-readonly="true"
-             oncommand="onCommandSave()"/>
-    <command id="cmd_item_delete"
-             disable-on-readonly="true"
-             oncommand="onCommandDeleteItem()"/>
-
-    <!-- Edit menu -->
-    <command id="cmd_undo"
-             disabled="true"
-             oncommand="goDoCommand('cmd_undo')"/>
-    <command id="cmd_redo"
-             disabled="true"
-             oncommand="goDoCommand('cmd_redo')"/>
-    <command id="cmd_cut"
-             disabled="true"
-             oncommand="goDoCommand('cmd_cut')"/>
-    <command id="cmd_copy"
-             disabled="true"
-             oncommand="goDoCommand('cmd_copy')"/>
-    <command id="cmd_paste"
-             disabled="true"
-             oncommand="goDoCommand('cmd_paste')"/>
-    <command id="cmd_selectAll"
-             disabled="true"
-             oncommand="goDoCommand('cmd_selectAll')"/>
-
-    <!-- View menu -->
-    <command id="cmd_toolbar"
-             oncommand="onCommandViewToolbar('event-toolbar',
-                                             'view-toolbars-event-menuitem')"/>
-    <command id="cmd_customize"
-             oncommand="onCommandCustomize()"/>
-
-    <!-- status -->
-    <command id="cmd_status_none"
-             oncommand="editStatus(event.target)"
-             hidden="true"
-             value="NONE"/>
-    <command id="cmd_status_tentative"
-             oncommand="editStatus(event.target)"
-             value="TENTATIVE"/>
-    <command id="cmd_status_confirmed"
-             oncommand="editStatus(event.target)"
-             value="CONFIRMED"/>
-    <command id="cmd_status_cancelled"
-             oncommand="editStatus(event.target)"
-             value="CANCELLED"/>
-
-    <!-- priority -->
-    <command id="cmd_priority_none"
-             oncommand="editPriority(event.target)"
-             value="0"/>
-    <command id="cmd_priority_low"
-             oncommand="editPriority(event.target)"
-             value="9"/>
-    <command id="cmd_priority_normal"
-             oncommand="editPriority(event.target)"
-             value="5"/>
-    <command id="cmd_priority_high"
-             oncommand="editPriority(event.target)"
-             value="1"/>
-
-    <!-- freebusy -->
-    <command id="cmd_showtimeas_busy"
-             oncommand="editShowTimeAs(event.target)"
-             value="OPAQUE"/>
-    <command id="cmd_showtimeas_free"
-             oncommand="editShowTimeAs(event.target)"
-             value="TRANSPARENT"/>
-
-    <!-- attendees -->
-    <command id="cmd_attendees"
-             oncommand="editAttendees();"/>
-    <command id="cmd_email"
-             oncommand="sendMailToAttendees(window.attendees);"/>
-    <command id="cmd_email_undecided"
-             oncommand="sendMailToUndecidedAttendees(window.attendees);"/>
-
-    <!-- accept, attachments, timezone -->
-    <command id="cmd_accept"
-             disable-on-readonly="true"
-             oncommand="acceptDialog();"/>
-    <command id="cmd_attach_url"
-             disable-on-readonly="true"
-             oncommand="attachURL()"/>
-    <command id="cmd_attach_cloud"
-             disable-on-readonly="true"/>
-    <command id="cmd_timezone"
-             persist="checked"
-             checked="false"
-             oncommand="toggleTimezoneLinks()"/>
-  </commandset>
-
-  <keyset id="calendar-event-dialog-keyset">
-    <key id="new-message-key"
-         modifiers="accel"
-         key="&event.dialog.new.message.key2;"
-         command="cmd_item_new_message"/>
-    <key id="close-key"
-         modifiers="accel"
-         key="&event.dialog.close.key;"
-         command="cmd_item_close"/>
-    <key id="save-key"
-         modifiers="accel"
-         key="&event.dialog.save.key;"
-         command="cmd_save"/>
-    <key id="saveandclose-key"
-         modifiers="accel"
-         key="&event.dialog.saveandclose.key;"
-         command="cmd_accept"/>
-    <key id="undo-key"
-         modifiers="accel"
-         key="&event.dialog.undo.key;"
-         command="cmd_undo"/>
-    <key id="redo-key"
-         modifiers="accel"
-         key="&event.dialog.redo.key;"
-         command="cmd_redo"/>
-    <key id="cut-key"
-         modifiers="accel"
-         key="&event.dialog.cut.key;"
-         command="cmd_cut"/>
-    <key id="copy-key"
-         modifiers="accel"
-         key="&event.dialog.copy.key;"
-         command="cmd_copy"/>
-    <key id="paste-key"
-         modifiers="accel"
-         key="&event.dialog.paste.key;"
-         command="cmd_paste"/>
-    <key id="select-all-key"
-         modifiers="accel"
-         key="&event.dialog.select.all.key;"
-         command="cmd_selectAll"/>
-  </keyset>
-
-  <menupopup id="event-dialog-toolbar-context-menu">
-    <menuitem id="CustomizeDialogToolbar"
-              label="&event.menu.view.toolbars.customize.label;"
-              command="cmd_customize"/>
-  </menupopup>
-
-  <!-- Toolbox contains the menubar -->
-  <toolbox id="event-toolbox"
-           class="mail-toolbox"
-           mode="full"
-           defaultmode="full"
-           iconsize="small"
-           defaulticonsize="small"
-           labelalign="end"
-           defaultlabelalign="end">
-
-    <!-- Menubar -->
-    <toolbar type="menubar">
-    <menubar id="event-menubar">
+    <!-- Command updater -->
+    <commandset
+      id="globalEditMenuItems"
+      commandupdater="true"
+      events="focus"
+      oncommandupdate="goUpdateGlobalEditMenuItems()"
+    />
+    <commandset
+      id="selectEditMenuItems"
+      commandupdater="true"
+      events="select"
+      oncommandupdate="goUpdateSelectEditMenuItems()"
+    />
+    <commandset
+      id="undoEditMenuItems"
+      commandupdater="true"
+      events="undo"
+      oncommandupdate="goUpdateUndoEditMenuItems()"
+    />
+    <commandset
+      id="clipboardEditMenuItems"
+      commandupdater="true"
+      events="clipboard"
+      oncommandupdate="goUpdatePasteMenuItems()"
+    />
 
+    <!-- Commands -->
+    <commandset id="itemCommands">
       <!-- Item menu -->
-      <!-- These 2 Strings are placeholders, values are set at runtime -->
-      <menu label="Item"
-            accesskey="I"
-            id="item-menu">
-        <menupopup id="item-menupopup">
-          <menu id="item-new-menu"
-                label="&event.menu.item.new.label;"
-                accesskey="&event.menu.item.new.accesskey;">
-            <menupopup id="item-new-menupopup" class="menulist-menupopup">
-              <menuitem id="item-new-message-menuitem"
-                        label="&event.menu.item.new.message.label;"
-                        accesskey="&event.menu.item.new.message.accesskey;"
-                        key="new-message-key"
-                        command="cmd_item_new_message"
-                        disable-on-readonly="true"/>
-              <menuitem id="item-new-event-menuitem"
-                        label="&event.menu.item.new.event.label;"
-                        accesskey="&event.menu.item.new.event.accesskey;"
-                        command="cmd_item_new_event"
-                        disable-on-readonly="true"/>
-              <menuitem id="item-new-task-menuitem"
-                        label="&event.menu.item.new.task.label;"
-                        accesskey="&event.menu.item.new.task.accesskey;"
-                        command="cmd_item_new_task"
-                        disable-on-readonly="true"/>
-            </menupopup>
-          </menu>
-          <menuseparator id="item-menuseparator1"/>
-          <menuitem id="item-save-menuitem"
-                    label="&event.menu.item.save.label;"
-                    accesskey="&event.menu.item.save.accesskey;"
-                    key="save-key"
-                    command="cmd_save"/>
-          <menuitem id="item-saveandclose-menuitem"
-                    label="&event.menu.item.saveandclose.label;"
-                    accesskey="&event.menu.item.saveandclose.accesskey;"
-                    key="saveandclose-key"
-                    command="cmd_accept"/>
-          <menuitem id="item-delete-menuitem"
-                    label="&event.menu.item.delete.label;"
-                    accesskey="&event.menu.item.delete.accesskey;"
-                    command="cmd_item_delete"
-                    disable-on-readonly="true"/>
-          <menuseparator id="item-menuseparator1"/>
-          <menuitem id="item-close-menuitem"
-                    label="&event.menu.item.close.label;"
-                    accesskey="&event.menu.item.close.accesskey;"
-                    key="close-key"
-                    command="cmd_item_close"
-                    disable-on-readonly="true"/>
-        </menupopup>
-      </menu>
+      <command id="cmd_item_new_event" oncommand="openNewEvent()" />
+      <command id="cmd_item_new_task" oncommand="openNewTask()" />
+      <command id="cmd_item_new_message" oncommand="openNewMessage()" />
+      <command id="cmd_item_close" oncommand="cancelDialog()" />
+      <command id="cmd_save" disable-on-readonly="true" oncommand="onCommandSave()" />
+      <command id="cmd_item_delete" disable-on-readonly="true" oncommand="onCommandDeleteItem()" />
 
       <!-- Edit menu -->
-      <menu id="edit-menu"
-            label="&event.menu.edit.label;"
-            accesskey="&event.menu.edit.accesskey;"
-            collapse-on-readonly="true">
-        <menupopup id="edit-menupopup">
-          <menuitem id="edit-undo-menuitem"
-                    label="&event.menu.edit.undo.label;"
-                    accesskey="&event.menu.edit.undo.accesskey;"
-                    key="undo-key"
-                    command="cmd_undo"/>
-          <menuitem id="edit-redo-menuitem"
-                    label="&event.menu.edit.redo.label;"
-                    accesskey="&event.menu.edit.redo.accesskey;"
-                    key="redo-key"
-                    command="cmd_redo"/>
-          <menuseparator id="edit-menuseparator1"/>
-          <menuitem id="edit-cut-menuitem"
-                    label="&event.menu.edit.cut.label;"
-                    accesskey="&event.menu.edit.cut.accesskey;"
-                    key="cut-key"
-                    command="cmd_cut"/>
-          <menuitem id="edit-copy-menuitem"
-                    label="&event.menu.edit.copy.label;"
-                    accesskey="&event.menu.edit.copy.accesskey;"
-                    key="copy-key"
-                    command="cmd_copy"/>
-          <menuitem id="edit-paste-menuitem"
-                    label="&event.menu.edit.paste.label;"
-                    accesskey="&event.menu.edit.paste.accesskey;"
-                    key="paste-key"
-                    command="cmd_paste"/>
-          <menuseparator id="edit-menuseparator2"/>
-          <menuitem id="edit-selectall-menuitem"
-                    label="&event.menu.edit.select.all.label;"
-                    accesskey="&event.menu.edit.select.all.accesskey;"
-                    key="select-all-key"
-                    command="cmd_selectAll"/>
-        </menupopup>
-      </menu>
+      <command id="cmd_undo" disabled="true" oncommand="goDoCommand('cmd_undo')" />
+      <command id="cmd_redo" disabled="true" oncommand="goDoCommand('cmd_redo')" />
+      <command id="cmd_cut" disabled="true" oncommand="goDoCommand('cmd_cut')" />
+      <command id="cmd_copy" disabled="true" oncommand="goDoCommand('cmd_copy')" />
+      <command id="cmd_paste" disabled="true" oncommand="goDoCommand('cmd_paste')" />
+      <command id="cmd_selectAll" disabled="true" oncommand="goDoCommand('cmd_selectAll')" />
 
       <!-- View menu -->
-      <menu id="view-menu"
+      <command
+        id="cmd_toolbar"
+        oncommand="onCommandViewToolbar('event-toolbar',
+                                             'view-toolbars-event-menuitem')"
+      />
+      <command id="cmd_customize" oncommand="onCommandCustomize()" />
+
+      <!-- status -->
+      <command
+        id="cmd_status_none"
+        oncommand="editStatus(event.target)"
+        hidden="true"
+        value="NONE"
+      />
+      <command id="cmd_status_tentative" oncommand="editStatus(event.target)" value="TENTATIVE" />
+      <command id="cmd_status_confirmed" oncommand="editStatus(event.target)" value="CONFIRMED" />
+      <command id="cmd_status_cancelled" oncommand="editStatus(event.target)" value="CANCELLED" />
+
+      <!-- priority -->
+      <command id="cmd_priority_none" oncommand="editPriority(event.target)" value="0" />
+      <command id="cmd_priority_low" oncommand="editPriority(event.target)" value="9" />
+      <command id="cmd_priority_normal" oncommand="editPriority(event.target)" value="5" />
+      <command id="cmd_priority_high" oncommand="editPriority(event.target)" value="1" />
+
+      <!-- freebusy -->
+      <command id="cmd_showtimeas_busy" oncommand="editShowTimeAs(event.target)" value="OPAQUE" />
+      <command
+        id="cmd_showtimeas_free"
+        oncommand="editShowTimeAs(event.target)"
+        value="TRANSPARENT"
+      />
+
+      <!-- attendees -->
+      <command id="cmd_attendees" oncommand="editAttendees();" />
+      <command id="cmd_email" oncommand="sendMailToAttendees(window.attendees);" />
+      <command
+        id="cmd_email_undecided"
+        oncommand="sendMailToUndecidedAttendees(window.attendees);"
+      />
+
+      <!-- accept, attachments, timezone -->
+      <command id="cmd_accept" disable-on-readonly="true" oncommand="acceptDialog();" />
+      <command id="cmd_attach_url" disable-on-readonly="true" oncommand="attachURL()" />
+      <command id="cmd_attach_cloud" disable-on-readonly="true" />
+      <command
+        id="cmd_timezone"
+        persist="checked"
+        checked="false"
+        oncommand="toggleTimezoneLinks()"
+      />
+    </commandset>
+
+    <keyset id="calendar-event-dialog-keyset">
+      <key
+        id="new-message-key"
+        modifiers="accel"
+        key="&event.dialog.new.message.key2;"
+        command="cmd_item_new_message"
+      />
+      <key
+        id="close-key"
+        modifiers="accel"
+        key="&event.dialog.close.key;"
+        command="cmd_item_close"
+      />
+      <key id="save-key" modifiers="accel" key="&event.dialog.save.key;" command="cmd_save" />
+      <key
+        id="saveandclose-key"
+        modifiers="accel"
+        key="&event.dialog.saveandclose.key;"
+        command="cmd_accept"
+      />
+      <key id="undo-key" modifiers="accel" key="&event.dialog.undo.key;" command="cmd_undo" />
+      <key id="redo-key" modifiers="accel" key="&event.dialog.redo.key;" command="cmd_redo" />
+      <key id="cut-key" modifiers="accel" key="&event.dialog.cut.key;" command="cmd_cut" />
+      <key id="copy-key" modifiers="accel" key="&event.dialog.copy.key;" command="cmd_copy" />
+      <key id="paste-key" modifiers="accel" key="&event.dialog.paste.key;" command="cmd_paste" />
+      <key
+        id="select-all-key"
+        modifiers="accel"
+        key="&event.dialog.select.all.key;"
+        command="cmd_selectAll"
+      />
+    </keyset>
+
+    <menupopup id="event-dialog-toolbar-context-menu">
+      <menuitem
+        id="CustomizeDialogToolbar"
+        label="&event.menu.view.toolbars.customize.label;"
+        command="cmd_customize"
+      />
+    </menupopup>
+
+    <!-- Toolbox contains the menubar -->
+    <toolbox
+      id="event-toolbox"
+      class="mail-toolbox"
+      mode="full"
+      defaultmode="full"
+      iconsize="small"
+      defaulticonsize="small"
+      labelalign="end"
+      defaultlabelalign="end"
+    >
+      <!-- Menubar -->
+      <toolbar type="menubar">
+        <menubar id="event-menubar">
+          <!-- Item menu -->
+          <!-- These 2 Strings are placeholders, values are set at runtime -->
+          <menu label="Item" accesskey="I" id="item-menu">
+            <menupopup id="item-menupopup">
+              <menu
+                id="item-new-menu"
+                label="&event.menu.item.new.label;"
+                accesskey="&event.menu.item.new.accesskey;"
+              >
+                <menupopup id="item-new-menupopup" class="menulist-menupopup">
+                  <menuitem
+                    id="item-new-message-menuitem"
+                    label="&event.menu.item.new.message.label;"
+                    accesskey="&event.menu.item.new.message.accesskey;"
+                    key="new-message-key"
+                    command="cmd_item_new_message"
+                    disable-on-readonly="true"
+                  />
+                  <menuitem
+                    id="item-new-event-menuitem"
+                    label="&event.menu.item.new.event.label;"
+                    accesskey="&event.menu.item.new.event.accesskey;"
+                    command="cmd_item_new_event"
+                    disable-on-readonly="true"
+                  />
+                  <menuitem
+                    id="item-new-task-menuitem"
+                    label="&event.menu.item.new.task.label;"
+                    accesskey="&event.menu.item.new.task.accesskey;"
+                    command="cmd_item_new_task"
+                    disable-on-readonly="true"
+                  />
+                </menupopup>
+              </menu>
+              <menuseparator id="item-menuseparator1" />
+              <menuitem
+                id="item-save-menuitem"
+                label="&event.menu.item.save.label;"
+                accesskey="&event.menu.item.save.accesskey;"
+                key="save-key"
+                command="cmd_save"
+              />
+              <menuitem
+                id="item-saveandclose-menuitem"
+                label="&event.menu.item.saveandclose.label;"
+                accesskey="&event.menu.item.saveandclose.accesskey;"
+                key="saveandclose-key"
+                command="cmd_accept"
+              />
+              <menuitem
+                id="item-delete-menuitem"
+                label="&event.menu.item.delete.label;"
+                accesskey="&event.menu.item.delete.accesskey;"
+                command="cmd_item_delete"
+                disable-on-readonly="true"
+              />
+              <menuseparator id="item-menuseparator1" />
+              <menuitem
+                id="item-close-menuitem"
+                label="&event.menu.item.close.label;"
+                accesskey="&event.menu.item.close.accesskey;"
+                key="close-key"
+                command="cmd_item_close"
+                disable-on-readonly="true"
+              />
+            </menupopup>
+          </menu>
+
+          <!-- Edit menu -->
+          <menu
+            id="edit-menu"
+            label="&event.menu.edit.label;"
+            accesskey="&event.menu.edit.accesskey;"
+            collapse-on-readonly="true"
+          >
+            <menupopup id="edit-menupopup">
+              <menuitem
+                id="edit-undo-menuitem"
+                label="&event.menu.edit.undo.label;"
+                accesskey="&event.menu.edit.undo.accesskey;"
+                key="undo-key"
+                command="cmd_undo"
+              />
+              <menuitem
+                id="edit-redo-menuitem"
+                label="&event.menu.edit.redo.label;"
+                accesskey="&event.menu.edit.redo.accesskey;"
+                key="redo-key"
+                command="cmd_redo"
+              />
+              <menuseparator id="edit-menuseparator1" />
+              <menuitem
+                id="edit-cut-menuitem"
+                label="&event.menu.edit.cut.label;"
+                accesskey="&event.menu.edit.cut.accesskey;"
+                key="cut-key"
+                command="cmd_cut"
+              />
+              <menuitem
+                id="edit-copy-menuitem"
+                label="&event.menu.edit.copy.label;"
+                accesskey="&event.menu.edit.copy.accesskey;"
+                key="copy-key"
+                command="cmd_copy"
+              />
+              <menuitem
+                id="edit-paste-menuitem"
+                label="&event.menu.edit.paste.label;"
+                accesskey="&event.menu.edit.paste.accesskey;"
+                key="paste-key"
+                command="cmd_paste"
+              />
+              <menuseparator id="edit-menuseparator2" />
+              <menuitem
+                id="edit-selectall-menuitem"
+                label="&event.menu.edit.select.all.label;"
+                accesskey="&event.menu.edit.select.all.accesskey;"
+                key="select-all-key"
+                command="cmd_selectAll"
+              />
+            </menupopup>
+          </menu>
+
+          <!-- View menu -->
+          <menu
+            id="view-menu"
             label="&event.menu.view.label;"
             accesskey="&event.menu.view.accesskey;"
-            collapse-on-readonly="true">
-        <menupopup id="view-menupopup">
-          <menu id="view-toolbars-menu"
+            collapse-on-readonly="true"
+          >
+            <menupopup id="view-menupopup">
+              <menu
+                id="view-toolbars-menu"
                 label="&event.menu.view.toolbars.label;"
-                accesskey="&event.menu.view.toolbars.accesskey;">
-            <menupopup id="view-toolbars-menupopup">
-              <menuitem id="view-toolbars-event-menuitem"
-                        label="&event.menu.view.toolbars.event.label;"
-                        accesskey="&event.menu.view.toolbars.event.accesskey;"
-                        type="checkbox"
-                        checked="true"
-                        command="cmd_toolbar"/>
-              <menuseparator id="view-toolbars-menuseparator1"/>
-              <menuitem id="view-toolbars-customize-menuitem"
-                        label="&event.menu.view.toolbars.customize.label;"
-                        accesskey="&event.menu.view.toolbars.customize.accesskey;"
-                        command="cmd_customize"/>
-            </menupopup>
-          </menu>
-        </menupopup>
-      </menu>
-
-      <!-- Options menu -->
-      <menu id="options-menu"
-            label="&event.menu.options.label;"
-            accesskey="&event.menu.options.accesskey;">
-        <menupopup id="options-menupopup">
-          <menuitem id="options-attendees-menuitem"
-                    label="&event.menu.options.attendees.label;"
-                    accesskey="&event.menu.options.attendees.accesskey;"
-                    command="cmd_attendees"
-                    disable-on-readonly="true"/>
-          <menu id="options-attachments-menu"
-                label="&event.attachments.menubutton.label;"
-                accesskey="&event.attachments.menubutton.accesskey;">
-            <menupopup id="options-attachments-menupopup">
-              <menuitem id="options-attachments-url-menuitem"
-                        label="&event.attachments.url.label;"
-                        accesskey="&event.attachments.url.accesskey;"
-                        command="cmd_attach_url"/>
-              <!-- Additional items are added here in loadCloudProviders(). -->
-            </menupopup>
-          </menu>
-          <menuitem id="options-timezones-menuitem"
-                    label="&event.menu.options.timezone2.label;"
-                    accesskey="&event.menu.options.timezone2.accesskey;"
+                accesskey="&event.menu.view.toolbars.accesskey;"
+              >
+                <menupopup id="view-toolbars-menupopup">
+                  <menuitem
+                    id="view-toolbars-event-menuitem"
+                    label="&event.menu.view.toolbars.event.label;"
+                    accesskey="&event.menu.view.toolbars.event.accesskey;"
                     type="checkbox"
-                    command="cmd_timezone"
-                    disable-on-readonly="true"/>
-          <menuseparator id="options-menuseparator1"/>
-          <menu id="options-priority-menu"
+                    checked="true"
+                    command="cmd_toolbar"
+                  />
+                  <menuseparator id="view-toolbars-menuseparator1" />
+                  <menuitem
+                    id="view-toolbars-customize-menuitem"
+                    label="&event.menu.view.toolbars.customize.label;"
+                    accesskey="&event.menu.view.toolbars.customize.accesskey;"
+                    command="cmd_customize"
+                  />
+                </menupopup>
+              </menu>
+            </menupopup>
+          </menu>
+
+          <!-- Options menu -->
+          <menu
+            id="options-menu"
+            label="&event.menu.options.label;"
+            accesskey="&event.menu.options.accesskey;"
+          >
+            <menupopup id="options-menupopup">
+              <menuitem
+                id="options-attendees-menuitem"
+                label="&event.menu.options.attendees.label;"
+                accesskey="&event.menu.options.attendees.accesskey;"
+                command="cmd_attendees"
+                disable-on-readonly="true"
+              />
+              <menu
+                id="options-attachments-menu"
+                label="&event.attachments.menubutton.label;"
+                accesskey="&event.attachments.menubutton.accesskey;"
+              >
+                <menupopup id="options-attachments-menupopup">
+                  <menuitem
+                    id="options-attachments-url-menuitem"
+                    label="&event.attachments.url.label;"
+                    accesskey="&event.attachments.url.accesskey;"
+                    command="cmd_attach_url"
+                  />
+                  <!-- Additional items are added here in loadCloudProviders(). -->
+                </menupopup>
+              </menu>
+              <menuitem
+                id="options-timezones-menuitem"
+                label="&event.menu.options.timezone2.label;"
+                accesskey="&event.menu.options.timezone2.accesskey;"
+                type="checkbox"
+                command="cmd_timezone"
+                disable-on-readonly="true"
+              />
+              <menuseparator id="options-menuseparator1" />
+              <menu
+                id="options-priority-menu"
                 label="&event.menu.options.priority2.label;"
                 accesskey="&event.menu.options.priority2.accesskey;"
-                disable-on-readonly="true">
-            <menupopup id="options-priority-menupopup">
-              <menuitem id="options-priority-none-menuitem"
-                        label="&event.menu.options.priority.notspecified.label;"
-                        accesskey="&event.menu.options.priority.notspecified.accesskey;"
-                        type="radio"
-                        command="cmd_priority_none"
-                        disable-on-readonly="true"/>
-              <menuitem id="options-priority-low-menuitem"
-                        label="&event.menu.options.priority.low.label;"
-                        accesskey="&event.menu.options.priority.low.accesskey;"
-                        type="radio"
-                        command="cmd_priority_low"
-                        disable-on-readonly="true"/>
-              <menuitem id="options-priority-normal-label"
-                        label="&event.menu.options.priority.normal.label;"
-                        accesskey="&event.menu.options.priority.normal.accesskey;"
-                        type="radio"
-                        command="cmd_priority_normal"
-                        disable-on-readonly="true"/>
-              <menuitem id="options-priority-high-label"
-                        label="&event.menu.options.priority.high.label;"
-                        accesskey="&event.menu.options.priority.high.accesskey;"
-                        type="radio"
-                        command="cmd_priority_high"
-                        disable-on-readonly="true"/>
-            </menupopup>
-          </menu>
-          <menu id="options-privacy-menu"
+                disable-on-readonly="true"
+              >
+                <menupopup id="options-priority-menupopup">
+                  <menuitem
+                    id="options-priority-none-menuitem"
+                    label="&event.menu.options.priority.notspecified.label;"
+                    accesskey="&event.menu.options.priority.notspecified.accesskey;"
+                    type="radio"
+                    command="cmd_priority_none"
+                    disable-on-readonly="true"
+                  />
+                  <menuitem
+                    id="options-priority-low-menuitem"
+                    label="&event.menu.options.priority.low.label;"
+                    accesskey="&event.menu.options.priority.low.accesskey;"
+                    type="radio"
+                    command="cmd_priority_low"
+                    disable-on-readonly="true"
+                  />
+                  <menuitem
+                    id="options-priority-normal-label"
+                    label="&event.menu.options.priority.normal.label;"
+                    accesskey="&event.menu.options.priority.normal.accesskey;"
+                    type="radio"
+                    command="cmd_priority_normal"
+                    disable-on-readonly="true"
+                  />
+                  <menuitem
+                    id="options-priority-high-label"
+                    label="&event.menu.options.priority.high.label;"
+                    accesskey="&event.menu.options.priority.high.accesskey;"
+                    type="radio"
+                    command="cmd_priority_high"
+                    disable-on-readonly="true"
+                  />
+                </menupopup>
+              </menu>
+              <menu
+                id="options-privacy-menu"
                 label="&event.menu.options.privacy.label;"
                 accesskey="&event.menu.options.privacy.accesskey;"
-                disable-on-readonly="true">
-            <menupopup id="options-privacy-menupopup">
-              <menuitem id="options-privacy-public-menuitem"
-                        label="&event.menu.options.privacy.public.label;"
-                        accesskey="&event.menu.options.privacy.public.accesskey;"
-                        type="radio"
-                        privacy="PUBLIC"
-                        oncommand="editPrivacy(this, event)"
-                        disable-on-readonly="true"/>
-              <menuitem id="options-privacy-confidential-menuitem"
-                        label="&event.menu.options.privacy.confidential.label;"
-                        accesskey="&event.menu.options.privacy.confidential.accesskey;"
-                        type="radio"
-                        privacy="CONFIDENTIAL"
-                        oncommand="editPrivacy(this, event)"
-                        disable-on-readonly="true"/>
-              <menuitem id="options-privacy-private-menuitem"
-                        label="&event.menu.options.privacy.private.label;"
-                        accesskey="&event.menu.options.privacy.private.accesskey;"
-                        type="radio"
-                        privacy="PRIVATE"
-                        oncommand="editPrivacy(this, event)"
-                        disable-on-readonly="true"/>
-            </menupopup>
-          </menu>
-          <menu id="options-status-menu"
+                disable-on-readonly="true"
+              >
+                <menupopup id="options-privacy-menupopup">
+                  <menuitem
+                    id="options-privacy-public-menuitem"
+                    label="&event.menu.options.privacy.public.label;"
+                    accesskey="&event.menu.options.privacy.public.accesskey;"
+                    type="radio"
+                    privacy="PUBLIC"
+                    oncommand="editPrivacy(this, event)"
+                    disable-on-readonly="true"
+                  />
+                  <menuitem
+                    id="options-privacy-confidential-menuitem"
+                    label="&event.menu.options.privacy.confidential.label;"
+                    accesskey="&event.menu.options.privacy.confidential.accesskey;"
+                    type="radio"
+                    privacy="CONFIDENTIAL"
+                    oncommand="editPrivacy(this, event)"
+                    disable-on-readonly="true"
+                  />
+                  <menuitem
+                    id="options-privacy-private-menuitem"
+                    label="&event.menu.options.privacy.private.label;"
+                    accesskey="&event.menu.options.privacy.private.accesskey;"
+                    type="radio"
+                    privacy="PRIVATE"
+                    oncommand="editPrivacy(this, event)"
+                    disable-on-readonly="true"
+                  />
+                </menupopup>
+              </menu>
+              <menu
+                id="options-status-menu"
                 label="&newevent.status.label;"
                 accesskey="&newevent.status.accesskey;"
                 class="event-only"
-                disable-on-readonly="true">
-            <menupopup id="options-status-menupopup">
-              <menuitem id="options-status-none-menuitem"
-                        label="&newevent.eventStatus.none.label;"
-                        accesskey="&newevent.eventStatus.none.accesskey;"
-                        type="radio"
-                        command="cmd_status_none"
-                        disable-on-readonly="true"/>
-              <menuitem id="options-status-tentative-menuitem"
-                        label="&newevent.status.tentative.label;"
-                        accesskey="&newevent.status.tentative.accesskey;"
-                        type="radio"
-                        command="cmd_status_tentative"
-                        disable-on-readonly="true"/>
-              <menuitem id="options-status-confirmed-menuitem"
-                        label="&newevent.status.confirmed.label;"
-                        accesskey="&newevent.status.confirmed.accesskey;"
-                        type="radio"
-                        command="cmd_status_confirmed"
-                        disable-on-readonly="true"/>
-              <menuitem id="options-status-canceled-menuitem"
-                        label="&newevent.eventStatus.cancelled.label;"
-                        accesskey="&newevent.eventStatus.cancelled.accesskey;"
-                        type="radio"
-                        command="cmd_status_cancelled"
-                        disable-on-readonly="true"/>
-            </menupopup>
-          </menu>
-          <menuseparator id="options-menuseparator2" class="event-only"/>
-          <menu id="options-freebusy-menu"
+                disable-on-readonly="true"
+              >
+                <menupopup id="options-status-menupopup">
+                  <menuitem
+                    id="options-status-none-menuitem"
+                    label="&newevent.eventStatus.none.label;"
+                    accesskey="&newevent.eventStatus.none.accesskey;"
+                    type="radio"
+                    command="cmd_status_none"
+                    disable-on-readonly="true"
+                  />
+                  <menuitem
+                    id="options-status-tentative-menuitem"
+                    label="&newevent.status.tentative.label;"
+                    accesskey="&newevent.status.tentative.accesskey;"
+                    type="radio"
+                    command="cmd_status_tentative"
+                    disable-on-readonly="true"
+                  />
+                  <menuitem
+                    id="options-status-confirmed-menuitem"
+                    label="&newevent.status.confirmed.label;"
+                    accesskey="&newevent.status.confirmed.accesskey;"
+                    type="radio"
+                    command="cmd_status_confirmed"
+                    disable-on-readonly="true"
+                  />
+                  <menuitem
+                    id="options-status-canceled-menuitem"
+                    label="&newevent.eventStatus.cancelled.label;"
+                    accesskey="&newevent.eventStatus.cancelled.accesskey;"
+                    type="radio"
+                    command="cmd_status_cancelled"
+                    disable-on-readonly="true"
+                  />
+                </menupopup>
+              </menu>
+              <menuseparator id="options-menuseparator2" class="event-only" />
+              <menu
+                id="options-freebusy-menu"
                 class="event-only"
                 label="&event.menu.options.show.time.label;"
                 accesskey="&event.menu.options.show.time.accesskey;"
-                disable-on-readonly="true">
-            <menupopup id="options-freebusy-menupopup">
-              <menuitem id="options-freebusy-busy-menuitem"
-                        label="&event.menu.options.show.time.busy.label;"
-                        accesskey="&event.menu.options.show.time.busy.accesskey;"
-                        type="radio"
-                        command="cmd_showtimeas_busy"
-                        disable-on-readonly="true"/>
-              <menuitem id="options-freebusy-free-menuitem"
-                        label="&event.menu.options.show.time.free.label;"
-                        accesskey="&event.menu.options.show.time.free.accesskey;"
-                        type="radio"
-                        command="cmd_showtimeas_free"
-                        disable-on-readonly="true"/>
+                disable-on-readonly="true"
+              >
+                <menupopup id="options-freebusy-menupopup">
+                  <menuitem
+                    id="options-freebusy-busy-menuitem"
+                    label="&event.menu.options.show.time.busy.label;"
+                    accesskey="&event.menu.options.show.time.busy.accesskey;"
+                    type="radio"
+                    command="cmd_showtimeas_busy"
+                    disable-on-readonly="true"
+                  />
+                  <menuitem
+                    id="options-freebusy-free-menuitem"
+                    label="&event.menu.options.show.time.free.label;"
+                    accesskey="&event.menu.options.show.time.free.accesskey;"
+                    type="radio"
+                    command="cmd_showtimeas_free"
+                    disable-on-readonly="true"
+                  />
+                </menupopup>
+              </menu>
             </menupopup>
           </menu>
-        </menupopup>
-      </menu>
-    </menubar>
-    </toolbar>
+        </menubar>
+      </toolbar>
 
-    <toolbarpalette id="event-toolbarpalette">
-#include ../item-editing/calendar-item-toolbar.inc.xhtml
-    </toolbarpalette>
+      <toolbarpalette id="event-toolbarpalette">
+        #include ../item-editing/calendar-item-toolbar.inc.xhtml
+      </toolbarpalette>
 
-    <!-- toolboxid is set here since we move the toolbar around in tabs -->
-    <toolbar is="customizable-toolbar" id="event-toolbar"
-             toolboxid="event-toolbox"
-             class="chromeclass-toolbar themeable-full"
-             customizable="true"
-             labelalign="end"
-             defaultlabelalign="end"
-             context="event-dialog-toolbar-context-menu"
-             defaultset="button-saveandclose,button-attendees,button-privacy,button-url,button-delete"/>
-  </toolbox>
+      <!-- toolboxid is set here since we move the toolbar around in tabs -->
+      <toolbar
+        is="customizable-toolbar"
+        id="event-toolbar"
+        toolboxid="event-toolbox"
+        class="chromeclass-toolbar themeable-full"
+        customizable="true"
+        labelalign="end"
+        defaultlabelalign="end"
+        context="event-dialog-toolbar-context-menu"
+        defaultset="button-saveandclose,button-attendees,button-privacy,button-url,button-delete"
+      />
+    </toolbox>
 
-  <!-- the calendar-item-panel-iframe iframe is inserted here dynamically in the "load" handler function -->
+    <!-- the calendar-item-panel-iframe iframe is inserted here dynamically in the "load" handler function -->
 
-  <hbox id="status-bar" class="statusbar chromeclass-status" role="status">
-    <hbox id="status-privacy"
-          class="statusbarpanel"
-          align="center"
-          flex="1"
-          collapsed="true"
-          pack="start">
-      <label value="&event.statusbarpanel.privacy.label;"/>
-      <hbox id="status-privacy-public-box" privacy="PUBLIC">
-        <label value="&event.menu.options.privacy.public.label;"/>
+    <hbox id="status-bar" class="statusbar chromeclass-status" role="status">
+      <hbox
+        id="status-privacy"
+        class="statusbarpanel"
+        align="center"
+        flex="1"
+        collapsed="true"
+        pack="start"
+      >
+        <label value="&event.statusbarpanel.privacy.label;" />
+        <hbox id="status-privacy-public-box" privacy="PUBLIC">
+          <label value="&event.menu.options.privacy.public.label;" />
+        </hbox>
+        <hbox id="status-privacy-confidential-box" privacy="CONFIDENTIAL">
+          <label value="&event.menu.options.privacy.confidential.label;" />
+        </hbox>
+        <hbox id="status-privacy-private-box" privacy="PRIVATE">
+          <label value="&event.menu.options.privacy.private.label;" />
+        </hbox>
       </hbox>
-      <hbox id="status-privacy-confidential-box" privacy="CONFIDENTIAL">
-        <label value="&event.menu.options.privacy.confidential.label;"/>
+      <hbox
+        id="status-priority"
+        class="statusbarpanel"
+        align="center"
+        flex="1"
+        collapsed="true"
+        pack="start"
+      >
+        <label value="&event.priority2.label;" />
+        <html:img class="cal-statusbar-1" />
       </hbox>
-      <hbox id="status-privacy-private-box" privacy="PRIVATE">
-        <label value="&event.menu.options.privacy.private.label;"/>
+      <hbox
+        id="status-status"
+        class="statusbarpanel"
+        align="center"
+        flex="1"
+        collapsed="true"
+        pack="start"
+      >
+        <label value="&task.status.label;" />
+        <label
+          id="status-status-tentative-label"
+          value="&newevent.status.tentative.label;"
+          hidden="true"
+        />
+        <label
+          id="status-status-confirmed-label"
+          value="&newevent.status.confirmed.label;"
+          hidden="true"
+        />
+        <label
+          id="status-status-cancelled-label"
+          value="&newevent.eventStatus.cancelled.label;"
+          hidden="true"
+        />
+      </hbox>
+      <hbox
+        id="status-freebusy"
+        class="statusbarpanel event-only"
+        align="center"
+        flex="1"
+        collapsed="true"
+        pack="start"
+      >
+        <label value="&event.statusbarpanel.freebusy.label;" />
+        <label id="status-freebusy-free-label" value="&event.freebusy.legend.free;" hidden="true" />
+        <label id="status-freebusy-busy-label" value="&event.freebusy.legend.busy;" hidden="true" />
       </hbox>
     </hbox>
-    <hbox id="status-priority"
-          class="statusbarpanel"
-          align="center"
-          flex="1"
-          collapsed="true"
-          pack="start">
-      <label value="&event.priority2.label;"/>
-      <html:img class="cal-statusbar-1" />
-    </hbox>
-    <hbox id="status-status"
-          class="statusbarpanel"
-          align="center"
-          flex="1"
-          collapsed="true"
-          pack="start">
-      <label value="&task.status.label;"/>
-      <label id="status-status-tentative-label"
-             value="&newevent.status.tentative.label;"
-             hidden="true"/>
-      <label id="status-status-confirmed-label"
-             value="&newevent.status.confirmed.label;"
-             hidden="true"/>
-      <label id="status-status-cancelled-label"
-             value="&newevent.eventStatus.cancelled.label;"
-             hidden="true"/>
-    </hbox>
-    <hbox id="status-freebusy"
-          class="statusbarpanel event-only"
-          align="center"
-          flex="1"
-          collapsed="true"
-          pack="start">
-      <label value="&event.statusbarpanel.freebusy.label;"/>
-      <label id="status-freebusy-free-label"
-             value="&event.freebusy.legend.free;"
-             hidden="true"/>
-      <label id="status-freebusy-busy-label"
-             value="&event.freebusy.legend.busy;"
-             hidden="true"/>
-    </hbox>
-  </hbox>
-</dialog>
+  </dialog>
 </window>
diff --git a/calendar/base/content/dialogs/calendar-ics-file-dialog.xhtml b/calendar/base/content/dialogs/calendar-ics-file-dialog.xhtml
index 0f28148aca..f793da6ab8 100644
--- 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>
diff --git a/calendar/base/content/dialogs/calendar-invitations-dialog.xhtml b/calendar/base/content/dialogs/calendar-invitations-dialog.xhtml
index c0ed60d95d..2fe892f319 100644
--- 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>
diff --git a/calendar/base/content/dialogs/calendar-itip-identity-dialog.xhtml b/calendar/base/content/dialogs/calendar-itip-identity-dialog.xhtml
index fc3f380024..22684cbe0d 100644
--- 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>
diff --git a/calendar/base/content/dialogs/calendar-migration-dialog.xhtml b/calendar/base/content/dialogs/calendar-migration-dialog.xhtml
index 115f035000..97b9dc6158 100644
--- 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>
diff --git a/calendar/base/content/dialogs/calendar-occurrence-prompt.xhtml b/calendar/base/content/dialogs/calendar-occurrence-prompt.xhtml
index 7a7357681c..70584be5aa 100644
--- 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>
diff --git a/calendar/base/content/dialogs/calendar-properties-dialog.xhtml b/calendar/base/content/dialogs/calendar-properties-dialog.xhtml
index cc1186eb3d..67d036da22 100644
--- 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>
diff --git a/calendar/base/content/dialogs/calendar-providerUninstall-dialog.xhtml b/calendar/base/content/dialogs/calendar-providerUninstall-dialog.xhtml
index 3d254aafcc..c67fb159b0 100644
--- 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"
diff --git a/calendar/base/content/dialogs/calendar-summary-dialog.xhtml b/calendar/base/content/dialogs/calendar-summary-dialog.xhtml
index d3bfe394fc..3843d69e51 100644
--- 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" />
diff --git a/calendar/base/content/dialogs/calendar-uri-redirect-dialog.xhtml b/calendar/base/content/dialogs/calendar-uri-redirect-dialog.xhtml
index 713c495d56..5625e1a5c5 100644
--- 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>
diff --git a/calendar/base/content/dialogs/chooseCalendarDialog.xhtml b/calendar/base/content/dialogs/chooseCalendarDialog.xhtml
index 6f6932d966..5cc985bd30 100644
--- 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" />
diff --git a/calendar/base/content/dialogs/publishDialog.xhtml b/calendar/base/content/dialogs/publishDialog.xhtml
index b345d4422d..aa6ae2e7bd 100644
--- 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>
diff --git a/calendar/base/content/item-editing/calendar-item-iframe.xhtml b/calendar/base/content/item-editing/calendar-item-iframe.xhtml
index 60180a0e4b..34f830e801 100644
--- 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" />
diff --git a/calendar/base/content/preferences/editCategory.xhtml b/calendar/base/content/preferences/editCategory.xhtml
index 5128a03249..cee50faa62 100644
--- 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>
diff --git a/chat/content/otr-add-fingerprint.xhtml b/chat/content/otr-add-fingerprint.xhtml
index cb5c17cea5..b4bd464a88 100644
--- 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"
diff --git a/chat/content/otr-auth.xhtml b/chat/content/otr-auth.xhtml
index 4269db475f..c6962d1f5c 100644
--- 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"
diff --git a/chat/content/otr-finger.xhtml b/chat/content/otr-finger.xhtml
index 95b3024565..9a690b1213 100644
--- 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>
diff --git a/mail/base/content/FilterListDialog.xhtml b/mail/base/content/FilterListDialog.xhtml
index 397bdea0d8..072116be14 100644
--- 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>
diff --git a/mail/base/content/SearchDialog.xhtml b/mail/base/content/SearchDialog.xhtml
index 6d6ff82713..347d92df04 100644
--- 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>
diff --git a/mail/base/content/aboutDialog.xhtml b/mail/base/content/aboutDialog.xhtml
index 55c7330f03..96a6326e80 100644
--- 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>
diff --git a/mail/base/content/browserRequest.xhtml b/mail/base/content/browserRequest.xhtml
index b9a77766a9..96c1b0a059 100644
--- 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">
diff --git a/mail/base/content/commonDialog.xhtml b/mail/base/content/commonDialog.xhtml
index 4072ff52f6..3989482958 100644
--- 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>
diff --git a/mail/base/content/compactFoldersDialog.xhtml b/mail/base/content/compactFoldersDialog.xhtml
index 427c70848c..c88317bc0e 100644
--- 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>
diff --git a/mail/base/content/customizeToolbar.xhtml b/mail/base/content/customizeToolbar.xhtml
index 8810a44ee9..c4b3bb51ee 100644
--- 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
diff --git a/mail/base/content/glodaFacetViewWrapper.xhtml b/mail/base/content/glodaFacetViewWrapper.xhtml
index 8b2ea1e8bc..b06205084c 100644
--- 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[
diff --git a/mail/base/content/messageWindow.xhtml b/mail/base/content/messageWindow.xhtml
index 23853c9817..698b874334 100644
--- 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" />
diff --git a/mail/base/content/messenger.xhtml b/mail/base/content/messenger.xhtml
index 44c476b993..fe4ed25109 100644
--- 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" />
diff --git a/mail/base/content/multimessageview.xhtml b/mail/base/content/multimessageview.xhtml
index 17241ce537..ddd8389f88 100644
--- 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" />
diff --git a/mail/base/content/newTagDialog.xhtml b/mail/base/content/newTagDialog.xhtml
index 38eccafec7..6d76ed1d0d 100644
--- 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"/>
diff --git a/mail/base/content/profileDowngrade.xhtml b/mail/base/content/profileDowngrade.xhtml
index 4768f930fb..0c2ad94425 100644
--- 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>
diff --git a/mail/base/content/sanitize.xhtml b/mail/base/content/sanitize.xhtml
index b9186841ab..a8832301f1 100644
--- 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">
 
diff --git a/mail/base/content/systemIntegrationDialog.xhtml b/mail/base/content/systemIntegrationDialog.xhtml
index 6ce932aed5..775fb6c717 100644
--- 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"
diff --git a/mail/base/content/troubleshootMode.xhtml b/mail/base/content/troubleshootMode.xhtml
index 767adced2c..1c8909a745 100644
--- 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>
diff --git a/mail/base/content/viewSource.xhtml b/mail/base/content/viewSource.xhtml
index 046ad41937..be93337ff8 100644
--- 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"/>
diff --git a/mail/base/test/browser/files/menulist.xhtml b/mail/base/test/browser/files/menulist.xhtml
index cba2bbcf86..8cd82d1dd1 100644
--- 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>
diff --git a/mail/components/activity/content/activity.xhtml b/mail/components/activity/content/activity.xhtml
index cdff19cbe6..838b4216cf 100644
--- 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>
diff --git a/mail/components/addrbook/content/abContactsPanel.xhtml b/mail/components/addrbook/content/abContactsPanel.xhtml
index 18163eafda..472f1ff8b1 100644
--- 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"
diff --git a/mail/components/addrbook/content/abEditListDialog.xhtml b/mail/components/addrbook/content/abEditListDialog.xhtml
index bf775c274b..575e228aa4 100644
--- 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" />
diff --git a/mail/components/addrbook/content/abMailListDialog.xhtml b/mail/components/addrbook/content/abMailListDialog.xhtml
index 5b0cf11dda..81f25993a8 100644
--- 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" />
diff --git a/mail/components/addrbook/content/abSearchDialog.xhtml b/mail/components/addrbook/content/abSearchDialog.xhtml
index 75a40df839..06b5db8a85 100644
--- 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"/>
diff --git a/mail/components/cloudfile/content/selectDialog.xhtml b/mail/components/cloudfile/content/selectDialog.xhtml
index 3f99fea350..03dcebca00 100644
--- 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"
diff --git a/mail/components/compose/content/dialogs/EdAdvancedEdit.xhtml b/mail/components/compose/content/dialogs/EdAdvancedEdit.xhtml
index cfeff95b42..0e14e9ae56 100644
--- 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" />
diff --git a/mail/components/compose/content/dialogs/EdColorPicker.xhtml b/mail/components/compose/content/dialogs/EdColorPicker.xhtml
index 8576fc27da..519e7336fd 100644
--- 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" />
diff --git a/mail/components/compose/content/dialogs/EdColorProps.xhtml b/mail/components/compose/content/dialogs/EdColorProps.xhtml
index b006bfc03e..21b67961a6 100644
--- 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" />
diff --git a/mail/components/compose/content/dialogs/EdConvertToTable.xhtml b/mail/components/compose/content/dialogs/EdConvertToTable.xhtml
index 6f2d9ad5b1..3ad30aa627 100644
--- 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" />
diff --git a/mail/components/compose/content/dialogs/EdDictionary.xhtml b/mail/components/compose/content/dialogs/EdDictionary.xhtml
index c5c33212a9..d51e4e6b46 100644
--- 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;"
diff --git a/mail/components/compose/content/dialogs/EdHLineProps.xhtml b/mail/components/compose/content/dialogs/EdHLineProps.xhtml
index 21fa52147c..b03bc68ff3 100644
--- 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" />
diff --git a/mail/components/compose/content/dialogs/EdImageProps.xhtml b/mail/components/compose/content/dialogs/EdImageProps.xhtml
index 93362f8ce7..bf13ee06c7 100644
--- 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" />
diff --git a/mail/components/compose/content/dialogs/EdInsSrc.xhtml b/mail/components/compose/content/dialogs/EdInsSrc.xhtml
index 1f35de996d..dca819a34e 100644
--- 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"
diff --git a/mail/components/compose/content/dialogs/EdInsertChars.xhtml b/mail/components/compose/content/dialogs/EdInsertChars.xhtml
index c610abdd88..f7d45f002b 100644
--- 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;"
diff --git a/mail/components/compose/content/dialogs/EdInsertMath.xhtml b/mail/components/compose/content/dialogs/EdInsertMath.xhtml
index d76a518b0a..a7549eebc5 100644
--- 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;"
diff --git a/mail/components/compose/content/dialogs/EdInsertTOC.xhtml b/mail/components/compose/content/dialogs/EdInsertTOC.xhtml
index 38c85c764d..c0b5b57647 100644
--- 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" />
diff --git a/mail/components/compose/content/dialogs/EdInsertTable.xhtml b/mail/components/compose/content/dialogs/EdInsertTable.xhtml
index b114e09d44..8455c5ac0c 100644
--- 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" />
diff --git a/mail/components/compose/content/dialogs/EdLinkProps.xhtml b/mail/components/compose/content/dialogs/EdLinkProps.xhtml
index 7c550a7a45..8c897add74 100644
--- 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" />
diff --git a/mail/components/compose/content/dialogs/EdListProps.xhtml b/mail/components/compose/content/dialogs/EdListProps.xhtml
index b8d7c40cb2..62b35f9672 100644
--- 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" />
diff --git a/mail/components/compose/content/dialogs/EdNamedAnchorProps.xhtml b/mail/components/compose/content/dialogs/EdNamedAnchorProps.xhtml
index d26f4d73b4..d29e79ce3e 100644
--- 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" />
diff --git a/mail/components/compose/content/dialogs/EdReplace.xhtml b/mail/components/compose/content/dialogs/EdReplace.xhtml
index 62ce5a67e2..e75dba7abe 100644
--- 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" />
diff --git a/mail/components/compose/content/dialogs/EdSpellCheck.xhtml b/mail/components/compose/content/dialogs/EdSpellCheck.xhtml
index fcff0e1703..40cb5c1744 100644
--- 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" />
diff --git a/mail/components/compose/content/dialogs/EdTableProps.xhtml b/mail/components/compose/content/dialogs/EdTableProps.xhtml
index a82d5e18c5..83065dfe29 100644
--- 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"
diff --git a/mail/components/compose/content/messengercompose.xhtml b/mail/components/compose/content/messengercompose.xhtml
index 2c31e1bd66..9728cd40a7 100644
--- 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" />
diff --git a/mail/components/downloads/content/aboutDownloads.xhtml b/mail/components/downloads/content/aboutDownloads.xhtml
index fdc570c06f..3d0024fe50 100644
--- 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">
diff --git a/mail/components/extensions/extensionPopup.xhtml b/mail/components/extensions/extensionPopup.xhtml
index 8cb9e4bb5f..5232d777d3 100644
--- 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" />
diff --git a/mail/components/im/content/addbuddy.xhtml b/mail/components/im/content/addbuddy.xhtml
index 5c4fbfbf94..6f3d6e56fb 100644
--- 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"
diff --git a/mail/components/im/content/am-im.xhtml b/mail/components/im/content/am-im.xhtml
index 5455309da8..044587989a 100644
--- 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" />
diff --git a/mail/components/im/content/imAccountWizard.xhtml b/mail/components/im/content/imAccountWizard.xhtml
index 9ff3cf33ad..7983be1709 100644
--- 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"
diff --git a/mail/components/im/content/imAccounts.xhtml b/mail/components/im/content/imAccounts.xhtml
index d123521be1..5be1378583 100644
--- 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"
diff --git a/mail/components/im/content/joinchat.xhtml b/mail/components/im/content/joinchat.xhtml
index 8bd5753e91..c1c82469b5 100644
--- 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"
diff --git a/mail/components/migration/content/migration.xhtml b/mail/components/migration/content/migration.xhtml
index 4171d02f63..f08e6dce2a 100644
--- 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>
diff --git a/mail/components/newmailaccount/content/accountProvisioner.xhtml b/mail/components/newmailaccount/content/accountProvisioner.xhtml
index 37f4be1422..ce09709f9f 100644
--- 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" />
 
diff --git a/mail/components/preferences/applicationManager.xhtml b/mail/components/preferences/applicationManager.xhtml
index 10c9346c0f..9e94c2948a 100644
--- 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"
diff --git a/mail/components/preferences/attachmentReminder.xhtml b/mail/components/preferences/attachmentReminder.xhtml
index 7f2f7b19ce..8bea211104 100644
--- 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"
diff --git a/mail/components/preferences/colors.xhtml b/mail/components/preferences/colors.xhtml
index f952de2d59..5feef5e45e 100644
--- 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>
 
diff --git a/mail/components/preferences/connection.xhtml b/mail/components/preferences/connection.xhtml
index 1bbb822f66..2b64e82271 100644
--- 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"
diff --git a/mail/components/preferences/cookies.xhtml b/mail/components/preferences/cookies.xhtml
index 63b6ba5a64..21307fab39 100644
--- 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>
 
diff --git a/mail/components/preferences/dockoptions.xhtml b/mail/components/preferences/dockoptions.xhtml
index 978cbe1e2d..0e33217711 100644
--- 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">
diff --git a/mail/components/preferences/fonts.xhtml b/mail/components/preferences/fonts.xhtml
index 4bb793a04d..76c6e8e92f 100644
--- 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"
diff --git a/mail/components/preferences/messengerLanguages.xhtml b/mail/components/preferences/messengerLanguages.xhtml
index 116ee4e5b2..9fc8188aa8 100644
--- 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"
diff --git a/mail/components/preferences/notifications.xhtml b/mail/components/preferences/notifications.xhtml
index d9abb47e4e..e673400c7b 100644
--- 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"
diff --git a/mail/components/preferences/offline.xhtml b/mail/components/preferences/offline.xhtml
index 77a86cfa86..d1c8b25918 100644
--- 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>
 
diff --git a/mail/components/preferences/passwordManager.xhtml b/mail/components/preferences/passwordManager.xhtml
index 594f2da8d8..82456dbc2c 100644
--- 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"
diff --git a/mail/components/preferences/permissions.xhtml b/mail/components/preferences/permissions.xhtml
index 33340d3f63..af43017bb4 100644
--- 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"
diff --git a/mail/components/preferences/preferences.xhtml b/mail/components/preferences/preferences.xhtml
index ed81b83989..4e9490921f 100644
--- 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" />
diff --git a/mail/components/preferences/receipts.xhtml b/mail/components/preferences/receipts.xhtml
index 32f8a7237d..fcaf64d04c 100644
--- 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>
 
diff --git a/mail/components/preferences/tagDialog.xhtml b/mail/components/preferences/tagDialog.xhtml
index 32dd72268d..19f338e502 100644
--- 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"/>
diff --git a/mail/extensions/am-e2e/am-e2e.xhtml b/mail/extensions/am-e2e/am-e2e.xhtml
index 8c5620dd2f..bc8f3a527d 100644
--- 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"/>
diff --git a/mail/extensions/mailviews/content/mailViewList.xhtml b/mail/extensions/mailviews/content/mailViewList.xhtml
index 2e1115403b..e72921af9d 100644
--- 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" />
diff --git a/mail/extensions/mailviews/content/mailViewSetup.xhtml b/mail/extensions/mailviews/content/mailViewSetup.xhtml
index a9ff2ef5c9..e1a6bef0da 100644
--- 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"/>
diff --git a/mail/extensions/openpgp/content/ui/backupKeyPassword.xhtml b/mail/extensions/openpgp/content/ui/backupKeyPassword.xhtml
index 1fe18e1b0f..e6a6107d0b 100644
--- 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" />
diff --git a/mail/extensions/openpgp/content/ui/changeExpiryDlg.xhtml b/mail/extensions/openpgp/content/ui/changeExpiryDlg.xhtml
index ddfd67ce24..848991b023 100644
--- 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"
diff --git a/mail/extensions/openpgp/content/ui/composeKeyStatus.xhtml b/mail/extensions/openpgp/content/ui/composeKeyStatus.xhtml
index fc0192a8a6..32b5d9ce39 100644
--- 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"
diff --git a/mail/extensions/openpgp/content/ui/confirmPubkeyImport.xhtml b/mail/extensions/openpgp/content/ui/confirmPubkeyImport.xhtml
index 35935e0be7..f4d898e9cf 100644
--- 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
diff --git a/mail/extensions/openpgp/content/ui/enigmailKeyImportInfo.xhtml b/mail/extensions/openpgp/content/ui/enigmailKeyImportInfo.xhtml
index c5c8436398..f31d0e83c5 100644
--- a/mail/extensions/openpgp/content/ui/enigmailKeyImportInfo.xhtml
+++ b/mail/extensions/openpgp/content/ui/enigmailKeyImportInfo.xhtml
@@ -5,10 +5,6 @@
  * file, You can obtain one at https://mozilla.org/MPL/2.0/.
 -->
 
-<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/openpgp/enigmail.css" type="text/css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/shared/grid-layout.css"?>
-
 <!DOCTYPE window [ <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD; ]>
 
@@ -25,6 +21,19 @@
       src="chrome://openpgp/content/ui/enigmailKeyImportInfo.js"
     />
     <linkset>
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/messenger.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/openpgp/enigmail.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/shared/grid-layout.css"
+      />
+
       <html:link rel="localization" href="messenger/openpgp/openpgp.ftl" />
     </linkset>
 
diff --git a/mail/extensions/openpgp/content/ui/enigmailKeyManager.xhtml b/mail/extensions/openpgp/content/ui/enigmailKeyManager.xhtml
index 36f730fe4a..819529beb4 100644
--- a/mail/extensions/openpgp/content/ui/enigmailKeyManager.xhtml
+++ b/mail/extensions/openpgp/content/ui/enigmailKeyManager.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/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/contextMenu.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/openpgp/enigmail.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
@@ -47,6 +40,25 @@
     />
 
     <linkset>
+      <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/contextMenu.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/openpgp/enigmail.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="messenger/openpgp/openpgp.ftl" />
     </linkset>
 
diff --git a/mail/extensions/openpgp/content/ui/enigmailMsgBox.xhtml b/mail/extensions/openpgp/content/ui/enigmailMsgBox.xhtml
index 3fec668c8c..057bd5503b 100644
--- a/mail/extensions/openpgp/content/ui/enigmailMsgBox.xhtml
+++ b/mail/extensions/openpgp/content/ui/enigmailMsgBox.xhtml
@@ -5,11 +5,6 @@
  * file, You can obtain one at https://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"?>
-<?xml-stylesheet href="chrome://messenger/skin/openpgp/enigmail.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
-
 <!DOCTYPE window [ <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD; ]>
 
@@ -26,6 +21,23 @@
       src="chrome://openpgp/content/ui/enigmailMsgBox.js"
     />
     <linkset>
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/messenger.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/contextMenu.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/openpgp/enigmail.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/shared/grid-layout.css"
+      />
+
       <html:link rel="localization" href="messenger/openpgp/openpgp.ftl" />
     </linkset>
 
diff --git a/mail/extensions/openpgp/content/ui/keyDetailsDlg.xhtml b/mail/extensions/openpgp/content/ui/keyDetailsDlg.xhtml
index a7f57d0339..5fe3abb552 100644
--- a/mail/extensions/openpgp/content/ui/keyDetailsDlg.xhtml
+++ b/mail/extensions/openpgp/content/ui/keyDetailsDlg.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/accountManage.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/openpgp/keyDetails.css" type="text/css"?>
-
 <!DOCTYPE html>
 <html
   id="enigmailKeyDetailsDlg"
@@ -16,6 +12,13 @@
 >
   <head>
     <title data-l10n-id="openpgp-key-details-doc-title"></title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/accountManage.css" />
+    <link
+      rel="stylesheet"
+      href="chrome://messenger/skin/openpgp/keyDetails.css"
+    />
+
     <link rel="localization" href="branding/brand.ftl" />
     <link rel="localization" href="messenger/openpgp/openpgp.ftl" />
     <script defer="defer" src="chrome://messenger/content/globalOverlay.js" />
diff --git a/mail/extensions/openpgp/content/ui/keyWizard.xhtml b/mail/extensions/openpgp/content/ui/keyWizard.xhtml
index c630eacb48..8c89e513f2 100644
--- a/mail/extensions/openpgp/content/ui/keyWizard.xhtml
+++ b/mail/extensions/openpgp/content/ui/keyWizard.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://messenger/skin/contextMenu.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/openpgp/keyWizard.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/openpgp/inlineNotification.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>
 
 <window
@@ -32,6 +24,29 @@
     <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/contextMenu.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/openpgp/keyWizard.css"
+      />
+      <html:link
+        rel="stylesheet"
+        href="chrome://messenger/skin/openpgp/inlineNotification.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" href="messenger/openpgp/keyWizard.ftl" />
     </linkset>
diff --git a/mail/extensions/openpgp/content/ui/oneRecipientStatus.xhtml b/mail/extensions/openpgp/content/ui/oneRecipientStatus.xhtml
index 5875224d4c..bfd7d128e1 100644
--- a/mail/extensions/openpgp/content/ui/oneRecipientStatus.xhtml
+++ b/mail/extensions/openpgp/content/ui/oneRecipientStatus.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/openpgp/openPgpComposeStatus.css" type="text/css"?>
-
 <window
   data-l10n-id="openpgp-one-recipient-status-title"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -17,6 +14,12 @@
   <dialog id="oneRecipientStatus" buttons="accept">
     <script src="chrome://openpgp/content/ui/oneRecipientStatus.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="localization"
         href="messenger/openpgp/oneRecipientStatus.ftl"
diff --git a/mailnews/addrbook/content/abAddressBookNameDialog.xhtml b/mailnews/addrbook/content/abAddressBookNameDialog.xhtml
index 3fc0d7d9e1..cc2498b55d 100644
--- a/mailnews/addrbook/content/abAddressBookNameDialog.xhtml
+++ b/mailnews/addrbook/content/abAddressBookNameDialog.xhtml
@@ -3,11 +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"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/addressbook/abAddressBookNameDialog.dtd">
-
 <html
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -17,6 +13,8 @@
 >
   <head>
     <title><!-- addressBookTitleEdit --></title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
     <script
       defer="defer"
       src="chrome://messenger/content/globalOverlay.js"
@@ -36,7 +34,6 @@
         id="bundle_addressBook"
         src="chrome://messenger/locale/addressbook/addressBook.properties"
       />
-
       <div class="input-container">
         <label id="nameLabel" for="name">&name.label;</label>
         <input
diff --git a/mailnews/addrbook/content/abCardDAVDialog.xhtml b/mailnews/addrbook/content/abCardDAVDialog.xhtml
index 9e0fc5e1e4..b0134cec17 100644
--- a/mailnews/addrbook/content/abCardDAVDialog.xhtml
+++ b/mailnews/addrbook/content/abCardDAVDialog.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/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/cardDAV.css" type="text/css"?>
-
 <html
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -16,6 +12,10 @@
 >
   <head>
     <title data-l10n-id="carddav-window-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/shared/cardDAV.css" />
+
     <link rel="localization" href="branding/brand.ftl" />
     <link rel="localization" href="messenger/addressbook/abCardDAVDialog.ftl" />
     <script
diff --git a/mailnews/addrbook/content/abCardDAVProperties.xhtml b/mailnews/addrbook/content/abCardDAVProperties.xhtml
index b611cbbf43..8d9f55bd55 100644
--- a/mailnews/addrbook/content/abCardDAVProperties.xhtml
+++ b/mailnews/addrbook/content/abCardDAVProperties.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://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/shared/cardDAV.css" type="text/css"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/addressbook/abAddressBookNameDialog.dtd">
-
 <html
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -19,6 +14,9 @@
 >
   <head>
     <title><!-- addressBookTitleEdit --></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/shared/cardDAV.css" />
     <link
       rel="localization"
       href="messenger/addressbook/abCardDAVProperties.ftl"
diff --git a/mailnews/addrbook/prefs/content/pref-directory-add.xhtml b/mailnews/addrbook/prefs/content/pref-directory-add.xhtml
index ff2e40df1e..9a5e8f7d52 100644
--- a/mailnews/addrbook/prefs/content/pref-directory-add.xhtml
+++ b/mailnews/addrbook/prefs/content/pref-directory-add.xhtml
@@ -3,13 +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/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/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/addressbook/pref-directory-add.dtd">
-
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       xmlns:html="http://www.w3.org/1999/xhtml"
@@ -17,6 +11,13 @@
       scrolling="false">
 <head>
   <title><!-- directoryTitleEdit --></title>
+  <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+  <link
+    rel="stylesheet"
+    href="chrome://messenger/skin/shared/grid-layout.css"
+  />
+  <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
   <style>
     #directoryTabPanels radiogroup {
       margin-inline-start: 4px;
diff --git a/mailnews/addrbook/prefs/content/pref-editdirectories.xhtml b/mailnews/addrbook/prefs/content/pref-editdirectories.xhtml
index 381aee3050..dd0298436a 100644
--- a/mailnews/addrbook/prefs/content/pref-editdirectories.xhtml
+++ b/mailnews/addrbook/prefs/content/pref-editdirectories.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 html SYSTEM "chrome://messenger/locale/addressbook/pref-directory.dtd">
 
 <html
@@ -15,6 +13,7 @@
 >
   <head>
     <title>&pref.ldap.window.title;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
     <link
       rel="localization"
       href="messenger/addressbook/aboutAddressBook.ftl"
diff --git a/mailnews/base/content/folderProps.xhtml b/mailnews/base/content/folderProps.xhtml
index a2812fc383..965df7b868 100644
--- a/mailnews/base/content/folderProps.xhtml
+++ b/mailnews/base/content/folderProps.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 https://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://messenger/skin/input-fields.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/folderProps.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/folderColors.css"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/folderProps.dtd">
 <html
   xmlns="http://www.w3.org/1999/xhtml"
@@ -22,6 +14,14 @@
 >
   <head>
     <title>&folderProps.windowtitle.label;</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="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/folderProps.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/folderColors.css" />
+
     <link rel="localization" href="messenger/folderprops.ftl" />
     <script
       defer="defer"
diff --git a/mailnews/base/content/junkLog.xhtml b/mailnews/base/content/junkLog.xhtml
index 28c7071c4e..7d941cad75 100644
--- a/mailnews/base/content/junkLog.xhtml
+++ b/mailnews/base/content/junkLog.xhtml
@@ -3,10 +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"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/junkLog.dtd">
-
 <html
   id="viewLogWindow"
   xmlns="http://www.w3.org/1999/xhtml"
@@ -19,6 +16,7 @@
 >
   <head>
     <title>&adaptiveJunkLog.title;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
     <script defer="defer" src="chrome://messenger/content/junkLog.js"></script>
   </head>
   <html:body
diff --git a/mailnews/base/content/markByDate.xhtml b/mailnews/base/content/markByDate.xhtml
index 7928bf2b59..3409104b4f 100644
--- a/mailnews/base/content/markByDate.xhtml
+++ b/mailnews/base/content/markByDate.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/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 html SYSTEM "chrome://messenger/locale/markByDate.dtd">
 <html
   xmlns="http://www.w3.org/1999/xhtml"
@@ -18,6 +13,11 @@
 >
   <head>
     <title>&messageMarkByDate.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/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+
     <link rel="localization" href="branding/brand.ftl" />
     <script
       defer="defer"
diff --git a/mailnews/base/content/msgAccountCentral.xhtml b/mailnews/base/content/msgAccountCentral.xhtml
index c09954eb7b..5718604d21 100644
--- a/mailnews/base/content/msgAccountCentral.xhtml
+++ b/mailnews/base/content/msgAccountCentral.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/accountCentral.css" type="text/css"?>
-
 <!DOCTYPE html>
 
 <html
@@ -13,6 +11,8 @@
   lightweightthemes="true"
 >
   <head>
+    <link rel="stylesheet" href="chrome://messenger/skin/accountCentral.css" />
+
     <link rel="localization" href="branding/brand.ftl" />
     <link rel="localization" href="messenger/accountCentral.ftl" />
 
diff --git a/mailnews/base/content/msgSelectOfflineFolders.xhtml b/mailnews/base/content/msgSelectOfflineFolders.xhtml
index 88e0ecbd39..2c1e7e6b39 100644
--- a/mailnews/base/content/msgSelectOfflineFolders.xhtml
+++ b/mailnews/base/content/msgSelectOfflineFolders.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/msgSelectOffline.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/icons.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/msgSynchronize.dtd">
 
 <html
@@ -24,6 +19,13 @@
 >
   <head>
     <title>&MsgSelect.label;</title>
+    <link
+      rel="stylesheet"
+      href="chrome://messenger/skin/msgSelectOffline.css"
+    />
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/icons.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
     <script
       defer="defer"
       src="chrome://messenger/content/dialogShadowDom.js"
diff --git a/mailnews/base/content/msgSynchronize.xhtml b/mailnews/base/content/msgSynchronize.xhtml
index 27df730cac..90aef56d1e 100644
--- a/mailnews/base/content/msgSynchronize.xhtml
+++ b/mailnews/base/content/msgSynchronize.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 https://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 SYSTEM "chrome://messenger/locale/msgSynchronize.dtd">
 <html
   id="msgSynchronize"
@@ -20,6 +16,9 @@
 >
   <head>
     <title>&MsgSynchronize.label;</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/dialogShadowDom.js"
diff --git a/mailnews/base/content/newFolderDialog.xhtml b/mailnews/base/content/newFolderDialog.xhtml
index bc141b95f3..1778f3d16a 100644
--- a/mailnews/base/content/newFolderDialog.xhtml
+++ b/mailnews/base/content/newFolderDialog.xhtml
@@ -1,20 +1,10 @@
 <?xml version="1.0"?>
-
 <!-- 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/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/input-fields.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 html [ <!ENTITY % newFolderDTD SYSTEM "chrome://messenger/locale/newFolderDialog.dtd">
 %newFolderDTD; ]>
-
 <html
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -24,6 +14,13 @@
 >
   <head>
     <title>&newFolderDialog.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/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/folderMenus.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/contextMenu.css" />
     <script
       defer="defer"
       src="chrome://messenger/content/globalOverlay.js"
diff --git a/mailnews/base/content/newmailalert.xhtml b/mailnews/base/content/newmailalert.xhtml
index 1346be9c9a..52a8029ebf 100644
--- a/mailnews/base/content/newmailalert.xhtml
+++ b/mailnews/base/content/newmailalert.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://messenger/skin/newmailalert.css" type="text/css"?>
-
 <html
   id="newMailAlertNotification"
   xmlns="http://www.w3.org/1999/xhtml"
@@ -15,6 +13,7 @@
   scrolling="false"
 >
   <head>
+    <link rel="stylesheet" href="chrome://messenger/skin/newmailalert.css" />
     <script
       defer="defer"
       src="chrome://messenger/content/newmailalert.js"
diff --git a/mailnews/base/content/renameFolderDialog.xhtml b/mailnews/base/content/renameFolderDialog.xhtml
index f81ba88db0..3feeeb2b61 100644
--- a/mailnews/base/content/renameFolderDialog.xhtml
+++ b/mailnews/base/content/renameFolderDialog.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 html SYSTEM "chrome://messenger/locale/renameFolderDialog.dtd">
 <html
   xmlns="http://www.w3.org/1999/xhtml"
@@ -19,6 +14,11 @@
 >
   <head>
     <title>&renameFolderDialog.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="localization" href="branding/brand.ftl" />
     <script
       defer="defer"
diff --git a/mailnews/base/content/shutdownWindow.xhtml b/mailnews/base/content/shutdownWindow.xhtml
index 32237dc44f..64b092a6e3 100644
--- a/mailnews/base/content/shutdownWindow.xhtml
+++ b/mailnews/base/content/shutdownWindow.xhtml
@@ -1,13 +1,7 @@
 <?xml version="1.0"?>
-<!--
-# 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/colors.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.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/. -->
 
 <html
   xmlns="http://www.w3.org/1999/xhtml"
@@ -19,6 +13,9 @@
   scrolling="false"
 >
   <head>
+    <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/dialogShadowDom.js"
diff --git a/mailnews/base/content/subscribe.xhtml b/mailnews/base/content/subscribe.xhtml
index f2838b95e2..f12c6f1d0f 100644
--- a/mailnews/base/content/subscribe.xhtml
+++ b/mailnews/base/content/subscribe.xhtml
@@ -3,16 +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/subscribe.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/searchBox.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/colors.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 html SYSTEM "chrome://messenger/locale/subscribe.dtd">
-
 <html
   id="subscribeWindow"
   xmlns="http://www.w3.org/1999/xhtml"
@@ -25,6 +16,13 @@
 >
   <head>
     <title>&subscribeDialog.title;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/subscribe.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/searchBox.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/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/contextMenu.css" />
     <script
       defer="defer"
       src="chrome://messenger/content/globalOverlay.js"
diff --git a/mailnews/base/content/virtualFolderListEdit.xhtml b/mailnews/base/content/virtualFolderListEdit.xhtml
index 326892734a..67bef4970e 100644
--- a/mailnews/base/content/virtualFolderListEdit.xhtml
+++ b/mailnews/base/content/virtualFolderListEdit.xhtml
@@ -1,17 +1,9 @@
 <?xml version="1.0"?>
 <!-- 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"?>
-<?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/mailWindow1.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
+   - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/virtualFolderListDialog.dtd">
-
 <html
   id="virtualFolderList"
   xmlns="http://www.w3.org/1999/xhtml"
@@ -26,6 +18,11 @@
 >
   <head>
     <title>&virtualFolderListTitle.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/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/mailWindow1.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
     <script
       defer="defer"
       src="chrome://messenger/content/dialogShadowDom.js"
diff --git a/mailnews/base/content/virtualFolderProperties.xhtml b/mailnews/base/content/virtualFolderProperties.xhtml
index 07b8283f84..81a3c49e77 100644
--- a/mailnews/base/content/virtualFolderProperties.xhtml
+++ b/mailnews/base/content/virtualFolderProperties.xhtml
@@ -4,15 +4,6 @@
    - 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/folderMenus.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/themeableDialog.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/folderColors.css" type="text/css"?>
-
 <!DOCTYPE html [
   <!ENTITY % folderDTD SYSTEM "chrome://messenger/locale/virtualFolderProperties.dtd">
   %folderDTD;
@@ -30,6 +21,18 @@
       scrolling="false">
 <head>
   <title>&virtualFolderProperties.title;</title>
+  <link rel="stylesheet" href="chrome://messenger/skin/searchDialog.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/folderMenus.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/themeableDialog.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/folderColors.css" />
+
   <link rel="localization" href="branding/brand.ftl" />
   <script defer="defer" src="chrome://messenger/content/globalOverlay.js"></script>
   <script defer="defer" src="chrome://global/content/editMenuOverlay.js"></script>
diff --git a/mailnews/base/prefs/content/AccountWizard.xhtml b/mailnews/base/prefs/content/AccountWizard.xhtml
index b58db60f60..4e2056e44e 100644
--- a/mailnews/base/prefs/content/AccountWizard.xhtml
+++ b/mailnews/base/prefs/content/AccountWizard.xhtml
@@ -6,11 +6,6 @@
 <!-- NOTE: This Account Wizard is *only* for Newsgroup accounts. Historically,
    - it was a generic Account Wizard, hence the generic naming. -->
 
-<?xml-stylesheet href="chrome://messenger/skin/accountWizard.css" type="text/css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
-<?xml-stylesheet href="chrome://messenger/skin/shared/grid-layout.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/themeableDialog.css" type="text/css"?>
-
 <!DOCTYPE window [
 <!ENTITY % AccountWizardDTD SYSTEM "chrome://messenger/locale/AccountWizard.dtd">
 %AccountWizardDTD;
@@ -27,6 +22,23 @@
   <stringbundle id="bundle_prefs" src="chrome://messenger/locale/prefs.properties"/>
   <stringbundle id="bundle_messenger" src="chrome://messenger/locale/messenger.properties"/>
   <linkset>
+    <html:link
+      rel="stylesheet"
+      href="chrome://messenger/skin/accountWizard.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/themeableDialog.css"
+    />
+
     <html:link rel="localization" href="toolkit/global/wizard.ftl"/>
   </linkset>
 
diff --git a/mailnews/base/prefs/content/SmtpServerEdit.xhtml b/mailnews/base/prefs/content/SmtpServerEdit.xhtml
index d0bbda97c6..83dd027006 100644
--- a/mailnews/base/prefs/content/SmtpServerEdit.xhtml
+++ b/mailnews/base/prefs/content/SmtpServerEdit.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/input-fields.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/smtpEditOverlay.dtd">
 
 <html
@@ -16,6 +13,8 @@
 >
   <head>
     <title>&smtpEditTitle.label;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/accountManage.css" />
     <script
       defer="defer"
       src="chrome://messenger/content/globalOverlay.js"
diff --git a/mailnews/base/prefs/content/am-addressing.xhtml b/mailnews/base/prefs/content/am-addressing.xhtml
index 554ee398c1..d9be730489 100644
--- a/mailnews/base/prefs/content/am-addressing.xhtml
+++ b/mailnews/base/prefs/content/am-addressing.xhtml
@@ -1,18 +1,15 @@
 <?xml version="1.0"?>
-
 <!-- 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/accountManage.css" type="text/css"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/am-addressing.dtd">
-
 <html xmlns="http://www.w3.org/1999/xhtml"
       xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
       xmlns:html="http://www.w3.org/1999/xhtml">
 <head>
   <title>&addressing.label;</title>
+  <link rel="stylesheet" href="chrome://messenger/skin/accountManage.css" />
   <script defer="defer" src="chrome://messenger/content/am-addressing.js"></script>
   <script defer="defer" src="chrome://messenger/content/amUtils.js"></script>
   <script defer="defer" src="chrome://messenger/content/am-prefs.js"></script>
diff --git a/mailnews/base/prefs/content/am-archiveoptions.xhtml b/mailnews/base/prefs/content/am-archiveoptions.xhtml
index e34de7a420..9a6f864433 100644
--- a/mailnews/base/prefs/content/am-archiveoptions.xhtml
+++ b/mailnews/base/prefs/content/am-archiveoptions.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/accountManage.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/folderPane.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/icons.css" type="text/css"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/am-archiveoptions.dtd">
 <html
   id="archiveOptions"
@@ -18,6 +14,9 @@
 >
   <head>
     <title>&dialogTitle.label;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/accountManage.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/folderPane.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/icons.css" />
     <script
       defer="defer"
       src="chrome://messenger/content/am-archiveoptions.js"
diff --git a/mailnews/base/prefs/content/am-copies.xhtml b/mailnews/base/prefs/content/am-copies.xhtml
index c142cb8eb5..6f5a64cfbb 100644
--- a/mailnews/base/prefs/content/am-copies.xhtml
+++ b/mailnews/base/prefs/content/am-copies.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/accountManage.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"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/am-copies.dtd">
 
 <html xmlns="http://www.w3.org/1999/xhtml"
@@ -14,6 +10,9 @@
       xmlns:html="http://www.w3.org/1999/xhtml">
 <head>
   <title>&copyAndFolderTitle.label;</title>
+  <link rel="stylesheet" href="chrome://messenger/skin/accountManage.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/icons.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/folderMenus.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/am-copies.js"></script>
diff --git a/mailnews/base/prefs/content/am-identities-list.xhtml b/mailnews/base/prefs/content/am-identities-list.xhtml
index 243630bd75..8b6b2ffe6b 100644
--- a/mailnews/base/prefs/content/am-identities-list.xhtml
+++ b/mailnews/base/prefs/content/am-identities-list.xhtml
@@ -3,11 +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/shared/grid-layout.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/am-identities-list.dtd">
-
 <html
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -17,6 +13,11 @@
 >
   <head>
     <title><!-- identity-list-title --></title>
+    <link
+      rel="stylesheet"
+      href="chrome://messenger/skin/shared/grid-layout.css"
+    />
+    <link rel="stylesheet" href="chrome://messenger/skin/accountManage.css" />
     <script
       defer="defer"
       src="chrome://messenger/content/am-identities-list.js"
diff --git a/mailnews/base/prefs/content/am-identity-edit.xhtml b/mailnews/base/prefs/content/am-identity-edit.xhtml
index d967b18202..17e20cb851 100644
--- a/mailnews/base/prefs/content/am-identity-edit.xhtml
+++ b/mailnews/base/prefs/content/am-identity-edit.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/icons.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/folderMenus.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"?>
-
 <!DOCTYPE html [
 <!ENTITY % identityEditDTD SYSTEM "chrome://messenger/locale/am-identity-edit.dtd" >
 %identityEditDTD;
@@ -27,6 +22,13 @@
       style="height: 900px; min-width: 800px;">
 <head>
   <title><!-- identityDialogTitleEdit --></title>
+  <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/accountManage.css" />
+  <link
+    rel="stylesheet"
+    href="chrome://messenger/skin/openpgp/inlineNotification.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://global/content/preferencesBindings.js"></script>
diff --git a/mailnews/base/prefs/content/am-junk.xhtml b/mailnews/base/prefs/content/am-junk.xhtml
index 216d3c0431..12f73f3fa2 100644
--- a/mailnews/base/prefs/content/am-junk.xhtml
+++ b/mailnews/base/prefs/content/am-junk.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/accountManage.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"?>
-
 <!DOCTYPE html [ <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
 <!ENTITY % junkMailDTD SYSTEM "chrome://messenger/locale/am-junk.dtd">
@@ -20,6 +16,9 @@
 >
   <head>
     <title>&junkSettings.label;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/accountManage.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/icons.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/folderMenus.css" />
     <script defer="defer" src="chrome://messenger/content/am-junk.js"></script>
     <script defer="defer" src="chrome://messenger/content/am-prefs.js"></script>
     <script defer="defer" src="chrome://messenger/content/amUtils.js"></script>
diff --git a/mailnews/base/prefs/content/am-main.xhtml b/mailnews/base/prefs/content/am-main.xhtml
index 09f5453fb8..83dbf5bd95 100644
--- a/mailnews/base/prefs/content/am-main.xhtml
+++ b/mailnews/base/prefs/content/am-main.xhtml
@@ -3,16 +3,14 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/am-main.dtd">
-
 <html
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:html="http://www.w3.org/1999/xhtml"
 >
   <head>
+    <link rel="stylesheet" href="chrome://messenger/skin/accountManage.css" />
     <script
       defer="defer"
       src="chrome://messenger/content/globalOverlay.js"
diff --git a/mailnews/base/prefs/content/am-offline.xhtml b/mailnews/base/prefs/content/am-offline.xhtml
index 0d3a12e396..07730077f3 100644
--- a/mailnews/base/prefs/content/am-offline.xhtml
+++ b/mailnews/base/prefs/content/am-offline.xhtml
@@ -3,16 +3,14 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://messenger/skin/accountManage.css" type="text/css"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/am-offline.dtd">
-
 <html
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
   xmlns:html="http://www.w3.org/1999/xhtml"
 >
   <head>
+    <link rel="stylesheet" href="chrome://messenger/skin/accountManage.css" />
     <script
       defer="defer"
       src="chrome://messenger/content/retention.js"
diff --git a/mailnews/base/prefs/content/am-server-advanced.xhtml b/mailnews/base/prefs/content/am-server-advanced.xhtml
index b8349af38f..1bb3e240b2 100644
--- a/mailnews/base/prefs/content/am-server-advanced.xhtml
+++ b/mailnews/base/prefs/content/am-server-advanced.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://messenger/skin/accountManage.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"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/am-server-advanced.dtd">
-
 <html
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -17,6 +12,9 @@
 >
   <head>
     <title>&serverAdvanced.label;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/accountManage.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/icons.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/folderMenus.css" />
     <script
       defer="defer"
       src="chrome://messenger/content/globalOverlay.js"
diff --git a/mailnews/base/prefs/content/am-server.xhtml b/mailnews/base/prefs/content/am-server.xhtml
index b41e93e290..c7cfdda6fd 100644
--- a/mailnews/base/prefs/content/am-server.xhtml
+++ b/mailnews/base/prefs/content/am-server.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 https://mozilla.org/MPL/2.0/. -->
 
-<?xml-stylesheet href="chrome://messenger/skin/accountManage.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"?>
-
 <!DOCTYPE html [ <!ENTITY % trashDTD SYSTEM "chrome://messenger/locale/am-server-top.dtd">
 %trashDTD; ]>
 
@@ -17,6 +13,9 @@
 >
   <head>
     <title>&serverSettings.label;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/accountManage.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/icons.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/folderMenus.css" />
     <script
       defer="defer"
       src="chrome://messenger/content/globalOverlay.js"
diff --git a/mailnews/base/prefs/content/am-serverwithnoidentities.xhtml b/mailnews/base/prefs/content/am-serverwithnoidentities.xhtml
index 1cdc36550f..37acafde1f 100644
--- a/mailnews/base/prefs/content/am-serverwithnoidentities.xhtml
+++ b/mailnews/base/prefs/content/am-serverwithnoidentities.xhtml
@@ -3,13 +3,10 @@
    - 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"?>
-
 <!DOCTYPE html [ <!ENTITY % accountNoIdentDTD SYSTEM "chrome://messenger/locale/am-serverwithnoidentities.dtd">
 %accountNoIdentDTD;
 <!ENTITY % accountServerTopDTD SYSTEM "chrome://messenger/locale/am-server-top.dtd">%accountServerTopDTD;
 ]>
-
 <html
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -17,6 +14,7 @@
 >
   <head>
     <title>&accountTitle.label;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/accountManage.css" />
     <script
       defer="defer"
       src="chrome://messenger/content/globalOverlay.js"
diff --git a/mailnews/base/prefs/content/am-smtp.xhtml b/mailnews/base/prefs/content/am-smtp.xhtml
index 851fb8da3e..a9af2e0a52 100644
--- a/mailnews/base/prefs/content/am-smtp.xhtml
+++ b/mailnews/base/prefs/content/am-smtp.xhtml
@@ -3,10 +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/accountManage.css" type="text/css"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/am-advanced.dtd">
-
 <html
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -14,6 +11,7 @@
 >
   <head>
     <title>&smtpServer.label;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/accountManage.css" />
     <script
       defer="defer"
       src="chrome://messenger/content/globalOverlay.js"
diff --git a/mailnews/base/prefs/content/removeAccount.xhtml b/mailnews/base/prefs/content/removeAccount.xhtml
index 510b3fef84..581b75219e 100644
--- a/mailnews/base/prefs/content/removeAccount.xhtml
+++ b/mailnews/base/prefs/content/removeAccount.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/checkbox.css" type="text/css"?>
-
 <!DOCTYPE html [
 <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
 %brandDTD;
@@ -18,6 +16,8 @@
       scrolling="false">
 <head>
   <title>&dialogTitle;</title>
+  <link rel="stylesheet" href="chrome://global/skin/checkbox.css" />
+
   <link rel="localization" href="branding/brand.ftl" />
   <script defer="defer" src="chrome://messenger/content/removeAccount.js"></script>
 </head>
diff --git a/mailnews/compose/content/sendProgress.xhtml b/mailnews/compose/content/sendProgress.xhtml
index cf46d0c8cc..9e9218a943 100644
--- a/mailnews/compose/content/sendProgress.xhtml
+++ b/mailnews/compose/content/sendProgress.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 SYSTEM "chrome://messenger/locale/messengercompose/sendProgress.dtd">
 <html
   xmlns="http://www.w3.org/1999/xhtml"
@@ -18,6 +14,10 @@
 >
   <head>
     <title>&sendDialog.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="branding/brand.ftl" />
     <script
       defer="defer"
diff --git a/mailnews/extensions/mdn/am-mdn.xhtml b/mailnews/extensions/mdn/am-mdn.xhtml
index 3cdf85d9e5..33bed97fc2 100644
--- a/mailnews/extensions/mdn/am-mdn.xhtml
+++ b/mailnews/extensions/mdn/am-mdn.xhtml
@@ -4,10 +4,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/accountManage.css" type="text/css"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/am-mdn.dtd">
-
 <html
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -15,6 +12,7 @@
 >
   <head>
     <title>&pane.title;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/accountManage.css" />
     <script
       defer="defer"
       src="chrome://messenger/content/AccountManager.js"
diff --git a/mailnews/extensions/newsblog/am-newsblog.xhtml b/mailnews/extensions/newsblog/am-newsblog.xhtml
index e6ba0f6a5d..0bb98dda57 100644
--- a/mailnews/extensions/newsblog/am-newsblog.xhtml
+++ b/mailnews/extensions/newsblog/am-newsblog.xhtml
@@ -3,14 +3,11 @@
    - 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-newsblog/skin/feed-subscriptions.css" type="text/css"?>
-
 <!DOCTYPE html [ <!ENTITY % newsblogDTD SYSTEM "chrome://messenger-newsblog/locale/am-newsblog.dtd">
 %newsblogDTD;
-<!ENTITY %             feedDTD SYSTEM "chrome://messenger-newsblog/locale/feed-subscriptions.dtd" >
+<!ENTITY % feedDTD SYSTEM "chrome://messenger-newsblog/locale/feed-subscriptions.dtd">
 %feedDTD;
-<!ENTITY %   accountNoIdentDTD SYSTEM "chrome://messenger/locale/am-serverwithnoidentities.dtd" >
+<!ENTITY % accountNoIdentDTD SYSTEM "chrome://messenger/locale/am-serverwithnoidentities.dtd">
 %accountNoIdentDTD;
 <!ENTITY % accountServerTopDTD SYSTEM "chrome://messenger/locale/am-server-top.dtd">
 %accountServerTopDTD; ]>
@@ -22,6 +19,11 @@
 >
   <head>
     <title>&accountTitle.label;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/accountManage.css" />
+    <link
+      rel="stylesheet"
+      href="chrome://messenger-newsblog/skin/feed-subscriptions.css"
+    />
     <script
       defer="defer"
       src="chrome://messenger/content/globalOverlay.js"
diff --git a/mailnews/extensions/newsblog/feed-subscriptions.xhtml b/mailnews/extensions/newsblog/feed-subscriptions.xhtml
index d2f8cba2bb..1656acd32e 100644
--- a/mailnews/extensions/newsblog/feed-subscriptions.xhtml
+++ b/mailnews/extensions/newsblog/feed-subscriptions.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://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/folderPane.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-newsblog/skin/feed-subscriptions.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"?>
-<?xml-stylesheet href="chrome://messenger/skin/contextMenu.css" type="text/css"?>
-
 <!DOCTYPE html [ <!ENTITY % feedDTD SYSTEM "chrome://messenger-newsblog/locale/feed-subscriptions.dtd">
 %feedDTD;
 <!ENTITY % newsblogDTD SYSTEM "chrome://messenger-newsblog/locale/am-newsblog.dtd">
@@ -30,6 +20,19 @@
 >
   <head>
     <title>&feedSubscriptions.label;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/folderPane.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-newsblog/skin/feed-subscriptions.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://messenger/skin/contextMenu.css" />
+
     <link rel="localization" href="security/certificates/certManager.ftl" />
     <script
       defer="defer"
diff --git a/mailnews/extensions/newsblog/feedAccountWizard.xhtml b/mailnews/extensions/newsblog/feedAccountWizard.xhtml
index ef1be03dd7..e7876d15e2 100644
--- a/mailnews/extensions/newsblog/feedAccountWizard.xhtml
+++ b/mailnews/extensions/newsblog/feedAccountWizard.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/accountWizard.css" type="text/css"?>
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.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 % accountDTD SYSTEM "chrome://messenger/locale/AccountWizard.dtd">
 %accountDTD;
 <!ENTITY % newsblogDTD SYSTEM "chrome://messenger-newsblog/locale/am-newsblog.dtd" >
@@ -25,6 +20,11 @@
 >
   <head>
     <title>&feedWindowTitle.label;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/accountWizard.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="localization" href="toolkit/global/wizard.ftl" />
     <script
       defer="defer"
diff --git a/mailnews/extensions/smime/certFetchingStatus.xhtml b/mailnews/extensions/smime/certFetchingStatus.xhtml
index b82042edda..f9f8686896 100644
--- a/mailnews/extensions/smime/certFetchingStatus.xhtml
+++ b/mailnews/extensions/smime/certFetchingStatus.xhtml
@@ -3,11 +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/messenger.css" type="text/css"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger-smime/locale/certFetchingStatus.dtd">
-
 <html
   xmlns="http://www.w3.org/1999/xhtml"
   xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
@@ -16,6 +12,8 @@
 >
   <head>
     <title>&title.label;</title>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
     <script
       defer="defer"
       src="chrome://messenger-smime/content/certFetchingStatus.js"
diff --git a/mailnews/extensions/smime/certpicker.xhtml b/mailnews/extensions/smime/certpicker.xhtml
index c0ff513cb6..1bb5e47193 100644
--- a/mailnews/extensions/smime/certpicker.xhtml
+++ b/mailnews/extensions/smime/certpicker.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 [ <!ENTITY % amE2EDTD SYSTEM "chrome://messenger/locale/am-smime.dtd">
 %amE2EDTD; ]>
 
@@ -16,6 +14,7 @@
 >
   <head>
     <title>&certPicker.title;</title>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
     <script
       defer="defer"
       src="chrome://messenger/content/globalOverlay.js"
diff --git a/mailnews/extensions/smime/msgCompSecurityInfo.xhtml b/mailnews/extensions/smime/msgCompSecurityInfo.xhtml
index 982d76818e..1becfc1244 100644
--- a/mailnews/extensions/smime/msgCompSecurityInfo.xhtml
+++ b/mailnews/extensions/smime/msgCompSecurityInfo.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/smime/msgCompSecurityInfo.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 html SYSTEM "chrome://messenger-smime/locale/msgCompSecurityInfo.dtd">
 <html
   id="msgCompSecurityInfo"
@@ -20,6 +14,15 @@
 >
   <head>
     <title>&title.label;</title>
+    <link rel="stylesheet" href="chrome://global/skin/global.css" />
+    <link
+      rel="stylesheet"
+      href="chrome://messenger/skin/smime/msgCompSecurityInfo.css"
+    />
+    <link rel="stylesheet" href="chrome://messenger/skin/colors.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/variables.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+
     <link rel="localization" href="branding/brand.ftl" />
     <script
       defer="defer"
diff --git a/mailnews/jar.mn b/mailnews/jar.mn
index 85b000577c..6f76816a86 100644
--- a/mailnews/jar.mn
+++ b/mailnews/jar.mn
@@ -87,7 +87,7 @@ messenger.jar:
     content/messenger/junkLog.js                                               (base/content/junkLog.js)
     content/messenger/jsTreeView.js                                            (base/content/jsTreeView.js)
     content/messenger/searchTerm.js                                            (search/content/searchTerm.js)
-*   content/messenger/CustomHeaders.xhtml                                      (search/content/CustomHeaders.xhtml)
+    content/messenger/CustomHeaders.xhtml                                      (search/content/CustomHeaders.xhtml)
     content/messenger/CustomHeaders.js                                         (search/content/CustomHeaders.js)
 *   content/messenger/FilterEditor.xhtml                                       (search/content/FilterEditor.xhtml)
     content/messenger/FilterEditor.js                                          (search/content/FilterEditor.js)
diff --git a/mailnews/news/content/downloadheaders.xhtml b/mailnews/news/content/downloadheaders.xhtml
index b212d5d288..8f32457c11 100644
--- a/mailnews/news/content/downloadheaders.xhtml
+++ b/mailnews/news/content/downloadheaders.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 dialog SYSTEM "chrome://messenger/locale/downloadheaders.dtd">
 
 <dialog
@@ -17,6 +13,13 @@
   lightweightthemes="true"
   onload="OnLoad();"
 >
+  <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"
+  />
+
   <stringbundle
     id="bundle_news"
     src="chrome://messenger/locale/news.properties"
diff --git a/mailnews/search/content/CustomHeaders.xhtml b/mailnews/search/content/CustomHeaders.xhtml
index 9a2ac8468f..7676d99ade 100644
--- a/mailnews/search/content/CustomHeaders.xhtml
+++ b/mailnews/search/content/CustomHeaders.xhtml
@@ -2,60 +2,88 @@
 <!-- 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/. -->
-#ifdef MOZ_THUNDERBIRD
-<?xml-stylesheet href="chrome://messenger/skin/messenger.css" type="text/css"?>
-#else
-<?xml-stylesheet href="chrome://communicator/skin/" type="text/css"?>
-#endif
-<?xml-stylesheet type="text/css" href="chrome://messenger/skin/input-fields.css"?>
 
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/CustomHeaders.dtd">
-<html id="customHeaderDialog" xmlns="http://www.w3.org/1999/xhtml"
-      xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
-      xmlns:html="http://www.w3.org/1999/xhtml"
-      width="450" height="375"
-      persist="width height screenX screenY"
-      scrolling="false">
-<head>
-  <title>&window.title;</title>
-  <link rel="localization" href="branding/brand.ftl" />
-  <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/CustomHeaders.js"></script>
-</head>
-<html:body xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
-<dialog buttons="accept,cancel,extra1,extra2">
-  <stringbundle id="bundle_filter" src="chrome://messenger/locale/filter.properties"/>
-  <stringbundle id="bundle_custom" src="chrome://messenger/locale/custom.properties"/>
+<html
+  id="customHeaderDialog"
+  xmlns="http://www.w3.org/1999/xhtml"
+  xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  xmlns:html="http://www.w3.org/1999/xhtml"
+  width="450"
+  height="375"
+  persist="width height screenX screenY"
+  scrolling="false"
+>
+  <head>
+    <title>&window.title;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+    <link rel="stylesheet" href="chrome://messenger/skin/input-fields.css" />
 
-  <hbox flex="1">
-    <vbox flex="1">
-      <label id="headerInputLabel"
-             accesskey="&newMsgHeader.accesskey;"
-             control="headerInput"
-             value="&newMsgHeader.label;"/>
-      <html:input id="headerInput"
-                  type="text"
-                  aria-labelledby="headerInputLabel"
-                  class="input-inline"
-                  oninput="onTextInput();"/>
-      <richlistbox id="headerList"
-                   class="theme-listbox"
-                   flex="1"
-                   onselect="updateRemoveButton();" />
-    </vbox>
-    <vbox>
-      <label value=""/>
-      <button id="addButton"
-              label="&addButton.label;"
-              accesskey="&addButton.accesskey;"
-              dlgtype="extra1"/>
-      <button id="removeButton"
-              label="&removeButton.label;"
-              accesskey="&removeButton.accesskey;"
-              dlgtype="extra2"/>
-    </vbox>
-  </hbox>
-</dialog>
-</html:body>
+    <link rel="localization" href="branding/brand.ftl" />
+    <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/CustomHeaders.js"
+    ></script>
+  </head>
+  <html:body
+    xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+  >
+    <dialog buttons="accept,cancel,extra1,extra2">
+      <stringbundle
+        id="bundle_filter"
+        src="chrome://messenger/locale/filter.properties"
+      />
+      <stringbundle
+        id="bundle_custom"
+        src="chrome://messenger/locale/custom.properties"
+      />
+
+      <hbox flex="1">
+        <vbox flex="1">
+          <label
+            id="headerInputLabel"
+            accesskey="&newMsgHeader.accesskey;"
+            control="headerInput"
+            value="&newMsgHeader.label;"
+          />
+          <html:input
+            id="headerInput"
+            type="text"
+            aria-labelledby="headerInputLabel"
+            class="input-inline"
+            oninput="onTextInput();"
+          />
+          <richlistbox
+            id="headerList"
+            class="theme-listbox"
+            flex="1"
+            onselect="updateRemoveButton();"
+          />
+        </vbox>
+        <vbox>
+          <label value="" />
+          <button
+            id="addButton"
+            label="&addButton.label;"
+            accesskey="&addButton.accesskey;"
+            dlgtype="extra1"
+          />
+          <button
+            id="removeButton"
+            label="&removeButton.label;"
+            accesskey="&removeButton.accesskey;"
+            dlgtype="extra2"
+          />
+        </vbox>
+      </hbox>
+    </dialog>
+  </html:body>
 </html>
diff --git a/mailnews/search/content/FilterEditor.xhtml b/mailnews/search/content/FilterEditor.xhtml
index 00188392bc..784998b1f4 100644
--- a/mailnews/search/content/FilterEditor.xhtml
+++ b/mailnews/search/content/FilterEditor.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://messenger/skin/messenger.css" type="text/css"?>
-<?xml-stylesheet href="chrome://messenger/skin/folderPane.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/input-fields.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"?>
-<?xml-stylesheet href="chrome://messenger/skin/filterEditor.css" type="text/css"?>
-
 <!DOCTYPE html [
   <!ENTITY % filterEditorDTD SYSTEM "chrome://messenger/locale/FilterEditor.dtd">
   %filterEditorDTD;
@@ -28,6 +18,15 @@
       scrolling="false">
 <head>
   <title>&window.title;</title>
+  <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/folderPane.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/input-fields.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/themeableDialog.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/filterDialog.css" />
+  <link rel="stylesheet" href="chrome://messenger/skin/filterEditor.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>
diff --git a/mailnews/search/content/viewLog.xhtml b/mailnews/search/content/viewLog.xhtml
index 66d2671df9..69206089e8 100644
--- a/mailnews/search/content/viewLog.xhtml
+++ b/mailnews/search/content/viewLog.xhtml
@@ -3,10 +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"?>
-
 <!DOCTYPE html SYSTEM "chrome://messenger/locale/viewLog.dtd">
-
 <html
   id="viewLogWindow"
   xmlns="http://www.w3.org/1999/xhtml"
@@ -20,6 +17,7 @@
 >
   <head>
     <title>&viewLog.title;</title>
+    <link rel="stylesheet" href="chrome://messenger/skin/messenger.css" />
     <script defer="defer" src="chrome://messenger/content/viewLog.js"></script>
   </head>
   <html:body