Adding upstream version 1:115.7.0.upstream/1%115.7.0upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

747 files changed, 18307 insertions, 0 deletions

diff --git a/comm/suite/themes/modern/README b/comm/suite/themes/modern/README
new file mode 100644
index 0000000000..66f8cb8f97
--- /dev/null
+++ b/comm/suite/themes/modern/README
@@ -0,0 +1,6 @@
+this is the modern skin (the original 6.0 skin)
+
+if you add to this, make sure you add to the other skin, otherwise when you
+switch skins, bad things will happen.
+
+questions to pixeljockeys@netscape.com 
diff --git a/comm/suite/themes/modern/communicator/aboutPrivateBrowsing.css b/comm/suite/themes/modern/communicator/aboutPrivateBrowsing.css
new file mode 100644
index 0000000000..8d2488202a
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/aboutPrivateBrowsing.css
@@ -0,0 +1,82 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#warningScreen {
+  background-color: #FFF;
+}
+
+#warningBox {
+  background-color: #C7D0D9;
+  color: #22262F;
+  border: 1px solid #494F5D;
+  border-radius: 10px;
+  padding: 3em;
+  padding-inline-start: 30px;
+  margin: 0 1em;
+}
+
+#warningInnerBox {
+  max-width: 50em;
+}
+
+#warningTitle {
+  font-weight: bold;
+  margin: 0 0 .6em;
+  font-size: 160%;
+  border-bottom: 1px solid #7A8490;
+}
+
+#warningText
+{
+  font-size: 110%;
+  margin-inline-start: 0;
+}
+
+/* Pick the desired icons depending on the window's context */
+
+#warningBox.private > #warningBoxIcon {
+  list-style-image: url("chrome://global/skin/icons/information-48.png");
+  width: 48px;
+  height: 48px;
+  margin-inline-end: 3em;
+}
+
+#warningBox.normal > #warningBoxIcon {
+  list-style-image: url("chrome://global/skin/icons/question-48.png");
+  width: 48px;
+  height: 48px;
+  margin-inline-end: 3em;
+}
+
+#trackWarnBox {
+  margin-top: 0.6em;
+  margin-inline-end: 7em;
+  -moz-box-align: center;
+}
+
+#trackWarnIcon {
+  list-style-image: url("chrome://global/skin/icons/warning-24.png");
+  width: 24px;
+  height: 24px;
+}
+
+/* Define additional styles to look similar to the netError/certError pages */
+
+#warningStatus {
+  margin: 0.4em 0 1.2em 0;
+  padding-bottom: 1.2em;
+  border-bottom: 1px solid #7A8490;
+  font-size: 135%;
+}
+
+#warningInnerBox > button {
+  margin: 0.8em 0 1em 0;
+}
+
+#warningOuterBox > vbox > label,
+#warningInnerBox > description {
+  margin-inline-start: 0;
+}
diff --git a/comm/suite/themes/modern/communicator/aboutSessionRestore.css b/comm/suite/themes/modern/communicator/aboutSessionRestore.css
new file mode 100644
index 0000000000..1faf46d241
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/aboutSessionRestore.css
@@ -0,0 +1,45 @@
+/* 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/. */
+
+#tabList {
+  width: 100%;
+  height: 12em;
+}
+
+treechildren::-moz-tree-image(icon),
+treechildren::-moz-tree-image(noicon) {
+  padding-right: 2px;
+  margin: 0px 2px;
+  width: 16px;
+  height: 16px;
+}
+
+treechildren::-moz-tree-image(noicon) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+}
+
+treechildren::-moz-tree-image(container, noicon) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-closed.png");
+}
+
+treechildren::-moz-tree-image(container, noicon, open) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-open.png");
+}
+
+treechildren::-moz-tree-checkbox {
+  list-style-image: url("chrome://global/skin/checkbox/cbox.png");
+}
+
+treechildren::-moz-tree-checkbox(checked) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check.png");
+}
+
+treechildren::-moz-tree-checkbox(partial) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-dis-check.png");
+}
+
+#buttons {
+  margin-top: 2em;
+  margin-inline-start: 80px;
+}
diff --git a/comm/suite/themes/modern/communicator/aboutSyncTabs.css b/comm/suite/themes/modern/communicator/aboutSyncTabs.css
new file mode 100644
index 0000000000..069fad2d57
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/aboutSyncTabs.css
@@ -0,0 +1,83 @@
+/* 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/. */
+
+#tabsList {
+  background: #FFFFFF url(chrome://communicator/skin/sync/sync-bg.png) repeat-x center -80px;
+}
+
+#headers {
+  background: url(chrome://communicator/skin/sync/sync-32.png) no-repeat;
+  width: 45em;
+  height: 32px;
+  margin: 4px 2em 0px;
+}
+
+#tabsListHeading {
+  font-size: 140%;
+  font-weight: bold;
+  margin-inline-start: 40px;
+}
+
+richlistitem {
+  margin-inline-end: 2em;
+}
+
+richlistitem[type="tab"] {
+  min-height: 3em;
+  border: #999999 1px solid !important;
+  padding: 2px 5px;
+  margin-bottom: 4px;
+  margin-inline-start: 4em;
+  border-radius: 6px;
+  background-color: #DDE3EB;
+  width: 44em;
+  opacity: 0.9;
+  box-shadow:
+    inset rgba(255, 255, 255, 0.5) 0 1px 0px,
+    inset rgba(0, 0, 0, 0.1) 0 -2px 0px,
+    rgba(0, 0, 0, 0.1) 0px 1px 0px;
+}
+
+richlistitem[type="tab"][selected="true"] {
+  background-color: #424F63;
+}
+
+richlistitem[type="client"] {
+  min-height: 2em;
+  color: #000000;
+  margin-inline-start: 2em;
+  margin-top: 2px;
+  margin-bottom: 3px;
+  width: 42em;
+  border-radius: 6px;
+  background-color: transparent;
+  -moz-user-focus: ignore !important;
+}
+
+.mobile[type="client"] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-mobileIcon.png");
+}
+
+.desktop[type="client"] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-desktopIcon.png");
+}
+
+.title,
+.clientName {
+  font-size: 1.1em;
+}
+
+.url {
+  color: blue;
+  font-size: 0.95em;
+}
+
+.url[selected="true"] {
+  color: inherit;
+}
+
+.tabIcon {
+  padding-inline-start: 2px;
+  padding-top: 2px;
+}
diff --git a/comm/suite/themes/modern/communicator/blockedSite.css b/comm/suite/themes/modern/communicator/blockedSite.css
new file mode 100644
index 0000000000..eabf1217b3
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/blockedSite.css
@@ -0,0 +1,19 @@
+/* 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/. */
+
+#buttons > span {
+  float: left;
+}
+
+#buttons > #ignoreWarningButton {
+  float: right;
+}
+
+/* the following two ids refer to <span> elements defined in safeBrowsing.dtd */
+
+#malware_sitename,
+#phishing_sitename,
+#unwanted_sitename {
+  word-wrap: break-word;
+}
diff --git a/comm/suite/themes/modern/communicator/brand.css b/comm/suite/themes/modern/communicator/brand.css
new file mode 100644
index 0000000000..cc19f0100b
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/brand.css
@@ -0,0 +1,60 @@
+/* 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/. */
+
+/* ==== brand.css ===========================================================
+   == Styles related to branding in the Communicator suite.
+   ========================================================================== */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#wrapper-throbber-box > #throbber-box > #navigator-throbber,
+#navigator-throbber {
+  -moz-user-focus: ignore !important;
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  margin: 6px 8px 0px;
+  border: none;
+  min-width: 0px;
+  list-style-image: url("chrome://communicator/skin/brand/throbber-single.png");
+  background: transparent;
+}
+
+#navigator-throbber .button-icon {
+  margin-inline-start: 0;
+}
+
+#navigator-throbber .button-text {
+  display: none;
+}
+
+#navigator-throbber[busy="true"] {
+  list-style-image: url("chrome://communicator/skin/brand/throbber-anim.png");
+}
+
+#throbber-box {
+  -moz-box-align: start;
+}
+
+toolbar[mode="icons"] #wrapper-throbber-box > #throbber-box > #navigator-throbber,
+toolbar[mode="icons"] #navigator-throbber {
+  margin: 4px 8px 2px;
+}
+
+window[chromehidden~="toolbar"] #navigator-throbber,
+toolbar[mode="text"] #wrapper-throbber-box > #throbber-box > #navigator-throbber,
+toolbar[iconsize="small"] #wrapper-throbber-box > #throbber-box > #navigator-throbber,
+toolbar[mode="text"] #navigator-throbber,
+toolbar[iconsize="small"] #navigator-throbber {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 6px;
+  margin-inline-end: 4px;
+  list-style-image: url("chrome://communicator/skin/brand/throbber16-single.png");
+}
+
+window[chromehidden~="toolbar"] #navigator-throbber[busy="true"],
+toolbar[mode="text"] #navigator-throbber[busy="true"],
+toolbar[iconsize="small"] #navigator-throbber[busy="true"] {
+  list-style-image: url("chrome://communicator/skin/brand/throbber16-anim.png");
+}
diff --git a/comm/suite/themes/modern/communicator/brand/throbber-anim.png b/comm/suite/themes/modern/communicator/brand/throbber-anim.png
new file mode 100644
index 0000000000..c946b2e5a1
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/brand/throbber-anim.png
diff --git a/comm/suite/themes/modern/communicator/brand/throbber-single.png b/comm/suite/themes/modern/communicator/brand/throbber-single.png
new file mode 100644
index 0000000000..609352f86a
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/brand/throbber-single.png
diff --git a/comm/suite/themes/modern/communicator/brand/throbber16-anim.png b/comm/suite/themes/modern/communicator/brand/throbber16-anim.png
new file mode 100644
index 0000000000..480ef01635
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/brand/throbber16-anim.png
diff --git a/comm/suite/themes/modern/communicator/brand/throbber16-single.png b/comm/suite/themes/modern/communicator/brand/throbber16-single.png
new file mode 100644
index 0000000000..c8a8c52aee
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/brand/throbber16-single.png
diff --git a/comm/suite/themes/modern/communicator/button.css b/comm/suite/themes/modern/communicator/button.css
new file mode 100644
index 0000000000..9b830f64af
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/button.css
@@ -0,0 +1,115 @@
+/* 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/. */
+
+
+/* ==== button.css ==========================================================
+   == Styles for special buttons in the Communicator suite.
+   ========================================================================== */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: large toolbar buttons ::::: */
+
+.toolbarbutton-1 {
+  color: #323642;
+  font-size: 83.3333%;
+}
+
+toolbar[mode="text"] .toolbarbutton-1,
+toolbar[labelalign="end"] .toolbarbutton-1 {
+  color: inherit;
+  font-size: 100%;
+  padding: 0px 2px !important;
+}
+
+toolbar[iconsize="small"] .toolbarbutton-1 {
+  border: 1px solid transparent !important;
+}
+
+.toolbarbutton-1,
+.toolbarbutton-1[type="menu-button"] > .toolbarbutton-menubutton-stack 
+  > .toolbarbutton-menubutton-button,
+.toolbarbutton-1[type="menu-button"] > .toolbarbutton-menubutton-button
+{
+  -moz-box-orient: vertical;
+  -moz-box-pack: center;
+  border: none !important;
+  padding: 0px !important;
+}
+
+.toolbarbutton-1 .toolbarbutton-text {
+  min-width: 33px;
+}
+
+.toolbarbutton-1:hover:active {
+  color: #FFFFFF;
+}
+
+.toolbarbutton-1[disabled="true"]:hover:active {
+  color: #9399AB;
+}
+
+.toolbarbutton-1 > .toolbarbutton-icon,
+.toolbarbutton-1[type="menu-button"] > .toolbarbutton-menubutton-stack 
+  > .toolbarbutton-menubutton-button > .toolbarbutton-icon,
+.toolbarbutton-1[type="menu-button"]
+  > .toolbarbutton-menubutton-button > .toolbarbutton-icon {
+  margin-bottom: 2px;
+}
+
+.toolbarbutton-1[type="menu"] > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+toolbar[mode="text"] .toolbarbutton-1 {
+  min-width: 46px;
+}
+
+toolbar[mode="text"] .toolbarbutton-1,
+toolbar[mode="text"] .toolbarbutton-1[type="menu-button"]
+  > .toolbarbutton-menubutton-button,
+toolbar[labelalign="end"] .toolbarbutton-1,
+toolbar[labelalign="end"] .toolbarbutton-1[type="menu-button"]
+  > .toolbarbutton-menubutton-button {
+  -moz-box-orient: horizontal;
+}
+
+toolbar[mode="icons"] .toolbarbutton-text,
+toolbar[mode="text"] .toolbarbutton-icon {
+  display: none;
+}
+
+toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker {
+  margin-top: 20px;
+  margin-bottom: 0px;
+  margin-inline-start: 40px;
+  margin-inline-end: 0px;
+}
+
+toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker,
+toolbar[labelalign="end"]:not([mode="icons"])
+  .toolbarbutton-menubutton-dropmarker {
+  margin: 0px 2px !important;
+}
+
+toolbar[iconsize="small"] .toolbarbutton-menubutton-dropmarker {
+  margin-top: 0px;
+  margin-bottom: 2px;
+  margin-inline-start: 14px;
+  margin-inline-end: 0px;
+}
+
+toolbar[iconsize=small][mode="icons"] .toolbarbutton-menubutton-dropmarker {
+  margin-top: 8px;
+  margin-bottom: 0px;
+  margin-inline-start: 14px;
+  margin-inline-end: 0px;
+}
+
+/* ::::: standard toolbar buttons ::::: */
+ 
+.button-toolbar {
+  -moz-user-focus: ignore !important;
+  margin: 0px;
+}
diff --git a/comm/suite/themes/modern/communicator/certError.css b/comm/suite/themes/modern/communicator/certError.css
new file mode 100644
index 0000000000..bacc9b1c57
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/certError.css
@@ -0,0 +1,81 @@
+/* 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 {
+  background: #FFF;
+}
+
+body {
+  margin: 0;
+  padding: 0 1em;
+  color: #22262F;
+  font: message-box;
+}
+
+h1 {
+  margin: 0 0 .6em;
+  border-bottom: 1px solid #7A8490;
+  font-size: 160%;
+}
+
+h2 {
+  font-size: 130%;
+}
+
+span.hostname {
+  font-weight: bolder;
+}
+
+#errorPageContainer {
+  position: relative;
+  min-width: 13em;
+  max-width: 52em;
+  margin: 4em auto;
+  border: 1px solid #E8DB99;
+  border-radius: 10px;
+  padding: 3em;
+  padding-inline-start: 30px;
+  background: url("chrome://global/skin/icons/sslWarning.png") left 0 no-repeat #C7D0D9;
+  background-origin: content-box;
+}
+
+body[dir="rtl"] #errorPageContainer {
+  background-position: right 0;
+}
+
+#errorTitle {
+  margin-inline-start: 80px;
+}
+
+#errorLongContent {
+  margin-inline-start: 80px;
+}
+
+#errorShortDescText.wrap {
+  white-space: pre-wrap;
+}
+
+#technicalContent > h2, #expertContent > h2 {
+  cursor: pointer;
+  padding-inline-start: 20px;
+  position: relative;
+  left: -20px;
+  background: url("chrome://global/skin/tree/twisty-open.png") left center no-repeat;
+}
+
+#technicalContent[collapsed] > h2,
+#expertContent[collapsed] > h2 {
+  background-image: url("chrome://global/skin/tree/twisty-clsd.png");
+}
+
+#technicalContent[collapsed] > p,
+#expertContent[collapsed] > div {
+  display: none;
+}
+
+#technicalContentText {
+  overflow: auto;
+  white-space: pre-wrap;
+}
diff --git a/comm/suite/themes/modern/communicator/communicator.css b/comm/suite/themes/modern/communicator/communicator.css
new file mode 100644
index 0000000000..af7ee6008d
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/communicator.css
@@ -0,0 +1,264 @@
+/* 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/. */
+
+/* ==== communicator.css ====================================================
+   == Styles shared everywhere throughout the Communicator suite.
+   ========================================================================== */
+
+@import url("chrome://global/skin/global.css");
+@import url("chrome://communicator/content/communicator.css");
+@import url("chrome://communicator/skin/brand.css");
+@import url("chrome://communicator/skin/button.css");
+@import url("chrome://communicator/skin/toolbar.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.wizard-box {
+  padding: 20px 44px 10px;
+}
+
+/* ::::: autocomplete ::::: */
+
+.autocomplete-history-popup {
+  max-height: 25em;
+}
+
+textbox[autocompletesearch="history file"] .autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue) {
+  width: 16px;
+  height: 16px;
+  margin-left: 1px;
+}
+
+textbox[autocompletesearch="history file"] .autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue, directory) {
+  /*list-style-image: url("chrome://global/skin/filepicker/dir-closed.png");*/
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-closed.png");
+}
+
+textbox[autocompletesearch="history file"] .autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue, file) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+}
+
+/* ::::: online/offline icons ::::: */
+
+#offline-status[offline="true"] {
+  list-style-image: url("chrome://communicator/skin/icons/offline.png");
+}
+
+#offline-status {
+  list-style-image: url("chrome://communicator/skin/icons/online.png");
+}
+
+/* ::::: security button icons ::::: */
+
+#security-button {
+  list-style-image: url("chrome://communicator/skin/icons/lock-insecure.png");
+}
+
+#security-button[level="high"] {
+  list-style-image: url("chrome://communicator/skin/icons/lock-secure.png");
+}
+
+#security-button[level="broken"] {
+  list-style-image: url("chrome://communicator/skin/icons/lock-broken.png");
+}
+
+/* ::::: spell checker ::::: */
+
+.spell-suggestion {
+  font-weight: bold;
+}
+
+/* ::::: directional button icons ::::: */
+
+.up {
+  min-width: 0px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.png");
+}
+
+.up[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up-dis.png");
+}
+
+.down {
+  min-width: 0px;
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
+}
+
+.down[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.png");
+}
+
+.sidebarTree {
+  border: none;
+  margin: 0px !important;
+}
+
+/* ::::: toolbar print button ::::: */
+#print-button {
+  list-style-image: url("chrome://communicator/skin/icons/common.png");
+  -moz-image-region: rect(0 42px 39px 0);
+}
+
+#print-button:hover {
+  -moz-image-region: rect(0 84px 39px 42px);
+}
+
+#print-button:hover:active {
+  -moz-image-region: rect(0 126px 39px 84px);
+}
+
+#print-button[disabled="true"] {
+  -moz-image-region: rect(0 168px 39px 126px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
+toolbar[iconsize="small"] > #print-button {
+  list-style-image: url("chrome://communicator/skin/icons/common-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #print-button:hover {
+  -moz-image-region: rect(0 38px 19px 19px);
+}
+
+toolbar[iconsize="small"] > #print-button:hover:active {
+  -moz-image-region: rect(0 57px 19px 38px);
+}
+
+toolbar[iconsize="small"] > #print-button[disabled="true"] {
+  -moz-image-region: rect(0 76px 19px 57px) !important;
+}
+
+/* ::::: notification bars ::::: */
+
+.messageImage[value="refresh-blocked"] {
+  list-style-image: url("chrome://communicator/skin/icons/application.png");
+}
+
+.messageImage[value="plugin-crashed"] {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
+}
+
+.messageImage[value="geolocation"] {
+  list-style-image: url("chrome://communicator/skin/icons/geo.png");
+}
+
+.messageImage[value="persistent-storage"] {
+  list-style-image: url("chrome://communicator/skin/icons/notification-icons.svg#persistent-storage");
+  width: 16px;
+  height: 16px;
+}
+
+.messageImage[value="webNotifications"] {
+  list-style-image: url("chrome://communicator/skin/icons/notification-16.png");
+}
+
+.messageImage[value="indexedDB-permissions-prompt"],
+.messageImage[value="indexedDB-quota-prompt"] {
+  list-style-image: url("chrome://global/skin/icons/question-16.png");
+}
+
+.messageImage[value="addon-install-blocked"],
+.messageImage[value="addon-install-cancelled"],
+.messageImage[value="addon-install-complete"],
+.messageImage[value="addon-install-disabled"],
+.messageImage[value="addon-install-failed"],
+.messageImage[value="addon-install-started"],
+.messageImage[value="lwtheme-install-request"],
+.messageImage[value="lwtheme-install-notification"] {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
+}
+
+.messageImage[value="popup-blocked"] {
+  list-style-image: url("chrome://navigator/skin/icons/popup-blocked.png");
+}
+
+.messageImage[value="blocked-badware-page"] {
+  list-style-image: url("chrome://global/skin/icons/blacklist_favicon.png");
+}
+
+.messageImage[value="EnterInsecureMessage"] {
+  list-style-image: url("chrome://communicator/skin/icons/lock-insecure-16.png");
+}
+
+.messageImage[value="EnterSecureMessage"],
+.messageImage[value="BlockedActiveContentMessage"],
+.messageImage[value="BlockedDisplayContentMessage"] {
+  list-style-image: url("chrome://communicator/skin/icons/lock-secure-16.png");
+}
+
+.messageImage[value="MixedContentMessage"],
+.messageImage[value="MixedActiveContentMessage"],
+.messageImage[value="MixedDisplayContentMessage"] {
+  list-style-image: url("chrome://communicator/skin/icons/lock-broken-16.png");
+}
+
+/* ::::: dialog header ::::: */
+
+dialogheader {
+  margin: 0px 5px 5px;
+  border: 1px solid #2D3B49;
+  padding: 5px 8px;
+  background-color: #90A1B3;
+  color: #000000;
+}
+
+.dialogheader-title {
+  margin: 0px !important;
+  font-size: 120%;
+  font-weight: bold;
+}
+
+/* ::::: statusbar ::::: */
+
+statusbar {
+  border-top: 1px solid #C7D0D9;
+  min-height: 15px;
+  min-width: 1px; /* DON'T DELETE!
+    Prevents hiding of scrollbars in browser when window is made smaller.*/
+  background-color: #C7D0D9;
+  color: #22262F;
+  font-size: 83.3333%;
+}
+
+statusbarpanel {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  border-top: 1px solid #E0ECF6;
+  border-right: 1px solid #8997A1;
+  border-left: 1px solid #E0ECF6;
+  padding: 0px 4px;
+}
+
+.statusbar-resizerpanel {
+  border: 0px;
+  -moz-box-align: end;
+  -moz-box-pack: end;
+  padding: 0px;
+}
+
+.statusbarpanel-progress {
+  -moz-box-align: stretch;
+  border: 0px;
+  margin: 0px;
+  padding: 0px;
+}
+
+.statusbarpanel-iconic {
+  padding: 0px;
+}
+
+.statusbarpanel-text {
+  margin: 0px !important;
+}
+
+.statusbarpanel-backgroundbox {
+  -moz-box-align: stretch;
+  padding: 0px;
+}
+
+.statusbarpanel-backgroundbox > .statusbarpanel-contentbox {
+  padding: 0px 4px;
+  -moz-box-align: center;
+}
diff --git a/comm/suite/themes/modern/communicator/console/console.css b/comm/suite/themes/modern/communicator/console/console.css
new file mode 100644
index 0000000000..3a42abb282
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/console/console.css
@@ -0,0 +1,106 @@
+/* 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/. */
+
+/* ===== console.css ====================================================
+  == Styles used by the Error Console window.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.console-box {
+  background-color: #FFFFFF;
+  color: #000000;
+}
+
+/* ::::: console rows ::::: */
+
+.console-row {
+  border-bottom: 2px solid #000000;
+  padding: 0px;
+}
+
+.console-row-icon {
+  border-right: 1px outset #C7D0D9;
+  padding: 5px;
+  background-color: #C7D0D9;
+  -moz-box-align: start !important;
+}
+
+.console-icon {
+  list-style-image: inherit;
+}
+
+/* ..... error rows ..... */
+
+.console-row-code {
+  padding-top: 3px;
+  padding-bottom: 3px;
+  padding-inline-start: 3px;
+  padding-inline-end: 0px;
+  color: #0000BB;
+  font-size: 120%;
+}
+
+.console-dots,
+.console-caret {
+  height: 9px;
+}
+
+.console-dots {
+  background: url("chrome://communicator/skin/console/console-error-dash.png") repeat-x top;
+}
+
+.console-caret {
+  width: 7px;
+  background: url("chrome://communicator/skin/console/console-error-caret.png") no-repeat top;
+}
+
+/* ..... message rows ..... */
+
+.console-row[type="message"] {
+  font-family: monospace;
+}
+
+/* ..... selected state ..... */
+
+.console-row[selected="true"] {
+  background-color: #B7DBEB !important;
+}
+
+.console-row-code[selected="true"],
+.console-row-content[selected="true"] > .console-row-file > .console-error-source > .text-link {
+  color: inherit !important;
+}
+
+/* ::::: icons ::::: */
+
+.console-row[type="error"],
+.console-row[type="exception"] {
+  list-style-image: url("chrome://global/skin/icons/error-48.png");
+}
+
+.console-row[type="warning"] {
+  list-style-image: url("chrome://global/skin/icons/warning-48.png");
+}
+
+.console-row[type="message"] {
+  list-style-image: url("chrome://global/skin/icons/information-48.png");
+}
+
+/* ::::: toolbars ::::: */
+
+#TextfieldEval {
+  margin: 2px !important;
+}
+
+#ButtonEval {
+  margin-top: 2px !important;
+  margin-bottom: 2px !important;
+  margin-inline-start: 0px !important;
+  margin-inline-end: 2px !important;
+}
+
+toolbarseparator {
+  min-height: 1em;
+}
diff --git a/comm/suite/themes/modern/communicator/console/error-caret.png b/comm/suite/themes/modern/communicator/console/error-caret.png
new file mode 100644
index 0000000000..44b78aa29c
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/console/error-caret.png
diff --git a/comm/suite/themes/modern/communicator/console/error-dash.png b/comm/suite/themes/modern/communicator/console/error-dash.png
new file mode 100644
index 0000000000..ab07898eff
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/console/error-dash.png
diff --git a/comm/suite/themes/modern/communicator/customizeToolbar.css b/comm/suite/themes/modern/communicator/customizeToolbar.css
new file mode 100644
index 0000000000..940f26e7dc
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/customizeToolbar.css
@@ -0,0 +1,20 @@
+/* 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/. */
+
+window,
+dialog {
+  padding: 7px 5px 5px 5px;
+}
+
+#instructions {
+  font-weight: bold;
+  font-size: 120%;
+}
+
+#CustomizeToolbarWindow > #main-box {
+  border-top: none;
+  border-left: 1px solid #5D616E;
+  border-right: 1px solid #5D616E;
+  border-bottom: 2px solid #5D616E;
+}
diff --git a/comm/suite/themes/modern/communicator/dataman/dataman.css b/comm/suite/themes/modern/communicator/dataman/dataman.css
new file mode 100644
index 0000000000..7293d7247f
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/dataman/dataman.css
@@ -0,0 +1,31 @@
+/* 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/. */
+
+#permList {
+  margin-top: .5em;
+  overflow: auto;
+}
+
+#permList[disabled="true"] {
+  opacity: .5;
+}
+
+.permission {
+  padding-top: 6px;
+  padding-bottom: 6px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
+  min-height: 25px;
+  border-bottom: 1px dotted #C7D0D9;
+}
+
+.hostLabel {
+  font-weight: bold;
+  font-style: italic;
+  margin-inline-end: 1em;
+}
+
+.permissionLabel {
+  font-weight: bold;
+}
diff --git a/comm/suite/themes/modern/communicator/dataman/datamanIcon-16.png b/comm/suite/themes/modern/communicator/dataman/datamanIcon-16.png
new file mode 100644
index 0000000000..9f1ba6b43e
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/dataman/datamanIcon-16.png
diff --git a/comm/suite/themes/modern/communicator/datetimepicker.css b/comm/suite/themes/modern/communicator/datetimepicker.css
new file mode 100644
index 0000000000..bba0369906
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/datetimepicker.css
@@ -0,0 +1,129 @@
+/* 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/. */
+
+/* ===== datetimepicker.css =============================================
+  == Styles used by the XUL datepicker and timepicker elements.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+datepicker, timepicker {
+  margin: 2px 4px;
+  padding: 0;
+  border: none;
+  background: none;
+  cursor: default;
+}
+
+.datetimepicker-input-box {
+  -moz-appearance: textfield;
+  cursor: text;
+  margin-inline-end: 2px;
+  border: 1px solid #5D616E;
+  padding: 2px 0 3px 0;
+  padding-inline-start: 4px;
+  padding-inline-end: 2px;
+  padding: 1px;
+  background-color: #C7D0D9;
+  color: #000000;
+}
+
+.datetimepicker-input-subbox {
+  text-align: right;
+  width: 1.6em;
+}
+
+html|*.datetimepicker-input {
+  text-align: end;
+}
+
+.datetimepicker-separator {
+  margin: 0 !important;
+}
+
+.datetimepicker-year {
+  width: 3.2em;
+}
+
+datepicker[readonly="true"],
+timepicker[readonly="true"] {
+  background-color: #C7D0D9;
+  color: -moz-DialogText;
+}
+
+datepicker[disabled="true"],
+timepicker[disabled="true"] {
+  cursor: default;
+  background-color: #C7D0D9;
+  color: GrayText;
+}
+
+.datepicker-mainbox {
+  margin: 2px 4px;
+  border: 2px solid;
+  -moz-border-top-colors: #BEC3D3 #5D616E;
+  -moz-border-right-colors: #F8FAFE #5D616E;
+  -moz-border-bottom-colors: #F8FAFE #5D616E;
+  -moz-border-left-colors: #BEC3D3 #5D616E;
+  background-color: #C7D0D9;
+  color: #000000;
+}
+
+.datepicker-popupgrid > .datepicker-mainbox {
+  margin: 0;
+  border: none;
+}
+
+.datepicker-gridlabel, .datepicker-weeklabel {
+  text-align: center;
+}
+
+.datepicker-gridlabel[today="true"] {
+  background-color: #C7D0D9;
+  color: white;
+}
+
+.datepicker-gridlabel[selected="true"] {
+  background-color: Highlight;
+  color: HighlightText;
+}
+
+.datepicker-button {
+  -moz-appearance: none;
+  min-width: 8px;
+  padding: 0px;
+}
+
+.datepicker-previous {
+  list-style-image: url("chrome://global/skin/arrow/arrow-lft.png");
+}
+
+.datepicker-next {
+  list-style-image: url("chrome://global/skin/arrow/arrow-rit.png");
+}
+
+.datepicker-previous[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-lft-dis.png");
+}
+
+.datepicker-next[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-rit-dis.png");
+}
+
+.datepicker-previous:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-rit.png");
+}
+
+.datepicker-next:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-lft.png");
+}
+
+.datepicker-previous[disabled="true"]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-rit-dis.png");
+}
+
+.datepicker-next[disabled="true"]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-lft-dis.png");
+}
diff --git a/comm/suite/themes/modern/communicator/dialogs.css b/comm/suite/themes/modern/communicator/dialogs.css
new file mode 100644
index 0000000000..58b813f719
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/dialogs.css
@@ -0,0 +1,11 @@
+/* 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/. */
+
+/* ==== dialogs.css ==================================================
+   == Styles used by certain dialogs in the Communicator suite.
+   ====================================================================== */
+
+@import url("chrome://communicator/skin/");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
diff --git a/comm/suite/themes/modern/communicator/downloads/dl-remove.png b/comm/suite/themes/modern/communicator/downloads/dl-remove.png
new file mode 100644
index 0000000000..b653b600e5
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/downloads/dl-remove.png
diff --git a/comm/suite/themes/modern/communicator/downloads/downloadButtons.png b/comm/suite/themes/modern/communicator/downloads/downloadButtons.png
new file mode 100644
index 0000000000..4fe7963abb
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/downloads/downloadButtons.png
diff --git a/comm/suite/themes/modern/communicator/downloads/downloadmanager.css b/comm/suite/themes/modern/communicator/downloads/downloadmanager.css
new file mode 100644
index 0000000000..b6052da3c3
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/downloads/downloadmanager.css
@@ -0,0 +1,97 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* Note to themers:
+   On rows and all cells, those properties for download states are available:
+   active, inactive, resumable, paused, downloading, finished, failed, canceled, blocked
+*/
+
+treechildren::-moz-tree-image(Name) {
+  margin-inline-end: 2px;
+}
+
+#pauseButton,
+treechildren::-moz-tree-image(ActionPlay, downloading, resumable) {
+  /* pause */
+  list-style-image: url("chrome://communicator/skin/downloads/downloadButtons.png");
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+#ActionPlay,
+#resumeButton,
+treechildren::-moz-tree-image(ActionPlay, paused, resumable) {
+  /* resume */
+  list-style-image: url("chrome://communicator/skin/downloads/downloadButtons.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+#retryButton,
+treechildren::-moz-tree-image(ActionPlay, failed),
+treechildren::-moz-tree-image(ActionPlay, canceled) {
+  /* retry */
+  list-style-image: url("chrome://communicator/skin/downloads/downloadButtons.png");
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+#ActionStop,
+#cancelButton,
+treechildren::-moz-tree-image(ActionStop, active) {
+  /* cancel */
+  list-style-image: url("chrome://communicator/skin/downloads/downloadButtons.png");
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+treechildren::-moz-tree-image(ActionStop, inactive) {
+  /* remove */
+  list-style-image: url("chrome://communicator/skin/downloads/dl-remove.png");
+  -moz-image-region: auto;
+}
+
+/* progress dialogs */
+#dlProgressWindow {
+  /* match dialog.css */
+  padding: 7px 5px 5px;
+}
+
+/* label with dropdown, actually done as a button type=menu */
+#fileName, #fileSource {
+  background-color: transparent;
+  border: none;
+}
+
+#fileName:focus,
+#fileSource:focus {
+  outline: 3px solid #98A5B2;
+  -moz-outline-radius: 4px 5px;
+}
+
+#fileName > .button-box > hbox > .button-text,
+#fileSource > .button-box > hbox > .button-text {
+  margin: 0 !important;
+}
+
+#fileName {
+  font-weight: bold;
+}
+
+.mini-button {
+  background-color: transparent;
+  border: none;
+  padding: 0;
+  margin: 0;
+  min-width: 0;
+  min-height: 0;
+}
+
+.mini-button:focus {
+  outline: 3px solid #98A5B2;
+  outline-offset: -2px;
+  -moz-outline-radius: 50%;
+}
+
+.mini-button > .button-box > .button-text {
+  margin: 0 !important;
+}
diff --git a/comm/suite/themes/modern/communicator/feed-subscribe-ui.css b/comm/suite/themes/modern/communicator/feed-subscribe-ui.css
new file mode 100644
index 0000000000..8bb90b3dab
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/feed-subscribe-ui.css
@@ -0,0 +1,11 @@
+/* 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/. */
+
+#feedSubscribeLine {
+  font: message-box;
+}
+
+menupopup:-moz-locale-dir(rtl) {
+  direction: rtl;
+}
diff --git a/comm/suite/themes/modern/communicator/feed-subscribe.css b/comm/suite/themes/modern/communicator/feed-subscribe.css
new file mode 100644
index 0000000000..4b6d693b6d
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/feed-subscribe.css
@@ -0,0 +1,150 @@
+/* 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 {
+  background-color: #FFFFFF;
+  font: message-box;
+}
+
+#feedBody {
+  border: 1px solid #2D3B49;
+  padding: 3em;
+  padding-inline-start: 30px;
+  margin: 2em auto;
+  background-color: #C7D0D9;
+  color: #22262F;
+}
+
+#feedHeaderContainer {
+  border: 1px solid #2D3B49;
+  border-radius: 10px;
+  margin: -4em auto 0 auto;
+  background-color: #C7D0D9;
+}
+
+#feedHeader {
+  margin-top: 4.9em;
+  margin-bottom: 1em;
+  margin-inline-start: 1.4em;
+  margin-inline-end: 1em;
+  padding-inline-start: 2.9em;
+  font-size: 110%;
+  color: #000000;
+}
+
+.feedBackground {
+  background: url("chrome://communicator/skin/icons/feedIcon.png") 0% 10% no-repeat transparent;
+}
+
+.videoPodcastBackground {
+  background: url("chrome://communicator/skin/icons/videoFeedIcon.png") 0% 10% no-repeat transparent;
+}
+
+.audioPodcastBackground {
+  background: url("chrome://communicator/skin/icons/audioFeedIcon.png") 0% 10% no-repeat transparent;
+}
+
+#feedHeader[dir="rtl"] {
+  background-position: 100% 10%;
+}
+
+#feedIntroText {
+  display: none;
+}
+
+#feedHeader[firstrun="true"] #feedIntroText {
+  padding-top: 0.1em;
+  padding-inline-start: 0.6em;
+  display: block;
+}
+
+#feedHeader[firstrun="true"] > #feedSubscribeLine {
+  padding-inline-start: 1.8em;
+}
+
+#feedSubscribeLine {
+  padding-top: 0.2em;
+}
+
+/* Don't print subscription UI */
+@media print {
+  #feedHeaderContainer {
+    display: none;
+  }
+}
+
+body {
+  margin: 0;
+  padding: 0 3em;
+  color: -moz-fieldText;
+  font: message-box;
+}
+
+h1 {
+  font-size: 160%;
+  border-bottom: 2px solid #7A8490;
+  margin: 0 0 .2em 0;
+}
+
+h2 {
+  font-size: 110%;
+  font-weight: normal;
+  margin: 0 0 .6em 0;
+}
+
+#feedTitleLink {
+  float: right;
+  margin-inline-start: .6em;
+  margin-inline-end: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+a[href] img {
+  border: none;
+}
+
+#feedTitleContainer {
+  margin-inline-start: 0;
+  margin-inline-end: .6em;
+  margin-top: 0;
+  margin-bottom: 0;
+}
+
+#feedTitleImage {
+  margin-inline-start: .6em;
+  margin-inline-end: 0;
+  margin-top: 0;
+  margin-bottom: 0;
+  max-width: 300px;
+  max-height: 150px;
+}
+
+.feedEntryContent {
+  font-size: 110%;
+}
+
+.lastUpdated {
+  font-size: 85%;
+  font-weight: normal;
+}
+
+.type-icon {
+  vertical-align: bottom;
+  height: 16px;
+  width: 16px;
+}
+
+.enclosures {
+  border: 1px solid #2D3B49;
+  padding: 1em;
+  margin: 1em auto;
+  background-color: #90A1B3;
+  color: #000000;
+}
+
+.enclosure {
+  vertical-align: middle;
+  margin-left: 2px;
+}
diff --git a/comm/suite/themes/modern/communicator/fullscreen-video.css b/comm/suite/themes/modern/communicator/fullscreen-video.css
new file mode 100644
index 0000000000..88d9c7b734
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/fullscreen-video.css
@@ -0,0 +1,33 @@
+/* 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,
+body,
+video {
+  height: 100%;
+}
+
+html {
+  background-color: black;
+}
+
+body {
+  margin: 0px;
+  overflow: -moz-hidden-unscrollable;
+  visibility: hidden;
+}
+
+video {
+  width: 100%;
+  max-height: 100%;
+}
+
+div {
+  position: absolute;
+  top: 0px;
+  right: 0px;
+  width: 32px;
+  height: 32px;
+  background: url("chrome://communicator/skin/icons/closeFullScreenVideo.png") center center no-repeat;
+}
diff --git a/comm/suite/themes/modern/communicator/helpviewer/help.css b/comm/suite/themes/modern/communicator/helpviewer/help.css
new file mode 100644
index 0000000000..00c54ef3b7
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/helpviewer/help.css
@@ -0,0 +1,144 @@
+/* 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/. */
+
+@import url("chrome://communicator/skin/");
+@import url("chrome://communicator/skin/sidebar/sidebar.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: primary toolbar masthead ::::: */
+
+/* pick up modern's usual primary toolbar style */
+#HelpToolbar {
+  -moz-binding: url("chrome://communicator/skin/toolbar/toolbarBindings.xml#toolbar-primary");
+  background-color: #B1BDC9;
+}
+
+.toolbar-primary-holder {
+  -moz-box-align: start;
+  background-image: url("chrome://communicator/skin/toolbar/prtb-bg-noline.png");
+}
+
+.toolbar-primary-icon {
+  display: none;
+}
+
+#HelpToolbar > toolbarbutton,
+#HelpToolbar > toolbarbutton[type="menu-button"] > .toolbarbutton-menubutton-stack 
+  > .toolbarbutton-menubutton-button
+{
+  -moz-box-orient: vertical;
+  -moz-box-pack: start;
+  border: none !important;
+  padding: 0px !important;
+}
+
+/* hide labels for the toolbar because not all of them are set in help viewer
+   make sure we always display the icon though */
+#HelpToolbar .toolbarbutton-text {
+  display: none;
+}
+
+#HelpToolbar .toolbarbutton-icon {
+  display: -moz-box;
+}
+
+#help-back-button > .toolbarbutton-menubutton-stack
+    > .toolbarbutton-menubutton-dropmarker,
+#help-forward-button > .toolbarbutton-menubutton-stack
+    > .toolbarbutton-menubutton-dropmarker
+{
+  margin-top: 30px;
+  margin-bottom: 0px;
+  margin-inline-start: 34px;
+  margin-inline-end: 0px;
+}
+
+#help-sidebar {
+  min-width: 30px;
+  width: 20em;
+  max-width: 25em;
+  background-color: #BDC7D6;
+}
+
+/* ::::: primary toolbar buttons ::::: */
+
+toolbar toolbarbutton {
+  list-style-image: url("chrome://communicator/skin/icons/common.png");
+}
+
+#help-back-button {
+  -moz-image-region: rect(78px 42px 117px 0);
+}
+
+#help-back-button:hover {
+  -moz-image-region: rect(78px 84px 117px 42px);
+}
+
+#help-back-button:hover:active {
+  -moz-image-region: rect(78px 126px 117px 84px);
+}
+
+#help-back-button[disabled="true"] {
+  -moz-image-region: rect(78px 168px 117px 126px) !important;
+}
+
+#help-forward-button {
+  -moz-image-region: rect(117px 42px 156px 0);
+}
+
+#help-forward-button:hover {
+  -moz-image-region: rect(117px 84px 156px 42px);
+}
+
+#help-forward-button:hover:active {
+  -moz-image-region: rect(117px 126px 156px 84px);
+}
+
+#help-forward-button[disabled="true"] {
+  -moz-image-region: rect(117px 168px 156px 126px) !important;
+}
+
+#help-home-button {
+  -moz-image-region: rect(156px 42px 195px 0);
+}
+
+#help-home-button:hover {
+  -moz-image-region: rect(156px 84px 195px 42px);
+}
+
+#help-home-button:hover:active {
+  -moz-image-region: rect(156px 126px 195px 84px);
+}
+
+#help-home-button[disabled="true"] {
+  -moz-image-region: rect(156px 168px 195px 126px) !important;
+}
+
+#help-print-button {
+  -moz-image-region: rect(0 42px 39px 0);
+}
+
+#help-print-button:hover {
+  -moz-image-region: rect(0 84px 39px 42px);
+}
+
+#help-print-button:hover:active {
+  -moz-image-region: rect(0 126px 39px 84px);
+}
+
+#help-print-button[disabled="true"] {
+  -moz-image-region: rect(0 168px 39px 126px) !important;
+}
+
+/* ::::: OTHER ::::: */
+
+#context-copy[disabled="true"] {
+  display: none;
+}
+
+/* make findbar appear above content */
+#appcontent {
+  -moz-box-direction: reverse;
+}
diff --git a/comm/suite/themes/modern/communicator/icons/alwaysAsk.png b/comm/suite/themes/modern/communicator/icons/alwaysAsk.png
new file mode 100644
index 0000000000..e367e999f2
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/alwaysAsk.png
diff --git a/comm/suite/themes/modern/communicator/icons/application.png b/comm/suite/themes/modern/communicator/icons/application.png
new file mode 100644
index 0000000000..23357e2764
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/application.png
diff --git a/comm/suite/themes/modern/communicator/icons/btn1.png b/comm/suite/themes/modern/communicator/icons/btn1.png
new file mode 100644
index 0000000000..3179c8c430
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/btn1.png
diff --git a/comm/suite/themes/modern/communicator/icons/closeFullScreenVideo.png b/comm/suite/themes/modern/communicator/icons/closeFullScreenVideo.png
new file mode 100644
index 0000000000..6090eab39f
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/closeFullScreenVideo.png
diff --git a/comm/suite/themes/modern/communicator/icons/common-small.png b/comm/suite/themes/modern/communicator/icons/common-small.png
new file mode 100644
index 0000000000..0fdc64eecb
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/common-small.png
diff --git a/comm/suite/themes/modern/communicator/icons/common.png b/comm/suite/themes/modern/communicator/icons/common.png
new file mode 100644
index 0000000000..908da42153
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/common.png
diff --git a/comm/suite/themes/modern/communicator/icons/feedIcon.png b/comm/suite/themes/modern/communicator/icons/feedIcon.png
new file mode 100644
index 0000000000..848a3bac91
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/feedIcon.png
diff --git a/comm/suite/themes/modern/communicator/icons/feedIcon16.png b/comm/suite/themes/modern/communicator/icons/feedIcon16.png
new file mode 100644
index 0000000000..0286dffab9
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/feedIcon16.png
diff --git a/comm/suite/themes/modern/communicator/icons/geo.png b/comm/suite/themes/modern/communicator/icons/geo.png
new file mode 100644
index 0000000000..2c1b2ecfba
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/geo.png
diff --git a/comm/suite/themes/modern/communicator/icons/geolocation-16.png b/comm/suite/themes/modern/communicator/icons/geolocation-16.png
new file mode 100644
index 0000000000..082b177811
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/geolocation-16.png
diff --git a/comm/suite/themes/modern/communicator/icons/geolocation-64.png b/comm/suite/themes/modern/communicator/icons/geolocation-64.png
new file mode 100644
index 0000000000..6e09ab9c32
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/geolocation-64.png
diff --git a/comm/suite/themes/modern/communicator/icons/identity.png b/comm/suite/themes/modern/communicator/icons/identity.png
new file mode 100644
index 0000000000..dc35c2c6fe
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/identity.png
diff --git a/comm/suite/themes/modern/communicator/icons/loading.png b/comm/suite/themes/modern/communicator/icons/loading.png
new file mode 100644
index 0000000000..907e55fb37
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/loading.png
diff --git a/comm/suite/themes/modern/communicator/icons/lock-broken-16.png b/comm/suite/themes/modern/communicator/icons/lock-broken-16.png
new file mode 100644
index 0000000000..8ba5d729a1
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/lock-broken-16.png
diff --git a/comm/suite/themes/modern/communicator/icons/lock-broken.png b/comm/suite/themes/modern/communicator/icons/lock-broken.png
new file mode 100644
index 0000000000..71c3aa8191
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/lock-broken.png
diff --git a/comm/suite/themes/modern/communicator/icons/lock-insecure-16.png b/comm/suite/themes/modern/communicator/icons/lock-insecure-16.png
new file mode 100644
index 0000000000..ef95c734e7
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/lock-insecure-16.png
diff --git a/comm/suite/themes/modern/communicator/icons/lock-insecure.png b/comm/suite/themes/modern/communicator/icons/lock-insecure.png
new file mode 100644
index 0000000000..a6b0842e57
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/lock-insecure.png
diff --git a/comm/suite/themes/modern/communicator/icons/lock-secure-16.png b/comm/suite/themes/modern/communicator/icons/lock-secure-16.png
new file mode 100644
index 0000000000..f153751872
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/lock-secure-16.png
diff --git a/comm/suite/themes/modern/communicator/icons/lock-secure.png b/comm/suite/themes/modern/communicator/icons/lock-secure.png
new file mode 100644
index 0000000000..178499e002
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/lock-secure.png
diff --git a/comm/suite/themes/modern/communicator/icons/notification-16.png b/comm/suite/themes/modern/communicator/icons/notification-16.png
new file mode 100644
index 0000000000..9e61a63973
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/notification-16.png
diff --git a/comm/suite/themes/modern/communicator/icons/notification-64.png b/comm/suite/themes/modern/communicator/icons/notification-64.png
new file mode 100644
index 0000000000..a01d0ab776
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/notification-64.png
diff --git a/comm/suite/themes/modern/communicator/icons/notification-icons.svg b/comm/suite/themes/modern/communicator/icons/notification-icons.svg
new file mode 100644
index 0000000000..cc5d4f7ba1
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/notification-icons.svg
@@ -0,0 +1,104 @@
+<!-- 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/. -->
+<svg fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg"
+     width="32" height="32" viewBox="0 0 32 32">
+  <style>
+    :root > use:not(:target),
+    :root > g:not(:target),
+    :root > circle:not(:target),
+    #strikeout {
+      display: none;
+    }
+    .blocked:target ~ #strikeout {
+      display: block;
+    }
+    .blocked {
+      clip-path: url(#blocked-clipPath);
+    }
+
+    #badge {
+      fill: #3088d4;
+    }
+
+    #update-icon {
+      stroke: #fff;
+      stroke-width: 3px;
+      stroke-linecap: round;
+    }
+  </style>
+
+  <defs>
+    <path id="camera-icon" d="m 2,23 a 3,3 0 0 0 3,3 l 14,0 a 3,3 0 0 0 3,-3 l 0,-4 6,5.5 c 0.5,0.5 1,0.7 2,0.5 l 0,-18 c -1,-0.2 -1.5,0 -2,0.5 l -6,5.5 0,-4 a 3,3 0 0 0 -3,-3 l -14,0 a 3,3 0 0 0 -3,3 z" />
+    <path id="desktop-notification-icon" d="m 2,20 a 4,4 0 0 0 4,4 l 13,0 7,7 0,-7 a 4,4 0 0 0 4,-4 l 0,-12 a 4,4 0 0 0 -4,-4 l -20,0 a 4,4 0 0 0 -4,4 z m 5,-2 a 1,1 0 1 1 0,-2 l 10,0 a 1,1 0 1 1 0,2 z m 0,-4 a 1,1 0 1 1 0,-2 l 14,0 a 1,1 0 1 1 0,2 z m 0,-4 a 1,1 0 1 1 0,-2 l 18,0 a 1,1 0 1 1 0,2 z" />
+    <path id="focus-tab-by-prompt-icon" d="M29.43,25,18.57,3.8A2.92,2.92,0,0,0,16,2a2.92,2.92,0,0,0-2.57,1.8L2.57,25a3.47,3.47,0,0,0,0,3.4A3.15,3.15,0,0,0,5.33,30H26.66a3.15,3.15,0,0,0,2.77-1.6A3.47,3.47,0,0,0,29.43,25ZM16,7.2a2.3,2.3,0,0,1,2.37,2.4L18,18a1.88,1.88,0,0,1-2,2,1.88,1.88,0,0,1-2-2l-.4-8.4A2.3,2.3,0,0,1,16,7.2ZM16,28a3,3,0,0,1,0-6,3,3,0,0,1,0,6Z"/>
+    <path id="geo-linux-icon" d="m 2,15.9 a 14,14 0 1 1 0,0.2 z m 4,2.1 a 10,10 0 0 0 8,8 l 0,-4 4,0 0,4 a 10,10 0 0 0 8,-8 l -4,0 0,-4 4,0 a 10,10 0 0 0 -8,-8 l 0,4 -4,0 0,-4 a 10,10 0 0 0 -8,8 l 4,0 0,4 z" />
+    <path id="geo-linux-detailed-icon" d="m 2,15.9 a 14,14 0 1 1 0,0.2 z m 3,2.1 a 11,11 0 0 0 9,9 l 1,-5 2,0 1,5 a 11,11 0 0 0 9,-9 l -5,-1 0,-2 5,-1 a 11,11 0 0 0 -9,-9 l -1,5 -2,0 -1,-5 a 11,11 0 0 0 -9,9 l 5,1 0,2 z" />
+    <path id="geo-osx-icon" d="m 0,16 16,0 0,16 12,-28 z" />
+    <path id="geo-windows-icon" d="m 2,14 0,4 2,0 a 12,12 0 0 0 10,10 l 0,2 4,0 0,-2 a 12,12 0 0 0 10,-10 l 2,0 0,-4 -2,0 a 12,12 0 0 0 -10,-10 l 0,-2 -4,0 0,2 a 12,12 0 0 0 -10,10 z m 4,1.9 a 10,10 0 1 1 0,0.2 z m 4,0 a 6,6 0 1 1 0,0.2 z" />
+    <path id="geo-windows-detailed-icon" d="m 2,14.5 0,3 2,0.5 a 12,12 0 0 0 10,10 l 0.5,2 3,0 0.5,-2 a 12,12 0 0 0 10,-10 l 2,-0.5 0,-3 -2,-0.5 a 12,12 0 0 0 -10,-10 l -0.5,-2 -3,0 -0.5,2 a 12,12 0 0 0 -10,10 z m 4,1.4 a 10,10 0 1 1 0,0.2 z m 3,0 a 7,7 0 1 1 0,0.2 z" />
+    <path id="indexedDB-icon" d="m 2,24 a 4,4 0 0 0 4,4 l 2,0 0,-4 -2,0 0,-16 20,0 0,16 -2,0 0,4 2,0 a 4,4 0 0 0 4,-4 l 0,-16 a 4,4 0 0 0 -4,-4 l -20,0 a 4,4 0 0 0 -4,4 z m 8,-2 6,7 6,-7 -4,0 0,-8 -4,0 0,8 z" />
+    <path id="login-icon" d="m 2,26 0,4 6,0 0,-2 2,0 0,-2 1,0 0,-1 2,0 0,-3 2,0 2.5,-2.5 1.5,1.5 3,-3 a 8,8 0 1 0 -8,-8 l -3,3 2,2 z m 20,-18.1 a 2,2 0 1 1 0,0.2 z" />
+    <path id="login-detailed-icon" d="m 1,27 0,3.5 a 0.5,0.5 0 0 0 0.5,0.5 l 5,0 a 0.5,0.5 0 0 0 0.5,-0.5 l 0,-1.5 1.5,0 a 0.5,0.5 0 0 0 0.5,-0.5 l 0,-1.5 1,0 a 0.5,0.5 0 0 0 0.5,-0.5 l 0,-1 1,0 a 0.5,0.5 0 0 0 0.5,-0.5 l 0,-2 2,0 2.5,-2.5 q 0.5,-0.5 1,0 l 1,1 c 0.5,0.5 1,0.5 1.5,-0.5 l 1,-2 a 9,9 0 1 0 -8,-8 l -2,1 c -1,0.5 -1,1 -0.5,1.5 l 1.5,1.5 q 0.5,0.5 0,1 z m 21,-19.1 a 2,2 0 1 1 0,0.2 z" />
+    <path id="microphone-icon" d="m 8,14 0,4 a 8,8 0 0 0 6,7.7 l 0,2.3 -2,0 a 2,2 0 0 0 -2,2 l 12,0 a 2,2 0 0 0 -2,-2 l -2,0 0,-2.3 a 8,8 0 0 0 6,-7.7 l 0,-4 -2,0 0,4 a 6,6 0 0 1 -12,0 l 0,-4 z m 4,4 a 4,4 0 0 0 8,0 l 0,-12 a 4,4 0 0 0 -8,0 z" />
+    <path id="microphone-detailed-icon" d="m 8,18 a 8,8 0 0 0 6,7.7 l 0,2.3 -1,0 a 3,2 0 0 0 -3,2 l 12,0 a 3,2 0 0 0 -3,-2 l -1,0 0,-2.3 a 8,8 0 0 0 6,-7.7 l 0,-4 a 1,1 0 0 0 -2,0 l 0,4 a 6,6 0 0 1 -12,0 l 0,-4 a 1,1 0 0 0 -2,0 z m 4,0 a 4,4 0 0 0 8,0 l 0,-12 a 4,4 0 0 0 -8,0 z" />
+    <path id="persistent-storage-icon" d="M26 21.1H6c-1.1 0-2 .9-2 2V27c0 1.1.9 2 2 2h20c1.1 0 2-.9 2-2v-3.9c0-1.1-.9-2-2-2zM24.1 27c-1.1 0-2-.9-2-2s.9-2 2-2 2 .9 2 2-.9 2-2 2zM25 3H7C5.3 3 4 4.4 4 6.2v13.3c.6-.3 1.3-.5 2-.5h20c.7 0 1.4.2 2 .5V6.2C28 4.4 26.7 3 25 3z"/>
+    <path id="plugin-icon" d="m 2,26 a 2,2 0 0 0 2,2 l 24,0 a 2,2 0 0 0 2,-2 l 0,-16 a 2,2 0 0 0 -2,-2 l -24,0 a 2,2 0 0 0 -2,2 z m 2,-20 10,0 0,-2 a 2,2 0 0 0 -2,-2 l -6,0 a 2,2 0 0 0 -2,2 z m 14,0 10,0 0,-2 a 2,2 0 0 0 -2,-2 l -6,0 a 2,2 0 0 0 -2,2 z" />
+    <path id="popup-icon" d="m 2,24 a 4,4 0 0 0 4,4 l 8,0 a 10,10 0 0 1 -2,-4 l -4,0 a 2,2 0 0 1 -2,-2 l 0,-12 18,0 0,2 a 10,10 0 0 1 4,2 l 0,-8 a 4,4 0 0 0 -4,-4 l -18,0 a 4,4 0 0 0 -4,4 z m 12,-2.1 a 8,8 0 1 1 0,0.2 m 10.7,-4.3 a 5,5 0 0 0 -6.9,6.9 z m -5.4,8.4 a 5,5 0 0 0 6.9,-6.9 z" />
+    <path id="screen-icon" d="m 2,18 a 2,2 0 0 0 2,2 l 2,0 0,-6 a 4,4 0 0 1 4,-4 l 14,0 0,-6 a 2,2 0 0 0 -2,-2 l -18,0 a 2,2 0 0 0 -2,2 z m 6,10 a 2,2 0 0 0 2,2 l 18,0 a 2,2 0 0 0 2,-2 l 0,-14 a 2,2 0 0 0 -2,-2 l -18,0 a 2,2 0 0 0 -2,2 z" />
+    <path id="update-icon" d="M 16,9 L 16,24 M 16,9 L 11,14 M 16,9 L 21,14" />
+
+    <clipPath id="blocked-clipPath">
+      <path d="m 0,0 0,31 31,-31 z m 6,32 26,0 0,-26 z"/>
+    </clipPath>
+
+    <mask id="i-mask" style="fill-opacity: 1;">
+      <rect fill="white" width="32" height="32"/>
+      <circle fill="black" cx="16" cy="9" r="2.5"/>
+      <rect fill="black" x="14" y="14" width="4" height="10" rx="2" ry="2"/>
+    </mask>
+  </defs>
+
+  <g id="default-info">
+    <circle cx="16" cy="16" r="14" mask="url(#i-mask)"/>
+  </g>
+
+  <use id="camera" href="#camera-icon" />
+  <use id="camera-sharing" href="#camera-icon"/>
+  <use id="camera-indicator" href="#camera-icon" />
+  <use id="camera-blocked" class="blocked" href="#camera-icon" />
+  <use id="desktop-notification" href="#desktop-notification-icon" />
+  <use id="desktop-notification-blocked" class="blocked" href="#desktop-notification-icon" />
+  <use id="focus-tab-by-prompt" href="#focus-tab-by-prompt-icon" />
+  <use id="geo-osx" href="#geo-osx-icon" />
+  <use id="geo-osx-blocked" class="blocked" href="#geo-osx-icon" />
+  <use id="geo-linux" href="#geo-linux-icon" />
+  <use id="geo-linux-blocked" class="blocked" href="#geo-linux-icon" />
+  <use id="geo-linux-detailed" href="#geo-linux-detailed-icon" />
+  <use id="geo-windows" href="#geo-windows-icon" />
+  <use id="geo-windows-blocked" class="blocked" href="#geo-windows-icon" />
+  <use id="geo-windows-detailed" href="#geo-windows-detailed-icon" />
+  <use id="indexedDB" href="#indexedDB-icon" />
+  <use id="indexedDB-blocked" class="blocked" href="#indexedDB-icon" />
+  <use id="login" href="#login-icon" />
+  <use id="login-detailed" href="#login-detailed-icon" />
+  <use id="microphone" href="#microphone-icon" />
+  <use id="microphone-sharing" href="#microphone-icon"/>
+  <use id="microphone-indicator" href="#microphone-icon"/>
+  <use id="microphone-blocked" class="blocked" href="#microphone-icon" />
+  <use id="microphone-detailed" href="#microphone-detailed-icon" />
+  <use id="persistent-storage" href="#persistent-storage-icon" />
+  <use id="persistent-storage-blocked" class="blocked" href="#persistent-storage-icon" />
+  <use id="plugin" href="#plugin-icon" />
+  <use id="plugin-blocked" class="blocked" href="#plugin-icon" />
+  <use id="plugin-badge" href="#badge" />
+  <use id="popup" href="#popup-icon" />
+  <use id="screen" href="#screen-icon" />
+  <use id="screen-sharing" href="#screen-icon"/>
+  <use id="screen-indicator" href="#screen-icon"/>
+  <use id="screen-blocked" class="blocked" href="#screen-icon" />
+  <use id="update" href="#update-icon" />
+
+  <path id="strikeout" d="m 2,28 2,2 26,-26 -2,-2 z"/>
+  <circle id="badge" cx="27" cy="5" r="5"/>
+</svg>
diff --git a/comm/suite/themes/modern/communicator/icons/offline.png b/comm/suite/themes/modern/communicator/icons/offline.png
new file mode 100644
index 0000000000..3f90a8b946
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/offline.png
diff --git a/comm/suite/themes/modern/communicator/icons/online.png b/comm/suite/themes/modern/communicator/icons/online.png
new file mode 100644
index 0000000000..f1178c95ba
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/online.png
diff --git a/comm/suite/themes/modern/communicator/icons/save.png b/comm/suite/themes/modern/communicator/icons/save.png
new file mode 100644
index 0000000000..46bb519033
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/save.png
diff --git a/comm/suite/themes/modern/communicator/icons/smileys/smiley-cool.png b/comm/suite/themes/modern/communicator/icons/smileys/smiley-cool.png
new file mode 100644
index 0000000000..1eee4586e5
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/smileys/smiley-cool.png
diff --git a/comm/suite/themes/modern/communicator/icons/smileys/smiley-cry.png b/comm/suite/themes/modern/communicator/icons/smileys/smiley-cry.png
new file mode 100644
index 0000000000..3c25cb658d
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/smileys/smiley-cry.png
diff --git a/comm/suite/themes/modern/communicator/icons/smileys/smiley-embarrassed.png b/comm/suite/themes/modern/communicator/icons/smileys/smiley-embarrassed.png
new file mode 100644
index 0000000000..5088e28e07
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/smileys/smiley-embarrassed.png
diff --git a/comm/suite/themes/modern/communicator/icons/smileys/smiley-foot.png b/comm/suite/themes/modern/communicator/icons/smileys/smiley-foot.png
new file mode 100644
index 0000000000..d1589f3696
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/smileys/smiley-foot.png
diff --git a/comm/suite/themes/modern/communicator/icons/smileys/smiley-frown.png b/comm/suite/themes/modern/communicator/icons/smileys/smiley-frown.png
new file mode 100644
index 0000000000..159c04b0c6
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/smileys/smiley-frown.png
diff --git a/comm/suite/themes/modern/communicator/icons/smileys/smiley-innocent.png b/comm/suite/themes/modern/communicator/icons/smileys/smiley-innocent.png
new file mode 100644
index 0000000000..85cbcf67ed
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/smileys/smiley-innocent.png
diff --git a/comm/suite/themes/modern/communicator/icons/smileys/smiley-kiss.png b/comm/suite/themes/modern/communicator/icons/smileys/smiley-kiss.png
new file mode 100644
index 0000000000..36fbf51dde
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/smileys/smiley-kiss.png
diff --git a/comm/suite/themes/modern/communicator/icons/smileys/smiley-laughing.png b/comm/suite/themes/modern/communicator/icons/smileys/smiley-laughing.png
new file mode 100644
index 0000000000..0d013d5012
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/smileys/smiley-laughing.png
diff --git a/comm/suite/themes/modern/communicator/icons/smileys/smiley-money.png b/comm/suite/themes/modern/communicator/icons/smileys/smiley-money.png
new file mode 100644
index 0000000000..59f089944f
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/smileys/smiley-money.png
diff --git a/comm/suite/themes/modern/communicator/icons/smileys/smiley-sealed.png b/comm/suite/themes/modern/communicator/icons/smileys/smiley-sealed.png
new file mode 100644
index 0000000000..c4f3042810
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/smileys/smiley-sealed.png
diff --git a/comm/suite/themes/modern/communicator/icons/smileys/smiley-smile.png b/comm/suite/themes/modern/communicator/icons/smileys/smiley-smile.png
new file mode 100644
index 0000000000..de862b15db
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/smileys/smiley-smile.png
diff --git a/comm/suite/themes/modern/communicator/icons/smileys/smiley-surprise.png b/comm/suite/themes/modern/communicator/icons/smileys/smiley-surprise.png
new file mode 100644
index 0000000000..4b4d423a55
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/smileys/smiley-surprise.png
diff --git a/comm/suite/themes/modern/communicator/icons/smileys/smiley-tongue.png b/comm/suite/themes/modern/communicator/icons/smileys/smiley-tongue.png
new file mode 100644
index 0000000000..9f53727055
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/smileys/smiley-tongue.png
diff --git a/comm/suite/themes/modern/communicator/icons/smileys/smiley-undecided.png b/comm/suite/themes/modern/communicator/icons/smileys/smiley-undecided.png
new file mode 100644
index 0000000000..8311076c53
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/smileys/smiley-undecided.png
diff --git a/comm/suite/themes/modern/communicator/icons/smileys/smiley-wink.png b/comm/suite/themes/modern/communicator/icons/smileys/smiley-wink.png
new file mode 100644
index 0000000000..e2db57ec39
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/smileys/smiley-wink.png
diff --git a/comm/suite/themes/modern/communicator/icons/smileys/smiley-yell.png b/comm/suite/themes/modern/communicator/icons/smileys/smiley-yell.png
new file mode 100644
index 0000000000..2ae846d201
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/icons/smileys/smiley-yell.png
diff --git a/comm/suite/themes/modern/communicator/numberbox.css b/comm/suite/themes/modern/communicator/numberbox.css
new file mode 100644
index 0000000000..f171ec15e8
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/numberbox.css
@@ -0,0 +1,25 @@
+/* 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/. */
+
+/* ===== numberbox.css ==================================================
+  == Styles used by the XUL textbox type="number" element.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+textbox[type="number"] {
+  padding: 0 !important;
+  cursor: default;
+}
+
+html|*.textbox-input {
+  text-align: right;
+}
+
+.numberbox-input-box {
+  -moz-box-align: center;
+  padding: 1px;
+  margin: 0;
+}
diff --git a/comm/suite/themes/modern/communicator/places/allBookmarks.png b/comm/suite/themes/modern/communicator/places/allBookmarks.png
new file mode 100644
index 0000000000..d2dfbf0e07
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/allBookmarks.png
diff --git a/comm/suite/themes/modern/communicator/places/bookmark-folder-closed.png b/comm/suite/themes/modern/communicator/places/bookmark-folder-closed.png
new file mode 100644
index 0000000000..ce200e4945
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/bookmark-folder-closed.png
diff --git a/comm/suite/themes/modern/communicator/places/bookmark-folder-dis.png b/comm/suite/themes/modern/communicator/places/bookmark-folder-dis.png
new file mode 100644
index 0000000000..aab45d465d
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/bookmark-folder-dis.png
diff --git a/comm/suite/themes/modern/communicator/places/bookmark-folder-open.png b/comm/suite/themes/modern/communicator/places/bookmark-folder-open.png
new file mode 100644
index 0000000000..f2fb7fc684
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/bookmark-folder-open.png
diff --git a/comm/suite/themes/modern/communicator/places/bookmark-item-dis.png b/comm/suite/themes/modern/communicator/places/bookmark-item-dis.png
new file mode 100644
index 0000000000..8731d51571
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/bookmark-item-dis.png
diff --git a/comm/suite/themes/modern/communicator/places/bookmark-item-updated.png b/comm/suite/themes/modern/communicator/places/bookmark-item-updated.png
new file mode 100644
index 0000000000..80e390f028
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/bookmark-item-updated.png
diff --git a/comm/suite/themes/modern/communicator/places/bookmark-item.svg b/comm/suite/themes/modern/communicator/places/bookmark-item.svg
new file mode 100644
index 0000000000..e6bf57ce2a
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/bookmark-item.svg
@@ -0,0 +1,10 @@
+<!-- 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/. -->
+<svg height="16" width="16" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<image xlink:href="data:image/png;base64,
+iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAMAAAAoLQ9TAAAAP1BMVEWYAgBSXmbr6+udqbMD
+Dh/GzNa8w8u/x83S1+Di6esSHSgpMT09R1BMVmBhbHWrtL6vusCzvMfL1NvV3eTd4+rDkTEb
+AAAAAXRSTlMAQObYZgAAAEZJREFUeNqNzjcCADEMAkEhJIfL6f9vvRpX3o6pMJsJgG53h0Kk
+CHpvVYVfFpGDb94iO1u9RDY+5RRZmdA/C2P4GyNY2Fw/rHYBQhkHlJYAAAAASUVORK5CYII="
+width="16" height="16"/></svg>
diff --git a/comm/suite/themes/modern/communicator/places/bookmark.png b/comm/suite/themes/modern/communicator/places/bookmark.png
new file mode 100644
index 0000000000..6b31e70c18
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/bookmark.png
diff --git a/comm/suite/themes/modern/communicator/places/bookmarks.css b/comm/suite/themes/modern/communicator/places/bookmarks.css
new file mode 100644
index 0000000000..456d563b8c
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/bookmarks.css
@@ -0,0 +1,123 @@
+/* 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/. */
+
+/* ===== bookmarks.css ==================================================
+  == Styles specific to widgets containing bookmarks.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: bookmark items ::::: */
+
+treechildren::-moz-tree-image(Name),
+treechildren::-moz-tree-image(title) {
+  margin-inline-end: 2px;
+  width: 16px;
+  height: 16px;
+}
+
+.bookmark-item,
+treechildren::-moz-tree-image(title) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+}
+
+.bookmark-item[container="true"],
+treechildren::-moz-tree-image(title, container) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-closed.png");
+}
+
+.bookmark-item[open="true"],
+treechildren::-moz-tree-image(title, open) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-open.png");
+}
+
+.bookmark-item[container="true"][open="true"][loading="true"] {
+  list-style-image: url("chrome://communicator/skin/icons/loading.png") !important;
+}
+
+.bookmark-item > .toolbarbutton-box > .toolbarbutton-icon {
+  list-style-image: inherit;
+  width: 16px;
+  height: 16px;
+}
+
+.bookmark-item[container][livemark],
+treechildren::-moz-tree-image(title, container, livemark) {
+  list-style-image: url("chrome://communicator/skin/places/livemark-folder.png");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[container][livemark] .bookmark-item,
+treechildren::-moz-tree-image(title, livemarkItem) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item-updated.png");
+}
+
+.bookmark-item[container][livemark] .bookmark-item[visited],
+treechildren::-moz-tree-image(title, livemarkItem, visited) {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+}
+
+#bookmarksToolbarFolderMenu,
+#BMB_bookmarksToolbarFolderMenu,
+treechildren::-moz-tree-image(container, queryFolder_toolbar_____) {
+  list-style-image: url("chrome://communicator/skin/places/bookmarksToolbar.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(container, queryFolder_menu________) {
+  list-style-image: url("chrome://communicator/skin/places/bookmarksMenu.png");
+  -moz-image-region: auto;
+}
+
+#unsortedBookmarksFolderMenu,
+#BMB_unsortedBookmarksFolderMenu,
+treechildren::-moz-tree-image(container, queryFolder_unfiled_____) {
+  list-style-image: url("chrome://communicator/skin/places/unsortedBookmarks.png");
+  -moz-image-region: auto;
+}
+
+/* query-nodes should be styled even if they're not expandable */
+.bookmark-item[container][query],
+treechildren::-moz-tree-image(query) {
+  list-style-image: url("chrome://communicator/skin/places/query.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(query, OrganizerQuery_AllBookmarks) {
+  list-style-image: url("chrome://communicator/skin/places/allBookmarks.png");
+  -moz-image-region: auto;
+}
+
+.bookmark-item[query][tagContainer],
+treechildren::-moz-tree-image(title, query, tagContainer),
+treechildren::-moz-tree-image(query, OrganizerQuery_Tags) {
+  list-style-image: url("chrome://communicator/skin/places/tag.png");
+  -moz-image-region: auto;
+}
+
+/* calendar icon for folders grouping items by day */
+treechildren::-moz-tree-image(title, query, dayContainer) {
+  list-style-image: url("chrome://communicator/skin/places/calendar.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(query, OrganizerQuery_History) {
+  list-style-image: url("chrome://communicator/skin/places/history.png");
+  -moz-image-region: auto;
+}
+
+treechildren::-moz-tree-image(title, separator) {
+  list-style-image: none;
+  width: 0px;
+  height: 0px;
+}
+
+treechildren::-moz-tree-cell-text(title, separator) {
+  color: #808080;
+  margin: 0px 5px;
+}
+
+treechildren::-moz-tree-cell-text(title, separator, selected, focus) {
+  color: #FFFFFF;
+}
diff --git a/comm/suite/themes/modern/communicator/places/bookmarksMenu.png b/comm/suite/themes/modern/communicator/places/bookmarksMenu.png
new file mode 100644
index 0000000000..a1b5ae590f
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/bookmarksMenu.png
diff --git a/comm/suite/themes/modern/communicator/places/bookmarksToolbar.css b/comm/suite/themes/modern/communicator/places/bookmarksToolbar.css
new file mode 100644
index 0000000000..d80e87c117
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/bookmarksToolbar.css
@@ -0,0 +1,103 @@
+/* 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/. */
+
+/* ===== bookmarksToolbar.css ===========================================
+  == Styles specific to bookmark items in a toolbar.
+  ======================================================================= */
+
+@import url("chrome://communicator/skin/places/bookmarks.css");
+
+/* ::::: bookmark toolbar buttons ::::: */
+
+/* ..... bookmark items ..... */
+
+toolbarbutton.bookmark-item {
+  cursor: pointer;
+  min-width: 0;
+  max-width: 10em;
+}
+
+toolbarbutton.bookmark-item:hover {
+  text-decoration: underline;
+}
+
+toolbarbutton.bookmark-item[container="true"],
+toolbarbutton.bookmark-item[container="true"]:hover {
+  cursor: default;
+  text-decoration: none;
+}
+
+/* removes border from non-container bookmark items */
+toolbarbutton.bookmark-item:not([container="true"]):hover,
+toolbarbutton.bookmark-item:not([container="true"]):hover:active {
+  border: 1px solid transparent;
+}
+
+toolbarbutton.bookmark-item[disabled="true"] {
+  cursor: default !important;
+  text-decoration: none !important;
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item-dis.png") !important;
+}
+
+toolbarbutton.bookmark-item[disabled="true"][container="true"] {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-dis.png") !important;
+}
+
+.bookmark-item > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
+.bookmark-item > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+/* Prevent [mode="icons"] from hiding the label */
+.bookmark-item > .toolbarbutton-text {
+  display: -moz-box !important;
+}
+
+/* ..... drag and drop styles ..... */
+
+#PlacesToolbarDropIndicator {
+  list-style-image: url("chrome://communicator/skin/places/toolbarDropMarker.png");
+}
+
+toolbarbutton.bookmark-item[dragover="true"][open="true"] {
+  border: 1px solid #000000;
+}
+
+/* ::::: bookmark menus ::::: */
+
+menu.bookmark-item,
+menuitem.bookmark-item {
+  border-top: 1px solid transparent !important;
+  border-bottom: 1px solid transparent !important;
+  padding: 1px 2px;
+}
+
+menuitem.bookmark-item[disabled="true"] {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item-dis.png");
+}
+
+menuitem.bookmark-item[disabled="true"][container="true"] {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-dis.png");
+}
+
+/* ..... drag and drop styles ..... */
+
+/* rules for menupopup drop indicators */
+.menupopup-drop-indicator-bar {
+  position: relative;
+  /* these two margins must together compensate the indicator's height */
+  margin-top: -1px;
+  margin-bottom: -1px;
+}
+
+.menupopup-drop-indicator {
+  list-style-image: none;
+  height: 2px;
+  margin-inline-end: -4em;
+  background-color: #424F63;
+}
diff --git a/comm/suite/themes/modern/communicator/places/bookmarksToolbar.png b/comm/suite/themes/modern/communicator/places/bookmarksToolbar.png
new file mode 100644
index 0000000000..c37b51e25a
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/bookmarksToolbar.png
diff --git a/comm/suite/themes/modern/communicator/places/calendar.png b/comm/suite/themes/modern/communicator/places/calendar.png
new file mode 100644
index 0000000000..666f6295f1
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/calendar.png
diff --git a/comm/suite/themes/modern/communicator/places/editBookmarkOverlay.css b/comm/suite/themes/modern/communicator/places/editBookmarkOverlay.css
new file mode 100644
index 0000000000..b685bedd1a
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/editBookmarkOverlay.css
@@ -0,0 +1,75 @@
+/* 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/. */
+
+/**** folder menulist ****/
+.folder-icon > .menulist-label-box > .menulist-icon {
+  width: 16px;
+  height: 16px;
+}
+
+.folder-icon > .menu-iconic-left {
+  display: -moz-box;
+}
+
+.folder-icon {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-folder-closed.png") !important;
+}
+
+
+/**** expanders ****/
+
+.expander-up,
+.expander-down {
+  min-width: 0;
+  padding: 2px 0;
+  padding-inline-start: 2px;
+}
+
+.expander-up {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.png");
+}
+
+.expander-down {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
+}
+
+#editBookmarkPanelContent {
+  min-width: 23em;
+  width: 32em;
+}
+
+#editBMPanel_folderTree {
+  margin-top: 2px;
+  margin-bottom: 2px;
+}
+
+/* Hide the value column of the tag autocomplete popup
+ * leaving only the comment column visible. This is
+ * so that only the tag being edited is shown in the
+ * popup.
+ */
+#editBMPanel_tagsField #treecolAutoCompleteValue {
+  visibility: collapse;
+}
+
+
+/* ::::: bookmark panel dropdown icons ::::: */
+
+#editBMPanel_folderMenuList[selectedIndex="0"],
+#editBMPanel_toolbarFolderItem {
+  list-style-image: url("chrome://communicator/skin/places/bookmarksToolbar.png") !important;
+  -moz-image-region: auto !important;
+}
+
+#editBMPanel_folderMenuList[selectedIndex="1"],
+#editBMPanel_bmRootItem {
+  list-style-image: url("chrome://communicator/skin/places/bookmarksMenu.png") !important;
+  -moz-image-region: auto !important;
+}
+
+#editBMPanel_folderMenuList[selectedIndex="2"],
+#editBMPanel_unfiledRootItem {
+  list-style-image: url("chrome://communicator/skin/places/unsortedBookmarks.png") !important;
+  -moz-image-region: auto !important;
+}
diff --git a/comm/suite/themes/modern/communicator/places/history.png b/comm/suite/themes/modern/communicator/places/history.png
new file mode 100644
index 0000000000..fcc89bbbf0
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/history.png
diff --git a/comm/suite/themes/modern/communicator/places/livemark-folder.png b/comm/suite/themes/modern/communicator/places/livemark-folder.png
new file mode 100644
index 0000000000..c76bf3abb8
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/livemark-folder.png
diff --git a/comm/suite/themes/modern/communicator/places/organizer.css b/comm/suite/themes/modern/communicator/places/organizer.css
new file mode 100644
index 0000000000..86641cbb74
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/organizer.css
@@ -0,0 +1,23 @@
+/* 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/. */
+
+
+#placesToolbar {
+  /* match menubar background */
+  background-color: #DDE3EB;
+}
+
+/* Info box */
+#detailsDeck {
+  margin: 5px;
+}
+
+#infoBoxExpanderLabel {
+  padding-inline-start: 2px;
+}
+
+#organizerScopeBar {
+  padding: 2px 0;
+  padding-inline-end: 3px;
+}
diff --git a/comm/suite/themes/modern/communicator/places/query.png b/comm/suite/themes/modern/communicator/places/query.png
new file mode 100644
index 0000000000..bd63cfebf3
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/query.png
diff --git a/comm/suite/themes/modern/communicator/places/tag.png b/comm/suite/themes/modern/communicator/places/tag.png
new file mode 100644
index 0000000000..95b4ee8656
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/tag.png
diff --git a/comm/suite/themes/modern/communicator/places/toolbarDropMarker.png b/comm/suite/themes/modern/communicator/places/toolbarDropMarker.png
new file mode 100644
index 0000000000..d0e143c36f
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/toolbarDropMarker.png
diff --git a/comm/suite/themes/modern/communicator/places/unsortedBookmarks.png b/comm/suite/themes/modern/communicator/places/unsortedBookmarks.png
new file mode 100644
index 0000000000..2f0926a71c
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/places/unsortedBookmarks.png
diff --git a/comm/suite/themes/modern/communicator/preferences.css b/comm/suite/themes/modern/communicator/preferences.css
new file mode 100644
index 0000000000..bfa001fea6
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/preferences.css
@@ -0,0 +1,18 @@
+/* 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/. */
+
+/* Styles used by all preference windows and panes of SeaMonkey */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Main Window ::::: */
+
+prefwindow {
+  padding: 7px 5px 5px;
+}
+
+prefpane,
+.prefWindow-dlgbuttons {
+  padding: 0px;
+}
diff --git a/comm/suite/themes/modern/communicator/prefpanels.css b/comm/suite/themes/modern/communicator/prefpanels.css
new file mode 100644
index 0000000000..0ef6482b84
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/prefpanels.css
@@ -0,0 +1,117 @@
+/* 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/. */
+
+/* ==== prefpanels.css ==================================================
+   == Styles used by all preference panels in the Communicator suite.
+   ====================================================================== */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Fonts ::::: */
+
+#sizeVar,
+#sizeMono {
+  width: 4em;
+}
+
+.prefpanel-font-list {
+  -moz-box-flex: 1;
+}
+
+/* checkbox which is disabled for changes but non-gray text (i.e., in effect) */
+
+checkbox.nogray-disabled[disabled="true"][nogray="true"]
+  > .checkbox-label-box > .checkbox-label {
+  color: inherit !important;
+}
+
+/* ::::: Applications ::::: */
+/**
+ * Line up the actions menu with action labels above and below it.
+ * Equalize the distance from the left side of the action box to the left side
+ * of the icon for both the menu and the non-menu versions of the action box.
+ * Also make sure the labels are the same distance away from the icons.
+ */
+
+.handler-action,
+.handler-type {
+  padding: 0;
+}
+
+.handler-action .listcell-icon,
+.handler-type .listcell-icon {
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-inline-start: 7px;
+  margin-inline-end: 2px;
+  height: 16px;
+  width: 16px;
+}
+
+.handler-action .listcell-label,
+.handler-type .listcell-label {
+  padding-top: 5px;
+  padding-bottom: 5px;
+  padding-inline-start: 0px;
+  padding-inline-end: 5px;
+}
+
+.actionsMenu {
+  margin: 0;
+}
+
+.actionsMenu > .menulist-label-box {
+  padding-inline-start: 0;
+}
+
+.actionsMenu > .menulist-label-box > .menulist-icon {
+  margin: 0 2px;
+  height: 16px;
+  width: 16px;
+}
+
+.handler-action > .menu-iconic-left > .menu-iconic-icon {
+  margin-inline-start: 6px;
+}
+
+/* Set icons on app pane elements */
+
+.handler-action[appHandlerIcon="app"] {
+  list-style-image: url("chrome://communicator/skin/icons/application.png");
+}
+
+.handler-action[appHandlerIcon="ask"] {
+  list-style-image: url("chrome://communicator/skin/icons/alwaysAsk.png");
+}
+
+.handler-action[appHandlerIcon="save"] {
+  list-style-image: url("chrome://communicator/skin/icons/save.png");
+}
+
+.handler-action[appHandlerIcon="feed"] {
+  list-style-image: url("chrome://communicator/skin/icons/feedIcon16.png");
+}
+
+.handler-type[typeClass="unknown"] {
+  list-style-image: url("moz-icon://goat?size=16");
+}
+
+.handler-type[typeClass="webFeed"],
+.handler-type[typeClass="videoPodcastFeed"],
+.handler-type[typeClass="audioPodcastFeed"] {
+  list-style-image: url("chrome://communicator/skin/icons/feedIcon16.png");
+}
+
+/* ::::: Search ::::: */
+
+#engineList > .menulist-label-box > .menulist-icon {
+  height: 16px;
+  width: 16px;
+}
+
+/* ::::: Sync ::::: */
+
+#syncDesc {
+  padding: 0 12em;
+}
diff --git a/comm/suite/themes/modern/communicator/profile/migrate.png b/comm/suite/themes/modern/communicator/profile/migrate.png
new file mode 100644
index 0000000000..5ce2f08cb5
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/profile/migrate.png
diff --git a/comm/suite/themes/modern/communicator/profile/profile.css b/comm/suite/themes/modern/communicator/profile/profile.css
new file mode 100644
index 0000000000..b86851d0d3
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/profile/profile.css
@@ -0,0 +1,68 @@
+/* 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/. */
+
+/* ===== profile.css ====================================================
+  == Styles for Profile Manager window and dialogs.
+  ======================================================================= */
+
+@import url("chrome://global/skin/global.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Profile Selection dialog ::::: */
+
+treechildren::-moz-tree-image {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://communicator/skin/profile/profile.png");
+}
+
+treechildren::-moz-tree-image(rowMigrate-no) {
+  list-style-image: url("chrome://communicator/skin/profile/migrate.png");
+}
+
+/* Override global.css */
+hbox.wizard-box {
+  padding: 10px 10px 10px 10px;
+}
+
+#header {
+  -moz-box-orient: vertical;
+  margin-top: -7px;
+  margin-bottom: 5px;
+  margin-inline-start: -7px;
+  margin-inline-end: -5px;
+  border-left: none;
+  border-right: none;
+  border-top: none;
+  border-bottom-width: 1px;
+  border-bottom-color: #000000;
+  padding-top: 12px;
+  padding-bottom: 12px;
+  padding-inline-start: 25px;
+  padding-inline-end: 5px;
+  background-color: #90A1B3;
+  color: #000000;
+}
+
+#header > .dialogheader-title {
+  font: inherit;
+  font-weight: bold;
+}
+
+#header > .dialogheader-description {
+  margin-inline-start: 12px !important;
+}
+
+#intro,
+#label {
+  width: 17em;
+}
+
+#managebuttons > button {
+  min-width: 8em;
+}
+
+#finishtext {
+  margin-top: -20px;
+}
diff --git a/comm/suite/themes/modern/communicator/profile/profile.png b/comm/suite/themes/modern/communicator/profile/profile.png
new file mode 100644
index 0000000000..208c9a0b52
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/profile/profile.png
diff --git a/comm/suite/themes/modern/communicator/sanitizeDialog.css b/comm/suite/themes/modern/communicator/sanitizeDialog.css
new file mode 100644
index 0000000000..0c0adaf26d
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sanitizeDialog.css
@@ -0,0 +1,56 @@
+/* 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/. */
+
+#sanitizeDurationChoice {
+  margin-inline-end: 0;
+}
+
+/* Align the duration label with the warning box and item list */
+#sanitizeDurationLabel {
+  margin-inline-start: 3px;
+}
+
+
+/* Hide the duration dropdown suffix label if it's empty.  Otherwise it
+   takes up a little space, causing the end of the dropdown to not be aligned
+   with the warning box. */
+#sanitizeDurationSuffixLabel[value=""] {
+  display: none;
+}
+
+
+/* Sanitize everything warning box */
+#sanitizeWarningBox {
+  background-color: Window;
+  border: 1px solid #494F5D;
+  border-radius: 5px;
+  padding: 16px;
+}
+
+#sanitizeWarningIcon {
+  list-style-image: url("chrome://global/skin/icons/warning-48.png");
+  padding: 0;
+  margin: 0;
+}
+
+#sanitizeWarningDescBox {
+  padding: 0 16px;
+  margin: 0;
+}
+
+
+/* Make the item list the same width as the warning box */
+#itemList {
+  margin-inline-start: 0;
+  margin-inline-end: 0;
+}
+
+
+/* Align the last dialog button with the end of the warning box */
+.dialog-button-box {
+  margin-inline-end: 0;
+}
+.dialog-button[dlgtype="cancel"] {
+  margin-inline-end: 0;
+}
diff --git a/comm/suite/themes/modern/communicator/search/engineManager.css b/comm/suite/themes/modern/communicator/search/engineManager.css
new file mode 100644
index 0000000000..53cf96f9d1
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/search/engineManager.css
@@ -0,0 +1,14 @@
+/* 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/. */
+
+#engineChildren::-moz-tree-image(engineName) {
+  margin-inline-end: 4px;
+  margin-inline-start: 1px;
+  width: 16px;
+  height: 16px;
+}
+
+#engineChildren::-moz-tree-row {
+  height: 20px;
+}
diff --git a/comm/suite/themes/modern/communicator/search/mainwindow-dropdown-arrow.png b/comm/suite/themes/modern/communicator/search/mainwindow-dropdown-arrow.png
new file mode 100644
index 0000000000..a556f6e046
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/search/mainwindow-dropdown-arrow.png
diff --git a/comm/suite/themes/modern/communicator/search/search.css b/comm/suite/themes/modern/communicator/search/search.css
new file mode 100755
index 0000000000..05d79ccb7c
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/search/search.css
@@ -0,0 +1,18 @@
+/* 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/. */
+
+/* ===== search.css =====================================================
+   == Styles specific to the Search sidebar panel.
+   ====================================================================== */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.autocomplete-treebody::-moz-tree-cell(datalist-first) {
+  border-top: 1px solid #999999;
+}
+
+#sidebar-search-engines > .menulist-label-box > .menulist-icon {
+  height: 16px;
+  width: 16px;
+}
diff --git a/comm/suite/themes/modern/communicator/search/searchbar.css b/comm/suite/themes/modern/communicator/search/searchbar.css
new file mode 100644
index 0000000000..92ba634510
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/search/searchbar.css
@@ -0,0 +1,62 @@
+/* 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/. */
+
+.searchbar-textbox {
+  width: 6em;
+  min-width: 6em;
+}
+
+/* ::::: search bar ::::: */
+
+.autocomplete-treebody::-moz-tree-cell-text(datalist-first, treecolAutoCompleteComment) {
+  color: #999999;
+  font-size: smaller;
+}
+
+.autocomplete-treebody::-moz-tree-cell(datalist-first) {
+  border-top: 1px solid #999999;
+}
+
+/* ::::: searchbar-engine-button ::::: */
+
+.toolbarbutton-icon {
+  height: 16px;
+  width: 16px;
+  list-style-image: url("chrome://communicator/skin/directory/file-icon.png");
+}
+
+.toolbarbutton-menu-dropmarker {
+  list-style-image: url("chrome://communicator/skin/search/mainwindow-dropdown-arrow.png");
+  -moz-image-region: rect(0, 13px, 11px, 0);
+}
+
+.searchbar-engine-button[open="true"] > .toolbarbutton-menu-dropmarker {
+  -moz-image-region: rect(0, 26px, 11px, 13px);
+}
+
+
+/* ::::: search-go-button ::::: */
+
+.search-go-container {
+  -moz-box-align: center;
+}
+
+.search-go-button {
+  padding: 0px 2px;
+  list-style-image: url("chrome://global/skin/icons/search.png");
+}
+
+@media (-moz-touch-enabled) {
+  .search-go-button {
+    padding: 0px 5px;
+  }
+}
+
+.search-go-button:-moz-locale-dir(rtl) {
+  transform: scaleX(-1);
+}
+
+.searchbar-engine-menuitem[selected="true"] > .menu-iconic-text {
+  font-weight: bold;
+}
diff --git a/comm/suite/themes/modern/communicator/sidebar/customize.css b/comm/suite/themes/modern/communicator/sidebar/customize.css
new file mode 100644
index 0000000000..d1626f7156
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/customize.css
@@ -0,0 +1,7 @@
+/* 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/. */
+
+#other-panels {
+  min-width: 180px;
+}
diff --git a/comm/suite/themes/modern/communicator/sidebar/preview.css b/comm/suite/themes/modern/communicator/sidebar/preview.css
new file mode 100644
index 0000000000..a1123226db
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/preview.css
@@ -0,0 +1,19 @@
+/* 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/. */
+
+/* ===== preview.css ====================================================
+  == Styles used by the Sidebar Preview dialog.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#previewframe {
+  margin: 0px;
+  border: none;
+  width: 162px;
+  height: 300px;
+  min-width: 10px;
+  min-height: 1px;
+}
+
diff --git a/comm/suite/themes/modern/communicator/sidebar/sbar-top-tabopen.png b/comm/suite/themes/modern/communicator/sidebar/sbar-top-tabopen.png
new file mode 100644
index 0000000000..c3304f310f
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sbar-top-tabopen.png
diff --git a/comm/suite/themes/modern/communicator/sidebar/sbar-top.png b/comm/suite/themes/modern/communicator/sidebar/sbar-top.png
new file mode 100644
index 0000000000..5494e79085
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sbar-top.png
diff --git a/comm/suite/themes/modern/communicator/sidebar/sbpicker-arrow.png b/comm/suite/themes/modern/communicator/sidebar/sbpicker-arrow.png
new file mode 100644
index 0000000000..e26dcc597c
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sbpicker-arrow.png
diff --git a/comm/suite/themes/modern/communicator/sidebar/sbtab-lft-act.png b/comm/suite/themes/modern/communicator/sidebar/sbtab-lft-act.png
new file mode 100644
index 0000000000..b5f5410b6c
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sbtab-lft-act.png
diff --git a/comm/suite/themes/modern/communicator/sidebar/sbtab-lft-sel.png b/comm/suite/themes/modern/communicator/sidebar/sbtab-lft-sel.png
new file mode 100644
index 0000000000..d57fa9a73b
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sbtab-lft-sel.png
diff --git a/comm/suite/themes/modern/communicator/sidebar/sbtab-lft.png b/comm/suite/themes/modern/communicator/sidebar/sbtab-lft.png
new file mode 100644
index 0000000000..f4c7d1997e
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sbtab-lft.png
diff --git a/comm/suite/themes/modern/communicator/sidebar/sbtab-mid-act.png b/comm/suite/themes/modern/communicator/sidebar/sbtab-mid-act.png
new file mode 100644
index 0000000000..f1e6dec403
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sbtab-mid-act.png
diff --git a/comm/suite/themes/modern/communicator/sidebar/sbtab-mid-sel.png b/comm/suite/themes/modern/communicator/sidebar/sbtab-mid-sel.png
new file mode 100644
index 0000000000..599fa1f7fc
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sbtab-mid-sel.png
diff --git a/comm/suite/themes/modern/communicator/sidebar/sbtab-mid.png b/comm/suite/themes/modern/communicator/sidebar/sbtab-mid.png
new file mode 100644
index 0000000000..8ba5bdc69e
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sbtab-mid.png
diff --git a/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-btm-act.png b/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-btm-act.png
new file mode 100644
index 0000000000..f24851d998
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-btm-act.png
diff --git a/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-btm-hov.png b/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-btm-hov.png
new file mode 100644
index 0000000000..f8ebe8c5c9
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-btm-hov.png
diff --git a/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-top-act.png b/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-top-act.png
new file mode 100644
index 0000000000..6bc3513748
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-top-act.png
diff --git a/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-top-hov.png b/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-top-hov.png
new file mode 100644
index 0000000000..d7aa72dfca
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-top-hov.png
diff --git a/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-top-sel.png b/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-top-sel.png
new file mode 100644
index 0000000000..afd1757b95
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-top-sel.png
diff --git a/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-top.png b/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-top.png
new file mode 100644
index 0000000000..a584e0d9d6
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sbtab-rit-top.png
diff --git a/comm/suite/themes/modern/communicator/sidebar/sidebar.css b/comm/suite/themes/modern/communicator/sidebar/sidebar.css
new file mode 100644
index 0000000000..6037702c4b
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sidebar.css
@@ -0,0 +1,247 @@
+/* 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/. */
+
+/* ===== sidebar.css ====================================================
+  == Styles used by the Sidebar panel and Sidebar tabs.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#sidebar-box {
+  border-left: 1px solid #8998AA;
+  background-color: #B9C4D0;
+}
+
+/* ::::: sidebar header ::::: */
+
+.sidebar-header-text {
+  color: #000000;
+  font-weight: bold;
+  -moz-box-align: center;
+}
+
+.sidebarheader-main {
+  -moz-binding: url("chrome://communicator/skin/sidebar/sidebarBindings.xml#sidebarheader") !important;
+  background-color: #B9C4D0;
+  background-image: url("chrome://communicator/skin/sidebar/sbar-top.png");
+  background-repeat: no-repeat;
+  overflow-x: hidden;
+}
+
+/* ..... picker button ..... */
+
+#sidebar-panel-picker {
+  margin-inline-end: 1px;
+  margin-top: 1px;
+  padding: 2px;
+}
+
+#sidebar-panel-picker:hover {
+  border: 1px outset #B1BDC9;
+}
+
+#sidebar-panel-picker[open="true"] {
+  border-style: inset;
+}
+
+#sidebar-panel-picker > .toolbarbutton-menu-dropmarker {
+  list-style-image: url("chrome://communicator/skin/sidebar/sbpicker-arrow.png");
+  padding-inline-end: 2px;
+  padding-inline-start: 2px;
+}
+
+/* ..... close button ..... */
+
+#sidebar-close-button {
+  margin: 0px 1px;
+  padding: 0px;
+  list-style-image: url("chrome://global/skin/icons/closebox.png");
+}
+
+#sidebar-close-button > .toolbarbutton-icon {
+  margin: 0px;
+}
+
+/* ::::: loading info ::::: */
+
+.text-panel-loading {
+  margin: 5px 0px;
+}
+
+.text-panel-loading[loading="false"] {
+  margin-inline-start: 11px;
+}
+
+.image-panel-loading {
+  margin: 5px;
+  list-style-image: url("chrome://communicator/skin/icons/loading.png");
+}
+
+/* ::::: sidebar panel ::::: */
+
+.iframe-panel {
+  border-bottom: 1px solid;
+  border-bottom-color: #96A7B8;
+}
+
+.browser-sidebar {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#browser-miniscroll") !important;
+  border-bottom: 1px solid;
+  border-bottom-color: #96A7B8;  
+}
+
+
+/* ::::: sidebar tabs ::::: */
+
+/* ..... normal tabs ..... */
+ 
+.box-texttab {
+  -moz-binding: url("chrome://communicator/skin/sidebar/sidebarBindings.xml#sidebar-tab");
+  color: #000000;
+  border-left: 1px solid #DAE3ED;
+}
+
+.sidebar-tab-left-box,
+.sidebar-tab-right-box {
+  margin-bottom: 3px;
+}
+
+.sidebar-tab-left-box {
+  border-top: 1px solid;
+  border-bottom: 2px solid #B9C4D0;
+  border-top-color: #8A9DAF;
+  min-width: 90px;
+}
+
+.sidebar-tab-left {
+  width: 10px;
+  background: url("chrome://communicator/skin/sidebar/sbtab-lft.png") no-repeat;
+}
+
+.sidebar-tab-text {
+  margin: 0px !important;
+  background: url("chrome://communicator/skin/sidebar/sbtab-mid.png") repeat-x top;
+}
+
+.sidebar-tab-right-img {
+  width: 32px;
+  height: 13px;
+  list-style-image: url("chrome://communicator/skin/sidebar/sbtab-rit-top.png");
+}
+
+.sidebar-tab-right-btm {
+  min-height: 5px;
+}
+
+.sidebar-tab-right-line {
+  border-bottom: 1px solid;
+  border-bottom-color: #96A7B8;
+}
+
+/* ..... hover state ..... */
+
+.box-texttab:hover > .sidebar-tab-left-box {
+  border-bottom: 1px solid;
+  border-bottom-color: #9CADBB;
+}
+
+.box-texttab:hover > .sidebar-tab-right-box > .sidebar-tab-right-top-box 
+    > .sidebar-tab-right-img 
+{
+  list-style-image: url("chrome://communicator/skin/sidebar/sbtab-rit-top-hov.png");
+}
+
+.box-texttab:hover > .sidebar-tab-right-box > .sidebar-tab-right-btm {
+  background: url("chrome://communicator/skin/sidebar/sbtab-rit-btm-hov.png") no-repeat bottom left;
+}
+
+/* ..... active state ..... */
+
+.box-texttab:hover:active {
+  border-left: none;
+  color: #FFFFFF;
+}
+
+.box-texttab:hover:active > .sidebar-tab-left-box {
+  border-left: 1px solid;
+  border-bottom-color: #A1B1BE	;
+  border-top-color: #748490;
+  border-left-color: #737E8A;
+  background-color: #A1B1BE;
+}
+
+.box-texttab:hover:active > .sidebar-tab-left-box > .sidebar-tab-left {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-lft-act.png");
+}
+
+.box-texttab:hover:active > .sidebar-tab-left-box > .sidebar-tab-text {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-mid-act.png");
+}
+
+.box-texttab:hover:active > .sidebar-tab-right-box > .sidebar-tab-right-top-box 
+    > .sidebar-tab-right-img 
+{
+  list-style-image: url("chrome://communicator/skin/sidebar/sbtab-rit-top-act.png");
+}
+
+.box-texttab:hover:active > .sidebar-tab-right-box > .sidebar-tab-right-btm {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-rit-btm-act.png");
+}
+
+/* ..... selected state ..... */
+
+.box-texttab[selected] {
+  border-left: 1px solid #E8EEF5 !important;
+  border-bottom: 1px solid #CBD5E0 !important;
+  color: #000000 !important;
+}
+
+.box-texttab[selected] > .sidebar-tab-left-box {
+  border-bottom: none !important;
+  border-left: none !important;
+  border-top-color: #8A9DAF !important;
+  background-color: #CBD5E0 !important;
+}
+
+.box-texttab[selected] > .sidebar-tab-left-box,
+.box-texttab[selected] > .sidebar-tab-right-box {
+  margin-bottom: 0 !important;
+}
+
+.box-texttab[selected] > .sidebar-tab-left-box > .sidebar-tab-left {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-lft-sel.png") !important;
+}
+
+.box-texttab[selected] > .sidebar-tab-left-box > .sidebar-tab-text {
+  background-image: url("chrome://communicator/skin/sidebar/sbtab-mid-sel.png") !important;
+}
+
+.box-texttab[selected] > .sidebar-tab-right-box > .sidebar-tab-right-top-box 
+    > .sidebar-tab-right-img 
+{
+  list-style-image: url("chrome://communicator/skin/sidebar/sbtab-rit-top-sel.png") !important;
+}
+
+.box-texttab[selected] > .sidebar-tab-right-box > .sidebar-tab-right-btm {
+  background: #CBD5E0 !important;
+}
+
+.box-texttab[selected] > .sidebar-tab-right-box > .sidebar-tab-right-top-box > .sidebar-tab-right-line 
+{
+  border-bottom-color: #8CA2B3 !important;
+}
+
+/* ::::: sidebar navigation buttons ::::: */
+
+.sidebar-nav-button {
+  padding: 5px 0px 5px 0px;
+}
+
+.tab-fwd {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.png");
+}
+
+.tab-back {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
+}
diff --git a/comm/suite/themes/modern/communicator/sidebar/sidebarBindings.xml b/comm/suite/themes/modern/communicator/sidebar/sidebarBindings.xml
new file mode 100644
index 0000000000..001afe71bc
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sidebarBindings.xml
@@ -0,0 +1,69 @@
+<?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/. -->
+
+
+<bindings id="sidebarSplitterBindings.xml"
+          xmlns="http://www.mozilla.org/xbl"
+          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+          xmlns:xbl="http://www.mozilla.org/xbl">
+
+  <binding id="sidebar-tab" extends="xul:button">
+    <content>
+      <xul:hbox class="sidebar-tab-left-box">
+        <xul:spacer class="sidebar-tab-left"/>
+        <xul:label class="sidebar-tab-text" xbl:inherits="value=label,accesskey" crop="right" flex="1"/>
+      </xul:hbox>
+      <xul:vbox class="sidebar-tab-right-box" flex="1">
+        <xul:hbox class="sidebar-tab-right-top-box">
+          <xul:image class="sidebar-tab-right-img"/>
+          <xul:spacer class="sidebar-tab-right-line" flex="1"/>
+        </xul:hbox>
+        <xul:spacer class="sidebar-tab-right-btm" flex="1"/>
+      </xul:vbox>
+    </content>
+  </binding>
+
+  <binding id="DEAD" extends="xul:button">
+    <content>
+      <xul:vbox class="sidebar-tab-left">
+        <xul:spacer class="sidebar-tab-left-top" xbl:inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
+        <xul:spacer class="sidebar-tab-left-mid" xbl:inherits="selected,first-panel-after-selected,top-panel,last-panel"
+                    flex="1"/>
+        <xul:spacer class="sidebar-tab-left-btm" xbl:inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
+      </xul:vbox>
+
+      <xul:stack class="sidebar-tab-mid-1">
+        <xul:vbox class="sidebar-tab-mid-2">
+          <xul:spacer class="sidebar-tab-mid-top" xbl:inherits="selected,first-panel-after-selected,top-panel,last-panel"
+                      flex="1"/>
+          <xul:spacer class="sidebar-tab-mid-btm" xbl:inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
+        </xul:vbox>
+
+        <xul:vbox class="sidebar-tab-text-box">
+          <xul:label class="sidebar-tab-text" xbl:inherits="value=label" crop="right"/>
+        </xul:vbox>
+      </xul:stack>
+
+      <xul:vbox class="sidebar-tab-right">
+        <xul:spacer class="sidebar-tab-right-top" xbl:inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
+        <xul:spacer class="sidebar-tab-right-mid" xbl:inherits="selected,first-panel-after-selected,top-panel,last-panel"
+                    flex="1"/>
+        <xul:spacer class="sidebar-tab-right-btm" xbl:inherits="selected,first-panel-after-selected,top-panel,last-panel"/>
+      </xul:vbox>
+
+      <xul:spacer class="sidebar-tab-rightcap" flex="1"/>
+    </content>
+  </binding>
+
+  <binding id="sidebarheader">
+    <content>
+      <xul:label class="sidebar-header-text" xbl:inherits="value=label,crop" crop="right" flex="1"/>
+      <xul:hbox>
+        <children/>
+      </xul:hbox>
+    </content>
+  </binding>
+
+</bindings>
diff --git a/comm/suite/themes/modern/communicator/sidebar/sidebarListView.css b/comm/suite/themes/modern/communicator/sidebar/sidebarListView.css
new file mode 100644
index 0000000000..39f974cbe2
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sidebar/sidebarListView.css
@@ -0,0 +1,17 @@
+/* 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/. */
+
+treechildren::-moz-tree-image(leaf),
+treechildren::-moz-tree-cell(leaf) {
+  cursor: pointer;
+}
+
+treechildren::-moz-tree-cell-text(leaf, hover) {
+  cursor: pointer;
+  text-decoration: underline;
+}
+
+treechildren::-moz-tree-cell(separator) {
+  cursor: default;
+}
diff --git a/comm/suite/themes/modern/communicator/smileys.css b/comm/suite/themes/modern/communicator/smileys.css
new file mode 100644
index 0000000000..858070dd52
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/smileys.css
@@ -0,0 +1,132 @@
+/* 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/. */
+
+/* ==== smileys.css ====================================================
+   == Style rules to bind smiley image types generated by editor and the mozTxtToHTMLConv
+   == into skinnable images.
+   ========================================================================== */
+
+@namespace url("http://www.w3.org/1999/xhtml");
+
+/* ::::: we also represent smilies inside of spans ::::: */
+
+.moz-smiley-s1,
+.moz-smiley-s2,
+.moz-smiley-s3,
+.moz-smiley-s4,
+.moz-smiley-s5,
+.moz-smiley-s6,
+.moz-smiley-s7,
+.moz-smiley-s8,
+.moz-smiley-s9,
+.moz-smiley-s10,
+.moz-smiley-s11,
+.moz-smiley-s12,
+.moz-smiley-s13,
+.moz-smiley-s14,
+.moz-smiley-s15,
+.moz-smiley-s16 {
+  display: inline-block;
+  vertical-align: middle;
+  -moz-user-select: all;
+}
+
+.moz-smiley-s1 > span,
+.moz-smiley-s2 > span,
+.moz-smiley-s3 > span,
+.moz-smiley-s4 > span,
+.moz-smiley-s5 > span,
+.moz-smiley-s6 > span,
+.moz-smiley-s7 > span,
+.moz-smiley-s8 > span,
+.moz-smiley-s9 > span,
+.moz-smiley-s10 > span,
+.moz-smiley-s11 > span,
+.moz-smiley-s12 > span,
+.moz-smiley-s13 > span,
+.moz-smiley-s14 > span,
+.moz-smiley-s15 > span,
+.moz-smiley-s16 > span {
+    display: none;
+}
+
+/* smile */
+.moz-smiley-s1:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-smile.png");
+}
+
+/* frown */
+.moz-smiley-s2:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-frown.png");
+}
+
+/* wink */
+.moz-smiley-s3:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-wink.png");
+}
+
+/* tongue */
+.moz-smiley-s4:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-tongue.png");
+}
+
+/* laughing */
+.moz-smiley-s5:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-laughing.png");
+}
+
+/* embarrassed */
+.moz-smiley-s6:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-embarrassed.png");
+}
+
+/* undecided */
+.moz-smiley-s7:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-undecided.png");
+}
+
+/* surprise */
+.moz-smiley-s8:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-surprise.png");
+}
+
+/* kiss */
+.moz-smiley-s9:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-kiss.png");
+}
+
+/* yell */
+.moz-smiley-s10:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-yell.png");
+}
+
+/* cool */
+.moz-smiley-s11:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-cool.png");
+}
+
+/* money */
+.moz-smiley-s12:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-money.png");
+}
+
+/* foot */
+.moz-smiley-s13:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-foot.png");
+}
+
+/* innocent */
+.moz-smiley-s14:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-innocent.png");
+}
+
+/* cry */
+.moz-smiley-s15:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-cry.png");
+}
+
+/* sealed */
+.moz-smiley-s16:before {
+  content: url("chrome://communicator/skin/icons/smileys/smiley-sealed.png");
+}
diff --git a/comm/suite/themes/modern/communicator/spinbuttons.css b/comm/suite/themes/modern/communicator/spinbuttons.css
new file mode 100644
index 0000000000..eda3b1d13a
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/spinbuttons.css
@@ -0,0 +1,49 @@
+/* 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/. */
+
+spinbuttons {
+  height: 16px;
+}
+
+.spinbuttons-button {
+  border: 1px solid;
+  padding: 1px;
+  border-top-color: #5D616E;
+  border-right-color: #2D3B49;
+  border-bottom-color: #2D3B49;
+  border-left-color: #5D616E;
+  border-radius: 0;
+  background: #B1BBC5 50% 50% no-repeat;
+  width: 13px;
+  min-width: 13px;
+  margin: 0;
+  -moz-box-flex: 1;
+}
+
+.spinbuttons-button:hover:active {
+  border-color: #8290A5;
+  border-top-color: #8290A5;
+  border-right-color: #8290A5;
+  border-bottom-color: #8290A5;
+  border-left-color: #8290A5;
+  background-color: #90A1B3;
+}
+
+.spinbuttons-button[disabled="true"] {
+  background-color: #B7BFCB;
+  border: 1px solid !important;
+  padding: 1px !important;
+  border-top-color: #8290A5 !important;
+  border-right-color: #8290A5 !important;
+  border-bottom-color: #8290A5 !important;
+  border-left-color: #8290A5 !important;
+}
+
+.spinbuttons-up {
+  list-style-image: url("chrome://global/skin/scrollbar/mini-btn-up.gif");
+}
+
+.spinbuttons-down {
+  list-style-image: url("chrome://global/skin/scrollbar/mini-btn-dn.gif");
+}
diff --git a/comm/suite/themes/modern/communicator/sync/sync-16-throbber.png b/comm/suite/themes/modern/communicator/sync/sync-16-throbber.png
new file mode 100644
index 0000000000..d604a32d75
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sync/sync-16-throbber.png
diff --git a/comm/suite/themes/modern/communicator/sync/sync-16.png b/comm/suite/themes/modern/communicator/sync/sync-16.png
new file mode 100644
index 0000000000..c7839c33e9
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sync/sync-16.png
diff --git a/comm/suite/themes/modern/communicator/sync/sync-32-throbber.png b/comm/suite/themes/modern/communicator/sync/sync-32-throbber.png
new file mode 100644
index 0000000000..4c8d903544
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sync/sync-32-throbber.png
diff --git a/comm/suite/themes/modern/communicator/sync/sync-32.png b/comm/suite/themes/modern/communicator/sync/sync-32.png
new file mode 100644
index 0000000000..d0d3b19050
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sync/sync-32.png
diff --git a/comm/suite/themes/modern/communicator/sync/sync-bg.png b/comm/suite/themes/modern/communicator/sync/sync-bg.png
new file mode 100644
index 0000000000..893a27d76e
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sync/sync-bg.png
diff --git a/comm/suite/themes/modern/communicator/sync/sync-desktopIcon.png b/comm/suite/themes/modern/communicator/sync/sync-desktopIcon.png
new file mode 100644
index 0000000000..a98f21b30f
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sync/sync-desktopIcon.png
diff --git a/comm/suite/themes/modern/communicator/sync/sync-mobileIcon.png b/comm/suite/themes/modern/communicator/sync/sync-mobileIcon.png
new file mode 100644
index 0000000000..57fbe054c8
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sync/sync-mobileIcon.png
diff --git a/comm/suite/themes/modern/communicator/sync/syncCommon.css b/comm/suite/themes/modern/communicator/sync/syncCommon.css
new file mode 100644
index 0000000000..28e53d89a1
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sync/syncCommon.css
@@ -0,0 +1,41 @@
+/* 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/. */
+
+/* The following are used by both syncSetup.xul and syncGenericChange.xul */
+.statusIcon {
+  margin-inline-start: 4px;
+  max-height: 16px;
+  max-width: 16px;
+}
+
+.statusIcon[status="active"] {
+  list-style-image: url("chrome://communicator/skin/icons/loading.png");
+}
+
+.statusIcon[status="error"] {
+  list-style-image: url("chrome://global/skin/icons/error-16.png");
+}
+
+.statusIcon[status="success"] {
+  list-style-image: url("chrome://global/skin/icons/information-16.png");
+}
+
+/* .data is only used by syncGenericChange.xul, but it seems unnecessary to have
+   a separate stylesheet for it. */
+.data {
+  font-size: 90%;
+  font-weight: bold;
+}
+
+#change-dialog {
+  width: 40em;
+}
+
+#introText {
+  margin-top: 2px;
+}
+
+#feedback {
+  height: 2em;
+}
diff --git a/comm/suite/themes/modern/communicator/sync/syncQuota.css b/comm/suite/themes/modern/communicator/sync/syncQuota.css
new file mode 100644
index 0000000000..073b0e5d69
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sync/syncQuota.css
@@ -0,0 +1,16 @@
+/* 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/. */
+
+#quotaDialog {
+  width: 33em;
+  height: 25em;
+}
+
+#treeCaption {
+  height: 4em;
+}
+
+.captionWarning {
+  font-weight: bold;
+}
diff --git a/comm/suite/themes/modern/communicator/sync/syncSetup.css b/comm/suite/themes/modern/communicator/sync/syncSetup.css
new file mode 100644
index 0000000000..c9216df69e
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/sync/syncSetup.css
@@ -0,0 +1,113 @@
+/* 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/. */
+
+wizard {
+  -moz-appearance: none;
+  width: 55em;
+  height: 42em;
+  padding: 0em;
+}
+
+.wizard-page-box {
+  -moz-appearance: none;
+  padding: 1em 0em;
+  margin: 0em;
+}
+
+wizardpage {
+  -moz-box-pack: center;
+  -moz-box-align: center;
+  margin: 0em;
+  padding: 0em 8em;
+}
+
+.wizard-header {
+  -moz-appearance: none;
+  border: none;
+  padding: 1em 0em;
+  text-align: center;
+}
+
+.wizard-header-label {
+  font-size: 24pt;
+  font-weight: normal;
+}
+
+.wizard-header-icon {
+  visibility: collapse;
+}
+
+.confirm {
+  border: 1px solid #000000;
+  padding: 1em;
+  border-radius: 5px;
+}
+
+/* Override the text-link style from global.css */
+description > .text-link,
+description > .text-link:focus {
+  margin: 0px;
+  padding: 0px;
+}
+
+.success,
+.error {
+  padding: 2px;
+  border-radius: 2px;
+}
+
+.error {
+  background-color: #FF0000 !important;
+  color: #FFFFFF !important;
+}
+
+.success {
+  background-color: #00FF00 !important;
+}
+
+.warning {
+  font-weight: bold;
+  font-size: 100%;
+  color: #FF0000;
+}
+
+.mainDesc {
+  font-weight: bold;
+  font-size: 100%;
+}
+
+.normal {
+  font-size: 100%;
+}
+
+.inputColumn {
+  margin-inline-end: 2px;
+}
+
+.recommended {
+  font-weight: bold;
+}
+
+.pin {
+  font-size: 18pt;
+  text-align: center;
+}
+
+#passphraseHelpSpacer {
+  width: 0.5em;
+}
+
+#add-device-throbber,
+#login-throbber {
+  list-style-image: url("chrome://communicator/skin/icons/loading.png");
+}
+
+#successPageIcon {
+  /* TODO replace this with a 128px version (bug 591122) */
+  list-style-image: url("chrome://communicator/skin/sync/sync-32.png");
+}
+
+#pickSetupDesc {
+  padding: 0em 7em;
+}
diff --git a/comm/suite/themes/modern/communicator/taskbar/taskbar.png b/comm/suite/themes/modern/communicator/taskbar/taskbar.png
new file mode 100644
index 0000000000..be3aee9b3b
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/taskbar/taskbar.png
diff --git a/comm/suite/themes/modern/communicator/taskbar/taskmenu-abook.png b/comm/suite/themes/modern/communicator/taskbar/taskmenu-abook.png
new file mode 100644
index 0000000000..5492cdd23f
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/taskbar/taskmenu-abook.png
diff --git a/comm/suite/themes/modern/communicator/taskbar/taskmenu-browser.png b/comm/suite/themes/modern/communicator/taskbar/taskmenu-browser.png
new file mode 100644
index 0000000000..6472c01f2b
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/taskbar/taskmenu-browser.png
diff --git a/comm/suite/themes/modern/communicator/taskbar/taskmenu-composer.png b/comm/suite/themes/modern/communicator/taskbar/taskmenu-composer.png
new file mode 100644
index 0000000000..13ec6c26a4
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/taskbar/taskmenu-composer.png
diff --git a/comm/suite/themes/modern/communicator/taskbar/taskmenu-mailnews.png b/comm/suite/themes/modern/communicator/taskbar/taskmenu-mailnews.png
new file mode 100644
index 0000000000..dd2bb3e2bb
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/taskbar/taskmenu-mailnews.png
diff --git a/comm/suite/themes/modern/communicator/tasksOverlay.css b/comm/suite/themes/modern/communicator/tasksOverlay.css
new file mode 100644
index 0000000000..d22c197e63
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/tasksOverlay.css
@@ -0,0 +1,87 @@
+/* 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/. */
+
+/* ==== tasksOverlay.css ================================================
+   == Styles used by the the overlay which contains tasks related
+   == content, such as the taskbar and product launcher icons.
+   ====================================================================== */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: communicator product icons ::::: */
+
+#mini-nav {
+  list-style-image: url("chrome://communicator/skin/taskbar/taskbar.png");
+  -moz-image-region: rect(0 13px 13px 0);
+  margin-inline-end: 2px;
+}
+
+#mini-nav:hover:active {
+  -moz-image-region: rect(13px 13px 26px 0);
+}
+
+.icon-navigator16 {
+  list-style-image: url("chrome://communicator/skin/taskbar/taskmenu-browser.png");
+}
+
+#mini-mail {
+  list-style-image: url("chrome://communicator/skin/taskbar/taskbar.png");
+  -moz-image-region: rect(0 34px 13px 13px);
+  margin-inline-start: 1px;
+}
+
+#mini-mail:hover:active {
+  -moz-image-region: rect(13px 34px 26px 13px);
+}
+
+#mini-mail[BiffState="NewMail"] {
+  -moz-image-region: rect(0 55px 13px 34px);
+}
+
+#mini-mail[BiffState="NewMail"]:hover:active {
+  -moz-image-region: rect(13px 55px 26px 34px);
+}
+
+.icon-mail16 {
+  list-style-image: url("chrome://communicator/skin/taskbar/taskmenu-mailnews.png");
+}
+
+#mini-addr {
+  list-style-image: url("chrome://communicator/skin/taskbar/taskbar.png");
+  -moz-image-region: rect(0 89px 13px 74px);
+}
+
+#mini-addr:hover:active {
+  -moz-image-region: rect(13px 89px 26px 74px);
+}
+
+.icon-addressbook16 {
+  list-style-image: url("chrome://communicator/skin/taskbar/taskmenu-abook.png");
+}
+
+#mini-comp {
+  list-style-image: url("chrome://communicator/skin/taskbar/taskbar.png");
+  -moz-image-region: rect(0 74px 13px 55px);
+}
+
+#mini-comp:hover:active {
+  -moz-image-region: rect(13px 74px 26px 55px);
+}
+
+.icon-composer16 {
+  list-style-image: url("chrome://communicator/skin/taskbar/taskmenu-composer.png");
+}
+
+/* ::::: component bar ::::: */
+
+#component-bar {
+  padding: 1px 3px 0px;
+}
+
+.taskbutton {
+  margin: 0px 3px;
+  border: none !important;
+  padding: 0px !important;
+}
+
diff --git a/comm/suite/themes/modern/communicator/toolbar.css b/comm/suite/themes/modern/communicator/toolbar.css
new file mode 100644
index 0000000000..8bf33648d7
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/toolbar.css
@@ -0,0 +1,106 @@
+/* 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/. */
+
+/* ==== toolbar.css =====================================================
+   == Styles for toolbars that are used throughout the Communicator suite.
+   ====================================================================== */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: toolbar-primary ::::: */
+
+.toolbar-primary {
+  -moz-binding: url("chrome://communicator/skin/toolbar/toolbarBindings.xml#toolbar-primary");
+  background-color: #B1BDC9;
+}
+
+.toolbar-primary-holder {
+  background: url("chrome://communicator/skin/toolbar/prtb-bg-line.png") repeat-x top;
+  border-top: none;
+  border-right: 1px solid #95A0AD;
+  border-bottom: 1px solid #95A0AD;
+  border-left: none;
+}
+
+.toolbar-primary-holder[mode="icons"],
+.toolbar-primary-holder[mode="text"],
+.toolbar-primary-holder[iconsize="small"],
+.toolbar-primary-holder[labelalign="end"] {
+  background-image: url("chrome://communicator/skin/toolbar/prtb-bg-noline.png");
+}
+
+.toolbar-primary-icon {
+  width: 77px;
+  height: 50px;
+  background-repeat: no-repeat;
+  background-position: top;
+}
+
+.toolbar-primary-icon[mode="icons"],
+.toolbar-primary-icon[mode="text"],
+.toolbar-primary-icon[iconsize="small"],
+.toolbar-primary-icon[labelalign="end"] {
+  display: none;
+}
+
+.toolbar-primary > .toolbaritem-noline,
+.toolbar-primary > toolbarpaletteitem > .toolbaritem-noline {
+  background: url("chrome://communicator/skin/toolbar/prtb-bg-noline.png") #B1BDC9 repeat-x top;
+}
+
+toolbar[mode="text"] toolbarbutton[type="menu-button"],
+toolbar[labelalign="end"]:not([mode="icons"]) toolbarbutton[type="menu-button"] {
+  -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-button");
+}
+
+toolbar[mode="text"] .toolbarbutton-1 .toolbarbutton-text,
+toolbar[labelalign="end"] .toolbarbutton-1 .toolbarbutton-text {
+  min-width: 0px;
+}
+
+/* ::::: toolbargrippy ::::: */
+ 
+.toolbar-primary-grippy { 
+  -moz-binding: url("chrome://communicator/skin/toolbar/toolbarBindings.xml#toolbargrippy-primary");
+  border: none;
+  background: url("chrome://communicator/skin/toolbar/prtb-grip-mid.png") repeat-y;
+  list-style-image: url("chrome://communicator/skin/toolbar/prtb-grip-btm.png");
+} 
+
+.toolbar-primary-grippy > .toolbargrippy-texture {
+  width: 13px;
+  height: 0px;
+  list-style-image: url("chrome://communicator/skin/toolbar/prtb-grip-top.png");
+}
+
+.toolbar-primary-grippy > .toolbargrippy-arrow {
+  margin: 0px;
+  width: 13px;
+  height: 10px;
+  list-style-image: inherit;
+}
+
+.toolbar-primary-grippy:hover:active {
+  background-image: url("chrome://communicator/skin/toolbar/prtb-grip-mid-act.png");
+  list-style-image: url("chrome://communicator/skin/toolbar/prtb-grip-btm-act.png");
+}
+
+.toolbar-primary-grippy:hover:active > .toolbargrippy-texture {
+  list-style-image: url("chrome://communicator/skin/toolbar/prtb-grip-top-act.png");
+}
+
+/* ::::: toolbar-primary separator ::::: */
+
+.toolbar-primary > toolbarseparator,
+.toolbarseparator-primary {
+  margin: 0px;
+  padding: 0px;
+  border: none;
+  width: 18px;
+  background: none;
+}
+
+.toolbar-primary > toolbarpaletteitem > toolbarseparator {
+  margin: 0px 8px;
+}
diff --git a/comm/suite/themes/modern/communicator/toolbar/prtb-bg-line.png b/comm/suite/themes/modern/communicator/toolbar/prtb-bg-line.png
new file mode 100644
index 0000000000..56590ad7fe
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/toolbar/prtb-bg-line.png
diff --git a/comm/suite/themes/modern/communicator/toolbar/prtb-bg-noline.png b/comm/suite/themes/modern/communicator/toolbar/prtb-bg-noline.png
new file mode 100644
index 0000000000..01f16335c4
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/toolbar/prtb-bg-noline.png
diff --git a/comm/suite/themes/modern/communicator/toolbar/prtb-grip-btm-act.png b/comm/suite/themes/modern/communicator/toolbar/prtb-grip-btm-act.png
new file mode 100644
index 0000000000..ad4203e24d
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/toolbar/prtb-grip-btm-act.png
diff --git a/comm/suite/themes/modern/communicator/toolbar/prtb-grip-btm.png b/comm/suite/themes/modern/communicator/toolbar/prtb-grip-btm.png
new file mode 100644
index 0000000000..1afb079117
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/toolbar/prtb-grip-btm.png
diff --git a/comm/suite/themes/modern/communicator/toolbar/prtb-grip-mid-act.png b/comm/suite/themes/modern/communicator/toolbar/prtb-grip-mid-act.png
new file mode 100644
index 0000000000..d113f628de
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/toolbar/prtb-grip-mid-act.png
diff --git a/comm/suite/themes/modern/communicator/toolbar/prtb-grip-mid.png b/comm/suite/themes/modern/communicator/toolbar/prtb-grip-mid.png
new file mode 100644
index 0000000000..e12831e441
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/toolbar/prtb-grip-mid.png
diff --git a/comm/suite/themes/modern/communicator/toolbar/prtb-grip-top-act.png b/comm/suite/themes/modern/communicator/toolbar/prtb-grip-top-act.png
new file mode 100644
index 0000000000..b6508e6dc0
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/toolbar/prtb-grip-top-act.png
diff --git a/comm/suite/themes/modern/communicator/toolbar/prtb-grip-top.png b/comm/suite/themes/modern/communicator/toolbar/prtb-grip-top.png
new file mode 100644
index 0000000000..d86fc582c4
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/toolbar/prtb-grip-top.png
diff --git a/comm/suite/themes/modern/communicator/toolbar/toolbarBindings.xml b/comm/suite/themes/modern/communicator/toolbar/toolbarBindings.xml
new file mode 100644
index 0000000000..c5bf0d5abf
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/toolbar/toolbarBindings.xml
@@ -0,0 +1,34 @@
+<?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/. -->
+
+<bindings id="toolbarBindings"
+          xmlns="http://www.mozilla.org/xbl"
+          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+          xmlns:xbl="http://www.mozilla.org/xbl">
+
+  <binding id="toolbar-primary"
+           extends="chrome://communicator/content/bindings/toolbar-xpfe.xml#grippytoolbar-primary">
+    <content>
+      <xul:toolbargrippy xbl:inherits="last-toolbar,hidden=grippyhidden"
+          tbattr="toolbar-grippy" class="toolbar-primary-grippy"/>
+      <xul:hbox class="toolbar-holder toolbar-primary-holder" flex="1" xbl:inherits="mode,iconsize,labelalign">
+        <xul:image class="toolbar-primary-icon" xbl:inherits="mode,iconsize,labelalign"/>
+        <xul:hbox class="toolbar-button-box" flex="1">
+          <children/>
+        </xul:hbox>
+      </xul:hbox>
+    </content>
+  </binding>
+
+  <binding id="toolbargrippy-primary"
+           extends="chrome://communicator/content/bindings/toolbar-xpfe.xml#toolbargrippy">
+    <content>
+      <xul:image class="toolbargrippy-arrow"/>
+      <xul:image class="toolbargrippy-texture" flex="1"/>
+    </content>
+  </binding>
+
+</bindings>
diff --git a/comm/suite/themes/modern/communicator/viewSourceOverlay.css b/comm/suite/themes/modern/communicator/viewSourceOverlay.css
new file mode 100644
index 0000000000..9381ac4b4d
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/viewSourceOverlay.css
@@ -0,0 +1,8 @@
+/* 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/. */
+
+/* make findbar appear above content */
+#appcontent {
+  -moz-box-direction: reverse;
+}
diff --git a/comm/suite/themes/modern/communicator/xpinstall/xpinstall.css b/comm/suite/themes/modern/communicator/xpinstall/xpinstall.css
new file mode 100644
index 0000000000..2d3b47c846
--- /dev/null
+++ b/comm/suite/themes/modern/communicator/xpinstall/xpinstall.css
@@ -0,0 +1,37 @@
+/* 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/. */
+
+/* ===== xpinstall.css ==================================================
+  == Styles used by the XPInstall dialogs.
+  ======================================================================= */
+
+@import url("chrome://communicator/skin");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Install Confirm and Progress dialogs ::::: */
+
+.packageName {
+  font-weight: bold;
+}
+
+#confirmBox {
+  margin: 1ex;
+}
+
+.confirmSeparator {
+  height: 1em;
+}
+
+.confirmName {
+  font-weight: bold;
+}
+
+#urlColumn {
+  margin-inline-start: 1ex;
+}
+
+#alert-image {
+  margin: 1em;
+}
diff --git a/comm/suite/themes/modern/editor/EditorDialog.css b/comm/suite/themes/modern/editor/EditorDialog.css
new file mode 100644
index 0000000000..575c3d0653
--- /dev/null
+++ b/comm/suite/themes/modern/editor/EditorDialog.css
@@ -0,0 +1,289 @@
+/* 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/. */
+
+/* ==== EditorDialog.css ====================================================
+   == Styles used by all dialog boxes in the Editor application.
+   ========================================================================== */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: common styles ::::: */
+
+.MinWidth5em {
+  min-width: 5em;
+}
+
+.MinWidth10em {
+  min-width: 10em;
+}
+
+.MinWidth20em {
+  min-width: 20em;
+}
+
+.bold {
+  font-weight: bold;
+}
+
+.italic {
+  font-style: italic;
+}
+
+.larger {
+  font-size: 120%;
+}
+
+.narrow {
+  width: 3em;
+}
+
+.wrap {
+  width: 1em;
+}
+
+.menuitem-highlight-1 {
+  font-weight: bold;
+}
+
+/* ::::: common buttons ::::: */
+
+#MoreFewerButton[more="0"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
+  min-width: 12em;
+}
+
+#MoreFewerButton[more="1"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.png");
+  min-width: 12em;
+}
+
+/* ::::: table properties dialog ::::: */
+
+#PreviousButton {
+  list-style-image: url("chrome://global/skin/arrow/arrow-lft.png");
+}
+
+#NextButton {
+  list-style-image: url("chrome://global/skin/arrow/arrow-rit.png");
+}
+
+#PreviousButton[type="row"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.png");
+}
+
+#NextButton[type="row"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
+}
+
+/* ::::: spelling dialog ::::: */
+
+#MisspelledWord {
+  font-weight: bold;
+}
+
+#ReplaceWordInput {
+  min-width: 16em;
+  width: 16em;
+}
+
+.spell-check {
+  min-width: 8em;
+}
+
+/* ::::: spacers ::::: */
+
+.smallspacer {
+  width: 3px;
+  height: 3px;
+  min-width: 3px;
+  min-height: 3px;
+}
+
+.spacer {
+  width: 5px;
+  height: 5px;
+  min-width: 5px;
+  min-height: 5px;
+}
+
+.bigspacer {
+  width: 10px;
+  height: 10px;
+  min-width: 10px;
+  min-height: 10px;
+}
+
+/* These should be the width of the checkbox and radio button images + margin + padding
+   Used to indent below those to the level of the text label next to image
+*/
+.checkbox-spacer {
+  width: 20px;
+  min-width: 20px;
+}
+
+.radio-spacer {
+  width: 20px;
+  min-width: 20px;
+}
+
+/* ::::: widget adjustments ::::: */
+
+/* The defaults are WAY to big! */
+groupbox {
+  margin: 2px 5px 4px;
+  padding-top: 2px;
+  padding-bottom: 4px;
+}
+
+/* ::::: color picker button ::::: */
+
+.color-button {
+  /* override larger default values */
+  min-width: 0px;
+  margin: 2px;
+}
+
+.color-well {
+  border: 1px inset #B4C3D4;
+  width: 20px;
+  height: 12px;
+}
+
+.color-well[default="true"] {
+  border: 1px solid transparent !important;
+  background-color: inherit !important;
+}
+
+/* ::::: color picker dialog ::::: */
+
+#ColorPicker {
+  -moz-user-focus: normal;
+}
+
+#ColorPickerSwatch {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-inline-start: 0px;
+  margin-inline-end: 3px;
+  border: 2px outset #B4C3D4;
+  width: 25px;
+  height: 20px;
+}
+
+#ColorPickerSwatch[default="true"] {
+  border: 2px solid transparent;
+  background-color: inherit;
+}
+
+#LastPickedColor {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 2px;
+  margin-inline-end: 8px;
+  border: 1px inset #B4C3D4;
+  width: 17px;
+  height: 13px;
+}
+
+
+/* ::::: Image Properties dialog ::::: */
+
+.align-menu > .menu-iconic-left > .menu-iconic-icon {
+  height: auto;
+  width: auto;
+}
+
+.align-menu[value="top"] {
+  list-style-image: url("chrome://editor/skin/icons/img-align-top.png") !important;
+}
+
+.align-menu[value="top"]:hover {
+  list-style-image: url("chrome://editor/skin/icons/img-align-top-sel.png") !important;
+}
+
+.align-menu[value="middle"] {
+  list-style-image: url("chrome://editor/skin/icons/img-align-mid.png") !important;
+}
+
+.align-menu[value="middle"]:hover {
+  list-style-image: url("chrome://editor/skin/icons/img-align-mid-sel.png") !important;
+}
+
+.align-menu[value="bottom"] {
+  list-style-image: url("chrome://editor/skin/icons/img-align-btm.png") !important;
+}
+
+.align-menu[value="bottom"]:hover {
+  list-style-image: url("chrome://editor/skin/icons/img-align-btm-sel.png") !important;
+}
+
+.align-menu[value="right"] {
+  list-style-image: url("chrome://editor/skin/icons/img-align-rit.png") !important;
+}
+
+.align-menu[value="left"] {
+  list-style-image: url("chrome://editor/skin/icons/img-align-lft.png") !important;
+}
+
+/* Don't change width/height of these without changing values in
+  GetOriginalWidth(), EdImageProps.js */
+#preview-image-box {
+  margin: 6px 5px;
+  border: 1px inset #B4C3D4;
+  width: 82px;
+  height: 52px;
+  min-width: 82px;
+  min-height: 52px;
+  max-width: 82px;
+  max-height: 52px;
+  overflow: -moz-hidden-unscrollable;
+}
+
+#preview-image-holder {
+  padding: 0px;
+  margin: 0px;
+}
+
+/* :::::: Advanced Edit dialog ::::: */
+
+#tagLabel {
+  font-weight: bold;
+}
+
+.AttributesTree {
+  min-width: 200px;
+  min-height: 200px;
+}
+
+/* ::::: Editor pref panels ::::: */
+
+#ColorPreview {
+  margin-inline-start: 10px;
+  border: 1px inset #B4C3D4;
+  padding: 0 5px;
+  min-width: 100px;
+  min-height: 50px;
+}
+
+/* ::::: select edit dialog ::::: */
+
+#SelectTreeChildren::-moz-tree-cell(SelectSelCol, checked-false) {
+  background: url("chrome://global/skin/checkbox/cbox.png") 50% 50% no-repeat;
+}
+
+#SelectTreeChildren::-moz-tree-cell(SelectSelCol, checked-true) {
+  background: url("chrome://global/skin/checkbox/cbox-check.png") 50% 50% no-repeat;
+}
+
+/* ::::: Publishing Progress ::::: */
+
+.progressitem[progress="busy"] {
+  list-style-image: url("chrome://editor/skin/icons/progress-busy.png");
+}
+.progressitem[progress="done"] {
+  list-style-image: url("chrome://editor/skin/icons/progress-done.png");
+}
+.progressitem[progress="failed"] {
+  list-style-image: url("chrome://editor/skin/icons/progress-failed.png");
+}
diff --git a/comm/suite/themes/modern/editor/editor.css b/comm/suite/themes/modern/editor/editor.css
new file mode 100644
index 0000000000..b4b65020d1
--- /dev/null
+++ b/comm/suite/themes/modern/editor/editor.css
@@ -0,0 +1,80 @@
+/* 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/. */
+
+/* ==== editor.css ==========================================================
+   == Styles shared throughout the Editor application.
+   ========================================================================== */
+
+@import url("chrome://communicator/skin/");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#content-frame {
+  height: 400px;
+  min-width: 10px;
+  min-height: 10px;
+}
+
+.source-editor,
+.source-editor:focus {
+  margin-top: 0px;
+  margin-bottom: 5px;
+  margin-inline-start: 0px;
+  margin-inline-end: 5px;
+  border: 0px;
+  padding-top: 5px;
+  padding-bottom: 0px;
+  padding-inline-start: 5px;
+  padding-inline-end: 0px;
+}
+
+/* Multiline textarea for HTML source editing */
+#content-source, #doctype-text {
+  font-family : -moz-fixed;
+  font-size: initial;
+}
+
+/* ::::: formatting toolbar ::::: */
+
+#FormatToolbar {
+  background: url("chrome://global/skin/toolbar/tb-mid.png") #C7D0D9 repeat-x top;
+}
+
+#FormatToolbar > .toolbar-box > toolbargrippy,
+#FormatToolbar > .toolbar-box > .toolbar-holder {
+  border-top: 1px solid #CED6DD;
+  border-right: 1px solid #95A0AD;
+  border-bottom: 1px solid #95A0AD;
+  border-left: 1px solid #DAE3ED;
+}
+
+#FormatToolbar > .toolbar-box > toolbargrippy:hover:active {
+  border-color: #67737E;
+}
+
+/* ::::: struct toolbar ::::: */
+
+#structToolbar {
+  min-width: 1px;
+  overflow: -moz-hidden-unscrollable;
+}
+
+#structSpacer {
+  margin: 1px 0px;
+}
+
+.struct-button {
+  padding: 0px;
+}
+
+.struct-button[checked="true"] {
+  font-weight: bold;
+}
+
+.struct-textbox {
+  padding: 0px !important;
+  border: 1px solid #000000 !important;
+  margin: 0px !important;
+}
+
diff --git a/comm/suite/themes/modern/editor/editorFormatToolbar.css b/comm/suite/themes/modern/editor/editorFormatToolbar.css
new file mode 100644
index 0000000000..8eb20b0f16
--- /dev/null
+++ b/comm/suite/themes/modern/editor/editorFormatToolbar.css
@@ -0,0 +1,591 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: formatting toolbar ::::: */
+
+#FormatToolbar {
+  background: url("chrome://global/skin/toolbar/tb-mid.png") #C7D0D9 repeat-x top;
+}
+
+#FormatToolbar > toolbargrippy,
+#FormatToolbar > .toolbar-holder {
+  border-top: 1px solid #CED6DD;
+  border-right: 1px solid #95A0AD;
+  border-bottom: 1px solid #95A0AD;
+  border-left: 1px solid #DAE3ED;
+}
+
+#FormatToolbar > toolbargrippy:hover:active {
+  border-color: #67737E;
+}
+
+/* ::::: formatting buttons ::::: */
+
+toolbarbutton.formatting-button {
+  border: none !important;
+  list-style-image: url("chrome://editor/skin/icons/btn2.png");
+  background-color: transparent !important;
+}
+
+#DecreaseFontSizeButton {
+  -moz-image-region: rect(101px 22px 118px 0px);
+}
+
+#DecreaseFontSizeButton:hover {
+  -moz-image-region: rect(101px 44px 118px 22px);
+}
+
+#DecreaseFontSizeButton:hover:active {
+  -moz-image-region: rect(101px 66px 118px 44px);
+}
+
+#DecreaseFontSizeButton[disabled="true"] {
+  -moz-image-region: rect(101px 88px 118px 66px) !important;
+}
+
+#IncreaseFontSizeButton {
+  -moz-image-region: rect(118px 22px 135px 0px);
+}
+
+#IncreaseFontSizeButton:hover {
+  -moz-image-region: rect(118px 44px 135px 22px);
+}
+
+#IncreaseFontSizeButton:hover:active {
+  -moz-image-region: rect(118px 66px 135px 44px);
+}
+
+#IncreaseFontSizeButton[disabled="true"] {
+  -moz-image-region: rect(118px 88px 135px 66px) !important;
+}
+
+#boldButton {
+  -moz-image-region: rect(33px 54px 50px 32px);
+}
+
+#boldButton:hover {
+  -moz-image-region: rect(33px 76px 50px 54px);
+}
+
+#boldButton:hover:active {
+  -moz-image-region: rect(50px 22px 67px 0px );
+}
+
+#boldButton[checked="true"] {
+  -moz-image-region: rect(33px 98px 50px 76px);
+}
+
+#boldButton[disabled="true"] {
+  -moz-image-region: rect(50px 44px 67px 22px) !important;
+}
+
+#italicButton {
+  -moz-image-region: rect(185px 86px 202px 64px);
+}
+
+#italicButton:hover {
+  -moz-image-region: rect(202px 22px 219px 0px);
+}
+
+#italicButton:hover:active {
+  -moz-image-region: rect(202px 66px 219px 44px);
+}
+
+#italicButton[checked="true"] {
+  -moz-image-region: rect(202px 44px 219px 22px);
+}
+
+#italicButton[disabled="true"] {
+  -moz-image-region: rect(202px 88px 219px 66px) !important;
+}
+
+#underlineButton {
+  -moz-image-region: rect(338px 22px 355px 0px);
+}
+
+#underlineButton:hover {
+  -moz-image-region: rect(338px 44px 355px 22px);
+}
+
+#underlineButton:hover:active {
+  -moz-image-region: rect(338px 88px 355px 66px);
+}
+
+#underlineButton[checked="true"] {
+  -moz-image-region: rect(338px 66px 355px 44px);
+}
+
+#underlineButton[disabled="true"] {
+  -moz-image-region: rect(355px 22px 372px 0px) !important;
+}
+
+#ulButton {
+  -moz-image-region: rect(50px 66px 67px 44px);
+}
+
+#ulButton:hover {
+  -moz-image-region: rect(50px 88px 67px 66px);
+}
+
+#ulButton:hover:active {
+  -moz-image-region: rect(67px 44px 84px 22px);
+}
+
+#ulButton[checked="true"] {
+  -moz-image-region: rect(67px 22px 84px 0px);
+}
+
+#ulButton[disabled="true"] {
+  -moz-image-region: rect(67px 66px 84px 44px ) !important;
+}
+
+
+#olButton {
+  -moz-image-region: rect(253px 66px 270px 44px);
+}
+
+#olButton:hover {
+  -moz-image-region: rect(253px 88px 270px 66px);
+}
+
+#olButton:hover:active {
+  -moz-image-region: rect(270px 44px 287px 22px);
+}
+
+#olButton[checked="true"] {
+  -moz-image-region: rect(270px 22px 287px 0px);
+}
+
+#olButton[disabled="true"] {
+  -moz-image-region: rect(270px 66px 287px 44px) !important;
+}
+
+#outdentButton {
+  -moz-image-region: rect(270px 88px 287px 66px);
+}
+
+#outdentButton:hover {
+  -moz-image-region: rect(287px 22px 304px 0px);
+}
+
+#outdentButton:hover:active {
+  -moz-image-region: rect(287px 44px 304px 22px);
+}
+
+#outdentButton[disabled="true"] {
+  -moz-image-region: rect(287px 66px 304px 44px) !important;
+}
+
+#indentButton {
+  -moz-image-region: rect(135px 22px 152px 0px);
+}
+
+#indentButton:hover {
+  -moz-image-region: rect(135px 44px 152px 22px);
+}
+
+#indentButton:hover:active {
+  -moz-image-region: rect(135px 66px 152px 44px);
+}
+
+#indentButton[disabled="true"] {
+  -moz-image-region: rect(135px 88px 152px 66px) !important;
+}
+
+#align-left-button {
+  -moz-image-region: rect(236px 44px 253px 22px);
+}
+
+#align-left-button:hover {
+  -moz-image-region: rect(236px 66px 253px 44px);
+}
+
+#align-left-button:hover:active {
+  -moz-image-region: rect(253px 22px 270px 0px);
+}
+
+#align-left-button[checked="true"] {
+  -moz-image-region: rect(236px 88px 253px 66px);
+}
+
+#align-left-button[disabled="true"] {
+  -moz-image-region: rect(253px 44px 270px 22px) !important;
+}
+
+#align-center-button {
+  -moz-image-region: rect(67px 88px 84px 66px);
+}
+
+#align-center-button:hover {
+  -moz-image-region: rect(84px 22px 101px 0px);
+}
+
+#align-center-button:hover:active {
+  -moz-image-region: rect(84px 66px 101px 44px);
+}
+
+#align-center-button[checked="true"] {
+  -moz-image-region: rect(84px 44px 101px 22px);
+}
+
+#align-center-button[disabled="true"] {
+  -moz-image-region: rect(84px 88px 101px 66px) !important;
+}
+
+#align-right-button {
+  -moz-image-region: rect(287px 88px 304px 66px);
+}
+
+#align-right-button:hover {
+  -moz-image-region: rect(304px 22px 321px 0px);
+}
+
+#align-right-button:hover:active {
+  -moz-image-region: rect(304px 66px 321px 44px);
+}
+
+#align-right-button[checked="true"] {
+  -moz-image-region: rect(304px 44px 321px 22px);
+}
+
+#align-right-button[disabled="true"] {
+  -moz-image-region: rect(304px 88px 321px 66px) !important;
+}
+
+#align-justify-button {
+  -moz-image-region: rect(219px 22px 236px 0px);
+}
+
+#align-justify-button:hover {
+  -moz-image-region: rect(219px 44px 236px 22px);
+}
+
+#align-justify-button:hover:active {
+  -moz-image-region: rect(219px 88px 236px 66px);
+}
+
+#align-justify-button[checked="true"] {
+  -moz-image-region: rect(219px 66px 236px 44px);
+}
+
+#align-justify-button[disabled="true"] {
+  -moz-image-region: rect(236px 22px 253px 0px) !important;
+}
+
+#AlignPopupButton {
+  -moz-image-region: rect(0px 22px 17px 0px);
+}
+
+#AlignPopupButton:hover {
+  -moz-image-region: rect(0px 44px 17px 22px);
+}
+
+#AlignPopupButton[open="true"] {
+  -moz-image-region: rect(0px 66px 17px 44px) !important;
+}
+
+#AlignPopupButton[disabled="true"] {
+  -moz-image-region: rect(0px 88px 17px 66px) !important;
+}
+
+#InsertPopupButton {
+  -moz-image-region: rect(152px 22px 169px 0px);
+}
+
+#InsertPopupButton:hover {
+  -moz-image-region: rect(152px 44px 169px 22px);
+}
+
+#InsertPopupButton[open="true"] {
+  -moz-image-region: rect(152px 66px 169px 44px) !important;
+}
+
+#InsertPopupButton[disabled="true"] {
+  -moz-image-region: rect(152px 88px 169px 66px) !important;
+}
+
+#smileButtonMenu {
+  -moz-image-region: rect(321px 22px 338px 0px);
+}
+
+#smileButtonMenu:hover {
+  -moz-image-region: rect(321px 44px 338px 22px);
+}
+
+#smileButtonMenu[open="true"] {
+  -moz-image-region: rect(321px 66px 338px 44px) !important;
+}
+
+#smileButtonMenu[disabled="true"] {
+  -moz-image-region: rect(321px 88px 338px 66px) !important;
+}
+
+/* ::::: menuitem icons ::::: */
+
+/* ..... align menu ..... */
+
+#AlignPopup > menuitem {
+  list-style-image: url("chrome://editor/skin/icons/btn2.png");
+}
+
+#AlignLeftItem {
+  -moz-image-region: rect(17px 80px 33px 64px);
+}
+
+#AlignLeftItem:hover {
+  -moz-image-region: rect(17px 96px 33px 80px);
+}
+
+#AlignCenterItem {
+  -moz-image-region: rect(17px 16px 33px 0px);
+}
+
+#AlignCenterItem:hover {
+  -moz-image-region: rect(17px 32px 33px 16px);
+}
+
+#AlignRightItem {
+  -moz-image-region: rect(33px 16px 49px 0px);
+}
+
+#AlignRightItem:hover {
+  -moz-image-region: rect(33px 32px 49px 0px);
+}
+
+#AlignJustifyItem {
+  -moz-image-region: rect(17px 48px 33px 32px);
+}
+
+#AlignJustifyItem:hover {
+  -moz-image-region: rect(17px 64px 33px 48px);
+}
+
+/* ..... insert menu ..... */
+
+#InsertPopup > menuitem {
+  list-style-image: url("chrome://editor/skin/icons/btn2.png");
+}
+
+#InsertLinkItem {
+  -moz-image-region: rect(185px 16px 201px 0px);
+}
+
+#InsertLinkItem:hover {
+  -moz-image-region: rect(185px 32px 201px 16px);
+}
+
+#InsertAnchorItem {
+  -moz-image-region: rect(169px 16px 185px 0px);
+}
+
+#InsertAnchorItem:hover {
+  -moz-image-region: rect(169px 32px 185px 16px);
+}
+
+#InsertImageItem {
+  -moz-image-region: rect(169px 80px 185px 64px);
+}
+
+#InsertImageItem:hover {
+  -moz-image-region: rect(169px 96px 185px 80px);
+}
+
+#InsertHRuleItem {
+  -moz-image-region: rect(169px 48px 185px 32px);
+}
+
+#InsertHRuleItem:hover {
+  -moz-image-region: rect(169px 64px 185px 48px);
+}
+
+#InsertTableItem {
+  -moz-image-region: rect(185px 48px 201px 32px);
+}
+
+#InsertTableItem:hover {
+  -moz-image-region: rect(185px 64px 201px 48px);
+}
+
+/* ..... smiley menu ..... */
+
+.insert-smile {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-smile.png");
+}
+
+.insert-frown {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-frown.png"); 
+}
+
+.insert-wink {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-wink.png");
+}
+
+.insert-tongue {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-tongue.png");
+}
+
+.insert-laughing {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-laughing.png"); 
+}
+
+.insert-embarrassed {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-embarrassed.png");
+}
+
+.insert-undecided {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-undecided.png"); 
+}
+
+.insert-surprise {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-surprise.png"); 
+}
+
+.insert-kiss {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-kiss.png"); 
+}
+
+.insert-yell {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-yell.png"); 
+}
+
+.insert-cool {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-cool.png"); 
+}
+
+.insert-money {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-money.png"); 
+}
+
+.insert-foot {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-foot.png"); 
+}
+
+.insert-innocent {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-innocent.png"); 
+}
+
+.insert-cry {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-cry.png"); 
+}
+
+.insert-sealed {
+  list-style-image: url("chrome://communicator/skin/icons/smileys/smiley-sealed.png"); 
+}
+
+/* ::::: fg/bg color picker ::::: */
+
+.color-button {
+  margin: 2px;
+  border: 1px inset #5B7693;
+  padding: 0px;
+  width: 14px;
+  height: 12px;
+}
+
+.color-button:hover {
+  border: 1px solid #ffffff;
+}
+
+#TextColorButton {
+  margin-top: 2px;
+  margin-bottom: 9px;
+  margin-inline-start: 2px;
+  margin-inline-end: 9px;
+}
+
+#TextColorButton[color="mixed"] {
+  background-image: url("chrome://editor/skin/icons/multicolor.png");
+  background-size: cover;
+}
+
+#BackgroundColorButton {
+  margin-top: 9px;
+  margin-bottom: 2px;
+  margin-inline-start: 9px;
+  margin-inline-end: 2px;
+}
+
+#HighlightColorButton > .toolbarbutton-icon {
+  margin-inline-end: 0px ! important ;
+}
+
+#HighlightColorButton {
+  -moz-image-region: rect(355px 44px 372px 22px);
+  margin: 4px;
+  border: 1px inset #5B7693;
+  padding: 0px;
+  width: 20px; height: 17px;
+}
+
+#HighlightColorButton:hover {
+  -moz-image-region: rect(355px 66px 372px 44px);
+}
+
+#HighlightColorButton:hover:active {
+  -moz-image-region: rect(355px 88px 372px 66px);
+}
+
+
+#HighlightColorButton[disabled="true"],
+#HighlightColorButton[disabled="true"]:hover,
+#HighlightColorButton[disabled="true"]:hover:active {
+  -moz-image-region: rect(372px 22px 389px 0px);
+}
+
+#absolutePositionButton {
+  -moz-image-region: rect(372px 44px 389px 22px);
+}
+
+#absolutePositionButton:hover {
+  -moz-image-region: rect(372px 66px 389px 44px);
+}
+
+#absolutePositionButton:hover:active {
+  -moz-image-region: rect(372px 88px 389px 66px);
+}
+
+#absolutePositionButton[checked="true"]{
+  -moz-image-region: rect(389px 22px 406px 0px);
+}
+
+#absolutePositionButton[checked="true"]:hover {
+  -moz-image-region: rect(389px 44px 406px 22px);
+}
+
+#absolutePositionButton[checked="true"]:hover:active {
+  -moz-image-region: rect(389px 66px 406px 44px);
+}
+
+#absolutePositionButton[disabled="true"] {
+  -moz-image-region: rect(389px 88px 406px 66px) !important;
+}
+
+#increaseZIndexButton {
+  list-style-image: url("chrome://editor/content/images/bringtofront.png");
+}
+
+#increaseZIndexButton[disabled="true"] {
+  list-style-image: url("chrome://editor/content/images/bringtofront-disabled.png");
+}
+
+#decreaseZIndexButton {
+  list-style-image: url("chrome://editor/content/images/sendtoback.png");
+}
+
+#decreaseZIndexButton[disabled="true"] {
+  list-style-image: url("chrome://editor/content/images/sendtoback-disabled.png");
+}
+
+/* Force the folder location and mail view items to fit in the available width
+   in the Customize Toolbar dialog. */
+#palette-box #paragraph-select-container,
+#palette-box #ParagraphSelect,
+#palette-box #font-face-select-container,
+#palette-box #FontFaceSelect,
+#palette-box #font-size-select-container,
+#palette-box #FontSizeSelect {
+  -moz-box-flex: 1;
+}
diff --git a/comm/suite/themes/modern/editor/editorModeToolbar.css b/comm/suite/themes/modern/editor/editorModeToolbar.css
new file mode 100644
index 0000000000..25ce81355f
--- /dev/null
+++ b/comm/suite/themes/modern/editor/editorModeToolbar.css
@@ -0,0 +1,29 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: edit mode toolbar ::::: */
+
+#EditModeToolbar {
+  border-bottom: 1px solid #B4C3D4;
+  padding: 0px 0px 2px;
+  min-width: 1px;
+}
+
+#NormalModeButton {
+  list-style-image: url("chrome://editor/skin/icons/editmode-normal.png");
+}
+
+#TagModeButton {
+  list-style-image: url("chrome://editor/skin/icons/editmode-tags.png");
+}
+
+#SourceModeButton {
+  list-style-image: url("chrome://editor/skin/icons/editmode-html.png");
+}
+
+#PreviewModeButton {
+  list-style-image: url("chrome://editor/skin/icons/editmode-preview.png");
+}
diff --git a/comm/suite/themes/modern/editor/editorPrimaryToolbar.css b/comm/suite/themes/modern/editor/editorPrimaryToolbar.css
new file mode 100644
index 0000000000..5b0dd2ce6e
--- /dev/null
+++ b/comm/suite/themes/modern/editor/editorPrimaryToolbar.css
@@ -0,0 +1,311 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: primary toolbar masthead ::::: */
+
+#EditToolbar > .toolbar-holder > .toolbar-primary-icon {
+  background-image: url("chrome://editor/skin/icons/mast-editor.png");
+  width: 57px;
+}
+
+.toolbar-primary-icon {
+  width: 57px;
+}
+
+/* ::::: primary toolbar buttons ::::: */
+
+.toolbarseparator-primary {
+  width: 9px !important;
+}
+
+#newButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(136px 49px 169px 0);
+}
+
+#newButton:hover {
+  -moz-image-region: rect(136px 99px 169px 50px);
+}
+
+#newButton:hover:active {
+  -moz-image-region: rect(136px 149px 169px 100px);
+}
+
+#newButton[disabled="true"] {
+  -moz-image-region: rect(136px 199px 169px 150px) !important;
+}
+
+#openButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(170px 49px 203px 0);
+}
+
+#openButton:hover {
+  -moz-image-region: rect(170px 99px 203px 50px);
+}
+
+#openButton:hover:active {
+  -moz-image-region: rect(170px 149px 203px 100px);
+}
+
+#openButton[disabled="true"] {
+  -moz-image-region: rect(170px 199px 203px 150px) !important;
+}
+
+#saveButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(238px 49px 271px 0);
+}
+
+#saveButton:hover {
+  -moz-image-region: rect(238px 99px 271px 50px);
+}
+
+#saveButton:hover:active {
+  -moz-image-region: rect(238px 149px 271px 100px);
+}
+
+#saveButton[disabled="true"] {
+  -moz-image-region: rect(238px 199px 271px 150px) !important;
+}
+
+#publishButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(340px 49px 373px 0);
+}
+
+#publishButton:hover {
+  -moz-image-region: rect(340px 99px 373px 50px);
+}
+
+#publishButton:hover:active {
+  -moz-image-region: rect(340px 149px 373px 100px);
+}
+
+#publishButton[disabled="true"] {
+  -moz-image-region: rect(340px 199px 373px 150px) !important;
+}
+
+#previewButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(204px 49px 237px 0);
+}
+
+#previewButton:hover {
+  -moz-image-region: rect(204px 99px 237px 50px);
+}
+
+#previewButton:hover:active {
+  -moz-image-region: rect(204px 149px 237px 100px);
+}
+
+#previewButton[disabled="true"] {
+  -moz-image-region: rect(204px 199px 237px 150px) !important;
+}
+
+/* To workaround that the composer icons are all 33px tall */
+#print-button {
+  -moz-image-region: rect(5px 42px 38px 0);
+}
+
+#print-button:hover {
+  -moz-image-region: rect(5px 84px 38px 42px);
+}
+
+#print-button:hover:active {
+  -moz-image-region: rect(5px 126px 38px 84px);
+}
+
+#print-button[disabled="true"] {
+  -moz-image-region: rect(5px 168px 38px 126px) !important;
+}
+
+#linkButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(102px 49px 135px 0);
+}
+
+#linkButton:hover {
+  -moz-image-region: rect(102px 99px 135px 50px);
+}
+
+#linkButton:hover:active {
+  -moz-image-region: rect(102px 149px 135px 100px);
+}
+
+#linkButton[disabled="true"] {
+  -moz-image-region: rect(102px 199px 135px 150px) !important;
+}
+
+#imageButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(68px 49px 101px 0);
+}
+
+#imageButton:hover {
+  -moz-image-region: rect(68px 99px 101px 50px);
+}
+
+#imageButton:hover:active {
+  -moz-image-region: rect(68px 149px 101px 100px);
+}
+
+#imageButton[disabled="true"] {
+  -moz-image-region: rect(68px 199px 101px 150px) !important;
+}
+
+#formButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(510px 49px 543px 0);
+}
+
+#formButton:hover {
+  -moz-image-region: rect(510px 99px 543px 50px);
+}
+
+#formButton:hover:active {
+  -moz-image-region: rect(510px 149px 543px 100px);
+}
+
+#formButton[disabled="true"] {
+  -moz-image-region: rect(510px 199px 543px 150px) !important;
+}
+
+#namedAnchorButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(0 49px 33px 0);
+}
+
+#namedAnchorButton:hover {
+  -moz-image-region: rect(0 99px 33px 50px);
+}
+
+#namedAnchorButton:hover:active {
+  -moz-image-region: rect(0 149px 33px 100px);
+}
+
+#namedAnchorButton[disabled="true"] {
+  -moz-image-region: rect(0 199px 33px 150px) !important;
+}
+
+#hlineButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(34px 49px 67px 0);
+}
+
+#hlineButton:hover {
+  -moz-image-region: rect(34px 99px 67px 50px);
+}
+
+#hlineButton:hover:active {
+  -moz-image-region: rect(34px 149px 67px 100px);
+}
+
+#hlineButton[disabled="true"] {
+  -moz-image-region: rect(34px 199px 67px 150px) !important;
+}
+
+#tableButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(306px 49px 339px 0);
+}
+
+#tableButton:hover {
+  -moz-image-region: rect(306px 99px 339px 50px);
+}
+
+#tableButton:hover:active {
+  -moz-image-region: rect(306px 149px 339px 100px);
+}
+
+#tableButton[disabled="true"] {
+  -moz-image-region: rect(306px 199px 339px 150px) !important;
+}
+
+#spellingButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(272px 49px 305px 0);
+}
+
+#spellingButton:hover {
+  -moz-image-region: rect(272px 99px 305px 50px);
+}
+
+#spellingButton:hover:active {
+  -moz-image-region: rect(272px 149px 305px 100px);
+}
+
+#spellingButton[disabled="true"] {
+  -moz-image-region: rect(272px 199px 305px 150px) !important;
+}
+
+#cutButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(374px 49px 407px 0);
+}
+
+#cutButton:hover {
+  -moz-image-region: rect(374px 99px 407px 50px);
+}
+
+#cutButton:hover:active {
+  -moz-image-region: rect(374px 149px 407px 100px);
+}
+
+#cutButton[disabled="true"] {
+  -moz-image-region: rect(374px 199px 407px 150px) !important;
+}
+
+#copyButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(408px 49px 441px 0);
+}
+
+#copyButton:hover {
+  -moz-image-region: rect(408px 99px 441px 50px);
+}
+
+#copyButton:hover:active {
+  -moz-image-region: rect(408px 149px 441px 100px);
+}
+
+#copyButton[disabled="true"] {
+  -moz-image-region: rect(408px 199px 441px 150px) !important;
+}
+
+#pasteButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(442px 49px 475px 0);
+}
+
+#pasteButton:hover {
+  -moz-image-region: rect(442px 99px 475px 50px);
+}
+
+#pasteButton:hover:active {
+  -moz-image-region: rect(442px 149px 475px 100px);
+}
+
+#pasteButton[disabled="true"] {
+  -moz-image-region: rect(442px 199px 475px 150px) !important;
+}
+
+#findButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(476px 49px 509px 0);
+}
+
+#findButton:hover {
+  -moz-image-region: rect(476px 99px 509px 50px);
+}
+
+#findButton:hover:active {
+  -moz-image-region: rect(476px 149px 509px 100px);
+}
+
+#findButton[disabled="true"] {
+  -moz-image-region: rect(476px 199px 509px 150px) !important;
+}
diff --git a/comm/suite/themes/modern/editor/icons/btn1.png b/comm/suite/themes/modern/editor/icons/btn1.png
new file mode 100644
index 0000000000..ff849ccb72
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/btn1.png
diff --git a/comm/suite/themes/modern/editor/icons/btn2.png b/comm/suite/themes/modern/editor/icons/btn2.png
new file mode 100644
index 0000000000..e314da5b6b
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/btn2.png
diff --git a/comm/suite/themes/modern/editor/icons/editmode-html.png b/comm/suite/themes/modern/editor/icons/editmode-html.png
new file mode 100644
index 0000000000..a21159669f
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/editmode-html.png
diff --git a/comm/suite/themes/modern/editor/icons/editmode-normal.png b/comm/suite/themes/modern/editor/icons/editmode-normal.png
new file mode 100644
index 0000000000..5161e167b1
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/editmode-normal.png
diff --git a/comm/suite/themes/modern/editor/icons/editmode-preview.png b/comm/suite/themes/modern/editor/icons/editmode-preview.png
new file mode 100644
index 0000000000..c54a61fa91
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/editmode-preview.png
diff --git a/comm/suite/themes/modern/editor/icons/editmode-tags.png b/comm/suite/themes/modern/editor/icons/editmode-tags.png
new file mode 100644
index 0000000000..a1784dada6
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/editmode-tags.png
diff --git a/comm/suite/themes/modern/editor/icons/img-align-btm-sel.png b/comm/suite/themes/modern/editor/icons/img-align-btm-sel.png
new file mode 100644
index 0000000000..fd920e634e
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/img-align-btm-sel.png
diff --git a/comm/suite/themes/modern/editor/icons/img-align-btm.png b/comm/suite/themes/modern/editor/icons/img-align-btm.png
new file mode 100644
index 0000000000..f4d3b83870
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/img-align-btm.png
diff --git a/comm/suite/themes/modern/editor/icons/img-align-lft.png b/comm/suite/themes/modern/editor/icons/img-align-lft.png
new file mode 100644
index 0000000000..425cd7a238
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/img-align-lft.png
diff --git a/comm/suite/themes/modern/editor/icons/img-align-mid-sel.png b/comm/suite/themes/modern/editor/icons/img-align-mid-sel.png
new file mode 100644
index 0000000000..b7fa551786
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/img-align-mid-sel.png
diff --git a/comm/suite/themes/modern/editor/icons/img-align-mid.png b/comm/suite/themes/modern/editor/icons/img-align-mid.png
new file mode 100644
index 0000000000..8baa8c1a36
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/img-align-mid.png
diff --git a/comm/suite/themes/modern/editor/icons/img-align-rit.png b/comm/suite/themes/modern/editor/icons/img-align-rit.png
new file mode 100644
index 0000000000..3e41c9a1da
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/img-align-rit.png
diff --git a/comm/suite/themes/modern/editor/icons/img-align-top-sel.png b/comm/suite/themes/modern/editor/icons/img-align-top-sel.png
new file mode 100644
index 0000000000..7cf6558964
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/img-align-top-sel.png
diff --git a/comm/suite/themes/modern/editor/icons/img-align-top.png b/comm/suite/themes/modern/editor/icons/img-align-top.png
new file mode 100644
index 0000000000..eaabca9205
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/img-align-top.png
diff --git a/comm/suite/themes/modern/editor/icons/mast-editor.png b/comm/suite/themes/modern/editor/icons/mast-editor.png
new file mode 100644
index 0000000000..f841eba9bf
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/mast-editor.png
diff --git a/comm/suite/themes/modern/editor/icons/multicolor.png b/comm/suite/themes/modern/editor/icons/multicolor.png
new file mode 100644
index 0000000000..ea20f50c5a
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/multicolor.png
diff --git a/comm/suite/themes/modern/editor/icons/progress-busy.png b/comm/suite/themes/modern/editor/icons/progress-busy.png
new file mode 100644
index 0000000000..260775bdda
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/progress-busy.png
diff --git a/comm/suite/themes/modern/editor/icons/progress-done.png b/comm/suite/themes/modern/editor/icons/progress-done.png
new file mode 100644
index 0000000000..ae07a3cb99
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/progress-done.png
diff --git a/comm/suite/themes/modern/editor/icons/progress-failed.png b/comm/suite/themes/modern/editor/icons/progress-failed.png
new file mode 100644
index 0000000000..e6c54b08d0
--- /dev/null
+++ b/comm/suite/themes/modern/editor/icons/progress-failed.png
diff --git a/comm/suite/themes/modern/global/about.css b/comm/suite/themes/modern/global/about.css
new file mode 100644
index 0000000000..3ba9673475
--- /dev/null
+++ b/comm/suite/themes/modern/global/about.css
@@ -0,0 +1,65 @@
+/* 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/. */
+
+@import url("chrome://global/skin/plugins.css");
+
+html {
+  background: #FFF;
+}
+
+body {
+  color: #22262F;
+  font: message-box;
+  position: relative;
+  min-width: 330px;
+  max-width: 50em;
+  margin: 4em auto;
+  border: 1px solid #494F5D;
+  border-radius: 10px;
+  padding: 3em;
+  padding-inline-start: 30px;
+  background: #C7D0D9;
+  text-align: left;
+}
+
+.aboutPageWideContainer {
+  max-width: 80%;
+}
+
+#aboutLogoContainer {
+  border: 1px solid #494F5D;
+  width: 300px;
+  margin-bottom: 2em;
+}
+
+img {
+  border: 0;
+}
+
+#version {
+  font-weight: bold;
+  color: #000;
+  margin-top: -24px;
+  margin-bottom: 9px;
+  margin-inline-start: 10px;
+  margin-inline-end: 0px;
+  font-size: 130%;
+}
+
+ul {
+  margin: 0;
+  margin-inline-start: 1.5em;
+  padding: 0;
+  list-style: square;
+  font-size: 110%;
+}
+
+ul > li {
+  margin-top: .5em;
+}
+
+.columns {
+  -moz-column-width: 20em;
+  -moz-column-gap: 3em;
+}
diff --git a/comm/suite/themes/modern/global/aboutCache.css b/comm/suite/themes/modern/global/aboutCache.css
new file mode 100644
index 0000000000..49e9015ee4
--- /dev/null
+++ b/comm/suite/themes/modern/global/aboutCache.css
@@ -0,0 +1,50 @@
+/* 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/. */
+
+h2 {
+  margin-top: 1em;
+}
+
+table {
+  table-layout: fixed;
+  width: 100%;
+  margin-bottom: 1em;
+}
+
+th {
+  width: 14em;
+  white-space: nowrap;
+  text-align: end;
+}
+
+td {
+  font-family: -moz-fixed;
+  word-wrap: break-word;
+}
+
+#col-key {
+  width: 52%;
+}
+
+#col-dataSize,
+#col-fetchCount,
+#col-lastModified,
+#col-expires {
+  width: 12%;
+}
+
+#entries > tbody > tr > td {
+  padding: .5em 0;
+  text-align: center;
+}
+
+#entries > thead > tr > th {
+  text-align: center;
+  white-space: normal;
+}
+
+#entries > thead > tr > th:first-child,
+#entries > tbody > tr > td:first-child {
+  text-align: start;
+}
diff --git a/comm/suite/themes/modern/global/aboutCacheEntry.css b/comm/suite/themes/modern/global/aboutCacheEntry.css
new file mode 100644
index 0000000000..2ea1bf7ba6
--- /dev/null
+++ b/comm/suite/themes/modern/global/aboutCacheEntry.css
@@ -0,0 +1,27 @@
+/* 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/. */
+
+body {
+  display: table;
+}
+
+table {
+  table-layout: fixed;
+  width: 100%;
+}
+
+th {
+  width: 12em;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+  vertical-align: top;
+  text-align: end;
+}
+
+td {
+  display: block;
+  font-family: -moz-fixed;
+  white-space: pre-wrap;
+  word-wrap: break-word;
+}
diff --git a/comm/suite/themes/modern/global/aboutMemory.css b/comm/suite/themes/modern/global/aboutMemory.css
new file mode 100644
index 0000000000..295ef6a847
--- /dev/null
+++ b/comm/suite/themes/modern/global/aboutMemory.css
@@ -0,0 +1,26 @@
+/* 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/. */
+
+@import url("chrome://global/content/aboutMemory.css");
+@import url("chrome://global/skin/button.css");
+
+html {
+  background-color: #FFF;
+}
+
+div.section, div.opsRow {
+  background-color: #C7D0D9;
+}
+
+h2 {
+  background-color: #90A1B3;
+}
+
+a:link, a:visited, a:active {
+ color: #313063;
+}
+
+input[type="checkbox"] {
+  -moz-appearance: none;
+}
diff --git a/comm/suite/themes/modern/global/aboutSupport.css b/comm/suite/themes/modern/global/aboutSupport.css
new file mode 100644
index 0000000000..b63f309cd2
--- /dev/null
+++ b/comm/suite/themes/modern/global/aboutSupport.css
@@ -0,0 +1,108 @@
+/* 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/. */
+
+@import url("chrome://global/skin/plugins.css");
+@import url("chrome://global/skin/button.css");
+
+body {
+  width: 90%;
+  margin-left: 5%;
+  margin-right: 5%;
+}
+
+.page-subtitle {
+  margin-bottom: 1.5em;
+}
+
+.major-section {
+  margin-top: 2em;
+  margin-bottom: 1em;
+  text-align: start;
+}
+
+button {
+  margin-inline-start: 0;
+  margin-inline-end: 8px;
+}
+
+th.title-column {
+  white-space: nowrap;
+  width: 0px;
+  font-size: medium;
+}
+
+th.column {
+  text-align: start;
+  border-top: 1px dotted #2D3B49;
+  white-space: nowrap;
+  width: 0px;
+}
+
+tr:first-child > th,
+tr:first-child > td {
+  border-top: 0;
+}
+
+.prefs-table {
+  table-layout: fixed;
+}
+
+.name {
+  width: 70%;
+}
+
+.value {
+  width: 30%;
+}
+
+.pref-name,
+.pref-value {
+  white-space: nowrap;
+  overflow: hidden;
+}
+
+#action-box {
+  background-color: #C7D0D9;
+  border: 1px solid #2D3B49;
+  border-radius: 6px;
+  color: #22262F;
+  float: right;
+  margin-top: 2em;
+  margin-bottom: 20px;
+  margin-inline-start: 20px;
+  margin-inline-end: 0;
+  padding: 16px;
+  width: 30%;
+}
+
+#action-box,
+#reset-box,
+#safe-mode-box {
+  display: none;
+}
+
+#action-box:dir(rtl) {
+  float: left;
+}
+
+#reset-box > h3 {
+  margin-top: 0;
+}
+
+#action-box button {
+  display: block;
+}
+
+#verify-place-result {
+  max-height: 200px;
+  overflow: auto;
+}
+
+.block {
+  display: block;
+}
+
+.hidden {
+  display: none;
+}
diff --git a/comm/suite/themes/modern/global/alerts/alert.css b/comm/suite/themes/modern/global/alerts/alert.css
new file mode 100644
index 0000000000..5f0984db7d
--- /dev/null
+++ b/comm/suite/themes/modern/global/alerts/alert.css
@@ -0,0 +1,113 @@
+/* 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/. */
+
+/* ===== alert.css =====================================================
+  == Styles specific to the alerts dialog.
+  ======================================================================= */
+
+@import url("chrome://global/skin/global.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.alertBox {
+  background-color: #C7D0D9;
+}
+
+#alertBox[hasBodyText] > #alertTitleBox,
+#alertBox[hasOrigin] > #alertTitleBox {
+  border-bottom: 1px solid #7B969C;
+}
+
+#alertBox[animate][clicked],
+#alertBox[animate][closing] {
+  animation-duration: 0.75s;
+}
+
+alertBox[hasImage] > box > .alertImageBox {
+  padding: 4px;
+  width: 64px;
+}
+
+.alertTextBox {
+  padding: 4px;
+  width: 255px;
+  -moz-box-flex: 1;
+}
+
+.alertTitle {
+  font-weight: bold;
+  font-size: 110%;
+  padding: 4px;
+  -moz-box-flex: 1;
+}
+
+.alertSource {
+  color: #8C99AB;
+  -moz-box-flex: 1;
+}
+
+#alertImage {
+  max-width: 48px;
+  max-height: 48px;
+  list-style-image: url("chrome://global/skin/alerts/notification-48.png");
+}
+
+#alertNotification {
+  border: ridge #5486DA 4px;
+}
+
+#alertNotification[clickable="true"] {
+  cursor: pointer;
+}
+
+label {
+  cursor: inherit;
+}
+
+.alertText[clickable="true"] {
+  color: #1455D6;
+  text-decoration: underline;
+}
+
+.alertText[clickable="true"]:hover:active {
+  color: #424F63;
+}
+
+@keyframes alert-animation {
+  from {
+    opacity: 0;
+  }
+  6.25% {
+    opacity: 1;
+  }
+  93.75% {
+    opacity: 1;
+  }
+  to {
+    opacity: 0;
+  }
+}
+
+.alertCloseButton {
+  list-style-image: url("chrome://global/skin/icons/closebox.png");
+  padding: 4px;
+  border: none;
+}
+
+#alertFooter {
+  -moz-box-align: end;
+}
+
+#alertSettings {
+  min-width: 0px;
+  list-style-image: url("chrome://mozapps/skin/extensions/utilities.png");
+  margin: 0px;
+  border: none;
+  background-color: transparent;
+}
+
+.button-menu-dropmarker,
+.button-text {
+  display: none;
+}
diff --git a/comm/suite/themes/modern/global/alerts/notification-48.png b/comm/suite/themes/modern/global/alerts/notification-48.png
new file mode 100644
index 0000000000..23ab5a0eb8
--- /dev/null
+++ b/comm/suite/themes/modern/global/alerts/notification-48.png
diff --git a/comm/suite/themes/modern/global/appPicker.css b/comm/suite/themes/modern/global/appPicker.css
new file mode 100644
index 0000000000..2af61e1eb6
--- /dev/null
+++ b/comm/suite/themes/modern/global/appPicker.css
@@ -0,0 +1,26 @@
+/* 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/. */
+
+#app-picker {
+  width: 57ch;
+}
+
+#content-description {
+  font-weight: bold;
+}
+
+.listitem-iconic {
+  border-bottom: 1px dotted #C7D0D9;
+}
+
+#content-icon,
+.listcell-icon {
+  margin: 5px;
+  width: 32px;
+  height: 32px;
+}
+
+.listcell-label {
+  padding: 5px;
+}
diff --git a/comm/suite/themes/modern/global/arrow/arrow-dn-dis.gif b/comm/suite/themes/modern/global/arrow/arrow-dn-dis.gif
new file mode 100644
index 0000000000..d1e378c24e
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-dn-dis.gif
diff --git a/comm/suite/themes/modern/global/arrow/arrow-dn-dis.png b/comm/suite/themes/modern/global/arrow/arrow-dn-dis.png
new file mode 100644
index 0000000000..11b72f18f1
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-dn-dis.png
diff --git a/comm/suite/themes/modern/global/arrow/arrow-dn.gif b/comm/suite/themes/modern/global/arrow/arrow-dn.gif
new file mode 100644
index 0000000000..459dfa4130
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-dn.gif
diff --git a/comm/suite/themes/modern/global/arrow/arrow-dn.png b/comm/suite/themes/modern/global/arrow/arrow-dn.png
new file mode 100644
index 0000000000..527efee994
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-dn.png
diff --git a/comm/suite/themes/modern/global/arrow/arrow-lft-dis.gif b/comm/suite/themes/modern/global/arrow/arrow-lft-dis.gif
new file mode 100644
index 0000000000..70a62b7620
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-lft-dis.gif
diff --git a/comm/suite/themes/modern/global/arrow/arrow-lft-dis.png b/comm/suite/themes/modern/global/arrow/arrow-lft-dis.png
new file mode 100644
index 0000000000..4ea0e174d9
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-lft-dis.png
diff --git a/comm/suite/themes/modern/global/arrow/arrow-lft-sharp-end.gif b/comm/suite/themes/modern/global/arrow/arrow-lft-sharp-end.gif
new file mode 100644
index 0000000000..c22294ba21
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-lft-sharp-end.gif
diff --git a/comm/suite/themes/modern/global/arrow/arrow-lft-sharp-end.png b/comm/suite/themes/modern/global/arrow/arrow-lft-sharp-end.png
new file mode 100644
index 0000000000..e6817290b1
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-lft-sharp-end.png
diff --git a/comm/suite/themes/modern/global/arrow/arrow-lft-sharp.gif b/comm/suite/themes/modern/global/arrow/arrow-lft-sharp.gif
new file mode 100644
index 0000000000..ae9b1dd0fb
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-lft-sharp.gif
diff --git a/comm/suite/themes/modern/global/arrow/arrow-lft-sharp.png b/comm/suite/themes/modern/global/arrow/arrow-lft-sharp.png
new file mode 100644
index 0000000000..d306dbb626
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-lft-sharp.png
diff --git a/comm/suite/themes/modern/global/arrow/arrow-lft.gif b/comm/suite/themes/modern/global/arrow/arrow-lft.gif
new file mode 100644
index 0000000000..18d3c0d4a5
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-lft.gif
diff --git a/comm/suite/themes/modern/global/arrow/arrow-lft.png b/comm/suite/themes/modern/global/arrow/arrow-lft.png
new file mode 100644
index 0000000000..1a09350721
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-lft.png
diff --git a/comm/suite/themes/modern/global/arrow/arrow-rit-dis.gif b/comm/suite/themes/modern/global/arrow/arrow-rit-dis.gif
new file mode 100644
index 0000000000..e53bd10e2d
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-rit-dis.gif
diff --git a/comm/suite/themes/modern/global/arrow/arrow-rit-dis.png b/comm/suite/themes/modern/global/arrow/arrow-rit-dis.png
new file mode 100644
index 0000000000..48074d503a
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-rit-dis.png
diff --git a/comm/suite/themes/modern/global/arrow/arrow-rit-sharp-end.gif b/comm/suite/themes/modern/global/arrow/arrow-rit-sharp-end.gif
new file mode 100644
index 0000000000..c1b3750d4c
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-rit-sharp-end.gif
diff --git a/comm/suite/themes/modern/global/arrow/arrow-rit-sharp-end.png b/comm/suite/themes/modern/global/arrow/arrow-rit-sharp-end.png
new file mode 100644
index 0000000000..0ced7e34af
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-rit-sharp-end.png
diff --git a/comm/suite/themes/modern/global/arrow/arrow-rit-sharp.gif b/comm/suite/themes/modern/global/arrow/arrow-rit-sharp.gif
new file mode 100644
index 0000000000..ca628ba69b
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-rit-sharp.gif
diff --git a/comm/suite/themes/modern/global/arrow/arrow-rit-sharp.png b/comm/suite/themes/modern/global/arrow/arrow-rit-sharp.png
new file mode 100644
index 0000000000..e662e73090
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-rit-sharp.png
diff --git a/comm/suite/themes/modern/global/arrow/arrow-rit.gif b/comm/suite/themes/modern/global/arrow/arrow-rit.gif
new file mode 100644
index 0000000000..fdbb09773b
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-rit.gif
diff --git a/comm/suite/themes/modern/global/arrow/arrow-rit.png b/comm/suite/themes/modern/global/arrow/arrow-rit.png
new file mode 100644
index 0000000000..299d40ed2d
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-rit.png
diff --git a/comm/suite/themes/modern/global/arrow/arrow-up-dis.gif b/comm/suite/themes/modern/global/arrow/arrow-up-dis.gif
new file mode 100644
index 0000000000..0484fe7d2a
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-up-dis.gif
diff --git a/comm/suite/themes/modern/global/arrow/arrow-up-dis.png b/comm/suite/themes/modern/global/arrow/arrow-up-dis.png
new file mode 100644
index 0000000000..dfee46b783
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-up-dis.png
diff --git a/comm/suite/themes/modern/global/arrow/arrow-up.gif b/comm/suite/themes/modern/global/arrow/arrow-up.gif
new file mode 100644
index 0000000000..bbba9d43dc
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-up.gif
diff --git a/comm/suite/themes/modern/global/arrow/arrow-up.png b/comm/suite/themes/modern/global/arrow/arrow-up.png
new file mode 100644
index 0000000000..76adae3649
--- /dev/null
+++ b/comm/suite/themes/modern/global/arrow/arrow-up.png
diff --git a/comm/suite/themes/modern/global/autocomplete.css b/comm/suite/themes/modern/global/autocomplete.css
new file mode 100644
index 0000000000..bbc747db4a
--- /dev/null
+++ b/comm/suite/themes/modern/global/autocomplete.css
@@ -0,0 +1,105 @@
+/* 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/. */
+
+/* ===== autocomplete.css =================================================
+  == Styles used by the autocomplete widget.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+/* ::::: autocomplete ::::: */
+
+textbox[type="autocomplete"] {
+  cursor: default !important;
+}
+
+textbox[nomatch="true"][highlightnonmatches="true"] {
+  color: #F00;
+}
+
+.textbox-input-box {
+  -moz-box-align: center;
+}
+
+/* ::::: history button ::::: */
+
+.autocomplete-history-dropmarker {
+  margin: 2px;
+  padding: 0;
+  border: none !important;
+  background-color: transparent !important;
+}
+
+.autocomplete-history-dropmarker[open="true"] {
+  margin-top: 3px;
+  margin-bottom: 1px;
+  margin-inline-start: 3px;
+  margin-inline-end: 1px;
+}
+
+/* ::::: autocomplete popups ::::: */
+
+panel[type="autocomplete"],
+panel[type="autocomplete-richlistbox"],
+.autocomplete-history-popup {
+  -moz-appearance: none;
+  border: 1px solid;
+  border-color: #6B747E;
+  background-color: #FFFFFF;
+}
+
+.autocomplete-history-popup {
+  max-height: 180px;
+}
+
+/* ::::: tree ::::: */
+
+.autocomplete-tree {
+  border: none;
+  background-color: transparent !important;
+}
+
+.autocomplete-treecol {
+  margin: 0px !important;
+  border: none !important;
+  padding: 0px !important;
+}
+
+.autocomplete-treebody::-moz-tree-cell-text {
+  padding-inline-start: 8px;
+  color: #000000;
+}
+
+.autocomplete-treebody::-moz-tree-row(selected) {
+  background-color: #9499AC;
+}
+
+.autocomplete-treebody::-moz-tree-cell-text(selected) {
+  color: #FFFFFF !important;
+}
+
+.autocomplete-treebody::-moz-tree-image(treecolAutoCompleteValue) {
+  max-width: 16px;
+  height: 16px;
+}
+
+/* ::::: richlistbox autocomplete ::::: */
+
+.autocomplete-richlistbox {
+  -moz-appearance: none;
+  margin: 0px !important;
+  border: none !important;
+  padding: 0px !important;
+}
+
+/* ::::: textboxes inside toolbarpaletteitems ::::: */
+
+toolbarpaletteitem > toolbaritem > textbox > hbox > hbox > html|*.textbox-input {
+  visibility: hidden;
+}
+
+toolbarpaletteitem > toolbaritem > * > textbox > hbox > hbox > html|*.textbox-input {
+  visibility: hidden;
+}
diff --git a/comm/suite/themes/modern/global/button.css b/comm/suite/themes/modern/global/button.css
new file mode 100644
index 0000000000..216791cc3e
--- /dev/null
+++ b/comm/suite/themes/modern/global/button.css
@@ -0,0 +1,127 @@
+/* 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/. */
+
+/* ===== button.css =====================================================
+  == Styles used by the XUL (and XHTML in netError.xhtml) button element.
+  ======================================================================= */
+
+/* :::::::::: button :::::::::: */
+
+button {
+  margin: 2px;
+  border: 1px solid;
+  padding: 3px;
+  border-color: #5F5F5F;
+  border-radius: 2px;
+  min-width: 6em;
+  background-color: #AAB6C4;
+  background-clip: padding-box;
+  color: #000000;
+  font: menu;
+}
+
+.button-icon {
+  margin-inline-start: 2px;
+}
+
+.button-text {
+  margin-top: 0px !important;
+  margin-bottom: 0px !important;
+  margin-inline-start: 4px !important;
+  margin-inline-end: 6px !important;
+  text-align: center;
+}
+
+/* .......... focused state .......... */
+
+button:focus {
+  border-color: #000000;
+}
+
+/* .......... active/open/checked state .......... */
+
+button:hover:active,
+button[checked="true"],
+button[open="true"] {
+  border-color: #000000;
+  background-color: #90A1B3;
+  color: #FFFFFF;
+}
+
+button:hover:active:focus,
+button[checked="true"]:focus,
+button[open="true"]:focus {
+  border: 2px solid;
+  border-color: #000000;
+}
+
+/* .......... disabled state .......... */
+
+button[disabled="true"] {
+  border-color: #8290A5 !important;
+  background-color: #B7BFCB !important;
+  color: #8C99AB !important;
+}
+  
+/* .......... default state .......... */
+
+button[default="true"] {
+  border-color: #000000;
+}
+
+button[default="true"]:hover:active {
+  border-color: #000000;
+  border-radius: 2px;
+}
+
+button[default="true"]:hover:active:focus {
+  border-color: #000000;
+}
+
+button[default="true"]:focus {
+  border-color: #000000;
+}
+
+/* ::::: menu/menu-button buttons ::::: */
+
+button[type="menu-button"] {
+  border: none;
+  background: transparent !important;
+}
+
+.button-menubutton-button {
+  margin: 0;
+}
+
+.button-menu-dropmarker,
+.button-menubutton-dropmarker {
+  margin: 1px;
+  background-color: transparent;
+  border: none;
+}
+  
+.button-menubutton-dropmarker[open="true"] {
+  margin-top: 2px;
+  margin-bottom: 0px;
+  margin-inline-start: 2px;
+  margin-inline-end: 0px;
+}
+
+/* ::::: plain buttons ::::: */
+
+button.plain,
+button.plain:hover,
+button.plain:hover:active
+{
+  margin: 0px;
+  border: none !important;
+  padding: 0px;
+}
+
+/* ::::: xhtml buttons ::::: */
+
+button::-moz-focus-inner {
+  padding: 0px;
+  border: 0px none;
+}
diff --git a/comm/suite/themes/modern/global/button/tbmbtn-arrow-act.gif b/comm/suite/themes/modern/global/button/tbmbtn-arrow-act.gif
new file mode 100644
index 0000000000..fadbe25025
--- /dev/null
+++ b/comm/suite/themes/modern/global/button/tbmbtn-arrow-act.gif
diff --git a/comm/suite/themes/modern/global/button/tbmbtn-arrow-act.png b/comm/suite/themes/modern/global/button/tbmbtn-arrow-act.png
new file mode 100644
index 0000000000..0cf89767ed
--- /dev/null
+++ b/comm/suite/themes/modern/global/button/tbmbtn-arrow-act.png
diff --git a/comm/suite/themes/modern/global/button/tbmbtn-arrow-hov.gif b/comm/suite/themes/modern/global/button/tbmbtn-arrow-hov.gif
new file mode 100644
index 0000000000..65d8d50c59
--- /dev/null
+++ b/comm/suite/themes/modern/global/button/tbmbtn-arrow-hov.gif
diff --git a/comm/suite/themes/modern/global/button/tbmbtn-arrow-hov.png b/comm/suite/themes/modern/global/button/tbmbtn-arrow-hov.png
new file mode 100644
index 0000000000..db21aa0524
--- /dev/null
+++ b/comm/suite/themes/modern/global/button/tbmbtn-arrow-hov.png
diff --git a/comm/suite/themes/modern/global/button/tbmbtn-arrow.gif b/comm/suite/themes/modern/global/button/tbmbtn-arrow.gif
new file mode 100644
index 0000000000..2f9e3ac67c
--- /dev/null
+++ b/comm/suite/themes/modern/global/button/tbmbtn-arrow.gif
diff --git a/comm/suite/themes/modern/global/button/tbmbtn-arrow.png b/comm/suite/themes/modern/global/button/tbmbtn-arrow.png
new file mode 100644
index 0000000000..2f7d89c498
--- /dev/null
+++ b/comm/suite/themes/modern/global/button/tbmbtn-arrow.png
diff --git a/comm/suite/themes/modern/global/button/tbmenu-arrow-act.gif b/comm/suite/themes/modern/global/button/tbmenu-arrow-act.gif
new file mode 100644
index 0000000000..6f1a8a0fb9
--- /dev/null
+++ b/comm/suite/themes/modern/global/button/tbmenu-arrow-act.gif
diff --git a/comm/suite/themes/modern/global/button/tbmenu-arrow-act.png b/comm/suite/themes/modern/global/button/tbmenu-arrow-act.png
new file mode 100644
index 0000000000..291f25a8ca
--- /dev/null
+++ b/comm/suite/themes/modern/global/button/tbmenu-arrow-act.png
diff --git a/comm/suite/themes/modern/global/button/tbmenu-arrow-dis.gif b/comm/suite/themes/modern/global/button/tbmenu-arrow-dis.gif
new file mode 100644
index 0000000000..ad7fdb61ca
--- /dev/null
+++ b/comm/suite/themes/modern/global/button/tbmenu-arrow-dis.gif
diff --git a/comm/suite/themes/modern/global/button/tbmenu-arrow-dis.png b/comm/suite/themes/modern/global/button/tbmenu-arrow-dis.png
new file mode 100644
index 0000000000..f490d05edb
--- /dev/null
+++ b/comm/suite/themes/modern/global/button/tbmenu-arrow-dis.png
diff --git a/comm/suite/themes/modern/global/button/tbmenu-arrow.gif b/comm/suite/themes/modern/global/button/tbmenu-arrow.gif
new file mode 100644
index 0000000000..1d8fbda3d7
--- /dev/null
+++ b/comm/suite/themes/modern/global/button/tbmenu-arrow.gif
diff --git a/comm/suite/themes/modern/global/button/tbmenu-arrow.png b/comm/suite/themes/modern/global/button/tbmenu-arrow.png
new file mode 100644
index 0000000000..d9f193db27
--- /dev/null
+++ b/comm/suite/themes/modern/global/button/tbmenu-arrow.png
diff --git a/comm/suite/themes/modern/global/checkbox.css b/comm/suite/themes/modern/global/checkbox.css
new file mode 100644
index 0000000000..b787096a9c
--- /dev/null
+++ b/comm/suite/themes/modern/global/checkbox.css
@@ -0,0 +1,69 @@
+/* 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/. */
+
+/* ===== checkbox.css ===================================================
+  == Styles used by the XUL checkbox element.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: checkbox ::::: */
+
+checkbox {
+  -moz-box-align: center;
+  margin: 0px 2px;
+  border: 2px solid transparent;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  padding-inline-start: 4px;
+  padding-inline-end: 2px;
+}
+
+.checkbox-icon {
+  margin-inline-start: 2px;
+}
+
+/* ..... focused state ..... */
+
+checkbox:focus {
+  border-color: #98A5B2;
+  border-radius: 4px 5px;
+}
+
+/* ..... disabled state ..... */
+
+checkbox[disabled="true"] > .checkbox-label-box > .checkbox-label {
+  color: #8C99AB !important;
+}
+
+/* ::::: checkmark image ::::: */
+
+.checkbox-check {
+  width: 13px;
+  height: 13px;
+  list-style-image: url("chrome://global/skin/checkbox/cbox.png");
+}
+  
+checkbox:hover:active > .checkbox-check {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-act.png");  
+}
+  
+.checkbox-check[disabled="true"] {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-dis.png") !important
+}
+
+/* ..... checked state ..... */
+
+.checkbox-check[checked="true"] {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check.png");
+}
+    
+checkbox:hover:active > .checkbox-check[checked="true"] {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-act-check.png");
+}
+
+.checkbox-check[checked="true"][disabled="true"] {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-dis-check.png") !important;
+}
+
diff --git a/comm/suite/themes/modern/global/checkbox/cbox-act-check.gif b/comm/suite/themes/modern/global/checkbox/cbox-act-check.gif
new file mode 100644
index 0000000000..1775859c91
--- /dev/null
+++ b/comm/suite/themes/modern/global/checkbox/cbox-act-check.gif
diff --git a/comm/suite/themes/modern/global/checkbox/cbox-act-check.png b/comm/suite/themes/modern/global/checkbox/cbox-act-check.png
new file mode 100644
index 0000000000..fc6c1b400e
--- /dev/null
+++ b/comm/suite/themes/modern/global/checkbox/cbox-act-check.png
diff --git a/comm/suite/themes/modern/global/checkbox/cbox-act.gif b/comm/suite/themes/modern/global/checkbox/cbox-act.gif
new file mode 100644
index 0000000000..f8a9e004ec
--- /dev/null
+++ b/comm/suite/themes/modern/global/checkbox/cbox-act.gif
diff --git a/comm/suite/themes/modern/global/checkbox/cbox-act.png b/comm/suite/themes/modern/global/checkbox/cbox-act.png
new file mode 100644
index 0000000000..712d7cd2d5
--- /dev/null
+++ b/comm/suite/themes/modern/global/checkbox/cbox-act.png
diff --git a/comm/suite/themes/modern/global/checkbox/cbox-check.gif b/comm/suite/themes/modern/global/checkbox/cbox-check.gif
new file mode 100644
index 0000000000..22f133bc5e
--- /dev/null
+++ b/comm/suite/themes/modern/global/checkbox/cbox-check.gif
diff --git a/comm/suite/themes/modern/global/checkbox/cbox-check.png b/comm/suite/themes/modern/global/checkbox/cbox-check.png
new file mode 100644
index 0000000000..7676c399e4
--- /dev/null
+++ b/comm/suite/themes/modern/global/checkbox/cbox-check.png
diff --git a/comm/suite/themes/modern/global/checkbox/cbox-dis-check.gif b/comm/suite/themes/modern/global/checkbox/cbox-dis-check.gif
new file mode 100644
index 0000000000..c34cf95d3c
--- /dev/null
+++ b/comm/suite/themes/modern/global/checkbox/cbox-dis-check.gif
diff --git a/comm/suite/themes/modern/global/checkbox/cbox-dis-check.png b/comm/suite/themes/modern/global/checkbox/cbox-dis-check.png
new file mode 100644
index 0000000000..4d71c80634
--- /dev/null
+++ b/comm/suite/themes/modern/global/checkbox/cbox-dis-check.png
diff --git a/comm/suite/themes/modern/global/checkbox/cbox-dis.gif b/comm/suite/themes/modern/global/checkbox/cbox-dis.gif
new file mode 100644
index 0000000000..52f3c2353f
--- /dev/null
+++ b/comm/suite/themes/modern/global/checkbox/cbox-dis.gif
diff --git a/comm/suite/themes/modern/global/checkbox/cbox-dis.png b/comm/suite/themes/modern/global/checkbox/cbox-dis.png
new file mode 100644
index 0000000000..b8ed5d3ddf
--- /dev/null
+++ b/comm/suite/themes/modern/global/checkbox/cbox-dis.png
diff --git a/comm/suite/themes/modern/global/checkbox/cbox.gif b/comm/suite/themes/modern/global/checkbox/cbox.gif
new file mode 100644
index 0000000000..5fecf79d03
--- /dev/null
+++ b/comm/suite/themes/modern/global/checkbox/cbox.gif
diff --git a/comm/suite/themes/modern/global/checkbox/cbox.png b/comm/suite/themes/modern/global/checkbox/cbox.png
new file mode 100644
index 0000000000..0c0355c438
--- /dev/null
+++ b/comm/suite/themes/modern/global/checkbox/cbox.png
diff --git a/comm/suite/themes/modern/global/colorpicker.css b/comm/suite/themes/modern/global/colorpicker.css
new file mode 100644
index 0000000000..28ccc2b30d
--- /dev/null
+++ b/comm/suite/themes/modern/global/colorpicker.css
@@ -0,0 +1,57 @@
+/* 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/. */
+
+/* ===== colorpicker.css ================================================
+  == Styles used by the XUL colorpicker element.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: colorpicker button ::::: */
+ 
+colorpicker[type="button"] {
+  width: 38px;
+  height: 24px;
+  border: 4px solid transparent;
+  background-color: #C7D0D9;
+  padding: 3px;
+}
+
+.colorpicker-button-colorbox {
+  border: 1px solid #000000;
+}
+
+colorpicker[type="button"][open="true"] {
+  border-color: #3B414F;
+  background-color: #A6B3C0;
+}
+
+colorpicker[type="button"]:focus {
+  border-color: #98A5B2;
+}
+
+colorpicker[type="button"][open="true"]:focus {
+  border-color: #98A5B2;
+}
+
+/* ::::: colorpicker tiles ::::: */
+
+.colorpickertile {
+  width: 20px;
+  height: 20px;
+  margin: 1px;
+  border: 1px inset #C7D0D9;
+}
+
+.colorpickertile[selected="true"] {
+  border: 2px outset #C0C0C0;
+}
+
+.colorpickertile[hover="true"] {
+  border: 2px dotted #FFFFFF;
+}
+
+.cp-light[hover="true"] {
+  border : 2px dotted #909090;
+}
diff --git a/comm/suite/themes/modern/global/config.css b/comm/suite/themes/modern/global/config.css
new file mode 100644
index 0000000000..c4864c7adb
--- /dev/null
+++ b/comm/suite/themes/modern/global/config.css
@@ -0,0 +1,72 @@
+/* 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/. */
+
+/* ===== config.css ==============================================
+   == Styles for about:config
+   ======================================================================= */
+
+@import url("chrome://global/skin/global.css");
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: warning screen ::::: */
+
+#warningScreen
+{
+  background-color: #FFF;
+}
+
+#warningBox
+{
+  background-color: #C7D0D9;
+  background-image: url("chrome://global/skin/icons/warning-48.png");
+  background-repeat: no-repeat;
+  background-position: 30px 3em;
+  color: #22262F;
+  border: 1px solid #494F5D;
+  border-radius: 10px;
+  padding: 3em;
+  padding-inline-start: 78px;
+  margin: 0 1em;
+}
+
+.title, .description
+{
+  max-width: 50em;
+  padding-inline-start: 3em;
+}
+
+#warningTitle
+{
+  margin: 0 0 .6em;
+  font-size: 160%;
+  border-bottom: 1px solid #7A8490;
+}
+
+#warningText
+{
+  font-size: 110%;
+  margin-inline-start: 0;
+}
+
+#warningButton
+{
+  margin-top: 0.6em;
+}
+
+#showWarningNextTime
+{
+  margin-top: 0.6em;
+}
+
+/* ::::: tree rows ::::: */
+
+treechildren::-moz-tree-cell-text(user)
+{
+  font-weight: bold;
+}
+
+treechildren::-moz-tree-cell-text(locked)
+{
+  font-style: italic;
+}
diff --git a/comm/suite/themes/modern/global/dialog.css b/comm/suite/themes/modern/global/dialog.css
new file mode 100644
index 0000000000..686f9fcf31
--- /dev/null
+++ b/comm/suite/themes/modern/global/dialog.css
@@ -0,0 +1,16 @@
+/* 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/. */
+
+/* ===== dialog.css =====================================================
+  == Styles used by the XUL dialog element.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: dialog ::::: */
+
+dialog { 
+  padding: 7px 5px 5px;
+}
+
diff --git a/comm/suite/themes/modern/global/dirListing/dirListing.css b/comm/suite/themes/modern/global/dirListing/dirListing.css
new file mode 100644
index 0000000000..2b7412f51d
--- /dev/null
+++ b/comm/suite/themes/modern/global/dirListing/dirListing.css
@@ -0,0 +1,107 @@
+/* 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/. */
+
+:root {
+  background-color: #FFF;
+  font: message-box;
+  padding-left: 2em;
+  padding-right: 2em;
+}
+
+body {
+  border: 1px solid #494F5D;
+  border-radius: 10px;
+  padding: 3em;
+  min-width: 30em;
+  max-width: 65em;
+  margin: 4em auto;
+  background-color: #C7D0D9;
+  color: #22262F;
+}
+
+h1 {
+  font-size: 160%;
+  margin: 0 0 .6em;
+  border-bottom: 1px solid #7A8490;
+  font-weight: normal;
+}
+
+a {
+  text-decoration: none;
+}
+
+a:hover {
+  text-decoration: underline;
+}
+
+p {
+  font-size: 110%;
+}
+
+#UI_goUp {
+  margin-top: 0;
+  float: left;
+}
+
+body[dir="rtl"] #UI_goUp {
+float: right;
+}
+
+#UI_showHidden {
+  margin-top: 0;
+  float: right;
+}
+
+#UI_showHidden:not(:hover) {
+  color: #8C99AB;
+}
+
+body[dir="rtl"] #UI_showHidden {
+  float: left;
+}
+
+table {
+  clear: both;
+  width: 90%;
+  margin: 0 auto;
+}
+
+thead {
+  font-size: 130%;
+}
+
+/* last modified */
+th:last-child {
+  text-align: center;
+}
+
+th:hover > a {
+  text-decoration: underline;
+}
+
+body > table > tbody > tr:hover {
+  outline: 1px solid #98A5B2;
+  -moz-outline-radius: .3em;
+}
+
+td:not(:first-child) {
+  width: 0;
+}
+
+.up {
+  padding: 0 .5em;
+  margin-inline-start: 24px;
+}
+
+.up::before {
+  margin-inline-end: 4px;
+  margin-inline-start: -24px;
+  vertical-align: middle;
+  content: url("chrome://global/skin/filepicker/folder-up.png");
+}
+
+.dir::before {
+  content: url("chrome://communicator/skin/places/bookmark-folder-closed.png");
+}
+
diff --git a/comm/suite/themes/modern/global/dropmarker.css b/comm/suite/themes/modern/global/dropmarker.css
new file mode 100644
index 0000000000..6a6c7c1c13
--- /dev/null
+++ b/comm/suite/themes/modern/global/dropmarker.css
@@ -0,0 +1,24 @@
+/* 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/. */
+
+dropmarker {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  border: 3px solid;
+  border-top-color: #BBC4D1;
+  border-right-color: #99A7B7;
+  border-bottom-color: #99A7B7;
+  border-left-color: #BBC4D1;
+  border-radius: 2px;
+  padding-top: 3px;
+  padding-bottom: 2px;
+  background-color: #A6B3C0;
+  list-style-image: url("chrome://global/skin/menulist/mlist-arrow.png");
+}
+
+dropmarker[disabled="true"] {
+  border-color: #727D8E !important;
+  background-color: #B7BFCB !important;
+  list-style-image: url("chrome://global/skin/menulist/mlist-dis-arrow.png") !important;
+}
diff --git a/comm/suite/themes/modern/global/filefield.css b/comm/suite/themes/modern/global/filefield.css
new file mode 100644
index 0000000000..4a7b05b63e
--- /dev/null
+++ b/comm/suite/themes/modern/global/filefield.css
@@ -0,0 +1,37 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* File Field Widget */
+filefield {
+  margin: 2px 4px;
+  border: 1px solid #5D616E;
+}
+
+.fileFieldContentBox {
+  background-color: #C7D0D9;
+}
+
+filefield[disabled="true"] {
+  border-color: #98A5B2;
+}
+
+.fileFieldIcon[disabled="true"] {
+ opacity: 0.4;
+}
+
+.fileFieldIcon {
+  width: 16px;
+  height: 16px;
+  margin-top: 1px;
+  margin-bottom: 1px;
+  margin-inline-start: 1px;
+  margin-inline-end: 4px;
+}
+
+.fileFieldLabel {
+  border: none;
+  margin: 0px;
+}
diff --git a/comm/suite/themes/modern/global/filepicker.css b/comm/suite/themes/modern/global/filepicker.css
new file mode 100644
index 0000000000..8faebdc84e
--- /dev/null
+++ b/comm/suite/themes/modern/global/filepicker.css
@@ -0,0 +1,59 @@
+/* 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/. */
+
+/* ===== filepicker.css =================================================
+  == Styles used by the File Picker dialog.
+  ======================================================================= */
+
+@import url("chrome://global/skin/global.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: column widths ::::: */
+
+#FilenameColumn,
+#ContentLengthColumn,
+#LastModifiedDateColumn {
+  width: 100px;
+}
+
+/* ::::: file/directory items ::::: */
+
+treechildren::-moz-tree-image(treecolAutoCompleteValue),
+treechildren::-moz-tree-image(FilenameColumn) {
+  margin-inline-end: 2px;
+}
+
+treechildren::-moz-tree-image(treecolAutoCompleteValue, directory),
+treechildren::-moz-tree-image(FilenameColumn, directory) {
+  list-style-image: url("chrome://global/skin/filepicker/dir-closed.png");
+}
+
+treechildren::-moz-tree-image(treecolAutoCompleteValue, file),
+treechildren::-moz-tree-image(FilenameColumn, file) {
+  list-style-image: url("chrome://global/skin/filepicker/blank.png");
+}
+
+/* ::::: button items ::::: */
+
+.up-button {
+  list-style-image: url("chrome://global/skin/filepicker/folder-up.png");
+  min-width: 0%; /* don't let XUL layout min-size override our max-width setting */
+  min-height: 0%;
+  max-width: 36px;
+}
+
+.home-button {
+  list-style-image: url("chrome://global/skin/filepicker/folder-home.png");
+  min-width: 0%; /* don't let XUL layout min-size override our max-width setting */
+  min-height: 0%;
+  max-width: 36px;
+}
+
+.new-dir-button {
+  list-style-image: url("chrome://global/skin/filepicker/folder-new.png");
+  min-width: 0%; /* don't let XUL layout min-size override our max-width setting */
+  min-height: 0%;
+  max-width: 36px;
+}
diff --git a/comm/suite/themes/modern/global/filepicker/blank.gif b/comm/suite/themes/modern/global/filepicker/blank.gif
new file mode 100644
index 0000000000..e9233162fc
--- /dev/null
+++ b/comm/suite/themes/modern/global/filepicker/blank.gif
diff --git a/comm/suite/themes/modern/global/filepicker/blank.png b/comm/suite/themes/modern/global/filepicker/blank.png
new file mode 100644
index 0000000000..39a5ea7a1f
--- /dev/null
+++ b/comm/suite/themes/modern/global/filepicker/blank.png
diff --git a/comm/suite/themes/modern/global/filepicker/dir-closed.gif b/comm/suite/themes/modern/global/filepicker/dir-closed.gif
new file mode 100644
index 0000000000..2487b6cfe6
--- /dev/null
+++ b/comm/suite/themes/modern/global/filepicker/dir-closed.gif
diff --git a/comm/suite/themes/modern/global/filepicker/dir-closed.png b/comm/suite/themes/modern/global/filepicker/dir-closed.png
new file mode 100644
index 0000000000..38cbc836ee
--- /dev/null
+++ b/comm/suite/themes/modern/global/filepicker/dir-closed.png
diff --git a/comm/suite/themes/modern/global/filepicker/dir-open.gif b/comm/suite/themes/modern/global/filepicker/dir-open.gif
new file mode 100644
index 0000000000..245a0002df
--- /dev/null
+++ b/comm/suite/themes/modern/global/filepicker/dir-open.gif
diff --git a/comm/suite/themes/modern/global/filepicker/dir-open.png b/comm/suite/themes/modern/global/filepicker/dir-open.png
new file mode 100644
index 0000000000..c923d5cff6
--- /dev/null
+++ b/comm/suite/themes/modern/global/filepicker/dir-open.png
diff --git a/comm/suite/themes/modern/global/filepicker/folder-home.gif b/comm/suite/themes/modern/global/filepicker/folder-home.gif
new file mode 100644
index 0000000000..bcc09c3254
--- /dev/null
+++ b/comm/suite/themes/modern/global/filepicker/folder-home.gif
diff --git a/comm/suite/themes/modern/global/filepicker/folder-home.png b/comm/suite/themes/modern/global/filepicker/folder-home.png
new file mode 100644
index 0000000000..cc722e2640
--- /dev/null
+++ b/comm/suite/themes/modern/global/filepicker/folder-home.png
diff --git a/comm/suite/themes/modern/global/filepicker/folder-new.gif b/comm/suite/themes/modern/global/filepicker/folder-new.gif
new file mode 100644
index 0000000000..c48f63af85
--- /dev/null
+++ b/comm/suite/themes/modern/global/filepicker/folder-new.gif
diff --git a/comm/suite/themes/modern/global/filepicker/folder-new.png b/comm/suite/themes/modern/global/filepicker/folder-new.png
new file mode 100644
index 0000000000..a3bcaa42eb
--- /dev/null
+++ b/comm/suite/themes/modern/global/filepicker/folder-new.png
diff --git a/comm/suite/themes/modern/global/filepicker/folder-up.gif b/comm/suite/themes/modern/global/filepicker/folder-up.gif
new file mode 100644
index 0000000000..8f622d1647
--- /dev/null
+++ b/comm/suite/themes/modern/global/filepicker/folder-up.gif
diff --git a/comm/suite/themes/modern/global/filepicker/folder-up.png b/comm/suite/themes/modern/global/filepicker/folder-up.png
new file mode 100644
index 0000000000..1b715959f7
--- /dev/null
+++ b/comm/suite/themes/modern/global/filepicker/folder-up.png
diff --git a/comm/suite/themes/modern/global/findBar.css b/comm/suite/themes/modern/global/findBar.css
new file mode 100644
index 0000000000..add2f5f2ba
--- /dev/null
+++ b/comm/suite/themes/modern/global/findBar.css
@@ -0,0 +1,98 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.findbar-closebutton {
+  list-style-image: url("chrome://global/skin/icons/close.png");
+  padding: 0 !important;
+  margin-top: 3px !important;
+  margin-bottom: 3px !important;
+  margin-inline-start: 6px !important;
+  margin-inline-end: 4px !important;
+  border: none;
+}
+
+.findbar-closebutton:hover {
+  list-style-image: url("chrome://global/skin/icons/close-hov.png");
+}
+
+.findbar-closebutton:hover:active {
+  list-style-image: url("chrome://global/skin/icons/close-act.png");
+}
+
+findbar {
+  min-width: 1px;
+  background-color: #C7D0D9;
+  border-top: 1px solid #EBF4FF;
+  border-right: 1px solid #95A0AD;
+  border-bottom: 1px solid #95A0AD;
+}
+
+/* find-next button */
+
+.findbar-find-next {
+  list-style-image: url("chrome://global/skin/icons/find.png");
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+.findbar-find-next[disabled="true"] {
+  -moz-image-region: rect(16px, 16px, 32px, 0px) !important;
+}
+
+/* find-previous button */
+
+.findbar-find-previous {
+  list-style-image: url("chrome://global/skin/icons/find.png");
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+.findbar-find-previous[disabled="true"] {
+  -moz-image-region: rect(16px, 32px, 32px, 16px) !important;
+}
+
+/* highlight button */
+
+.findbar-highlight {
+  list-style-image: url("chrome://global/skin/icons/find.png");
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+.findbar-highlight[disabled="true"] {
+  -moz-image-region: rect(16px, 48px, 32px, 32px) !important;
+}
+
+.findbar-highlight:hover:active {
+  -moz-image-region: rect(32px, 48px, 48px, 32px);
+}
+
+.findbar-highlight[checked="true"] {
+  -moz-image-region: rect(32px, 48px, 48px, 32px);
+}
+
+.find-status-icon {
+  list-style-image: none;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 8px;
+  margin-inline-end: 0;
+  width: 16px;
+  height: 16px;
+}
+
+.find-status-icon[status="notfound"] {
+  list-style-image: url("chrome://global/skin/icons/notfound.png");
+}
+
+.findbar-textbox[status="notfound"] {
+  background-color: #FFCCCC;
+}
+
+.findbar-textbox[flash="true"] {
+  background-color: #FFFF00;
+}
+
+.find-status-icon[status="wrapped"] {
+  list-style-image: url("chrome://global/skin/icons/wrap.png");
+}
diff --git a/comm/suite/themes/modern/global/global.css b/comm/suite/themes/modern/global/global.css
new file mode 100644
index 0000000000..2fe9344fc0
--- /dev/null
+++ b/comm/suite/themes/modern/global/global.css
@@ -0,0 +1,309 @@
+/* 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/. */
+
+/* ===== global.css =====================================================
+  == Styles that apply everywhere.
+  ======================================================================= */
+
+/* all localizable skin settings shall live here */
+@import url("chrome://global/locale/intl.css");
+@import url("chrome://global/skin/menu.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: XBL bindings ::::: */
+
+toolbarbutton[type="menu-button"] {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#toolbar-menu-button");
+}
+
+toolbarbutton.devtools-toolbarbutton[type="menu-button"] {
+  -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-button");
+}
+
+.menulist-compact {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#menulist-compact");
+}
+
+/* ::::: root elements ::::: */
+
+window, 
+page,
+dialog,
+wizard,
+prefwindow { 
+  background-color: #C7D0D9;
+  color: #000000;
+  font: message-box;
+}
+  
+[wait-cursor] { 
+  cursor: wait !important; 
+}
+
+/* deprecated */  
+window.dialog { 
+  padding: 7px 5px 5px;
+}
+
+/* ::::: alert icons :::::*/
+
+.message-icon {
+  width: 48px;
+  height: 48px;
+  list-style-image: url("chrome://global/skin/icons/information-48.png");
+}
+
+.alert-icon {
+  width: 48px;
+  height: 48px;
+  list-style-image: url("chrome://global/skin/icons/warning-48.png");
+}
+
+.error-icon {
+  width: 48px;
+  height: 48px;
+  list-style-image: url("chrome://global/skin/icons/error-48.png");
+}
+
+.question-icon {
+  width: 48px;
+  height: 48px;
+  list-style-image: url("chrome://global/skin/icons/question-48.png");
+}
+
+.authentication-icon {
+  width: 48px;
+  height: 48px;
+  list-style-image: url("chrome://global/skin/icons/authentication-48.png");
+}
+
+/* ::::: iframe ::::: */
+
+iframe {
+  border: none;
+  width: 100px;
+  height: 100px;
+  min-width: 10px;
+  min-height: 10px;
+}
+
+/* Override resizer.css for "normal" resizers */
+resizer {
+  background-color: transparent;
+}
+
+/* ::::: miscellaneous ::::: */
+
+.toolbar-focustarget {
+  -moz-user-focus: ignore !important;
+}
+
+description.error {
+  color: #FF0000;
+}
+/* :::::: autoscroll popup ::::: */
+
+.autoscroller {
+  height: 28px;
+  width: 28px;
+  border: none;
+  margin: -14px;
+  padding: 0;
+  background-image: url("chrome://global/skin/icons/autoscroll.png");
+  background-color: transparent;
+  -moz-appearance: none;
+  -moz-window-shadow: none;
+}
+
+.autoscroller[scrolldir="NS"] {
+  background-position: left center;
+}
+
+.autoscroller[scrolldir="EW"] {
+  background-position: left bottom;
+}
+
+.autoscroller[transparent="true"] {
+  background-position: center top;
+}
+
+.autoscroller[transparent="true"][scrolldir="NS"] {
+  background-position: center center;
+}
+
+.autoscroller[transparent="true"][scrolldir="EW"] {
+  background-position: center bottom;
+}
+
+.autoscroller[translucent="true"] {
+  background-position: right top;
+}
+
+.autoscroller[translucent="true"][scrolldir="NS"] {
+  background-position: right center;
+}
+
+.autoscroller[translucent="true"][scrolldir="EW"] {
+  background-position: right bottom;
+}
+
+/* :::::: Close button icons ::::: */
+
+.close-icon {
+  list-style-image: url("chrome://global/skin/icons/close.png");
+}
+
+.close-icon:hover {
+  list-style-image: url("chrome://global/skin/icons/close-hov.png");
+}
+
+.close-icon:hover:active {
+  list-style-image: url("chrome://global/skin/icons/close-act.png");
+}
+
+/* ===== taken from formatting.css ===== */
+
+/* ::::: inset areas ::::: */
+
+.inset {
+  border: 1px inset #C7D0D9;
+  margin: 0px 5px 5px 5px;
+}
+
+/* ::::: formatting ::::: */
+
+.outset {
+  border: 1px outset #C7D0D9;
+}
+
+/* ::::: separator rules ::::: */
+
+/* ..... standard separators ..... */
+
+separator, separator[orient="horizontal"] {
+  height: 1.5em;
+}
+
+separator[orient="vertical"] {
+  width: 1.5em;
+}
+
+/* ..... thinner separators ..... */
+
+separator.thin, separator.thin[orient="horizontal"] {
+  height: 0.5em;
+}
+
+separator.thin[orient="vertical"] {
+  width: 0.5em;
+}
+
+/* ..... groove separators ..... */
+
+separator.groove,
+separator.groove[orient="horizontal"] {
+  border-top: 1px solid #7A8490;
+  border-bottom: 1px solid #FEFEFE;
+  height: 0px;
+  margin-top: 0.4em;
+  margin-bottom: 0.4em;
+}
+
+separator.groove[orient="vertical"] {
+  border-left: 1px solid #7A8490;
+  border-right: 1px solid #FEFEFE;
+  margin: 0 .4em;
+}
+
+/* ..... thin groove separators ..... */
+
+separator.groove-thin {
+  border-top: 2px groove #D7D9E0;
+  height: 0px;
+}
+
+separator[orient="vertical"].groove-thin {
+  border-left: 2px groove #D7D9E0;
+}
+
+/* ::::: text formatting rules ::::: */
+
+/* ..... label (with margins) ..... */
+
+/* reduced margin for some UI */
+.small-margin {
+  margin: 1px 2px 1px 2px;
+}
+
+.plain {
+  margin: 0px !important;
+  border: none;
+  padding: 0px;
+}
+
+description, label {
+  cursor: default;
+}
+
+description {
+  margin: 1px 5px 4px 5px;
+}
+
+label {
+  margin: 1px 5px 2px 5px;
+}
+
+description[disabled="true"],
+label[disabled="true"] {
+  color: #8C99AB;
+}
+
+.tooltip-label {
+  margin: 0px;
+}
+
+.header {
+  font-weight: bold;
+}
+
+.monospace {
+  font-family: monospace;
+}
+
+.indent {
+  margin-inline-start: 20px;
+}
+
+.box-padded {
+  padding: 5px;
+}
+
+.spaced {
+  margin: 3px 5px 4px 5px;
+}
+
+/* class for text with a 'link' appearance */
+.text-link {
+  color: blue;
+  text-decoration: underline;
+}
+
+.text-link:focus {
+  color: red;
+  /* Don't specify the outline-color, we should always use initial value. */
+  outline: 1px dotted;
+}
+
+.text-link:hover {
+  cursor: pointer;
+}
+
+.text-link:hover:active {
+  color: red;
+}
+
+.text-link[visited="true"] {
+  color: purple;
+}
diff --git a/comm/suite/themes/modern/global/globalBindings.xml b/comm/suite/themes/modern/global/globalBindings.xml
new file mode 100644
index 0000000000..0e31150286
--- /dev/null
+++ b/comm/suite/themes/modern/global/globalBindings.xml
@@ -0,0 +1,70 @@
+<?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/. -->
+
+
+<bindings id="globalBindings"
+          xmlns="http://www.mozilla.org/xbl"
+          xmlns:html="http://www.w3.org/1999/xhtml"
+          xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
+          xmlns:xbl="http://www.mozilla.org/xbl">
+
+  <!-- :::/ widgets \ ::::::::::::::::::::::::::::::::::::::::::::::::::::: -->
+
+  <binding id="menulist-compact" display="xul:menu"
+           extends="chrome://global/content/bindings/menulist.xml#menulist">
+    <content sizetopopup="false">
+      <xul:dropmarker class="menulist-dropmarker" type="menu" xbl:inherits="disabled,open"/>
+      <xul:label class="menulist-label" xbl:inherits="value=label,crop,accesskey" crop="right" flex="1"/>
+      <children includes="menupopup"/>
+    </content>
+  </binding>
+
+  <binding id="toolbar-menu-button" display="xul:menu"
+           extends="chrome://global/content/bindings/toolbarbutton.xml#menu-button">
+    <content>
+      <children includes="observes|template|menupopup|tooltip"/>
+      <xul:stack class="box-inherit toolbarbutton-menubutton-stack" flex="1">
+        <xul:toolbarbutton class="box-inherit toolbarbutton-menubutton-button"
+             anonid="button" allowevents="true"
+             xbl:inherits="disabled,image,label,crop,accesskey,command,
+                           align,dir,pack,orient"/>
+        <xul:dropmarker type="menu-button" xbl:inherits="open,disabled"
+                        class="toolbarbutton-menubutton-dropmarker"/>
+      </xul:stack>
+    </content>
+  </binding>
+
+  <!-- :::/ mini scrollbar \ ::::::::::::::::::::::::::::::::::::::::::::::::: -->
+
+  <binding id="iframe-miniscroll" extends="chrome://global/content/bindings/general.xml#iframe">
+    <content usechromesheets="chrome://global/skin/scrollbars-mini.css"/>
+  </binding>
+
+  <binding id="browser-miniscroll" extends="chrome://global/content/bindings/browser.xml#browser">
+    <content usechromesheets="chrome://global/skin/scrollbars-mini.css"/>
+  </binding>
+
+  <binding id="scrollbar-mini" extends="chrome://global/content/bindings/scrollbar.xml#scrollbar">
+    <resources>
+      <stylesheet src="chrome://global/skin/scrollbars-mini.css"/>
+    </resources>
+  </binding>
+
+  <!-- :::/ misc scrollbar \ ::::::::::::::::::::::::::::::::::::::::::::::::: -->
+
+  <binding id="row-iconic" extends="xul:row">
+    <content>
+      <xul:hbox align="center">
+        <xul:image class="row-iconic-icon"/>
+        <children/>
+      </xul:hbox>
+    </content>
+  </binding>
+
+  <!-- Hack to prevent Add-ons Manager window transparency on Mac (bug 415934) -->
+
+  <binding id="unifiedWindow"/>
+
+</bindings>
diff --git a/comm/suite/themes/modern/global/groupbox.css b/comm/suite/themes/modern/global/groupbox.css
new file mode 100644
index 0000000000..41ae48c5bd
--- /dev/null
+++ b/comm/suite/themes/modern/global/groupbox.css
@@ -0,0 +1,27 @@
+/* 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/. */
+
+/* ===== groupbox.css ==================================================
+  == Styles used by the XUL groupbox and related elements.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: groupbox ::::: */
+
+groupbox {
+  margin: 5px;
+  border: 1px solid #858B97;
+  padding: 5px;
+}
+
+.groupbox-body {
+  padding: inherit;
+}
+
+caption {
+  margin: 0px 6px 2px;
+  padding: 0px 3px;
+  background-color: #C7D0D9; 
+}
diff --git a/comm/suite/themes/modern/global/icons/Error.png b/comm/suite/themes/modern/global/icons/Error.png
new file mode 100644
index 0000000000..512a1b010e
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/Error.png
diff --git a/comm/suite/themes/modern/global/icons/Question.png b/comm/suite/themes/modern/global/icons/Question.png
new file mode 100644
index 0000000000..19304ac5e6
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/Question.png
diff --git a/comm/suite/themes/modern/global/icons/authentication-48.png b/comm/suite/themes/modern/global/icons/authentication-48.png
new file mode 100644
index 0000000000..cfd1a7144f
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/authentication-48.png
diff --git a/comm/suite/themes/modern/global/icons/autoscroll.png b/comm/suite/themes/modern/global/icons/autoscroll.png
new file mode 100644
index 0000000000..95794f822f
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/autoscroll.png
diff --git a/comm/suite/themes/modern/global/icons/blacklist_favicon.png b/comm/suite/themes/modern/global/icons/blacklist_favicon.png
new file mode 100644
index 0000000000..c347fb36aa
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/blacklist_favicon.png
diff --git a/comm/suite/themes/modern/global/icons/blacklist_large.png b/comm/suite/themes/modern/global/icons/blacklist_large.png
new file mode 100644
index 0000000000..96ff341c0a
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/blacklist_large.png
diff --git a/comm/suite/themes/modern/global/icons/close-act.gif b/comm/suite/themes/modern/global/icons/close-act.gif
new file mode 100644
index 0000000000..3d2fc64d02
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/close-act.gif
diff --git a/comm/suite/themes/modern/global/icons/close-act.png b/comm/suite/themes/modern/global/icons/close-act.png
new file mode 100644
index 0000000000..a860ea07bd
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/close-act.png
diff --git a/comm/suite/themes/modern/global/icons/close-dis.gif b/comm/suite/themes/modern/global/icons/close-dis.gif
new file mode 100644
index 0000000000..42d0a09961
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/close-dis.gif
diff --git a/comm/suite/themes/modern/global/icons/close-dis.png b/comm/suite/themes/modern/global/icons/close-dis.png
new file mode 100644
index 0000000000..d79c92749c
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/close-dis.png
diff --git a/comm/suite/themes/modern/global/icons/close-hov.gif b/comm/suite/themes/modern/global/icons/close-hov.gif
new file mode 100644
index 0000000000..451d92d0c4
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/close-hov.gif
diff --git a/comm/suite/themes/modern/global/icons/close-hov.png b/comm/suite/themes/modern/global/icons/close-hov.png
new file mode 100644
index 0000000000..b5a7e6ed8f
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/close-hov.png
diff --git a/comm/suite/themes/modern/global/icons/close.gif b/comm/suite/themes/modern/global/icons/close.gif
new file mode 100644
index 0000000000..e0a4cff20c
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/close.gif
diff --git a/comm/suite/themes/modern/global/icons/close.png b/comm/suite/themes/modern/global/icons/close.png
new file mode 100644
index 0000000000..7055768b7d
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/close.png
diff --git a/comm/suite/themes/modern/global/icons/closebox.gif b/comm/suite/themes/modern/global/icons/closebox.gif
new file mode 100644
index 0000000000..da69691601
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/closebox.gif
diff --git a/comm/suite/themes/modern/global/icons/closebox.png b/comm/suite/themes/modern/global/icons/closebox.png
new file mode 100644
index 0000000000..609b18cf99
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/closebox.png
diff --git a/comm/suite/themes/modern/global/icons/error-16.png b/comm/suite/themes/modern/global/icons/error-16.png
new file mode 100644
index 0000000000..f2b01a13eb
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/error-16.png
diff --git a/comm/suite/themes/modern/global/icons/error-24.png b/comm/suite/themes/modern/global/icons/error-24.png
new file mode 100644
index 0000000000..6b81eb7933
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/error-24.png
diff --git a/comm/suite/themes/modern/global/icons/error-48.png b/comm/suite/themes/modern/global/icons/error-48.png
new file mode 100644
index 0000000000..a233945b0f
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/error-48.png
diff --git a/comm/suite/themes/modern/global/icons/error-64.png b/comm/suite/themes/modern/global/icons/error-64.png
new file mode 100644
index 0000000000..92c11533ee
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/error-64.png
diff --git a/comm/suite/themes/modern/global/icons/find.png b/comm/suite/themes/modern/global/icons/find.png
new file mode 100644
index 0000000000..4fb70d2766
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/find.png
diff --git a/comm/suite/themes/modern/global/icons/information-16.png b/comm/suite/themes/modern/global/icons/information-16.png
new file mode 100644
index 0000000000..dad31249ed
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/information-16.png
diff --git a/comm/suite/themes/modern/global/icons/information-24.png b/comm/suite/themes/modern/global/icons/information-24.png
new file mode 100644
index 0000000000..b8120e5be8
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/information-24.png
diff --git a/comm/suite/themes/modern/global/icons/information-32.png b/comm/suite/themes/modern/global/icons/information-32.png
new file mode 100644
index 0000000000..af7974c132
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/information-32.png
diff --git a/comm/suite/themes/modern/global/icons/information-48.png b/comm/suite/themes/modern/global/icons/information-48.png
new file mode 100644
index 0000000000..e8b6bd6468
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/information-48.png
diff --git a/comm/suite/themes/modern/global/icons/information-64.png b/comm/suite/themes/modern/global/icons/information-64.png
new file mode 100644
index 0000000000..bd1ead88c6
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/information-64.png
diff --git a/comm/suite/themes/modern/global/icons/notfound.png b/comm/suite/themes/modern/global/icons/notfound.png
new file mode 100644
index 0000000000..dad31249ed
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/notfound.png
diff --git a/comm/suite/themes/modern/global/icons/pg-landscape-small.gif b/comm/suite/themes/modern/global/icons/pg-landscape-small.gif
new file mode 100644
index 0000000000..96a9381049
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/pg-landscape-small.gif
diff --git a/comm/suite/themes/modern/global/icons/pg-landscape-small.png b/comm/suite/themes/modern/global/icons/pg-landscape-small.png
new file mode 100644
index 0000000000..b518415cae
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/pg-landscape-small.png
diff --git a/comm/suite/themes/modern/global/icons/pg-landscape.gif b/comm/suite/themes/modern/global/icons/pg-landscape.gif
new file mode 100644
index 0000000000..fe94aba114
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/pg-landscape.gif
diff --git a/comm/suite/themes/modern/global/icons/pg-landscape.png b/comm/suite/themes/modern/global/icons/pg-landscape.png
new file mode 100644
index 0000000000..cfd9c70732
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/pg-landscape.png
diff --git a/comm/suite/themes/modern/global/icons/pg-portrait-small.gif b/comm/suite/themes/modern/global/icons/pg-portrait-small.gif
new file mode 100644
index 0000000000..4fc6745bc8
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/pg-portrait-small.gif
diff --git a/comm/suite/themes/modern/global/icons/pg-portrait-small.png b/comm/suite/themes/modern/global/icons/pg-portrait-small.png
new file mode 100644
index 0000000000..141ba8f629
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/pg-portrait-small.png
diff --git a/comm/suite/themes/modern/global/icons/pg-portrait.gif b/comm/suite/themes/modern/global/icons/pg-portrait.gif
new file mode 100644
index 0000000000..01840302e2
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/pg-portrait.gif
diff --git a/comm/suite/themes/modern/global/icons/pg-portrait.png b/comm/suite/themes/modern/global/icons/pg-portrait.png
new file mode 100644
index 0000000000..8c47256c9e
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/pg-portrait.png
diff --git a/comm/suite/themes/modern/global/icons/question-16.png b/comm/suite/themes/modern/global/icons/question-16.png
new file mode 100644
index 0000000000..80ec9dd12f
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/question-16.png
diff --git a/comm/suite/themes/modern/global/icons/question-24.png b/comm/suite/themes/modern/global/icons/question-24.png
new file mode 100644
index 0000000000..151b244991
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/question-24.png
diff --git a/comm/suite/themes/modern/global/icons/question-48.png b/comm/suite/themes/modern/global/icons/question-48.png
new file mode 100644
index 0000000000..d055385dac
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/question-48.png
diff --git a/comm/suite/themes/modern/global/icons/question-64.png b/comm/suite/themes/modern/global/icons/question-64.png
new file mode 100644
index 0000000000..85ea0c8b5c
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/question-64.png
diff --git a/comm/suite/themes/modern/global/icons/resizer-rtl.png b/comm/suite/themes/modern/global/icons/resizer-rtl.png
new file mode 100644
index 0000000000..d6bb324401
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/resizer-rtl.png
diff --git a/comm/suite/themes/modern/global/icons/resizer.png b/comm/suite/themes/modern/global/icons/resizer.png
new file mode 100644
index 0000000000..d6841f9b1e
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/resizer.png
diff --git a/comm/suite/themes/modern/global/icons/search.gif b/comm/suite/themes/modern/global/icons/search.gif
new file mode 100644
index 0000000000..2b7b08dc26
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/search.gif
diff --git a/comm/suite/themes/modern/global/icons/search.png b/comm/suite/themes/modern/global/icons/search.png
new file mode 100644
index 0000000000..85f6bfb61f
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/search.png
diff --git a/comm/suite/themes/modern/global/icons/sslWarning.png b/comm/suite/themes/modern/global/icons/sslWarning.png
new file mode 100644
index 0000000000..09946986fe
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/sslWarning.png
diff --git a/comm/suite/themes/modern/global/icons/warning-16.png b/comm/suite/themes/modern/global/icons/warning-16.png
new file mode 100644
index 0000000000..cd6537c2ea
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/warning-16.png
diff --git a/comm/suite/themes/modern/global/icons/warning-24.png b/comm/suite/themes/modern/global/icons/warning-24.png
new file mode 100644
index 0000000000..c12a5c3de0
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/warning-24.png
diff --git a/comm/suite/themes/modern/global/icons/warning-32.png b/comm/suite/themes/modern/global/icons/warning-32.png
new file mode 100644
index 0000000000..d5a70bdbf0
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/warning-32.png
diff --git a/comm/suite/themes/modern/global/icons/warning-48.png b/comm/suite/themes/modern/global/icons/warning-48.png
new file mode 100644
index 0000000000..8c988cc5d5
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/warning-48.png
diff --git a/comm/suite/themes/modern/global/icons/warning-64.png b/comm/suite/themes/modern/global/icons/warning-64.png
new file mode 100644
index 0000000000..2208e9b58a
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/warning-64.png
diff --git a/comm/suite/themes/modern/global/icons/wrap.png b/comm/suite/themes/modern/global/icons/wrap.png
new file mode 100644
index 0000000000..c2043877ce
--- /dev/null
+++ b/comm/suite/themes/modern/global/icons/wrap.png
diff --git a/comm/suite/themes/modern/global/listbox.css b/comm/suite/themes/modern/global/listbox.css
new file mode 100644
index 0000000000..87cedcfe59
--- /dev/null
+++ b/comm/suite/themes/modern/global/listbox.css
@@ -0,0 +1,137 @@
+/* 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/. */
+
+/* ===== listbox.css =======================================================
+  == Styles used by XUL listbox-related elements.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: listbox ::::: */
+
+listbox {
+  margin: 2px 4px;
+  border: 1px solid #5D616E;
+  background-color: #FFFFFF;
+  color: #000000;
+}
+
+listbox[disabled="true"] {
+  color: #999999;
+}
+
+/* ::::: listitem ::::: */
+
+listitem {
+  border-top: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+}
+
+listbox:focus > listitem[current="true"] {
+  border-top-color: #000000;
+  border-bottom-color: #000000;
+}
+
+listitem[selected="true"] {
+  background-color: #C7D0D9;
+  color: #000000;
+}
+
+listbox:focus > listitem[selected="true"] {
+  background-color: #424F63;
+  color: #FFFFFF;
+}
+
+listcell {
+  padding-top: 0px;
+  padding-bottom: 1px;
+  padding-inline-start: 2px;
+  padding-inline-end: 0px;
+}
+
+/* ::::: listcell checkbox ::::: */
+
+.listcell-check {
+  margin: 0px 2px;
+  list-style-image: url("chrome://global/skin/checkbox/cbox.png");
+}
+
+.listcell-check[checked="true"] {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check.png");
+}
+
+.listcell-check[disabled="true"] {
+  border-color: #999999;
+  list-style-image: url("chrome://global/skin/checkbox/cbox-dis.png");
+}
+
+.listcell-check[disabled="true"][checked="true"] {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-dis-check.png");
+}
+
+/* ::::: listheader ::::: */
+
+listheader {
+  -moz-box-align: center;
+  border: 1px solid;
+  border-top-color: #C7D0D9;
+  border-right-color: #63676B;
+  border-bottom-color: #63676B;
+  border-left-color: #C7D0D9;
+  padding: 0 4px;
+  background-color: #C7D0D9;
+  color: #000000;
+}
+
+listheader[sortable="true"]:hover:active {
+  border-top: 1px solid #A5ABB0;
+  border-right: 1px solid #A5ABB0;
+  border-bottom: 1px solid #A5ABB0;
+  border-left: 1px solid #A5ABB0;
+  padding-top: 1px;
+  padding-bottom: 0px;
+  padding-inline-start: 5px;
+  padding-inline-end: 4px;
+}
+
+.listheader-icon {
+  margin-inline-end: 2px;
+}
+
+.listheader-label {
+  margin: 0px !important;
+}
+
+/* ..... sort direction icon ..... */
+
+.listheader-sortdirection {
+  list-style-image: none;
+}
+
+.listheader-sortdirection[sortDirection="ascending"] {
+  list-style-image: url("chrome://global/skin/tree/sort-asc.png");
+}
+
+.listheader-sortdirection[sortDirection="descending"] {
+  list-style-image: url("chrome://global/skin/tree/sort-dsc.png");
+}
+
+/* ::::: listcell ::::: */
+
+.listcell-label {
+  margin: 0px !important;
+  padding-top: 0px;
+  padding-bottom: 1px;
+  padding-inline-start: 4px;
+  padding-inline-end: 0px;
+  white-space: nowrap;
+}
+
+.listcell-icon {
+  margin-inline-end: 2px;
+}
+
+.listcell-label[disabled="true"] {
+  color: #999999;
+}
diff --git a/comm/suite/themes/modern/global/media/TopLevelImageDocument.css b/comm/suite/themes/modern/global/media/TopLevelImageDocument.css
new file mode 100644
index 0000000000..5242175161
--- /dev/null
+++ b/comm/suite/themes/modern/global/media/TopLevelImageDocument.css
@@ -0,0 +1,17 @@
+/* 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/. */
+
+@media not print {
+  /* N.B.: Remember to update ImageDocument.css in the tree or reftests may fail! */
+
+  body {
+    color: #eee;
+    background-image: url("chrome://global/skin/media/imagedoc-darknoise.png");
+  }
+
+  img.transparent {
+    background: hsl(0,0%,90%) url("chrome://global/skin/media/imagedoc-lightnoise.png");
+    color: #222;
+  }
+}
diff --git a/comm/suite/themes/modern/global/media/TopLevelVideoDocument.css b/comm/suite/themes/modern/global/media/TopLevelVideoDocument.css
new file mode 100644
index 0000000000..2d857ced2d
--- /dev/null
+++ b/comm/suite/themes/modern/global/media/TopLevelVideoDocument.css
@@ -0,0 +1,12 @@
+/* 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/. */
+
+body {
+  background-image: url("chrome://global/skin/media/imagedoc-darknoise.png");
+  background-color: rgb(33,33,33); /* Average color of that ^ image. */
+}
+
+video {
+  box-shadow: 0 0 5px rgba(0,0,0,0.6);
+}
diff --git a/comm/suite/themes/modern/global/media/closedCaptionButton.svg b/comm/suite/themes/modern/global/media/closedCaptionButton.svg
new file mode 100644
index 0000000000..0c55071956
--- /dev/null
+++ b/comm/suite/themes/modern/global/media/closedCaptionButton.svg
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18px" height="18px" viewBox="0 0 18 18">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #ffffff;
+    }
+    use[id$="-hover"] {
+      fill: #48a0f7;
+    }
+    use[id$="-active"] {
+      fill: #2d89e6;
+    }
+    use[id$="-focus"] {
+      fill: #48a0f7;
+    }
+    use[id$="-disabled"] {
+      fill: #ffffff;
+    }
+  </style>
+  <symbol id="cc-off-shape">
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M16.531,16.107H5.267l1.982-2H15c0.6,0,1-0.4,1-1V5.274
+      l1.946-1.964C17.963,3.399,18,3.483,18,3.576v11.031C18,15.407,17.331,16.107,16.531,16.107z M14.016,8.506h-1.218l1.005-1.014
+      C13.913,7.789,13.984,8.128,14.016,8.506z M11.786,12.361c-0.828,0-1.476-0.326-1.913-0.902l1.09-1.101
+      c0.136,0.323,0.374,0.541,0.796,0.541c0.514,0,0.695-0.44,0.756-1.014h1.535C13.908,11.43,13.071,12.361,11.786,12.361z
+       M1.496,16.106C0.697,16.104,0,15.406,0,14.607V3.576c0-0.8,0.7-1.5,1.5-1.5h12.846L16.299,0l1.316,1.283L2.615,17.13L1.496,16.106
+      z M3,4.107c-0.6,0-1,0.4-1,1v8c0,0.6,0.4,1,1,1h0.029l2.031-2.16c-0.757-0.503-1.191-1.457-1.191-2.744
+      c0-1.936,1.069-3.14,2.428-3.14c1.357,0,2.136,0.76,2.361,2.059l3.777-4.016H3z M8.298,8.506H7.355
+      c-0.047-0.623-0.49-1.23-0.99-1.23c-0.561,0-1.337,0.84-1.337,1.995c0,0.674,0.381,1.427,0.95,1.702L8.298,8.506z"/>
+  </symbol>
+
+  <symbol id="cc-shape">
+    <path d="M16.531,1.984H1.5c-0.8,0-1.5,0.7-1.5,1.5v11.031c0,0.8,0.7,1.5,1.5,1.5h15.031
+      c0.8,0,1.469-0.7,1.469-1.5V3.484C18,2.684,17.331,1.984,16.531,1.984z M16,13.016c0,0.6-0.4,1-1,1H3c-0.6,0-1-0.4-1-1v-8
+      c0-0.6,0.4-1,1-1h12c0.6,0,1,0.4,1,1V13.016z M6.426,10.807c-0.811,0-0.96-0.789-0.96-1.628c0-1.155,0.338-1.745,0.899-1.745
+      c0.5,0,0.818,0.357,0.866,0.98h1.484C8.585,6.877,7.785,5.972,6.297,5.972c-1.359,0-2.428,1.205-2.428,3.14
+      c0,1.944,0.974,3.157,2.583,3.157c1.285,0,2.153-0.93,2.295-2.476H7.244C7.183,10.367,6.94,10.807,6.426,10.807z M11.759,10.807
+      c-0.811,0-0.96-0.789-0.96-1.628c0-1.155,0.338-1.745,0.899-1.745c0.5,0,0.756,0.357,0.803,0.98h1.515
+      c-0.129-1.537-0.898-2.443-2.385-2.443c-1.359,0-2.396,1.205-2.396,3.14c0,1.944,0.943,3.157,2.552,3.157
+      c1.285,0,2.122-0.93,2.264-2.476h-1.535C12.454,10.367,12.273,10.807,11.759,10.807z"/>
+  </symbol>
+  <use id="cc" xlink:href="#cc-shape"/>
+  <use id="cc-hover" xlink:href="#cc-shape"/>
+  <use id="cc-active" xlink:href="#cc-shape"/>
+  <use id="cc-focus" xlink:href="#cc-shape"/>
+  <use id="cc-disabled" xlink:href="#cc-shape"/>
+
+  <use id="cc-off" xlink:href="#cc-off-shape"/>
+  <use id="cc-off-hover" xlink:href="#cc-off-shape"/>
+  <use id="cc-off-active" xlink:href="#cc-off-shape"/>
+  <use id="cc-off-focus" xlink:href="#cc-off-shape"/>
+  <use id="cc-off-disabled" xlink:href="#cc-off-shape"/>
+</svg>
diff --git a/comm/suite/themes/modern/global/media/error.png b/comm/suite/themes/modern/global/media/error.png
new file mode 100644
index 0000000000..30ee8eb0b3
--- /dev/null
+++ b/comm/suite/themes/modern/global/media/error.png
diff --git a/comm/suite/themes/modern/global/media/fullscreenButton.svg b/comm/suite/themes/modern/global/media/fullscreenButton.svg
new file mode 100644
index 0000000000..b39fa3407a
--- /dev/null
+++ b/comm/suite/themes/modern/global/media/fullscreenButton.svg
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18px" height="18px" viewBox="0 0 18 18">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #ffffff;
+    }
+    use[id$="-hover"] {
+      fill: #C7D0D9;
+    }
+    use[id$="-active"] {
+      fill: #6B7B8D;
+    }
+    use[id$="-focus"] {
+      fill: #C7D0D9;
+    }
+    use[id$="-disabled"] {
+      fill: #ffffff;
+    }
+  </style>
+  <symbol id="fullscreen-shape">
+    <path d="M6.728,10.188l-3.235,3.094l0.017-2.267l-1.513-0.016l0,5l4.987-0.008l0.011-1.537l-2.281-0.022
+  l3.097-3.158L6.728,10.188z M14.453,11.004l-0.022,2.281l-3.158-3.097l-1.086,1.083l3.094,3.235l-2.267-0.017l-0.016,1.514l5,0
+  l-0.008-4.988L14.453,11.004z M11.015,2.01l-0.011,1.537l2.281,0.022l-3.097,3.158l1.083,1.086l3.235-3.094L14.49,6.986
+  l1.513,0.016v-5L11.015,2.01z M6.986,3.511l0.016-1.514l-5,0L2.01,6.985l1.537,0.011l0.022-2.281l3.158,3.097l1.086-1.083
+  L4.718,3.494L6.986,3.511z"/>
+  </symbol>
+  <symbol id="unfullscreen-shape">
+    <path d="M2.047,11.135l-0.011,1.537l2.281,0.022L1.22,15.851l1.083,1.086l3.235-3.094l-0.017,2.268l1.513,0.016
+  l0-5L2.047,11.135z M13.781,12.587l2.267,0.017l0.016-1.514l-5,0l0.008,4.988l1.537,0.011l0.022-2.281l3.158,3.097l1.086-1.083
+  L13.781,12.587z M16.058,5.578l-2.281-0.021l3.097-3.158l-1.083-1.086l-3.235,3.094l0.017-2.267L11.06,2.123v5l4.988-0.008
+  L16.058,5.578z M5.516,2.098L5.494,4.379L2.336,1.283L1.25,2.365L4.344,5.6L2.077,5.583L2.06,7.097l5,0L7.053,2.109L5.516,2.098z"/>
+  </symbol>
+  <use id="fullscreen" xlink:href="#fullscreen-shape"/>
+  <use id="fullscreen-hover" xlink:href="#fullscreen-shape"/>
+  <use id="fullscreen-active" xlink:href="#fullscreen-shape"/>
+  <use id="fullscreen-focus" xlink:href="#fullscreen-shape"/>
+  <use id="fullscreen-disabled" xlink:href="#fullscreen-shape"/>
+
+  <use id="unfullscreen" xlink:href="#unfullscreen-shape"/>
+  <use id="unfullscreen-hover" xlink:href="#unfullscreen-shape"/>
+  <use id="unfullscreen-active" xlink:href="#unfullscreen-shape"/>
+  <use id="unfullscreen-focus" xlink:href="#unfullscreen-shape"/>
+  <use id="unfullscreen-disabled" xlink:href="#unfullscreen-shape"/>
+</svg>
diff --git a/comm/suite/themes/modern/global/media/imagedoc-darknoise.png b/comm/suite/themes/modern/global/media/imagedoc-darknoise.png
new file mode 100644
index 0000000000..5c33e24d4c
--- /dev/null
+++ b/comm/suite/themes/modern/global/media/imagedoc-darknoise.png
diff --git a/comm/suite/themes/modern/global/media/imagedoc-lightnoise.png b/comm/suite/themes/modern/global/media/imagedoc-lightnoise.png
new file mode 100644
index 0000000000..3467cf4d47
--- /dev/null
+++ b/comm/suite/themes/modern/global/media/imagedoc-lightnoise.png
diff --git a/comm/suite/themes/modern/global/media/muteButton.svg b/comm/suite/themes/modern/global/media/muteButton.svg
new file mode 100644
index 0000000000..0ac2ab9376
--- /dev/null
+++ b/comm/suite/themes/modern/global/media/muteButton.svg
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="18px" height="18px" viewBox="0 0 18 18">
+  <style>
+    use:not(:target) {
+      display: none;
+    }
+    use {
+      fill: #ffffff;
+    }
+    use[id$="-hover"] {
+      fill: #C7D0D9;
+    }
+    use[id$="-active"] {
+      fill: #6B7B8D;
+    }
+    use[id$="-focus"] {
+      fill: #C7D0D9;
+    }
+    use[id$="-disabled"] {
+      fill: #ffffff;
+    }
+  </style>
+  <symbol id="unmute-shape">
+    <path d="M3.52,5.367c-1.332,0-2.422,1.09-2.422,2.422v2.422c0,1.332,1.09,2.422,2.422,2.422h1.516l4.102,3.633
+    V1.735L5.035,5.367H3.52z M12.059,9c0-0.727-0.484-1.211-1.211-1.211v2.422C11.574,10.211,12.059,9.727,12.059,9z M14.48,9
+    c0-1.695-1.211-3.148-2.785-3.512l-0.363,1.09C12.422,6.82,13.27,7.789,13.27,9c0,1.211-0.848,2.18-1.938,2.422l0.484,1.09
+    C13.27,12.148,14.48,10.695,14.48,9z M12.543,3.188l-0.484,1.09C14.238,4.883,15.691,6.82,15.691,9c0,2.18-1.453,4.117-3.512,4.601
+    l0.484,1.09c2.422-0.605,4.238-2.906,4.238-5.691C16.902,6.215,15.086,3.914,12.543,3.188z"/>
+  </symbol>
+  <symbol id="mute-shape">
+    <path d="M3.52,5.367c-1.332,0-2.422,1.09-2.422,2.422v2.422c0,1.332,1.09,2.422,2.422,2.422h1.516l4.102,3.633
+      V1.735L5.035,5.367H3.52z"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M12.155,12.066l-1.138-1.138l4.872-4.872l1.138,1.138
+      L12.155,12.066z"/>
+    <path fill-rule="evenodd" clip-rule="evenodd" d="M10.998,7.204l1.138-1.138l4.872,4.872l-1.138,1.138L10.998,7.204
+      z"/>
+  </symbol>
+  <symbol id="noaudio-shape">
+    <path d="M14.901,3.571l-4.412,3.422V1.919L6.286,5.46H4.869c-1.298,0-2.36,1.062-2.36,2.36v2.36
+      c0,1.062,0.708,1.888,1.652,2.242l-2.242,1.77l1.18,1.416L16.081,4.987L14.901,3.571z M10.489,16.081V11.36l-2.669,2.36
+      L10.489,16.081z"/>
+  </symbol>
+  <use id="unmute" xlink:href="#unmute-shape"/>
+  <use id="unmute-hover" xlink:href="#unmute-shape"/>
+  <use id="unmute-active" xlink:href="#unmute-shape"/>
+  <use id="unmute-focus" xlink:href="#unmute-shape"/>
+  <use id="unmute-disabled" xlink:href="#unmute-shape"/>
+
+  <use id="mute" xlink:href="#mute-shape"/>
+  <use id="mute-hover" xlink:href="#mute-shape"/>
+  <use id="mute-active" xlink:href="#mute-shape"/>
+  <use id="mute-focus" xlink:href="#mute-shape"/>
+  <use id="mute-disabled" xlink:href="#mute-shape"/>
+
+  <use id="noaudio" xlink:href="#noaudio-shape"/>
+</svg>
diff --git a/comm/suite/themes/modern/global/media/pauseButton.svg b/comm/suite/themes/modern/global/media/pauseButton.svg
new file mode 100644
index 0000000000..dfc258194a
--- /dev/null
+++ b/comm/suite/themes/modern/global/media/pauseButton.svg
@@ -0,0 +1,6 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18px" height="18px" viewBox="0 0 18 18">
+  <path fill="context-fill" d="M6.002,1.953C5.172,1.953,4.5,2.626,4.5,3.455v11.08
+        c0,0.83,0.672,1.502,1.502,1.502c0.829,0,1.502-0.672,1.502-1.502V3.455C7.504,2.626,6.831,1.953,6.002,1.953z M12,1.953
+        c-0.828,0-1.5,0.672-1.5,1.5v11.094c0,0.828,0.672,1.5,1.5,1.5s1.5-0.672,1.5-1.5V3.453C13.5,2.625,12.828,1.953,12,1.953z"/>
+</svg>
+
diff --git a/comm/suite/themes/modern/global/media/playButton.svg b/comm/suite/themes/modern/global/media/playButton.svg
new file mode 100644
index 0000000000..ee8e482a2a
--- /dev/null
+++ b/comm/suite/themes/modern/global/media/playButton.svg
@@ -0,0 +1,5 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="18px" height="18px" viewBox="0 0 18 18">
+  <path fill="context-fill" d="M3.243,15.155c0,0.845,0.593,1.157,1.317,0.707l9.659-6.041c0.727-0.453,0.722-1.193,0-1.645L4.556,2.137
+    C3.827,1.682,3.237,2.014,3.237,2.844v12.312H3.243z"/>
+</svg>
+
diff --git a/comm/suite/themes/modern/global/media/stalled.png b/comm/suite/themes/modern/global/media/stalled.png
new file mode 100644
index 0000000000..525375889b
--- /dev/null
+++ b/comm/suite/themes/modern/global/media/stalled.png
diff --git a/comm/suite/themes/modern/global/media/throbber.png b/comm/suite/themes/modern/global/media/throbber.png
new file mode 100644
index 0000000000..1c8fe0f5cb
--- /dev/null
+++ b/comm/suite/themes/modern/global/media/throbber.png
diff --git a/comm/suite/themes/modern/global/media/videocontrols.css b/comm/suite/themes/modern/global/media/videocontrols.css
new file mode 100644
index 0000000000..43e8e1d236
--- /dev/null
+++ b/comm/suite/themes/modern/global/media/videocontrols.css
@@ -0,0 +1,482 @@
+/* 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/. */
+
+@namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace url("http://www.w3.org/1999/xhtml");
+
+video > xul|videocontrols,
+audio > xul|videocontrols {
+  writing-mode: horizontal-tb;
+  width: 100%;
+  height: 100%;
+  display: inline-block;
+}
+
+.controlsContainer [hidden="true"],
+.controlBar[hidden] {
+  display: none;
+}
+
+.controlBar[size="hidden"] {
+  display: none;
+}
+
+.controlsSpacer[hideCursor] {
+  cursor: none;
+}
+
+.controlsContainer,
+.progressContainer {
+  position: relative;
+  height: 100%;
+}
+
+.stackItem {
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  width: 100%;
+  height: 100%;
+}
+
+.statusOverlay {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  background-color: rgb(80,80,80, .85);
+}
+
+.controlsOverlay {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  position: relative;
+}
+
+.controlsSpacerStack {
+  display: flex;
+  flex-direction: column;
+  flex-grow: 1;
+  justify-content: center;
+  align-items: center;
+}
+
+.controlsSpacer {
+  background-color: rgba(255,255,255,.4);
+}
+
+.controlBar {
+  position: relative;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  overflow: hidden;
+  height: 40px;
+  padding: 0 9px;
+  background-color: #A5B3C0;
+  border-style: solid;
+  border-width: 2px;
+  border-color: #000000;
+  border-radius: 5px;
+}
+
+.playButton,
+.muteButton,
+.closedCaptionButton,
+.fullscreenButton {
+  -moz-binding: none;
+  height: 100%;
+  min-height: 30px;
+  min-width: 30px;
+  padding: 6px;
+  border: 0;
+  margin: 0;
+  background-color: transparent;
+  background-repeat: no-repeat;
+  background-position: center;
+  background-origin: content-box;
+  background-clip: content-box;
+}
+
+.playButton {
+  background-image: url(chrome://global/skin/media/pauseButton.svg);
+  -moz-context-properties: fill;
+  fill: #ffffff;
+}
+.playButton:hover {
+  fill: #C7D0D9;
+}
+.playButton:hover:active {
+  fill: #6B7B8D;
+}
+.playButton[paused] {
+  background-image: url(chrome://global/skin/media/playButton.svg);
+  -moz-context-properties: fill;
+  fill: #ffffff;
+}
+.playButton[paused]:hover {
+  fill: #C7D0D9;
+}
+.playButton[paused]:hover:active {
+  fill: #6B7B8D;
+}
+
+.muteButton {
+  background-image: url(chrome://global/skin/media/muteButton.svg#unmute);
+}
+.muteButton:hover {
+  background-image: url(chrome://global/skin/media/muteButton.svg#unmute-hover);
+}
+.muteButton:hover:active {
+  background-image: url(chrome://global/skin/media/muteButton.svg#unmute-active);
+}
+.muteButton[muted] {
+  background-image: url(chrome://global/skin/media/muteButton.svg#mute);
+}
+.muteButton[muted]:hover {
+  background-image: url(chrome://global/skin/media/muteButton.svg#mute-hover);
+}
+.muteButton[muted]:hover:active {
+  background-image: url(chrome://global/skin/media/muteButton.svg#mute-active);
+}
+.muteButton[noAudio],
+.muteButton[noAudio]:hover,
+.muteButton[noAudio]:hover:active {
+  background-image: url(chrome://global/skin/media/muteButton.svg#noaudio);
+}
+.muteButton[noAudio] + .volumeStack {
+  display: none;
+}
+
+.closedCaptionButton {
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-off);
+}
+.closedCaptionButton:hover {
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-off-hover);
+}
+.closedCaptionButton:hover:active {
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-off-active);
+}
+.closedCaptionButton[enabled] {
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc);
+}
+.closedCaptionButton[enabled]:hover {
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-hover);
+}
+.closedCaptionButton[enabled]:hover:active {
+  background-image: url(chrome://global/skin/media/closedCaptionButton.svg#cc-active);
+}
+
+.fullscreenButton {
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#fullscreen);
+}
+.fullscreenButton:hover {
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#fullscreen-hover);
+}
+.fullscreenButton:hover:active {
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#fullscreen-active);
+}
+.fullscreenButton[fullscreened] {
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#unfullscreen);
+}
+.fullscreenButton[fullscreened]:hover {
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#unfullscreen-hover);
+}
+.fullscreenButton[fullscreened]:hover:active {
+  background-image: url(chrome://global/skin/media/fullscreenButton.svg#unfullscreen-active);
+}
+
+.controlBarSpacer {
+  flex-grow: 1;
+}
+
+.volumeControl::-moz-range-thumb,
+.scrubber::-moz-range-thumb {
+  height: 13px;
+  width: 13px;
+  border-style: solid;
+  border-color: #000000;
+  border-radius: 50%;
+  background-color: #ffffff;
+}
+
+.volumeControl::-moz-focus-outer,
+.scrubber::-moz-focus-outer {
+  border: 0;
+}
+
+.progressBackgroundBar {
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+}
+
+.progressStack {
+  position: relative;
+  width: 100%;
+  height: 5px;
+}
+
+.scrubberStack {
+  min-width: 48px;
+  flex-basis: 48px;
+  flex-grow: 2;
+  flex-shrink: 0;
+  margin: 0 9px;
+}
+
+.volumeStack {
+  max-width: 60px;
+  min-width: 48px;
+  flex-grow: 1;
+  flex-shrink: 0;
+  margin-right: 6px;
+  margin-left: 4px;
+}
+
+.bufferBar,
+.progressBar,
+.scrubber,
+.volumeBackground,
+.volumeControl {
+  bottom: 0;
+  left: 0;
+  position: absolute;
+  width: 100%;
+  height: 100%;
+  padding: 0;
+  border: 0;
+  border-radius: 2.5px;
+  margin: 0;
+  background: none;
+  background-color: transparent;
+}
+
+.bufferBar,
+.volumeBackground {
+  background-color: rgba(0,0,0,0.7);
+}
+
+.bufferBar::-moz-progress-bar,
+.progressBar::-moz-progress-bar,
+.volumeBackground::-moz-meter-bar {
+  height: 100%;
+  padding: 0;
+  margin: 0;
+  border: 0;
+  border-radius: 2.5px;
+  background: none;
+}
+
+.scrubber:hover::-moz-range-thumb,
+.volumeControl:hover::-moz-range-thumb {
+  background-color: #C7D0D9;
+}
+
+.scrubber:active::-moz-range-thumb,
+.volumeControl:active::-moz-range-thumb {
+  background-color: #6B7B8D;
+}
+
+.scrubber::-moz-range-track,
+.scrubber::-moz-range-progress {
+  background-color: transparent;
+}
+
+.volumeControl::-moz-range-progress,
+.volumeControl::-moz-range-track {
+  height: 5px;
+  border-radius: 2.5px;
+}
+
+.volumeControl::-moz-range-progress {
+  background-color: #ffffff;
+}
+
+.volumeControl::-moz-range-track {
+  background-color: rgba(0,0,0,0.7);
+}
+
+
+.bufferBar::-moz-progress-bar {
+  background-color: rgba(255,255,255,0.3);
+  border-radius: 2.5px;
+}
+
+.progressBar::-moz-progress-bar {
+  background-color: #C7D0D9;
+}
+
+.textTrackList {
+  position: absolute;
+  right: 5px;
+  bottom: 45px;
+  max-width: 80%;
+  border: 1px solid #000000;
+  border-radius: 2.5px;
+  padding: 5px 0;
+  vertical-align: middle;
+  font-size: 12px;
+  background-color: #000000;
+  opacity: 0.7;
+}
+
+.textTrackList > .textTrackItem {
+  display: block;
+  width: 100%;
+  height: 30px;
+  padding: 2px 10px;
+  border: none;
+  margin: 0;
+  white-space: nowrap;
+  overflow: hidden;
+  text-align: left;
+  text-overflow: ellipsis;
+  color: #ffffff;
+  background-color: transparent;
+}
+
+.textTrackList > .textTrackItem:hover {
+  background-color: #444444;
+}
+
+.textTrackList > .textTrackItem[on] {
+  color: #C7D0D9;
+}
+
+.positionLabel,
+.durationLabel {
+  display: none;
+}
+
+.positionDurationBox {
+  text-align: center;
+  padding-inline-start: 1px;
+  padding-inline-end: 9px;
+  white-space: nowrap;
+  font: message-box;
+  font-size: 13px;
+  font-size-adjust: 0.55;
+  color: #ffffff;
+}
+
+.duration {
+  display: inline-block;
+  white-space: pre;
+  color: #404040;
+}
+
+.statusIcon {
+  width: 36px;
+  height: 36px;
+  margin-bottom: 20px;
+}
+
+.statusIcon[type="throbber"] {
+  background: url(chrome://global/skin/media/throbber.png) no-repeat center;
+}
+
+.statusIcon[type="throbber"][stalled] {
+  background: url(chrome://global/skin/media/stalled.png) no-repeat center;
+}
+
+.statusIcon[type="error"] {
+  min-width: 70px;
+  min-height: 60px;
+  background: url(chrome://global/skin/media/error.png) no-repeat center;
+  background-size: contain;
+}
+
+/* Overlay Play button */
+.clickToPlay {
+  min-width: 48px;
+  min-height: 48px;
+  border-radius: 50%;
+  background-image: url(chrome://global/skin/media/playButton.svg);
+  background-repeat: no-repeat;
+  background-position: 54% 50%;
+  background-size: 40% 40%;
+  background-color: #1a1a1a;
+  -moz-context-properties: fill;
+  fill: #ffffff;
+  opacity: 0.8;
+  position: relative;
+  top: 20px;
+}
+
+.controlsSpacerStack:hover > .clickToPlay,
+.clickToPlay:hover {
+  opacity: 0.55;
+}
+
+.controlsSpacerStack:hover > .clickToPlay[fadeout] {
+  opacity: 0;
+}
+
+.controlBar[fullscreen-unavailable] .fullscreenButton {
+  display: none;
+}
+
+/* CSS Transitions */
+.clickToPlay {
+  transition-property: transform, opacity;
+  transition-duration: 400ms, 400ms;
+}
+
+.controlsSpacer[fadeout] {
+  opacity: 0;
+}
+
+.clickToPlay[fadeout] {
+  transform: scale(3);
+  opacity: 0;
+}
+
+.clickToPlay[fadeout][immediate] {
+  transition-property: opacity, background-size;
+  transition-duration: 0s, 0s;
+}
+.controlBar:not([immediate]) {
+  transition-property: opacity;
+  transition-duration: 200ms;
+}
+.controlBar[fadeout] {
+  opacity: 0;
+}
+.volumeStack:not([immediate]) {
+  transition-property: opacity, margin-top;
+  transition-duration: 200ms, 200ms;
+}
+.statusOverlay:not([immediate]) {
+  transition-property: opacity;
+  transition-duration: 300ms;
+  transition-delay: 750ms;
+}
+.statusOverlay[fadeout] {
+  opacity: 0;
+}
+
+/* Error description formatting */
+.errorLabel {
+  padding: 0 10px;
+  text-align: center;
+  font: message-box;
+  font-size: 14px;
+  color: #ffffff;
+}
+
+.errorLabel {
+  display: none;
+}
+
+[error="errorAborted"]         > [anonid="errorAborted"],
+[error="errorNetwork"]         > [anonid="errorNetwork"],
+[error="errorDecode"]          > [anonid="errorDecode"],
+[error="errorSrcNotSupported"] > [anonid="errorSrcNotSupported"],
+[error="errorNoSource"]        > [anonid="errorNoSource"],
+[error="errorGeneric"]         > [anonid="errorGeneric"] {
+  display: inline;
+}
diff --git a/comm/suite/themes/modern/global/menu.css b/comm/suite/themes/modern/global/menu.css
new file mode 100644
index 0000000000..5d2df75295
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu.css
@@ -0,0 +1,233 @@
+/* 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/. */
+
+/* ===== menu.css =======================================================
+  == Styles used by XUL menu-related elements.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: menu/menuitem ::::: */
+
+menu, 
+menuitem {
+  -moz-box-align: center;
+  color: #000000;
+  font: menu;
+  list-style-image: none;
+  -moz-image-region: auto;
+}
+
+menuitem[default="true"] {
+  font-weight: bold;
+}  
+  
+menu[disabled="true"],
+menuitem[disabled="true"],
+menu[_moz-menuactive="true"][disabled="true"],
+menuitem[_moz-menuactive="true"][disabled="true"] {
+  color: #8C99AB;
+}
+
+/* ..... internal content .... */
+
+.menu-text, 
+.menu-iconic-left,
+.menu-iconic-text {
+  margin-top: 0px !important;
+  margin-bottom: 0px !important;
+  margin-inline-start: 0px !important;
+  margin-inline-end: 2px !important;
+  color: inherit;
+}
+
+.menu-text {
+  margin-inline-start: 18px !important;
+  font-weight: inherit;
+}
+
+.menu-description {
+  font-style: italic;
+  color: #8C99AB;
+  margin-inline-start: 1ex !important;
+}
+
+.menu-accel,
+.menu-iconic-accel {
+  margin-top: 0px !important;
+  margin-bottom: 0px !important;
+  margin-inline-start: 7px !important;
+  margin-inline-end: 2px !important;
+  padding-inline-end: 14px;
+  color: inherit;
+}
+
+.menu-iconic-icon {
+  width: 16px;
+  height: 16px;
+  list-style-image: inherit;
+}
+
+/* ..... menu arrow box ..... */
+
+.menu-right {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-inline-start: 6px;
+  margin-inline-end: 4px;
+  width: 4px;
+  list-style-image: url("chrome://global/skin/menu/menu-arrow.png");
+  -moz-image-region: auto;
+}
+
+.menu-right[_moz-menuactive="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-arrow-hov.png");
+  -moz-image-region: auto;
+}
+
+.menu-right[disabled="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-arrow-dis.png") !important;
+  -moz-image-region: auto;
+}
+
+/* ::::: menu/menuitems in menubar ::::: */
+
+menubar > menu {
+  border: 1px solid transparent;
+  padding: 1px 4px 2px;
+  margin: 1px 0px;
+}
+
+menubar > menu[_moz-menuactive="true"] {
+  border: 1px outset #DDE3EB;
+  background-color: transparent;
+  color: #000000;
+}
+
+menubar > menu[_moz-menuactive="true"][open="true"] {
+  border-style: inset;
+}
+
+/* ..... internal content .... */
+
+.menubar-left {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-inline-start: 0px;
+  margin-inline-end: 2px;
+  color: inherit;
+}
+
+.menubar-text {
+  margin-top: 0px !important;
+  margin-bottom: 0px !important;
+  margin-inline-start: 0px !important;
+  margin-inline-end: 2px !important;
+  color: inherit;
+}
+
+/* ::::: menu/menuitems in popups ::::: */
+
+menu,
+menuitem {
+  padding: 2px;
+  max-width: 42em;
+}
+
+menu[_moz-menuactive="true"],
+menuitem[_moz-menuactive="true"] {
+  background-color: #424F63;
+  color: #FFFFFF;
+}
+
+/* ::::: menu/menuitems in menulist popups ::::: */
+
+.menulist-menupopup > menuitem,
+menulist > menupopup > menuitem,
+.menulist-menupopup > menu,
+menulist > menupopup > menu {
+  padding-top: 1px;
+  padding-bottom: 1px;
+  max-width: none;
+  font: message-box;
+}
+
+menulist > menupopup > menuitem {
+  padding-inline-end: 30px;
+}
+    
+/* ..... selected state ..... */
+
+menulist > menupopup > menuitem[selected="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-check.png");
+  -moz-image-region: auto;
+}
+  
+menulist > menupopup > menuitem[_moz-menuactive="true"][selected="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-check-hov.png");
+  -moz-image-region: auto;
+}
+
+/* ::::: checkbox menuitem ::::: */
+
+menuitem[checked="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-check.png");
+  -moz-image-region: auto;
+}
+
+menuitem[checked="true"][disabled="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-check-dis.png");
+  -moz-image-region: auto;
+}
+
+menuitem[checked="true"][_moz-menuactive="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-check-hov.png");
+  -moz-image-region: auto;
+}
+
+/* ::::: radio menuitem ::::: */
+
+menuitem[checked="true"][type="radio"] {
+  list-style-image: url("chrome://global/skin/menu/menu-radio.png");
+  -moz-image-region: auto;
+}
+
+menuitem[checked="true"][type="radio"][disabled="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-radio-dis.png");
+  -moz-image-region: auto;
+}
+
+menuitem[checked="true"][type="radio"][_moz-menuactive="true"] {
+  list-style-image: url("chrome://global/skin/menu/menu-radio-hov.png");
+  -moz-image-region: auto;
+}
+
+/* ::::: menuseparator ::::: */
+
+menuseparator {
+  margin: 2px 3px;
+  border-top: 1px solid #A5ABC0;
+  border-bottom: 1px solid #EEF1F7;
+}
+
+menulist > menupopup > menuseparator,
+.menulist-menupopup > menuseparator {
+  margin: 2px 0;
+  border-bottom: none;
+}
+
+/* ::::: autocomplete ::::: */
+
+.autocomplete-history-popup > menuitem {
+  max-width: none !important;
+  font: message-box;
+}
+
+/* ::::: tree column picker ::::: */
+
+.treecell-popupcell-menu {
+  margin-inline-start: -2px;
+  list-style-image: url("chrome://global/skin/tree/columnpicker.png");
+  -moz-image-region: auto;
+}
diff --git a/comm/suite/themes/modern/global/menu/menu-arrow-dis.gif b/comm/suite/themes/modern/global/menu/menu-arrow-dis.gif
new file mode 100644
index 0000000000..99860477e4
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-arrow-dis.gif
diff --git a/comm/suite/themes/modern/global/menu/menu-arrow-dis.png b/comm/suite/themes/modern/global/menu/menu-arrow-dis.png
new file mode 100644
index 0000000000..ea3aef3c50
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-arrow-dis.png
diff --git a/comm/suite/themes/modern/global/menu/menu-arrow-hov.gif b/comm/suite/themes/modern/global/menu/menu-arrow-hov.gif
new file mode 100644
index 0000000000..22a82a66d5
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-arrow-hov.gif
diff --git a/comm/suite/themes/modern/global/menu/menu-arrow-hov.png b/comm/suite/themes/modern/global/menu/menu-arrow-hov.png
new file mode 100644
index 0000000000..a572a4bb96
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-arrow-hov.png
diff --git a/comm/suite/themes/modern/global/menu/menu-arrow.gif b/comm/suite/themes/modern/global/menu/menu-arrow.gif
new file mode 100644
index 0000000000..921ae65b69
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-arrow.gif
diff --git a/comm/suite/themes/modern/global/menu/menu-arrow.png b/comm/suite/themes/modern/global/menu/menu-arrow.png
new file mode 100644
index 0000000000..0be772e464
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-arrow.png
diff --git a/comm/suite/themes/modern/global/menu/menu-check-dis.gif b/comm/suite/themes/modern/global/menu/menu-check-dis.gif
new file mode 100644
index 0000000000..ddd8ecdc35
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-check-dis.gif
diff --git a/comm/suite/themes/modern/global/menu/menu-check-dis.png b/comm/suite/themes/modern/global/menu/menu-check-dis.png
new file mode 100644
index 0000000000..46a6b8526a
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-check-dis.png
diff --git a/comm/suite/themes/modern/global/menu/menu-check-hov.gif b/comm/suite/themes/modern/global/menu/menu-check-hov.gif
new file mode 100644
index 0000000000..03e7e12790
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-check-hov.gif
diff --git a/comm/suite/themes/modern/global/menu/menu-check-hov.png b/comm/suite/themes/modern/global/menu/menu-check-hov.png
new file mode 100644
index 0000000000..e7bda1cec3
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-check-hov.png
diff --git a/comm/suite/themes/modern/global/menu/menu-check.gif b/comm/suite/themes/modern/global/menu/menu-check.gif
new file mode 100644
index 0000000000..ddd8ecdc35
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-check.gif
diff --git a/comm/suite/themes/modern/global/menu/menu-check.png b/comm/suite/themes/modern/global/menu/menu-check.png
new file mode 100644
index 0000000000..46a6b8526a
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-check.png
diff --git a/comm/suite/themes/modern/global/menu/menu-radio-dis.gif b/comm/suite/themes/modern/global/menu/menu-radio-dis.gif
new file mode 100644
index 0000000000..83cb3cdf5d
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-radio-dis.gif
diff --git a/comm/suite/themes/modern/global/menu/menu-radio-dis.png b/comm/suite/themes/modern/global/menu/menu-radio-dis.png
new file mode 100644
index 0000000000..d68b52b9bd
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-radio-dis.png
diff --git a/comm/suite/themes/modern/global/menu/menu-radio-hov.gif b/comm/suite/themes/modern/global/menu/menu-radio-hov.gif
new file mode 100644
index 0000000000..c9eb82afbb
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-radio-hov.gif
diff --git a/comm/suite/themes/modern/global/menu/menu-radio-hov.png b/comm/suite/themes/modern/global/menu/menu-radio-hov.png
new file mode 100644
index 0000000000..ac61ee33ef
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-radio-hov.png
diff --git a/comm/suite/themes/modern/global/menu/menu-radio.gif b/comm/suite/themes/modern/global/menu/menu-radio.gif
new file mode 100644
index 0000000000..83cb3cdf5d
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-radio.gif
diff --git a/comm/suite/themes/modern/global/menu/menu-radio.png b/comm/suite/themes/modern/global/menu/menu-radio.png
new file mode 100644
index 0000000000..d68b52b9bd
--- /dev/null
+++ b/comm/suite/themes/modern/global/menu/menu-radio.png
diff --git a/comm/suite/themes/modern/global/menulist.css b/comm/suite/themes/modern/global/menulist.css
new file mode 100644
index 0000000000..aae5b01114
--- /dev/null
+++ b/comm/suite/themes/modern/global/menulist.css
@@ -0,0 +1,180 @@
+/* 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/. */
+
+/* ===== menulist.css ===================================================
+  == Styles used by the XUL menulist element.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
+
+/* :::::::::: menulist :::::::::: */
+
+menulist {
+  margin: 1px 4px;
+  border: 2px solid transparent;
+  min-height: 19px;
+  color: #000000;
+  font: message-box;
+}
+
+.menulist-label {
+  margin-top: 0px !important;
+  margin-bottom: 0px !important;
+  margin-inline-start: 0px !important;
+  margin-inline-end: 2px !important;
+}
+
+.menulist-description {
+  font-style: italic;
+  color: #5D616E;
+  margin-inline-start: 1em !important;
+}
+
+.menulist-icon {
+  margin-inline-end: 2px;
+}
+
+.menulist-label-box {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  padding: 2px;
+  border: 1px solid #000000;
+  border-right: 1px solid transparent;
+  border-top-left-radius: 2px;
+  border-bottom-left-radius: 2px;
+  background-color: #A6B3C0;
+  padding-inline-start: 8px;
+}
+
+.menulist-dropmarker {
+  border: 1px solid black;
+  border-left: 1px solid #6D7C8F;
+  border-top-left-radius: 0px;
+  border-bottom-left-radius: 0px;
+}
+
+.menulist-dropmarker > .dropmarker-icon {
+  margin: 1px 2px 0px;
+}
+
+/* ..... focused state ..... */
+
+menulist:focus {
+  border-color: #98A5B2;
+  border-radius: 7px;
+  background-color: #98A5B2;
+}
+
+/* ..... active state ..... */
+  
+menulist[open="true"] {
+  color: #FFFFFF;
+}
+  
+menulist[open="true"] > .menulist-label-box {
+  border-top-color: #313948;
+  border-bottom-color: #313948;
+  border-left-color: #313948;
+  background-color: #91A2B4;
+}
+
+menulist[open="true"] > .menulist-dropmarker {
+  list-style-image: url("chrome://global/skin/menulist/mlist-act-arrow.png");
+}
+
+/* ..... disabled state ..... */
+
+menulist[disabled="true"] {
+  color: #8C99AB !important;
+}
+  
+menulist[disabled="true"] > .menulist-label-box {
+  border-top-color: #727D8E !important;
+  border-bottom-color: #727D8E !important;
+  background-color: #B7BFCB !important;
+}
+
+menulist[disabled="true"] > .menulist-label-box {
+  border-left-color: #727D8E !important;
+}
+
+menulist[disabled="true"] > .menulist-dropmarker {
+  border-left-color: #95A1AD !important;
+}
+
+/* ::::: editable menulists ::::: */
+
+.menulist-editable-box {
+  border: 1px solid #000000;
+  border-right: none;
+  background-color: #FFFFFF;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  padding-inline-start: 2px;
+  padding-inline-end: 0px;
+}
+
+html|*.menulist-editable-input {
+  margin: 0px !important;
+  border: none !important;
+  padding: 0px !important;
+  background: inherit;
+  font: inherit;
+}
+
+menulist[focused="true"] {
+  border-color: #98A5B2;
+  border-top-right-radius: 7px;
+  border-bottom-right-radius: 7px;
+  background-color: #98A5B2;
+}
+
+/* ::::: compact menulists ::::: */
+
+.menulist-compact {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  margin: 0;
+  border: 1px solid;
+  border-top-color: #A6B3C0;
+  border-right-color: #5D616E;
+  border-bottom-color: #5D616E;
+  border-left-color: #A6B3C0;
+  border-radius: 0;
+  padding: 1px;
+  min-height: 0px;
+  background-color: #A6B3C0;
+  color: #000000;
+}
+
+.menulist-compact > .menulist-label {
+  margin-top: 0px !important;
+  margin-bottom: 0px !important;
+  margin-inline-start: 0px !important;
+  margin-inline-end: 3px !important;
+  text-align: end;
+}  
+
+.menulist-compact > .menulist-dropmarker {
+  border: none;
+  background: transparent;
+}
+
+.menulist-compact > .menulist-dropmarker,
+.menulist-compact[open="true"] > .menulist-dropmarker {
+  list-style-image: url("chrome://global/skin/menulist/mlist-compact-arrow.png");
+}
+
+.menulist-compact:focus {
+  border-radius: 0;
+}
+      
+.menulist-compact[open="true"] {
+  border-top-color: #788797;
+  border-right-color: #5D616E;
+  border-bottom-color: #5D616E;
+  border-left-color: #788797;
+  background-color: #91A2B4;
+}
diff --git a/comm/suite/themes/modern/global/menulist/mlist-act-arrow.gif b/comm/suite/themes/modern/global/menulist/mlist-act-arrow.gif
new file mode 100644
index 0000000000..79c2777abb
--- /dev/null
+++ b/comm/suite/themes/modern/global/menulist/mlist-act-arrow.gif
diff --git a/comm/suite/themes/modern/global/menulist/mlist-act-arrow.png b/comm/suite/themes/modern/global/menulist/mlist-act-arrow.png
new file mode 100644
index 0000000000..20c978ad90
--- /dev/null
+++ b/comm/suite/themes/modern/global/menulist/mlist-act-arrow.png
diff --git a/comm/suite/themes/modern/global/menulist/mlist-arrow.gif b/comm/suite/themes/modern/global/menulist/mlist-arrow.gif
new file mode 100644
index 0000000000..0067826651
--- /dev/null
+++ b/comm/suite/themes/modern/global/menulist/mlist-arrow.gif
diff --git a/comm/suite/themes/modern/global/menulist/mlist-arrow.png b/comm/suite/themes/modern/global/menulist/mlist-arrow.png
new file mode 100644
index 0000000000..aa69aca2d2
--- /dev/null
+++ b/comm/suite/themes/modern/global/menulist/mlist-arrow.png
diff --git a/comm/suite/themes/modern/global/menulist/mlist-compact-arrow.gif b/comm/suite/themes/modern/global/menulist/mlist-compact-arrow.gif
new file mode 100644
index 0000000000..41751cbf2f
--- /dev/null
+++ b/comm/suite/themes/modern/global/menulist/mlist-compact-arrow.gif
diff --git a/comm/suite/themes/modern/global/menulist/mlist-compact-arrow.png b/comm/suite/themes/modern/global/menulist/mlist-compact-arrow.png
new file mode 100644
index 0000000000..3fbcf0b362
--- /dev/null
+++ b/comm/suite/themes/modern/global/menulist/mlist-compact-arrow.png
diff --git a/comm/suite/themes/modern/global/menulist/mlist-dis-arrow.gif b/comm/suite/themes/modern/global/menulist/mlist-dis-arrow.gif
new file mode 100644
index 0000000000..9ca54729bc
--- /dev/null
+++ b/comm/suite/themes/modern/global/menulist/mlist-dis-arrow.gif
diff --git a/comm/suite/themes/modern/global/menulist/mlist-dis-arrow.png b/comm/suite/themes/modern/global/menulist/mlist-dis-arrow.png
new file mode 100644
index 0000000000..498285b415
--- /dev/null
+++ b/comm/suite/themes/modern/global/menulist/mlist-dis-arrow.png
diff --git a/comm/suite/themes/modern/global/netError.css b/comm/suite/themes/modern/global/netError.css
new file mode 100644
index 0000000000..3c84a12bdd
--- /dev/null
+++ b/comm/suite/themes/modern/global/netError.css
@@ -0,0 +1,137 @@
+/* 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/. */
+
+/*
+ *  This defines the look-and-feel styling of the error pages.
+ *  (see: netError.xhtml)
+ *
+ *  Original styling by William Price <bugzilla@mob.rice.edu>
+ *  Updated by: Steven Garrity <steven@silverorange.com>
+ *              Henrik Skupin  <mozilla@hskupin.info>
+ *              Akihiro Misaki <spitfire.kuden@gmail.com>
+ */
+
+@import url("chrome://global/skin/button.css");
+
+html {
+  background: #FFF;
+}
+
+body {
+  margin: 0;
+  padding: 0 1em;
+  color: #22262F;
+  font: message-box;
+}
+
+h1 {
+  margin: 0 0 .6em;
+  border-bottom: 1px solid #7A8490;
+  font-size: 160%;
+}
+
+ul, ol {
+  margin: 0;
+  margin-inline-start: 1.5em;
+  padding: 0;
+}
+
+ul > li, ol > li {
+  margin-bottom: .5em;
+}
+
+ul {
+  list-style: square;
+}
+
+#errorPageContainer {
+  position: relative;
+  min-width: 13em;
+  max-width: 52em;
+  margin: 4em auto;
+  border: 1px solid #494F5D;
+  border-radius: 10px;
+  padding: 3em;
+  padding-inline-start: 30px;
+  background: url("chrome://global/skin/icons/warning-48.png") left 0 no-repeat #C7D0D9;
+  background-origin: content-box;
+}
+
+#errorPageContainer.certerror {
+  background-image: url("chrome://global/skin/icons/authentication-48.png");
+}
+
+#errorPageContainer:dir(rtl) {
+  background-position: right 0;
+}
+
+#errorTitle {
+  margin-inline-start: 80px;
+}
+
+#errorLongContent {
+  margin-inline-start: 80px;
+}
+
+#errorShortDesc > p {
+  overflow: auto;
+  border-bottom: 1px solid #7A8490;
+  padding-bottom: 1em;
+  font-size: 130%;
+  white-space: pre-wrap;
+}
+
+#errorLongDesc {
+  padding-inline-end: 3em;
+  font-size: 110%;
+}
+
+#errorPageContainer > #errorTryAgain {
+  margin-top: 2em;
+  margin-inline-start: 80px;
+}
+
+#brand {
+  position: absolute;
+  right: 0;
+  bottom: -1.5em;
+  margin-inline-end: 10px;
+  opacity: .6;
+}
+
+#brand:dir(rtl) {
+  right: auto;
+  left: 0;
+}
+
+#brand > p {
+  margin: 0;
+}
+
+#errorContainer {
+  display: none;
+}
+
+#securityOverrideDiv {
+  padding-top: 10px;
+}
+
+#securityOverrideContent {
+  background-color: #FFFFE7;
+  color: #000000;
+  padding: 10px;
+  border-radius: 10px;
+  display: none;
+}
+
+/* Custom styling for 'blacklist' error class */
+:root.blacklist #errorPageContainer {
+  background-image: url("chrome://global/skin/icons/blacklist_large.png");
+  background-color: #772222;
+  color: #FFFFFF;
+}
+
+:root.blacklist {
+  background: #333333;
+}
diff --git a/comm/suite/themes/modern/global/notification.css b/comm/suite/themes/modern/global/notification.css
new file mode 100644
index 0000000000..30487da13b
--- /dev/null
+++ b/comm/suite/themes/modern/global/notification.css
@@ -0,0 +1,129 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+notification {
+  background-color: #C7D0D9;
+  color: #000000;
+}
+
+notification[type="warning"] {
+  background-color: #E8DB99;
+}
+
+notification[type="critical"] {
+  background-color: #FF0000;
+  color: #FFFFFF;
+}
+
+.notification-inner[type="warning"] {
+  border-color: #E8DB99 !important;
+}
+
+.notification-inner[type="critical"] {
+  border-color: #FF0000 !important;
+}
+
+.messageImage {
+  width: 16px;
+  height: 16px;
+  margin-top: 0px;
+  margin-bottom: 3px;
+  margin-inline-start: 5px;
+  margin-inline-end: 1px;
+}
+
+/* Default icons for notifications */
+
+.messageImage[type="info"] {
+  list-style-image: url("chrome://global/skin/icons/information-16.png");
+}
+
+.messageImage[type="warning"] {
+  list-style-image: url("chrome://global/skin/icons/warning-16.png");
+}
+
+.messageImage[type="critical"] {
+  list-style-image: url("chrome://global/skin/icons/error-16.png");
+}
+
+.messageText {
+  margin-top: 0px !important;
+  margin-bottom: 0px !important;
+  margin-inline-start: 5px !important;
+  margin-inline-end: 1px !important;
+}
+
+.messageCloseButton {
+  list-style-image: url("chrome://global/skin/icons/close.png");
+  padding: 4px 2px;
+  border: none;
+}
+
+.messageCloseButton:hover {
+  list-style-image: url("chrome://global/skin/icons/close-hov.png");
+}
+
+.messageCloseButton:hover:active {
+  list-style-image: url("chrome://global/skin/icons/close-act.png");
+}
+
+/* Popup notifications */
+
+popupnotification {
+  background-color: #C7D0D9;
+}
+
+.popup-notification-description {
+  max-width: 248px;
+  margin-top: 4px !important;
+}
+
+.popup-notification-learnmore-link:not([href]) {
+  display: none;
+}
+
+.popup-notification-closeitem {
+  list-style-image: url("chrome://global/skin/icons/closebox.png");
+}
+
+.popup-notification-button-container {
+  background-color: transparent;
+  display: flex;
+}
+
+.popup-notification-button-container > toolbarseparator {
+  display: none;
+}
+
+.popup-notification-button {
+  flex: 1;
+  min-width: 0;
+}
+
+.popup-notification-button[anonid="secondarybutton"][hidden="true"] ~ .popup-notification-button[default] {
+  flex: 1;
+}
+
+.popup-notification-button > .button-box {
+  padding: 0;
+}
+
+.popup-notification-dropmarker {
+  flex: none;
+  padding: 0 15px;
+}
+
+.popup-notification-dropmarker > .button-box > hbox {
+  display: none;
+}
+
+.popup-notification-dropmarker > .button-box > .button-menu-dropmarker {
+  /* This is to override the linux !important */
+  -moz-appearance: none !important;
+  display: -moz-box;
+  padding: 0;
+  margin: 0;
+}
diff --git a/comm/suite/themes/modern/global/plugins.css b/comm/suite/themes/modern/global/plugins.css
new file mode 100644
index 0000000000..ca612c13d2
--- /dev/null
+++ b/comm/suite/themes/modern/global/plugins.css
@@ -0,0 +1,101 @@
+/* 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/. */
+
+/* ===== plugins.css =====================================================
+   == Styles used by the about:plugins dialog.
+   ======================================================================= */
+
+body {
+  background-color: #FFFFFF;
+  color: #22262F;
+  font: message-box;
+  text-align: start;
+}
+
+a:link, a:visited, a:active {
+ color: #313063;
+}
+
+hr {
+ display: none;
+}
+
+div#outside {
+ text-align: justify;
+ width: 90%;
+ margin: 0 5%;
+}
+
+div#plugs {
+  text-align: center;
+  font-size: x-large;
+  font-weight: bold;
+  color: #5D616E;
+}
+
+div#noplugs {
+  font-size: large;
+  font-weight: bold;
+  color: #5D616E;
+}
+
+div#findmore {
+  margin-top: 2em;
+}
+
+div.plugname {
+  margin-top: 2em;
+  margin-bottom: 1em;
+  font-size: large;
+  text-align: left;
+  font-weight: bold;
+  color: #5D616E;
+}
+
+dl {
+  margin: 0px 0px 3px;
+}
+
+table {
+  background-color: #C7D0D9;
+  color: #22262F;
+  font: message-box;
+  text-align: left;
+  width: 100%;
+  border: 1px solid #2D3B49;
+  border-spacing: 0px;
+}
+
+th {
+  text-align: center;
+  font-weight: bold;
+  background-color: #90A1B3;
+  color: #000000;
+}
+
+th + th,
+td + td {
+  border-left: 1px dotted #2D3B49; 
+}
+
+td {
+  text-align: left;
+  border-top: 1px dotted #2D3B49;
+}
+
+th, td {
+  padding: 3px;
+}
+
+th.type, th.suff {
+  width: 20%;
+}
+
+th.desc {
+  width: 50%;
+}
+
+th.enabled {
+  width: 10%;
+}
\ No newline at end of file
diff --git a/comm/suite/themes/modern/global/popup.css b/comm/suite/themes/modern/global/popup.css
new file mode 100644
index 0000000000..33250e6733
--- /dev/null
+++ b/comm/suite/themes/modern/global/popup.css
@@ -0,0 +1,104 @@
+/* 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/. */
+
+/* ===== popup.css =====================================================
+  == Styles used by the XUL popup & menupopup elements.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: popup/menupopup ::::: */
+
+.panel-arrowcontent,
+panel:not([type="arrow"]),
+menupopup,
+popup {
+  cursor: default;
+  border: 1px solid #7F8893;
+  min-width: 1px;
+  background-color: #DDE3EB;
+  color: #22262F;
+}
+
+menupopup > menu > menupopup,
+popup > menu > menupopup {
+  margin: -2px;
+}
+
+/* Ideally we would set and forget a -16px margin around the entire panel.
+   Unfortunately this makes the panel code think we're hiding the anchor,
+   and it reacts by turning the arrow off. So instead we have to turn off
+   the 16px border on the appropriate side of the arrow. */
+panel[type="arrow"][side="top"],
+panel[type="arrow"][side="bottom"] {
+  margin: 0px -16px;
+}
+
+panel[type="arrow"][side="left"],
+panel[type="arrow"][side="right"] {
+  margin: -16px 0px;
+}
+
+/* The arrow is empty, but it has equal triangular borders on all four sides.
+   We just have to turn on the border on the side touching the content. */
+.panel-arrow {
+  border: 16px solid transparent;
+}
+
+.panel-arrow[side="top"] {
+  border-top-style: none;
+  border-bottom-color: #7F8893;
+}
+
+.panel-arrow[side="bottom"] {
+  border-bottom-style: none;
+  border-top-color: #7F8893;
+}
+
+.panel-arrow[side="left"] {
+  border-left-style: none;
+  border-right-color: #7F8893;
+}
+
+.panel-arrow[side="right"] {
+  border-right-style: none;
+  border-left-color: #7F8893;
+}
+
+/* ::::: tooltip ::::: */
+
+tooltip {
+  margin-top: 21px;
+  border: 1px solid #000000;
+  padding: 2px 3px;
+  max-width: 40em;
+  background-color: #FFFFE7;
+  color: #000000;
+  font: message-box;
+}
+
+tooltip[titletip="true"] {
+  /* See bug 32157 comment 128
+   * margin-top: -2px;
+   * margin-bottom: 0px;
+   * margin-inline-start: -4px;
+   * margin-inline-end: 0px;
+   */
+  max-width: none;
+}
+
+/* ::::: menulist popup :::::: */
+
+menulist > menupopup,
+.menulist-menupopup {
+  border-width: 1px;
+  border-color: #000000;
+  padding: 0px;
+  min-width: 0px;
+}
+
+menupopup > menu > .menulist-menupopup,
+popup > menu > .menulist-menupopup {
+  margin: -1px;
+}
diff --git a/comm/suite/themes/modern/global/preferences.css b/comm/suite/themes/modern/global/preferences.css
new file mode 100644
index 0000000000..49450a6ef7
--- /dev/null
+++ b/comm/suite/themes/modern/global/preferences.css
@@ -0,0 +1,65 @@
+/* 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/. */
+
+/* ===== preferences.css =====================================================
+  == Styles used by the XUL prefwindow element.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: dialog ::::: */
+
+prefwindow {
+  padding: 0px;
+}
+
+prefwindow[type="child"] {
+  padding: 7px 5px 5px;
+}
+
+prefpane {
+  padding: 7px 5px 0px 5px;
+}
+
+prefwindow[type="child"] > prefpane {
+  padding: 0px;
+}
+
+.prefWindow-dlgbuttons {
+  padding: 0px 5px 5px;
+}
+
+prefwindow[type="child"] > .prefWindow-dlgbuttons {
+  padding: 0px;
+}
+
+radio[pane] {
+  margin: 0px 1px;
+  padding: 1px 3px;
+  min-width: 4.5em;
+  background-color: #FFFFFF;
+  color: #000000;
+}
+
+radio[pane][selected="true"] {
+  background-color: #C7D0D9;
+}
+
+radio[pane]:hover:active {
+  background-color: #90A1B3;
+  color: #FFFFFF;
+}
+
+.paneSelector {
+  border-bottom: 1px solid #2D3B49;
+  margin: 0px;
+  padding-inline-start: 10px;
+  background-color: #FFFFFF;
+  color: #000000;
+}
+
+.paneButtonIcon {
+  width: 32px;
+  height: 32px;
+}
diff --git a/comm/suite/themes/modern/global/printPageSetup.css b/comm/suite/themes/modern/global/printPageSetup.css
new file mode 100644
index 0000000000..7846c8b58e
--- /dev/null
+++ b/comm/suite/themes/modern/global/printPageSetup.css
@@ -0,0 +1,11 @@
+/* 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/. */
+
+.portrait-page {
+  list-style-image: url("chrome://global/skin/icons/pg-portrait.png");
+}
+
+.landscape-page {
+  list-style-image: url("chrome://global/skin/icons/pg-landscape.png");
+}
diff --git a/comm/suite/themes/modern/global/printPreview.css b/comm/suite/themes/modern/global/printPreview.css
new file mode 100644
index 0000000000..2c416e51f1
--- /dev/null
+++ b/comm/suite/themes/modern/global/printPreview.css
@@ -0,0 +1,37 @@
+/* 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/. */
+
+/* ::::: print preview toolbar ::::: */
+
+/* ..... page navigation ..... */
+
+.home-arrow,
+.end-arrow:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-lft-sharp-end.png");
+}
+
+.end-arrow,
+.home-arrow:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp-end.png");
+}
+
+.previous-arrow,
+.next-arrow:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-lft-sharp.png");
+}
+
+.next-arrow,
+.previous-arrow:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-rit-sharp.png");
+}
+
+/* ..... orientation ..... */
+
+.toolbar-portrait-page {
+  list-style-image: url("chrome://global/skin/icons/pg-portrait-small.png");
+}
+
+.toolbar-landscape-page {
+  list-style-image: url("chrome://global/skin/icons/pg-landscape-small.png");
+}
diff --git a/comm/suite/themes/modern/global/progressmeter.css b/comm/suite/themes/modern/global/progressmeter.css
new file mode 100644
index 0000000000..ae44afec74
--- /dev/null
+++ b/comm/suite/themes/modern/global/progressmeter.css
@@ -0,0 +1,47 @@
+/* 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/. */
+
+/* ===== progressmeter.css ==============================================
+  == Styles used by the XUL progressmeter element.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: progressmeter ::::: */
+
+progressmeter {
+  margin: 2px 4px;
+  border: 1px solid;
+  border-top-color: #8997A1;
+  border-right-color: #C7D0D9;
+  border-bottom-color: #C7D0D9;
+  border-left-color: #8997A1;
+  min-width: 128px;
+  height: 14px;
+}
+
+progressmeter[mode="undetermined"] {
+  background: url("chrome://global/skin/progressmeter/progress-busy.png");
+}
+
+.progress-bar {
+  min-width: 0px;
+  background-color: #6B7B8D;
+}
+
+.progress-bar[mode="undetermined"],
+.progress-remainder[mode="undetermined"] {
+  visibility: hidden;
+}
+
+/* ::::: statusbar progressmeter ::::: */
+
+.progressmeter-statusbar {
+  margin: 0;
+  border-bottom-color: transparent;
+  border-top-color: #C7D0D9;
+  border-right-color: #8997A1;
+  border-left-color: #C7D0D9;
+}
+
diff --git a/comm/suite/themes/modern/global/progressmeter/progress-busy.gif b/comm/suite/themes/modern/global/progressmeter/progress-busy.gif
new file mode 100644
index 0000000000..acbf06931d
--- /dev/null
+++ b/comm/suite/themes/modern/global/progressmeter/progress-busy.gif
diff --git a/comm/suite/themes/modern/global/progressmeter/progress-busy.png b/comm/suite/themes/modern/global/progressmeter/progress-busy.png
new file mode 100644
index 0000000000..0c5dc994dc
--- /dev/null
+++ b/comm/suite/themes/modern/global/progressmeter/progress-busy.png
diff --git a/comm/suite/themes/modern/global/radio.css b/comm/suite/themes/modern/global/radio.css
new file mode 100644
index 0000000000..a9fb28856f
--- /dev/null
+++ b/comm/suite/themes/modern/global/radio.css
@@ -0,0 +1,72 @@
+/* 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/. */
+
+/* ===== radio.css ======================================================
+  == Styles used by the XUL radio element.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: radio ::::: */
+
+radio {
+  -moz-box-align: center;
+  margin: 0px 2px;
+  border: 2px solid transparent;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  padding-inline-start: 4px;
+  padding-inline-end: 2px;
+  border-radius: 4px 5px;
+}
+
+.radio-icon {
+  margin-inline-start: 2px;
+}
+
+.radio-text {
+  margin: 0px 2px !important;
+}
+
+/* ..... focused state ..... */
+
+radio[focused="true"] {
+  border-color: #98A5B2;
+}
+  
+/* ..... disabled state ..... */
+
+radio[disabled="true"] > .radio-label-box > .radio-label {
+  color: #8C99AB !important;
+}
+
+/* ::::: checkmark image ::::: */
+
+.radio-check {
+  width: 13px;
+  height: 13px;
+  list-style-image: url("chrome://global/skin/radio/radio.png");
+}
+
+radio:hover:active > .radio-check {
+  list-style-image: url("chrome://global/skin/radio/radio-act.png");
+}
+
+radio[disabled="true"] > .radio-check {
+  list-style-image: url("chrome://global/skin/radio/radio-dis.png") !important;
+}
+
+/* ..... checked state ..... */
+
+radio[selected] > .radio-check {
+  list-style-image: url("chrome://global/skin/radio/radio-check.png");
+}
+  
+radio[selected]:hover:active > .radio-check {
+  list-style-image: url("chrome://global/skin/radio/radio-act-check.png");  
+}
+
+radio[selected][disabled="true"] > .radio-check {
+  list-style-image: url("chrome://global/skin/radio/radio-dis-check.png") !important;
+}
diff --git a/comm/suite/themes/modern/global/radio/radio-act-check.gif b/comm/suite/themes/modern/global/radio/radio-act-check.gif
new file mode 100644
index 0000000000..a3ad23afdf
--- /dev/null
+++ b/comm/suite/themes/modern/global/radio/radio-act-check.gif
diff --git a/comm/suite/themes/modern/global/radio/radio-act-check.png b/comm/suite/themes/modern/global/radio/radio-act-check.png
new file mode 100644
index 0000000000..360c4370d4
--- /dev/null
+++ b/comm/suite/themes/modern/global/radio/radio-act-check.png
diff --git a/comm/suite/themes/modern/global/radio/radio-act.gif b/comm/suite/themes/modern/global/radio/radio-act.gif
new file mode 100644
index 0000000000..6acf3006e2
--- /dev/null
+++ b/comm/suite/themes/modern/global/radio/radio-act.gif
diff --git a/comm/suite/themes/modern/global/radio/radio-act.png b/comm/suite/themes/modern/global/radio/radio-act.png
new file mode 100644
index 0000000000..f8fe1cb595
--- /dev/null
+++ b/comm/suite/themes/modern/global/radio/radio-act.png
diff --git a/comm/suite/themes/modern/global/radio/radio-check.gif b/comm/suite/themes/modern/global/radio/radio-check.gif
new file mode 100644
index 0000000000..e3a534af41
--- /dev/null
+++ b/comm/suite/themes/modern/global/radio/radio-check.gif
diff --git a/comm/suite/themes/modern/global/radio/radio-check.png b/comm/suite/themes/modern/global/radio/radio-check.png
new file mode 100644
index 0000000000..69bffa6361
--- /dev/null
+++ b/comm/suite/themes/modern/global/radio/radio-check.png
diff --git a/comm/suite/themes/modern/global/radio/radio-dis-check.gif b/comm/suite/themes/modern/global/radio/radio-dis-check.gif
new file mode 100644
index 0000000000..fbec743564
--- /dev/null
+++ b/comm/suite/themes/modern/global/radio/radio-dis-check.gif
diff --git a/comm/suite/themes/modern/global/radio/radio-dis-check.png b/comm/suite/themes/modern/global/radio/radio-dis-check.png
new file mode 100644
index 0000000000..3fa12a37dd
--- /dev/null
+++ b/comm/suite/themes/modern/global/radio/radio-dis-check.png
diff --git a/comm/suite/themes/modern/global/radio/radio-dis.gif b/comm/suite/themes/modern/global/radio/radio-dis.gif
new file mode 100644
index 0000000000..1ccf4f060b
--- /dev/null
+++ b/comm/suite/themes/modern/global/radio/radio-dis.gif
diff --git a/comm/suite/themes/modern/global/radio/radio-dis.png b/comm/suite/themes/modern/global/radio/radio-dis.png
new file mode 100644
index 0000000000..e415e54871
--- /dev/null
+++ b/comm/suite/themes/modern/global/radio/radio-dis.png
diff --git a/comm/suite/themes/modern/global/radio/radio.gif b/comm/suite/themes/modern/global/radio/radio.gif
new file mode 100644
index 0000000000..abc479afa6
--- /dev/null
+++ b/comm/suite/themes/modern/global/radio/radio.gif
diff --git a/comm/suite/themes/modern/global/radio/radio.png b/comm/suite/themes/modern/global/radio/radio.png
new file mode 100644
index 0000000000..7d226f7341
--- /dev/null
+++ b/comm/suite/themes/modern/global/radio/radio.png
diff --git a/comm/suite/themes/modern/global/resizer.css b/comm/suite/themes/modern/global/resizer.css
new file mode 100644
index 0000000000..2242efc976
--- /dev/null
+++ b/comm/suite/themes/modern/global/resizer.css
@@ -0,0 +1,49 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
+
+/* This affects all resizers, even native anonymous ones. */
+resizer {
+  background-color: #B1BBC5;
+}
+
+resizer[dir="top"],
+resizer[dir="bottom"] {
+  cursor: ns-resize;
+}
+
+resizer[dir="left"],
+resizer[dir="right"] {
+  cursor: ew-resize;
+}
+
+resizer[dir="topleft"] {
+  cursor: nw-resize;
+}
+
+resizer[dir="bottomright"],
+resizer[dir="bottomend"]:-moz-locale-dir(ltr) {
+  background-image: url("chrome://global/skin/icons/resizer.png");
+  background-position: bottom right;
+  background-repeat: no-repeat;
+  cursor: se-resize;
+  width: 15px;
+  height: 15px;
+}
+
+resizer[dir="topright"] {
+  cursor: ne-resize;
+}
+
+resizer[dir="bottomleft"],
+resizer[dir="bottomend"]:-moz-locale-dir(rtl) {
+  background-image: url("chrome://global/skin/icons/resizer-rtl.png");
+  background-position: bottom left;
+  background-repeat: no-repeat;
+  cursor: sw-resize;
+  width: 15px;
+  height: 15px;
+}
diff --git a/comm/suite/themes/modern/global/richlistbox.css b/comm/suite/themes/modern/global/richlistbox.css
new file mode 100644
index 0000000000..b938b0005d
--- /dev/null
+++ b/comm/suite/themes/modern/global/richlistbox.css
@@ -0,0 +1,51 @@
+/* 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/. */
+
+/* ===== richlistbox.css ===================================================
+  == Styles used by XUL richlistbox-related elements.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: richlistbox ::::: */
+
+richlistbox {
+  /* -moz-appearance needed to override xul.css */
+  -moz-appearance: none !important;
+  margin: 2px 4px;
+  border: 1px solid #5D616E;
+  background-color: #FFFFFF;
+  color: #000000;
+}
+
+richlistbox[disabled="true"] {
+  color: #8C99AB;
+}
+
+/* ::::: richlistitem ::::: */
+
+richlistitem {
+  border-top: 1px solid transparent;
+  border-bottom: 1px solid transparent;
+}
+
+richlistitem[selected="true"] {
+  background-color: #C7D0D9;
+  color: #000000;
+}
+
+richlistbox:focus > richlistitem[selected="true"] {
+  background-color: #424F63;
+  color: #FFFFFF;
+}
+
+richlistbox:focus > richlistitem[current="true"] {
+  border-top-color: #000000;
+  border-bottom-color: #000000;
+}
+
+richlistbox[seltype="multiple"]:focus > richlistitem[selected="true"][current="true"] {
+  border-top-color: #FFFFFF;
+  border-bottom-color: #FFFFFF;
+}
diff --git a/comm/suite/themes/modern/global/scale.css b/comm/suite/themes/modern/global/scale.css
new file mode 100644
index 0000000000..e7863deaf7
--- /dev/null
+++ b/comm/suite/themes/modern/global/scale.css
@@ -0,0 +1,51 @@
+/* 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/. */
+
+/* ===== scale.css =================================================
+  == Styles used by XUL scale elements.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: scale ::::: */
+
+.scale-slider {
+  background: url("chrome://global/skin/scrollbar/slider-hrz.png") repeat-x;
+  border-left: 1px solid black;
+  border-right: 1px solid black;
+  margin: 2px 4px;
+  width: 100px;
+  height: 15px;
+}
+
+.scale-slider[orient="vertical"]
+{
+  background: url("chrome://global/skin/scrollbar/slider-vrt.png") repeat-y;
+  border-left: none;
+  border-right: none;
+  border-top: 1px solid black;
+  border-bottom: 1px solid black;
+  margin: 4px 2px;
+  width: 15px;
+  height: 100px;
+}
+
+/* ::::: scale thumb ::::: */
+
+.scale-thumb {
+  border: 1px solid #000000;
+  background-image: url("chrome://global/skin/scrollbar/thumb-hrz-grip.png");
+  min-width: 18px;
+}
+
+.scale-thumb[orient="vertical"] {
+  background-image: url("chrome://global/skin/scrollbar/thumb-vrt-grip.png");
+  min-height: 18px;
+  min-width: 0px;
+}
+
+.scale-thumb[disabled="true"] {
+  border-color: #000000;
+  background: #9CA8B4;
+}
diff --git a/comm/suite/themes/modern/global/scrollbar/btn-dn.gif b/comm/suite/themes/modern/global/scrollbar/btn-dn.gif
new file mode 100644
index 0000000000..ccd686cb8b
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/btn-dn.gif
diff --git a/comm/suite/themes/modern/global/scrollbar/btn-dn.png b/comm/suite/themes/modern/global/scrollbar/btn-dn.png
new file mode 100644
index 0000000000..e26dcc597c
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/btn-dn.png
diff --git a/comm/suite/themes/modern/global/scrollbar/btn-lft.gif b/comm/suite/themes/modern/global/scrollbar/btn-lft.gif
new file mode 100644
index 0000000000..c0493ca918
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/btn-lft.gif
diff --git a/comm/suite/themes/modern/global/scrollbar/btn-lft.png b/comm/suite/themes/modern/global/scrollbar/btn-lft.png
new file mode 100644
index 0000000000..d306dbb626
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/btn-lft.png
diff --git a/comm/suite/themes/modern/global/scrollbar/btn-rit.gif b/comm/suite/themes/modern/global/scrollbar/btn-rit.gif
new file mode 100644
index 0000000000..b23b771f27
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/btn-rit.gif
diff --git a/comm/suite/themes/modern/global/scrollbar/btn-rit.png b/comm/suite/themes/modern/global/scrollbar/btn-rit.png
new file mode 100644
index 0000000000..e662e73090
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/btn-rit.png
diff --git a/comm/suite/themes/modern/global/scrollbar/btn-up.gif b/comm/suite/themes/modern/global/scrollbar/btn-up.gif
new file mode 100644
index 0000000000..97db3ed22f
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/btn-up.gif
diff --git a/comm/suite/themes/modern/global/scrollbar/btn-up.png b/comm/suite/themes/modern/global/scrollbar/btn-up.png
new file mode 100644
index 0000000000..6888f3ed79
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/btn-up.png
diff --git a/comm/suite/themes/modern/global/scrollbar/mini-btn-dn.gif b/comm/suite/themes/modern/global/scrollbar/mini-btn-dn.gif
new file mode 100644
index 0000000000..1f03248f07
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/mini-btn-dn.gif
diff --git a/comm/suite/themes/modern/global/scrollbar/mini-btn-dn.png b/comm/suite/themes/modern/global/scrollbar/mini-btn-dn.png
new file mode 100644
index 0000000000..0855351197
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/mini-btn-dn.png
diff --git a/comm/suite/themes/modern/global/scrollbar/mini-btn-lft.gif b/comm/suite/themes/modern/global/scrollbar/mini-btn-lft.gif
new file mode 100644
index 0000000000..6f85443e2a
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/mini-btn-lft.gif
diff --git a/comm/suite/themes/modern/global/scrollbar/mini-btn-lft.png b/comm/suite/themes/modern/global/scrollbar/mini-btn-lft.png
new file mode 100644
index 0000000000..14d44d7eea
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/mini-btn-lft.png
diff --git a/comm/suite/themes/modern/global/scrollbar/mini-btn-rit.gif b/comm/suite/themes/modern/global/scrollbar/mini-btn-rit.gif
new file mode 100644
index 0000000000..e8404bc185
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/mini-btn-rit.gif
diff --git a/comm/suite/themes/modern/global/scrollbar/mini-btn-rit.png b/comm/suite/themes/modern/global/scrollbar/mini-btn-rit.png
new file mode 100644
index 0000000000..21f9e43779
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/mini-btn-rit.png
diff --git a/comm/suite/themes/modern/global/scrollbar/mini-btn-up.gif b/comm/suite/themes/modern/global/scrollbar/mini-btn-up.gif
new file mode 100644
index 0000000000..837c4369b5
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/mini-btn-up.gif
diff --git a/comm/suite/themes/modern/global/scrollbar/mini-btn-up.png b/comm/suite/themes/modern/global/scrollbar/mini-btn-up.png
new file mode 100644
index 0000000000..0bbd83ba8f
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/mini-btn-up.png
diff --git a/comm/suite/themes/modern/global/scrollbar/mini-slider-hrz.gif b/comm/suite/themes/modern/global/scrollbar/mini-slider-hrz.gif
new file mode 100644
index 0000000000..bc391487c1
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/mini-slider-hrz.gif
diff --git a/comm/suite/themes/modern/global/scrollbar/mini-slider-hrz.png b/comm/suite/themes/modern/global/scrollbar/mini-slider-hrz.png
new file mode 100644
index 0000000000..306a6c0dd4
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/mini-slider-hrz.png
diff --git a/comm/suite/themes/modern/global/scrollbar/mini-slider-vrt.gif b/comm/suite/themes/modern/global/scrollbar/mini-slider-vrt.gif
new file mode 100644
index 0000000000..09c5ac8a93
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/mini-slider-vrt.gif
diff --git a/comm/suite/themes/modern/global/scrollbar/mini-slider-vrt.png b/comm/suite/themes/modern/global/scrollbar/mini-slider-vrt.png
new file mode 100644
index 0000000000..ff6b021b36
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/mini-slider-vrt.png
diff --git a/comm/suite/themes/modern/global/scrollbar/mini-thumb-hrz-grip.gif b/comm/suite/themes/modern/global/scrollbar/mini-thumb-hrz-grip.gif
new file mode 100644
index 0000000000..087219863e
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/mini-thumb-hrz-grip.gif
diff --git a/comm/suite/themes/modern/global/scrollbar/mini-thumb-hrz-grip.png b/comm/suite/themes/modern/global/scrollbar/mini-thumb-hrz-grip.png
new file mode 100644
index 0000000000..0fcae98003
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/mini-thumb-hrz-grip.png
diff --git a/comm/suite/themes/modern/global/scrollbar/mini-thumb-vrt-grip.gif b/comm/suite/themes/modern/global/scrollbar/mini-thumb-vrt-grip.gif
new file mode 100644
index 0000000000..95073fcee9
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/mini-thumb-vrt-grip.gif
diff --git a/comm/suite/themes/modern/global/scrollbar/mini-thumb-vrt-grip.png b/comm/suite/themes/modern/global/scrollbar/mini-thumb-vrt-grip.png
new file mode 100644
index 0000000000..cafac1df0d
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/mini-thumb-vrt-grip.png
diff --git a/comm/suite/themes/modern/global/scrollbar/slider-hrz.gif b/comm/suite/themes/modern/global/scrollbar/slider-hrz.gif
new file mode 100644
index 0000000000..93a4d1a090
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/slider-hrz.gif
diff --git a/comm/suite/themes/modern/global/scrollbar/slider-hrz.png b/comm/suite/themes/modern/global/scrollbar/slider-hrz.png
new file mode 100644
index 0000000000..8511a19a83
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/slider-hrz.png
diff --git a/comm/suite/themes/modern/global/scrollbar/slider-vrt.gif b/comm/suite/themes/modern/global/scrollbar/slider-vrt.gif
new file mode 100644
index 0000000000..9d85a0c774
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/slider-vrt.gif
diff --git a/comm/suite/themes/modern/global/scrollbar/slider-vrt.png b/comm/suite/themes/modern/global/scrollbar/slider-vrt.png
new file mode 100644
index 0000000000..1641d0cbc2
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/slider-vrt.png
diff --git a/comm/suite/themes/modern/global/scrollbar/thumb-hrz-grip.gif b/comm/suite/themes/modern/global/scrollbar/thumb-hrz-grip.gif
new file mode 100644
index 0000000000..3e40a51b8e
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/thumb-hrz-grip.gif
diff --git a/comm/suite/themes/modern/global/scrollbar/thumb-hrz-grip.png b/comm/suite/themes/modern/global/scrollbar/thumb-hrz-grip.png
new file mode 100644
index 0000000000..3e04533f68
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/thumb-hrz-grip.png
diff --git a/comm/suite/themes/modern/global/scrollbar/thumb-vrt-grip.gif b/comm/suite/themes/modern/global/scrollbar/thumb-vrt-grip.gif
new file mode 100644
index 0000000000..046e343a4e
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/thumb-vrt-grip.gif
diff --git a/comm/suite/themes/modern/global/scrollbar/thumb-vrt-grip.png b/comm/suite/themes/modern/global/scrollbar/thumb-vrt-grip.png
new file mode 100644
index 0000000000..9d6521b117
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbar/thumb-vrt-grip.png
diff --git a/comm/suite/themes/modern/global/scrollbars-mini.css b/comm/suite/themes/modern/global/scrollbars-mini.css
new file mode 100644
index 0000000000..a9591c60bf
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbars-mini.css
@@ -0,0 +1,108 @@
+/* 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/. */
+
+/* ===== scrollbars.css =================================================
+  == Styles used by XUL scrollbar-related elements.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+
+/* ::::: scrollbar ::::: */
+
+scrollbar {
+  -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar");
+  cursor: default;
+  min-width: 11px;
+  min-height: 11px;
+}
+
+/* ::::: square at the corner of two scrollbars ::::: */
+
+scrollcorner { 
+  -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar-base");
+  cursor: default;
+  background-color: #B1BBC5;
+}
+
+/* ::::: slider ::::: */
+
+slider {
+  background: url("chrome://global/skin/scrollbar/mini-slider-hrz.png") repeat-x;
+}
+
+slider[orient="vertical"] {
+  background: url("chrome://global/skin/scrollbar/mini-slider-vrt.png") repeat-y;
+}
+
+/* ::::: borders for thumb and buttons ::::: */
+
+thumb,
+scrollbarbutton {
+  border: 1px solid;
+  border-color: #000000;
+  background: #B1BBC5 50% 50% no-repeat;
+}
+
+thumb:active {
+  background-color: #C2CCD6;
+  border-color: #111111;
+}
+
+/* ::::: thumb (horizontal) ::::: */
+
+thumb {
+  background-image: url("chrome://global/skin/scrollbar/thumb-vrt-grip.png");
+}
+
+thumb[orient="horizontal"] {
+  background-image: url("chrome://global/skin/scrollbar/thumb-hrz-grip.png");
+}
+
+/* ::::: scrollbar button ::::: */
+
+scrollbarbutton {
+  width: 11px;
+  height: 14px;
+  max-width: 11px;
+  max-height: 14px;
+  -moz-box-flex: 1;
+}
+
+scrollbar[orient="horizontal"] > scrollbarbutton {
+  width: 14px;
+  height: 11px;
+  max-width: 14px;
+  max-height: 11px;
+}
+
+scrollbarbutton[disabled="true"],
+scrollbarbutton[active="true"],
+scrollbarbutton:hover:active {
+  border-left-width: 1px;
+  border-right-width: 1px;
+  border-color: #000000;
+  background-color: #9CA8B4;
+}
+
+/* ..... increment .... */
+
+scrollbarbutton[type="increment"] {
+  background-image: url("chrome://global/skin/scrollbar/mini-btn-rit.png")
+}
+
+scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] {
+  background-image: url("chrome://global/skin/scrollbar/mini-btn-dn.png")
+}
+
+/* ..... decrement .... */
+
+scrollbarbutton[type="decrement"] {
+   background-image: url("chrome://global/skin/scrollbar/mini-btn-lft.png")
+}
+
+scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] {
+   background-image: url("chrome://global/skin/scrollbar/mini-btn-up.png")
+}
+
diff --git a/comm/suite/themes/modern/global/scrollbars.css b/comm/suite/themes/modern/global/scrollbars.css
new file mode 100644
index 0000000000..64ce6a4f63
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbars.css
@@ -0,0 +1,192 @@
+/* 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/. */
+
+/* ===== scrollbars.css =================================================
+  == Styles used by XUL scrollbar-related elements.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
+
+/* ::::: scrollbar ::::: */
+
+scrollbar {
+  -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar");
+  cursor: default;
+}
+
+/* ::::: slider ::::: */
+
+slider {
+  min-width: 15px;
+  min-height: 15px;
+  background: url("chrome://global/skin/scrollbar/slider-hrz.png") repeat-x;
+}
+
+slider[orient="vertical"] {
+  background: url("chrome://global/skin/scrollbar/slider-vrt.png") repeat-y;
+}
+
+/* ::::: borders for thumb and buttons ::::: */
+
+thumb,
+scrollbarbutton {
+  border: 1px solid;
+  border-color: #000000;
+  background: #B1BBC5 50% 50% no-repeat;
+}
+
+thumb:active {
+  background-color: #C2CCD6;
+  border-color: #111111;
+}
+
+%ifdef MOZ_WIDGET_GTK
+scrollbarbutton[sbattr="scrollbar-up-bottom"],
+scrollbarbutton[sbattr="scrollbar-down-top"] {
+  display: none;
+}
+
+scrollbarbutton[sbattr="scrollbar-up-top"],
+scrollbarbutton[sbattr="scrollbar-down-bottom"] {
+  display: -moz-box !important;
+}
+%endif
+
+/* ::::: thumb (horizontal) ::::: */
+
+thumb {
+  min-height: 18px;
+  background-image: url("chrome://global/skin/scrollbar/thumb-vrt-grip.png");
+}
+
+thumb[orient="horizontal"] {
+  min-width: 18px;
+  background-image: url("chrome://global/skin/scrollbar/thumb-hrz-grip.png");
+}
+
+/* ::::: scrollbar button ::::: */
+
+scrollbarbutton {
+  width: 15px;
+  height: 15px;
+  max-width: 15px;
+  max-height: 15px;
+  -moz-box-flex: 1;
+}
+
+scrollbarbutton[disabled="true"],
+scrollbarbutton[active="true"],
+scrollbarbutton:hover:active {
+  border-color: #000000;
+  background-color: #9CA8B4;
+}
+
+/* ::::: square at the corner of two scrollbars ::::: */
+
+scrollcorner { 
+  -moz-binding: url("chrome://global/content/bindings/scrollbar.xml#scrollbar-base");
+  width: 15px;
+  cursor: default;
+  background-color: #B1BBC5;
+}
+
+/* ..... increment .... */
+
+scrollbarbutton[type="increment"] {
+  background-image: url("chrome://global/skin/scrollbar/btn-rit.png")
+}
+
+scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] {
+  background-image: url("chrome://global/skin/scrollbar/btn-dn.png")
+}
+
+/* ..... decrement .... */
+
+scrollbarbutton[type="decrement"] {
+   background-image: url("chrome://global/skin/scrollbar/btn-lft.png")
+}
+
+scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] {
+   background-image: url("chrome://global/skin/scrollbar/btn-up.png")
+}
+
+/* :::::::::::::::::::::::::::::::::::::::::::::::::::::::: */
+/* ::::::::::::::::::::: MEDIA PRINT :::::::::::::::::::::: */
+/* :::::::::::::::::::::::::::::::::::::::::::::::::::::::: */
+@media print {
+
+  /* ::::: slider ::::: */
+
+  html|div slider {
+    height: 15px;
+    background: url("chrome://global/skin/scrollbar/slider-hrz.png") repeat-x;
+  }
+
+  html|div slider[orient="vertical"] {
+    width: 15px;
+    background: url("chrome://global/skin/scrollbar/slider-vrt.png") repeat-y;
+  }
+
+  /* ::::: borders for thumb and buttons ::::: */
+
+  html|div thumb,
+  html|div scrollbarbutton {
+    border: 1px solid;
+    border-color: #000000;
+    background: #B1BBC5 50% 50% no-repeat;
+  }
+
+  html|div thumb:active {
+    background-color: #C2CCD6;
+    border-color: #111111;
+  }
+
+  /* ::::: thumb (horizontal) ::::: */
+
+  html|div thumb {
+    min-height: 18px;
+    background-image: url("chrome://global/skin/scrollbar/thumb-vrt-grip.png");
+  }
+
+  html|div thumb[orient="horizontal"] {
+    min-width: 18px;
+    background-image: url("chrome://global/skin/scrollbar/thumb-hrz-grip.png");
+  }
+
+  /* ::::: scrollbar button ::::: */
+
+  html|div scrollbarbutton {
+    width: 15px;
+    height: 15px;
+  }
+
+  html|div scrollbarbutton[disabled="true"],
+  html|div scrollbarbutton[active="true"],   
+  html|div scrollbarbutton:hover:active {
+    border-color: #000000;
+    background-color: #9CA8B4;
+  }
+
+  /* ..... increment .... */
+
+  html|div scrollbarbutton[type="increment"] {
+    background-image: url("chrome://global/skin/scrollbar/btn-rit.png")
+  }
+
+  html|div scrollbar[orient="vertical"] > scrollbarbutton[type="increment"] {
+    background-image: url("chrome://global/skin/scrollbar/btn-dn.png")
+  }
+
+  /* ..... decrement .... */
+
+  html|div scrollbarbutton[type="decrement"] {
+     background-image: url("chrome://global/skin/scrollbar/btn-lft.png")
+  }
+
+  html|div scrollbar[orient="vertical"] > scrollbarbutton[type="decrement"] {
+     background-image: url("chrome://global/skin/scrollbar/btn-up.png")
+  }
+
+}
diff --git a/comm/suite/themes/modern/global/scrollbox.css b/comm/suite/themes/modern/global/scrollbox.css
new file mode 100644
index 0000000000..10b5d417fe
--- /dev/null
+++ b/comm/suite/themes/modern/global/scrollbox.css
@@ -0,0 +1,95 @@
+/* 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/. */
+
+/* ===== arrowscrollbox.css =============================================
+  == Styles used by the XUL arrowscrollbox and related elements.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: auto-repeat button ::::: */
+
+autorepeatbutton {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  margin-top: 1px;
+  margin-bottom: 2px;
+  margin-inline-start: 1px;
+  margin-inline-end: 2px;
+  border: 1px solid transparent;
+  padding: 3px;
+}
+
+autorepeatbutton:not([disabled="true"]):hover {
+  margin: 1px;
+  border: 1px inset #A5B2C2;
+  padding-top: 4px;
+  padding-bottom: 3px;
+  padding-inline-start: 4px;
+  padding-inline-end: 3px;
+  background-color: #A5B2C2;
+}
+
+.scrollbutton-up,
+.scrollbutton-down {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+}
+
+.scrollbutton-up > .toolbarbutton-text,
+.scrollbutton-down > .toolbarbutton-text {
+  display: none;
+}
+
+/* Vertical enabled */
+.autorepeatbutton-up,
+.scrollbutton-up {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.png")
+}
+
+.autorepeatbutton-down,
+.scrollbutton-down {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png")
+}
+
+/* Vertical disabled */
+.autorepeatbutton-up[disabled="true"],
+.scrollbutton-up[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up-dis.png");
+}
+
+.autorepeatbutton-down[disabled="true"],
+.scrollbutton-down[disabled="true"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn-dis.png");
+}
+
+/* Horizontal enabled */
+.autorepeatbutton-up[orient="horizontal"],
+.autorepeatbutton-down[orient="horizontal"]:-moz-locale-dir(rtl),
+.scrollbutton-up[orient="horizontal"],
+.scrollbutton-down[orient="horizontal"]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-lft.png");
+}
+
+.autorepeatbutton-down[orient="horizontal"],
+.autorepeatbutton-up[orient="horizontal"]:-moz-locale-dir(rtl),
+.scrollbutton-down[orient="horizontal"],
+.scrollbutton-up[orient="horizontal"]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-rit.png");
+}
+
+ /* Horizontal disabled */
+.autorepeatbutton-up[orient="horizontal"][disabled="true"],
+.autorepeatbutton-down[orient="horizontal"][disabled="true"]:-moz-locale-dir(rtl),
+.scrollbutton-up[orient="horizontal"][disabled="true"],
+.scrollbutton-down[orient="horizontal"][disabled="true"]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-lft-dis.png");
+}
+
+.autorepeatbutton-down[orient="horizontal"][disabled="true"],
+.autorepeatbutton-up[orient="horizontal"][disabled="true"]:-moz-locale-dir(rtl),
+.scrollbutton-down[orient="horizontal"][disabled="true"],
+.scrollbutton-up[orient="horizontal"][disabled="true"]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-rit-dis.png");
+}
diff --git a/comm/suite/themes/modern/global/splitter.css b/comm/suite/themes/modern/global/splitter.css
new file mode 100644
index 0000000000..4236334444
--- /dev/null
+++ b/comm/suite/themes/modern/global/splitter.css
@@ -0,0 +1,182 @@
+/* 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/. */
+
+/* ===== splitter.css ===================================================
+  == Styles used by the XUL splitter element.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: splitter (vertical) ::::: */
+
+splitter {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  cursor: ew-resize;
+  border-top: 1px solid #DFE5EF;
+  border-right: 1px solid #3B414F;
+  border-bottom: 1px solid #AAB4BF;
+  border-left: 1px solid #97A4B2;
+  min-width: 5px;
+  background-color: #C1CBD5;
+}
+
+splitter[state="collapsed"][collapse="before"],
+splitter[state="collapsed"][substate="before"],
+splitter[state="collapsed"][collapse="after"]:-moz-locale-dir(rtl),
+splitter[state="collapsed"][substate="after"]:-moz-locale-dir(rtl) {
+  cursor: e-resize;
+}
+
+splitter[state="collapsed"][collapse="after"],
+splitter[state="collapsed"][substate="after"],
+splitter[state="collapsed"][collapse="before"]:-moz-locale-dir(rtl),
+splitter[state="collapsed"][substate="before"]:-moz-locale-dir(rtl) {
+  cursor: w-resize;
+}
+
+/* ::::: splitter (horizontal) ::::: */
+
+splitter[orient="vertical"] {
+  cursor: ns-resize;
+  border-top: 1px solid #97A4B2;
+  border-right: 1px solid #AAB4BF;
+  border-bottom: 1px solid #3B414F;
+  border-left: 1px solid #DFE5EF;
+  min-width: 0;
+  min-height: 5px;
+}
+
+splitter[orient="vertical"][state="collapsed"][collapse="before"],
+splitter[orient="vertical"][state="collapsed"][substate="before"] {
+  cursor: s-resize;
+}
+
+splitter[orient="vertical"][state="collapsed"][collapse="after"],
+splitter[orient="vertical"][state="collapsed"][substate="after"] {
+  cursor: n-resize;
+}
+
+splitter[disabled="true"] {
+  cursor: default !important;
+}
+
+/* ::::: splitter grippy ::::: */
+
+grippy {
+  cursor: pointer;
+  margin: 0px;
+  min-width: 5px;
+  min-height: 50px;
+}
+
+splitter[orient="vertical"] > grippy {
+  margin: 0px;
+  min-width: 50px;
+  min-height: 5px;
+}
+
+/* ..... normal state ..... */
+
+/* vertical grippies */
+splitter[collapse="before"] > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-vrt-before.png");
+}
+
+splitter[collapse="before"]:hover:active > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-vrt-before-act.png");
+}
+
+splitter[collapse="before"] > grippy:hover:active {
+  background-image: url("chrome://global/skin/splitter/grip-vrt-before-act.png");
+}
+
+splitter[collapse="after"] > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-vrt-after.png");
+}
+
+splitter[collapse="after"]:hover:active > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-vrt-after-act.png");
+}
+
+splitter[collapse="after"] > grippy:hover:active {
+  background-image: url("chrome://global/skin/splitter/grip-vrt-after-act.png");
+}
+
+/* horizontal grippies */
+splitter[collapse="before"][orient="vertical"] > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-hrz-before.png");
+}
+
+splitter[collapse="before"][orient="vertical"]:hover:active > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-hrz-before-act.png");
+}
+
+splitter[collapse="before"][orient="vertical"] > grippy:hover:active {
+  background-image: url("chrome://global/skin/splitter/grip-hrz-before-act.png");
+}
+
+splitter[collapse="after"][orient="vertical"] > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-hrz-after.png");
+}
+
+splitter[collapse="after"][orient="vertical"]:hover:active > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-hrz-after-act.png");
+}
+
+splitter[collapse="after"][orient="vertical"] > grippy:hover:active {
+  background-image: url("chrome://global/skin/splitter/grip-hrz-after-act.png");
+}
+
+/* ..... collapsed state ..... */
+
+/* vertical grippies */
+splitter[collapse="before"][state="collapsed"] > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-vrt-after.png");
+}
+
+splitter[collapse="before"][state="collapsed"]:hover:active > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-vrt-after-act.png");
+}
+
+splitter[collapse="before"][state="collapsed"] > grippy:hover:active {
+  background-image: url("chrome://global/skin/splitter/grip-vrt-after-act.png");
+}
+
+splitter[collapse="after"][state="collapsed"] > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-vrt-before.png");
+}
+
+splitter[collapse="after"][state="collapsed"]:hover:active > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-vrt-before-act.png");
+}
+
+splitter[collapse="after"][state="collapsed"] > grippy:hover:active {
+  background-image: url("chrome://global/skin/splitter/grip-vrt-before-act.png");
+}
+
+/* horizontal grippies */
+splitter[collapse="before"][state="collapsed"][orient="vertical"] > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-hrz-after.png");
+}
+
+splitter[collapse="before"][state="collapsed"][orient="vertical"]:hover:active > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-hrz-after-act.png");
+}
+
+splitter[collapse="before"][state="collapsed"][orient="vertical"] > grippy:hover:active {
+  background-image: url("chrome://global/skin/splitter/grip-hrz-after-act.png");
+}
+
+splitter[collapse="after"][state="collapsed"][orient="vertical"] > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-hrz-before.png");
+}
+
+splitter[collapse="after"][state="collapsed"][orient="vertical"]:hover:active > grippy {
+  background-image: url("chrome://global/skin/splitter/grip-hrz-before-act.png");
+}
+
+splitter[collapse="after"][state="collapsed"][orient="vertical"] > grippy:hover:active {
+  background-image: url("chrome://global/skin/splitter/grip-hrz-before-act.png");
+}
diff --git a/comm/suite/themes/modern/global/splitter/grip-hrz-after-act.gif b/comm/suite/themes/modern/global/splitter/grip-hrz-after-act.gif
new file mode 100644
index 0000000000..700815a7a1
--- /dev/null
+++ b/comm/suite/themes/modern/global/splitter/grip-hrz-after-act.gif
diff --git a/comm/suite/themes/modern/global/splitter/grip-hrz-after-act.png b/comm/suite/themes/modern/global/splitter/grip-hrz-after-act.png
new file mode 100644
index 0000000000..3d907f8516
--- /dev/null
+++ b/comm/suite/themes/modern/global/splitter/grip-hrz-after-act.png
diff --git a/comm/suite/themes/modern/global/splitter/grip-hrz-after.gif b/comm/suite/themes/modern/global/splitter/grip-hrz-after.gif
new file mode 100644
index 0000000000..533e55399f
--- /dev/null
+++ b/comm/suite/themes/modern/global/splitter/grip-hrz-after.gif
diff --git a/comm/suite/themes/modern/global/splitter/grip-hrz-after.png b/comm/suite/themes/modern/global/splitter/grip-hrz-after.png
new file mode 100644
index 0000000000..b1d03f51c5
--- /dev/null
+++ b/comm/suite/themes/modern/global/splitter/grip-hrz-after.png
diff --git a/comm/suite/themes/modern/global/splitter/grip-hrz-before-act.gif b/comm/suite/themes/modern/global/splitter/grip-hrz-before-act.gif
new file mode 100644
index 0000000000..df08d29c0d
--- /dev/null
+++ b/comm/suite/themes/modern/global/splitter/grip-hrz-before-act.gif
diff --git a/comm/suite/themes/modern/global/splitter/grip-hrz-before-act.png b/comm/suite/themes/modern/global/splitter/grip-hrz-before-act.png
new file mode 100644
index 0000000000..f929149031
--- /dev/null
+++ b/comm/suite/themes/modern/global/splitter/grip-hrz-before-act.png
diff --git a/comm/suite/themes/modern/global/splitter/grip-hrz-before.gif b/comm/suite/themes/modern/global/splitter/grip-hrz-before.gif
new file mode 100644
index 0000000000..703bbafeff
--- /dev/null
+++ b/comm/suite/themes/modern/global/splitter/grip-hrz-before.gif
diff --git a/comm/suite/themes/modern/global/splitter/grip-hrz-before.png b/comm/suite/themes/modern/global/splitter/grip-hrz-before.png
new file mode 100644
index 0000000000..4b2e3d41e8
--- /dev/null
+++ b/comm/suite/themes/modern/global/splitter/grip-hrz-before.png
diff --git a/comm/suite/themes/modern/global/splitter/grip-vrt-after-act.gif b/comm/suite/themes/modern/global/splitter/grip-vrt-after-act.gif
new file mode 100644
index 0000000000..1fb624dbb0
--- /dev/null
+++ b/comm/suite/themes/modern/global/splitter/grip-vrt-after-act.gif
diff --git a/comm/suite/themes/modern/global/splitter/grip-vrt-after-act.png b/comm/suite/themes/modern/global/splitter/grip-vrt-after-act.png
new file mode 100644
index 0000000000..cbcd094da7
--- /dev/null
+++ b/comm/suite/themes/modern/global/splitter/grip-vrt-after-act.png
diff --git a/comm/suite/themes/modern/global/splitter/grip-vrt-after.gif b/comm/suite/themes/modern/global/splitter/grip-vrt-after.gif
new file mode 100644
index 0000000000..15ea90a20a
--- /dev/null
+++ b/comm/suite/themes/modern/global/splitter/grip-vrt-after.gif
diff --git a/comm/suite/themes/modern/global/splitter/grip-vrt-after.png b/comm/suite/themes/modern/global/splitter/grip-vrt-after.png
new file mode 100644
index 0000000000..c2f2ff0722
--- /dev/null
+++ b/comm/suite/themes/modern/global/splitter/grip-vrt-after.png
diff --git a/comm/suite/themes/modern/global/splitter/grip-vrt-before-act.gif b/comm/suite/themes/modern/global/splitter/grip-vrt-before-act.gif
new file mode 100644
index 0000000000..e06f8cbeef
--- /dev/null
+++ b/comm/suite/themes/modern/global/splitter/grip-vrt-before-act.gif
diff --git a/comm/suite/themes/modern/global/splitter/grip-vrt-before-act.png b/comm/suite/themes/modern/global/splitter/grip-vrt-before-act.png
new file mode 100644
index 0000000000..f17373c84d
--- /dev/null
+++ b/comm/suite/themes/modern/global/splitter/grip-vrt-before-act.png
diff --git a/comm/suite/themes/modern/global/splitter/grip-vrt-before.gif b/comm/suite/themes/modern/global/splitter/grip-vrt-before.gif
new file mode 100644
index 0000000000..0f08486e44
--- /dev/null
+++ b/comm/suite/themes/modern/global/splitter/grip-vrt-before.gif
diff --git a/comm/suite/themes/modern/global/splitter/grip-vrt-before.png b/comm/suite/themes/modern/global/splitter/grip-vrt-before.png
new file mode 100644
index 0000000000..99ebfb38e0
--- /dev/null
+++ b/comm/suite/themes/modern/global/splitter/grip-vrt-before.png
diff --git a/comm/suite/themes/modern/global/tabbox.css b/comm/suite/themes/modern/global/tabbox.css
new file mode 100644
index 0000000000..0e93163048
--- /dev/null
+++ b/comm/suite/themes/modern/global/tabbox.css
@@ -0,0 +1,123 @@
+/* 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/. */
+
+/* ===== tabbox.css =================================================
+  == Styles used by XUL tab-related elements.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: tabs ::::: */
+
+tabs {
+  -moz-box-align: end;
+}
+
+.tabs-left,
+.tabs-right {
+  border-bottom: 1px solid #000000;
+}
+
+/* ::::: tabpanels ::::: */
+
+tabpanels {
+  border-right: 1px solid #000000;
+  border-left: 1px solid #000000;
+  border-bottom: 1px solid #000000;
+  padding: 5px;
+  background-color: #C7D0D9;
+}
+
+/* ::::: tab ::::: */
+
+tab {
+  margin: 0px;
+  border: 1px solid #000000;
+  border-bottom-width: 1px;
+  border-top-left-radius: 3px;
+  border-top-right-radius: 3px;
+  padding: 1px 3px;
+  /*background-color: #8C9DAF;*/
+  background-color: #9CABBA;
+  color: #000000;
+  font: menu;
+}
+
+.tab-text {
+  margin: 0px !important;
+}
+
+.tab-image {
+  list-style-image: inherit;
+}
+
+/* ..... active state ..... */
+
+tab:hover:active {
+  border-top-color: #8190A5;
+  border-right-color: #8190A5;
+  border-left-color: #8190A5;
+  background-color: #8B9AAD;
+  color: #FFFFFF;
+}
+
+/* ..... selected state ..... */
+
+tab[selected="true"],
+tab[selected="true"]:hover:active {
+  border-top-color: #000000;
+  border-right-color: #000000;
+  border-bottom-color: transparent;
+  border-left-color: #000000;
+  background-color: #C7D0D9;
+  color: #000000;
+}
+
+/* ::::: tab-bottom ::::::::::
+   :: Tabs that are attached to the bottom of a panel, but not necessarily
+   :: a tabpanels.
+   ::::: */
+
+.tab-bottom {
+  border-top-color: #000000;
+  border-bottom-color: #000000;
+  border-top-left-radius: 0;
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 3px;
+  border-bottom-left-radius: 3px;
+}
+
+.tab-bottom:hover:active {
+  border-top-color: #000000;
+  border-bottom-color: transparent;
+}
+   
+.tab-bottom[selected="true"] {
+  border-top-color: transparent !important;
+  border-bottom-color: #000000 !important;
+}
+
+tab:focus {
+  border-top-color: #000000;
+  border-left-color: #000000;
+  border-right-color: #000000;
+  border-bottom-color: #8190A5;
+}
+
+.tab-bottom > .tab-text {
+  font: message-box;
+  font-weight: bold;
+}
+   
+/* ::::: tabs-bottom ::::: */
+
+.tabs-bottom {
+  -moz-box-align: start;
+}
+
+.tabs-bottom > .tabs-left,
+.tabs-bottom > .tabs-right {
+  border-top: 1px solid #000000;
+  border-bottom: none;
+}
diff --git a/comm/suite/themes/modern/global/textbox.css b/comm/suite/themes/modern/global/textbox.css
new file mode 100644
index 0000000000..d0bae80b5a
--- /dev/null
+++ b/comm/suite/themes/modern/global/textbox.css
@@ -0,0 +1,120 @@
+/* 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/. */
+
+/* ===== textbox.css ==================================================
+  == Styles used by the XUL textbox element.
+  ======================================================================= */
+
+@import url("chrome://global/content/autocomplete.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
+
+/* ::::: textbox ::::: */
+
+textbox {
+  margin: 2px 4px;
+  border: 1px solid;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  padding-inline-start: 2px;
+  padding-inline-end: 0px;
+  background-color: #FFFFFF;
+  color: #000000;
+  font: inherit;
+}
+
+html|*.textbox-input::placeholder,
+html|*.textbox-textarea::placeholder {
+  color: #999999;
+  opacity: 1.0;
+}
+
+textbox,
+textbox[readonly="true"][focused="true"] {
+  border-color: #5D616E;
+}
+
+html|*.textbox-input,
+html|*.textbox-textarea {
+  cursor: text;
+  margin: 0px !important;
+  border: none !important;
+  padding: 0px !important;
+  background-color: inherit;
+  color: inherit;
+  font: inherit;
+}
+
+/* ..... focused state ..... */
+
+textbox[focused="true"] {
+  border-color: #000000;
+}
+
+/* ..... disabled state ..... */
+
+textbox[disabled="true"] {
+  border-top-color: #98A5B2;
+  border-right-color: #F8FAFE;
+  border-bottom-color: #F8FAFE;
+  border-left-color: #BEC3D3;
+  background-color: #C7D0D9;
+  color: #999999;
+  cursor: default !important;
+}
+
+/* ..... readonly state ..... */
+
+textbox[readonly="true"] {
+  background-color: #C7D0D9;
+}
+
+/* ::::: plain textbox ::::: */
+
+textbox.plain {
+  background-color: transparent;
+  margin: 0px !important;
+  border: none !important;
+  padding: 0px !important;
+}
+
+/* ::::: search textbox ::::: */
+
+.textbox-search-icon {
+  list-style-image: url("chrome://global/skin/icons/search.png");
+}
+
+.textbox-search-clear {
+  list-style-image: url("chrome://global/skin/icons/closebox.png");
+}
+
+/* ::::: scrollable textbox ::::: */
+
+.scrollfield {
+  border: none !important;
+  margin: 0px;
+  margin-top: 1px;
+  padding: 0px !important;
+  background: inherit;
+}
+
+.scrollfield > .textbox-internal-box {
+  border: none !important;
+  margin: 0px !important;
+  padding: 0px !important;
+}
+
+/* ::::: inline-edit textbox ::::: */
+
+.textbox-inline-edit {
+  margin: 0px !important;
+  border: 1px solid #000000 !important;
+}
+
+/* ::::: textboxes inside toolbarpaletteitems ::::: */
+
+toolbarpaletteitem > toolbaritem > textbox > .textbox-input-box > html|*.textbox-input {
+  visibility: hidden;
+}
diff --git a/comm/suite/themes/modern/global/toolbar.css b/comm/suite/themes/modern/global/toolbar.css
new file mode 100644
index 0000000000..483b986c93
--- /dev/null
+++ b/comm/suite/themes/modern/global/toolbar.css
@@ -0,0 +1,186 @@
+/* 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/. */
+
+/* ===== toolbar.css ====================================================
+  == Styles used by XUL toolbar-related elements.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: toolbox ::::: */
+
+toolbox {
+  border-bottom: 1px solid #494F5D;
+}
+ 
+/* ::::: toolbar ::::: */
+
+toolbar {
+  min-width: 1px; /* DON'T DELETE!
+    Prevents hiding of scrollbars in browser when window is made smaller.*/
+  min-height: 22px;
+  background: #C7D0D9;
+  color: #000000;
+}
+
+toolbar > .toolbar-box > .toolbar-holder {
+  border-top: 1px solid #EEF0F3;
+  border-right: 1px solid #86929E;
+  border-bottom: 1px solid #86929E;
+}
+
+/* ::::: menubar ::::: */
+
+menubar,
+toolbar[type="menubar"] {
+  cursor: default;
+  min-width: 1px; /* DON'T DELETE!
+    Prevents hiding of scrollbars in browser when window is made smaller.*/
+  background-color: #DDE3EB;
+  color: #000000;
+}
+
+menubar > .toolbar-box > .toolbar-holder,
+toolbar[type="menubar"] > .toolbar-box > .toolbar-holder  {
+  border-top: 1px solid #EBF4FF;
+  border-right: 1px solid #86929E;
+  border-bottom: 1px solid #B9BFC7;
+  border-left: 1px solid #EEF4FC;
+}  
+
+toolbar > toolbaritem > menubar > .toolbar-box > .toolbar-holder {
+  border: 0px none;
+}
+
+/* ::::: toolbargrippy ::::: */
+ 
+toolbargrippy {
+  -moz-box-orient: vertical;
+  -moz-box-align: center;
+  -moz-box-pack: end;
+  -moz-box-direction: reverse;
+  border-top: 1px solid #EEF0F3;
+  border-right: 1px solid #86929E;
+  border-bottom: 1px solid #86929E;
+  border-left: 1px solid #EEF0F3;
+  list-style-image: url("chrome://global/skin/toolbar/tbgrip-arrow.png");
+}
+
+toolbargrippy:hover:active {
+  border-color: #67737E;
+  background-color: #9DA9B6;
+  list-style-image: url("chrome://global/skin/toolbar/tbgrip-arrow-act.png");
+}
+
+.toolbargrippy-arrow {
+  margin: 0px 1px 3px;
+  width: 8px;
+  height: 5px;
+}
+
+/* ::::: menubar grippy ::::: */
+
+toolbar[type="menubar"] > .toolbar-box > toolbargrippy,
+menubar > .toolbar-box > toolbargrippy {
+  border-top: 1px solid #EBF4FF;
+  border-right: 1px solid #B9BFC7;
+  border-bottom: 1px solid #B9BFC7;
+  border-left: 1px solid #F4FAFF;
+  background-color: #DDE3EB;
+  list-style-image: url("chrome://global/skin/toolbar/mbgrip-arrow.png");
+} 
+
+/* ::::: collapsed toolbargrippy and tray ::::: */
+  
+toolbargrippy[tbgrippy-collapsed="true"] {
+  -moz-box-orient: horizontal;
+  -moz-box-pack: start;
+  -moz-box-direction: normal;
+  width: 40px;
+  list-style-image: url("chrome://global/skin/toolbar/tbgrip-arrow-clps.png");
+}
+
+toolbargrippy[tbgrippy-collapsed="true"] > .toolbargrippy-arrow {
+  margin-top: 1px;
+  margin-bottom: 1px;
+  margin-inline-start: 3px;
+  margin-inline-end: 0px;
+  width: 5px;
+  height: 8px;
+}
+
+toolbargrippy[tbgrippy-collapsed="true"]:hover:active > .toolbargrippy-arrow {
+  list-style-image: url("chrome://global/skin/toolbar/tbgrip-arrow-clps-act.png");
+}
+
+.collapsed-tray-holder {
+  background-color: #C7D0D9;
+}
+
+/* ::::: toolbar decorations ::::: */
+
+toolbarseparator { 
+  margin: 0px 0.2em;
+  border-right: 1px solid #E2E7EB;
+  border-left: 1px solid #95A0AD;
+  width: 0px;
+}
+
+toolbarspacer {
+  width: 15px;
+}
+
+/* ::::: toolbarpaletteitem ::::: */
+
+toolbarpaletteitem {
+  cursor: grab;
+}
+
+.toolbarpaletteitem-box[type="spacer"],
+.toolbarpaletteitem-box[type="spring"] {
+  border: 1px solid #808080;
+  background-color: #F0F0F0 !important;
+}
+
+toolbarpaletteitem[place="toolbar"] > toolbarspacer {
+  width: 11px;
+}
+
+.toolbarpaletteitem-box[type="separator"][place="palette"] {
+  width: 2px;
+  height: 50px;
+}
+
+.toolbarpaletteitem-box[type="splitter"][place="palette"] {
+  width: 8px;
+  height: 50px;
+}
+
+.toolbarpaletteitem-box[type="spacer"][place="palette"],
+.toolbarpaletteitem-box[type="spring"][place="palette"] {
+  margin-bottom: 2px;
+  width: 50px;
+  height: 50px;
+}
+
+.toolbarpaletteitem-box[type="spring"][place] {
+  background: url("chrome://global/skin/toolbar/spring.png") no-repeat center;
+}
+
+/* ..... drag and drop feedback ..... */
+
+toolbarpaletteitem[place="toolbar"] {
+  margin-left: -2px;
+  margin-right: -2px;
+  border-left: 2px solid transparent;
+  border-right: 2px solid transparent;
+}
+
+toolbarpaletteitem[dragover="left"] {
+  border-left-color: #000000;
+}
+
+toolbarpaletteitem[dragover="right"] {
+  border-right-color: #000000;
+}
diff --git a/comm/suite/themes/modern/global/toolbar/chevron.gif b/comm/suite/themes/modern/global/toolbar/chevron.gif
new file mode 100644
index 0000000000..186aac9764
--- /dev/null
+++ b/comm/suite/themes/modern/global/toolbar/chevron.gif
diff --git a/comm/suite/themes/modern/global/toolbar/chevron.png b/comm/suite/themes/modern/global/toolbar/chevron.png
new file mode 100644
index 0000000000..7b7a9a1d9e
--- /dev/null
+++ b/comm/suite/themes/modern/global/toolbar/chevron.png
diff --git a/comm/suite/themes/modern/global/toolbar/mbgrip-arrow.gif b/comm/suite/themes/modern/global/toolbar/mbgrip-arrow.gif
new file mode 100644
index 0000000000..0b0715ca1d
--- /dev/null
+++ b/comm/suite/themes/modern/global/toolbar/mbgrip-arrow.gif
diff --git a/comm/suite/themes/modern/global/toolbar/mbgrip-arrow.png b/comm/suite/themes/modern/global/toolbar/mbgrip-arrow.png
new file mode 100644
index 0000000000..6e4828cb66
--- /dev/null
+++ b/comm/suite/themes/modern/global/toolbar/mbgrip-arrow.png
diff --git a/comm/suite/themes/modern/global/toolbar/spring.png b/comm/suite/themes/modern/global/toolbar/spring.png
new file mode 100644
index 0000000000..16ba2f6b1c
--- /dev/null
+++ b/comm/suite/themes/modern/global/toolbar/spring.png
diff --git a/comm/suite/themes/modern/global/toolbar/tb-mid.gif b/comm/suite/themes/modern/global/toolbar/tb-mid.gif
new file mode 100644
index 0000000000..b41b42b925
--- /dev/null
+++ b/comm/suite/themes/modern/global/toolbar/tb-mid.gif
diff --git a/comm/suite/themes/modern/global/toolbar/tb-mid.png b/comm/suite/themes/modern/global/toolbar/tb-mid.png
new file mode 100644
index 0000000000..ec36d448a4
--- /dev/null
+++ b/comm/suite/themes/modern/global/toolbar/tb-mid.png
diff --git a/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-act.gif b/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-act.gif
new file mode 100644
index 0000000000..a7af50a254
--- /dev/null
+++ b/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-act.gif
diff --git a/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-act.png b/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-act.png
new file mode 100644
index 0000000000..23d527d458
--- /dev/null
+++ b/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-act.png
diff --git a/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-clps-act.gif b/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-clps-act.gif
new file mode 100644
index 0000000000..4e44940114
--- /dev/null
+++ b/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-clps-act.gif
diff --git a/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-clps-act.png b/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-clps-act.png
new file mode 100644
index 0000000000..4c277a704c
--- /dev/null
+++ b/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-clps-act.png
diff --git a/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-clps.gif b/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-clps.gif
new file mode 100644
index 0000000000..b7d879acfa
--- /dev/null
+++ b/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-clps.gif
diff --git a/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-clps.png b/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-clps.png
new file mode 100644
index 0000000000..52dca015bc
--- /dev/null
+++ b/comm/suite/themes/modern/global/toolbar/tbgrip-arrow-clps.png
diff --git a/comm/suite/themes/modern/global/toolbar/tbgrip-arrow.gif b/comm/suite/themes/modern/global/toolbar/tbgrip-arrow.gif
new file mode 100644
index 0000000000..cc4c647156
--- /dev/null
+++ b/comm/suite/themes/modern/global/toolbar/tbgrip-arrow.gif
diff --git a/comm/suite/themes/modern/global/toolbar/tbgrip-arrow.png b/comm/suite/themes/modern/global/toolbar/tbgrip-arrow.png
new file mode 100644
index 0000000000..e90a1c0a5a
--- /dev/null
+++ b/comm/suite/themes/modern/global/toolbar/tbgrip-arrow.png
diff --git a/comm/suite/themes/modern/global/toolbarbutton.css b/comm/suite/themes/modern/global/toolbarbutton.css
new file mode 100644
index 0000000000..1b0ba564fe
--- /dev/null
+++ b/comm/suite/themes/modern/global/toolbarbutton.css
@@ -0,0 +1,146 @@
+/* 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/. */
+
+/* ===== toolbarbutton.css ==============================================
+  == Styles used by XUL toolbarbutton elements.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: toolbarbutton ::::: */
+
+toolbarbutton {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  border: 1px solid transparent;
+  padding: 1px 2px;
+  font: message-box;
+}
+
+.toolbarbutton-icon[label]:not([label=""]),
+.toolbarbutton-icon[type="menu"] {
+  margin-inline-end: 2px;
+}
+
+.toolbarbutton-text {
+  margin: 0px !important;
+  text-align: center;
+}
+
+.tabbable {
+  -moz-user-focus: normal !important;
+}
+
+toolbarbutton:focus,
+toolbarbutton:hover {
+  border-top-color: #EEF0F3;
+  border-right-color: #86929E;
+  border-bottom-color: #86929E;
+  border-left-color: #EEF0F3;
+}
+
+toolbarbutton:hover:active,
+toolbarbutton[open="true"] {
+  border-top-color: #86929E;
+  border-right-color: #EEF0F3;
+  border-bottom-color: #EEF0F3;
+  border-left-color: #86929E;
+  padding-top: 2px;
+  padding-bottom: 0px;
+  padding-inline-start: 3px;
+  padding-inline-end: 1px;
+}
+
+toolbarbutton[disabled="true"] {
+  border-color: transparent !important;
+  padding: 1px 2px !important;
+  color: #9399AB !important;
+}
+
+/* ..... checked state ..... */
+
+toolbarbutton[checked="true"] {
+  border-top-color: #454C55 !important;
+  border-right-color: #7D848D !important;
+  border-bottom-color: #7D848D !important;
+  border-left-color: #454C55 !important;
+}
+
+toolbarbutton:not(.devtools-toolbarbutton)[checked="true"] {
+  background-color: #8C9AA8 !important;
+  color: #EFF1F4;
+}
+
+toolbarbutton[checked="true"]:hover:active {
+  padding: 1px 2px;
+}
+
+/* ::::: toolbarbutton menu ::::: */
+
+.toolbarbutton-menu-dropmarker {
+  list-style-image: url("chrome://global/skin/button/tbmenu-arrow.png");
+  -moz-image-region: auto; /* cut off inheritance */
+  padding: 0px;
+  border: none !important;
+  background-color: transparent !important;
+}
+
+.toolbarbutton-menu-dropmarker[disabled="true"] {
+  list-style-image: url("chrome://global/skin/button/tbmenu-arrow-dis.png");
+}
+
+.toolbarbutton-menu-dropmarker[open="true"] {
+  list-style-image: url("chrome://global/skin/button/tbmenu-arrow-act.png");
+}
+
+/* ::::: toolbarbutton menu-button ::::: */
+
+.toolbarbutton-menubutton-button {
+  font: inherit;
+}
+
+/* ..... dropmarker ..... */
+
+.toolbarbutton-menubutton-dropmarker {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  margin-top: 20px;
+  margin-bottom: 15px;
+  margin-inline-start: 40px;
+  margin-inline-end: 5px;
+  padding: 0px;
+  border: none !important;
+  background-color: transparent !important;
+  width: 13px;
+  height: 11px;
+  list-style-image: url("chrome://global/skin/button/tbmbtn-arrow.png");
+  -moz-image-region: auto; /* cut off inheritance */
+}
+
+toolbarbutton:hover > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton:hover > stack > .toolbarbutton-menubutton-dropmarker {
+  list-style-image: url("chrome://global/skin/button/tbmbtn-arrow-hov.png");
+}
+
+toolbarbutton[open="true"] > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[open="true"] > stack > .toolbarbutton-menubutton-dropmarker {
+  list-style-image: url("chrome://global/skin/button/tbmbtn-arrow-act.png");
+}
+
+toolbarbutton[disabled="true"] > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[disabled="true"] > stack > .toolbarbutton-menubutton-dropmarker,
+toolbarbutton[disabled="true"]:hover > stack > .toolbarbutton-menubutton-dropmarker
+{
+  list-style-image: none;
+}
+
+/* ::::: Devtools toolbarbuttons ::::: */
+
+.devtools-toolbarbutton[type=menu] > .toolbarbutton-menu-dropmarker,
+.devtools-toolbarbutton[type=menu-button] > .toolbarbutton-menubutton-dropmarker {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-inline-start: 0px;
+  margin-inline-end: 0px;
+}
diff --git a/comm/suite/themes/modern/global/tree.css b/comm/suite/themes/modern/global/tree.css
new file mode 100644
index 0000000000..0acc157a7f
--- /dev/null
+++ b/comm/suite/themes/modern/global/tree.css
@@ -0,0 +1,278 @@
+/* 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/. */
+
+/* ===== tree.css ===================================================
+  == Styles used by the XUL outline element.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: tree ::::: */
+
+tree {
+  margin: 0px 4px;
+  border: 1px solid #5D616E;
+  background-color: #FFFFFF;
+  color: #000000;
+}
+
+/* ::::: tree focusring ::::: */
+
+.focusring > .tree-stack > .tree-rows > .tree-bodybox {
+  border: 1px solid transparent;  
+}
+
+.focusring:focus > .tree-stack > .tree-rows > .tree-bodybox {
+  border: 1px solid #000000;
+}
+
+/* ::::: tree rows ::::: */
+
+treechildren::-moz-tree-row {
+  border: 1px solid transparent;
+  background-color: transparent;
+  min-height: 18px;
+  height: 1.3em;
+}
+
+/* ::::: alternating background ::::: */
+treechildren[alternatingbackground="true"]::-moz-tree-row(odd) {
+  background-color: #f3f3f3;
+}
+
+treechildren[alternatingbackground="true"]::-moz-tree-row(odd, selected),
+treechildren::-moz-tree-row(selected) {
+  background-color: #C7D0D9;
+}
+
+treechildren[alternatingbackground="true"]::-moz-tree-row(odd, selected, focus),
+treechildren::-moz-tree-row(selected, focus) {
+  background-color: #424F63;
+}
+
+treechildren::-moz-tree-row(current, focus) {
+  border-top-color: #000000;
+  border-bottom-color: #000000;
+}
+
+/* ::::: tree cells ::::: */
+
+treechildren::-moz-tree-cell {
+  padding: 0px 2px;
+}
+
+treechildren::-moz-tree-cell-text {
+  color: inherit;
+}
+
+treechildren::-moz-tree-cell-text(selected) {
+  color: #000000;
+}
+
+treechildren::-moz-tree-cell-text(selected, focus) {
+  color: #FFFFFF;
+}
+
+/* ::::: lines connecting cells ::::: */
+
+treechildren::-moz-tree-line {
+  border: 1px dotted #808080;
+}
+
+treechildren::-moz-tree-line(selected, focus) {
+  border: 1px dotted #FFFFFF;
+}
+
+/* ::::: tree separator ::::: */
+
+treechildren::-moz-tree-separator {
+  border-top: 1px solid #7A8490;
+  border-bottom: 1px solid #FEFEFE;
+}
+
+/* ::::: drop feedback ::::: */
+
+treechildren::-moz-tree-cell-text(primary, dropOn) {
+  background-color: #424F63;
+  color: #FFFFFF;
+}
+
+treechildren::-moz-tree-drop-feedback {
+  background-color: #424F63;
+  width: 50px;
+  height: 2px;
+  margin-inline-start: 5px;
+}
+
+/* ::::: tree checkbox ::::: */
+
+treechildren::-moz-tree-checkbox {
+  list-style-image: url("chrome://global/skin/tree/checkbox.png");
+}
+
+treechildren::-moz-tree-checkbox(checked) {
+  list-style-image: url("chrome://global/skin/tree/checkbox-checked.png");
+}
+
+/* ::::: tree progress meter ::::: */
+
+treechildren::-moz-tree-progressmeter {
+  margin: 2px 4px;
+  border: 1px solid;
+  border-top-color: #8997A1;
+  border-right-color: #C7D0D9;
+  border-bottom-color: #C7D0D9;
+  border-left-color: #8997A1;
+  color: #6B7B8D;
+}
+
+treechildren::-moz-tree-progressmeter(progressUndetermined) {
+  list-style-image: url("chrome://global/skin/progressmeter/progress-busy.png");
+}
+
+treechildren::-moz-tree-cell-text(progressmeter) {
+  margin: 2px 4px;
+ }
+
+/* ::::: tree columns ::::: */
+
+treecol,
+treecolpicker {
+  -moz-box-align: center;
+  -moz-box-pack: center;
+  border: 1px solid;
+  border-top-color: #C7D0D9;
+  border-right-color: #63676B;
+  border-bottom-color: #63676B;
+  border-left-color: #C7D0D9;
+  background-color: #C7D0D9;
+  color: #000000;
+  padding: 0px 4px;
+  min-width: 19px;
+}
+
+.treecol-image {
+  padding: 0px 1px;
+}
+
+.treecol-text {
+  margin: 0px !important;
+}
+
+treecol[hideheader="true"] {
+  border: none;
+  padding: 0;
+}
+
+/* ..... internal box ..... */
+
+treecol:hover:active,
+treecolpicker:hover:active {
+  border-top: 1px solid;
+  border-right: 1px solid;
+  border-bottom: 1px solid;
+  border-left: 2px solid;
+  border-color: #A5ABB0;
+  padding-top: 1px;
+  padding-bottom: 0px;
+  padding-inline-start: 5px;
+  padding-inline-end: 4px;
+}
+
+.treecol-image:hover:active {
+  padding-top: 1px;
+  padding-bottom: 0px;
+  padding-inline-start: 2px;
+  padding-inline-end: 1px;
+}
+
+/* ::::: column drag and drop styles ::::: */
+
+treecol[dragging="true"] {
+  border-top-color: #000000 !important;
+  border-right-color: #000000 !important;
+  border-bottom-color: #000000 !important;
+  border-left-color: #000000 !important;
+  background-color: #90A1B3 !important;
+  color: #FFFFFF !important;
+}
+
+treecol[insertafter="true"]:-moz-locale-dir(ltr),
+treecol[insertbefore="true"]:-moz-locale-dir(rtl) {
+  border-right-color: #000000;
+}
+
+treecol[insertafter="true"]:-moz-locale-dir(rtl),
+treecol[insertbefore="true"]:-moz-locale-dir(ltr) {
+  border-left-color: #000000;
+}
+
+treechildren::-moz-tree-column(insertbefore) {
+  border-inline-start: 1px solid #AAAAAA;
+}
+
+treechildren::-moz-tree-column(insertafter) {
+  border-inline-end: 1px solid #AAAAAA;
+}
+
+/* ::::: sort direction indicator :::::  */
+
+.treecol-sortdirection {
+  list-style-image: none;
+}
+
+.treecol-sortdirection[sortDirection="ascending"] {
+  list-style-image: url("chrome://global-platform/skin/tree/sort-asc.png");
+}
+
+.treecol-sortdirection[sortDirection="descending"] {
+  list-style-image: url("chrome://global-platform/skin/tree/sort-dsc.png");
+}
+
+/* ::::: column picker :::::  */
+
+.tree-columnpicker-icon {
+  list-style-image: url("chrome://global/skin/tree/columnpicker.png");
+}
+
+/* ::::: twisty :::::  */
+
+treechildren::-moz-tree-twisty {
+  padding-inline-end: 2px;
+  width: 10px; /* The image's width is 10 pixels */
+  list-style-image: url("chrome://global/skin/tree/twisty-clsd.png");
+}
+
+treechildren::-moz-tree-twisty(open) {
+  width: 10px; /* The image's width is 10 pixels */
+  list-style-image: url("chrome://global/skin/tree/twisty-open.png");
+}
+
+treechildren::-moz-tree-indentation {
+  width: 16px;
+}
+
+/* ::::: editable tree ::::: */
+
+treechildren::-moz-tree-row(selected, editing) {
+  background-color: transparent;
+}
+
+treechildren::-moz-tree-cell-text(selected, editing) {
+  color: inherit;
+}
+
+.tree-input {
+  -moz-appearance: none;
+  border-top-color: #C7D0D9;
+  border-bottom-color: #C7D0D9;
+  border-left-color: #C7D0D9;
+  border-right-color: #C7D0D9;
+  border: 1px solid #C7D0D9;
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-inline-start: -4px;
+  margin-inline-end: 0px;
+  padding: 1px;
+}
diff --git a/comm/suite/themes/modern/global/tree/checkbox-checked.gif b/comm/suite/themes/modern/global/tree/checkbox-checked.gif
new file mode 100644
index 0000000000..f9fa6338de
--- /dev/null
+++ b/comm/suite/themes/modern/global/tree/checkbox-checked.gif
diff --git a/comm/suite/themes/modern/global/tree/checkbox-checked.png b/comm/suite/themes/modern/global/tree/checkbox-checked.png
new file mode 100644
index 0000000000..bae3ab8cc7
--- /dev/null
+++ b/comm/suite/themes/modern/global/tree/checkbox-checked.png
diff --git a/comm/suite/themes/modern/global/tree/checkbox.gif b/comm/suite/themes/modern/global/tree/checkbox.gif
new file mode 100644
index 0000000000..4b6110c037
--- /dev/null
+++ b/comm/suite/themes/modern/global/tree/checkbox.gif
diff --git a/comm/suite/themes/modern/global/tree/checkbox.png b/comm/suite/themes/modern/global/tree/checkbox.png
new file mode 100644
index 0000000000..541c2f6374
--- /dev/null
+++ b/comm/suite/themes/modern/global/tree/checkbox.png
diff --git a/comm/suite/themes/modern/global/tree/columnpicker.gif b/comm/suite/themes/modern/global/tree/columnpicker.gif
new file mode 100644
index 0000000000..a4ef0d6080
--- /dev/null
+++ b/comm/suite/themes/modern/global/tree/columnpicker.gif
diff --git a/comm/suite/themes/modern/global/tree/columnpicker.png b/comm/suite/themes/modern/global/tree/columnpicker.png
new file mode 100644
index 0000000000..6ba273a2fc
--- /dev/null
+++ b/comm/suite/themes/modern/global/tree/columnpicker.png
diff --git a/comm/suite/themes/modern/global/tree/sort-asc.gif b/comm/suite/themes/modern/global/tree/sort-asc.gif
new file mode 100644
index 0000000000..5e13c7398f
--- /dev/null
+++ b/comm/suite/themes/modern/global/tree/sort-asc.gif
diff --git a/comm/suite/themes/modern/global/tree/sort-asc.png b/comm/suite/themes/modern/global/tree/sort-asc.png
new file mode 100644
index 0000000000..4dc365f1fe
--- /dev/null
+++ b/comm/suite/themes/modern/global/tree/sort-asc.png
diff --git a/comm/suite/themes/modern/global/tree/sort-dsc.gif b/comm/suite/themes/modern/global/tree/sort-dsc.gif
new file mode 100644
index 0000000000..fa957ac1e7
--- /dev/null
+++ b/comm/suite/themes/modern/global/tree/sort-dsc.gif
diff --git a/comm/suite/themes/modern/global/tree/sort-dsc.png b/comm/suite/themes/modern/global/tree/sort-dsc.png
new file mode 100644
index 0000000000..a24720dc1b
--- /dev/null
+++ b/comm/suite/themes/modern/global/tree/sort-dsc.png
diff --git a/comm/suite/themes/modern/global/tree/twisty-clsd.gif b/comm/suite/themes/modern/global/tree/twisty-clsd.gif
new file mode 100644
index 0000000000..3efbd5b2d7
--- /dev/null
+++ b/comm/suite/themes/modern/global/tree/twisty-clsd.gif
diff --git a/comm/suite/themes/modern/global/tree/twisty-clsd.png b/comm/suite/themes/modern/global/tree/twisty-clsd.png
new file mode 100644
index 0000000000..df1ab82608
--- /dev/null
+++ b/comm/suite/themes/modern/global/tree/twisty-clsd.png
diff --git a/comm/suite/themes/modern/global/tree/twisty-open.gif b/comm/suite/themes/modern/global/tree/twisty-open.gif
new file mode 100644
index 0000000000..2117e5ff70
--- /dev/null
+++ b/comm/suite/themes/modern/global/tree/twisty-open.gif
diff --git a/comm/suite/themes/modern/global/tree/twisty-open.png b/comm/suite/themes/modern/global/tree/twisty-open.png
new file mode 100644
index 0000000000..955ebed9e3
--- /dev/null
+++ b/comm/suite/themes/modern/global/tree/twisty-open.png
diff --git a/comm/suite/themes/modern/global/wizard.css b/comm/suite/themes/modern/global/wizard.css
new file mode 100644
index 0000000000..62f3b010e8
--- /dev/null
+++ b/comm/suite/themes/modern/global/wizard.css
@@ -0,0 +1,58 @@
+/* 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/. */
+
+/* ===== wizard.css =====================================================
+  == Styles used by the wizards which contains buttons for stepping
+  == through a wizard.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.wizard-header {
+  border-top: 1px solid #94AACE;
+  border-bottom: 1px solid #000000;
+  padding: 10px 0px;
+  background-color: #5B7693;
+  color: #ffffff;
+}
+
+.wizard-header-description[value=""] {
+  display: none;
+}
+
+.wizard-header-label {
+  margin-inline-start: 23px !important;
+  font-weight: bold;
+}
+
+.wizard-header-description {
+  margin-inline-start: 44px !important;
+}
+
+wizard[branded="true"] .wizard-header-icon {
+  list-style-image: url("chrome://branding/content/icon48.png");
+  margin-inline-end: 5px;
+}
+
+.wizard-page-box {
+  margin: 10px 44px;
+}
+
+.wizard-buttons-separator {
+  margin-bottom: 0px !important;
+}
+
+.wizard-buttons-box-2,
+.wizard-buttons-btm {
+  padding: 5px;
+}
+
+.wizard-button[dlgtype="finish"],
+.wizard-button[dlgtype="next"] {
+  margin-inline-start: 0px;
+}
+
+.wizard-button[dlgtype="back"] {
+  margin-inline-end: 0px;
+}
diff --git a/comm/suite/themes/modern/icon.png b/comm/suite/themes/modern/icon.png
new file mode 100644
index 0000000000..7afda68363
--- /dev/null
+++ b/comm/suite/themes/modern/icon.png
diff --git a/comm/suite/themes/modern/install.rdf b/comm/suite/themes/modern/install.rdf
new file mode 100644
index 0000000000..582aefea56
--- /dev/null
+++ b/comm/suite/themes/modern/install.rdf
@@ -0,0 +1,47 @@
+<?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/. -->
+
+
+#filter substitution
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>modern@themes.mozilla.org</em:id>
+    <em:version>@SEAMONKEY_VERSION@</em:version>
+
+    <!-- Target Application this theme can install into,
+        with minimum and maximum supported versions. -->
+    <em:targetApplication>
+      <Description>
+        <em:id>{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}</em:id>
+        <em:minVersion>@SEAMONKEY_VERSION@</em:minVersion>
+        <em:maxVersion>@SEAMONKEY_VERSION@</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+
+    <!-- Front End MetaData -->
+    <em:name>SeaMonkey Modern</em:name>
+    <em:description>A contemporary theme for all components.</em:description>
+
+    <!-- EXTENSION AUTHORS!
+         DO NOT COPY THIS PROPERTY INTO YOUR INSTALL RDF FILES
+         It will cause users not to be informed of incompatibilities
+         with your extension when they are updated with Software Update
+         and your extension will become unavailable to them!
+         -->
+    <em:appManaged>true</em:appManaged>
+
+    <em:locked>true</em:locked>
+
+    <!-- Front End Integration Hooks (used by Theme Manager)-->
+    <em:creator>Mozilla Contributors</em:creator>
+    <em:contributor>Mozilla Contributors</em:contributor>
+
+    <em:internalName>modern/1.0</em:internalName>
+  </Description>
+
+</RDF>
diff --git a/comm/suite/themes/modern/jar.mn b/comm/suite/themes/modern/jar.mn
new file mode 100644
index 0000000000..cecaf5359b
--- /dev/null
+++ b/comm/suite/themes/modern/jar.mn
@@ -0,0 +1,766 @@
+# 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/.
+
+modern.jar:
+% override chrome://mozapps/skin/places/defaultFavicon.svg chrome://communicator/skin/places/bookmark-item.svg
+% skin communicator modern/1.0 %skin/modern/communicator/
+% skin editor modern/1.0 %skin/modern/editor/
+% skin global modern/1.0 %skin/modern/global/
+% skin global-platform modern/1.0 %skin/modern/global/gtk/
+% skin global-platform modern/1.0 %skin/modern/global/mac/ os=Darwin
+% skin global-platform modern/1.0 %skin/modern/global/win/ os=WINNT
+% skin messenger modern/1.0 %skin/modern/messenger/
+% skin mozapps modern/1.0 %skin/modern/mozapps/
+% skin navigator modern/1.0 %skin/modern/navigator/
+% skin messenger-newsblog modern/1.0 %skin/modern/messenger-newsblog/
+% style chrome://communicator/content/customizeToolbar.xul chrome://navigator/skin/navigator.css
+% style chrome://communicator/content/customizeToolbar.xul chrome://messenger/skin/primaryToolbar.css
+% style chrome://communicator/content/customizeToolbar.xul chrome://messenger/skin/messengercompose/messengercompose.css
+% style chrome://communicator/content/customizeToolbar.xul chrome://messenger/skin/smime/msgCompSMIMEOverlay.css
+% style chrome://communicator/content/customizeToolbar.xul chrome://messenger/skin/addressbook/addressbook.css
+% style chrome://communicator/content/customizeToolbar.xul chrome://editor/skin/editorPrimaryToolbar.css
+% style chrome://communicator/content/customizeToolbar.xul chrome://editor/skin/editorFormatToolbar.css
+  skin/modern/communicator/brand.css                               (communicator/brand.css)
+  skin/modern/communicator/blockedSite.css                         (communicator/blockedSite.css)
+  skin/modern/communicator/certError.css                           (communicator/certError.css)
+  skin/modern/communicator/customizeToolbar.css                    (communicator/customizeToolbar.css)
+  skin/modern/communicator/datetimepicker.css                      (communicator/datetimepicker.css)
+  skin/modern/communicator/numberbox.css                           (communicator/numberbox.css)
+  skin/modern/communicator/prefpanels.css                          (communicator/prefpanels.css)
+  skin/modern/communicator/preferences.css                         (communicator/preferences.css)
+  skin/modern/communicator/spinbuttons.css                         (communicator/spinbuttons.css)
+  skin/modern/communicator/tasksOverlay.css                        (communicator/tasksOverlay.css)
+  skin/modern/communicator/button.css                              (communicator/button.css)
+  skin/modern/communicator/toolbar.css                             (communicator/toolbar.css)
+  skin/modern/communicator/dialogs.css                             (communicator/dialogs.css)
+  skin/modern/communicator/smileys.css                             (communicator/smileys.css)
+  skin/modern/communicator/communicator.css                        (communicator/communicator.css)
+  skin/modern/communicator/aboutPrivateBrowsing.css                (communicator/aboutPrivateBrowsing.css)
+  skin/modern/communicator/aboutSessionRestore.css                 (communicator/aboutSessionRestore.css)
+  skin/modern/communicator/viewSourceOverlay.css                   (communicator/viewSourceOverlay.css)
+  skin/modern/communicator/brand/throbber-anim.png                 (communicator/brand/throbber-anim.png)
+  skin/modern/communicator/brand/throbber-single.png               (communicator/brand/throbber-single.png)
+  skin/modern/communicator/brand/throbber16-anim.png               (communicator/brand/throbber16-anim.png)
+  skin/modern/communicator/brand/throbber16-single.png             (communicator/brand/throbber16-single.png)
+  skin/modern/communicator/console/console.css                     (communicator/console/console.css)
+  skin/modern/communicator/console/error-caret.png                 (communicator/console/error-caret.png)
+  skin/modern/communicator/console/error-dash.png                  (communicator/console/error-dash.png)
+  skin/modern/communicator/dataman/dataman.css                     (communicator/dataman/dataman.css)
+  skin/modern/communicator/dataman/datamanIcon-16.png              (communicator/dataman/datamanIcon-16.png)
+  skin/modern/communicator/downloads/dl-remove.png                 (communicator/downloads/dl-remove.png)
+  skin/modern/communicator/downloads/downloadButtons.png           (communicator/downloads/downloadButtons.png)
+  skin/modern/communicator/downloads/downloadmanager.css           (communicator/downloads/downloadmanager.css)
+  skin/modern/communicator/feed-subscribe.css                      (communicator/feed-subscribe.css)
+  skin/modern/communicator/feed-subscribe-ui.css                   (communicator/feed-subscribe-ui.css)
+  skin/modern/communicator/fullscreen-video.css                    (communicator/fullscreen-video.css)
+  skin/modern/communicator/helpviewer/help.css                     (communicator/helpviewer/help.css)
+  skin/modern/communicator/icons/alwaysAsk.png                     (communicator/icons/alwaysAsk.png)
+  skin/modern/communicator/icons/application.png                   (communicator/icons/application.png)
+  skin/modern/communicator/icons/audioFeedIcon.png                 (communicator/icons/feedIcon.png)
+  skin/modern/communicator/icons/closeFullScreenVideo.png          (communicator/icons/closeFullScreenVideo.png)
+  skin/modern/communicator/icons/btn1.png                          (communicator/icons/btn1.png)
+  skin/modern/communicator/icons/common.png                        (communicator/icons/common.png)
+  skin/modern/communicator/icons/common-small.png                  (communicator/icons/common-small.png)
+  skin/modern/communicator/icons/feedIcon.png                      (communicator/icons/feedIcon.png)
+  skin/modern/communicator/icons/feedIcon16.png                    (communicator/icons/feedIcon16.png)
+  skin/modern/communicator/icons/geo.png                           (communicator/icons/geo.png)
+  skin/modern/communicator/icons/geolocation-16.png                (communicator/icons/geolocation-16.png)
+  skin/modern/communicator/icons/geolocation-64.png                (communicator/icons/geolocation-64.png)
+  skin/modern/communicator/icons/identity.png                      (communicator/icons/identity.png)
+  skin/modern/communicator/icons/loading.png                       (communicator/icons/loading.png)
+  skin/modern/communicator/icons/lock-broken.png                   (communicator/icons/lock-broken.png)
+  skin/modern/communicator/icons/lock-broken-16.png                (communicator/icons/lock-broken-16.png)
+  skin/modern/communicator/icons/lock-insecure.png                 (communicator/icons/lock-insecure.png)
+  skin/modern/communicator/icons/lock-insecure-16.png              (communicator/icons/lock-insecure-16.png)
+  skin/modern/communicator/icons/lock-secure.png                   (communicator/icons/lock-secure.png)
+  skin/modern/communicator/icons/lock-secure-16.png                (communicator/icons/lock-secure-16.png)
+  skin/modern/communicator/icons/notification-16.png               (communicator/icons/notification-16.png)
+  skin/modern/communicator/icons/notification-64.png               (communicator/icons/notification-64.png)
+  skin/modern/communicator/icons/notification-icons.svg            (communicator/icons/notification-icons.svg)
+  skin/modern/communicator/icons/offline.png                       (communicator/icons/offline.png)
+  skin/modern/communicator/icons/online.png                        (communicator/icons/online.png)
+  skin/modern/communicator/icons/save.png                          (communicator/icons/save.png)
+  skin/modern/communicator/icons/smileys/smiley-smile.png          (communicator/icons/smileys/smiley-smile.png)
+  skin/modern/communicator/icons/smileys/smiley-frown.png          (communicator/icons/smileys/smiley-frown.png)
+  skin/modern/communicator/icons/smileys/smiley-wink.png           (communicator/icons/smileys/smiley-wink.png)
+  skin/modern/communicator/icons/smileys/smiley-tongue.png         (communicator/icons/smileys/smiley-tongue.png)
+  skin/modern/communicator/icons/smileys/smiley-laughing.png       (communicator/icons/smileys/smiley-laughing.png)
+  skin/modern/communicator/icons/smileys/smiley-embarrassed.png    (communicator/icons/smileys/smiley-embarrassed.png)
+  skin/modern/communicator/icons/smileys/smiley-undecided.png      (communicator/icons/smileys/smiley-undecided.png)
+  skin/modern/communicator/icons/smileys/smiley-surprise.png       (communicator/icons/smileys/smiley-surprise.png)
+  skin/modern/communicator/icons/smileys/smiley-kiss.png           (communicator/icons/smileys/smiley-kiss.png)
+  skin/modern/communicator/icons/smileys/smiley-yell.png           (communicator/icons/smileys/smiley-yell.png)
+  skin/modern/communicator/icons/smileys/smiley-cool.png           (communicator/icons/smileys/smiley-cool.png)
+  skin/modern/communicator/icons/smileys/smiley-money.png          (communicator/icons/smileys/smiley-money.png)
+  skin/modern/communicator/icons/smileys/smiley-foot.png           (communicator/icons/smileys/smiley-foot.png)
+  skin/modern/communicator/icons/smileys/smiley-innocent.png       (communicator/icons/smileys/smiley-innocent.png)
+  skin/modern/communicator/icons/smileys/smiley-cry.png            (communicator/icons/smileys/smiley-cry.png)
+  skin/modern/communicator/icons/smileys/smiley-sealed.png         (communicator/icons/smileys/smiley-sealed.png)
+  skin/modern/communicator/icons/videoFeedIcon.png                 (communicator/icons/feedIcon.png)
+  skin/modern/communicator/places/allBookmarks.png                 (communicator/places/allBookmarks.png)
+  skin/modern/communicator/places/bookmark.png                     (communicator/places/bookmark.png)
+  skin/modern/communicator/places/bookmark-folder-closed.png       (communicator/places/bookmark-folder-closed.png)
+  skin/modern/communicator/places/bookmark-folder-dis.png          (communicator/places/bookmark-folder-dis.png)
+  skin/modern/communicator/places/bookmark-folder-open.png         (communicator/places/bookmark-folder-open.png)
+  skin/modern/communicator/places/bookmark-item-dis.png            (communicator/places/bookmark-item-dis.png)
+  skin/modern/communicator/places/bookmark-item-updated.png        (communicator/places/bookmark-item-updated.png)
+  skin/modern/communicator/places/bookmark-item.svg                (communicator/places/bookmark-item.svg)
+  skin/modern/communicator/places/bookmarks.css                    (communicator/places/bookmarks.css)
+  skin/modern/communicator/places/bookmarksMenu.png                (communicator/places/bookmarksMenu.png)
+  skin/modern/communicator/places/bookmarksToolbar.css             (communicator/places/bookmarksToolbar.css)
+  skin/modern/communicator/places/bookmarksToolbar.png             (communicator/places/bookmarksToolbar.png)
+  skin/modern/communicator/places/calendar.png                     (communicator/places/calendar.png)
+  skin/modern/communicator/places/editBookmarkOverlay.css          (communicator/places/editBookmarkOverlay.css)
+  skin/modern/communicator/places/history.png                      (communicator/places/history.png)
+  skin/modern/communicator/places/livemark-folder.png              (communicator/places/livemark-folder.png)
+  skin/modern/communicator/places/organizer.css                    (communicator/places/organizer.css)
+  skin/modern/communicator/places/query.png                        (communicator/places/query.png)
+  skin/modern/communicator/places/tag.png                          (communicator/places/tag.png)
+  skin/modern/communicator/places/toolbarDropMarker.png            (communicator/places/toolbarDropMarker.png)
+  skin/modern/communicator/places/unsortedBookmarks.png            (communicator/places/unsortedBookmarks.png)
+  skin/modern/communicator/profile/migrate.png                     (communicator/profile/migrate.png)
+  skin/modern/communicator/profile/profile.png                     (communicator/profile/profile.png)
+  skin/modern/communicator/profile/profile.css                     (communicator/profile/profile.css)
+  skin/modern/communicator/sanitizeDialog.css                      (communicator/sanitizeDialog.css)
+  skin/modern/communicator/search/engineManager.css                (communicator/search/engineManager.css)
+  skin/modern/communicator/search/mainwindow-dropdown-arrow.png    (communicator/search/mainwindow-dropdown-arrow.png)
+  skin/modern/communicator/search/search.css                       (communicator/search/search.css)
+  skin/modern/communicator/search/searchbar.css                    (communicator/search/searchbar.css)
+  skin/modern/communicator/sidebar/sidebarBindings.xml             (communicator/sidebar/sidebarBindings.xml)
+  skin/modern/communicator/sidebar/sbar-top.png                    (communicator/sidebar/sbar-top.png)
+  skin/modern/communicator/sidebar/sbar-top-tabopen.png            (communicator/sidebar/sbar-top-tabopen.png)
+  skin/modern/communicator/sidebar/sbtab-rit-top-act.png           (communicator/sidebar/sbtab-rit-top-act.png)
+  skin/modern/communicator/sidebar/sbtab-rit-btm-act.png           (communicator/sidebar/sbtab-rit-btm-act.png)
+  skin/modern/communicator/sidebar/sbtab-rit-top.png               (communicator/sidebar/sbtab-rit-top.png)
+  skin/modern/communicator/sidebar/sbtab-mid.png                   (communicator/sidebar/sbtab-mid.png)
+  skin/modern/communicator/sidebar/sbtab-lft-act.png               (communicator/sidebar/sbtab-lft-act.png)
+  skin/modern/communicator/sidebar/sbtab-mid-act.png               (communicator/sidebar/sbtab-mid-act.png)
+  skin/modern/communicator/sidebar/sbtab-rit-top-hov.png           (communicator/sidebar/sbtab-rit-top-hov.png)
+  skin/modern/communicator/sidebar/sbtab-rit-btm-hov.png           (communicator/sidebar/sbtab-rit-btm-hov.png)
+  skin/modern/communicator/sidebar/sbtab-rit-top-sel.png           (communicator/sidebar/sbtab-rit-top-sel.png)
+  skin/modern/communicator/sidebar/sbtab-mid-sel.png               (communicator/sidebar/sbtab-mid-sel.png)
+  skin/modern/communicator/sidebar/sbtab-lft.png                   (communicator/sidebar/sbtab-lft.png)
+  skin/modern/communicator/sidebar/sbtab-lft-sel.png               (communicator/sidebar/sbtab-lft-sel.png)
+  skin/modern/communicator/sidebar/sbpicker-arrow.png              (communicator/sidebar/sbpicker-arrow.png)
+  skin/modern/communicator/sidebar/customize.css                   (communicator/sidebar/customize.css)
+  skin/modern/communicator/sidebar/preview.css                     (communicator/sidebar/preview.css)
+  skin/modern/communicator/sidebar/sidebar.css                     (communicator/sidebar/sidebar.css)
+  skin/modern/communicator/sidebar/sidebarListView.css             (communicator/sidebar/sidebarListView.css)
+  skin/modern/communicator/taskbar/taskbar.png                     (communicator/taskbar/taskbar.png)
+  skin/modern/communicator/taskbar/taskmenu-browser.png            (communicator/taskbar/taskmenu-browser.png)
+  skin/modern/communicator/taskbar/taskmenu-composer.png           (communicator/taskbar/taskmenu-composer.png)
+  skin/modern/communicator/taskbar/taskmenu-mailnews.png           (communicator/taskbar/taskmenu-mailnews.png)
+  skin/modern/communicator/taskbar/taskmenu-abook.png              (communicator/taskbar/taskmenu-abook.png)
+  skin/modern/communicator/toolbar/prtb-grip-btm-act.png           (communicator/toolbar/prtb-grip-btm-act.png)
+  skin/modern/communicator/toolbar/prtb-grip-btm.png               (communicator/toolbar/prtb-grip-btm.png)
+  skin/modern/communicator/toolbar/prtb-grip-mid-act.png           (communicator/toolbar/prtb-grip-mid-act.png)
+  skin/modern/communicator/toolbar/prtb-grip-mid.png               (communicator/toolbar/prtb-grip-mid.png)
+  skin/modern/communicator/toolbar/prtb-grip-top-act.png           (communicator/toolbar/prtb-grip-top-act.png)
+  skin/modern/communicator/toolbar/prtb-grip-top.png               (communicator/toolbar/prtb-grip-top.png)
+  skin/modern/communicator/toolbar/toolbarBindings.xml             (communicator/toolbar/toolbarBindings.xml)
+  skin/modern/communicator/toolbar/prtb-bg-line.png                (communicator/toolbar/prtb-bg-line.png)
+  skin/modern/communicator/toolbar/prtb-bg-noline.png              (communicator/toolbar/prtb-bg-noline.png)
+  skin/modern/communicator/xpinstall/xpinstall.css                 (communicator/xpinstall/xpinstall.css)
+  skin/modern/editor/EditorDialog.css                              (editor/EditorDialog.css)
+  skin/modern/editor/editor.css                                    (editor/editor.css)
+  skin/modern/editor/editorModeToolbar.css                         (editor/editorModeToolbar.css)
+  skin/modern/editor/editorPrimaryToolbar.css                      (editor/editorPrimaryToolbar.css)
+  skin/modern/editor/editorFormatToolbar.css                       (editor/editorFormatToolbar.css)
+  skin/modern/editor/icons/editmode-html.png                       (editor/icons/editmode-html.png)
+  skin/modern/editor/icons/editmode-normal.png                     (editor/icons/editmode-normal.png)
+  skin/modern/editor/icons/editmode-preview.png                    (editor/icons/editmode-preview.png)
+  skin/modern/editor/icons/editmode-tags.png                       (editor/icons/editmode-tags.png)
+  skin/modern/editor/icons/img-align-btm-sel.png                   (editor/icons/img-align-btm-sel.png)
+  skin/modern/editor/icons/img-align-btm.png                       (editor/icons/img-align-btm.png)
+  skin/modern/editor/icons/img-align-lft.png                       (editor/icons/img-align-lft.png)
+  skin/modern/editor/icons/img-align-mid-sel.png                   (editor/icons/img-align-mid-sel.png)
+  skin/modern/editor/icons/img-align-mid.png                       (editor/icons/img-align-mid.png)
+  skin/modern/editor/icons/img-align-rit.png                       (editor/icons/img-align-rit.png)
+  skin/modern/editor/icons/img-align-top-sel.png                   (editor/icons/img-align-top-sel.png)
+  skin/modern/editor/icons/img-align-top.png                       (editor/icons/img-align-top.png)
+  skin/modern/editor/icons/mast-editor.png                         (editor/icons/mast-editor.png)
+  skin/modern/editor/icons/btn1.png                                (editor/icons/btn1.png)
+  skin/modern/editor/icons/btn2.png                                (editor/icons/btn2.png)
+  skin/modern/editor/icons/multicolor.png                          (editor/icons/multicolor.png)
+  skin/modern/editor/icons/progress-busy.png                       (editor/icons/progress-busy.png)
+  skin/modern/editor/icons/progress-done.png                       (editor/icons/progress-done.png)
+  skin/modern/editor/icons/progress-failed.png                     (editor/icons/progress-failed.png)
+  skin/modern/global/globalBindings.xml                            (global/globalBindings.xml)
+  skin/modern/global/about.css                                     (global/about.css)
+  skin/modern/global/aboutCache.css                                (global/aboutCache.css)
+  skin/modern/global/aboutCacheEntry.css                           (global/aboutCacheEntry.css)
+  skin/modern/global/aboutMemory.css                               (global/aboutMemory.css)
+  skin/modern/global/aboutSupport.css                              (global/aboutSupport.css)
+  skin/modern/global/appPicker.css                                 (global/appPicker.css)
+  skin/modern/global/autocomplete.css                              (global/autocomplete.css)
+  skin/modern/global/button.css                                    (global/button.css)
+  skin/modern/global/checkbox.css                                  (global/checkbox.css)
+  skin/modern/global/colorpicker.css                               (global/colorpicker.css)
+  skin/modern/global/config.css                                    (global/config.css)
+  skin/modern/global/datetimeinputpickers.css                      (shared/datetimeinputpickers.css)
+  skin/modern/global/datetimepopup.css                             (shared/datetimepopup.css)
+  skin/modern/global/dialog.css                                    (global/dialog.css)
+  skin/modern/global/dropmarker.css                                (global/dropmarker.css)
+  skin/modern/global/filefield.css                                 (global/filefield.css)
+  skin/modern/global/filepicker.css                                (global/filepicker.css)
+  skin/modern/global/findBar.css                                   (global/findBar.css)
+  skin/modern/global/global.css                                    (global/global.css)
+  skin/modern/global/groupbox.css                                  (global/groupbox.css)
+  skin/modern/global/listbox.css                                   (global/listbox.css)
+  skin/modern/global/menu.css                                      (global/menu.css)
+  skin/modern/global/menulist.css                                  (global/menulist.css)
+  skin/modern/global/netError.css                                  (global/netError.css)
+  skin/modern/global/notification.css                              (global/notification.css)
+  skin/modern/global/plugins.css                                   (global/plugins.css)
+  skin/modern/global/popup.css                                     (global/popup.css)
+  skin/modern/global/preferences.css                               (global/preferences.css)
+  skin/modern/global/printPreview.css                              (global/printPreview.css)
+  skin/modern/global/printPageSetup.css                            (global/printPageSetup.css)
+  skin/modern/global/progressmeter.css                             (global/progressmeter.css)
+  skin/modern/global/radio.css                                     (global/radio.css)
+  skin/modern/global/resizer.css                                   (global/resizer.css)
+  skin/modern/global/richlistbox.css                               (global/richlistbox.css)
+  skin/modern/global/scale.css                                     (global/scale.css)
+  skin/modern/global/scrollbox.css                                 (global/scrollbox.css)
+  skin/modern/global/splitter.css                                  (global/splitter.css)
+  skin/modern/global/tabbox.css                                    (global/tabbox.css)
+  skin/modern/global/textbox.css                                   (global/textbox.css)
+  skin/modern/global/toolbar.css                                   (global/toolbar.css)
+  skin/modern/global/toolbarbutton.css                             (global/toolbarbutton.css)
+  skin/modern/global/tree.css                                      (global/tree.css)
+  skin/modern/global/wizard.css                                    (global/wizard.css)
+* skin/modern/global/scrollbars.css                                (global/scrollbars.css)
+  skin/modern/global/scrollbars-mini.css                           (global/scrollbars-mini.css)
+  skin/modern/global/alerts/alert.css                              (global/alerts/alert.css)
+  skin/modern/global/alerts/notification-48.png                    (global/alerts/notification-48.png)
+  skin/modern/global/arrow/arrow-dn-dis.png                        (global/arrow/arrow-dn-dis.png)
+  skin/modern/global/arrow/arrow-dn.png                            (global/arrow/arrow-dn.png)
+  skin/modern/global/arrow/arrow-lft-dis.png                       (global/arrow/arrow-lft-dis.png)
+  skin/modern/global/arrow/arrow-lft.png                           (global/arrow/arrow-lft.png)
+  skin/modern/global/arrow/arrow-lft-sharp.png                     (global/arrow/arrow-lft-sharp.png)
+  skin/modern/global/arrow/arrow-lft-sharp-end.png                 (global/arrow/arrow-lft-sharp-end.png)
+  skin/modern/global/arrow/arrow-rit-dis.png                       (global/arrow/arrow-rit-dis.png)
+  skin/modern/global/arrow/arrow-rit.png                           (global/arrow/arrow-rit.png)
+  skin/modern/global/arrow/arrow-rit-sharp.png                     (global/arrow/arrow-rit-sharp.png)
+  skin/modern/global/arrow/arrow-rit-sharp-end.png                 (global/arrow/arrow-rit-sharp-end.png)
+  skin/modern/global/arrow/arrow-up-dis.png                        (global/arrow/arrow-up-dis.png)
+  skin/modern/global/arrow/arrow-up.png                            (global/arrow/arrow-up.png)
+  skin/modern/global/button/tbmbtn-arrow-act.png                   (global/button/tbmbtn-arrow-act.png)
+  skin/modern/global/button/tbmbtn-arrow-hov.png                   (global/button/tbmbtn-arrow-hov.png)
+  skin/modern/global/button/tbmbtn-arrow.png                       (global/button/tbmbtn-arrow.png)
+  skin/modern/global/button/tbmenu-arrow-act.png                   (global/button/tbmenu-arrow-act.png)
+  skin/modern/global/button/tbmenu-arrow-dis.png                   (global/button/tbmenu-arrow-dis.png)
+  skin/modern/global/button/tbmenu-arrow.png                       (global/button/tbmenu-arrow.png)
+  skin/modern/global/checkbox/cbox-act-check.png                   (global/checkbox/cbox-act-check.png)
+  skin/modern/global/checkbox/cbox-act.png                         (global/checkbox/cbox-act.png)
+  skin/modern/global/checkbox/cbox-check.png                       (global/checkbox/cbox-check.png)
+  skin/modern/global/checkbox/cbox-dis-check.png                   (global/checkbox/cbox-dis-check.png)
+  skin/modern/global/checkbox/cbox-dis.png                         (global/checkbox/cbox-dis.png)
+  skin/modern/global/checkbox/cbox.png                             (global/checkbox/cbox.png)
+  skin/modern/global/dirListing/dirListing.css                     (global/dirListing/dirListing.css)
+  skin/modern/global/filepicker/blank.png                          (global/filepicker/blank.png)
+  skin/modern/global/filepicker/dir-closed.png                     (global/filepicker/dir-closed.png)
+  skin/modern/global/filepicker/dir-open.png                       (global/filepicker/dir-open.png)
+  skin/modern/global/filepicker/folder-up.png                      (global/filepicker/folder-up.png)
+  skin/modern/global/filepicker/folder-home.png                    (global/filepicker/folder-home.png)
+  skin/modern/global/filepicker/folder-new.png                     (global/filepicker/folder-new.png)
+  skin/modern/global/icons/authentication-48.png                   (global/icons/authentication-48.png)
+  skin/modern/global/icons/autoscroll.png                          (global/icons/autoscroll.png)
+  skin/modern/global/icons/blacklist_favicon.png                   (global/icons/blacklist_favicon.png)
+  skin/modern/global/icons/blacklist_large.png                     (global/icons/blacklist_large.png)
+  skin/modern/global/icons/close-act.png                           (global/icons/close-act.png)
+  skin/modern/global/icons/close-dis.png                           (global/icons/close-dis.png)
+  skin/modern/global/icons/close-hov.png                           (global/icons/close-hov.png)
+  skin/modern/global/icons/close.png                               (global/icons/close.png)
+  skin/modern/global/icons/closebox.png                            (global/icons/closebox.png)
+  skin/modern/global/icons/Error.png                               (global/icons/Error.png)
+  skin/modern/global/icons/error-16.png                            (global/icons/error-16.png)
+  skin/modern/global/icons/error-24.png                            (global/icons/error-24.png)
+  skin/modern/global/icons/error-48.png                            (global/icons/error-48.png)
+  skin/modern/global/icons/error-64.png                            (global/icons/error-64.png)
+  skin/modern/global/icons/find.png                                (global/icons/find.png)
+  skin/modern/global/icons/information-16.png                      (global/icons/information-16.png)
+  skin/modern/global/icons/information-24.png                      (global/icons/information-24.png)
+  skin/modern/global/icons/information-32.png                      (global/icons/information-32.png)
+  skin/modern/global/icons/information-48.png                      (global/icons/information-48.png)
+  skin/modern/global/icons/information-64.png                      (global/icons/information-64.png)
+  skin/modern/global/icons/notfound.png                            (global/icons/notfound.png)
+  skin/modern/global/icons/pg-landscape.png                        (global/icons/pg-landscape.png)
+  skin/modern/global/icons/pg-landscape-small.png                  (global/icons/pg-landscape-small.png)
+  skin/modern/global/icons/pg-portrait.png                         (global/icons/pg-portrait.png)
+  skin/modern/global/icons/pg-portrait-small.png                   (global/icons/pg-portrait-small.png)
+  skin/modern/global/icons/Question.png                            (global/icons/Question.png)
+  skin/modern/global/icons/question-16.png                         (global/icons/question-16.png)
+  skin/modern/global/icons/question-24.png                         (global/icons/question-24.png)
+  skin/modern/global/icons/question-48.png                         (global/icons/question-48.png)
+  skin/modern/global/icons/question-64.png                         (global/icons/question-64.png)
+  skin/modern/global/icons/resizer.png                             (global/icons/resizer.png)
+  skin/modern/global/icons/resizer-rtl.png                         (global/icons/resizer-rtl.png)
+  skin/modern/global/icons/search.png                              (global/icons/search.png)
+  skin/modern/global/icons/sslWarning.png                          (global/icons/sslWarning.png)
+  skin/modern/global/icons/warning-16.png                          (global/icons/warning-16.png)
+  skin/modern/global/icons/warning-24.png                          (global/icons/warning-24.png)
+  skin/modern/global/icons/warning-32.png                          (global/icons/warning-32.png)
+  skin/modern/global/icons/warning-48.png                          (global/icons/warning-48.png)
+  skin/modern/global/icons/warning-64.png                          (global/icons/warning-64.png)
+  skin/modern/global/icons/wrap.png                                (global/icons/wrap.png)
+  skin/modern/global/icons/calendar-arrow-left.svg                 (shared/icons/calendar-arrow-left.svg)
+  skin/modern/global/icons/calendar-arrow-right.svg                (shared/icons/calendar-arrow-right.svg)
+  skin/modern/global/icons/input-clear.svg                         (shared/icons/input-clear.svg)
+  skin/modern/global/icons/spinner-arrow-down.svg                  (shared/icons/spinner-arrow-down.svg)
+  skin/modern/global/icons/spinner-arrow-up.svg                    (shared/icons/spinner-arrow-up.svg)
+  skin/modern/global/media/closedCaptionButton.svg                 (global/media/closedCaptionButton.svg)
+  skin/modern/global/media/error.png                               (global/media/error.png)
+  skin/modern/global/media/fullscreenButton.svg                    (global/media/fullscreenButton.svg)
+  skin/modern/global/media/imagedoc-darknoise.png                  (global/media/imagedoc-darknoise.png)
+  skin/modern/global/media/imagedoc-lightnoise.png                 (global/media/imagedoc-lightnoise.png)
+  skin/modern/global/media/muteButton.svg                          (global/media/muteButton.svg)
+  skin/modern/global/media/pauseButton.svg                         (global/media/pauseButton.svg)
+  skin/modern/global/media/playButton.svg                          (global/media/playButton.svg)
+  skin/modern/global/media/stalled.png                             (global/media/stalled.png)
+  skin/modern/global/media/throbber.png                            (global/media/throbber.png)
+  skin/modern/global/media/TopLevelImageDocument.css               (global/media/TopLevelImageDocument.css)
+  skin/modern/global/media/TopLevelVideoDocument.css               (global/media/TopLevelVideoDocument.css)
+  skin/modern/global/media/videocontrols.css                       (global/media/videocontrols.css)
+  skin/modern/global/menu/menu-arrow-dis.png                       (global/menu/menu-arrow-dis.png)
+  skin/modern/global/menu/menu-arrow-hov.png                       (global/menu/menu-arrow-hov.png)
+  skin/modern/global/menu/menu-arrow.png                           (global/menu/menu-arrow.png)
+  skin/modern/global/menu/menu-check-dis.png                       (global/menu/menu-check-dis.png)
+  skin/modern/global/menu/menu-check-hov.png                       (global/menu/menu-check-hov.png)
+  skin/modern/global/menu/menu-check.png                           (global/menu/menu-check.png)
+  skin/modern/global/menu/menu-radio-dis.png                       (global/menu/menu-radio-dis.png)
+  skin/modern/global/menu/menu-radio-hov.png                       (global/menu/menu-radio-hov.png)
+  skin/modern/global/menu/menu-radio.png                           (global/menu/menu-radio.png)
+  skin/modern/global/menulist/mlist-act-arrow.png                  (global/menulist/mlist-act-arrow.png)
+  skin/modern/global/menulist/mlist-arrow.png                      (global/menulist/mlist-arrow.png)
+  skin/modern/global/menulist/mlist-compact-arrow.png              (global/menulist/mlist-compact-arrow.png)
+  skin/modern/global/menulist/mlist-dis-arrow.png                  (global/menulist/mlist-dis-arrow.png)
+  skin/modern/global/progressmeter/progress-busy.png               (global/progressmeter/progress-busy.png)
+  skin/modern/global/radio/radio-act-check.png                     (global/radio/radio-act-check.png)
+  skin/modern/global/radio/radio-act.png                           (global/radio/radio-act.png)
+  skin/modern/global/radio/radio-check.png                         (global/radio/radio-check.png)
+  skin/modern/global/radio/radio-dis-check.png                     (global/radio/radio-dis-check.png)
+  skin/modern/global/radio/radio-dis.png                           (global/radio/radio-dis.png)
+  skin/modern/global/radio/radio.png                               (global/radio/radio.png)
+  skin/modern/global/scrollbar/thumb-vrt-grip.png                  (global/scrollbar/thumb-vrt-grip.png)
+  skin/modern/global/scrollbar/btn-lft.png                         (global/scrollbar/btn-lft.png)
+  skin/modern/global/scrollbar/btn-rit.png                         (global/scrollbar/btn-rit.png)
+  skin/modern/global/scrollbar/btn-up.png                          (global/scrollbar/btn-up.png)
+  skin/modern/global/scrollbar/mini-btn-dn.png                     (global/scrollbar/mini-btn-dn.png)
+  skin/modern/global/scrollbar/mini-btn-lft.png                    (global/scrollbar/mini-btn-lft.png)
+  skin/modern/global/scrollbar/mini-btn-rit.png                    (global/scrollbar/mini-btn-rit.png)
+  skin/modern/global/scrollbar/mini-btn-up.png                     (global/scrollbar/mini-btn-up.png)
+  skin/modern/global/scrollbar/mini-slider-hrz.png                 (global/scrollbar/mini-slider-hrz.png)
+  skin/modern/global/scrollbar/mini-slider-vrt.png                 (global/scrollbar/mini-slider-vrt.png)
+  skin/modern/global/scrollbar/mini-thumb-hrz-grip.png             (global/scrollbar/mini-thumb-hrz-grip.png)
+  skin/modern/global/scrollbar/mini-thumb-vrt-grip.png             (global/scrollbar/mini-thumb-vrt-grip.png)
+  skin/modern/global/scrollbar/slider-hrz.png                      (global/scrollbar/slider-hrz.png)
+  skin/modern/global/scrollbar/slider-vrt.png                      (global/scrollbar/slider-vrt.png)
+  skin/modern/global/scrollbar/thumb-hrz-grip.png                  (global/scrollbar/thumb-hrz-grip.png)
+  skin/modern/global/scrollbar/btn-dn.png                          (global/scrollbar/btn-dn.png)
+  skin/modern/global/splitter/grip-vrt-after.png                   (global/splitter/grip-vrt-after.png)
+  skin/modern/global/splitter/grip-vrt-before.png                  (global/splitter/grip-vrt-before.png)
+  skin/modern/global/splitter/grip-vrt-after-act.png               (global/splitter/grip-vrt-after-act.png)
+  skin/modern/global/splitter/grip-vrt-before-act.png              (global/splitter/grip-vrt-before-act.png)
+  skin/modern/global/splitter/grip-hrz-after.png                   (global/splitter/grip-hrz-after.png)
+  skin/modern/global/splitter/grip-hrz-before.png                  (global/splitter/grip-hrz-before.png)
+  skin/modern/global/splitter/grip-hrz-after-act.png               (global/splitter/grip-hrz-after-act.png)
+  skin/modern/global/splitter/grip-hrz-before-act.png              (global/splitter/grip-hrz-before-act.png)
+  skin/modern/global/toolbar/tbgrip-arrow.png                      (global/toolbar/tbgrip-arrow.png)
+  skin/modern/global/toolbar/mbgrip-arrow.png                      (global/toolbar/mbgrip-arrow.png)
+  skin/modern/global/toolbar/tbgrip-arrow-act.png                  (global/toolbar/tbgrip-arrow-act.png)
+  skin/modern/global/toolbar/tbgrip-arrow-clps.png                 (global/toolbar/tbgrip-arrow-clps.png)
+  skin/modern/global/toolbar/tbgrip-arrow-clps-act.png             (global/toolbar/tbgrip-arrow-clps-act.png)
+  skin/modern/global/toolbar/tb-mid.png                            (global/toolbar/tb-mid.png)
+  skin/modern/global/toolbar/chevron.png                           (global/toolbar/chevron.png)
+  skin/modern/global/toolbar/spring.png                            (global/toolbar/spring.png)
+  skin/modern/global/tree/checkbox.png                             (global/tree/checkbox.png)
+  skin/modern/global/tree/checkbox-checked.png                     (global/tree/checkbox-checked.png)
+  skin/modern/global/mac/tree/sort-asc.png                         (global/tree/sort-dsc.png)
+  skin/modern/global/mac/tree/sort-dsc.png                         (global/tree/sort-asc.png)
+  skin/modern/global/gtk/tree/sort-asc.png                         (global/tree/sort-asc.png)
+  skin/modern/global/gtk/tree/sort-dsc.png                         (global/tree/sort-dsc.png)
+  skin/modern/global/win/tree/sort-asc.png                         (global/tree/sort-dsc.png)
+  skin/modern/global/win/tree/sort-dsc.png                         (global/tree/sort-asc.png)
+  skin/modern/global/tree/twisty-clsd.png                          (global/tree/twisty-clsd.png)
+  skin/modern/global/tree/twisty-open.png                          (global/tree/twisty-open.png)
+  skin/modern/global/tree/columnpicker.png                         (global/tree/columnpicker.png)
+  skin/modern/messenger/threadPaneLabels.css                       (messenger/threadPaneLabels.css)
+  skin/modern/messenger/accountCentral.css                         (messenger/accountCentral.css)
+  skin/modern/messenger/accountManage.css                          (messenger/accountManage.css)
+  skin/modern/messenger/accountWizard.css                          (messenger/accountWizard.css)
+  skin/modern/messenger/addressingWidget.css                       (messenger/addressingWidget.css)
+  skin/modern/messenger/browserRequest.css                         (messenger/browserRequest.css)
+  skin/modern/messenger/dialogs.css                                (messenger/dialogs.css)
+  skin/modern/messenger/filterDialog.css                           (messenger/filterDialog.css)
+  skin/modern/messenger/folderMenus.css                            (messenger/folderMenus.css)
+  skin/modern/messenger/folderPane.css                             (messenger/folderPane.css)
+  skin/modern/messenger/folderPaneExtras.css                       (messenger/folderPaneExtras.css)
+  skin/modern/messenger/threadPaneExtras.css                       (messenger/threadPaneExtras.css)
+  skin/modern/messenger/messageBody.css                            (messenger/messageBody.css)
+  skin/modern/messenger/msgSelectOffline.css                       (messenger/msgSelectOffline.css)
+  skin/modern/messenger/messageHeader.css                          (messenger/messageHeader.css)
+  skin/modern/messenger/messageQuotes.css                          (messenger/messageQuotes.css)
+  skin/modern/messenger/messageKeywords.css                        (messenger/messageKeywords.css)
+  skin/modern/messenger/messageWindow.css                          (messenger/messageWindow.css)
+  skin/modern/messenger/messenger.css                              (messenger/messenger.css)
+  skin/modern/messenger/newmailalert.css                           (messenger/newmailalert.css)
+  skin/modern/messenger/prefPanels.css                             (messenger/prefPanels.css)
+  skin/modern/messenger/searchDialog.css                           (messenger/searchDialog.css)
+  skin/modern/messenger/subscribe.css                              (messenger/subscribe.css)
+  skin/modern/messenger/mailWindow1.css                            (messenger/mailWindow1.css)
+  skin/modern/messenger/threadPane.css                             (messenger/threadPane.css)
+  skin/modern/messenger/primaryToolbar.css                         (messenger/primaryToolbar.css)
+  skin/modern/messenger/start.css                                  (messenger/start.css)
+  skin/modern/messenger/addressbook/abResultsPane.css              (messenger/addressbook/abResultsPane.css)
+  skin/modern/messenger/addressbook/addressPanes.css               (messenger/addressbook/addressPanes.css)
+  skin/modern/messenger/addressbook/cardDialog.css                 (messenger/addressbook/cardDialog.css)
+  skin/modern/messenger/addressbook/selectAddressesDialog.css      (messenger/addressbook/selectAddressesDialog.css)
+  skin/modern/messenger/addressbook/addressbook.css                (messenger/addressbook/addressbook.css)
+  skin/modern/messenger/addressbook/sidebarPanel.css               (messenger/addressbook/sidebarPanel.css)
+  skin/modern/messenger/addressbook/icons/directory-down.png       (messenger/addressbook/icons/directory-down.png)
+  skin/modern/messenger/addressbook/icons/directory.png            (messenger/addressbook/icons/directory.png)
+  skin/modern/messenger/addressbook/icons/secure-directory.png     (messenger/addressbook/icons/secure-directory.png)
+  skin/modern/messenger/addressbook/icons/list.png                 (messenger/addressbook/icons/list.png)
+  skin/modern/messenger/addressbook/icons/mast-ab.png              (messenger/addressbook/icons/mast-ab.png)
+  skin/modern/messenger/addressbook/icons/myaddrbk.png             (messenger/addressbook/icons/myaddrbk.png)
+  skin/modern/messenger/addressbook/icons/person.png               (messenger/addressbook/icons/person.png)
+  skin/modern/messenger/addressbook/icons/contact-generic.png      (messenger/addressbook/icons/contact-generic.png)
+  skin/modern/messenger/addressbook/icons/contact-generic-tiny.png (messenger/addressbook/icons/contact-generic-tiny.png)
+  skin/modern/messenger/icons/acct-compose.png                     (messenger/icons/acct-compose.png)
+  skin/modern/messenger/icons/acct-filters.png                     (messenger/icons/acct-filters.png)
+  skin/modern/messenger/icons/acct-newaccount.png                  (messenger/icons/acct-newaccount.png)
+  skin/modern/messenger/icons/acct-prefs.png                       (messenger/icons/acct-prefs.png)
+  skin/modern/messenger/icons/acct-read.png                        (messenger/icons/acct-read.png)
+  skin/modern/messenger/icons/acct-search.png                      (messenger/icons/acct-search.png)
+  skin/modern/messenger/icons/acct-subscribe.png                   (messenger/icons/acct-subscribe.png)
+  skin/modern/messenger/icons/attach.png                           (messenger/icons/attach.png)
+  skin/modern/messenger/icons/attachment.png                       (messenger/icons/attachment.png)
+  skin/modern/messenger/icons/attachment-col.png                   (messenger/icons/attachment-col.png)
+  skin/modern/messenger/icons/attachment-selected.png              (messenger/icons/attachment-selected.png)
+  skin/modern/messenger/icons/check.png                            (messenger/icons/check.png)
+  skin/modern/messenger/icons/dot.png                              (messenger/icons/dot.png)
+  skin/modern/messenger/icons/flagcol-flagged.png                  (messenger/icons/flagcol-flagged.png)
+  skin/modern/messenger/icons/folder-closed.png                    (messenger/icons/folder-closed.png)
+  skin/modern/messenger/icons/folder-draft-open.png                (messenger/icons/folder-draft-open.png)
+  skin/modern/messenger/icons/folder-draft-share-open.png          (messenger/icons/folder-draft-share-open.png)
+  skin/modern/messenger/icons/folder-draft-share.png               (messenger/icons/folder-draft-share.png)
+  skin/modern/messenger/icons/folder-draft.png                     (messenger/icons/folder-draft.png)
+  skin/modern/messenger/icons/folder-inbox-new.png                 (messenger/icons/folder-inbox-new.png)
+  skin/modern/messenger/icons/folder-inbox-open.png                (messenger/icons/folder-inbox-open.png)
+  skin/modern/messenger/icons/folder-inbox-share-open.png          (messenger/icons/folder-inbox-share-open.png)
+  skin/modern/messenger/icons/folder-inbox-share.png               (messenger/icons/folder-inbox-share.png)
+  skin/modern/messenger/icons/folder-inbox.png                     (messenger/icons/folder-inbox.png)
+  skin/modern/messenger/icons/folder-new-open.png                  (messenger/icons/folder-new-open.png)
+  skin/modern/messenger/icons/folder-new.png                       (messenger/icons/folder-new.png)
+  skin/modern/messenger/icons/folder-newsgroup-new.png             (messenger/icons/folder-newsgroup-new.png)
+  skin/modern/messenger/icons/folder-newsgroup.png                 (messenger/icons/folder-newsgroup.png)
+  skin/modern/messenger/icons/folder-open.png                      (messenger/icons/folder-open.png)
+  skin/modern/messenger/icons/folder-outbox-open.png               (messenger/icons/folder-outbox-open.png)
+  skin/modern/messenger/icons/folder-outbox.png                    (messenger/icons/folder-outbox.png)
+  skin/modern/messenger/icons/folder-sent-open.png                 (messenger/icons/folder-sent-open.png)
+  skin/modern/messenger/icons/folder-sent-share-open.png           (messenger/icons/folder-sent-share-open.png)
+  skin/modern/messenger/icons/folder-sent-share.png                (messenger/icons/folder-sent-share.png)
+  skin/modern/messenger/icons/folder-sent.png                      (messenger/icons/folder-sent.png)
+  skin/modern/messenger/icons/folder-share-open.png                (messenger/icons/folder-share-open.png)
+  skin/modern/messenger/icons/folder-share.png                     (messenger/icons/folder-share.png)
+  skin/modern/messenger/icons/folder-junk-open.png                 (messenger/icons/folder-junk-open.png)
+  skin/modern/messenger/icons/folder-junk.png                      (messenger/icons/folder-junk.png)
+  skin/modern/messenger/icons/folder-template-open.png             (messenger/icons/folder-template-open.png)
+  skin/modern/messenger/icons/folder-template-share-open.png       (messenger/icons/folder-template-share-open.png)
+  skin/modern/messenger/icons/folder-template-share.png            (messenger/icons/folder-template-share.png)
+  skin/modern/messenger/icons/folder-template.png                  (messenger/icons/folder-template.png)
+  skin/modern/messenger/icons/folder-trash-open.png                (messenger/icons/folder-trash-open.png)
+  skin/modern/messenger/icons/folder-trash-share-open.png          (messenger/icons/folder-trash-share-open.png)
+  skin/modern/messenger/icons/folder-trash-share.png               (messenger/icons/folder-trash-share.png)
+  skin/modern/messenger/icons/folder-trash.png                     (messenger/icons/folder-trash.png)
+  skin/modern/messenger/icons/folder-search.png                    (messenger/icons/folder-search.png)
+  skin/modern/messenger/icons/info.png                             (messenger/icons/info.png)
+  skin/modern/messenger/icons/insecure.png                         (messenger/icons/insecure.png)
+  skin/modern/messenger/icons/junk.png                             (messenger/icons/junk.png)
+  skin/modern/messenger/icons/loading.png                          (messenger/icons/loading.png)
+  skin/modern/messenger/icons/local-mailhost.png                   (messenger/icons/local-mailhost.png)
+  skin/modern/messenger/icons/mast-mail.png                        (messenger/icons/mast-mail.png)
+  skin/modern/messenger/icons/message-mail-attach-del.png          (messenger/icons/message-mail-attach-del.png)
+  skin/modern/messenger/icons/message-mail-attach-fwd-offl-reply.png (messenger/icons/message-mail-attach-fwd-offl-reply.png)
+  skin/modern/messenger/icons/message-mail-attach-fwd-offl.png     (messenger/icons/message-mail-attach-fwd-offl.png)
+  skin/modern/messenger/icons/message-mail-attach-fwd-reply.png    (messenger/icons/message-mail-attach-fwd-reply.png)
+  skin/modern/messenger/icons/message-mail-attach-fwd.png          (messenger/icons/message-mail-attach-fwd.png)
+  skin/modern/messenger/icons/message-mail-attach-offl-reply.png   (messenger/icons/message-mail-attach-offl-reply.png)
+  skin/modern/messenger/icons/message-mail-attach-offl.png         (messenger/icons/message-mail-attach-offl.png)
+  skin/modern/messenger/icons/message-mail-attach-reply.png        (messenger/icons/message-mail-attach-reply.png)
+  skin/modern/messenger/icons/message-mail-attach.png              (messenger/icons/message-mail-attach.png)
+  skin/modern/messenger/icons/message-mail-delete-offl.png         (messenger/icons/message-mail-delete-offl.png)
+  skin/modern/messenger/icons/message-mail-fwd-offl-reply.png      (messenger/icons/message-mail-fwd-offl-reply.png)
+  skin/modern/messenger/icons/message-mail-fwd-offl.png            (messenger/icons/message-mail-fwd-offl.png)
+  skin/modern/messenger/icons/message-mail-fwd-reply.png           (messenger/icons/message-mail-fwd-reply.png)
+  skin/modern/messenger/icons/message-mail-fwd.png                 (messenger/icons/message-mail-fwd.png)
+  skin/modern/messenger/icons/message-mail-imapdelete.png          (messenger/icons/message-mail-imapdelete.png)
+  skin/modern/messenger/icons/message-mail-new-offl.png            (messenger/icons/message-mail-new-offl.png)
+  skin/modern/messenger/icons/message-mail-new.png                 (messenger/icons/message-mail-new.png)
+  skin/modern/messenger/icons/message-mail-offl-reply.png          (messenger/icons/message-mail-offl-reply.png)
+  skin/modern/messenger/icons/message-mail-offl.png                (messenger/icons/message-mail-offl.png)
+  skin/modern/messenger/icons/message-mail-reply.png               (messenger/icons/message-mail-reply.png)
+  skin/modern/messenger/icons/message-mail.png                     (messenger/icons/message-mail.png)
+  skin/modern/messenger/icons/message-news.png                     (messenger/icons/message-news.png)
+  skin/modern/messenger/icons/message-news-attach-kill-offl.png    (messenger/icons/message-news-attach-kill-offl.png)
+  skin/modern/messenger/icons/message-news-attach-kill.png         (messenger/icons/message-news-attach-kill.png)
+  skin/modern/messenger/icons/message-news-attach.png              (messenger/icons/message-news-attach.png)
+  skin/modern/messenger/icons/message-news-attach-offl.png         (messenger/icons/message-news-attach-offl.png)
+  skin/modern/messenger/icons/message-news-kill-offl.png           (messenger/icons/message-news-kill-offl.png)
+  skin/modern/messenger/icons/message-news-kill.png                (messenger/icons/message-news-kill.png)
+  skin/modern/messenger/icons/message-news-new.png                 (messenger/icons/message-news-new.png)
+  skin/modern/messenger/icons/message-news-new-attach.png          (messenger/icons/message-news-new-attach.png)
+  skin/modern/messenger/icons/message-news-new-attach-off.png      (messenger/icons/message-news-new-attach-off.png)
+  skin/modern/messenger/icons/message-news-new-offl.png            (messenger/icons/message-news-new-offl.png)
+  skin/modern/messenger/icons/message-news-offl.png                (messenger/icons/message-news-offl.png)
+  skin/modern/messenger/icons/phishing.png                         (messenger/icons/phishing.png)
+  skin/modern/messenger/icons/readcol-read.png                     (messenger/icons/readcol-read.png)
+  skin/modern/messenger/icons/readcol-unread.png                   (messenger/icons/readcol-unread.png)
+  skin/modern/messenger/icons/remote-blocked.png                   (messenger/icons/remote-blocked.png)
+  skin/modern/messenger/icons/secure.png                           (messenger/icons/secure.png)
+  skin/modern/messenger/icons/server-local-new.png                 (messenger/icons/server-local-new.png)
+  skin/modern/messenger/icons/server-local.png                     (messenger/icons/server-local.png)
+  skin/modern/messenger/icons/server-mail-new.png                  (messenger/icons/server-mail-new.png)
+  skin/modern/messenger/icons/server-mail.png                      (messenger/icons/server-mail.png)
+  skin/modern/messenger/icons/server-news-lock.png                 (messenger/icons/server-news-lock.png)
+  skin/modern/messenger/icons/server-news-new.png                  (messenger/icons/server-news-new.png)
+  skin/modern/messenger/icons/server-news.png                      (messenger/icons/server-news.png)
+  skin/modern/messenger/icons/server-remote-lock.png               (messenger/icons/server-remote-lock.png)
+  skin/modern/messenger/icons/server-remote-lock-new.png           (messenger/icons/server-remote-lock-new.png)
+  skin/modern/messenger/icons/thread-closed.png                    (messenger/icons/thread-closed.png)
+  skin/modern/messenger/icons/thread-new-closed.png                (messenger/icons/thread-new-closed.png)
+  skin/modern/messenger/icons/threadcol-threaded.png               (messenger/icons/threadcol-threaded.png)
+  skin/modern/messenger/icons/threadcol-unthreaded.png             (messenger/icons/threadcol-unthreaded.png)
+  skin/modern/messenger/icons/thread-closed-eye.png                (messenger/icons/thread-closed-eye.png)
+  skin/modern/messenger/icons/thread-closed-kill.png               (messenger/icons/thread-closed-kill.png)
+  skin/modern/messenger/icons/thread-closed-offl-eye.png           (messenger/icons/thread-closed-offl-eye.png)
+  skin/modern/messenger/icons/thread-closed-offl-kill.png          (messenger/icons/thread-closed-offl-kill.png)
+  skin/modern/messenger/icons/thread-new-closed-eye.png            (messenger/icons/thread-new-closed-eye.png)
+  skin/modern/messenger/icons/thread-new-closed-kill.png           (messenger/icons/thread-new-closed-kill.png)
+  skin/modern/messenger/icons/thread-new-closed-offl-eye.png       (messenger/icons/thread-new-closed-offl-eye.png)
+  skin/modern/messenger/icons/thread-new-closed-offl-kill.png      (messenger/icons/thread-new-closed-offl-kill.png)
+  skin/modern/messenger/icons/new-mail-alert.png                   (messenger/icons/new-mail-alert.png)
+  skin/modern/messenger/icons/btn1.png                             (messenger/icons/btn1.png)
+  skin/modern/messenger/icons/junkBar.png                          (messenger/icons/junkBar.png)
+  skin/modern/messenger/icons/message-junk-other.png               (messenger/icons/message-junk-other.png)
+  skin/modern/messenger/messengercompose/messengercompose.css      (messenger/messengercompose/messengercompose.css)
+  skin/modern/messenger/messengercompose/icons/mast-msgcomp.png    (messenger/messengercompose/icons/mast-msgcomp.png)
+  skin/modern/messenger/smime/msgReadSecurityInfo.css              (messenger/smime/msgReadSecurityInfo.css)
+  skin/modern/messenger/smime/msgCompSecurityInfo.css              (messenger/smime/msgCompSecurityInfo.css)
+  skin/modern/messenger/smime/msgReadSMIMEOverlay.css              (messenger/smime/msgReadSMIMEOverlay.css)
+  skin/modern/messenger/smime/msgCompSMIMEOverlay.css              (messenger/smime/msgCompSMIMEOverlay.css)
+  skin/modern/messenger/smime/certFetchingStatus.css               (messenger/smime/certFetchingStatus.css)
+  skin/modern/messenger/smime/msgHdrViewSMIMEOverlay.css           (messenger/smime/msgHdrViewSMIMEOverlay.css)
+  skin/modern/messenger/smime/icons/smbtn1.png                     (messenger/smime/icons/smbtn1.png)
+  skin/modern/messenger/smime/icons/sbSignOk.png                   (messenger/smime/icons/sbSignOk.png)
+  skin/modern/messenger/smime/icons/sbSignUnknown.png              (messenger/smime/icons/sbSignUnknown.png)
+  skin/modern/messenger/smime/icons/sbSignNotOk.png                (messenger/smime/icons/sbSignNotOk.png)
+  skin/modern/messenger/smime/icons/sbCryptoOk.png                 (messenger/smime/icons/sbCryptoOk.png)
+  skin/modern/messenger/smime/icons/sbCryptoNotOk.png              (messenger/smime/icons/sbCryptoNotOk.png)
+  skin/modern/messenger/smime/icons/hdrSignOk.png                  (messenger/smime/icons/hdrSignOk.png)
+  skin/modern/messenger/smime/icons/hdrSignUnknown.png             (messenger/smime/icons/hdrSignUnknown.png)
+  skin/modern/messenger/smime/icons/hdrSignNotOk.png               (messenger/smime/icons/hdrSignNotOk.png)
+  skin/modern/messenger/smime/icons/hdrCryptoOk.png                (messenger/smime/icons/hdrCryptoOk.png)
+  skin/modern/messenger/smime/icons/hdrCryptoNotOk.png             (messenger/smime/icons/hdrCryptoNotOk.png)
+  skin/modern/messenger-newsblog/feed-subscriptions.css            (messenger/newsblog/feed-subscriptions.css)
+  skin/modern/messenger-newsblog/icons/rss-feed.png                (messenger/newsblog/rss-feed.png)
+  skin/modern/mozapps/aboutNetworking.css                          (mozapps/aboutNetworking.css)
+  skin/modern/mozapps/downloads/downloadIcon.png                   (mozapps/downloads/downloadIcon.png)
+  skin/modern/mozapps/downloads/downloads.css                      (mozapps/downloads/downloads.css)
+  skin/modern/mozapps/downloads/unknownContentType.css             (mozapps/downloads/unknownContentType.css)
+  skin/modern/mozapps/extensions/about.css                         (mozapps/extensions/about.css)
+  skin/modern/mozapps/extensions/alerticon-error.png               (mozapps/extensions/alerticon-error.png)
+  skin/modern/mozapps/extensions/alerticon-info-negative.png       (mozapps/extensions/alerticon-info-negative.png)
+  skin/modern/mozapps/extensions/alerticon-info-positive.png       (mozapps/extensions/alerticon-info-positive.png)
+  skin/modern/mozapps/extensions/alerticon-warning.png             (mozapps/extensions/alerticon-warning.png)
+  skin/modern/mozapps/extensions/blocklist.css                     (mozapps/extensions/blocklist.css)
+  skin/modern/mozapps/extensions/cancel.png                        (mozapps/extensions/cancel.png)
+  skin/modern/mozapps/extensions/category-available.png            (mozapps/extensions/category-available.png)
+  skin/modern/mozapps/extensions/category-dictionaries.png         (mozapps/extensions/category-dictionaries.png)
+  skin/modern/mozapps/extensions/category-discover.png             (mozapps/extensions/category-discover.png)
+  skin/modern/mozapps/extensions/category-extensions.png           (mozapps/extensions/category-extensions.png)
+  skin/modern/mozapps/extensions/category-languages.png            (mozapps/extensions/category-languages.png)
+  skin/modern/mozapps/extensions/category-plugins.png              (mozapps/extensions/category-plugins.png)
+  skin/modern/mozapps/extensions/category-recent.png               (mozapps/extensions/category-recent.png)
+  skin/modern/mozapps/extensions/category-searchengines.png        (mozapps/extensions/category-searchengines.png)
+  skin/modern/mozapps/extensions/category-search.png               (mozapps/extensions/category-search.png)
+  skin/modern/mozapps/extensions/category-themes.png               (mozapps/extensions/category-themes.png)
+  skin/modern/mozapps/extensions/discover-logo.png                 (mozapps/extensions/discover-logo.png)
+  skin/modern/mozapps/extensions/dictionaryGeneric.png             (mozapps/extensions/dictionaryGeneric.png)
+  skin/modern/mozapps/extensions/dictionaryGeneric-16.png          (mozapps/extensions/dictionaryGeneric-16.png)
+  skin/modern/mozapps/extensions/eula.css                          (mozapps/extensions/eula.css)
+  skin/modern/mozapps/extensions/extensionGeneric-16.png           (mozapps/extensions/extensionGeneric-16.png)
+  skin/modern/mozapps/extensions/extensionGeneric.png              (mozapps/extensions/extensionGeneric.png)
+  skin/modern/mozapps/extensions/extensions.css                    (mozapps/extensions/extensions.css)
+  skin/modern/mozapps/extensions/extensions.svg                    (mozapps/extensions/extensions.svg)
+  skin/modern/mozapps/extensions/heart.png                         (mozapps/extensions/heart.png)
+  skin/modern/mozapps/extensions/localeGeneric.png                 (mozapps/extensions/localeGeneric.png)
+  skin/modern/mozapps/extensions/navigation.png                    (mozapps/extensions/navigation.png)
+  skin/modern/mozapps/extensions/newaddon.css                      (mozapps/extensions/newaddon.css)
+  skin/modern/mozapps/extensions/rating-not-won.png                (mozapps/extensions/rating-not-won.png)
+  skin/modern/mozapps/extensions/rating-won.png                    (mozapps/extensions/rating-won.png)
+  skin/modern/mozapps/extensions/stripes-error.png                 (mozapps/extensions/stripes-error.png)
+  skin/modern/mozapps/extensions/stripes-info-negative.png         (mozapps/extensions/stripes-info-negative.png)
+  skin/modern/mozapps/extensions/stripes-info-positive.png         (mozapps/extensions/stripes-info-positive.png)
+  skin/modern/mozapps/extensions/stripes-warning.png               (mozapps/extensions/stripes-warning.png)
+  skin/modern/mozapps/extensions/themeGeneric-16.png               (mozapps/extensions/themeGeneric-16.png)
+  skin/modern/mozapps/extensions/themeGeneric.png                  (mozapps/extensions/themeGeneric.png)
+  skin/modern/mozapps/extensions/update.css                        (mozapps/extensions/update.css)
+  skin/modern/mozapps/extensions/utilities.png                     (mozapps/extensions/utilities.png)
+  skin/modern/mozapps/handling/handling.css                        (mozapps/handling/handling.css)
+  skin/modern/mozapps/icons/itemDisabledFader.png                  (mozapps/icons/itemDisabledFader.png)
+  skin/modern/mozapps/icons/itemEnabledFader.png                   (mozapps/icons/itemEnabledFader.png)
+  skin/modern/mozapps/passwordmgr/key-16.png                       (mozapps/passwordmgr/key-16.png)
+  skin/modern/mozapps/passwordmgr/key-64.png                       (mozapps/passwordmgr/key-64.png)
+  skin/modern/mozapps/passwordmgr/key.png                          (mozapps/passwordmgr/key.png)
+  skin/modern/mozapps/plugins/pluginBlocked.png                    (mozapps/plugins/pluginBlocked.png)
+  skin/modern/mozapps/plugins/pluginBlocked-16.png                 (mozapps/plugins/pluginBlocked.png)
+  skin/modern/mozapps/plugins/pluginGeneric.png                    (mozapps/plugins/pluginGeneric.png)
+  skin/modern/mozapps/plugins/pluginGeneric-16.png                 (mozapps/plugins/pluginGeneric-16.png)
+  skin/modern/mozapps/plugins/pluginInstallerWizard.css            (mozapps/plugins/pluginInstallerWizard.css)
+  skin/modern/mozapps/update/update.png                            (mozapps/update/update.png)
+  skin/modern/mozapps/update/updates.css                           (mozapps/update/updates.css)
+  skin/modern/mozapps/viewsource/viewsource.css                    (mozapps/viewsource/viewsource.css)
+  skin/modern/mozapps/xpinstall/xpinstallConfirm.css               (mozapps/xpinstall/xpinstallConfirm.css)
+  skin/modern/mozapps/xpinstall/xpinstallItemGeneric.png           (mozapps/extensions/extensionGeneric.png)
+  skin/modern/navigator/linkToolbar.css                            (navigator/linkToolbar.css)
+  skin/modern/navigator/navigator.css                              (navigator/navigator.css)
+  skin/modern/navigator/pageInfo.css                               (navigator/pageInfo.css)
+  skin/modern/navigator/tabbrowser.css                             (navigator/tabbrowser.css)
+  skin/modern/navigator/webDeveloper.css                           (navigator/webDeveloper.css)
+  skin/modern/navigator/btn1/feeds.png                             (navigator/btn1/feeds.png)
+  skin/modern/navigator/btn1/first-dis.png                         (navigator/btn1/first-dis.png)
+  skin/modern/navigator/btn1/first-hov.png                         (navigator/btn1/first-hov.png)
+  skin/modern/navigator/btn1/first.png                             (navigator/btn1/first.png)
+  skin/modern/navigator/btn1/last-dis.png                          (navigator/btn1/last-dis.png)
+  skin/modern/navigator/btn1/last-hov.png                          (navigator/btn1/last-hov.png)
+  skin/modern/navigator/btn1/last.png                              (navigator/btn1/last.png)
+  skin/modern/navigator/btn1/next-dis.png                          (navigator/btn1/next-dis.png)
+  skin/modern/navigator/btn1/next-hov.png                          (navigator/btn1/next-hov.png)
+  skin/modern/navigator/btn1/next.png                              (navigator/btn1/next.png)
+  skin/modern/navigator/btn1/previous-dis.png                      (navigator/btn1/previous-dis.png)
+  skin/modern/navigator/btn1/previous-hov.png                      (navigator/btn1/previous-hov.png)
+  skin/modern/navigator/btn1/previous.png                          (navigator/btn1/previous.png)
+  skin/modern/navigator/btn1/top-dis.png                           (navigator/btn1/top-dis.png)
+  skin/modern/navigator/btn1/top-hov.png                           (navigator/btn1/top-hov.png)
+  skin/modern/navigator/btn1/top.png                               (navigator/btn1/top.png)
+  skin/modern/navigator/btn1/up-dis.png                            (navigator/btn1/up-dis.png)
+  skin/modern/navigator/btn1/up-hov.png                            (navigator/btn1/up-hov.png)
+  skin/modern/navigator/btn1/up.png                                (navigator/btn1/up.png)
+  skin/modern/navigator/toolbar/ubhist-arrow-act.png               (navigator/toolbar/ubhist-arrow-act.png)
+  skin/modern/navigator/toolbar/ubhist-arrow.png                   (navigator/toolbar/ubhist-arrow.png)
+  skin/modern/navigator/icons/browser.png                          (navigator/icons/browser.png)
+  skin/modern/navigator/icons/browser-small.png                    (navigator/icons/browser-small.png)
+  skin/modern/navigator/icons/identity.png                         (navigator/icons/identity.png)
+  skin/modern/navigator/icons/popup-blocked.png                    (navigator/icons/popup-blocked.png)
+  skin/modern/navigator/icons/tab-drag-indicator.png               (navigator/icons/tab-drag-indicator.png)
+  skin/modern/navigator/icons/tab-new.png                          (navigator/icons/tab-new.png)
+  skin/modern/navigator/icons/tab-new-hov.png                      (navigator/icons/tab-new-hov.png)
+  skin/modern/navigator/icons/tab-new-act.png                      (navigator/icons/tab-new-act.png)
+  skin/modern/navigator/icons/windowcontrols.png                   (navigator/icons/windowcontrols.png)
+
+# Keep global gif icons for compatibility with toolkit.
+  skin/modern/global/arrow/arrow-dn-dis.gif                        (global/arrow/arrow-dn-dis.gif)
+  skin/modern/global/arrow/arrow-dn.gif                            (global/arrow/arrow-dn.gif)
+  skin/modern/global/arrow/arrow-lft-dis.gif                       (global/arrow/arrow-lft-dis.gif)
+  skin/modern/global/arrow/arrow-lft.gif                           (global/arrow/arrow-lft.gif)
+  skin/modern/global/arrow/arrow-lft-sharp.gif                     (global/arrow/arrow-lft-sharp.gif)
+  skin/modern/global/arrow/arrow-lft-sharp-end.gif                 (global/arrow/arrow-lft-sharp-end.gif)
+  skin/modern/global/arrow/arrow-rit-dis.gif                       (global/arrow/arrow-rit-dis.gif)
+  skin/modern/global/arrow/arrow-rit.gif                           (global/arrow/arrow-rit.gif)
+  skin/modern/global/arrow/arrow-rit-sharp.gif                     (global/arrow/arrow-rit-sharp.gif)
+  skin/modern/global/arrow/arrow-rit-sharp-end.gif                 (global/arrow/arrow-rit-sharp-end.gif)
+  skin/modern/global/arrow/arrow-up-dis.gif                        (global/arrow/arrow-up-dis.gif)
+  skin/modern/global/arrow/arrow-up.gif                            (global/arrow/arrow-up.gif)
+  skin/modern/global/button/tbmbtn-arrow-act.gif                   (global/button/tbmbtn-arrow-act.gif)
+  skin/modern/global/button/tbmbtn-arrow-hov.gif                   (global/button/tbmbtn-arrow-hov.gif)
+  skin/modern/global/button/tbmbtn-arrow.gif                       (global/button/tbmbtn-arrow.gif)
+  skin/modern/global/button/tbmenu-arrow-act.gif                   (global/button/tbmenu-arrow-act.gif)
+  skin/modern/global/button/tbmenu-arrow-dis.gif                   (global/button/tbmenu-arrow-dis.gif)
+  skin/modern/global/button/tbmenu-arrow.gif                       (global/button/tbmenu-arrow.gif)
+  skin/modern/global/checkbox/cbox-act-check.gif                   (global/checkbox/cbox-act-check.gif)
+  skin/modern/global/checkbox/cbox-act.gif                         (global/checkbox/cbox-act.gif)
+  skin/modern/global/checkbox/cbox-check.gif                       (global/checkbox/cbox-check.gif)
+  skin/modern/global/checkbox/cbox-dis-check.gif                   (global/checkbox/cbox-dis-check.gif)
+  skin/modern/global/checkbox/cbox-dis.gif                         (global/checkbox/cbox-dis.gif)
+  skin/modern/global/checkbox/cbox.gif                             (global/checkbox/cbox.gif)
+  skin/modern/global/filepicker/blank.gif                          (global/filepicker/blank.gif)
+  skin/modern/global/filepicker/dir-closed.gif                     (global/filepicker/dir-closed.gif)
+  skin/modern/global/filepicker/dir-open.gif                       (global/filepicker/dir-open.gif)
+  skin/modern/global/filepicker/folder-up.gif                      (global/filepicker/folder-up.gif)
+  skin/modern/global/filepicker/folder-home.gif                    (global/filepicker/folder-home.gif)
+  skin/modern/global/filepicker/folder-new.gif                     (global/filepicker/folder-new.gif)
+  skin/modern/global/icons/close-act.gif                           (global/icons/close-act.gif)
+  skin/modern/global/icons/close-dis.gif                           (global/icons/close-dis.gif)
+  skin/modern/global/icons/close-hov.gif                           (global/icons/close-hov.gif)
+  skin/modern/global/icons/close.gif                               (global/icons/close.gif)
+  skin/modern/global/icons/closebox.gif                            (global/icons/closebox.gif)
+  skin/modern/global/icons/pg-landscape.gif                        (global/icons/pg-landscape.gif)
+  skin/modern/global/icons/pg-landscape-small.gif                  (global/icons/pg-landscape-small.gif)
+  skin/modern/global/icons/pg-portrait.gif                         (global/icons/pg-portrait.gif)
+  skin/modern/global/icons/pg-portrait-small.gif                   (global/icons/pg-portrait-small.gif)
+  skin/modern/global/icons/search.gif                              (global/icons/search.gif)
+  skin/modern/global/menu/menu-arrow-dis.gif                       (global/menu/menu-arrow-dis.gif)
+  skin/modern/global/menu/menu-arrow-hov.gif                       (global/menu/menu-arrow-hov.gif)
+  skin/modern/global/menu/menu-arrow.gif                           (global/menu/menu-arrow.gif)
+  skin/modern/global/menu/menu-check-dis.gif                       (global/menu/menu-check-dis.gif)
+  skin/modern/global/menu/menu-check-hov.gif                       (global/menu/menu-check-hov.gif)
+  skin/modern/global/menu/menu-check.gif                           (global/menu/menu-check.gif)
+  skin/modern/global/menu/menu-radio-dis.gif                       (global/menu/menu-radio-dis.gif)
+  skin/modern/global/menu/menu-radio-hov.gif                       (global/menu/menu-radio-hov.gif)
+  skin/modern/global/menu/menu-radio.gif                           (global/menu/menu-radio.gif)
+  skin/modern/global/menulist/mlist-act-arrow.gif                  (global/menulist/mlist-act-arrow.gif)
+  skin/modern/global/menulist/mlist-arrow.gif                      (global/menulist/mlist-arrow.gif)
+  skin/modern/global/menulist/mlist-compact-arrow.gif              (global/menulist/mlist-compact-arrow.gif)
+  skin/modern/global/menulist/mlist-dis-arrow.gif                  (global/menulist/mlist-dis-arrow.gif)
+  skin/modern/global/progressmeter/progress-busy.gif               (global/progressmeter/progress-busy.gif)
+  skin/modern/global/radio/radio-act-check.gif                     (global/radio/radio-act-check.gif)
+  skin/modern/global/radio/radio-act.gif                           (global/radio/radio-act.gif)
+  skin/modern/global/radio/radio-check.gif                         (global/radio/radio-check.gif)
+  skin/modern/global/radio/radio-dis-check.gif                     (global/radio/radio-dis-check.gif)
+  skin/modern/global/radio/radio-dis.gif                           (global/radio/radio-dis.gif)
+  skin/modern/global/radio/radio.gif                               (global/radio/radio.gif)
+  skin/modern/global/scrollbar/thumb-vrt-grip.gif                  (global/scrollbar/thumb-vrt-grip.gif)
+  skin/modern/global/scrollbar/btn-lft.gif                         (global/scrollbar/btn-lft.gif)
+  skin/modern/global/scrollbar/btn-rit.gif                         (global/scrollbar/btn-rit.gif)
+  skin/modern/global/scrollbar/btn-up.gif                          (global/scrollbar/btn-up.gif)
+  skin/modern/global/scrollbar/mini-btn-dn.gif                     (global/scrollbar/mini-btn-dn.gif)
+  skin/modern/global/scrollbar/mini-btn-lft.gif                    (global/scrollbar/mini-btn-lft.gif)
+  skin/modern/global/scrollbar/mini-btn-rit.gif                    (global/scrollbar/mini-btn-rit.gif)
+  skin/modern/global/scrollbar/mini-btn-up.gif                     (global/scrollbar/mini-btn-up.gif)
+  skin/modern/global/scrollbar/mini-slider-hrz.gif                 (global/scrollbar/mini-slider-hrz.gif)
+  skin/modern/global/scrollbar/mini-slider-vrt.gif                 (global/scrollbar/mini-slider-vrt.gif)
+  skin/modern/global/scrollbar/mini-thumb-hrz-grip.gif             (global/scrollbar/mini-thumb-hrz-grip.gif)
+  skin/modern/global/scrollbar/mini-thumb-vrt-grip.gif             (global/scrollbar/mini-thumb-vrt-grip.gif)
+  skin/modern/global/scrollbar/slider-hrz.gif                      (global/scrollbar/slider-hrz.gif)
+  skin/modern/global/scrollbar/slider-vrt.gif                      (global/scrollbar/slider-vrt.gif)
+  skin/modern/global/scrollbar/thumb-hrz-grip.gif                  (global/scrollbar/thumb-hrz-grip.gif)
+  skin/modern/global/scrollbar/btn-dn.gif                          (global/scrollbar/btn-dn.gif)
+  skin/modern/global/splitter/grip-vrt-after.gif                   (global/splitter/grip-vrt-after.gif)
+  skin/modern/global/splitter/grip-vrt-before.gif                  (global/splitter/grip-vrt-before.gif)
+  skin/modern/global/splitter/grip-vrt-after-act.gif               (global/splitter/grip-vrt-after-act.gif)
+  skin/modern/global/splitter/grip-vrt-before-act.gif              (global/splitter/grip-vrt-before-act.gif)
+  skin/modern/global/splitter/grip-hrz-after.gif                   (global/splitter/grip-hrz-after.gif)
+  skin/modern/global/splitter/grip-hrz-before.gif                  (global/splitter/grip-hrz-before.gif)
+  skin/modern/global/splitter/grip-hrz-after-act.gif               (global/splitter/grip-hrz-after-act.gif)
+  skin/modern/global/splitter/grip-hrz-before-act.gif              (global/splitter/grip-hrz-before-act.gif)
+  skin/modern/global/toolbar/tbgrip-arrow.gif                      (global/toolbar/tbgrip-arrow.gif)
+  skin/modern/global/toolbar/mbgrip-arrow.gif                      (global/toolbar/mbgrip-arrow.gif)
+  skin/modern/global/toolbar/tbgrip-arrow-act.gif                  (global/toolbar/tbgrip-arrow-act.gif)
+  skin/modern/global/toolbar/tbgrip-arrow-clps.gif                 (global/toolbar/tbgrip-arrow-clps.gif)
+  skin/modern/global/toolbar/tbgrip-arrow-clps-act.gif             (global/toolbar/tbgrip-arrow-clps-act.gif)
+  skin/modern/global/toolbar/tb-mid.gif                            (global/toolbar/tb-mid.gif)
+  skin/modern/global/toolbar/chevron.gif                           (global/toolbar/chevron.gif)
+  skin/modern/global/tree/checkbox.gif                             (global/tree/checkbox.gif)
+  skin/modern/global/tree/checkbox-checked.gif                     (global/tree/checkbox-checked.gif)
+  skin/modern/global/mac/tree/sort-asc.gif                         (global/tree/sort-dsc.gif)
+  skin/modern/global/mac/tree/sort-dsc.gif                         (global/tree/sort-asc.gif)
+  skin/modern/global/gtk/tree/sort-asc.gif                         (global/tree/sort-asc.gif)
+  skin/modern/global/gtk/tree/sort-dsc.gif                         (global/tree/sort-dsc.gif)
+  skin/modern/global/win/tree/sort-asc.gif                         (global/tree/sort-dsc.gif)
+  skin/modern/global/win/tree/sort-dsc.gif                         (global/tree/sort-asc.gif)
+  skin/modern/global/tree/twisty-clsd.gif                          (global/tree/twisty-clsd.gif)
+  skin/modern/global/tree/twisty-open.gif                          (global/tree/twisty-open.gif)
+  skin/modern/global/tree/columnpicker.gif                         (global/tree/columnpicker.gif)
diff --git a/comm/suite/themes/modern/messenger/accountCentral.css b/comm/suite/themes/modern/messenger/accountCentral.css
new file mode 100644
index 0000000000..8c8f2272fe
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/accountCentral.css
@@ -0,0 +1,117 @@
+/* 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/. */
+
+/* ===== accountCentral.css ==========================================
+  == Styles for the Messenger Account Central panel.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#acctCentralGrid {
+  background-color: #FFFFFF;
+}
+
+spacer {
+  max-height: .5em;
+}
+
+spacer.big {
+  max-height: 4em;
+}
+
+/* ::::: rows ::::: */
+
+#acctCentralHeaderRow {
+  padding: 10px 0 10px 10px;
+  font-size: 180%;
+  font-weight: bold;
+  color: #000000;
+}
+
+.acctCentralRow {
+  -moz-binding: url("chrome://global/skin/globalBindings.xml#row-iconic");
+  margin-inline-start: 10px;
+  font-size: 125%;
+  color: #000000;
+}
+
+.row-iconic-icon {
+  list-style-image: inherit;
+  margin-inline-end: 10px;
+}
+
+.acctCentralRowTitleBox {
+  background-color: #C7D0D9;
+  font-size: 150%;
+  font-weight: bold;
+  color: #000000;
+}
+
+/* ::::: links ::::: */
+
+.acctCentralLinkText {
+  cursor: pointer;
+  color: #212731;
+  text-decoration: underline;
+}
+
+.acctCentralLinkText:hover {
+  color: #39598E;
+}
+
+.acctCentralLinkText:hover:active {
+  color: #000000;
+}
+
+/* ::::: row icons ::::: */
+
+#ReadMessages {
+  list-style-image: url("chrome://messenger/skin/icons/acct-read.png");
+}
+
+#ComposeMessage {
+  list-style-image: url("chrome://messenger/skin/icons/acct-compose.png");
+}
+
+#SubscribeNewsgroups {
+  list-style-image: url("chrome://messenger/skin/icons/acct-subscribe.png");
+}
+
+#SubscribeImapFolders {
+  list-style-image: url("chrome://messenger/skin/icons/acct-subscribe.png");
+}
+
+#SubscribeRSS {
+  list-style-image: url("chrome://messenger/skin/icons/acct-subscribe.png");
+}
+
+#SearchMessages {
+  list-style-image: url("chrome://messenger/skin/icons/acct-search.png");
+}
+
+#AccountSettings {
+  list-style-image: url("chrome://messenger/skin/icons/acct-prefs.png");
+}
+
+#CreateAccount {
+  list-style-image: url("chrome://messenger/skin/icons/acct-newaccount.png");
+}
+
+#CreateFilters {
+  list-style-image: url("chrome://messenger/skin/icons/acct-filters.png");
+}
+
+#OfflineSettings {
+  list-style-image: url("chrome://messenger/skin/icons/acct-prefs.png");
+}
+
+#JunkSettingsMail {
+  list-style-image: url("chrome://messenger/skin/icons/acct-filters.png");
+}
+
+#JunkSettingsNews {
+  list-style-image: url("chrome://messenger/skin/icons/acct-filters.png");
+}
diff --git a/comm/suite/themes/modern/messenger/accountManage.css b/comm/suite/themes/modern/messenger/accountManage.css
new file mode 100644
index 0000000000..8171d9f184
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/accountManage.css
@@ -0,0 +1,61 @@
+/* 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/. */
+
+/* ===== accountManage.css ==============================================
+  == Styles for the Mail Account Manager.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: account manager :::::: */
+
+.specialFolderPickerGrid {
+  margin-inline-start: 20px;
+}
+
+.fccReplyFollowsParent {
+  margin-inline-start: 20px;
+}
+
+.selectForOfflineUseButton {
+  list-style-image: url("chrome://communicator/skin/icons/offline.png");
+}
+
+.selectForOfflineUseButton > .button-box > .button-icon {
+  margin-inline-start: 4px;
+  margin-inline-end: 4px;
+}
+
+.signatureBox {
+  font-family: -moz-fixed;
+}
+
+listitem[default="true"],
+#identitiesList > listitem:first-child {
+  font-weight: bold;
+}
+
+treechildren::-moz-tree-cell-text(isDefaultServer-true) {
+  text-decoration: underline;
+}
+
+#accounttree treechildren::-moz-tree-indentation {
+  width: 1ch;
+}
+
+/* ::::: SMTP Server Panel :::::: */
+
+.smtpServerListItem {
+  padding-inline-start: 3px;
+}
+
+#backgroundBox {
+  background-color: #BBC6D1;
+}
+
+#smtpServerInfoBox textbox {
+  background-color: transparent;
+}
diff --git a/comm/suite/themes/modern/messenger/accountWizard.css b/comm/suite/themes/modern/messenger/accountWizard.css
new file mode 100644
index 0000000000..5acf7f1b56
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/accountWizard.css
@@ -0,0 +1,26 @@
+/* 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/. */
+
+/* ===== accountWizard.css ==============================================
+  == Styles for the Mail Account Wizard.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: account wizard :::::: */
+
+.awIdentityLabel {
+  width: 8em;
+  margin-inline-start: 5px;
+}
+
+.serverLabel {
+  width: 8em;
+}
+
+.serverDataBox {
+  margin-inline-start: 15px;
+}
diff --git a/comm/suite/themes/modern/messenger/addressbook/abResultsPane.css b/comm/suite/themes/modern/messenger/addressbook/abResultsPane.css
new file mode 100644
index 0000000000..740bcfa0a2
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/addressbook/abResultsPane.css
@@ -0,0 +1,15 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+treechildren::-moz-tree-image(GeneratedName) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/person.png");
+}
+
+treechildren::-moz-tree-image(GeneratedName, MailList) {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/list.png");
+}
+
diff --git a/comm/suite/themes/modern/messenger/addressbook/addressPanes.css b/comm/suite/themes/modern/messenger/addressbook/addressPanes.css
new file mode 100644
index 0000000000..a98952048c
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/addressbook/addressPanes.css
@@ -0,0 +1,36 @@
+/* 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/. */
+
+/* ===== addressPanes.css ================================================
+  == Styles for directory and address panes.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: directory pane icons ::::: */
+
+treechildren::-moz-tree-image(DirCol) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/myaddrbk.png");
+}
+
+treechildren::-moz-tree-image(DirCol, IsMailList-true) {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/list.png");
+}
+
+treechildren::-moz-tree-image(DirCol, IsRemote-true) {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/directory.png");
+}
+
+treechildren::-moz-tree-image(DirCol, IsRemote-true, IsSecure-true) {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/secure-directory.png");
+}
+
+#dirTree [sortDirection="ascending"] {
+  list-style-image: none;
+}
+
+#dirTree [sortDirection="descending"] {
+  list-style-image: none;
+}
diff --git a/comm/suite/themes/modern/messenger/addressbook/addressbook.css b/comm/suite/themes/modern/messenger/addressbook/addressbook.css
new file mode 100644
index 0000000000..918dcbef69
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/addressbook/addressbook.css
@@ -0,0 +1,200 @@
+/* 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/. */
+
+/* ===== addressbook.css ================================================
+  == Styles for the main Address Book window.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+/* ::::: primary toolbar masthead ::::: */
+
+#ab-bar2 > .toolbar-holder > .toolbar-primary-icon {
+  background-image: url("chrome://messenger/skin/addressbook/icons/mast-ab.png");
+}
+
+/* ::::: primary toolbar buttons ::::: */
+
+#button-newcard {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(476px 49px 509px 0);
+}
+
+#button-newcard:hover {
+  -moz-image-region: rect(476px 99px 509px 50px);
+} 
+
+#button-newcard:hover:active {
+  -moz-image-region: rect(476px 149px 509px 100px);
+}
+
+#button-newcard[disabled] {
+  -moz-image-region: rect(476px 199px 509px 150px) !important;
+} 
+
+#button-newlist {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(510px 49px 543px 0);
+}
+
+#button-newlist:hover {
+  -moz-image-region: rect(510px 99px 543px 50px);
+} 
+
+#button-newlist:hover:active {
+  -moz-image-region: rect(510px 149px 543px 100px);
+}
+
+#button-newlist[disabled] {
+  -moz-image-region: rect(510px 199px 543px 150px) !important;
+} 
+
+#button-editcard {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(442px 49px 475px 0);
+}
+
+#button-editcard:hover {
+  -moz-image-region: rect(442px 99px 475px 50px);
+} 
+
+#button-editcard:hover:active {
+  -moz-image-region: rect(442px 149px 475px 100px);
+}
+
+#button-editcard[disabled] {
+  -moz-image-region: rect(442px 199px 475px 150px) !important;
+} 
+
+#button-newmessage {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(170px 49px 203px 0);
+}
+
+
+#button-newmessage:hover {
+  -moz-image-region: rect(170px 99px 203px 50px);
+} 
+
+#button-newmessage:hover:active {
+  -moz-image-region: rect(170px 149px 203px 100px);
+} 
+
+#button-newmessage[disabled] {
+  -moz-image-region: rect(170px 199px 203px 150px) !important;
+} 
+
+#button-abdelete {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(408px 49px 441px 0);
+}
+
+#button-abdelete:hover {
+  -moz-image-region: rect(408px 99px 441px 50px);
+} 
+
+#button-abdelete:hover:active {
+  -moz-image-region: rect(408px 149px 441px 100px);
+}
+
+#button-abdelete[disabled] {
+  -moz-image-region: rect(408px 199px 441px 150px) !important;
+} 
+
+#blankResultsPaneMessage {
+  font-style: italic;
+}
+
+#localResultsOnlyMessage {
+  font-style: italic;
+  text-align: center;
+}
+
+/* ::::: Card View pane ::::: */
+
+#CardViewBox {
+  -moz-user-focus: ignore;
+  min-width: 150px;
+  background-color: #EFEFEF;
+  overflow: auto;
+}
+
+#CardViewInnerBox {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  padding: 0 8px;
+}
+
+#CardTitle {
+  margin: 0px;
+  border-bottom: 2px solid black;
+  min-width: 120px;
+  font-size: 150%;
+  font-weight: bold;
+  color: #000000;
+}
+ 
+.cardViewColumn {
+  margin-inline-end: 10px;
+}
+
+.cardViewGroup {
+  margin-top: 8px;
+  padding-bottom: 5px;
+  min-width: 50px;
+}
+
+.CardViewHeading {
+  margin: 0px 0px 1px;
+  padding-top: 1px;
+  padding-bottom: 1px;
+  padding-inline-start: 5px;
+  padding-inline-end: 1px;
+  min-width: 30px;
+  background-color: #8E9EAA;
+  color: #ffffff;
+  font-weight: bold;
+}
+
+#cvPhoto {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/contact-generic.png");
+}
+
+#cvBuddyIcon {
+  padding-inline-start: 20px;
+  padding-top: 2px;
+}
+
+.CardViewText,
+.CardViewLink {
+  margin: 0px;
+  padding-inline-end: 2px;
+  padding-inline-start: 20px;
+  min-width: 30px;
+  color: #000000;
+}
+
+.CardViewLink {
+  color: blue;
+  text-decoration: underline;
+  cursor: pointer;
+}
+
+#cvHomeMapIt, #cvWorkMapIt {
+  margin-inline-start: 3px;
+  margin-bottom: -1px;
+}
+
+html|a {
+  border: none !important;
+  padding-inline-end: 2px;
+  padding-inline-start: 0px;
+}
+
+html|p {
+  border: none !important;
+}
diff --git a/comm/suite/themes/modern/messenger/addressbook/cardDialog.css b/comm/suite/themes/modern/messenger/addressbook/cardDialog.css
new file mode 100644
index 0000000000..9d4d091024
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/addressbook/cardDialog.css
@@ -0,0 +1,72 @@
+/* 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/. */
+
+/* ===== cardViewOverlay.css ============================================
+  == Styles for the Address Book Card view.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Card Edit dialog ::::: */
+
+.CardEditWidth {
+  width: 42ch;
+}
+
+.CardEditLabel {
+  text-align: end;
+}
+
+.PhoneEditWidth {
+  width: 24ch;
+}
+
+.AddressCardEditWidth {
+  width: 72ch;
+}
+
+.YearWidth {
+  width: 8ch;
+}
+
+.stateZipSpacer {
+  width: 6ch;
+}
+
+.ZipWidth {
+  width: 14ch;
+}
+
+#photo {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/contact-generic.png");
+}
+
+#GenericPhotoList[value="default"] {
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/contact-generic-tiny.png");
+}
+
+#PhotoContainer {
+  margin: 5px;
+}
+
+#PhotoDropTarget {
+  margin-top: 5px;
+}
+
+#PhotoDropTarget:hover {
+  border: 1px dashed #CACAFF;
+}
+
+#ProgressContainer {
+  max-height: 0;
+  transition: all .5s ease-out;
+  overflow: hidden;
+}
+
+#ProgressContainer.expanded {
+  margin-top: 10px;
+  max-height: 40px; /* something higher than the actual height, but not too large */
+}
diff --git a/comm/suite/themes/modern/messenger/addressbook/icons/contact-generic-tiny.png b/comm/suite/themes/modern/messenger/addressbook/icons/contact-generic-tiny.png
new file mode 100644
index 0000000000..300c09e914
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/addressbook/icons/contact-generic-tiny.png
diff --git a/comm/suite/themes/modern/messenger/addressbook/icons/contact-generic.png b/comm/suite/themes/modern/messenger/addressbook/icons/contact-generic.png
new file mode 100644
index 0000000000..452f1cf655
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/addressbook/icons/contact-generic.png
diff --git a/comm/suite/themes/modern/messenger/addressbook/icons/directory-down.png b/comm/suite/themes/modern/messenger/addressbook/icons/directory-down.png
new file mode 100644
index 0000000000..13e8f1f793
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/addressbook/icons/directory-down.png
diff --git a/comm/suite/themes/modern/messenger/addressbook/icons/directory.png b/comm/suite/themes/modern/messenger/addressbook/icons/directory.png
new file mode 100644
index 0000000000..db549f2406
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/addressbook/icons/directory.png
diff --git a/comm/suite/themes/modern/messenger/addressbook/icons/list.png b/comm/suite/themes/modern/messenger/addressbook/icons/list.png
new file mode 100644
index 0000000000..7abc48d0cc
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/addressbook/icons/list.png
diff --git a/comm/suite/themes/modern/messenger/addressbook/icons/mast-ab.png b/comm/suite/themes/modern/messenger/addressbook/icons/mast-ab.png
new file mode 100644
index 0000000000..139d884b34
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/addressbook/icons/mast-ab.png
diff --git a/comm/suite/themes/modern/messenger/addressbook/icons/myaddrbk.png b/comm/suite/themes/modern/messenger/addressbook/icons/myaddrbk.png
new file mode 100644
index 0000000000..9aa2816f28
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/addressbook/icons/myaddrbk.png
diff --git a/comm/suite/themes/modern/messenger/addressbook/icons/person.png b/comm/suite/themes/modern/messenger/addressbook/icons/person.png
new file mode 100644
index 0000000000..bd1456b017
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/addressbook/icons/person.png
diff --git a/comm/suite/themes/modern/messenger/addressbook/icons/secure-directory.png b/comm/suite/themes/modern/messenger/addressbook/icons/secure-directory.png
new file mode 100644
index 0000000000..f0a9e5e757
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/addressbook/icons/secure-directory.png
diff --git a/comm/suite/themes/modern/messenger/addressbook/selectAddressesDialog.css b/comm/suite/themes/modern/messenger/addressbook/selectAddressesDialog.css
new file mode 100644
index 0000000000..eeca2ef7fe
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/addressbook/selectAddressesDialog.css
@@ -0,0 +1,49 @@
+/* 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/. */
+
+/* ===== selectAddressesDialog.css ======================================
+  == Styles for the Select Addresses Dialog.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Select Addresses dialog ::::: */
+
+#topBox {
+  padding: 0.5em 0 1.0em;
+}
+
+#abResultsTree {
+  min-width: 10px;
+}
+
+#resultsBox {
+  border: 1px solid #000000;
+}
+
+#addToBucketButtonBox {
+  min-width: 10px;
+  padding: 0.3em; 
+}
+
+#addressBucket {
+  min-width: 10px;
+}
+
+#newEditButtonBox {
+  padding-top: 0.5em; 
+  padding-inline-end: 0px;
+  margin-inline-start: 0px;
+}
+
+.middle-button-spacer {
+  width: 10px;
+}
+
+.above-remove-spacer {
+  width: 10px;
+  height: 15px;
+}
diff --git a/comm/suite/themes/modern/messenger/addressbook/sidebarPanel.css b/comm/suite/themes/modern/messenger/addressbook/sidebarPanel.css
new file mode 100644
index 0000000000..842fc33d26
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/addressbook/sidebarPanel.css
@@ -0,0 +1,12 @@
+/* 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/. */
+
+/* ===== sidebarPanel.css ===============================================
+  == Styles for the Address Book sidebar panel.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/addressbook/addressbook.css");
+  
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
diff --git a/comm/suite/themes/modern/messenger/addressingWidget.css b/comm/suite/themes/modern/messenger/addressingWidget.css
new file mode 100644
index 0000000000..89bf3530c1
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/addressingWidget.css
@@ -0,0 +1,43 @@
+/* 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/. */
+
+/* ::::: addressing widget ::::: */
+
+#addressingWidget {
+  -moz-user-focus: none;
+  width: 0;
+}  
+
+#typecol-addressingWidget {
+  min-width: 9em;
+  border-right: 1px solid #C4CADC;
+}
+
+.addressingWidgetItem,
+.dummy-row {
+  border: none !important;
+  background-color: inherit !important;
+  color: inherit !important;
+}
+
+.addressingWidgetCell {
+  border-bottom: 1px solid #C4CADC;
+  padding: 0px;
+}
+
+.addressingWidgetCell:first-child {
+  border-top: none;
+}
+
+.dummy-row-cell:first-child {
+  border-top: none;
+  border-bottom: 1px solid #C4CADC;
+}
+
+.person-icon {
+  cursor: default !important;
+  margin: 2px 4px;
+  border: none;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/person.png");
+}
diff --git a/comm/suite/themes/modern/messenger/browserRequest.css b/comm/suite/themes/modern/messenger/browserRequest.css
new file mode 100644
index 0000000000..0924641265
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/browserRequest.css
@@ -0,0 +1,40 @@
+/* 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/. */
+
+#security-button {
+  width: 20px;
+  padding-right: 5px;
+  background-repeat: no-repeat;
+}
+
+#security-button[level="high"] {
+  background-image: url("chrome://messenger/skin/icons/secure.png");
+}
+
+#security-button[level="broken"] {
+  background-image: url("chrome://messenger/skin/icons/insecure.png");
+}
+
+#security-button[loading="true"] {
+  background-image: url("chrome://messenger/skin/icons/loading.png");
+  background-position: 4px 2px;
+}
+
+#header {
+  overflow: hidden;
+  border-bottom: 1px solid black;
+}
+
+#addressbox {
+  font-weight: bold;
+  font-size: normal;
+  -moz-appearance: textfield;
+  overflow: hidden;
+  margin: 0px 5px;
+  font-weight: normal;
+}
+
+#headerMessage {
+  margin-top: 4px;
+}
diff --git a/comm/suite/themes/modern/messenger/dialogs.css b/comm/suite/themes/modern/messenger/dialogs.css
new file mode 100644
index 0000000000..095ef86341
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/dialogs.css
@@ -0,0 +1,32 @@
+/* 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/. */
+
+/* ===== dialogs.css ====================================================
+  == Styles used by the general dialogs in Messenger.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: fieldMapImport.xul ::::: */
+
+.importsampledata {
+  border-left: 3px solid #C2D0D0;
+  padding-inline-start: 10px;
+}
+
+/* ::::: importDialog.xul ::::: */
+
+#progressStatus {
+  margin: 1em 0px 0px;
+}
+
+#progressMeter {
+  margin-top: 1em;
+  margin-bottom: 2em;
+  margin-inline-start: 1em;
+  margin-inline-end: 2em;
+  width: 26em;
+}
diff --git a/comm/suite/themes/modern/messenger/filterDialog.css b/comm/suite/themes/modern/messenger/filterDialog.css
new file mode 100644
index 0000000000..e7ce71dee4
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/filterDialog.css
@@ -0,0 +1,67 @@
+/* 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/. */
+
+/* ===== filterDialog.css ===============================================
+  == Styles for the Mail Filters dialog.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: columns :::::: */
+
+listcell.listcell-iconic > .listcell-label {
+  display: none;
+}
+
+listcell[enabled="false"] {
+  list-style-image: url("chrome://global/skin/checkbox/cbox.png");
+}
+
+listcell[enabled="true"] {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check.png");
+}
+
+.search-menulist, .search-value-menulist {
+  width: 12em;
+}
+
+.search-menulist[unavailable="true"] {
+  color: #8C99AB;
+}
+
+.small-button {
+  min-width: 3em;
+  padding: 0px;
+  margin: 0px 1px;
+}
+
+textbox {
+  margin: 1px 4px;
+}
+
+#FilterEditor {
+  padding: 0px;
+}
+
+#filterListDialog {
+  padding: 0px;
+}
+
+.filler {
+  padding-inline-end: 22px;
+}
+
+.ruleaction {
+  border: 1px solid transparent;
+}
+
+.ruleactionitem {
+  min-width: 20em;
+}
+
+.ruleaction-type {
+  min-width: 15em;
+}
diff --git a/comm/suite/themes/modern/messenger/folderMenus.css b/comm/suite/themes/modern/messenger/folderMenus.css
new file mode 100644
index 0000000000..c5ded47094
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/folderMenus.css
@@ -0,0 +1,120 @@
+/* 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/. */
+
+/* ===== folderMenus.css ================================================
+  == Icons for menus which represent mail folder.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: folder icons for menus ::::: */
+
+.folderMenuItem {
+  list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
+}
+
+.folderMenuItem[open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-open.png");
+}
+
+.folderMenuItem[ServerType="nntp"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+}
+
+.folderMenuItem[ServerType="rss"] {
+  list-style-image: url("chrome://messenger-newsblog/skin/icons/rss-feed.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+/* ..... special folders ..... */
+
+.folderMenuItem[SpecialFolder="Inbox"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox.png");
+}
+
+.folderMenuItem[SpecialFolder="Inbox"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Sent"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-sent.png");
+}
+
+.folderMenuItem[SpecialFolder="Sent"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-sent-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Drafts"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-draft.png");
+}
+
+.folderMenuItem[SpecialFolder="Drafts"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-draft-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Templates"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-template.png");
+}
+
+.folderMenuItem[SpecialFolder="Templates"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-template-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Outbox"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-outbox.png");
+}
+
+.folderMenuItem[SpecialFolder="Outbox"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-outbox-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Junk"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
+}
+
+.folderMenuItem[SpecialFolder="Junk"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Trash"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-trash.png");
+}
+
+.folderMenuItem[SpecialFolder="Trash"][open="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-trash-open.png");
+}
+
+.folderMenuItem[SpecialFolder="Virtual"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-search.png");
+}
+
+/* ..... servers ..... */
+
+.folderMenuItem[IsServer="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="imap"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="pop3"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="none"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-local.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="nntp"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-news.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
+}
+
+.folderMenuItem[IsServer="true"][ServerType="rss"] {
+  list-style-image: url("chrome://communicator/skin/icons/feedIcon16.png");
+}
diff --git a/comm/suite/themes/modern/messenger/folderPane.css b/comm/suite/themes/modern/messenger/folderPane.css
new file mode 100644
index 0000000000..7a351985ed
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/folderPane.css
@@ -0,0 +1,237 @@
+/* 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/. */
+
+/* ===== folderPane.css =================================================
+  == Styles for the Folder pane in the Messenger 3-pane window.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: mail folder ::::: */
+
+treechildren::-moz-tree-image(folderNameCol) {
+  margin-inline-end: 2px;
+}
+
+.icon-holder[type="folder"],
+treechildren::-moz-tree-image(folderNameCol) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
+}
+
+/* ..... Shared ..... */
+
+.icon-holder[type="folder"][ImapShared="true"],
+treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-share.png");
+}
+
+/* ..... mail folder with new messages ..... */
+
+treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-new.png");
+}
+
+/* ..... News ..... */
+
+.icon-holder[type="folder"][ServerType="nntp"],
+treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+}
+
+.icon-holder[type="folder"][ServerType="nntp"][NewMessages="true"],
+treechildren::-moz-tree-image(folderNameCol, serverType-nntp, newMessages-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup-new.png");
+}
+
+/* ..... Feeds ..... */
+
+.icon-holder[type="folder"][ServerType="rss"],
+treechildren::-moz-tree-image(folderNameCol, serverType-rss) {
+  list-style-image: url("chrome://messenger-newsblog/skin/icons/rss-feed.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+.icon-holder[type="folder"][ServerType="rss"][NewMessages="true"],
+treechildren::-moz-tree-image(folderNameCol, serverType-rss, newMessages-true) {
+  -moz-image-region: rect(16px 16px 32px 0);
+}
+
+/* ..... Inbox ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Inbox"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox.png");
+}
+
+.icon-holder[type="folder"][SpecialFolder="Inbox"][NewMessages="true"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox, newMessages-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-inbox-new.png");
+}
+
+/* ..... Sent ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Sent"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Sent) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-sent.png");
+}
+
+/* ..... Drafts ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Drafts"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Drafts) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-draft.png");
+}
+
+/* ..... Templates ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Templates"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Templates) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-template.png");
+}
+
+/* ..... Outbox ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Outbox"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Outbox) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-outbox.png");
+}
+
+/* ..... Junk ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Junk"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Junk) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-junk.png");
+}
+
+/* ..... Trash ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Trash"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Trash) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-trash.png");
+}
+
+/* ..... Saved Searches ..... */
+
+.icon-holder[type="folder"][SpecialFolder="Virtual"],
+treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-search.png");
+}
+
+/* ..... Server Folders ..... */
+
+.icon-holder[type="folder"][IsServer="true"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
+}
+
+.icon-holder[type="folder"][BiffState="NewMail"][IsServer="true"],
+treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail-new.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="pop3"][IsSecure="true"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="imap"][IsSecure="true"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-imap, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+.icon-holder[type="folder"][BiffState="NewMail"][IsServer="true"][IsSecure="true"],
+treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock-new.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="none"]
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
+  list-style-image: url("chrome://messenger/skin/icons/server-local.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="nntp"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
+  list-style-image: url("chrome://messenger/skin/icons/server-news.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="nntp"][IsSecure="true"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isSecure-true) {
+  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
+}
+
+.icon-holder[type="folder"][IsServer="true"][ServerType="rss"],
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss) {
+  list-style-image: url("chrome://communicator/skin/icons/feedIcon16.png");
+}
+
+/* ::::: All Servers ::::: */
+
+treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true),
+treechildren::-moz-tree-cell-text(folderNameCol, isServer-true),
+treechildren::-moz-tree-cell-text(hasUnreadMessages-true) {
+  font-weight: bold;
+}
+
+treechildren::-moz-tree-cell-text(folderNameCol, noSelect-true) {
+  color: gray;
+  font-style: italic;
+}
+
+.tree-folder-checkbox {
+  list-style-image: none;
+}
+
+treechildren::-moz-tree-image(syncCol) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox.png");
+}
+
+treechildren::-moz-tree-image(syncCol, synchronize-true) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check.png");
+}
+
+treechildren::-moz-tree-image(syncCol, isServer-true) {
+  list-style-image: none;
+}
+
+#folderUnreadCol,
+#folderTotalCol,
+#folderSizeCol {
+  text-align: right;
+}
+
+#folderNameCol [sortDirection="ascending"] {
+  list-style-image: none;
+}
+
+#folderNameCol [sortDirection="descending"] {
+  list-style-image: none;
+}
+
+/* ::::: Folder Summary Popup ::::: */
+
+.folderSummary-message-row {
+  /* This max width ends up dictating the overall width of the popup
+     because it controls how large the preview, subject and sender text can be
+     before cropping kicks in */
+  max-width: 450px;
+}
+
+.folderSummary-subject {
+  font-weight: bold; 
+}
+
+.folderSummary-previewText {
+  color: #8C99AB;
+}
+
+/* Virtual Folder List Dialog */
+
+treechildren::-moz-tree-image(selectedColumn) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://global/skin/checkbox/cbox.gif");
+}
+
+treechildren::-moz-tree-image(selectedColumn, selected-true) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check.gif");
+}
diff --git a/comm/suite/themes/modern/messenger/folderPaneExtras.css b/comm/suite/themes/modern/messenger/folderPaneExtras.css
new file mode 100644
index 0000000000..f315e6e12c
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/folderPaneExtras.css
@@ -0,0 +1,7 @@
+/* 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/. */
+
+/* distributors / ISPs can override folder pane icons
+ * see http://www.mozilla.org/mailnews/arch/folderpaneextras.html
+ */
diff --git a/comm/suite/themes/modern/messenger/icons/acct-compose.png b/comm/suite/themes/modern/messenger/icons/acct-compose.png
new file mode 100644
index 0000000000..5f08885c24
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/acct-compose.png
diff --git a/comm/suite/themes/modern/messenger/icons/acct-filters.png b/comm/suite/themes/modern/messenger/icons/acct-filters.png
new file mode 100644
index 0000000000..d87ce17f12
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/acct-filters.png
diff --git a/comm/suite/themes/modern/messenger/icons/acct-newaccount.png b/comm/suite/themes/modern/messenger/icons/acct-newaccount.png
new file mode 100644
index 0000000000..80a9c66e82
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/acct-newaccount.png
diff --git a/comm/suite/themes/modern/messenger/icons/acct-prefs.png b/comm/suite/themes/modern/messenger/icons/acct-prefs.png
new file mode 100644
index 0000000000..93f19dbf6b
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/acct-prefs.png
diff --git a/comm/suite/themes/modern/messenger/icons/acct-read.png b/comm/suite/themes/modern/messenger/icons/acct-read.png
new file mode 100644
index 0000000000..edff1f86ca
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/acct-read.png
diff --git a/comm/suite/themes/modern/messenger/icons/acct-search.png b/comm/suite/themes/modern/messenger/icons/acct-search.png
new file mode 100644
index 0000000000..4edcf5d4cf
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/acct-search.png
diff --git a/comm/suite/themes/modern/messenger/icons/acct-subscribe.png b/comm/suite/themes/modern/messenger/icons/acct-subscribe.png
new file mode 100644
index 0000000000..8430da5cae
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/acct-subscribe.png
diff --git a/comm/suite/themes/modern/messenger/icons/attach.png b/comm/suite/themes/modern/messenger/icons/attach.png
new file mode 100644
index 0000000000..2f8209d675
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/attach.png
diff --git a/comm/suite/themes/modern/messenger/icons/attachment-col.png b/comm/suite/themes/modern/messenger/icons/attachment-col.png
new file mode 100644
index 0000000000..6e5342df80
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/attachment-col.png
diff --git a/comm/suite/themes/modern/messenger/icons/attachment-selected.png b/comm/suite/themes/modern/messenger/icons/attachment-selected.png
new file mode 100644
index 0000000000..1ed3d5a0d1
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/attachment-selected.png
diff --git a/comm/suite/themes/modern/messenger/icons/attachment.png b/comm/suite/themes/modern/messenger/icons/attachment.png
new file mode 100644
index 0000000000..2c1edc83a9
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/attachment.png
diff --git a/comm/suite/themes/modern/messenger/icons/btn1.png b/comm/suite/themes/modern/messenger/icons/btn1.png
new file mode 100644
index 0000000000..373eeb4773
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/btn1.png
diff --git a/comm/suite/themes/modern/messenger/icons/check.png b/comm/suite/themes/modern/messenger/icons/check.png
new file mode 100644
index 0000000000..bae3ab8cc7
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/check.png
diff --git a/comm/suite/themes/modern/messenger/icons/dot.png b/comm/suite/themes/modern/messenger/icons/dot.png
new file mode 100644
index 0000000000..541c2f6374
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/dot.png
diff --git a/comm/suite/themes/modern/messenger/icons/flagcol-flagged.png b/comm/suite/themes/modern/messenger/icons/flagcol-flagged.png
new file mode 100644
index 0000000000..6fec71af1d
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/flagcol-flagged.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-closed.png b/comm/suite/themes/modern/messenger/icons/folder-closed.png
new file mode 100644
index 0000000000..59134ad340
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-closed.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-draft-open.png b/comm/suite/themes/modern/messenger/icons/folder-draft-open.png
new file mode 100644
index 0000000000..2101f71c4e
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-draft-open.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-draft-share-open.png b/comm/suite/themes/modern/messenger/icons/folder-draft-share-open.png
new file mode 100644
index 0000000000..d184ce03c9
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-draft-share-open.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-draft-share.png b/comm/suite/themes/modern/messenger/icons/folder-draft-share.png
new file mode 100644
index 0000000000..70478ec756
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-draft-share.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-draft.png b/comm/suite/themes/modern/messenger/icons/folder-draft.png
new file mode 100644
index 0000000000..51c33505a2
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-draft.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-inbox-new.png b/comm/suite/themes/modern/messenger/icons/folder-inbox-new.png
new file mode 100644
index 0000000000..373135b6fd
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-inbox-new.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-inbox-open.png b/comm/suite/themes/modern/messenger/icons/folder-inbox-open.png
new file mode 100644
index 0000000000..718d02c166
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-inbox-open.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-inbox-share-open.png b/comm/suite/themes/modern/messenger/icons/folder-inbox-share-open.png
new file mode 100644
index 0000000000..0ee8a7dbe7
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-inbox-share-open.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-inbox-share.png b/comm/suite/themes/modern/messenger/icons/folder-inbox-share.png
new file mode 100644
index 0000000000..a359131887
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-inbox-share.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-inbox.png b/comm/suite/themes/modern/messenger/icons/folder-inbox.png
new file mode 100644
index 0000000000..718d02c166
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-inbox.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-junk-open.png b/comm/suite/themes/modern/messenger/icons/folder-junk-open.png
new file mode 100644
index 0000000000..ff34019710
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-junk-open.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-junk.png b/comm/suite/themes/modern/messenger/icons/folder-junk.png
new file mode 100644
index 0000000000..6b4bef6fbe
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-junk.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-new-open.png b/comm/suite/themes/modern/messenger/icons/folder-new-open.png
new file mode 100644
index 0000000000..c862bf16ea
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-new-open.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-new.png b/comm/suite/themes/modern/messenger/icons/folder-new.png
new file mode 100644
index 0000000000..dade2ce9c0
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-new.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-newsgroup-new.png b/comm/suite/themes/modern/messenger/icons/folder-newsgroup-new.png
new file mode 100644
index 0000000000..f6ae9b5687
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-newsgroup-new.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-newsgroup.png b/comm/suite/themes/modern/messenger/icons/folder-newsgroup.png
new file mode 100644
index 0000000000..9637bb00b5
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-newsgroup.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-open.png b/comm/suite/themes/modern/messenger/icons/folder-open.png
new file mode 100644
index 0000000000..abffc7834e
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-open.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-outbox-open.png b/comm/suite/themes/modern/messenger/icons/folder-outbox-open.png
new file mode 100644
index 0000000000..f74785fc9a
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-outbox-open.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-outbox.png b/comm/suite/themes/modern/messenger/icons/folder-outbox.png
new file mode 100644
index 0000000000..01c63f8aa2
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-outbox.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-search.png b/comm/suite/themes/modern/messenger/icons/folder-search.png
new file mode 100644
index 0000000000..85934c2474
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-search.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-sent-open.png b/comm/suite/themes/modern/messenger/icons/folder-sent-open.png
new file mode 100644
index 0000000000..381207cf88
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-sent-open.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-sent-share-open.png b/comm/suite/themes/modern/messenger/icons/folder-sent-share-open.png
new file mode 100644
index 0000000000..e8e4d791e5
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-sent-share-open.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-sent-share.png b/comm/suite/themes/modern/messenger/icons/folder-sent-share.png
new file mode 100644
index 0000000000..7234b225fe
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-sent-share.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-sent.png b/comm/suite/themes/modern/messenger/icons/folder-sent.png
new file mode 100644
index 0000000000..5ee8888b84
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-sent.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-share-open.png b/comm/suite/themes/modern/messenger/icons/folder-share-open.png
new file mode 100644
index 0000000000..85feccd59d
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-share-open.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-share.png b/comm/suite/themes/modern/messenger/icons/folder-share.png
new file mode 100644
index 0000000000..d1928bbbc9
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-share.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-template-open.png b/comm/suite/themes/modern/messenger/icons/folder-template-open.png
new file mode 100644
index 0000000000..d82d224944
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-template-open.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-template-share-open.png b/comm/suite/themes/modern/messenger/icons/folder-template-share-open.png
new file mode 100644
index 0000000000..bf8667747d
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-template-share-open.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-template-share.png b/comm/suite/themes/modern/messenger/icons/folder-template-share.png
new file mode 100644
index 0000000000..2fce83f395
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-template-share.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-template.png b/comm/suite/themes/modern/messenger/icons/folder-template.png
new file mode 100644
index 0000000000..b0fce572ea
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-template.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-trash-open.png b/comm/suite/themes/modern/messenger/icons/folder-trash-open.png
new file mode 100644
index 0000000000..25cf8bb429
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-trash-open.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-trash-share-open.png b/comm/suite/themes/modern/messenger/icons/folder-trash-share-open.png
new file mode 100644
index 0000000000..267004c321
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-trash-share-open.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-trash-share.png b/comm/suite/themes/modern/messenger/icons/folder-trash-share.png
new file mode 100644
index 0000000000..98bda91af9
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-trash-share.png
diff --git a/comm/suite/themes/modern/messenger/icons/folder-trash.png b/comm/suite/themes/modern/messenger/icons/folder-trash.png
new file mode 100644
index 0000000000..83f14e1e22
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/folder-trash.png
diff --git a/comm/suite/themes/modern/messenger/icons/info.png b/comm/suite/themes/modern/messenger/icons/info.png
new file mode 100644
index 0000000000..3ce14ddc1a
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/info.png
diff --git a/comm/suite/themes/modern/messenger/icons/insecure.png b/comm/suite/themes/modern/messenger/icons/insecure.png
new file mode 100644
index 0000000000..efda0de255
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/insecure.png
diff --git a/comm/suite/themes/modern/messenger/icons/junk.png b/comm/suite/themes/modern/messenger/icons/junk.png
new file mode 100644
index 0000000000..0ae15cd390
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/junk.png
diff --git a/comm/suite/themes/modern/messenger/icons/junkBar.png b/comm/suite/themes/modern/messenger/icons/junkBar.png
new file mode 100644
index 0000000000..82e47972e2
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/junkBar.png
diff --git a/comm/suite/themes/modern/messenger/icons/loading.png b/comm/suite/themes/modern/messenger/icons/loading.png
new file mode 100644
index 0000000000..87d0badd10
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/loading.png
diff --git a/comm/suite/themes/modern/messenger/icons/local-mailhost.png b/comm/suite/themes/modern/messenger/icons/local-mailhost.png
new file mode 100644
index 0000000000..96c4dea511
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/local-mailhost.png
diff --git a/comm/suite/themes/modern/messenger/icons/mast-mail.png b/comm/suite/themes/modern/messenger/icons/mast-mail.png
new file mode 100644
index 0000000000..cf75df88aa
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/mast-mail.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-junk-other.png b/comm/suite/themes/modern/messenger/icons/message-junk-other.png
new file mode 100644
index 0000000000..e3976f698a
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-junk-other.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-attach-del.png b/comm/suite/themes/modern/messenger/icons/message-mail-attach-del.png
new file mode 100644
index 0000000000..5d63878f57
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-attach-del.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-attach-fwd-offl-reply.png b/comm/suite/themes/modern/messenger/icons/message-mail-attach-fwd-offl-reply.png
new file mode 100644
index 0000000000..c7fbc15387
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-attach-fwd-offl-reply.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-attach-fwd-offl.png b/comm/suite/themes/modern/messenger/icons/message-mail-attach-fwd-offl.png
new file mode 100644
index 0000000000..16897414e8
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-attach-fwd-offl.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-attach-fwd-reply.png b/comm/suite/themes/modern/messenger/icons/message-mail-attach-fwd-reply.png
new file mode 100644
index 0000000000..defaedf14a
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-attach-fwd-reply.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-attach-fwd.png b/comm/suite/themes/modern/messenger/icons/message-mail-attach-fwd.png
new file mode 100644
index 0000000000..6eb1896ead
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-attach-fwd.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-attach-offl-reply.png b/comm/suite/themes/modern/messenger/icons/message-mail-attach-offl-reply.png
new file mode 100644
index 0000000000..d99d1bb64c
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-attach-offl-reply.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-attach-offl.png b/comm/suite/themes/modern/messenger/icons/message-mail-attach-offl.png
new file mode 100644
index 0000000000..f571c591d4
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-attach-offl.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-attach-reply.png b/comm/suite/themes/modern/messenger/icons/message-mail-attach-reply.png
new file mode 100644
index 0000000000..f581e4f0a9
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-attach-reply.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-attach.png b/comm/suite/themes/modern/messenger/icons/message-mail-attach.png
new file mode 100644
index 0000000000..a6a329c999
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-attach.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-delete-offl.png b/comm/suite/themes/modern/messenger/icons/message-mail-delete-offl.png
new file mode 100644
index 0000000000..a7f52efae2
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-delete-offl.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-fwd-offl-reply.png b/comm/suite/themes/modern/messenger/icons/message-mail-fwd-offl-reply.png
new file mode 100644
index 0000000000..1ff711861a
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-fwd-offl-reply.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-fwd-offl.png b/comm/suite/themes/modern/messenger/icons/message-mail-fwd-offl.png
new file mode 100644
index 0000000000..26b66c828d
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-fwd-offl.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-fwd-reply.png b/comm/suite/themes/modern/messenger/icons/message-mail-fwd-reply.png
new file mode 100644
index 0000000000..875cbb24c2
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-fwd-reply.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-fwd.png b/comm/suite/themes/modern/messenger/icons/message-mail-fwd.png
new file mode 100644
index 0000000000..2af6da71ca
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-fwd.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-imapdelete.png b/comm/suite/themes/modern/messenger/icons/message-mail-imapdelete.png
new file mode 100644
index 0000000000..eaa573c724
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-imapdelete.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-new-offl.png b/comm/suite/themes/modern/messenger/icons/message-mail-new-offl.png
new file mode 100644
index 0000000000..18d0ba5eac
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-new-offl.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-new.png b/comm/suite/themes/modern/messenger/icons/message-mail-new.png
new file mode 100644
index 0000000000..85c6754428
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-new.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-offl-reply.png b/comm/suite/themes/modern/messenger/icons/message-mail-offl-reply.png
new file mode 100644
index 0000000000..361ece8d7d
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-offl-reply.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-offl.png b/comm/suite/themes/modern/messenger/icons/message-mail-offl.png
new file mode 100644
index 0000000000..7776f9b4f6
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-offl.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail-reply.png b/comm/suite/themes/modern/messenger/icons/message-mail-reply.png
new file mode 100644
index 0000000000..fc75f516d3
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail-reply.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-mail.png b/comm/suite/themes/modern/messenger/icons/message-mail.png
new file mode 100644
index 0000000000..f727e0c8b4
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-mail.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-news-attach-kill-offl.png b/comm/suite/themes/modern/messenger/icons/message-news-attach-kill-offl.png
new file mode 100644
index 0000000000..8e36e243e5
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-news-attach-kill-offl.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-news-attach-kill.png b/comm/suite/themes/modern/messenger/icons/message-news-attach-kill.png
new file mode 100644
index 0000000000..110e943507
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-news-attach-kill.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-news-attach-offl.png b/comm/suite/themes/modern/messenger/icons/message-news-attach-offl.png
new file mode 100644
index 0000000000..b9a60d7923
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-news-attach-offl.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-news-attach.png b/comm/suite/themes/modern/messenger/icons/message-news-attach.png
new file mode 100644
index 0000000000..3094a71d25
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-news-attach.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-news-kill-offl.png b/comm/suite/themes/modern/messenger/icons/message-news-kill-offl.png
new file mode 100644
index 0000000000..0caac52c20
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-news-kill-offl.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-news-kill.png b/comm/suite/themes/modern/messenger/icons/message-news-kill.png
new file mode 100644
index 0000000000..509b52ce86
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-news-kill.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-news-new-attach-off.png b/comm/suite/themes/modern/messenger/icons/message-news-new-attach-off.png
new file mode 100644
index 0000000000..9281a74ba8
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-news-new-attach-off.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-news-new-attach.png b/comm/suite/themes/modern/messenger/icons/message-news-new-attach.png
new file mode 100644
index 0000000000..5df3a9926d
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-news-new-attach.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-news-new-offl.png b/comm/suite/themes/modern/messenger/icons/message-news-new-offl.png
new file mode 100644
index 0000000000..5aa7495bcd
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-news-new-offl.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-news-new.png b/comm/suite/themes/modern/messenger/icons/message-news-new.png
new file mode 100644
index 0000000000..b8ef186906
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-news-new.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-news-offl.png b/comm/suite/themes/modern/messenger/icons/message-news-offl.png
new file mode 100644
index 0000000000..fcd8ec577b
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-news-offl.png
diff --git a/comm/suite/themes/modern/messenger/icons/message-news.png b/comm/suite/themes/modern/messenger/icons/message-news.png
new file mode 100644
index 0000000000..cd134c3428
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/message-news.png
diff --git a/comm/suite/themes/modern/messenger/icons/new-mail-alert.png b/comm/suite/themes/modern/messenger/icons/new-mail-alert.png
new file mode 100644
index 0000000000..7d3364336c
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/new-mail-alert.png
diff --git a/comm/suite/themes/modern/messenger/icons/phishing.png b/comm/suite/themes/modern/messenger/icons/phishing.png
new file mode 100644
index 0000000000..d99a9ea6d4
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/phishing.png
diff --git a/comm/suite/themes/modern/messenger/icons/readcol-read.png b/comm/suite/themes/modern/messenger/icons/readcol-read.png
new file mode 100644
index 0000000000..d459afad89
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/readcol-read.png
diff --git a/comm/suite/themes/modern/messenger/icons/readcol-unread.png b/comm/suite/themes/modern/messenger/icons/readcol-unread.png
new file mode 100644
index 0000000000..8c7ef2d57b
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/readcol-unread.png
diff --git a/comm/suite/themes/modern/messenger/icons/remote-blocked.png b/comm/suite/themes/modern/messenger/icons/remote-blocked.png
new file mode 100644
index 0000000000..872efec63f
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/remote-blocked.png
diff --git a/comm/suite/themes/modern/messenger/icons/secure.png b/comm/suite/themes/modern/messenger/icons/secure.png
new file mode 100644
index 0000000000..bcca43a917
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/secure.png
diff --git a/comm/suite/themes/modern/messenger/icons/server-local-new.png b/comm/suite/themes/modern/messenger/icons/server-local-new.png
new file mode 100644
index 0000000000..82ba657d2c
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/server-local-new.png
diff --git a/comm/suite/themes/modern/messenger/icons/server-local.png b/comm/suite/themes/modern/messenger/icons/server-local.png
new file mode 100644
index 0000000000..ae05749377
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/server-local.png
diff --git a/comm/suite/themes/modern/messenger/icons/server-mail-new.png b/comm/suite/themes/modern/messenger/icons/server-mail-new.png
new file mode 100644
index 0000000000..1288143820
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/server-mail-new.png
diff --git a/comm/suite/themes/modern/messenger/icons/server-mail.png b/comm/suite/themes/modern/messenger/icons/server-mail.png
new file mode 100644
index 0000000000..eeeb1a124b
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/server-mail.png
diff --git a/comm/suite/themes/modern/messenger/icons/server-news-lock.png b/comm/suite/themes/modern/messenger/icons/server-news-lock.png
new file mode 100644
index 0000000000..3c11c02beb
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/server-news-lock.png
diff --git a/comm/suite/themes/modern/messenger/icons/server-news-new.png b/comm/suite/themes/modern/messenger/icons/server-news-new.png
new file mode 100644
index 0000000000..7d9982a7ee
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/server-news-new.png
diff --git a/comm/suite/themes/modern/messenger/icons/server-news.png b/comm/suite/themes/modern/messenger/icons/server-news.png
new file mode 100644
index 0000000000..2e7bba3b91
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/server-news.png
diff --git a/comm/suite/themes/modern/messenger/icons/server-remote-lock-new.png b/comm/suite/themes/modern/messenger/icons/server-remote-lock-new.png
new file mode 100644
index 0000000000..90dd729c97
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/server-remote-lock-new.png
diff --git a/comm/suite/themes/modern/messenger/icons/server-remote-lock.png b/comm/suite/themes/modern/messenger/icons/server-remote-lock.png
new file mode 100644
index 0000000000..cca53c85b3
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/server-remote-lock.png
diff --git a/comm/suite/themes/modern/messenger/icons/thread-closed-eye.png b/comm/suite/themes/modern/messenger/icons/thread-closed-eye.png
new file mode 100644
index 0000000000..9d36b28575
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/thread-closed-eye.png
diff --git a/comm/suite/themes/modern/messenger/icons/thread-closed-kill.png b/comm/suite/themes/modern/messenger/icons/thread-closed-kill.png
new file mode 100644
index 0000000000..e0b2f8fcf7
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/thread-closed-kill.png
diff --git a/comm/suite/themes/modern/messenger/icons/thread-closed-offl-eye.png b/comm/suite/themes/modern/messenger/icons/thread-closed-offl-eye.png
new file mode 100644
index 0000000000..e2fdaa68f8
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/thread-closed-offl-eye.png
diff --git a/comm/suite/themes/modern/messenger/icons/thread-closed-offl-kill.png b/comm/suite/themes/modern/messenger/icons/thread-closed-offl-kill.png
new file mode 100644
index 0000000000..0fc2ff71dc
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/thread-closed-offl-kill.png
diff --git a/comm/suite/themes/modern/messenger/icons/thread-closed.png b/comm/suite/themes/modern/messenger/icons/thread-closed.png
new file mode 100644
index 0000000000..a4330b21e9
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/thread-closed.png
diff --git a/comm/suite/themes/modern/messenger/icons/thread-new-closed-eye.png b/comm/suite/themes/modern/messenger/icons/thread-new-closed-eye.png
new file mode 100644
index 0000000000..6a6b6f8397
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/thread-new-closed-eye.png
diff --git a/comm/suite/themes/modern/messenger/icons/thread-new-closed-kill.png b/comm/suite/themes/modern/messenger/icons/thread-new-closed-kill.png
new file mode 100644
index 0000000000..9641038a64
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/thread-new-closed-kill.png
diff --git a/comm/suite/themes/modern/messenger/icons/thread-new-closed-offl-eye.png b/comm/suite/themes/modern/messenger/icons/thread-new-closed-offl-eye.png
new file mode 100644
index 0000000000..70a3ccca20
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/thread-new-closed-offl-eye.png
diff --git a/comm/suite/themes/modern/messenger/icons/thread-new-closed-offl-kill.png b/comm/suite/themes/modern/messenger/icons/thread-new-closed-offl-kill.png
new file mode 100644
index 0000000000..846aa7094e
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/thread-new-closed-offl-kill.png
diff --git a/comm/suite/themes/modern/messenger/icons/thread-new-closed.png b/comm/suite/themes/modern/messenger/icons/thread-new-closed.png
new file mode 100644
index 0000000000..74263ba533
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/thread-new-closed.png
diff --git a/comm/suite/themes/modern/messenger/icons/threadcol-threaded.png b/comm/suite/themes/modern/messenger/icons/threadcol-threaded.png
new file mode 100644
index 0000000000..2faf37198f
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/threadcol-threaded.png
diff --git a/comm/suite/themes/modern/messenger/icons/threadcol-unthreaded.png b/comm/suite/themes/modern/messenger/icons/threadcol-unthreaded.png
new file mode 100644
index 0000000000..f9bc07bb0f
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/icons/threadcol-unthreaded.png
diff --git a/comm/suite/themes/modern/messenger/mailWindow1.css b/comm/suite/themes/modern/messenger/mailWindow1.css
new file mode 100644
index 0000000000..6f23ee00bf
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/mailWindow1.css
@@ -0,0 +1,143 @@
+/* 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/. */
+
+/* ===== mailWindow1.css ================================================
+  == Styles for the main Mail window in the default layout scheme.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+@import url("chrome://messenger/skin/primaryToolbar.css");
+@import url("chrome://messenger/skin/folderMenus.css");
+@import url("chrome://messenger/skin/folderPane.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* :::::
+   :: Make sure the min height is small so we can
+   :: resize the pane vertically -EDV
+   ::::: */
+
+#messagepanebox {
+  min-height: 10px;
+  height: 0px;
+}
+
+/* ..... folder pane adjustments ..... */
+
+.folderview-cycler > .toolbarbutton-text {
+  display: none;
+}
+
+.folderview-cycler > .toolbarbutton-icon {
+  margin: 0px;
+}
+
+.folderview-cycler[dir="prev"],
+.folderview-cycler[dir="next"]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-lft.png");
+}
+
+.folderview-cycler[dir="next"],
+.folderview-cycler[dir="prev"]:-moz-locale-dir(rtl) {
+  list-style-image: url("chrome://global/skin/arrow/arrow-rit.png");
+}
+
+/* ::::: border adjustments for focus ring and joined splitters ::::: */
+
+#folderpane-splitter {
+  border-right: none;
+  border-bottom: none;
+  border-left: none;
+  min-width: 5px;
+}
+
+#threadpane-splitter {
+  border: none;
+  min-height: 5px;
+}
+
+#threadpane-splitter[state="collapsed"] {
+  border-bottom: 2px solid;
+}
+
+/* ..... tree adjustments ..... */
+
+#folderTree {
+  border-right: 1px solid #97A4B2;
+  min-width: 1px;
+}
+
+#threadTree {
+  border-bottom: 1px solid #97A4B2;
+  min-width: 1px;
+}
+
+#threadTree,
+#accountCentralBox,
+#messagepanebox {
+  border-left: 1px solid #3B414F;
+}
+
+/* ::::: search toolbar ::::: */
+
+#searchToolbar {
+  background: url("chrome://global/skin/toolbar/tb-mid.png") #C7D0D9 repeat-x top;
+}
+
+#searchToolbar > .toolbar-box > toolbargrippy,
+#searchToolbar > .toolbar-box > .toolbar-holder {
+  border-top: 1px solid #CED6DD;
+  border-right: 1px solid #95A0AD;
+  border-bottom: 1px solid #95A0AD;
+  border-left: 1px solid #DAE3ED;
+}
+
+#searchToolbar > .toolbar-box > toolbargrippy:hover:active {
+  border-color: #67737E;
+}
+
+/* ::::: location widget ::::: */
+
+#locationIcon {
+  list-style-image: none;
+}
+
+/* ..... message pane adjustments ..... */
+
+#messagepanebox {
+ border-top: 1px solid #3B414F;
+}
+
+#msgHeaderView {
+  border-left: none !important;
+}
+
+#messagepane {
+  border: 1px solid #FFFFFF;
+  border-right: none;
+}
+
+#messagepanebox[focusring="true"] > #messagepanewrapper > #messagepane {
+  border-color: #000000;
+}
+
+/* ..... tabmail ..... */
+
+.tab-close-button {
+  list-style-image: url("chrome://global/skin/icons/close.png");
+}
+
+.tabmail-tab[type="folder"][IsServer="true"],
+.alltabs-item[selected="true"] {
+  font-weight: bold;
+}
+
+.alltabs-item[tabIsScrolled] {
+  font-style: italic;
+}
+
+#tabbar-toolbar {
+  background-color: transparent;
+  min-height: 0;
+}
diff --git a/comm/suite/themes/modern/messenger/messageBody.css b/comm/suite/themes/modern/messenger/messageBody.css
new file mode 100644
index 0000000000..dca30c7826
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/messageBody.css
@@ -0,0 +1,190 @@
+/* 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/. */
+
+/* ===== messageBody.css =================================================
+  == Styles for the body of a mail message.
+  ======================================================================= */
+
+@import url(chrome://communicator/skin/smileys.css);
+@import url(chrome://messenger/skin/messageQuotes.css);
+
+@namespace url("http://www.w3.org/1999/xhtml");
+
+/* :::: message header ::::: */
+
+.header-part1 {
+  background-color: #EFEFEF;
+}
+
+.header-part2,
+.header-part3 {
+  background-color: #DEDEDE;
+}
+
+.headerdisplayname {
+  display: inline;
+  font-weight: bold;
+  white-space: pre;
+}
+
+/* ::::: message text, incl. quotes ::::: */
+
+.moz-text-flowed blockquote,
+.moz-text-plain blockquote {
+  margin: 0;
+}
+
+.moz-text-plain pre {
+  margin: 0;
+  font-family: inherit;
+}
+
+.moz-text-plain[wrap="true"] {
+  white-space: pre-wrap;
+}
+
+.moz-text-plain[wrap="false"] {
+  white-space: pre;
+}
+
+.moz-text-plain[wrap="flow"] .moz-txt-sig {
+  white-space: pre-wrap;
+}
+
+.moz-text-plain[graphical-quote="false"] blockquote {
+  border-style: none;
+  padding: 0;
+}
+
+.moz-text-plain[graphical-quote="true"] .moz-txt-citetags {
+  display: none;
+}
+
+.moz-txt-underscore {
+  text-decoration: underline;
+}
+
+.moz-txt-formfeed {
+  display: block;
+  height: 100%;
+}
+
+/* ::::: signature ::::: */
+
+@media not print {
+  .moz-txt-sig,
+  .moz-signature {
+    opacity: 0.5;
+  }
+
+  .moz-txt-sig .moz-txt-sig,
+  .moz-signature .moz-signature {
+    opacity: 1.0;
+  }
+}
+
+/* ::::: vcard ::::: */
+
+.moz-vcard-table {
+  border-radius: 8px;
+  border: thin solid gray;
+  margin-top: 10px;
+  background: url("chrome://communicator/skin/toolbar/prtb-bg-noline.png") repeat-x;
+  background-position: 0px -1px;
+}
+
+.moz-vcard-property {
+  font-size: 80%;
+  color: gray;
+}
+
+.moz-vcard-title-property {
+  padding-bottom: 10px;
+}
+
+.moz-vcard-badge {
+  height: 30px;
+  width: 30px;
+  display: block;
+  background-image: url("chrome://messenger/skin/icons/btn1.png");
+  background-position: -5px -308px;
+}
+
+.moz-vcard-badge:hover {
+  background-position: -55px -308px;
+  outline: 1px dotted;
+}
+
+.moz-vcard-badge:hover:active {
+  background-position: -105px -308px;
+}
+
+/* ::::: attached images ::::: */
+
+.moz-attached-image-container {
+  text-align: center;
+}
+
+.moz-attached-image {
+  image-orientation: from-image;
+}
+
+.moz-attached-image[overflowing="true"] {
+  cursor: zoom-out;
+}
+
+.moz-attached-image[isshrunk="true"] {
+  cursor: zoom-in;
+  max-width: 100%;
+}
+
+/* Old style feeds. */
+#_mailrssiframe {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  border: none;
+}
+
+/* Attachment display styling (for inline attachments and printing) */
+.mimeAttachmentHeader {
+  border-style: none;
+  border-top: 1px solid gray;
+}
+
+.mimeAttachmentHeaderName {
+  color: gray;
+  font-size: 80%;
+}
+
+.mimeAttachmentWrap {
+  padding: 0 1em;
+}
+
+.mimeAttachmentTable {
+  width: 100%;
+  border-collapse: collapse;
+  table-layout: fixed;
+}
+
+.mimeAttachmentTable tr + tr > td {
+  border-top: 1px solid gray;
+}
+
+.mimeAttachmentFile {
+  word-wrap: break-word;
+}
+
+.mimeAttachmentSize {
+  vertical-align: top;
+  width: 10ch;
+  text-align: right;
+}
+
+.mimeAttachmentFile,
+.mimeAttachmentSize {
+  padding: 0.25em 0;
+}
diff --git a/comm/suite/themes/modern/messenger/messageHeader.css b/comm/suite/themes/modern/messenger/messageHeader.css
new file mode 100644
index 0000000000..d86d816486
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/messageHeader.css
@@ -0,0 +1,189 @@
+/* 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/. */
+
+/* ===== messageHeader.css ==============================================
+  == Styles for the header toolbars of a mail message.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: msg header toolbars ::::: */
+
+#collapsedHeaderView,
+#expandedHeaderView {
+  min-width: 1px;
+}
+
+.header-part1 {
+  background-color: #C7D0D9;
+  color: #000000;
+}
+
+/* ::::: msg header buttons ::::: */
+
+#expandedAttachmentBox {
+  width: 20em;
+  height: 0;
+}
+
+#attachmentText {
+  font-weight: bold;
+}
+
+/* ::::: msg header captions ::::: */
+
+#msgHeaderView {
+  border-right: 1px solid #7B969C;
+  border-bottom: 1px solid #000000;
+  border-left: 1px solid #7B969C;
+}
+
+#collapsedHeaderView,
+#expandedHeaderView {
+  min-width: 1px;
+}
+
+.headerNameBox {
+  width: 7.7em;
+}
+
+.headerName {
+  margin-top: 0px;
+  margin-bottom: 5px;
+  margin-inline-start: 0px;
+  margin-inline-end: .5em;
+  font-weight: bold;
+  text-align: right;
+}
+
+.headerValue {
+  margin: 0;
+  min-width: 50px;
+  white-space: normal;
+}
+
+.headerValueBox {
+  margin: 0 0 5px;
+}
+
+.headerValueBox[singleline="true"] {
+  overflow: hidden;
+}
+
+.subjectvalue {
+  font-weight: bold;
+}
+
+.tagvalue {
+  margin-top: 0;
+  margin-inline-start: 0;
+}
+
+/* ::::: msg header message ids ::::: */
+
+.messageIdDisplayButton {
+  cursor: pointer;
+  color: #424F63;
+  text-decoration: underline;
+  margin: 0;
+}
+
+.messageIdDisplayButton:hover {
+  color: #1455D6;
+}
+
+.messageIdDisplayImage {
+  padding-inline-start: 2px;
+  -moz-box-pack: end;
+}
+
+/* ::::: msg header email addresses ::::: */
+
+.emailDisplayButton {
+  cursor: pointer;
+  color: #424F63;
+  text-decoration: underline;
+  margin: 0;
+}
+
+.emailDisplayButton:hover {
+  color: #1455D6;
+}
+
+.emailDisplayImage {
+  padding-inline-start: 2px;
+  -moz-box-pack: end;
+}
+
+mail-emailaddress:-moz-focusring {
+  outline: 1px dotted;
+  outline-offset: -1px;
+}
+
+/* ::::: email address twisty ::::: */
+
+.addresstwisty {
+  margin: 2px;
+  list-style-image: url("chrome://global/skin/tree/twisty-clsd.png");
+}
+
+.addresstwisty[open] {
+  list-style-image: url("chrome://global/skin/tree/twisty-open.png");
+}
+
+/* ::::: view expand and collapse twisties  ::::: */
+
+.expandHeaderViewButton,
+.collapsedHeaderViewButton  {
+  margin: 2px .5em 0;
+}
+
+.expandHeaderViewButton {
+  list-style-image: url("chrome://global/skin/tree/twisty-open.png");
+}
+
+.collapsedHeaderViewButton  {
+  list-style-image: url("chrome://global/skin/tree/twisty-clsd.png");
+}
+
+/* ::::: collapsed view styles ::::: */
+
+#collapsedAttachmentBox {
+  -moz-box-pack: center;
+}
+
+#collapseddateValue {
+  margin: 0 .5em;
+  text-align: right;
+}
+
+#collapseddateValue > .textbox-input-box menupopup {
+  text-align: left;
+}
+
+#collapsedfromBox {
+  width: 18em;
+}
+
+#collapseddateBox {
+  width: 12em;
+}
+
+.collapsedHeaderDisplayName {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-inline-start: .7em;
+  margin-inline-end: .5em;
+  min-height: 16px;
+  font-weight: bold;
+}
+
+.collapsedHeaderValue {
+  margin: 0;
+}
+
+.collapsedAttachmentButton {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.png");
+  margin-inline-end: .5em;
+}
diff --git a/comm/suite/themes/modern/messenger/messageKeywords.css b/comm/suite/themes/modern/messenger/messageKeywords.css
new file mode 100644
index 0000000000..751eb1eb83
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/messageKeywords.css
@@ -0,0 +1,8 @@
+/* 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/. */
+
+/* distributors / ISPs can use this
+ * to add or override icons and colors to the message pane.
+ * see http://www.mozilla.org/mailnews/arch/messagekeywords.html
+ */
diff --git a/comm/suite/themes/modern/messenger/messageQuotes.css b/comm/suite/themes/modern/messenger/messageQuotes.css
new file mode 100644
index 0000000000..6c4b636f3c
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/messageQuotes.css
@@ -0,0 +1,58 @@
+/* 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/. */
+
+/* Because this sheet is loaded synchronously while the user is waiting for the
+   compose window to appear, it must not @import a ton of other things, and
+   especially must not trigger network access. */
+
+/* ===== messageQuotes.css =================================================
+  == Shared styles such as block quote colors and signature style
+  == between the message body during
+  == message display and the mail editor instance for mail compose.
+  ======================================================================= */
+
+/* workaround for MS Outlook mails where the line-height is set to 0 */
+body {
+  line-height: initial !important;
+}
+
+/* ::::: signature ::::: */
+
+@media not print {
+  div.moz-text-flowed > div.moz-txt-sig,
+  div.moz-text-plain > pre > div.moz-txt-sig,
+  pre.moz-signature {
+    opacity: 0.6;
+  }
+}
+
+/* ::::: Turn on borders and padding for quotes. ::::: */
+blockquote[type=cite] {
+  padding: 0.4ex 1ex;
+  margin: 1ex;
+  border-width: 0px 0px 0px 2px;
+  border-style: none none none solid;
+  border-radius: 2px;
+}
+
+/* ::::: Colorize block quote borders. We only go 5 levels deep. ::::: */
+blockquote[type=cite] {
+  border-color: rgb(131, 165, 201); /* 65% */}
+
+blockquote[type=cite] blockquote[type=cite] {
+  border-color: rgb(149, 178, 208); /* 70% */
+}
+
+blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] {
+  border-color: rgb(166, 190, 216); /* 75% */
+}
+
+blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] {
+
+  border-color: rgb(184, 203, 224); /* 80% */
+}
+
+blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] blockquote[type=cite] {
+  border-color: rgb(202, 216, 232); /* 85% */
+}
diff --git a/comm/suite/themes/modern/messenger/messageWindow.css b/comm/suite/themes/modern/messenger/messageWindow.css
new file mode 100644
index 0000000000..105ccb0752
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/messageWindow.css
@@ -0,0 +1,13 @@
+/* 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/. */
+
+/* ===== messageWindow.css ==============================================
+  == Styles for the message window.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+@import url("chrome://messenger/skin/primaryToolbar.css");
+@import url("chrome://messenger/skin/threadPaneLabels.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
diff --git a/comm/suite/themes/modern/messenger/messenger.css b/comm/suite/themes/modern/messenger/messenger.css
new file mode 100644
index 0000000000..f938368535
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/messenger.css
@@ -0,0 +1,23 @@
+/* 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/. */
+
+/* ===== messenger.css ==================================================
+  == Styles shared throughout the Messenger application.
+  ======================================================================= */
+
+@import url("chrome://communicator/skin/");
+@import url("chrome://messenger/content/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: miscellany :::::: */
+
+spacer.spacer {
+  width: 5px;
+  height: 5px;
+}
+
+
+
+
diff --git a/comm/suite/themes/modern/messenger/messengercompose/icons/mast-msgcomp.png b/comm/suite/themes/modern/messenger/messengercompose/icons/mast-msgcomp.png
new file mode 100644
index 0000000000..46c5b8d286
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/messengercompose/icons/mast-msgcomp.png
diff --git a/comm/suite/themes/modern/messenger/messengercompose/messengercompose.css b/comm/suite/themes/modern/messenger/messengercompose/messengercompose.css
new file mode 100644
index 0000000000..58e6719ad8
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/messengercompose/messengercompose.css
@@ -0,0 +1,211 @@
+/* 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/. */
+
+/* ===== messengercompose.css ===========================================
+  == Styles for the main Messenger Compose window.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: primary toolbar masthead ::::: */
+
+#composeToolbar > .toolbar-holder > .toolbar-primary-icon {
+  background-image: url("chrome://messenger/skin/messengercompose/icons/mast-msgcomp.png");
+}
+
+/* ::::: primary toolbar buttons ::::: */
+
+#button-send {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(374px 49px 407px 0);
+}
+
+#button-send:hover {
+  -moz-image-region: rect(374px 99px 407px 50px);
+} 
+
+#button-send:hover:active {
+  -moz-image-region: rect(374px 149px 407px 100px);
+} 
+
+#button-send[disabled="true"] {
+  -moz-image-region: rect(374px 199px 407px 150px) !important;
+} 
+
+#button-address {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(306px 49px 339px 0);
+}
+
+#button-address:hover {
+  -moz-image-region: rect(306px 99px 339px 50px);
+} 
+
+#button-address:hover:active {
+  -moz-image-region: rect(306px 149px 339px 100px);
+} 
+
+#button-address[disabled="true"] {
+  -moz-image-region: rect(306px 199px 339px 150px) !important;
+} 
+
+#button-attach {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(340px 49px 373px 0);
+}
+
+#button-attach:hover {
+  -moz-image-region: rect(340px 99px 373px 50px);
+} 
+
+#button-attach:hover:active {
+  -moz-image-region: rect(340px 149px 373px 100px);
+} 
+
+#button-attach[disabled="true"] {
+  -moz-image-region: rect(340px 199px 373px 150px) !important;
+} 
+
+#spellingButton {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(272px 49px 305px 0);
+}
+
+#spellingButton:hover {
+  -moz-image-region: rect(272px 99px 305px 50px);
+}
+
+#spellingButton:hover:active {
+  -moz-image-region: rect(272px 149px 305px 100px);
+}
+
+#spellingButton[disabled="true"] {
+  -moz-image-region: rect(272px 199px 305px 150px) !important;
+}
+
+#button-save {
+  list-style-image: url("chrome://editor/skin/icons/btn1.png");
+  -moz-image-region: rect(238px 49px 271px 0);
+}
+
+#button-save:hover {
+  -moz-image-region: rect(238px 99px 271px 50px);
+} 
+
+#button-save:hover:active {
+  -moz-image-region: rect(238px 149px 271px 100px);
+} 
+
+#button-save[disabled="true"] {
+  -moz-image-region: rect(238px 199px 271px 150px) !important;
+} 
+
+/* To workaround that the mailnews icons are all 33px tall and do not have small versions */
+toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
+toolbar[iconsize="small"] > #print-button,
+#print-button {
+  list-style-image: url("chrome://communicator/skin/icons/common.png");
+  -moz-image-region: rect(5px 42px 38px 0);
+}
+
+toolbar[iconsize="small"] > #print-button:hover,
+#print-button:hover {
+  -moz-image-region: rect(5px 84px 38px 42px);
+}
+
+toolbar[iconsize="small"] > #print-button:hover:active,
+#print-button:hover:active {
+  -moz-image-region: rect(5px 126px 38px 84px);
+}
+
+toolbar[iconsize="small"] > #print-button[disabled="true"],
+#print-button[disabled="true"] {
+  -moz-image-region: rect(5px 168px 38px 126px) !important;
+}
+
+/* ::::: special toolbar colors ::::: */
+
+#MsgHeadersToolbar {
+  background: #B1BDC9;
+}
+
+#FormatToolbar {
+  background: url("chrome://global/skin/toolbar/tb-mid.png") #C7D0D9 repeat-x top;
+}
+
+#MsgHeadersToolbar > toolbargrippy,
+#MsgHeadersToolbar > .toolbar-holder,
+#FormatToolbar > toolbargrippy,
+#FormatToolbar > .toolbar-holder {
+  border-top: 1px solid #CED6DD;
+  border-right: 1px solid #95A0AD;
+  border-bottom: 1px solid #95A0AD;
+  border-left: 1px solid #DAE3ED;
+}
+
+#MsgHeadersToolbar > toolbargrippy:hover:active,
+#FormatToolbar > toolbargrippy:hover:active {
+  border-color: #67737E;
+}
+
+.toolbox-top {
+  border-bottom: none;
+}
+
+#attachmentbucket-sizer {
+  border-top: none;
+  border-bottom: none;
+  background-color: #B1BDC9;
+}
+
+#compose-toolbar-sizer {
+  border-top-width: 1px;
+  border-top-color: #EEF0F3;
+}
+
+#FontFaceSelect {
+  max-width: 35ch;
+}
+
+/* ::::: autocomplete icons ::::: */
+
+treechildren::-moz-tree-cell-text(default-match) {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 15px;
+  margin-inline-end: -3px;
+  border: none;
+}
+
+treechildren::-moz-tree-image(local-abook) {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 4px;
+  margin-inline-end: -3px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/myaddrbk.png");
+}
+
+treechildren::-moz-tree-image(remote-abook) {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 3px;
+  margin-inline-end: -4px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/directory.png");
+}
+
+treechildren::-moz-tree-image(remote-err) {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 3px;
+  margin-inline-end: -4px;
+  list-style-image: url("chrome://messenger/skin/addressbook/icons/directory-down.png");
+}
+
+treechildren::-moz-tree-image(subscribed-news) {
+  margin-inline-start: 3px;
+  margin-inline-end: -4px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+}
diff --git a/comm/suite/themes/modern/messenger/msgSelectOffline.css b/comm/suite/themes/modern/messenger/msgSelectOffline.css
new file mode 100644
index 0000000000..4b025ed994
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/msgSelectOffline.css
@@ -0,0 +1,33 @@
+/* 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/. */
+
+/* ===== msgSelectOffline.css =================================================
+   == The dialog where you select which folders to enable for offline use.
+   ========================================================================== */
+
+@import url("chrome://messenger/skin/");
+@import url("chrome://messenger/skin/folderPane.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+treechildren::-moz-tree-image(syncCol) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://global/skin/checkbox/cbox.png");
+}
+
+treechildren::-moz-tree-image(syncCol, synchronize-true) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check.png");
+}
+
+treechildren::-moz-tree-image(syncCol, isServer-true) {
+  list-style-image: none;
+}
+
+#folderNameCol [sortDirection="ascending"] {
+  list-style-image: none;
+}
+
+#folderNameCol [sortDirection="descending"] {
+  list-style-image: none;
+}
diff --git a/comm/suite/themes/modern/messenger/newmailalert.css b/comm/suite/themes/modern/messenger/newmailalert.css
new file mode 100644
index 0000000000..24c6c1e616
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/newmailalert.css
@@ -0,0 +1,67 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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/. */
+
+/* ===== alert.css =====================================================
+  == Styles specific to the alerts dialog.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#newMailAlertNotification {
+  min-height: 60px;
+  border: ridge #5486DA 4px;
+}
+
+#alertImage {
+  list-style-image: url("chrome://branding/content/icon64.png");
+}
+
+#alertImageBox {
+  padding: 4px;
+}
+
+#alertTitle {
+  font-weight: bold;
+}
+
+#alertTextBox {
+  padding: 4px;
+  padding-inline-end: 16px;
+}
+
+.folderSummary-message-row
+{
+  /* This max width ends up dictating the overall width of the alert window
+     because it controls how large the preview, subject and sender text can be
+     before cropping kicks in */
+  max-width: 450px;
+  padding: 0px 5px;
+}
+
+.folderSummary-subject {
+  font-weight: bold;
+}
+
+.folderSummary-sender, .folderSummary-subject {
+  cursor: inherit;
+}
+
+.folderSummary-previewText {
+  color: #8C99AB;
+}
+
+.folderSummaryMessage:hover > .folderSummary-message-row {
+  cursor: pointer;
+  color: #0000FF;
+}
+
+#closeButton {
+  list-style-image: url("chrome://global/skin/icons/closebox.png");
+  -moz-appearance: none;
+  border: none !important;
+  padding: 2px 0px 0px;
+}
diff --git a/comm/suite/themes/modern/messenger/newsblog/feed-subscriptions.css b/comm/suite/themes/modern/messenger/newsblog/feed-subscriptions.css
new file mode 100644
index 0000000000..436140430a
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/newsblog/feed-subscriptions.css
@@ -0,0 +1,30 @@
+/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
+ * 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/. */
+
+/* ::::: Feed Subscription styling :::::: */
+
+#subscriptionsDialog {
+  width: 40em;
+  height: 30em;
+}
+
+#contentPane {
+  padding: 14px;
+}
+
+#rssFeedInfoBox {
+  border: 1px solid #2D3B49;
+  margin: 4px;
+  padding-top: 4px;
+  background-color: #BBC6D1;
+}
+
+#statusContainerBox {
+  height: 24px;
+}
+
+#autotagPrefix {
+  width: 35ch;
+}
diff --git a/comm/suite/themes/modern/messenger/newsblog/rss-feed.png b/comm/suite/themes/modern/messenger/newsblog/rss-feed.png
new file mode 100644
index 0000000000..aef600bf35
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/newsblog/rss-feed.png
diff --git a/comm/suite/themes/modern/messenger/prefPanels.css b/comm/suite/themes/modern/messenger/prefPanels.css
new file mode 100644
index 0000000000..f01b406d98
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/prefPanels.css
@@ -0,0 +1,21 @@
+/* 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/. */
+
+/* ===== prefPanels.css =================================================
+  == Styles for the Messenger preference panels.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Tags ::::: */
+
+#tagList > listhead {
+  text-align: center;
+}
+
+#tagList > listitem > listcell {
+  padding: 0 16px;
+}
diff --git a/comm/suite/themes/modern/messenger/primaryToolbar.css b/comm/suite/themes/modern/messenger/primaryToolbar.css
new file mode 100644
index 0000000000..7145629267
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/primaryToolbar.css
@@ -0,0 +1,385 @@
+/* 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/. */
+
+/* ===== primaryToolbar.css =============================================
+  == Images for the Mail primary toolbar.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: primary toolbar masthead ::::: */
+
+#msgToolbar > .toolbar-holder > .toolbar-primary-icon {
+  list-style-image: url("chrome://messenger/skin/icons/mast-mail.png");
+}
+
+/* ::::: primary toolbar buttons ::::: */
+
+.toolbarbutton-1 {
+  min-width: 0px;
+}
+
+#button-getmsg {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(102px 49px 135px 0);
+}
+
+#button-getmsg:hover {
+  -moz-image-region: rect(102px 99px 135px 50px);
+} 
+
+#button-getmsg:hover:active {
+  -moz-image-region: rect(102px 149px 135px 100px);
+} 
+
+#button-getmsg[disabled] {
+  -moz-image-region: rect(102px 199px 135px 150px) !important;
+} 
+
+#button-newmsg {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(170px 49px 203px 0);
+}
+
+#button-newmsg:hover {
+  -moz-image-region: rect(170px 99px 203px 50px);
+} 
+
+#button-newmsg:hover:active {
+  -moz-image-region: rect(170px 149px 203px 100px);
+} 
+
+#button-newmsg[disabled] {
+  -moz-image-region: rect(170px 199px 203px 150px) !important;
+} 
+
+#button-reply {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(238px 49px 271px 0);
+}
+
+#button-reply:hover {
+  -moz-image-region: rect(238px 99px 271px 50px);
+} 
+
+#button-reply:hover:active {
+  -moz-image-region: rect(238px 149px 271px 100px);
+} 
+
+#button-reply[disabled] {
+  -moz-image-region: rect(238px 199px 271px 150px) !important;
+} 
+
+#button-replyall {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(272px 49px 305px 0);
+}
+
+#button-replyall:hover {
+  -moz-image-region: rect(272px 99px 305px 50px);
+} 
+
+#button-replyall:hover:active {
+  -moz-image-region: rect(272px 149px 305px 100px);
+} 
+
+#button-replyall[disabled] {
+  -moz-image-region: rect(272px 199px 305px 150px) !important;
+} 
+
+#button-forward {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(68px 49px 101px 0);
+}
+
+#button-forward:hover {
+  -moz-image-region: rect(68px 99px 101px 50px);
+} 
+
+#button-forward:hover:active {
+  -moz-image-region: rect(68px 149px 101px 100px);
+} 
+
+#button-forward[disabled] {
+  -moz-image-region: rect(68px 199px 101px 150px) !important;
+} 
+
+#button-file {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(34px 49px 67px 0);
+}
+
+#button-file:hover {
+  -moz-image-region: rect(34px 99px 67px 50px);
+} 
+
+#button-file:hover:active,
+#button-file[open] {
+  -moz-image-region: rect(34px 149px 67px 100px);
+} 
+
+#button-file[disabled] {
+  -moz-image-region: rect(34px 199px 67px 150px) !important;
+} 
+
+#button-goback {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(578px 49px 611px 0);
+}
+
+#button-goback:hover {
+  -moz-image-region: rect(578px 99px 611px 50px);
+}
+
+#button-goback:hover:active {
+  -moz-image-region: rect(578px 149px 611px 100px);
+}
+
+#button-goback[disabled] {
+  -moz-image-region: rect(578px 199px 611px 150px) !important;
+}
+
+#button-goforward {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(612px 49px 645px 0);
+}
+
+#button-goforward:hover {
+  -moz-image-region: rect(612px 99px 645px 50px);
+}
+
+#button-goforward:hover:active {
+  -moz-image-region: rect(612px 149px 645px 100px);
+}
+
+#button-goforward[disabled] {
+  -moz-image-region: rect(612px 199px 645px 150px) !important;
+}
+
+#button-next {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(204px 49px 237px 0);
+}
+
+#button-next:hover {
+  -moz-image-region: rect(204px 99px 237px 50px);
+} 
+
+#button-next:hover:active {
+  -moz-image-region: rect(204px 149px 237px 100px);
+} 
+
+#button-next[disabled] {
+  -moz-image-region: rect(204px 199px 237px 150px) !important;
+} 
+
+#button-delete {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(0 49px 33px 0);
+}
+
+#button-delete:hover {
+  -moz-image-region: rect(0 99px 33px 50px);
+} 
+
+#button-delete:hover:active {
+  -moz-image-region: rect(0 149px 33px 100px);
+}
+
+#button-delete[disabled] {
+  -moz-image-region: rect(0 199px 33px 150px) !important;
+}
+
+toolbarpaletteitem > #button-delete {
+  display: -moz-box;
+}
+
+#button-mark {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(136px 49px 169px 0);
+}
+
+#button-mark:hover {
+  -moz-image-region: rect(136px 99px 169px 50px);
+} 
+
+#button-mark:hover:active {
+  -moz-image-region: rect(136px 149px 169px 100px);
+} 
+
+#button-mark[disabled] {
+  -moz-image-region: rect(136px 199px 169px 150px) !important;
+} 
+
+#button-junk {
+  list-style-image: url("chrome://messenger/skin/icons/btn1.png");
+  -moz-image-region: rect(544px 49px 577px 0);
+}
+
+#button-junk:hover {
+  -moz-image-region: rect(544px 99px 577px 50px);
+} 
+
+#button-junk:hover:active {
+  -moz-image-region: rect(544px 149px 577px 100px);
+}
+
+#button-junk[disabled="true"] {
+  -moz-image-region: rect(544px 199px 577px 150px) !important;
+}
+
+/* To workaround the mailnews icons are 33px tall and have no small versions */
+toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
+toolbar[iconsize="small"] > #print-button {
+  list-style-image: url("chrome://communicator/skin/icons/common.png");
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #print-button,
+toolbar[iconsize="small"] > #print-button,
+#print-button {
+  -moz-image-region: rect(5px 42px 38px 0);
+}
+
+toolbar[iconsize="small"] > #print-button:hover,
+#print-button:hover {
+  -moz-image-region: rect(5px 84px 38px 42px);
+}
+
+toolbar[iconsize="small"] > #print-button:hover:active,
+#print-button:hover:active {
+  -moz-image-region: rect(5px 126px 38px 84px);
+}
+
+toolbar[iconsize="small"] > #print-button[disabled="true"],
+#print-button[disabled="true"] {
+  -moz-image-region: rect(5px 168px 38px 126px) !important;
+}
+
+#button-stop {
+  list-style-image: url("chrome://communicator/skin/icons/btn1.png");
+  -moz-image-region: rect(68px 49px 101px 0);
+}
+
+#button-stop:hover {
+  -moz-image-region: rect(68px 99px 101px 50px);
+} 
+
+#button-stop:hover:active {
+  -moz-image-region: rect(68px 149px 101px 100px);
+}
+
+#button-stop[disabled="true"] {
+  -moz-image-region: rect(68px 199px 101px 150px) !important;
+}
+
+#sync-button {
+  list-style-image: url("chrome://communicator/skin/sync/sync-32.png");
+}
+
+#sync-button[status=active] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-32-throbber.png");
+}
+
+#locationFolders {
+  width: 22em;
+}
+
+
+/* Force the folder location and mail view items to fit in the available width
+   in the Customize Toolbar dialog. */
+#palette-box #locationFolders,
+#palette-box #folder-location-container,
+#palette-box #searchInput,
+#palette-box #button-search-container,
+#palette-box #button-search,
+#palette-box #mailviews-container,
+#palette-box #viewPicker {
+  -moz-box-flex: 1;
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+/* XXXRatty We don't have any small graphics for these buttons yet.
+toolbar[iconsize="small"] #button-getmsg {}
+toolbar[iconsize="small"] #button-newmsg {}
+toolbar[iconsize="small"] #button-reply {}
+toolbar[iconsize="small"] #button-replyall {}
+toolbar[iconsize="small"] #button-forward {}
+toolbar[iconsize="small"] #button-file {}
+toolbar[iconsize="small"] #button-goback {}
+toolbar[iconsize="small"] #button-goforward {}
+toolbar[iconsize="small"] #button-next {}
+toolbar[iconsize="small"] #button-junk {}
+toolbar[iconsize="small"] #button-delete {}
+toolbar[iconsize="small"] #button-mark {}
+*/
+
+toolbar[iconsize="small"] #button-stop {
+  list-style-image: url("chrome://communicator/skin/icons/common-small.png");
+  -moz-image-region: rect(19px 19px 38px 0);
+}
+
+toolbar[iconsize="small"] #button-stop:hover {
+  -moz-image-region: rect(19px 38px 38px 19px);
+}
+
+toolbar[iconsize="small"] #button-stop:hover:active {
+  -moz-image-region: rect(19px 57px 38px 38px);
+}
+
+toolbar[iconsize="small"] #button-stop[disabled="true"] {
+  -moz-image-region: rect(19px 76px 38px 57px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button,
+toolbar[iconsize="small"] > #sync-button {
+  list-style-image: url("chrome://communicator/skin/sync/sync-16.png");
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button[status=active],
+toolbar[iconsize="small"] > #sync-button[status=active] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-16-throbber.png");
+}
+
+/* ::::: Lightning icon sizes ::::: */
+
+#lightning-button-calendar > .toolbarbutton-icon,
+#lightning-button-tasks > .toolbarbutton-icon,
+#extractEventButton .toolbarbutton-icon,
+#extractTaskButton .toolbarbutton-icon {
+  width: 33px;
+  height: 33px;
+}
+
+#lightning-button-calendar[disabled="true"] > .toolbarbutton-icon,
+#lightning-button-tasks[disabled="true"] > .toolbarbutton-icon,
+#extractEventButton[disabled="true"] .toolbarbutton-icon,
+#extractTaskButton[disabled="true"] .toolbarbutton-icon {
+  opacity: 0.3;
+}
+
+/* ::::: message notification bar style rules ::::: */
+
+.msgNotificationBar {
+  border-bottom: 1px solid #000000;
+  -moz-appearance: toolbox;
+  background-color: #C7BC8F;
+  color: black;
+}
+
+.messageImage[value="remoteContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/remote-blocked.png");
+}
+
+.messageImage[value="junkContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/junk.png");
+}
+
+.messageImage[value="phishingContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/phishing.png");
+}
+
+.messageImage[value="mdnContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/info.png");
+}
diff --git a/comm/suite/themes/modern/messenger/searchDialog.css b/comm/suite/themes/modern/messenger/searchDialog.css
new file mode 100644
index 0000000000..a47f54c17b
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/searchDialog.css
@@ -0,0 +1,59 @@
+/* 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/. */
+
+/* ===== searchDialog.css ===============================================
+  == Styles for the Mail Search dialog.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: Search Dialog adjustments ::::: */
+
+
+#searchTermTree {
+  min-height: 50px;
+}
+
+#searchTermListBox {
+  height: 100px;
+}
+
+#searchResultListBox {
+  margin: 5px;
+  height: 100px;
+}
+
+#searchAddressBookWindow,
+#searchMailWindow {
+  padding: 0px;
+}
+
+.search-menulist[unavailable="true"] {
+  color: #8C99AB;
+}
+
+menulist:not(#menuSearchLocalSystem) {
+  width: 12em;
+}
+
+menulist:not(#menuSearchLocalSystem) > menupopup > menuitem {
+  padding-inline-end: 2px;
+}
+
+.filler {
+  padding-inline-end: 22px;
+}
+
+.small-button {
+  min-width: 3em;
+  padding: 0px;
+  margin: 0px 1px;
+}
+
+textbox {
+  margin: 1px 4px;
+}
+
diff --git a/comm/suite/themes/modern/messenger/smime/certFetchingStatus.css b/comm/suite/themes/modern/messenger/smime/certFetchingStatus.css
new file mode 100644
index 0000000000..9638e0879d
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/smime/certFetchingStatus.css
@@ -0,0 +1,7 @@
+/* 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/. */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
diff --git a/comm/suite/themes/modern/messenger/smime/icons/hdrCryptoNotOk.png b/comm/suite/themes/modern/messenger/smime/icons/hdrCryptoNotOk.png
new file mode 100644
index 0000000000..3f4e8add83
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/smime/icons/hdrCryptoNotOk.png
diff --git a/comm/suite/themes/modern/messenger/smime/icons/hdrCryptoOk.png b/comm/suite/themes/modern/messenger/smime/icons/hdrCryptoOk.png
new file mode 100644
index 0000000000..c0f4b5e9d4
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/smime/icons/hdrCryptoOk.png
diff --git a/comm/suite/themes/modern/messenger/smime/icons/hdrSignNotOk.png b/comm/suite/themes/modern/messenger/smime/icons/hdrSignNotOk.png
new file mode 100644
index 0000000000..36c72dd351
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/smime/icons/hdrSignNotOk.png
diff --git a/comm/suite/themes/modern/messenger/smime/icons/hdrSignOk.png b/comm/suite/themes/modern/messenger/smime/icons/hdrSignOk.png
new file mode 100644
index 0000000000..3a0e75d97c
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/smime/icons/hdrSignOk.png
diff --git a/comm/suite/themes/modern/messenger/smime/icons/hdrSignUnknown.png b/comm/suite/themes/modern/messenger/smime/icons/hdrSignUnknown.png
new file mode 100644
index 0000000000..537d4daf84
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/smime/icons/hdrSignUnknown.png
diff --git a/comm/suite/themes/modern/messenger/smime/icons/sbCryptoNotOk.png b/comm/suite/themes/modern/messenger/smime/icons/sbCryptoNotOk.png
new file mode 100644
index 0000000000..92c6ee0311
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/smime/icons/sbCryptoNotOk.png
diff --git a/comm/suite/themes/modern/messenger/smime/icons/sbCryptoOk.png b/comm/suite/themes/modern/messenger/smime/icons/sbCryptoOk.png
new file mode 100644
index 0000000000..155c5582ce
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/smime/icons/sbCryptoOk.png
diff --git a/comm/suite/themes/modern/messenger/smime/icons/sbSignNotOk.png b/comm/suite/themes/modern/messenger/smime/icons/sbSignNotOk.png
new file mode 100644
index 0000000000..657b504044
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/smime/icons/sbSignNotOk.png
diff --git a/comm/suite/themes/modern/messenger/smime/icons/sbSignOk.png b/comm/suite/themes/modern/messenger/smime/icons/sbSignOk.png
new file mode 100644
index 0000000000..ceb4d347ab
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/smime/icons/sbSignOk.png
diff --git a/comm/suite/themes/modern/messenger/smime/icons/sbSignUnknown.png b/comm/suite/themes/modern/messenger/smime/icons/sbSignUnknown.png
new file mode 100644
index 0000000000..103849166a
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/smime/icons/sbSignUnknown.png
diff --git a/comm/suite/themes/modern/messenger/smime/icons/smbtn1.png b/comm/suite/themes/modern/messenger/smime/icons/smbtn1.png
new file mode 100644
index 0000000000..994e72b98d
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/smime/icons/smbtn1.png
diff --git a/comm/suite/themes/modern/messenger/smime/msgCompSMIMEOverlay.css b/comm/suite/themes/modern/messenger/smime/msgCompSMIMEOverlay.css
new file mode 100644
index 0000000000..fafce19419
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/smime/msgCompSMIMEOverlay.css
@@ -0,0 +1,58 @@
+/* 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/. */
+
+/* ===== msgCompSMIMEOverlay.css ========================================
+  == Styles for the S/Mime in composer window.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#button-security {
+  list-style-image: url("chrome://messenger/skin/smime/icons/smbtn1.png");
+  -moz-image-region: rect(0px 49px 33px 0px);
+}
+
+#button-security:hover {
+  -moz-image-region: rect(0px 99px 33px 50px);
+} 
+
+#button-security:hover:active {
+  -moz-image-region: rect(0px 149px 33px 100px);
+} 
+
+#button-security[disabled] {
+  -moz-image-region: rect(0px 199px 33px 150px) !important;
+} 
+
+
+#msgcomposeWindow #signing-status {
+  list-style-image: none;
+  visibility: collapse;
+}
+
+#msgcomposeWindow[signing="ok"] #signing-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.png");
+  visibility: visible;
+}
+
+#msgcomposeWindow[signing="notok"] #signing-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignNotOk.png");
+  visibility: visible;
+}
+
+
+#msgcomposeWindow #encryption-status {
+  list-style-image: none;
+  visibility: collapse;
+}
+
+#msgcomposeWindow[crypto="ok"] #encryption-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoOk.png");
+  visibility: visible;
+}
+
+#msgcomposeWindow[crypto="notok"] #encryption-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoNotOk.png");
+  visibility: visible;
+}
diff --git a/comm/suite/themes/modern/messenger/smime/msgCompSecurityInfo.css b/comm/suite/themes/modern/messenger/smime/msgCompSecurityInfo.css
new file mode 100644
index 0000000000..170c162340
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/smime/msgCompSecurityInfo.css
@@ -0,0 +1,11 @@
+/* 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/. */
+
+/* ===== msgReadSecurityInfo.css ========================================
+  == Styles for the security info window when displaying received mail.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
diff --git a/comm/suite/themes/modern/messenger/smime/msgHdrViewSMIMEOverlay.css b/comm/suite/themes/modern/messenger/smime/msgHdrViewSMIMEOverlay.css
new file mode 100644
index 0000000000..9e4cdd72af
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/smime/msgHdrViewSMIMEOverlay.css
@@ -0,0 +1,45 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#signedHdrIcon {
+  list-style-image: none;
+  visibility: visible;
+}
+
+#signedHdrIcon[signed="ok"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrSignOk.png");
+  visibility: visible;
+}
+
+#signedHdrIcon[signed="unknown"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrSignUnknown.png");
+  visibility: visible;
+}
+
+#signedHdrIcon[signed="mismatch"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrSignUnknown.png");
+  visibility: visible;
+}
+
+#signedHdrIcon[signed="notok"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrSignNotOk.png");
+  visibility: visible;
+}
+
+#encryptedHdrIcon {
+  list-style-image: none;
+  visibility: visible;
+}
+
+#encryptedHdrIcon[encrypted="ok"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrCryptoOk.png");
+  visibility: visible;
+}
+
+#encryptedHdrIcon[encrypted="notok"] {
+  list-style-image: url("chrome://messenger/skin/smime/icons/hdrCryptoNotOk.png");
+  visibility: visible;
+}
diff --git a/comm/suite/themes/modern/messenger/smime/msgReadSMIMEOverlay.css b/comm/suite/themes/modern/messenger/smime/msgReadSMIMEOverlay.css
new file mode 100644
index 0000000000..8633a4c09d
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/smime/msgReadSMIMEOverlay.css
@@ -0,0 +1,37 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#status-bar #signed-status {
+  list-style-image: none;
+}
+
+#status-bar[signed="ok"] #signed-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignOk.png");
+}
+
+#status-bar[signed="unknown"] #signed-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.png");
+}
+
+#status-bar[signed="mismatch"] #signed-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignUnknown.png");
+}
+
+#status-bar[signed="notok"] #signed-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbSignNotOk.png");
+}
+
+#status-bar #encrypted-status {
+  list-style-image: none;
+}
+
+#status-bar[encrypted="ok"] #encrypted-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoOk.png");
+}
+
+#status-bar[encrypted="notok"] #encrypted-status {
+  list-style-image: url("chrome://messenger/skin/smime/icons/sbCryptoNotOk.png");
+}
diff --git a/comm/suite/themes/modern/messenger/smime/msgReadSecurityInfo.css b/comm/suite/themes/modern/messenger/smime/msgReadSecurityInfo.css
new file mode 100644
index 0000000000..7ca95f7b04
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/smime/msgReadSecurityInfo.css
@@ -0,0 +1,27 @@
+/* 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/. */
+
+/* ===== msgReadSecurityInfo.css ========================================
+  == Styles for the security info window when displaying received mail.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#signatureLabel {
+  font-weight: bold;
+}
+
+#signatureCert {
+  margin: 5px;
+}
+
+#encryptionLabel {
+  font-weight: bold;
+}
+
+#encryptionCert {
+  margin: 5px;
+}
diff --git a/comm/suite/themes/modern/messenger/start.css b/comm/suite/themes/modern/messenger/start.css
new file mode 100644
index 0000000000..059a488a2e
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/start.css
@@ -0,0 +1,40 @@
+/* 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/. */
+
+/* ===== start.css =====================================================
+   == Styles used by the mailnews start page.
+   ======================================================================= */
+
+body {
+  margin: 0;
+  padding: 0;
+  background: url("chrome://branding/content/messenger-start-bg.png") no-repeat fixed center 3em;
+  background-size: auto 85%;
+}
+
+h1 {
+  background: url("chrome://branding/content/messenger-start-hdr.png") repeat-x bottom;
+  border-bottom: 2px solid #26269A;
+  font-size: 1.5em;
+  padding: 0.25em 0.67em; /* 0.67*1.5=1, so fit with 1em below */
+  margin: 0;
+}
+
+#main {
+  margin: 0 1em;
+}
+
+p {
+  margin: 0.5em 0;
+}
+
+h2 {
+  font-size: 1.2em;
+  font-weight: bold;
+}
+
+ul {
+  margin: 0.5em 0;
+}
+
diff --git a/comm/suite/themes/modern/messenger/subscribe.css b/comm/suite/themes/modern/messenger/subscribe.css
new file mode 100644
index 0000000000..1b4961321b
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/subscribe.css
@@ -0,0 +1,78 @@
+/* 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/. */
+
+/* ===== subscribe.css ==================================================
+  == Styles for the Subscribe dialog.
+  ======================================================================= */
+
+@import url("chrome://messenger/skin/messenger.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: subscribed icons  :::::: */
+
+treechildren::-moz-tree-checkbox {
+  list-style-image: none;
+}
+
+treechildren::-moz-tree-image(subscribedColumn),
+treechildren::-moz-tree-image(subscribedColumn2) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox.png");
+}
+
+treechildren::-moz-tree-image(subscribedColumn, subscribed-true),
+treechildren::-moz-tree-image(subscribedColumn2, subscribed-true) {
+  list-style-image: url("chrome://global/skin/checkbox/cbox-check.png");
+}
+
+treechildren::-moz-tree-image(subscribedColumn, subscribable-false) {
+  list-style-image: none;
+}
+
+treechildren::-moz-tree-cell-text(nameColumn, subscribable-false) {
+  color: gray;
+  font-style: italic;
+}
+
+/* ::::: folder icons :::::: */
+
+treechildren::-moz-tree-image(nameColumn) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-closed.png");
+}
+
+treechildren::-moz-tree-image(nameColumn, serverType-nntp),
+treechildren::-moz-tree-image(nameColumn2, serverType-nntp) {
+  margin-inline-end: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+}
+
+/* ::::: server icons :::::: */
+
+.subscribeMenuItem {
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.png");
+}
+
+.subscribeMenuItem[ServerType="imap"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.png");
+}
+
+.subscribeMenuItem[ServerType="nntp"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-news.png");
+}
+
+.subscribeMenuItem[ServerType="nntp"][IsSecure="true"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-news-lock.png");
+}
+
+/* ::::: statusbar adjustments :::::: */
+
+statusbarpanel,
+.progressmeter-statusbar {
+  border: none !important;
+}
+
+#statusContainerBox {
+  margin-inline-end: 4px;
+}
diff --git a/comm/suite/themes/modern/messenger/threadPane.css b/comm/suite/themes/modern/messenger/threadPane.css
new file mode 100644
index 0000000000..5d19edabec
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/threadPane.css
@@ -0,0 +1,351 @@
+/* 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/. */
+ 
+/* ===== threadPane.css ==============================================
+  == Styles for the thread pane in the Messenger 3-pane window.
+  ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: thread decoration ::::: */
+
+treechildren::-moz-tree-cell-text(read) {
+  font-weight: normal;
+}
+
+treechildren::-moz-tree-cell-text(unread) {
+  font-weight: bold;
+}
+
+treechildren::-moz-tree-cell-text(imapdeleted) {
+  text-decoration: line-through;
+}
+
+/* on a collapsed thread, if the top level message is read, but the thread has
+ * unread children, underline the text.  4.x mac did this, very slick 
+ */
+treechildren::-moz-tree-cell-text(container, closed, hasUnread, read) {
+  text-decoration: underline;
+}
+
+/* ::::: priority colors ::::: */
+/****
+ ****  Priority colors currently not being used at the moment.  It has been
+ ****  disabled so as to not conflict with the labels color feature.
+ ****
+treechildren::-moz-tree-cell-text(priorityCol, priority-highest) {
+  color: red;
+}
+
+treechildren::-moz-tree-cell-text(priorityCol, priority-high) {
+  color: rgb(128, 0, 0);
+}
+
+treechildren::-moz-tree-cell-text(priorityCol, priority-lowest) {
+  color: rgb(170, 170, 170);
+}
+
+treechildren::-moz-tree-cell-text(priorityCol, priority-low) {
+  color: rgb(85, 85, 85);
+}
+
+treechildren::-moz-tree-cell-text(priorityCol, selected, focus) {
+  color: #000000;
+}
+
+treechildren::-moz-tree-cell-text(priorityCol, selected, focus) {
+  color: #FFFFFF;
+}
+ ****/
+
+/* ::::: message icons ::::: */
+
+/* ::::: message column icons ::::: */
+
+/* ..... thread column ..... */
+
+.threadColumnHeader {
+  list-style-image: url("chrome://messenger/skin/icons/threadcol-unthreaded.png");
+}
+
+.threadColumnHeader[sortDirection="ascending"]  {
+  list-style-image: url("chrome://messenger/skin/icons/threadcol-threaded.png");
+}
+
+.threadColumnHeader[sortDirection="descending"] {
+  list-style-image: url("chrome://messenger/skin/icons/threadcol-threaded.png");
+}
+
+treechildren::-moz-tree-image(threadCol, container) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed.png");
+}
+
+treechildren::-moz-tree-image(threadCol, container, hasUnread) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed.png");
+}
+
+/* ::::: new thread icons for watch and ignore ::::: */
+
+treechildren::-moz-tree-image(news, threadCol, watch) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed-eye.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, ignore) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed-kill.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, watch, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed-offl-eye.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, ignore, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-closed-offl-kill.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, container, hasUnread, watch) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed-eye.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, container, hasUnread, ignore) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed-kill.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, container, hasUnread, watch, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed-offl-eye.png");
+}
+
+treechildren::-moz-tree-image(news, threadCol, container, hasUnread, ignore, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/thread-new-closed-offl-kill.png");
+}
+
+/* ..... read column ..... */
+
+.readColumnHeader {
+  list-style-image: url("chrome://messenger/skin/icons/readcol-unread.png");
+}
+
+treechildren::-moz-tree-image(unreadButtonColHeader) {
+  list-style-image: url("chrome://messenger/skin/icons/readcol-read.png");
+  padding-inline-start: 0px;
+  padding-inline-end: 4px;
+}
+
+treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
+  list-style-image: url("chrome://messenger/skin/icons/readcol-unread.png");
+}
+
+/* ..... attachment column ..... */
+
+.attachmentColumnHeader {
+  list-style-image: url("chrome://messenger/skin/icons/attachment-col.png");
+}
+
+treechildren::-moz-tree-image(attachmentCol, attach) {
+  list-style-image: url("chrome://messenger/skin/icons/attachment.png");
+}
+
+treechildren::-moz-tree-image(attachmentCol, attach, focus, selected) {
+  list-style-image: url("chrome://messenger/skin/icons/attachment-selected.png");
+}
+
+/* ..... flag column ..... */
+
+.flagColumnHeader {
+  list-style-image: url("chrome://messenger/skin/icons/flagcol-flagged.png");
+}
+
+treechildren::-moz-tree-image(flaggedCol) {
+  list-style-image: url("chrome://messenger/skin/icons/readcol-read.png");
+  padding-inline-start: 0px;
+  padding-inline-end: 4px;
+}
+
+treechildren::-moz-tree-image(flaggedCol, flagged) {
+  list-style-image: url("chrome://messenger/skin/icons/flagcol-flagged.png");
+}
+
+/* ..... junkStatus column ..... */
+
+.junkStatusHeader {
+  list-style-image: url("chrome://messenger/skin/icons/message-junk-other.png");
+}
+
+/* "unknown" now looks like "not junk".  see bug #182386 */
+treechildren::-moz-tree-image(junkStatusCol) {
+  list-style-image: url("chrome://messenger/skin/icons/readcol-read.png");
+  padding-inline-start: 0px;
+  padding-inline-end: 4px;
+}
+
+treechildren::-moz-tree-image(junkStatusCol, junk) {
+  list-style-image: url("chrome://messenger/skin/icons/message-junk-other.png");
+}
+
+treechildren::-moz-tree-image(junkStatusCol, notjunk) {
+  list-style-image: url("chrome://messenger/skin/icons/readcol-read.png");
+  padding-inline-start: 0px;
+  padding-inline-end: 4px;
+}
+
+/* ..... subject column, tab and menuitem icons ..... */
+
+.icon-holder[type="message"],
+treechildren::-moz-tree-image(subjectCol) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail.png");
+}
+
+treechildren::-moz-tree-image(subjectCol) {
+  margin-inline-end: 2px;
+}
+
+treechildren::-moz-tree-image(subjectCol, new) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-new.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-fwd.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-reply.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-fwd-reply.png");
+}
+
+.icon-holder[type="message"][Attachment="true"],
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, forwarded) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-fwd.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, replied, attach) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-reply.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, forwarded, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-fwd-reply.png");
+}
+
+.icon-holder[type="message"][IMAPDeleted="true"],
+treechildren::-moz-tree-image(subjectCol, imapdeleted) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-imapdelete.png");
+}
+.icon-holder[type="message"][Offline="true"],
+treechildren::-moz-tree-image(subjectCol, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-offl.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, new, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-new-offl.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-fwd-offl.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, offline, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-offl-reply.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, forwarded, offline, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-fwd-offl-reply.png");
+}
+
+.icon-holder[type="message"][Attachment="true"][Offline="true"],
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-offl.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, forwarded, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-fwd-offl.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, offline, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-offl-reply.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, attach, forwarded, offline, replied) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-attach-fwd-offl-reply.png");
+}
+
+.icon-holder[type="message"][IMAPDeleted="true"][Offline="true"],
+treechildren::-moz-tree-image(subjectCol, imapdeleted, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-mail-delete-offl.png");
+}
+
+.icon-holder[type="message"][MessageType="rss"],
+.icon-holder[type="message"][MessageType="nntp"],
+treechildren::-moz-tree-image(subjectCol, rss),
+treechildren::-moz-tree-image(subjectCol, news) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, rss, ignoreSubthread),
+treechildren::-moz-tree-image(subjectCol, news, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-kill.png");
+}
+
+.icon-holder[type="message"][MessageType="rss"][Attachment="true"],
+.icon-holder[type="message"][MessageType="nntp"][Attachment="true"],
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, ignoreSubthread),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-kill.png");
+}
+
+.icon-holder[type="message"][MessageType="rss"][Attachment="true"][Offline="true"],
+.icon-holder[type="message"][MessageType="nntp"][Attachment="true"][Offline="true"],
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-offl.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, rss, attach, offline, ignoreSubthread),
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, attach, offline, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-attach-kill-offl.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, rss, new),
+treechildren::-moz-tree-image(subjectCol, news, new) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-new.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, new, attach) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-new-attach.png");
+}
+
+tree[noattachcol="true"] > treechildren::-moz-tree-image(subjectCol, news, new, attach, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-new-attach-off.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, news, new, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-new-offl.png");
+}
+
+.icon-holder[type="message"][MessageType="rss"][Offline="true"],
+.icon-holder[type="message"][MessageType="nntp"][Offline="true"],
+treechildren::-moz-tree-image(subjectCol, rss, offline),
+treechildren::-moz-tree-image(subjectCol, news, offline) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-offl.png");
+}
+
+treechildren::-moz-tree-image(subjectCol, rss, offline, ignoreSubthread),
+treechildren::-moz-tree-image(subjectCol, news, offline, ignoreSubthread) {
+  list-style-image: url("chrome://messenger/skin/icons/message-news-kill-offl.png");
+}
+
+#sizeCol,
+#unreadCol,
+#totalCol {
+  text-align: right;
+}
diff --git a/comm/suite/themes/modern/messenger/threadPaneExtras.css b/comm/suite/themes/modern/messenger/threadPaneExtras.css
new file mode 100644
index 0000000000..7ac07445a1
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/threadPaneExtras.css
@@ -0,0 +1,7 @@
+/* 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/. */
+
+/* distributors / ISPs can override this to override thread pane icons.
+ * see http://www.mozilla.org/mailnews/arch/threadpaneextras.html
+ */
diff --git a/comm/suite/themes/modern/messenger/threadPaneLabels.css b/comm/suite/themes/modern/messenger/threadPaneLabels.css
new file mode 100644
index 0000000000..a506bc1b1a
--- /dev/null
+++ b/comm/suite/themes/modern/messenger/threadPaneLabels.css
@@ -0,0 +1,527 @@
+/* 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/. */
+
+/* ===== threadPaneLabels.css ===========================================
+   == Styles for the thread pane in the Messenger 3-pane window.
+   ======================================================================= */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: thread labels decoration ::::: */
+
+/* There are 10x7 color definitions (size of the color picker used)
+   times 2 (2 style definitions for each color) +  2 general black
+   and white color definitions.
+   The color definitions can be in the following formats:
+     color: red;
+     color: #FF0000;
+     color: rgb(128, 0, 0); 
+*/
+treechildren::-moz-tree-cell-text(lc-FFFFFF), .lc-FFFFFF:not([_moz-menuactive]) {
+  color: #FFFFFF
+}
+treechildren::-moz-tree-row(lc-FFFFFF, selected, focus), .lc-FFFFFF[_moz-menuactive] {
+  background-color: #FFFFFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-CCCCCC), .lc-CCCCCC:not([_moz-menuactive]) {
+  color: #CCCCCC
+}
+treechildren::-moz-tree-row(lc-CCCCCC, selected, focus), .lc-CCCCCC[_moz-menuactive] {
+  background-color: #CCCCCC;
+}
+
+treechildren::-moz-tree-cell-text(lc-C0C0C0), .lc-C0C0C0:not([_moz-menuactive]) {
+  color: #C0C0C0
+}
+treechildren::-moz-tree-row(lc-C0C0C0, selected, focus), .lc-C0C0C0[_moz-menuactive] {
+  background-color: #C0C0C0;
+}
+
+treechildren::-moz-tree-cell-text(lc-999999), .lc-999999:not([_moz-menuactive]) {
+  color: #999999
+}
+treechildren::-moz-tree-row(lc-999999, selected, focus), .lc-999999[_moz-menuactive] {
+  background-color: #999999;
+}
+
+treechildren::-moz-tree-cell-text(lc-666666), .lc-666666:not([_moz-menuactive]) {
+  color: #666666
+}
+treechildren::-moz-tree-row(lc-666666, selected, focus), .lc-666666[_moz-menuactive] {
+  background-color: #666666;
+}
+
+treechildren::-moz-tree-cell-text(lc-333333), .lc-333333:not([_moz-menuactive]) {
+  color: #333333
+}
+treechildren::-moz-tree-row(lc-333333, selected, focus), .lc-333333[_moz-menuactive] {
+  background-color: #333333;
+}
+
+treechildren::-moz-tree-cell-text(lc-000000), .lc-000000:not([_moz-menuactive]) {
+  color: #000000
+}
+treechildren::-moz-tree-row(lc-000000, selected, focus), .lc-000000[_moz-menuactive] {
+  background-color: #000000;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-FFCCCC), .lc-FFCCCC:not([_moz-menuactive]) {
+  color: #FFCCCC
+}
+treechildren::-moz-tree-row(lc-FFCCCC, selected, focus), .lc-FFCCCC[_moz-menuactive] {
+  background-color: #FFCCCC;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF6666), .lc-FF6666:not([_moz-menuactive]) {
+  color: #FF6666
+}
+treechildren::-moz-tree-row(lc-FF6666, selected, focus), .lc-FF6666[_moz-menuactive] {
+  background-color: #FF6666;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF0000), .lc-FF0000:not([_moz-menuactive]) {
+  color: #FF0000
+}
+treechildren::-moz-tree-row(lc-FF0000, selected, focus), .lc-FF0000[_moz-menuactive] {
+  background-color: #FF0000;
+}
+
+treechildren::-moz-tree-cell-text(lc-CC0000), .lc-CC0000:not([_moz-menuactive]) {
+  color: #CC0000
+}
+treechildren::-moz-tree-row(lc-CC0000, selected, focus), .lc-CC0000[_moz-menuactive] {
+  background-color: #CC0000;
+}
+
+treechildren::-moz-tree-cell-text(lc-990000), .lc-990000:not([_moz-menuactive]) {
+  color: #990000
+}
+treechildren::-moz-tree-row(lc-990000, selected, focus), .lc-990000[_moz-menuactive] {
+  background-color: #990000;
+}
+
+treechildren::-moz-tree-cell-text(lc-660000), .lc-660000:not([_moz-menuactive]) {
+  color: #660000
+}
+treechildren::-moz-tree-row(lc-660000, selected, focus), .lc-660000[_moz-menuactive] {
+  background-color: #660000;
+}
+
+treechildren::-moz-tree-cell-text(lc-330000), .lc-330000:not([_moz-menuactive]) {
+  color: #330000
+}
+treechildren::-moz-tree-row(lc-330000, selected, focus), .lc-330000[_moz-menuactive] {
+  background-color: #330000;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-FFCC99), .lc-FFCC99:not([_moz-menuactive]) {
+  color: #FFCC99
+}
+treechildren::-moz-tree-row(lc-FFCC99, selected, focus), .lc-FFCC99[_moz-menuactive] {
+  background-color: #FFCC99;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF9966), .lc-FF9966:not([_moz-menuactive]) {
+  color: #FF9966
+}
+treechildren::-moz-tree-row(lc-FF9966, selected, focus), .lc-FF9966[_moz-menuactive] {
+  background-color: #FF9966;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF9900), .lc-FF9900:not([_moz-menuactive]) {
+  color: #FF9900
+}
+treechildren::-moz-tree-row(lc-FF9900, selected, focus), .lc-FF9900[_moz-menuactive] {
+  background-color: #FF9900;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF6600), .lc-FF6600:not([_moz-menuactive]) {
+  color: #FF6600
+}
+treechildren::-moz-tree-row(lc-FF6600, selected, focus), .lc-FF6600[_moz-menuactive] {
+  background-color: #FF6600;
+}
+
+treechildren::-moz-tree-cell-text(lc-CC6600), .lc-CC6600:not([_moz-menuactive]) {
+  color: #CC6600
+}
+treechildren::-moz-tree-row(lc-CC6600, selected, focus), .lc-CC6600[_moz-menuactive] {
+  background-color: #CC6600;
+}
+
+treechildren::-moz-tree-cell-text(lc-993300), .lc-993300:not([_moz-menuactive]) {
+  color: #993300
+}
+treechildren::-moz-tree-row(lc-993300, selected, focus), .lc-993300[_moz-menuactive] {
+  background-color: #993300;
+}
+
+treechildren::-moz-tree-cell-text(lc-663300), .lc-663300:not([_moz-menuactive]) {
+  color: #663300
+}
+treechildren::-moz-tree-row(lc-663300, selected, focus), .lc-663300[_moz-menuactive] {
+  background-color: #663300;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-FFFF99), .lc-FFFF99:not([_moz-menuactive]) {
+  color: #FFFF99
+}
+treechildren::-moz-tree-row(lc-FFFF99, selected, focus), .lc-FFFF99[_moz-menuactive] {
+  background-color: #FFFF99;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFFF66), .lc-FFFF66:not([_moz-menuactive]) {
+  color: #FFFF66
+}
+treechildren::-moz-tree-row(lc-FFFF66, selected, focus), .lc-FFFF66[_moz-menuactive] {
+  background-color: #FFFF66;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFCC66), .lc-FFCC66:not([_moz-menuactive]) {
+  color: #FFCC66
+}
+treechildren::-moz-tree-row(lc-FFCC66, selected, focus), .lc-FFCC66[_moz-menuactive] {
+  background-color: #FFCC66;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFCC33), .lc-FFCC33:not([_moz-menuactive]) {
+  color: #FFCC33
+}
+treechildren::-moz-tree-row(lc-FFCC33, selected, focus), .lc-FFCC33[_moz-menuactive] {
+  background-color: #FFCC33;
+}
+
+treechildren::-moz-tree-cell-text(lc-CC9933), .lc-CC9933:not([_moz-menuactive]) {
+  color: #CC9933
+}
+treechildren::-moz-tree-row(lc-CC9933, selected, focus), .lc-CC9933[_moz-menuactive] {
+  background-color: #CC9933;
+}
+
+treechildren::-moz-tree-cell-text(lc-996633), .lc-996633:not([_moz-menuactive]) {
+  color: #996633
+}
+treechildren::-moz-tree-row(lc-996633, selected, focus), .lc-996633[_moz-menuactive] {
+  background-color: #996633;
+}
+
+treechildren::-moz-tree-cell-text(lc-663333), .lc-663333:not([_moz-menuactive]) {
+  color: #663333
+}
+treechildren::-moz-tree-row(lc-663333, selected, focus), .lc-663333[_moz-menuactive] {
+  background-color: #663333;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-FFFFCC), .lc-FFFFCC:not([_moz-menuactive]) {
+  color: #FFFFCC
+}
+treechildren::-moz-tree-row(lc-FFFFCC, selected, focus), .lc-FFFFCC[_moz-menuactive] {
+  background-color: #FFFFCC;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFFF33), .lc-FFFF33:not([_moz-menuactive]) {
+  color: #FFFF33
+}
+treechildren::-moz-tree-row(lc-FFFF33, selected, focus), .lc-FFFF33[_moz-menuactive] {
+  background-color: #FFFF33;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFFF00), .lc-FFFF00:not([_moz-menuactive]) {
+  color: #FFFF00
+}
+treechildren::-moz-tree-row(lc-FFFF00, selected, focus), .lc-FFFF00[_moz-menuactive] {
+  background-color: #FFFF00;
+}
+
+treechildren::-moz-tree-cell-text(lc-FFCC00), .lc-FFCC00:not([_moz-menuactive]) {
+  color: #FFCC00
+}
+treechildren::-moz-tree-row(lc-FFCC00, selected, focus), .lc-FFCC00[_moz-menuactive] {
+  background-color: #FFCC00;
+}
+
+treechildren::-moz-tree-cell-text(lc-999900), .lc-999900:not([_moz-menuactive]) {
+  color: #999900
+}
+treechildren::-moz-tree-row(lc-999900, selected, focus), .lc-999900[_moz-menuactive] {
+  background-color: #999900;
+}
+
+treechildren::-moz-tree-cell-text(lc-666600), .lc-666600:not([_moz-menuactive]) {
+  color: #666600
+}
+treechildren::-moz-tree-row(lc-666600, selected, focus), .lc-666600[_moz-menuactive] {
+  background-color: #666600;
+}
+
+treechildren::-moz-tree-cell-text(lc-333300), .lc-333300:not([_moz-menuactive]) {
+  color: #333300
+}
+treechildren::-moz-tree-row(lc-333300, selected, focus), .lc-333300[_moz-menuactive] {
+  background-color: #333300;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-99FF99), .lc-99FF99:not([_moz-menuactive]) {
+  color: #99FF99
+}
+treechildren::-moz-tree-row(lc-99FF99, selected, focus), .lc-99FF99[_moz-menuactive] {
+  background-color: #99FF99;
+}
+
+treechildren::-moz-tree-cell-text(lc-66FF99), .lc-66FF99:not([_moz-menuactive]) {
+  color: #66FF99
+}
+treechildren::-moz-tree-row(lc-66FF99, selected, focus), .lc-66FF99[_moz-menuactive] {
+  background-color: #66FF99;
+}
+
+treechildren::-moz-tree-cell-text(lc-33FF33), .lc-33FF33:not([_moz-menuactive]) {
+  color: #33FF33
+}
+treechildren::-moz-tree-row(lc-33FF33, selected, focus), .lc-33FF33[_moz-menuactive] {
+  background-color: #33FF33;
+}
+
+treechildren::-moz-tree-cell-text(lc-33CC00), .lc-33CC00:not([_moz-menuactive]) {
+  color: #33CC00
+}
+treechildren::-moz-tree-row(lc-33CC00, selected, focus), .lc-33CC00[_moz-menuactive] {
+  background-color: #33CC00;
+}
+
+treechildren::-moz-tree-cell-text(lc-009900), .lc-009900:not([_moz-menuactive]) {
+  color: #009900
+}
+treechildren::-moz-tree-row(lc-009900, selected, focus), .lc-009900[_moz-menuactive] {
+  background-color: #009900;
+}
+
+treechildren::-moz-tree-cell-text(lc-006600), .lc-006600:not([_moz-menuactive]) {
+  color: #006600
+}
+treechildren::-moz-tree-row(lc-006600, selected, focus), .lc-006600[_moz-menuactive] {
+  background-color: #006600;
+}
+
+treechildren::-moz-tree-cell-text(lc-003300), .lc-003300:not([_moz-menuactive]) {
+  color: #003300
+}
+treechildren::-moz-tree-row(lc-003300, selected, focus), .lc-003300[_moz-menuactive] {
+  background-color: #003300;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-99FFFF), .lc-99FFFF:not([_moz-menuactive]) {
+  color: #99FFFF
+}
+treechildren::-moz-tree-row(lc-99FFFF, selected, focus), .lc-99FFFF[_moz-menuactive] {
+  background-color: #99FFFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-33FFFF), .lc-33FFFF:not([_moz-menuactive]) {
+  color: #33FFFF
+}
+treechildren::-moz-tree-row(lc-33FFFF, selected, focus), .lc-33FFFF[_moz-menuactive] {
+  background-color: #33FFFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-66CCCC), .lc-66CCCC:not([_moz-menuactive]) {
+  color: #66CCCC
+}
+treechildren::-moz-tree-row(lc-66CCCC, selected, focus), .lc-66CCCC[_moz-menuactive] {
+  background-color: #66CCCC;
+}
+
+treechildren::-moz-tree-cell-text(lc-00CCCC), .lc-00CCCC:not([_moz-menuactive]) {
+  color: #00CCCC
+}
+treechildren::-moz-tree-row(lc-00CCCC, selected, focus), .lc-00CCCC[_moz-menuactive] {
+  background-color: #00CCCC;
+}
+
+treechildren::-moz-tree-cell-text(lc-339999), .lc-339999:not([_moz-menuactive]) {
+  color: #339999
+}
+treechildren::-moz-tree-row(lc-339999, selected, focus), .lc-339999[_moz-menuactive] {
+  background-color: #339999;
+}
+
+treechildren::-moz-tree-cell-text(lc-336666), .lc-336666:not([_moz-menuactive]) {
+  color: #336666
+}
+treechildren::-moz-tree-row(lc-336666, selected, focus), .lc-336666[_moz-menuactive] {
+  background-color: #336666;
+}
+
+treechildren::-moz-tree-cell-text(lc-003333), .lc-003333:not([_moz-menuactive]) {
+  color: #003333
+}
+treechildren::-moz-tree-row(lc-003333, selected, focus), .lc-003333[_moz-menuactive] {
+  background-color: #003333;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-CCFFFF), .lc-CCFFFF:not([_moz-menuactive]) {
+  color: #CCFFFF
+}
+treechildren::-moz-tree-row(lc-CCFFFF, selected, focus), .lc-CCFFFF[_moz-menuactive] {
+  background-color: #CCFFFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-66FFFF), .lc-66FFFF:not([_moz-menuactive]) {
+  color: #66FFFF
+}
+treechildren::-moz-tree-row(lc-66FFFF, selected, focus), .lc-66FFFF[_moz-menuactive] {
+  background-color: #66FFFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-33CCFF), .lc-33CCFF:not([_moz-menuactive]) {
+  color: #33CCFF
+}
+treechildren::-moz-tree-row(lc-33CCFF, selected, focus), .lc-33CCFF[_moz-menuactive] {
+  background-color: #33CCFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-3366FF), .lc-3366FF:not([_moz-menuactive]) {
+  color: #3366FF
+}
+treechildren::-moz-tree-row(lc-3366FF, selected, focus), .lc-3366FF[_moz-menuactive] {
+  background-color: #3366FF;
+}
+
+treechildren::-moz-tree-cell-text(lc-3333FF), .lc-3333FF:not([_moz-menuactive]) {
+  color: #3333FF
+}
+treechildren::-moz-tree-row(lc-3333FF, selected, focus), .lc-3333FF[_moz-menuactive] {
+  background-color: #3333FF;
+}
+
+treechildren::-moz-tree-cell-text(lc-000099), .lc-000099:not([_moz-menuactive]) {
+  color: #000099
+}
+treechildren::-moz-tree-row(lc-000099, selected, focus), .lc-000099[_moz-menuactive] {
+  background-color: #000099;
+}
+
+treechildren::-moz-tree-cell-text(lc-000066), .lc-000066:not([_moz-menuactive]) {
+  color: #000066
+}
+treechildren::-moz-tree-row(lc-000066, selected, focus), .lc-000066[_moz-menuactive] {
+  background-color: #000066;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-CCCCFF), .lc-CCCCFF:not([_moz-menuactive]) {
+  color: #CCCCFF
+}
+treechildren::-moz-tree-row(lc-CCCCFF, selected, focus), .lc-CCCCFF[_moz-menuactive] {
+  background-color: #CCCCFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-9999FF), .lc-9999FF:not([_moz-menuactive]) {
+  color: #9999FF
+}
+treechildren::-moz-tree-row(lc-9999FF, selected, focus), .lc-9999FF[_moz-menuactive] {
+  background-color: #9999FF;
+}
+
+treechildren::-moz-tree-cell-text(lc-6666CC), .lc-6666CC:not([_moz-menuactive]) {
+  color: #6666CC
+}
+treechildren::-moz-tree-row(lc-6666CC, selected, focus), .lc-6666CC[_moz-menuactive] {
+  background-color: #6666CC;
+}
+
+treechildren::-moz-tree-cell-text(lc-6633FF), .lc-6633FF:not([_moz-menuactive]) {
+  color: #6633FF
+}
+treechildren::-moz-tree-row(lc-6633FF, selected, focus), .lc-6633FF[_moz-menuactive] {
+  background-color: #6633FF;
+}
+
+treechildren::-moz-tree-cell-text(lc-6600CC), .lc-6600CC:not([_moz-menuactive]) {
+  color: #6600CC
+}
+treechildren::-moz-tree-row(lc-6600CC, selected, focus), .lc-6600CC[_moz-menuactive] {
+  background-color: #6600CC;
+}
+
+treechildren::-moz-tree-cell-text(lc-333399), .lc-333399:not([_moz-menuactive]) {
+  color: #333399
+}
+treechildren::-moz-tree-row(lc-333399, selected, focus), .lc-333399[_moz-menuactive] {
+  background-color: #333399;
+}
+
+treechildren::-moz-tree-cell-text(lc-330099), .lc-330099:not([_moz-menuactive]) {
+  color: #330099
+}
+treechildren::-moz-tree-row(lc-330099, selected, focus), .lc-330099[_moz-menuactive] {
+  background-color: #330099;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-FFCCFF), .lc-FFCCFF:not([_moz-menuactive]) {
+  color: #FFCCFF
+}
+treechildren::-moz-tree-row(lc-FFCCFF, selected, focus), .lc-FFCCFF[_moz-menuactive] {
+  background-color: #FFCCFF;
+}
+
+treechildren::-moz-tree-cell-text(lc-FF99FF), .lc-FF99FF:not([_moz-menuactive]) {
+  color: #FF99FF
+}
+treechildren::-moz-tree-row(lc-FF99FF, selected, focus), .lc-FF99FF[_moz-menuactive] {
+  background-color: #FF99FF;
+}
+
+treechildren::-moz-tree-cell-text(lc-CC66CC), .lc-CC66CC:not([_moz-menuactive]) {
+  color: #CC66CC
+}
+treechildren::-moz-tree-row(lc-CC66CC, selected, focus), .lc-CC66CC[_moz-menuactive] {
+  background-color: #CC66CC;
+}
+
+treechildren::-moz-tree-cell-text(lc-CC33CC), .lc-CC33CC:not([_moz-menuactive]) {
+  color: #CC33CC
+}
+treechildren::-moz-tree-row(lc-CC33CC, selected, focus), .lc-CC33CC[_moz-menuactive] {
+  background-color: #CC33CC;
+}
+
+treechildren::-moz-tree-cell-text(lc-993399), .lc-993399:not([_moz-menuactive]) {
+  color: #993399
+}
+treechildren::-moz-tree-row(lc-993399, selected, focus), .lc-993399[_moz-menuactive] {
+  background-color: #993399;
+}
+
+treechildren::-moz-tree-cell-text(lc-663366), .lc-663366:not([_moz-menuactive]) {
+  color: #663366
+}
+treechildren::-moz-tree-row(lc-663366, selected, focus), .lc-663366[_moz-menuactive] {
+  background-color: #663366;
+}
+
+treechildren::-moz-tree-cell-text(lc-330033), .lc-330033:not([_moz-menuactive]) {
+  color: #330033
+}
+treechildren::-moz-tree-row(lc-330033, selected, focus), .lc-330033[_moz-menuactive] {
+  background-color: #330033;
+}
+
+
+treechildren::-moz-tree-cell-text(lc-white, selected, focus) {
+  color: #FFFFFF
+}
+treechildren::-moz-tree-cell-text(lc-black, selected, focus) {
+  color: #000000
+}
+
diff --git a/comm/suite/themes/modern/moz.build b/comm/suite/themes/modern/moz.build
new file mode 100644
index 0000000000..03ef5c46a1
--- /dev/null
+++ b/comm/suite/themes/modern/moz.build
@@ -0,0 +1,19 @@
+# vim: set filetype=python:
+# 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/.
+
+FINAL_TARGET_PP_FILES += ["install.rdf"]
+
+DIST_SUBDIR = "extensions/modern@themes.mozilla.org"
+
+JAR_MANIFESTS += ["jar.mn"]
+
+USE_EXTENSION_MANIFEST = True
+
+DEFINES["SEAMONKEY_VERSION"] = CONFIG["SEAMONKEY_VERSION"]
+
+FINAL_TARGET_FILES += [
+    "icon.png",
+    "preview.png",
+]
diff --git a/comm/suite/themes/modern/mozapps/aboutNetworking.css b/comm/suite/themes/modern/mozapps/aboutNetworking.css
new file mode 100644
index 0000000000..a44151b8ed
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/aboutNetworking.css
@@ -0,0 +1,149 @@
+/* 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/. */
+
+@import url("chrome://global/skin/plugins.css");
+@import url("chrome://global/skin/button.css"); 
+
+html {
+  height: 100%;
+}
+
+body {
+  display: block;
+  align-items: stretch;
+  height: 100%;
+}
+
+#sectionTitle {
+  float: left;
+}
+
+#refreshDiv {
+  text-align: end;
+  margin-bottom: 0.5em;
+}
+
+#refreshButton, #autorefcheck {
+  vertical-align: middle;
+}
+
+/** Categories **/
+
+#categories > .category
+{
+  -moz-appearance: button;
+  display: inline-block;
+
+  margin: 2px;
+  border: 1px solid;
+  padding: 3px;
+  border-color: #000000;
+  border-radius: 2px;
+  min-width: 6em;
+  background-color: #AAB6C4;
+  background-clip: padding-box;
+  color: #000000;
+  font: menu;
+}
+
+.category {
+  cursor: pointer;
+  /* Center category names */
+  align-items: center;
+}
+
+.category .category-name {
+  pointer-events: none;
+}
+
+#categories hr {
+  display: none;
+}
+
+/** Warning container **/
+
+/* XXX: a lot of this is duplicated from info-pages.css since that stylesheet
+   is incompatible with this type of layout */
+.warningBackground:not([hidden]) {
+  display: flex;
+}
+
+.warningBackground {
+  flex-direction: column;
+  box-sizing: border-box;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  height: 50%;
+  top: 0;
+  left: 0;
+  position: fixed;
+}
+
+.container {
+  width: 40%;
+  color: #22262F;
+  background-color: #C7D0D9;
+  background-image: url("chrome://global/skin/icons/warning-48.png");
+  background-repeat: no-repeat;
+  background-position: 30px 3em;
+  border: 1px solid #494F5D;
+  border-radius: 10px;
+  padding: 3em;
+  padding-inline-start: 78px;
+}
+
+.title {
+  display: inline-block;
+  font-size: 1rem;
+  position: relative;
+  border-bottom: 1px solid #000000;
+  margin-bottom: 1em;
+  padding-bottom: 0.5em;
+}
+
+.warningBackground button {
+  margin-top: 1em;
+  margin-left: 0;
+  min-width: 100px;
+}
+
+/** Content area **/
+
+.warningBackground:not([hidden]) ~ div
+{
+  display: none;
+}
+
+.main-content {
+  flex: 1;
+  margin: 5px 0px;
+  padding: 5px;
+  border: 1px solid #2D3B49;
+  border-radius: 6px;
+}
+
+.header-name {
+  font-size: 1.5rem;
+  font-weight: bold;
+} 
+
+.tab {
+  padding: 0.5em 0;
+}
+
+.tab table {
+  border: 1px solid;
+  width: 100%;
+}
+
+th, td, table {
+  text-align: start;
+}
+
+th {
+  font-size: medium;
+  text-align: start;
+  border-top: 1px dotted #2D3B49;
+}
diff --git a/comm/suite/themes/modern/mozapps/downloads/downloadIcon.png b/comm/suite/themes/modern/mozapps/downloads/downloadIcon.png
new file mode 100644
index 0000000000..da5c66fe42
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/downloads/downloadIcon.png
diff --git a/comm/suite/themes/modern/mozapps/downloads/downloads.css b/comm/suite/themes/modern/mozapps/downloads/downloads.css
new file mode 100644
index 0000000000..54fed087c8
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/downloads/downloads.css
@@ -0,0 +1,102 @@
+/* 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/. */
+
+/* Download View */
+#downloadView {
+  margin: 0;
+  border-top: none;
+  border-right: none;
+  border-left: none;
+}
+
+/* Download View Items */
+richlistitem[type="download"] {
+  padding: 4px 8px 4px 4px;
+  min-height: 46px;
+}
+
+richlistitem[type="download"]:not([selected="true"]):nth-child(odd) {
+  background-color: #F3F3F3;
+}
+
+richlistitem[type="download"][selected="true"] {
+  background-image: url("chrome://mozapps/skin/icons/itemEnabledFader.png");
+}
+
+richlistitem[type="download"] .name {
+  font-size: 120%;
+}
+
+richlistitem[type="download"] .dateTime {
+  font-size: 83.3333%;
+}
+
+richlistitem[type="download"] progressmeter {
+  background-color: #C7D0D9;
+}
+
+richlistitem[type="download"]:not([selected="true"]) .dateTime,
+richlistitem[type="download"]:not([selected="true"]) .status {
+  color: #808080;
+}
+
+.mini-button > .button-box > .button-icon {
+  margin-inline-start: 0;
+}
+
+.mini-button > .button-box > .button-text {
+  margin-inline-start: 0 !important;
+  margin-inline-end: 0 !important;
+}
+
+.mini-button {
+  min-width: 0;
+  min-height: 0;
+  color: #000000 !important;
+  background-color: transparent !important;
+  list-style-image: url("chrome://communicator/skin/downloads/downloadButtons.png");
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+  margin: 0;
+  border: 1px dotted transparent !important;
+  border-radius: 0 !important;
+  outline: none !important;
+}
+
+.mini-button:focus {
+  border-color: #000000 !important;
+}
+
+.cancel {
+  -moz-image-region: rect(0px, 32px, 16px, 16px);
+}
+
+.retry {
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+.pause {
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+}
+
+.pause[disabled="true"] {
+  opacity: 0.5;
+}
+
+.resume {
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+.blockedIcon {
+  list-style-image: url("chrome://global/skin/icons/Error.png");
+}
+
+/* prevent flickering when changing states */
+.downloadTypeIcon {
+  min-height: 32px;
+  min-width: 32px;
+}
+
+#clearListButton {
+  margin: 2px 4px;
+}
diff --git a/comm/suite/themes/modern/mozapps/downloads/unknownContentType.css b/comm/suite/themes/modern/mozapps/downloads/unknownContentType.css
new file mode 100644
index 0000000000..3bd06833b8
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/downloads/unknownContentType.css
@@ -0,0 +1,27 @@
+/* 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/. */
+
+#from {
+  margin-top: 1px;
+}
+
+#location {
+  font-weight: bold;
+}
+
+#contentTypeImage {
+  margin-top: 0;
+  margin-bottom: 0;
+  margin-inline-start: 0;
+  margin-inline-end: 5px;
+}
+
+.small-indent {
+  margin-left: 15px;
+  margin-right: 15px;
+}
+
+.small-indent label {
+  margin-inline-start: 0;
+}
diff --git a/comm/suite/themes/modern/mozapps/extensions/about.css b/comm/suite/themes/modern/mozapps/extensions/about.css
new file mode 100644
index 0000000000..2764176a63
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/about.css
@@ -0,0 +1,79 @@
+/* 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/. */
+
+#genericAbout {
+  padding: 0px;
+  min-height: 200px;
+  max-height: 400px;
+  width: 30em;
+}
+
+#clientBox {
+  background-color: #C7D0D9;
+  color: #000000;
+}
+
+.basic-info {
+  padding: 10px;
+}
+
+#extensionIcon {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  max-width: 64px;
+  max-height: 64px;
+  margin-inline-end: 6px;
+}
+
+#genericAbout[addontype="theme"] #extensionIcon {
+  list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
+}
+
+#genericAbout[addontype="locale"] #extensionIcon {
+  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
+}
+
+#genericAbout[addontype="plugin"] #extensionIcon {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
+}
+
+#genericAbout[addontype="dictionary"] #extensionIcon {
+  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
+}
+
+#extensionName {
+  font-size: 200%;
+  font-weight: bolder;
+}
+
+#extensionVersion {
+  font-weight: bold;
+}
+
+#extensionDescription {
+  margin-top: 4px;
+}
+
+#groove {
+  margin-top: 8px;
+}
+
+#extensionDetailsBox {
+  overflow: auto;
+  min-height: 100px;
+}
+
+.boxIndent {
+  margin-inline-start: 18px;
+}
+
+#extensionCreator, .contributor {
+  margin: 0px;
+}
+
+.sectionTitle {
+  padding: 2px 0px 3px 0px;
+  margin-top: 3px;
+  font-weight: bold;
+}
+
diff --git a/comm/suite/themes/modern/mozapps/extensions/alerticon-error.png b/comm/suite/themes/modern/mozapps/extensions/alerticon-error.png
new file mode 100644
index 0000000000..8740e4911a
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/alerticon-error.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/alerticon-info-negative.png b/comm/suite/themes/modern/mozapps/extensions/alerticon-info-negative.png
new file mode 100644
index 0000000000..2c5f628ab6
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/alerticon-info-negative.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/alerticon-info-positive.png b/comm/suite/themes/modern/mozapps/extensions/alerticon-info-positive.png
new file mode 100644
index 0000000000..a186c6b7ad
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/alerticon-info-positive.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/alerticon-warning.png b/comm/suite/themes/modern/mozapps/extensions/alerticon-warning.png
new file mode 100644
index 0000000000..75ea826f91
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/alerticon-warning.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/blocklist.css b/comm/suite/themes/modern/mozapps/extensions/blocklist.css
new file mode 100644
index 0000000000..2749b586a7
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/blocklist.css
@@ -0,0 +1,20 @@
+/* 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/. */
+
+richlistitem {
+  padding-top: 6px;
+  padding-bottom: 6px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
+  border-bottom: 1px solid #A5ABC0;
+}
+
+.addonName {
+  font-weight: bold;
+}
+
+.blockedLabel {
+  font-weight: bold;
+  font-style: italic;
+}
diff --git a/comm/suite/themes/modern/mozapps/extensions/cancel.png b/comm/suite/themes/modern/mozapps/extensions/cancel.png
new file mode 100644
index 0000000000..0d98ab2359
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/cancel.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/category-available.png b/comm/suite/themes/modern/mozapps/extensions/category-available.png
new file mode 100644
index 0000000000..d1b737ab05
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/category-available.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/category-dictionaries.png b/comm/suite/themes/modern/mozapps/extensions/category-dictionaries.png
new file mode 100644
index 0000000000..b26bb7100c
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/category-dictionaries.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/category-discover.png b/comm/suite/themes/modern/mozapps/extensions/category-discover.png
new file mode 100644
index 0000000000..a6f5b49b37
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/category-discover.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/category-extensions.png b/comm/suite/themes/modern/mozapps/extensions/category-extensions.png
new file mode 100644
index 0000000000..6a76774c7b
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/category-extensions.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/category-languages.png b/comm/suite/themes/modern/mozapps/extensions/category-languages.png
new file mode 100644
index 0000000000..4d9ac5ad89
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/category-languages.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/category-plugins.png b/comm/suite/themes/modern/mozapps/extensions/category-plugins.png
new file mode 100644
index 0000000000..5c4d8bf471
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/category-plugins.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/category-recent.png b/comm/suite/themes/modern/mozapps/extensions/category-recent.png
new file mode 100644
index 0000000000..7ecfc7d4c8
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/category-recent.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/category-search.png b/comm/suite/themes/modern/mozapps/extensions/category-search.png
new file mode 100644
index 0000000000..496a919cf3
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/category-search.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/category-searchengines.png b/comm/suite/themes/modern/mozapps/extensions/category-searchengines.png
new file mode 100644
index 0000000000..b893cb48a2
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/category-searchengines.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/category-themes.png b/comm/suite/themes/modern/mozapps/extensions/category-themes.png
new file mode 100644
index 0000000000..be645f76df
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/category-themes.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/dictionaryGeneric-16.png b/comm/suite/themes/modern/mozapps/extensions/dictionaryGeneric-16.png
new file mode 100644
index 0000000000..37e2a5e4ce
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/dictionaryGeneric-16.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/dictionaryGeneric.png b/comm/suite/themes/modern/mozapps/extensions/dictionaryGeneric.png
new file mode 100644
index 0000000000..b26bb7100c
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/dictionaryGeneric.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/discover-logo.png b/comm/suite/themes/modern/mozapps/extensions/discover-logo.png
new file mode 100644
index 0000000000..cd50735a89
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/discover-logo.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/eula.css b/comm/suite/themes/modern/mozapps/extensions/eula.css
new file mode 100644
index 0000000000..68a8a5bd30
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/eula.css
@@ -0,0 +1,43 @@
+/* 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/. */
+
+#icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  max-width: 48px;
+  max-height: 48px;
+  margin-inline-end: 6px;
+}
+
+#eula-dialog[addontype="theme"] #icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
+}
+
+#eula-dialog[addontype="locale"] #icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
+}
+
+#eula-dialog[addontype="plugin"] #icon {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
+}
+
+#eula-dialog[addontype="dictionary"] #icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
+}
+
+#heading-container {
+  -moz-box-align: center;
+}
+
+#heading {
+  font-size: 120%;
+}
+
+#eula {
+  -moz-appearance: none;
+  color: #000000;
+  background-color: #FFFFFF;
+  margin: 1em;
+  border: 1px solid;
+  border-colors: #6E7378 #EEF0F3 #EEF0F3 #6E7378;
+}
diff --git a/comm/suite/themes/modern/mozapps/extensions/extensionGeneric-16.png b/comm/suite/themes/modern/mozapps/extensions/extensionGeneric-16.png
new file mode 100644
index 0000000000..aec2675e31
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/extensionGeneric-16.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/extensionGeneric.png b/comm/suite/themes/modern/mozapps/extensions/extensionGeneric.png
new file mode 100644
index 0000000000..6a76774c7b
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/extensionGeneric.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/extensions.css b/comm/suite/themes/modern/mozapps/extensions/extensions.css
new file mode 100644
index 0000000000..55e4deb534
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/extensions.css
@@ -0,0 +1,1077 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+#addons-page {
+  padding: 18px;
+}
+
+#view-port-container {
+  /* Needed to allow the radius to clip the inner content, see bug 595656 */
+  /* Disabled because of bug 623615
+  overflow: hidden;
+  */
+  background-color: #C7D0D9;
+  border: 1px solid #494F5D;
+  border-radius: 2px;
+}
+
+.nav-button {
+  list-style-image: url(chrome://mozapps/skin/extensions/navigation.png);
+}
+
+#forward-btn {
+  border-inline-start: none;
+}
+
+#back-btn:-moz-locale-dir(ltr),
+#forward-btn:-moz-locale-dir(rtl) {
+  -moz-image-region: rect(0, 18px, 18px, 0);
+  border-top-right-radius: 0;
+  border-bottom-right-radius: 0;
+}
+
+#back-btn:-moz-locale-dir(rtl),
+#forward-btn:-moz-locale-dir(ltr) {
+  -moz-image-region: rect(0, 36px, 18px, 18px);
+  border-top-left-radius: 0;
+  border-bottom-left-radius: 0;
+}
+
+
+/*** global warnings ***/
+
+.global-warning-container {
+  overflow-x: hidden;
+}
+
+.global-warning {
+  -moz-box-align: center;
+  padding: 0 8px;
+  color: #916D15;
+  font-weight: bold;
+}
+
+#addons-page[warning] .global-warning-container {
+  background-color: rgba(255, 255, 0, 0.1);
+  background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png");
+  background-repeat: repeat-x;
+}
+
+#detail-view .global-warning {
+  padding: 4px 12px;
+  border-bottom: 1px solid #CAD4E0;
+}
+
+@media (max-width: 600px) {
+  .global-warning-text {
+    display: none;
+  }
+
+  .global-warning .warning-icon {
+    background-color: #FFF;
+    box-shadow: 0px 0px 2px 5px #FFF;
+    border-radius: 10px;
+  }
+}
+
+/*** notification icons ***/
+
+.warning-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
+  width: 16px;
+  height: 15px;
+  margin: 3px 0;
+}
+
+.error-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-error.png");
+  width: 16px;
+  height: 15px;
+  margin: 3px 0;
+}
+
+.pending-icon,
+.info-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-positive.png");
+  width: 16px;
+  height: 15px;
+  margin: 3px 0;
+}
+
+.addon-view[pending="disable"] .pending-icon,
+.addon-view[pending="uninstall"] .pending-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
+  width: 16px;
+  height: 15px;
+  margin: 3px 0;
+}
+
+
+/*** view alert boxes ***/
+
+.alert-container {
+  -moz-box-align: center;
+}
+
+.alert-spacer-before {
+  -moz-box-flex: 1;
+}
+
+.alert-spacer-after {
+  -moz-box-flex: 3;
+}
+
+.alert {
+  -moz-box-align: center;
+  padding: 10px;
+  color: #000000;
+  border: 1px solid #494F5D;
+  border-radius: 8px;
+  background-color: #C7D0D9;
+}
+
+.alert .alert-title {
+  font-weight: bold;
+  font-size: 200%;
+  margin-bottom: 15px;
+}
+
+.alert .addon-control {
+  margin: 1em 2em;
+}
+
+.loading {
+  list-style-image: url("chrome://communicator/skin/icons/loading.png");
+  padding-left: 20px;
+  padding-right: 20px;
+}
+
+
+/*** category selector ***/
+
+#categories {
+  -moz-appearance: none;
+  border: none;
+  margin-inline-end: -1px;
+  background-color: transparent;
+  position: relative;
+  margin-top: 31px;
+}
+
+.category {
+  -moz-appearance: none;
+  background-color: transparent;
+  color: #252F3B;
+  min-height: 0;
+  padding: 10px 4px;
+  border-width: 1px;
+  border-style: solid;
+  border-color: transparent;
+  -moz-box-align: center;
+  overflow: hidden;
+}
+
+.category:-moz-locale-dir(ltr) {
+  border-top-left-radius: 5px;
+  border-bottom-left-radius: 5px;
+}
+
+.category:-moz-locale-dir(rtl) {
+  border-top-right-radius: 5px;
+  border-bottom-right-radius: 5px;
+}
+
+.category[disabled] {
+  border-top: 0;
+  border-bottom: 0;
+  height: 0;
+  opacity: 0;
+  transition-property: height, opacity;
+  transition-duration: 1s, 0.8s;
+}
+
+.category:not([disabled]) {
+  height: 52px;
+  transition-property: height, opacity;
+  transition-duration: 1s, 0.8s;
+}
+
+.category[selected] {
+  background-color: #C7D0D9;
+  color: #000000;
+  border-color: #494F5D;
+  border-inline-end-color: #C7D0D9;
+}
+
+.category-name {
+  font-size: 150%;
+}
+
+/* Maximize the size of the viewport when the window is small */
+@media (max-width: 800px) {
+  .category-name {
+    display: none;
+  }
+}
+
+.category-badge {
+  background-color: #55D4FF;
+  padding: 2px 8px;
+  margin: 6px 0;
+  border-radius: 10000px;
+  color: #FFF;
+  font-weight: bold;
+  text-align: center;
+}
+
+.category-badge[value="0"] {
+  visibility: hidden;
+}
+
+.category-icon {
+  width: 32px;
+  height: 32px;
+  margin-inline-start: 6px;
+}
+
+#category-search {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-search.png");
+}
+#category-discover {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-discover.png");
+}
+#category-locale {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-languages.png");
+}
+#category-searchengine {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-searchengines.png");
+}
+#category-extension {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-extensions.png");
+}
+#category-theme {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-themes.png");
+}
+#category-plugin {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-plugins.png");
+}
+#category-dictionary {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-dictionaries.png");
+}
+#category-availableUpdates {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-available.png");
+}
+#category-recentUpdates {
+  list-style-image: url("chrome://mozapps/skin/extensions/category-recent.png");
+}
+
+
+/*** header ***/
+
+#header {
+  margin-bottom: 18px;
+}
+
+#header-search {
+  margin: 0;
+}
+
+#header-utils-btn {
+  list-style-image: url("chrome://mozapps/skin/extensions/utilities.png");
+  margin-inline-end: 16px;
+}
+
+.view-header {
+  background-color: rgba(251, 252, 253, 0.25);
+  padding: 4px;
+  margin: 0;
+  min-height: 31px;
+  border-bottom: 1px solid #CAD4E0;
+}
+
+
+/*** sorters ***/
+
+.sort-controls {
+  -moz-appearance: none;
+}
+
+.sorter {
+  -moz-appearance: none;
+  border: none;
+  background-color: transparent;
+  color: #536680;
+  border-radius: 10000px;
+  padding: 0 6px;
+  margin: 0 6px;
+  min-width: 12px !important;
+  -moz-box-direction: reverse;
+}
+
+.sorter .button-box {
+  padding-top: 0;
+  padding-bottom: 0;
+}
+
+.sorter[checkState="1"],
+.sorter[checkState="2"] {
+  background-color: rgba(194, 200, 206, 0.4);
+  box-shadow: 1px 1px 2px #B6BBC4 inset;
+}
+
+.sorter[checkState="1"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
+}
+
+.sorter[checkState="2"] {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.png");
+}
+
+.sorter .button-icon {
+  margin-inline-start: 4px;
+}
+
+
+/*** discover view ***/
+
+.discover-spacer-before,
+.discover-spacer-after {
+  -moz-box-flex: 1;
+}
+
+#discover-error .alert {
+  max-width: 45em;
+  -moz-box-flex: 1;
+}
+
+.discover-logo {
+  list-style-image: url("chrome://mozapps/skin/extensions/discover-logo.png");
+  margin-inline-end: 15px;
+}
+
+.discover-title {
+  font-weight: bold;
+  font-size: 24px;
+  font-family: MetaWebPro-Book, "Trebuchet MS", sans-serif;
+  margin: 0 0 15px 0;
+}
+
+.discover-description {
+  text-align: justify;
+  margin: 0 0 15px 0;
+}
+
+.discover-footer {
+  text-align: justify;
+}
+
+
+/*** list ***/
+
+.list {
+  -moz-appearance: none;
+  margin: 0;
+  border: none;
+  background-color: transparent;
+}
+
+.addon {
+  color: black;
+  border-top: 1px solid;
+  border-top-color: rgba(0, 0, 0, 0.1);
+  border-bottom: 1px solid;
+  border-bottom-color: rgba(255, 255, 255, 0.1);
+  padding: 5px;
+  background-origin: border-box;
+}
+
+.view-pane:not(#search-view) .addon:first-of-type,
+#search-view .addon[first] {
+  border-top-width: 1px;
+  border-top-color: rgba(255, 255, 255, 0.1);
+}
+
+.view-pane:not(#search-view) .addon:last-of-type,
+#search-view .addon[last] {
+  border-bottom-width: 1px;
+  border-bottom-color: rgba(0, 0, 0, 0.1);
+}
+
+.details {
+  cursor: pointer;
+  margin: 0;
+  margin-inline-start: 10px;
+}
+
+.icon-container {
+  width: 48px;
+  height: 48px;
+  margin: 3px 7px;
+  -moz-box-align: center;
+  -moz-box-pack: center;
+}
+
+.icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  max-width: 48px;
+  max-height: 48px;
+}
+
+.addon[active="false"] .icon {
+  filter: url("chrome://mozapps/skin/extensions/extensions.svg#greyscale");
+}
+
+
+.addon-view[type="theme"] .icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
+}
+
+.addon-view[type="locale"] .icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
+}
+
+.addon-view[type="plugin"] .icon {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
+}
+
+.addon-view[type="dictionary"] .icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
+}
+
+.name-container {
+  font-size: 150%;
+  font-weight: bold;
+  margin-bottom: 0;
+  -moz-box-align: end;
+  -moz-box-flex: 1;
+}
+
+.creator {
+  font-weight: bold;
+}
+
+.creator .text-link {
+  color: #0066CC;
+}
+
+.description-container {
+  margin-inline-start: 6px;
+  -moz-box-align: center;
+}
+
+.description {
+  margin: 0;
+}
+
+.warning,
+.pending,
+.error {
+  margin-inline-start: 48px;
+  font-weight: bold;
+  -moz-box-align: center;
+}
+
+.content-container,
+.basicinfo-container {
+  -moz-box-align: start;
+}
+
+.addon[status="installing"] > .content-container {
+  -moz-box-align: stretch;
+}
+
+.advancedinfo-container,
+.update-info-container {
+  -moz-box-align: center;
+}
+
+.update-available {
+  -moz-box-align: end;
+}
+
+.install-status-container {
+  -moz-box-pack: end;
+  -moz-box-align: end;
+}
+
+.name-outer-container {
+  -moz-box-pack: center;
+}
+
+.relnotes-toggle-container,
+.icon-outer-container {
+  -moz-box-pack: start;
+}
+
+.status-container,
+.control-container {
+  -moz-box-pack: end;
+}
+
+.addon-view .warning {
+  color: #916D15;
+}
+
+.addon-view .error {
+  color: #864441;
+}
+
+.addon-view .pending {
+  color: #1B7123;
+}
+
+.addon-view[pending="disable"] .pending,
+.addon-view[pending="uninstall"] .pending {
+  color: #62666E;
+}
+
+.addon .relnotes-container {
+  -moz-box-align: start;
+  margin-inline-start: 6px;
+  height: 0;
+  overflow: hidden;
+  opacity: 0;
+  transition-property: height, opacity;
+  transition-duration: 0.5s, 0.5s;
+}
+
+.addon[show-relnotes] .relnotes-container {
+  opacity: 1;
+  transition-property: height, opacity;
+  transition-duration: 0.5s, 0.5s;
+}
+
+.addon .relnotes-header {
+  font-weight: bold;
+  margin: 10px 0;
+}
+
+.addon .relnotes-toggle {
+  -moz-appearance: none;
+  border: none;
+  background: transparent;
+  font-weight: bold;
+  -moz-box-direction: reverse;
+  cursor: pointer;
+  list-style-image: url("chrome://global/skin/arrow/arrow-dn.png");
+}
+
+.addon .relnotes-toggle > .button-box > .button-icon {
+  padding-inline-start: 4px;
+}
+
+.addon[show-relnotes] .relnotes-toggle {
+  list-style-image: url("chrome://global/skin/arrow/arrow-up.png");
+}
+
+.addon[active="false"] {
+  background-color: #B7BFCB;
+}
+
+.addon-view[active="false"],
+.addon-view[active="false"] .name-container {
+  color: #8C99AB;
+}
+
+.addon-view[notification="warning"] {
+  background-image: url("chrome://mozapps/skin/extensions/stripes-warning.png"),
+                    linear-gradient(rgba(255, 255, 0, 0.04),
+                                    rgba(255, 255, 0, 0));
+  background-repeat: repeat-x;
+}
+
+.addon-view[notification="error"] {
+  background-image: url("chrome://mozapps/skin/extensions/stripes-error.png"),
+                    linear-gradient(rgba(255, 0, 0, 0.04),
+                                    rgba(255, 0, 0, 0));
+  background-repeat: repeat-x;
+}
+
+.addon-view[pending="enable"],
+.addon-view[pending="upgrade"],
+.addon-view[pending="install"] {
+  background-image: url("chrome://mozapps/skin/extensions/stripes-info-positive.png"),
+                    linear-gradient(rgba(0, 255, 0, 0.04),
+                                    rgba(0, 255, 0, 0));
+  background-repeat: repeat-x;
+}
+
+.addon-view[pending="disable"],
+.addon-view[pending="uninstall"] {
+  background-image: url("chrome://mozapps/skin/extensions/stripes-info-negative.png"),
+                    linear-gradient(rgba(128, 128, 128, 0.04),
+                                    rgba(128, 128, 128, 0));
+  background-repeat: repeat-x;
+}
+
+.addon[selected] {
+  background-color: rgba(148, 172, 204, 0.39);
+  color: black;
+}
+
+.addon[active="false"][selected] .name-container {
+  color: #8C99AB;
+}
+
+
+/*** item - uninstalled ***/
+
+.addon[status="uninstalled"] {
+  border: none;
+}
+
+.addon[status="uninstalled"] > .container {
+  -moz-box-align: center;
+  padding: 4px 20px;
+  background-color: #FDFFA8;
+  border-radius: 8px;
+  font-size: 120%;
+}
+
+.addon[status="uninstalled"][selected] {
+  background-color: transparent;
+}
+
+
+
+/*** search view ***/
+
+#search-filter {
+  padding: 5px 20px;
+  font-size: 120%;
+  border-bottom: 1px solid #CAD4E0;
+  overflow-x: hidden;
+}
+
+#search-filter-label {
+  font-weight: bold;
+  color: grey;
+}
+
+.search-filter-radio {
+  -moz-appearance: none;
+  padding: 0 6px;
+  margin: 0 3px;
+  border-radius: 10000px;
+}
+
+.search-filter-radio[selected] {
+  background-color: grey;
+  color: white;
+}
+
+.search-filter-radio .radio-check-box1 {
+  display: none;
+}
+
+.search-filter-radio .radio-icon {
+  display: none;
+}
+
+#search-allresults-link {
+  margin-top: 1em;
+  margin-bottom: 2em;
+}
+
+/*** detail view ***/
+
+#detail-view .loading {
+  opacity: 0;
+}
+
+#detail-view[loading-extended] .loading {
+  opacity: 1;
+  transition-property: opacity;
+  transition-duration: 1s;
+}
+
+.detail-view-container {
+  padding: 0 2em 2em 2em;
+  font-size: 110%;
+}
+
+#detail-notifications {
+  margin-top: 1em;
+  margin-bottom: 2em;
+}
+
+#detail-notifications .warning,
+#detail-notifications .pending,
+#detail-notifications .error {
+  margin-inline-start: 0;
+}
+
+#detail-icon {
+  margin-inline-end: 10px;
+  margin-top: 6px;
+  max-width: 64px;
+  max-height: 64px;
+}
+
+#detail-summary {
+  margin-bottom: 2em;
+}
+
+#detail-name-container {
+  font-size: 200%;
+}
+
+#detail-screenshot {
+  margin-inline-end: 2em;
+  max-width: 300px;
+  max-height: 300px;
+}
+
+#detail-desc-container {
+  margin-bottom: 2em;
+}
+
+#detail-desc, #detail-fulldesc {
+  margin-inline-start: 6px;
+  /* This is necessary to fix layout issues with multi-line descriptions, see
+     bug 592712*/
+  outline: solid transparent;
+  white-space: pre-wrap;
+  min-width: 10em;
+}
+
+#detail-fulldesc {
+  margin-top: 1em;
+}
+
+#detail-contributions {
+  border-radius: 5px;
+  border: 1px solid #D2DBE8;
+  margin-bottom: 2em;
+  padding: 1em;
+  background-color: #F3F7FB;
+}
+
+#detail-contrib-description {
+  font-style: italic;
+  margin-bottom: 1em;
+  color: #373D48;
+}
+
+#detail-contrib-suggested {
+  color: grey;
+  font-weight: bold;
+}
+
+#detail-contrib-btn {
+  color: #FFF;
+  border: 1px solid #3A4EEE;
+  border-radius: 3px;
+  list-style-image: url("chrome://mozapps/skin/extensions/heart.png");
+  background-color: #2F73EF;
+  background-image: linear-gradient(rgba(251, 252, 253, 0.70), rgba(246, 247, 248, 0.27) 49%,
+                                    rgba(231, 232, 233, 0.25) 51%, rgba(225, 226, 229, 0.1));
+}
+
+#detail-contrib-btn .button-box {
+  padding: 0 6px 1px 6px;
+}
+
+#detail-contrib-btn .button-icon {
+  margin-inline-end: 3px;
+}
+
+#detail-contrib-btn:not(:active):hover {
+  border-color: #4271FF;
+  background-color: #0459F7;
+  box-shadow: 0 1px 0 rgba(0, 0, 0, 0.1),
+              0 0 3.5px hsl(190, 90%, 80%);
+  transition: background-color .4s ease-in,
+                   border-color .3s ease-in,
+                   box-shadow .3s ease-in
+}
+
+#detail-contrib-btn:active:hover {
+  background-color: #8FA1C1;
+  border-color: rgba(0, 0, 0, 0.65) rgba(0, 0, 0, 0.55) rgba(0, 0, 0, 0.5);
+  box-shadow: 0 0 6.5px rgba(0, 0, 0, 0.4) inset,
+              0 0 2px rgba(0, 0, 0, 0.4) inset,
+              0 1px 0 rgba(255, 255, 255, 0.4);
+}
+
+#detail-grid {
+  margin-bottom: 2em;
+}
+
+.detail-row[first-row="true"],
+.detail-row-complex[first-row="true"] {
+  border-top: none;
+}
+
+.detail-row,
+.detail-row-complex {
+  border-top: 1px solid;
+  border-top-color: rgba(28, 31, 37, 0.1);
+  -moz-box-align: center;
+}
+
+.detail-row-value {
+  margin-inline-start: 0;
+}
+
+#detail-controls {
+  margin-bottom: 1em;
+}
+
+#detail-view[active="false"]:not([pending]):not([notification]) {
+  background-color: #B7BFCB;
+}
+
+/*** creator ***/
+
+.creator > label {
+  margin-inline-start: 0;
+  margin-inline-end: 0;
+}
+
+.creator > .text-link {
+  margin-top: 1px;
+  margin-bottom: 1px;
+}
+
+
+/*** rating ***/
+
+.meta-rating {
+  margin-inline-start: 0;
+  margin-inline-end: 0;
+  padding-top: 2px;
+}
+
+.meta-rating > .star {
+  list-style-image: url("chrome://mozapps/skin/extensions/rating-not-won.png");
+  padding: 0 1px;
+}
+
+.meta-rating > .star[on="true"] {
+  list-style-image: url("chrome://mozapps/skin/extensions/rating-won.png");
+}
+
+
+/*** download progress ***/
+
+.download-progress {
+  background-color: rgba(151,152,153,.05);
+  background-image: linear-gradient(rgba(251, 252, 253, 0.95), rgba(246, 247, 248, 0.47) 49%,
+                                    rgba(231, 232, 233, 0.45) 51%, rgba(225, 226, 229, 0.3));
+  background-clip: padding-box;
+  border-radius: 3px;
+  border: 1px solid;
+  border-color: rgba(0, 0, 0, 0.12) rgba(0, 0, 0, 0.19) rgba(0, 0, 0, 0.38);
+  box-shadow: 0 0 0 1px rgba(255, 255, 255, 0.3) inset,
+              0 0 0 2px rgba(255, 255, 255, 0.1) inset;
+  width: 200px;
+  height: 21px;
+  margin: 0 8px;
+}
+
+.download-progress[mode="undetermined"] {
+  border-color: #358942 #317F3D #2E773A;
+}
+
+.download-progress[mode="undetermined"] .status-container {
+  padding: 0 2px;
+}
+
+.download-progress .start-cap,
+.download-progress[complete] .end-cap,
+.download-progress[mode="undetermined"] .end-cap,
+.download-progress .progress .progress-bar {
+  -moz-appearance: none;
+  background-image: linear-gradient(#71CA83, #54B06C 49%, #43A05D 51%, #60BB76);
+  margin-top: -1px;
+  margin-bottom: -1px;
+  border: 1px solid;
+  border-color: #358942 #317F3D #2E773A;
+}
+
+.download-progress .start-cap {
+  margin-inline-start: -1px;
+  border-inline-end-width: 0;
+}
+
+.download-progress .end-cap {
+  margin-inline-end: -1px;
+  border-inline-start: 0px !important;
+}
+
+.download-progress .progress .progress-bar  {
+  border-left-width: 0;
+  border-right-width: 0;
+  min-height: 21px;
+}
+
+.download-progress .progress {
+  -moz-appearance: none;
+  background-color: transparent;
+  padding: 0;
+  margin: 0;
+  border: none;
+}
+
+.download-progress .start-cap,
+.download-progress .end-cap {
+  width: 4px;
+}
+
+.download-progress .start-cap:-moz-locale-dir(ltr),
+.download-progress .end-cap:-moz-locale-dir(rtl) {
+  border-radius: 3px 0 0 3px;
+}
+
+.download-progress .end-cap:-moz-locale-dir(ltr),
+.download-progress .start-cap:-moz-locale-dir(rtl) {
+  border-radius: 0 3px 3px 0;
+}
+
+.download-progress .cancel {
+  -moz-appearance: none;
+  background-color: rgba(255, 255, 255, 0.4);
+  border: 1px solid rgba(0, 0, 0, 0.4);
+  padding: 3px;
+  border-radius: 3px;
+  min-width: 0;
+  margin: 3px;
+}
+
+.download-progress .cancel:hover {
+  background-color: rgba(255, 255, 255, 0.6);
+  border: 1px solid rgba(0, 0, 0, 0.8);
+}
+
+.download-progress .cancel:active:hover {
+  box-shadow: inset rgba(0, 0, 0, 0.5) 1px 1px 2px;
+}
+
+.download-progress .cancel .button-box {
+  padding: 0;
+  border: none;
+}
+
+.download-progress .cancel .button-text {
+  display: none;
+}
+
+.download-progress .cancel .button-icon {
+  margin-inline-start: 0;
+}
+
+.download-progress .cancel {
+  list-style-image: url('chrome://mozapps/skin/extensions/cancel.png');
+}
+
+.download-progress .status-container {
+  -moz-box-align: center;
+}
+
+.download-progress .status {
+  text-shadow: #FFF 0 0 2px;
+}
+
+/*** install status ***/
+
+.install-status {
+  -moz-box-align: center;
+}
+
+
+/*** check for updates ***/
+
+#updates-container {
+  -moz-box-align: center;
+}
+
+#updates-container .button-link {
+  font-weight: bold;
+}
+
+#updates-installed,
+#updates-downloaded {
+  color: #00BB00;
+  font-weight: bold;
+}
+
+#update-selected {
+  margin: 12px;
+}
+
+
+/*** buttons ***/
+
+.addon-control[disabled="true"] {
+  display: none;
+}
+
+.button-link {
+  -moz-appearance: none;
+  background: transparent;
+  border: none;
+  text-decoration: underline;
+  color: blue;
+  cursor: pointer;
+  min-width: 0;
+  margin: 0 6px;
+}
+
+.button-link:focus {
+  color: red;
+  outline: 1px dotted;
+}
+
+.button-link:hover:active {
+  color: red;
+}
+
+.button-link[visited="true"] {
+  color: purple;
+}
+
+.header-button {
+  margin: 2px;
+  border: 1px solid;
+  padding: 3px;
+  border-color: #000000;
+  border-radius: 2px;
+  background-color: #AAB6C4;
+  background-clip: padding-box;
+  color: #000000;
+  font: menu;
+}
+
+.header-button:focus {
+  border-color: #98A5B2;
+}
+
+.header-button[disabled="true"] {
+  border-color: #8290A5 !important;
+  background-color: #B7BFCB !important;
+  color: #8C99AB !important;
+}
+
+.header-button[disabled="true"] > .toolbarbutton-icon {
+  opacity: 0.4;
+}
+
+.header-button:not([disabled="true"]):active:hover,
+.header-button[open="true"] {
+  border-color: #000000;
+  background-color: #90A1B3;
+  color: #FFFFFF;
+}
+
+.header-button:not([disabled="true"]):active:hover:focus,
+.header-button[open="true"]:focus {
+  border-color: #98A5B2;
+}
+
+.header-button > .toolbarbutton-text {
+  display: none;
+}
diff --git a/comm/suite/themes/modern/mozapps/extensions/extensions.svg b/comm/suite/themes/modern/mozapps/extensions/extensions.svg
new file mode 100644
index 0000000000..076c210469
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/extensions.svg
@@ -0,0 +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/. -->
+
+<svg xmlns="http://www.w3.org/2000/svg">
+  <filter id="greyscale">
+    <feColorMatrix type="saturate" values="0"/>
+  </filter>
+</svg>
diff --git a/comm/suite/themes/modern/mozapps/extensions/heart.png b/comm/suite/themes/modern/mozapps/extensions/heart.png
new file mode 100644
index 0000000000..655f4c4be7
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/heart.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/localeGeneric.png b/comm/suite/themes/modern/mozapps/extensions/localeGeneric.png
new file mode 100644
index 0000000000..4d9ac5ad89
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/localeGeneric.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/navigation.png b/comm/suite/themes/modern/mozapps/extensions/navigation.png
new file mode 100644
index 0000000000..c1e2a026d0
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/navigation.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/newaddon.css b/comm/suite/themes/modern/mozapps/extensions/newaddon.css
new file mode 100644
index 0000000000..525b487e5b
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/newaddon.css
@@ -0,0 +1,110 @@
+/* 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/. */
+
+#addon-page {
+  background: #FFF;
+  padding: 0;
+}
+
+#addon-scrollbox {
+  overflow: auto;
+  -moz-box-orient: vertical;
+  -moz-box-flex: 1;
+}
+
+#spacer-start {
+  -moz-box-flex: 1;
+}
+
+#spacer-end {
+  -moz-box-flex: 3;
+}
+
+#addon-container {
+  color: #22262F;
+  background: #C7D0D9;
+  border: 1px solid #494F5D;
+  border-radius: 10px;
+  max-width: 600px;
+  margin: 20px;
+  padding: 30px 90px;
+}
+
+#addon-info {
+  -moz-box-align: start;
+  margin: 25px 10px;
+}
+
+#icon {
+  margin-inline-end: 10px;
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+}
+
+.addon-info[type="theme"] #icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
+}
+
+.addon-info[type="locale"] #icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
+}
+
+.addon-info[type="plugin"] #icon {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
+}
+
+.addon-info[type="dictionary"] #icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
+}
+
+#name {
+  font-size: 130%;
+}
+
+#author {
+  font-style: italic;
+}
+
+#location {
+  font-style: italic;
+}
+
+#warning {
+  margin-bottom: 25px;
+  -moz-box-align: start;
+}
+
+#warning-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/alerticon-warning.png");
+  width: 16px;
+  height: 15px;
+  margin-inline-end: 5px;
+}
+
+#allow {
+  margin-inline-start: 84px;
+  margin-bottom: 20px;
+}
+
+#continuePanel,
+#restartPanel {
+  margin-top: 25px;
+  -moz-box-pack: end;
+  -moz-box-align: center;
+}
+
+#continuePanel {
+  -moz-box-pack: end;
+}
+
+#restartMessage {
+  text-align: right;
+}
+
+#restartSpacer {
+  -moz-box-flex: 1;
+}
+
+#later {
+  font-style: italic;
+}
diff --git a/comm/suite/themes/modern/mozapps/extensions/rating-not-won.png b/comm/suite/themes/modern/mozapps/extensions/rating-not-won.png
new file mode 100644
index 0000000000..2761f19255
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/rating-not-won.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/rating-won.png b/comm/suite/themes/modern/mozapps/extensions/rating-won.png
new file mode 100644
index 0000000000..336dd8f6eb
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/rating-won.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/stripes-error.png b/comm/suite/themes/modern/mozapps/extensions/stripes-error.png
new file mode 100644
index 0000000000..9dce6d0dcd
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/stripes-error.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/stripes-info-negative.png b/comm/suite/themes/modern/mozapps/extensions/stripes-info-negative.png
new file mode 100644
index 0000000000..8315e0fb21
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/stripes-info-negative.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/stripes-info-positive.png b/comm/suite/themes/modern/mozapps/extensions/stripes-info-positive.png
new file mode 100644
index 0000000000..11fee7d689
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/stripes-info-positive.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/stripes-warning.png b/comm/suite/themes/modern/mozapps/extensions/stripes-warning.png
new file mode 100644
index 0000000000..157faf6d2d
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/stripes-warning.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/themeGeneric-16.png b/comm/suite/themes/modern/mozapps/extensions/themeGeneric-16.png
new file mode 100644
index 0000000000..16d77a4a25
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/themeGeneric-16.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/themeGeneric.png b/comm/suite/themes/modern/mozapps/extensions/themeGeneric.png
new file mode 100644
index 0000000000..39118b15f3
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/themeGeneric.png
diff --git a/comm/suite/themes/modern/mozapps/extensions/update.css b/comm/suite/themes/modern/mozapps/extensions/update.css
new file mode 100644
index 0000000000..c6cba309c5
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/update.css
@@ -0,0 +1,26 @@
+/* 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/. */
+
+#alert {
+  list-style-image: url("chrome://mozapps/skin/update/update.png");
+}
+
+.throbber {
+  list-style-image: url("chrome://communicator/skin/icons/loading.png");
+  width: 16px;
+  height: 16px;
+  margin-top: 5px;
+  margin-bottom: 5px;
+  margin-inline-start: 5px;
+  margin-inline-end: 2px;
+}
+
+.alertBox {
+  background-color: #FFFFE7;
+  color: #000000;
+  border: 1px outset #FFFFE7;
+  margin-left: 3px;
+  margin-right: 3px;
+  padding: 5px;
+}
diff --git a/comm/suite/themes/modern/mozapps/extensions/utilities.png b/comm/suite/themes/modern/mozapps/extensions/utilities.png
new file mode 100644
index 0000000000..8efc337118
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/extensions/utilities.png
diff --git a/comm/suite/themes/modern/mozapps/handling/handling.css b/comm/suite/themes/modern/mozapps/handling/handling.css
new file mode 100644
index 0000000000..a6c7d0b15c
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/handling/handling.css
@@ -0,0 +1,34 @@
+/* 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/. */
+
+#description-image:not([src]) {
+  height: 32px;
+  width: 32px;
+}
+
+richlistitem[type] {
+  min-height: 36px; /* Don't forget to update the richlistbox height! */
+  padding-inline-start: 2px;
+ }
+
+richlistitem {
+  -moz-box-align: center;
+}
+
+richlistbox {
+  /* 3 items high, plus 4px for top and bottom margins, less 2px for border */
+  min-height: 110px;
+}
+
+.name {
+  font-weight: bold;
+}
+
+.description {
+  color: #006400;
+}
+
+richlistitem[selected="true"] .description {
+  color: inherit !important;
+}
diff --git a/comm/suite/themes/modern/mozapps/icons/itemDisabledFader.png b/comm/suite/themes/modern/mozapps/icons/itemDisabledFader.png
new file mode 100644
index 0000000000..9da353ce5c
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/icons/itemDisabledFader.png
diff --git a/comm/suite/themes/modern/mozapps/icons/itemEnabledFader.png b/comm/suite/themes/modern/mozapps/icons/itemEnabledFader.png
new file mode 100644
index 0000000000..12886160ca
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/icons/itemEnabledFader.png
diff --git a/comm/suite/themes/modern/mozapps/passwordmgr/key-16.png b/comm/suite/themes/modern/mozapps/passwordmgr/key-16.png
new file mode 100644
index 0000000000..c6e0fda650
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/passwordmgr/key-16.png
diff --git a/comm/suite/themes/modern/mozapps/passwordmgr/key-64.png b/comm/suite/themes/modern/mozapps/passwordmgr/key-64.png
new file mode 100644
index 0000000000..31f2fbb9e5
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/passwordmgr/key-64.png
diff --git a/comm/suite/themes/modern/mozapps/passwordmgr/key.png b/comm/suite/themes/modern/mozapps/passwordmgr/key.png
new file mode 100644
index 0000000000..b5e8afefca
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/passwordmgr/key.png
diff --git a/comm/suite/themes/modern/mozapps/plugins/pluginBlocked-16.png b/comm/suite/themes/modern/mozapps/plugins/pluginBlocked-16.png
new file mode 100644
index 0000000000..d38cfde90f
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/plugins/pluginBlocked-16.png
diff --git a/comm/suite/themes/modern/mozapps/plugins/pluginBlocked.png b/comm/suite/themes/modern/mozapps/plugins/pluginBlocked.png
new file mode 100644
index 0000000000..a912cbe2e8
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/plugins/pluginBlocked.png
diff --git a/comm/suite/themes/modern/mozapps/plugins/pluginGeneric-16.png b/comm/suite/themes/modern/mozapps/plugins/pluginGeneric-16.png
new file mode 100644
index 0000000000..d38cfde90f
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/plugins/pluginGeneric-16.png
diff --git a/comm/suite/themes/modern/mozapps/plugins/pluginGeneric.png b/comm/suite/themes/modern/mozapps/plugins/pluginGeneric.png
new file mode 100644
index 0000000000..a912cbe2e8
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/plugins/pluginGeneric.png
diff --git a/comm/suite/themes/modern/mozapps/plugins/pluginInstallerWizard.css b/comm/suite/themes/modern/mozapps/plugins/pluginInstallerWizard.css
new file mode 100644
index 0000000000..6db976c01d
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/plugins/pluginInstallerWizard.css
@@ -0,0 +1,10 @@
+/* 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/. */
+
+#licenseContainer, #pluginList {
+  margin: 2px 4px;
+  border: 1px solid #5D616E;
+  background-color: #FFFFFF;
+  color: #000000;
+}
diff --git a/comm/suite/themes/modern/mozapps/update/update.png b/comm/suite/themes/modern/mozapps/update/update.png
new file mode 100644
index 0000000000..e2737058f8
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/update/update.png
diff --git a/comm/suite/themes/modern/mozapps/update/updates.css b/comm/suite/themes/modern/mozapps/update/updates.css
new file mode 100644
index 0000000000..69cccd75c2
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/update/updates.css
@@ -0,0 +1,168 @@
+/* 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/. */
+
+/**
+ * General
+ */
+wizardpage {
+  height: 360px;
+  width: 700px;
+}
+
+#updates, .wizard-page-box {
+  margin: 0;
+  padding: 0;
+}
+
+.update-header {
+  padding: 0px 10px;
+}
+
+.update-content {
+  padding: 10px;
+}
+
+/**
+ * License Page
+ */
+.loadingBox {
+  padding: 3px 5px;
+}
+
+.remoteLoadingThrobber {
+  margin-top: 3px;
+}
+
+.remoteLoadingThrobber[state="loading"] {
+  list-style-image: url("chrome://communicator/skin/icons/loading.png");
+}
+
+.remoteLoadingThrobber[state="error"] {
+  list-style-image: url("chrome://global/skin/icons/notfound.png");
+}
+
+/**
+ * Update Found Page
+ */
+.wizard-buttons-separator {
+  margin-top: 0 !important;
+}
+
+/* Update Found Basic Page */
+#updateName, #updateFinishedName {
+  font-weight: bold;
+  font-size: 120%;
+}
+
+/* License Page */
+#licenseContent {
+  margin: 2px 4px;
+  border: 1px solid #5D616E;
+  background-color: #FFFFFF;
+  color: #000000;
+}
+
+/**
+ * Downloading Page
+ */
+#downloadStatusLine {
+  -moz-box-align: center;
+}
+
+#downloadStatus {
+  height: 3em !important;
+}
+
+#downloadStatusProgress {
+  padding-inline-end: 5px;
+}
+
+#pauseButton > .button-box > .button-icon {
+  margin-inline-start: 0;
+}
+
+#pauseButton > .button-box > .button-text {
+  margin-inline-start: 0 !important;
+  margin-inline-end: 0 !important;
+}
+
+#pauseButton {
+  min-width: 0;
+  min-height: 0;
+  color: #000000 !important;
+  background-color: transparent !important;
+  list-style-image: url("chrome://mozapps/skin/icons/buttons.png");
+  -moz-image-region: rect(0px, 48px, 16px, 32px);
+  margin: 0;
+  border: 1px solid !important;
+  border-top-colors: transparent !important;
+  border-right-colors: transparent !important;
+  border-bottom-colors: transparent !important;
+  border-left-colors: transparent !important;
+  border-radius: 0 !important;
+  outline: none !important;
+}
+
+#pauseButton:focus {
+  border-style: dotted !important;
+  border-color: #000000 !important;
+}
+
+#pauseButton[disabled="true"] {
+  -moz-image-region: rect(16px, 48px, 32px, 32px);
+}
+
+#pauseButton[paused="true"] {
+  -moz-image-region: rect(0px, 16px, 16px, 0px);
+}
+
+#pauseButton[paused="true"][disabled="true"] {
+  -moz-image-region: rect(16px, 16px, 32px, 0px);
+}
+
+#verificationFailedIcon {
+  margin-inline-start: 5px;
+  list-style-image: url("chrome://global/skin/icons/notfound.png");
+}
+
+/**
+ * Error Page
+ */
+#errorReason {
+  margin-top: 1px;
+  margin-bottom: 2px;
+  margin-inline-start: 6px !important;
+  margin-inline-end: 5px;
+  font-weight: bold;
+}
+
+/**
+ * Update History Window
+ */
+update {
+  border-bottom: 1px solid #90A1B3;
+}
+
+.update-name {
+  font-weight: bold;
+}
+
+.update-label-column {
+  -moz-box-align: end;
+}
+
+.update-type {
+  font-weight: bold;
+  color: #990000;
+}
+
+#historyItems {
+  height: 200px;
+  margin: 1px 5px 4px;
+  border: 1px solid #5D616E;
+}
+
+#historyItems > scrollbox {
+  margin-bottom: 1px;
+}
diff --git a/comm/suite/themes/modern/mozapps/viewsource/viewsource.css b/comm/suite/themes/modern/mozapps/viewsource/viewsource.css
new file mode 100644
index 0000000000..76c7d00b9d
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/viewsource/viewsource.css
@@ -0,0 +1,5 @@
+/* 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/. */
+
+/* This is for styling the menus of the viewsource window */
diff --git a/comm/suite/themes/modern/mozapps/xpinstall/xpinstallConfirm.css b/comm/suite/themes/modern/mozapps/xpinstall/xpinstallConfirm.css
new file mode 100644
index 0000000000..0188d345a5
--- /dev/null
+++ b/comm/suite/themes/modern/mozapps/xpinstall/xpinstallConfirm.css
@@ -0,0 +1,91 @@
+/* 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/. */
+
+#xpinstallheader {
+  margin-bottom: 2em;
+}
+
+#itemList {
+  margin-top: 2px;
+  margin-bottom: 10px;
+  height: 14em;
+  border: 1px solid #5D616E;
+  background-color: #FFFFFF;
+  color: #000000;
+}
+
+#itemWarningIntro {
+  margin-inline-start: 8px;
+}
+
+#dialogContentBox {
+  padding: 5px;
+}
+
+installitem {
+  padding-top: 5px;
+  padding-bottom: 5px;
+  padding-inline-start: 5px;
+  padding-inline-end: 0;
+  border-bottom: 1px solid #A5ABC0;
+  margin-bottom: 5px;
+}
+
+.alert-icon {
+  margin-inline-end: 20px;
+}
+
+.warning {
+  font-weight: bold;
+  font-size: 1.25em;
+  margin-bottom: 1em;
+}
+
+.xpinstallIconContainer {
+  width: 32px;
+  height: 32px;
+  margin-inline-end: 5px;
+}
+
+.xpinstallItemName {
+  font-weight: bold;
+}
+
+.xpinstallItemSigned {
+  font-style: italic;
+  font-size: 0.9em;
+}
+
+.xpinstallItemURL {
+  border: none;
+  padding: 0;
+  background-color: #FFFFFF;
+  color: #000000;
+  margin-top: 1px;
+  margin-bottom: 1px;
+  margin-inline-start: 6px;
+  margin-inline-end: 5px;
+}
+
+.xpinstallItemIcon {
+  max-width: 32px;
+  max-height: 32px;
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+}
+
+installitem[type="theme"] .xpinstallItemIcon {
+  list-style-image: url("chrome://mozapps/skin/extensions/themeGeneric.png");
+}
+
+installitem[type="locale"] .xpinstallItemIcon {
+  list-style-image: url("chrome://mozapps/skin/extensions/localeGeneric.png");
+}
+
+installitem[type="plugin"] .xpinstallItemIcon {
+  list-style-image: url("chrome://mozapps/skin/plugins/pluginGeneric.png");
+}
+
+installitem[type="dictionary"] .xpinstallItemIcon {
+  list-style-image: url("chrome://mozapps/skin/extensions/dictionaryGeneric.png");
+}
diff --git a/comm/suite/themes/modern/navigator/btn1/feeds.png b/comm/suite/themes/modern/navigator/btn1/feeds.png
new file mode 100644
index 0000000000..61853ac262
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/feeds.png
diff --git a/comm/suite/themes/modern/navigator/btn1/first-dis.png b/comm/suite/themes/modern/navigator/btn1/first-dis.png
new file mode 100644
index 0000000000..c9bbb8e759
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/first-dis.png
diff --git a/comm/suite/themes/modern/navigator/btn1/first-hov.png b/comm/suite/themes/modern/navigator/btn1/first-hov.png
new file mode 100644
index 0000000000..e5bd045c82
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/first-hov.png
diff --git a/comm/suite/themes/modern/navigator/btn1/first.png b/comm/suite/themes/modern/navigator/btn1/first.png
new file mode 100644
index 0000000000..bdfca7c38e
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/first.png
diff --git a/comm/suite/themes/modern/navigator/btn1/last-dis.png b/comm/suite/themes/modern/navigator/btn1/last-dis.png
new file mode 100644
index 0000000000..c67a320d22
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/last-dis.png
diff --git a/comm/suite/themes/modern/navigator/btn1/last-hov.png b/comm/suite/themes/modern/navigator/btn1/last-hov.png
new file mode 100644
index 0000000000..e97442907c
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/last-hov.png
diff --git a/comm/suite/themes/modern/navigator/btn1/last.png b/comm/suite/themes/modern/navigator/btn1/last.png
new file mode 100644
index 0000000000..769aaf1cae
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/last.png
diff --git a/comm/suite/themes/modern/navigator/btn1/next-dis.png b/comm/suite/themes/modern/navigator/btn1/next-dis.png
new file mode 100644
index 0000000000..d2a6bfc98f
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/next-dis.png
diff --git a/comm/suite/themes/modern/navigator/btn1/next-hov.png b/comm/suite/themes/modern/navigator/btn1/next-hov.png
new file mode 100644
index 0000000000..b9962372d0
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/next-hov.png
diff --git a/comm/suite/themes/modern/navigator/btn1/next.png b/comm/suite/themes/modern/navigator/btn1/next.png
new file mode 100644
index 0000000000..6563b91dec
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/next.png
diff --git a/comm/suite/themes/modern/navigator/btn1/previous-dis.png b/comm/suite/themes/modern/navigator/btn1/previous-dis.png
new file mode 100644
index 0000000000..cf7ba06e8a
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/previous-dis.png
diff --git a/comm/suite/themes/modern/navigator/btn1/previous-hov.png b/comm/suite/themes/modern/navigator/btn1/previous-hov.png
new file mode 100644
index 0000000000..512c3582d8
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/previous-hov.png
diff --git a/comm/suite/themes/modern/navigator/btn1/previous.png b/comm/suite/themes/modern/navigator/btn1/previous.png
new file mode 100644
index 0000000000..fcdc6a8896
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/previous.png
diff --git a/comm/suite/themes/modern/navigator/btn1/top-dis.png b/comm/suite/themes/modern/navigator/btn1/top-dis.png
new file mode 100644
index 0000000000..86dbe1b80f
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/top-dis.png
diff --git a/comm/suite/themes/modern/navigator/btn1/top-hov.png b/comm/suite/themes/modern/navigator/btn1/top-hov.png
new file mode 100644
index 0000000000..dce156271b
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/top-hov.png
diff --git a/comm/suite/themes/modern/navigator/btn1/top.png b/comm/suite/themes/modern/navigator/btn1/top.png
new file mode 100644
index 0000000000..d750c751ec
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/top.png
diff --git a/comm/suite/themes/modern/navigator/btn1/up-dis.png b/comm/suite/themes/modern/navigator/btn1/up-dis.png
new file mode 100644
index 0000000000..31bab499da
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/up-dis.png
diff --git a/comm/suite/themes/modern/navigator/btn1/up-hov.png b/comm/suite/themes/modern/navigator/btn1/up-hov.png
new file mode 100644
index 0000000000..721a044e95
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/up-hov.png
diff --git a/comm/suite/themes/modern/navigator/btn1/up.png b/comm/suite/themes/modern/navigator/btn1/up.png
new file mode 100644
index 0000000000..2405a46181
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/btn1/up.png
diff --git a/comm/suite/themes/modern/navigator/icons/browser-small.png b/comm/suite/themes/modern/navigator/icons/browser-small.png
new file mode 100644
index 0000000000..0845512968
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/icons/browser-small.png
diff --git a/comm/suite/themes/modern/navigator/icons/browser.png b/comm/suite/themes/modern/navigator/icons/browser.png
new file mode 100644
index 0000000000..ae73bf56d2
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/icons/browser.png
diff --git a/comm/suite/themes/modern/navigator/icons/identity.png b/comm/suite/themes/modern/navigator/icons/identity.png
new file mode 100644
index 0000000000..35b376f30d
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/icons/identity.png
diff --git a/comm/suite/themes/modern/navigator/icons/popup-blocked.png b/comm/suite/themes/modern/navigator/icons/popup-blocked.png
new file mode 100644
index 0000000000..6d32ce1697
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/icons/popup-blocked.png
diff --git a/comm/suite/themes/modern/navigator/icons/tab-drag-indicator.png b/comm/suite/themes/modern/navigator/icons/tab-drag-indicator.png
new file mode 100644
index 0000000000..60a3a21b2f
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/icons/tab-drag-indicator.png
diff --git a/comm/suite/themes/modern/navigator/icons/tab-new-act.png b/comm/suite/themes/modern/navigator/icons/tab-new-act.png
new file mode 100644
index 0000000000..b88743a3fe
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/icons/tab-new-act.png
diff --git a/comm/suite/themes/modern/navigator/icons/tab-new-hov.png b/comm/suite/themes/modern/navigator/icons/tab-new-hov.png
new file mode 100644
index 0000000000..c48a3bc247
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/icons/tab-new-hov.png
diff --git a/comm/suite/themes/modern/navigator/icons/tab-new.png b/comm/suite/themes/modern/navigator/icons/tab-new.png
new file mode 100644
index 0000000000..93bebb8c61
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/icons/tab-new.png
diff --git a/comm/suite/themes/modern/navigator/icons/windowcontrols.png b/comm/suite/themes/modern/navigator/icons/windowcontrols.png
new file mode 100644
index 0000000000..63a4317b88
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/icons/windowcontrols.png
diff --git a/comm/suite/themes/modern/navigator/linkToolbar.css b/comm/suite/themes/modern/navigator/linkToolbar.css
new file mode 100644
index 0000000000..6fccf75d2f
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/linkToolbar.css
@@ -0,0 +1,112 @@
+/* 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/. */
+
+/* ::::: Link toolbar items ::::: */
+
+#link-top {
+  list-style-image: url("chrome://navigator/skin/btn1/top.png");
+}
+
+#link-top[disabled="true"],
+#link-top[disabled="true"]:hover,
+#link-top[disabled="true"]:hover:active {
+  list-style-image: url("chrome://navigator/skin/btn1/top-dis.png") !important;
+}
+
+#link-top:hover,
+#link-top:hover:active {
+  list-style-image: url("chrome://navigator/skin/btn1/top-hov.png");
+}
+
+#link-up {
+  list-style-image: url("chrome://navigator/skin/btn1/up.png");
+}
+
+#link-up[disabled="true"],
+#link-up[disabled="true"]:hover,
+#link-up[disabled="true"]:hover:active {
+  list-style-image: url("chrome://navigator/skin/btn1/up-dis.png") !important;
+}
+
+#link-up:hover,
+#link-up:hover:active {
+  list-style-image: url("chrome://navigator/skin/btn1/up-hov.png");
+}
+
+#link-first {
+  list-style-image: url("chrome://navigator/skin/btn1/first.png");
+}
+
+#link-first[disabled="true"],
+#link-first[disabled="true"]:hover,
+#link-first[disabled="true"]:hover:active {
+  list-style-image: url("chrome://navigator/skin/btn1/first-dis.png") !important;
+}
+
+#link-first:hover,
+#link-first:hover:active {
+  list-style-image: url("chrome://navigator/skin/btn1/first-hov.png");
+}
+
+#link-prev {
+  list-style-image: url("chrome://navigator/skin/btn1/previous.png");
+}
+
+#link-prev[disabled="true"],
+#link-prev[disabled="true"]:hover,
+#link-prev[disabled="true"]:hover:active {
+  list-style-image: url("chrome://navigator/skin/btn1/previous-dis.png") !important;
+}
+
+#link-prev:hover,
+#link-prev:hover:active {
+  list-style-image: url("chrome://navigator/skin/btn1/previous-hov.png");
+}
+
+#link-next {
+  list-style-image: url("chrome://navigator/skin/btn1/next.png");
+}
+
+#link-next[disabled="true"],
+#link-next[disabled="true"]:hover,
+#link-next[disabled="true"]:hover:active {
+  list-style-image: url("chrome://navigator/skin/btn1/next-dis.png") !important;
+}
+
+#link-next:hover,
+#link-next:hover:active {
+  list-style-image: url("chrome://navigator/skin/btn1/next-hov.png");
+}
+
+#link-last {
+  list-style-image: url("chrome://navigator/skin/btn1/last.png");
+}
+
+#link-last[disabled="true"],
+#link-last[disabled="true"]:hover,
+#link-last[disabled="true"]:hover:active {
+  list-style-image: url("chrome://navigator/skin/btn1/last-dis.png") !important;
+}
+
+#link-last:hover,
+#link-last:hover:active {
+  list-style-image: url("chrome://navigator/skin/btn1/last-hov.png");
+}
+
+#link-feed {
+  list-style-image: url("chrome://navigator/skin/btn1/feeds.png") !important;
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#link-feed:hover {
+  -moz-image-region: rect(16px 32px 32px 16px);
+}
+
+#link-feed[disabled="true"] {
+  -moz-image-region: rect(32px 32px 48px 16px);
+}
+
+#link-feed[open="true"] {
+  -moz-image-region: rect(48px 32px 64px 16px);
+}
diff --git a/comm/suite/themes/modern/navigator/navigator.css b/comm/suite/themes/modern/navigator/navigator.css
new file mode 100644
index 0000000000..51b7d5b73c
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/navigator.css
@@ -0,0 +1,936 @@
+/* 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/. */
+
+@import url("chrome://navigator/content/navigator.css");
+@import url("chrome://communicator/skin/");
+@import url("chrome://communicator/skin/places/bookmarksToolbar.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: primary toolbar buttons ::::: */
+
+.toolbarbutton-1 {
+  min-width: 0px;
+}
+
+toolbox {
+  border-bottom: none;
+}
+
+#appcontent {
+  border-top: 1px solid #494F5D;
+}
+
+#back-button {
+  list-style-image: url("chrome://communicator/skin/icons/common.png");
+  -moz-image-region: rect(78px 42px 117px 0);
+}
+
+#back-button:hover {
+  -moz-image-region: rect(78px 84px 117px 42px);
+}
+
+#back-button:hover:active {
+  -moz-image-region: rect(78px 126px 117px 84px);
+}
+
+#back-button[disabled="true"] {
+  -moz-image-region: rect(78px 168px 117px 126px) !important;
+}
+
+#forward-button {
+  list-style-image: url("chrome://communicator/skin/icons/common.png");
+  -moz-image-region: rect(117px 42px 156px 0);
+}
+
+#forward-button:hover {
+  -moz-image-region: rect(117px 84px 156px 42px);
+}
+
+#forward-button:hover:active {
+  -moz-image-region: rect(117px 126px 156px 84px);
+}
+
+#forward-button[disabled="true"] {
+  -moz-image-region: rect(117px 168px 156px 126px) !important;
+}
+
+#reload-button {
+  list-style-image: url("chrome://navigator/skin/icons/browser.png");
+  -moz-image-region: rect(0px 42px 39px 0);
+}
+
+#reload-button:hover {
+  -moz-image-region: rect(0px 84px 39px 42px);
+}
+
+#reload-button:hover:active {
+  -moz-image-region: rect(0px 126px 39px 84px);
+}
+
+#reload-button[disabled="true"] {
+  -moz-image-region: rect(0px 168px 39px 126px) !important;
+}
+
+#stop-button {
+  list-style-image: url("chrome://communicator/skin/icons/common.png");
+  -moz-image-region: rect(39px 42px 78px 0);
+}
+
+#stop-button:hover {
+  -moz-image-region: rect(39px 84px 78px 42px);
+}
+
+#stop-button:hover:active {
+  -moz-image-region: rect(39px 126px 78px 84px);
+}
+
+#stop-button[disabled="true"] {
+  -moz-image-region: rect(39px 168px 78px 126px) !important;
+}
+
+#home-button {
+  list-style-image: url("chrome://communicator/skin/icons/common.png");
+  -moz-image-region: rect(156px 42px 195px 0);
+}
+
+#home-button:hover {
+  -moz-image-region: rect(156px 84px 195px 42px);
+}
+
+#home-button:hover:active {
+  -moz-image-region: rect(156px 126px 195px 84px);
+}
+
+#home-button[disabled="true"] {
+  -moz-image-region: rect(156px 168px 195px 126px) !important;
+}
+
+#sync-button {
+  list-style-image: url("chrome://communicator/skin/sync/sync-32.png");
+}
+
+#sync-button > .toolbarbutton-icon {
+  margin-top: 5px;
+  margin-bottom: 4px;
+  margin-inline-start: 5px;
+  margin-inline-end: 7px;
+}
+
+#sync-button[status=active] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-32-throbber.png");
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #back-button,
+toolbar[iconsize="small"] > #back-button {
+  list-style-image: url("chrome://communicator/skin/icons/common-small.png");
+  -moz-image-region: rect(38px 19px 57px 0);
+}
+
+toolbar[iconsize="small"] > #back-button:hover {
+  -moz-image-region: rect(38px 38px 57px 19px);
+}
+
+toolbar[iconsize="small"] > #back-button:hover:active {
+  -moz-image-region: rect(38px 57px 57px 38px);
+}
+
+toolbar[iconsize="small"] > #back-button[disabled="true"] {
+  -moz-image-region: rect(38px 76px 57px 57px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #forward-button,
+toolbar[iconsize="small"] > #forward-button {
+  list-style-image: url("chrome://communicator/skin/icons/common-small.png");
+  -moz-image-region: rect(57px 19px 76px 0);
+}
+
+toolbar[iconsize="small"] > #forward-button:hover {
+  -moz-image-region: rect(57px 38px 76px 19px);
+}
+
+toolbar[iconsize="small"] > #forward-button:hover:active {
+  -moz-image-region: rect(57px 57px 76px 38px);
+}
+
+toolbar[iconsize="small"] > #forward-button[disabled="true"] {
+  -moz-image-region: rect(57px 76px 76px 57px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #reload-button,
+toolbar[iconsize="small"] > #reload-button {
+  list-style-image: url("chrome://navigator/skin/icons/browser-small.png");
+  -moz-image-region: rect(0 19px 19px 0);
+}
+
+toolbar[iconsize="small"] > #reload-button:hover {
+  -moz-image-region: rect(0 38px 19px 19px);
+}
+
+toolbar[iconsize="small"] > #reload-button:hover:active {
+  -moz-image-region: rect(0 57px 19px 38px);
+}
+
+toolbar[iconsize="small"] > #reload-button[disabled="true"] {
+  -moz-image-region: rect(0 76px 19px 57px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #stop-button,
+toolbar[iconsize="small"] > #stop-button {
+  list-style-image: url("chrome://communicator/skin/icons/common-small.png");
+  -moz-image-region: rect(19px 19px 38px 0);
+}
+
+toolbar[iconsize="small"] > #stop-button:hover {
+  -moz-image-region: rect(19px 38px 38px 19px);
+}
+
+toolbar[iconsize="small"] > #stop-button:hover:active {
+  -moz-image-region: rect(19px 57px 38px 38px);
+}
+
+toolbar[iconsize="small"] > #stop-button[disabled="true"] {
+  -moz-image-region: rect(19px 76px 38px 57px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #home-button,
+toolbar[iconsize="small"] > #home-button {
+  list-style-image: url("chrome://communicator/skin/icons/common-small.png");
+  -moz-image-region: rect(76px 19px 95px 0);
+}
+
+toolbar[iconsize="small"] > #home-button:hover {
+  -moz-image-region: rect(76px 38px 95px 19px);
+}
+
+toolbar[iconsize="small"] > #home-button:hover:active {
+  -moz-image-region: rect(76px 57px 95px 38px);
+}
+
+toolbar[iconsize="small"] > #home-button[disabled="true"] {
+  -moz-image-region: rect(76px 76px 95px 57px) !important;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button,
+toolbar[iconsize="small"] > #sync-button {
+  list-style-image: url("chrome://communicator/skin/sync/sync-16.png");
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button > .toolbarbutton-icon,
+toolbar[iconsize="small"] > #sync-button > .toolbarbutton-icon {
+  margin-top: 2px;
+  margin-bottom: 3px;
+  margin-inline-start: 3px;
+  margin-inline-end: 5px;
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button[status=active],
+toolbar[iconsize="small"] > #sync-button[status=active] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-16-throbber.png");
+}
+
+#nav-bar[iconsize="small"] {
+  min-height: 0;
+}
+
+/* ::::: fullscreen window controls ::::: */
+
+#window-controls {
+  -moz-box-align: center;
+  padding-top: 0px;
+  padding-bottom: 0px;
+  padding-inline-start: 4px;
+  padding-inline-end: 2px;
+  background-color: #A9B2BD;
+  border-left: 1px solid #B6BEC5;
+}
+
+#window-controls > toolbarbutton {
+  list-style-image: url("chrome://navigator/skin/icons/windowcontrols.png");
+  min-width: 0;
+  border: none;
+}
+
+toolbar[mode="text"] > #window-controls > toolbarbutton > .toolbarbutton-icon {
+  display: -moz-box;
+}
+
+#minimize-button {
+  -moz-image-region: rect(16px 15px 32px 0);
+}
+
+#minimize-button:hover {
+  -moz-image-region: rect(16px 30px 32px 15px);
+}
+
+#minimize-button:hover:active {
+  -moz-image-region: rect(16px 45px 32px 30px);
+}
+
+#minimize-button[disabled="true"] {
+  -moz-image-region: rect(16px 60px 32px 45px) !important;
+}
+
+#restore-button {
+  -moz-image-region: rect(0 15px 16px 0);
+}
+
+#restore-button:hover {
+  -moz-image-region: rect(0 30px 16px 15px);
+}
+
+#restore-button:hover:active {
+  -moz-image-region: rect(0 45px 16px 30px);
+}
+
+#restore-button[disabled="true"] {
+  -moz-image-region: rect(0 60px 16px 45px) !important;
+}
+
+#close-button {
+  -moz-image-region: rect(32px 15px 48px 0);
+}
+
+#close-button:hover {
+  -moz-image-region: rect(32px 30px 48px 15px);
+}
+
+#close-button:hover:active {
+  -moz-image-region: rect(32px 45px 48px 30px);
+}
+
+#close-button[disabled="true"] {
+  -moz-image-region: rect(32px 60px 48px 45px) !important;
+}
+
+/* ::::: special menubutton dropmarkers ::::: */
+
+/* ..... dropmarker box ..... */
+
+#back-button > .toolbarbutton-menubutton-stack
+    > .toolbarbutton-menubutton-dropmarker,
+#forward-button > .toolbarbutton-menubutton-stack
+    > .toolbarbutton-menubutton-dropmarker
+{
+  margin-top: 20px;
+  margin-bottom: 0px;
+  margin-inline-start: 34px;
+  margin-inline-end: 0px;
+}
+
+#print-button > .toolbarbutton-menubutton-stack
+    > .toolbarbutton-menubutton-dropmarker
+{
+  margin-top: 20px;
+  margin-bottom: 0px;
+  margin-inline-start: 40px;
+  margin-inline-end: 0px;
+}
+
+toolbar[mode="icons"] #back-button > .toolbarbutton-menubutton-stack
+    > .toolbarbutton-menubutton-dropmarker,
+toolbar[mode="icons"] #forward-button > .toolbarbutton-menubutton-stack
+    > .toolbarbutton-menubutton-dropmarker
+{
+  margin-top: 30px;
+  margin-bottom: 0px;
+  margin-inline-start: 34px;
+  margin-inline-end: 0px;
+}
+
+toolbar[iconsize=small] #back-button > .toolbarbutton-menubutton-stack
+    > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize=small] #forward-button > .toolbarbutton-menubutton-stack
+    > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize=small] #print-button > .toolbarbutton-menubutton-stack
+    > .toolbarbutton-menubutton-dropmarker
+{
+  margin-top: 8px;
+  margin-bottom: 8px;
+  margin-inline-start: 14px;
+  margin-inline-end: 0px;
+}
+
+toolbar[iconsize=small][mode="icons"] #back-button > .toolbarbutton-menubutton-stack
+    > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize=small][mode="icons"] #forward-button > .toolbarbutton-menubutton-stack
+    > .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize=small][mode="icons"] #print-button > .toolbarbutton-menubutton-stack
+    > .toolbarbutton-menubutton-dropmarker
+{
+  margin-top: 8px;
+  margin-bottom: 0px;
+  margin-inline-start: 14px;
+  margin-inline-end: 0px;
+}
+
+/* ::::: nav-bar - the navigator primary toolbar ::::: */
+
+.toolbar-primary-icon {
+  display: none;
+}
+
+.toolbar-primary-holder {
+  -moz-box-align: start;
+  background-image: url("chrome://communicator/skin/toolbar/prtb-bg-noline.png");
+}
+
+/* ::::: the grooved area around the urlbar and associated buttons ::::: */
+
+.nav-bar-class {
+  -moz-box-align: center;
+  margin-top: 7px;
+  margin-bottom: 3px;
+  border-top: 1px solid;
+  border-bottom: 1px solid;
+  border-top-color: #A2AFBD;
+  border-right-color: #A2AFBD;
+  border-bottom-color: #939EAA;
+  border-left-color: #9FABB9;
+  padding: 0px;
+  min-width: 0px;
+}
+
+.nav-bar-first,
+toolbarpaletteitem > .nav-bar-class {
+  margin-inline-start: 5px;
+  border-inline-start: 2px solid #D2DAE1;
+  padding-inline-start: 3px;
+}
+
+.nav-bar-last,
+toolbarpaletteitem > .nav-bar-class {
+  margin-inline-end: 0px;
+  border-inline-end: 2px solid #A2AFBD;
+  padding-inline-end: 3px;
+}
+
+.nav-bar-last:-moz-locale-dir(rtl),
+.nav-bar-first:-moz-locale-dir(ltr),
+toolbarpaletteitem > .nav-bar-class:-moz-locale-dir(rtl),
+toolbarpaletteitem > .nav-bar-class:-moz-locale-dir(ltr) {
+  border-bottom-left-radius: 3px;
+  border-top-left-radius: 3px;
+}
+
+.nav-bar-last:-moz-locale-dir(ltr),
+.nav-bar-first:-moz-locale-dir(rtl),
+toolbarpaletteitem > .nav-bar-class:-moz-locale-dir(ltr),
+toolbarpaletteitem > .nav-bar-class:-moz-locale-dir(rtl) {
+  border-bottom-right-radius: 3px;
+  border-top-right-radius: 3px;
+}
+
+toolbar[mode="text"] > .nav-bar-class,
+toolbar[iconsize="small"] > .nav-bar-class,
+toolbar[mode="text"] > toolbarpaletteitem > .nav-bar-class,
+toolbar[iconsize="small"] > toolbarpaletteitem > .nav-bar-class {
+  margin: 0 !important;
+  padding: 0 !important;
+  border: none !important;
+}
+
+toolbar[mode="text"] #search-button {
+  margin-inline-end: 0px;
+}
+
+#search-button > .button-box > .button-icon {
+  display: -moz-box;
+}
+
+toolbar[mode="text"] #search-button > .button-box > .button-icon,
+toolbar[mode="icons"] #search-button > .button-box > .button-text {
+  display: none;
+}
+
+#wrapper-nav-bar-inner[place="palette"] > #nav-bar-inner
+  > .button-toolbar,
+#wrapper-nav-bar-inner[place="palette"] > #nav-bar-inner
+  > #urlbar > .urlbar-icons {
+  display: none;
+}
+
+/* ::::: urlbar - the url textbox ::::: */
+
+.searchbar-textbox,
+#urlbar {
+  margin-top: 2px;
+  margin-bottom: 2px;
+  margin-inline-start: 3px;
+  margin-inline-end: 6px;
+  padding: 3px;
+  border: 1px solid #000000;
+  background-color: #EDF5F7;
+  box-shadow: inset 0px -2px #E9F3F6;
+}
+
+#urlbar[level="high"] {
+  background-color: #E8DB99;
+  box-shadow: none;
+}
+
+#urlbar-search-splitter {
+  min-width: 6px;
+  margin: 0 -3px;
+  border: none;
+  background-color: transparent;
+}
+
+/* ::::: notification popups ::::: */
+
+.popup-notification-icon {
+  width: 64px;
+  height: 64px;
+  margin-inline-end: 10px;
+}
+
+.popup-notification-icon[popupid="geolocation"] {
+  list-style-image: url("chrome://communicator/skin/icons/geolocation-64.png");
+}
+
+.popup-notification-icon[popupid="persistent-storage"] {
+  list-style-image: url("chrome://communicator/skin/icons/notification-icons.svg#persistent-storage");
+}
+
+.popup-notification-icon[popupid="web-notifications"] {
+  list-style-image: url("chrome://communicator/skin/icons/notification-64.png");
+}
+
+.popup-notification-icon[popupid="addon-install-disabled"],
+.popup-notification-icon[popupid="addon-install-blocked"],
+.popup-notification-icon[popupid="addon-install-started"],
+.popup-notification-icon[popupid="addon-install-cancelled"],
+.popup-notification-icon[popupid="addon-install-failed"],
+.popup-notification-icon[popupid="addon-install-complete"],
+.popup-notification-icon[popupid="lwtheme-install-request"],
+.popup-notification-icon[popupid="lwtheme-install-notification"] {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric.png");
+  width: 32px;
+  height: 32px;
+}
+
+.popup-notification-icon[popupid="indexedDB-permissions-prompt"],
+.popup-notification-icon[popupid="indexedDB-quota-prompt"] {
+  list-style-image: url("chrome://global/skin/icons/question-64.png");
+}
+
+.popup-notification-icon[popupid="password"] {
+  list-style-image: url("chrome://mozapps/skin/passwordmgr/key-64.png");
+}
+
+.addon-progress-description {
+  width: 350px;
+  max-width: 350px;
+}
+
+/* Notification icon box */
+#notification-popup-box {
+  margin-inline-end: 3px;
+}
+
+.notification-anchor-icon:-moz-focusring {
+  outline: 1px dotted;
+}
+
+#default-notification-icon {
+  list-style-image: url("chrome://global/skin/icons/information-16.png");
+  width: 16px;
+  height: 16px;
+}
+
+#geo-notification-icon {
+  list-style-image: url("chrome://communicator/skin/icons/geolocation-16.png");
+  width: 16px;
+  height: 16px;
+}
+
+#web-notifications-notification-icon {
+  width: 16px;
+  height: 16px;
+  list-style-image: url("chrome://communicator/skin/icons/notification-16.png");
+}
+
+#addons-notification-icon {
+  list-style-image: url("chrome://mozapps/skin/extensions/extensionGeneric-16.png");
+  width: 16px;
+  height: 16px;
+}
+
+#indexedDB-notification-icon {
+  list-style-image: url("chrome://global/skin/icons/question-16.png");
+  width: 16px;
+  height: 16px;
+}
+
+#password-notification-icon {
+  list-style-image: url("chrome://mozapps/skin/passwordmgr/key-16.png");
+  width: 16px;
+  height: 16px;
+}
+
+.center-item-box {
+  padding: 8px 16px 0px 16px;
+}
+
+.center-item-box[padbottom="true"] {
+  padding-bottom: 8px;
+}
+
+.center-item-icon {
+  background-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
+  background-repeat: no-repeat;
+  height: 16px;
+  width: 16px;
+  margin-bottom: 4px;
+}
+
+.center-item-box[warn="true"] {
+  background-image: url("chrome://mozapps/skin/plugins/pluginGeneric-16.png");
+  background-repeat: repeat-x;
+  padding: 8px 16px 6px 16px;
+}
+
+.center-item-box[padbottom="true"][warn="true"] {
+  padding-bottom: 4px;
+}
+
+.center-item-box[showseparator="true"] {
+  border-top: 1px solid #B1BBC5;
+}
+
+.center-item-box[warn="false"] > .center-item-warning {
+  display: none;
+}
+
+.center-item-warning > .text-link[href=""] {
+  display: none;
+}
+
+.center-item-warning-icon {
+  background-image: url("chrome://mozapps/skin/extensions/alerticon-info-negative.png");
+  background-repeat: no-repeat;
+  width: 16px;
+  height: 15px;
+  margin-bottom: 4px;
+}
+
+.center-item-warning-description {
+  color: #828282;
+}
+
+.center-item-button {
+  min-width: 0px;
+}
+
+/* ::::: page proxy icon ::::: */
+
+#page-proxy-deck,
+#page-proxy-button,
+#page-proxy-favicon {
+  width: 16px;
+  height: 16px;
+}
+
+#page-proxy-deck {
+  cursor: grab;
+  margin-inline-end: 4px;
+}
+
+#page-proxy-button {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg"); 
+} 
+
+#page-proxy-favicon {
+  list-style-image: none;
+} 
+
+#page-proxy-button[pageproxystate="invalid"] {
+  cursor: default;
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item-dis.png"); 
+}
+
+/* ::::: autocomplete ::::: */
+
+#PopupAutoComplete > richlistbox > richlistitem {
+  height: 20px;
+  min-height: 20px;
+  border: 0;
+  border-radius: 0;
+  padding: 0px 1px 0px 1px;
+}
+
+#PopupAutoComplete > richlistbox > richlistitem > .ac-title {
+  font: icon;
+  margin-inline-start: 6px;
+}
+
+#PopupAutoComplete > richlistbox {
+  padding: 0;
+}
+
+.autocomplete-treebody::-moz-tree-cell-text(value) {
+  padding-inline-start: 15px;
+}
+
+.autocomplete-treebody::-moz-tree-cell-text(comment) {
+  color: #555566;
+}
+
+.autocomplete-search-box {
+  border-top: 2px groove #DDE3EB;
+  background-color: #DDE3EB;
+}
+
+panel[nomatch="true"] > .autocomplete-search-box {
+  border-top: 1px solid #E4EAEF;
+}
+
+.autocomplete-search-engine {
+  padding: 2px;
+}
+
+.autocomplete-search-engine[menuactive="true"] {
+  background-color: #9499AC;
+  color: #FFFFFF;
+}
+
+.autocomplete-search-engine-img {
+  margin-inline-end: 4px;
+  width: 16px;
+  height: 16px;
+}
+
+.autocomplete-history-dropmarker {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-inline-start: 0px;
+  margin-inline-end: 3px;
+  list-style-image: url("chrome://navigator/skin/toolbar/ubhist-arrow.png");
+}
+
+.autocomplete-history-dropmarker[open="true"] {
+  list-style-image: url("chrome://navigator/skin/toolbar/ubhist-arrow-act.png");
+}
+
+.autocomplete-treebody::-moz-tree-cell-text(treecolAutoCompleteComment) {
+  color: #999999;
+}
+
+/* ::::: go and searchbuttons ::::: */
+
+#go-button,
+#search-button {
+  margin-top: 0px;
+  margin-bottom: 0px;
+  margin-inline-start: 0px;
+  margin-inline-end: 4px;
+  min-width: 0px;
+  font: message-box;
+  font-weight: bold;
+}
+
+#search-button {
+  list-style-image: url("chrome://global/skin/icons/search.png");
+}
+
+/* ::::: navigator throbber ::::: */
+
+.toolbar-primary #throbber-box {
+  margin: 0px 0px 2px;
+}
+
+/* ::::: personal toolbar ::::: */
+
+#PersonalToolbar {
+  background: url("chrome://global/skin/toolbar/tb-mid.png") #C7D0D9 repeat-x top;
+}
+
+#PersonalToolbar > .toolbar-box > toolbargrippy,
+#PersonalToolbar > .toolbar-box > .toolbar-holder {
+  border-top: 1px solid #CED6DD;
+  border-right: 1px solid #95A0AD;
+  border-bottom: 1px solid #95A0AD;
+  border-left: 1px solid #DAE3ED;
+}
+
+#PersonalToolbar > .toolbar-box > toolbargrippy:hover:active {
+  border-color: #67737E;
+}
+
+toolbarbutton.chevron {
+  list-style-image: url("chrome://global/skin/toolbar/chevron.png") !important;
+}
+
+toolbarbutton.chevron > .toolbarbutton-menu-dropmarker {
+  display: none;
+}
+
+toolbarbutton.chevron > .toolbarbutton-text {
+  display: none; /* hide chevron label which has a width even if blank */
+}
+
+toolbar[mode="text"] toolbarbutton.chevron > .toolbarbutton-icon {
+  display: -moz-box; /* display chevron icon in text mode */
+}
+
+/* Prevent [mode="icons"|"text"] from hiding the label and icon */
+#PlacesToolbarItems .bookmark-item > .toolbarbutton-text,
+#PlacesToolbarItems .bookmark-item > .toolbarbutton-icon {
+  display: -moz-box !important;
+}
+
+#PersonalToolbar[iconsize="small"] > toolbarpaletteitem > #home-button > .toolbarbutton-icon,
+#PersonalToolbar[iconsize="small"] > #home-button > .toolbarbutton-icon {
+  width: 16px;
+  height: 16px;
+}
+
+#PersonalToolbar > #home-button {
+  cursor: pointer;
+}
+
+#PersonalToolbar > #home-button:hover {
+  text-decoration: underline;
+}
+
+#PersonalToolbar > #home-button[disabled="true"] {
+  cursor: default !important;
+  text-decoration: none !important;
+}
+
+/*
+  In customize mode we hide the normal bookmark items and show a placeholder
+  for the drag/drop UI.
+*/
+.bookmarks-toolbar-customize {
+  list-style-image: url("chrome://communicator/skin/places/bookmarksToolbar.png");
+  display: none;
+  max-width: 15em !important;
+}
+
+#wrapper-personal-bookmarks[place="palette"] > .toolbarpaletteitem-box {
+  width: 16px;
+  height: 16px;
+  background: url("chrome://communicator/skin/places/bookmarksToolbar.png") no-repeat;
+}
+
+/* ::::: content area ::::: */
+
+#content {
+  border-bottom: 1px solid #494F5D;
+}
+
+#status-bar {
+  border-top: none;
+  min-width: 1px;
+}
+
+#security-button[level="high"] > .statusbarpanel-contentbox {
+  background-color: #B4CD32;
+}
+
+#security-button[level="broken"] > .statusbarpanel-contentbox {
+  background-color: #E83404;
+}
+
+#security-button[label] > .statusbarpanel-contentbox {
+  background-color: #62C441;
+}
+
+#security-button > .statusbarpanel-contentbox > .statusbarpanel-text {
+  margin: 0px;
+  color: #FFFFFF;
+}
+
+#ev-button {
+  list-style-image: url("chrome://communicator/skin/icons/identity.png");
+}
+
+#popupIcon {
+  list-style-image: url("chrome://navigator/skin/icons/popup-blocked.png");
+}
+
+#invalid-form-popup {
+  border: 1px solid #000000;
+  padding: 2px 3px 0px 3px;
+  max-width: 40em;
+  background-color: #FFFFE7;
+  color: #000000;
+  font: message-box;
+  font-weight: bold;
+}
+
+/* ::::: star button ::::: */
+
+#star-button {
+  list-style-image: url("chrome://communicator/skin/places/bookmark.png");
+  -moz-image-region: rect(16px 16px 32px 0px);
+}
+
+#star-button:hover {
+  -moz-image-region: rect(16px 32px 32px 16px);
+}
+
+#star-button:hover:active {
+  -moz-image-region: rect(16px 48px 32px 32px);
+}
+
+#star-button[starred="true"] {
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+#star-button[starred="true"]:hover {
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#star-button[starred="true"]:hover:active {
+  -moz-image-region: rect(0px 48px 16px 32px);
+}
+
+#editBookmarkPanelStarIcon {
+  list-style-image: url("chrome://communicator/skin/places/bookmark.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+/* ::::: feeds ::::: */
+
+.feedsMenu {
+  list-style-image: url("chrome://navigator/skin/btn1/feeds.png");
+  -moz-image-region: rect(0px 16px 16px 0px);
+}
+
+.feedsMenu[_moz-menuactive="true"] {
+  -moz-image-region: rect(16px 16px 32px 0px);
+}
+
+.feedsMenu[disabled="true"] {
+  -moz-image-region: rect(32px 16px 48px 0px);
+}
+
+.feedsMenu[open="true"] {
+  -moz-image-region: rect(48px 16px 64px 0px);
+}
+
+#feedsButton {
+  list-style-image: url("chrome://navigator/skin/btn1/feeds.png");
+  -moz-image-region: rect(0px 32px 16px 16px);
+}
+
+#feedsButton:hover {
+  -moz-image-region: rect(16px 32px 32px 16px);
+}
+
+/* Need to set fixed width to stop the zoom display from changing size and moving around the zoom buttons */
+#zoomLevel-display {
+  width: 60px;
+  max-width: 60px;
+  margin-left: 0px;
+  margin-right: 0px;
+}
+
+.zoom-button-align{
+  padding-bottom: 3px;
+}
diff --git a/comm/suite/themes/modern/navigator/pageInfo.css b/comm/suite/themes/modern/navigator/pageInfo.css
new file mode 100644
index 0000000000..2406f9aab9
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/pageInfo.css
@@ -0,0 +1,122 @@
+/* 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/. */
+
+@import "chrome://global/skin/global.css";
+
+/* Misc */
+tree {
+  margin: .5em;
+}
+
+.gridSeparator {
+  width: .5em;
+}
+
+textbox {
+  background: transparent !important;
+  border: none;
+  padding: 0px;
+  -moz-user-focus: none;
+}
+
+textbox.header {
+  margin-inline-start: 0;
+}
+
+textbox.meta-properties {
+  margin-top: 1px;
+}
+
+.iframe {
+  margin: .5em;
+  background: white;
+  overflow: auto;
+}
+
+.fixedsize {
+  height: 8.5em;
+}
+
+textbox[disabled] {
+  font-style: italic;
+}
+
+/* General Tab */
+#general-security-identity {
+  white-space: pre-wrap;
+  line-height: 2em;
+}
+
+/* Media Tab */
+#imagetree {
+  min-height: 10em;
+}
+
+#mediaGrid {
+  min-height: 9em;
+}
+
+#mediaLabelColumn {
+  min-width: 10em;
+}
+
+#thepreviewimage {
+  margin: 1em;
+}
+
+treechildren::-moz-tree-cell-text(broken) {
+  font-style: italic;
+  color: #999999;
+}
+
+/* Feeds Tab */
+#feedListbox > richlistitem {
+  padding: 6px 7px;
+  min-height: 25px;
+  border-bottom: 1px dotted #C7D0D9;
+}
+
+.feedTitle { 
+  font-weight: bold;
+}
+
+/* Permissions Tab */
+#permList {
+  margin-top: .5em;
+  overflow: auto;
+}
+
+.permission {
+  padding-top: 6px;
+  padding-bottom: 6px;
+  padding-inline-start: 7px;
+  padding-inline-end: 7px;
+  min-height: 25px;
+  border-bottom: 1px dotted #C7D0D9;
+}
+
+.permissionLabel {
+  font-weight: bold;
+}
+
+/* Security Tab */
+.fieldValue {
+  font-weight: bold;
+}
+
+#identity-icon {
+  width: 64px;
+  height: 64px;
+  max-height: 64px;
+  list-style-image: url("chrome://navigator/skin/icons/identity.png");
+  -moz-image-region: rect(0px, 64px, 64px, 0px);
+}
+
+#identity-icon.verifiedDomain {
+  -moz-image-region: rect(64px, 64px, 128px, 0px);
+}
+
+#identity-icon.verifiedIdentity {
+  -moz-image-region: rect(128px, 64px, 192px, 0px);
+}
diff --git a/comm/suite/themes/modern/navigator/tabbrowser.css b/comm/suite/themes/modern/navigator/tabbrowser.css
new file mode 100644
index 0000000000..817e110e7a
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/tabbrowser.css
@@ -0,0 +1,155 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* ::::: tabs ::::: */
+
+.tabbrowser-strip {
+  padding-bottom: 3px;
+  border-bottom: 1px solid #000000;
+}
+
+.tabbrowser-tabs {
+  padding-top: 1px;
+}
+
+.tabs-left {
+  width: 3px;
+}
+
+tab {
+  padding: 0px 3px;
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+}
+
+tab[busy] {
+  list-style-image: url("chrome://communicator/skin/icons/loading.png");
+}
+
+.tab-icon {
+  margin-inline-end: 3px;
+  width: 16px;
+  height: 16px;
+}
+
+/* ::::: Tab scrollbox arrow, and all-tabs buttons ::::: */
+
+.scrollbutton-up,
+.scrollbutton-down,
+.tabs-alltabs-button {
+  margin: 0px;
+  border-bottom: 1px solid #000000;
+}
+
+.scrollbutton-up:not([disabled="true"]):-moz-locale-dir(ltr),
+.scrollbutton-down:not([disabled="true"]):-moz-locale-dir(rtl) {
+  border-right: 1px solid #000000;
+}
+
+.scrollbutton-up:not([disabled="true"]):-moz-locale-dir(rtl),
+.scrollbutton-down:not([disabled="true"]):-moz-locale-dir(ltr) {
+  border-left: 1px solid #000000;
+}
+
+.scrollbutton-down {
+  transition: background-color 1s ease-out;
+}
+
+.scrollbutton-down:hover,
+.scrollbutton-down[notifybgtab="true"],
+.scrollbutton-down[disabled="true"] {
+  transition: none;
+}
+
+.scrollbutton-down[notifybgtab="true"] {
+  background-color: #8C9AA8;
+}
+
+.scrollbutton-up:not([disabled="true"]):hover,
+.scrollbutton-down:not([disabled="true"]):hover {
+  border-color: #EEF0F3;
+}
+
+.scrollbutton-up:not([disabled="true"]):hover:active,
+.scrollbutton-down:not([disabled="true"]):hover:active {
+  border-color: #86929E;
+  background-color: #8C9AA8;
+}
+
+.tabs-alltabs-button > .toolbarbutton-icon {
+  margin: 0px;
+}
+
+/* All tabs menupopup */
+.alltabs-item {
+  list-style-image: url("chrome://communicator/skin/places/bookmark-item.svg");
+}
+
+.alltabs-item[selected="true"] {
+  font-weight: bold;
+}
+
+.alltabs-item[busy] {
+  list-style-image: url("chrome://communicator/skin/icons/loading.png");
+}
+
+.alltabs-item[tabIsScrolled] {
+  font-style: italic;
+}
+
+/* ::::: close button ::::: */
+
+.tabs-closebutton {
+  margin: 0px 4px;
+  padding: 3px 2px;
+  border: none;
+  list-style-image: url("chrome://global/skin/icons/close.png");
+}
+
+.tabs-closebutton:hover {
+  list-style-image: url("chrome://global/skin/icons/close-hov.png");
+}
+
+.tabs-closebutton:hover:active {
+  list-style-image: url("chrome://global/skin/icons/close-act.png");
+}
+
+.tabs-closebutton[disabled="true"] {
+  padding: 3px 2px !important;
+  list-style-image: url("chrome://global/skin/icons/close-dis.png") !important;
+}
+
+.tabs-newbutton {
+  margin: 0px;
+  padding-top: 2px;
+  padding-bottom: 3px;
+  padding-inline-start: 2px;
+  padding-inline-end: 0px;
+  border: none;
+  list-style-image: url("chrome://navigator/skin/icons/tab-new.png");
+}
+
+.tabs-newbutton:hover {
+  list-style-image: url("chrome://navigator/skin/icons/tab-new-hov.png");
+}
+
+.tabs-newbutton:hover:active {
+  list-style-image: url("chrome://navigator/skin/icons/tab-new-act.png");
+}
+
+.tab-drop-indicator-bar {
+    height: 11px;
+    margin-top: -11px;
+    margin-inline-start: -6px;
+    position: relative;
+}
+
+.tab-drop-indicator {
+    height: 11px;
+    width: 11px;
+    margin-bottom: -5px;
+    position: relative;
+    list-style-image: url('chrome://navigator/skin/icons/tab-drag-indicator.png');
+}
diff --git a/comm/suite/themes/modern/navigator/toolbar/ubhist-arrow-act.png b/comm/suite/themes/modern/navigator/toolbar/ubhist-arrow-act.png
new file mode 100644
index 0000000000..92cf956d94
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/toolbar/ubhist-arrow-act.png
diff --git a/comm/suite/themes/modern/navigator/toolbar/ubhist-arrow.png b/comm/suite/themes/modern/navigator/toolbar/ubhist-arrow.png
new file mode 100644
index 0000000000..f6da257004
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/toolbar/ubhist-arrow.png
diff --git a/comm/suite/themes/modern/navigator/webDeveloper.css b/comm/suite/themes/modern/navigator/webDeveloper.css
new file mode 100644
index 0000000000..185f7b38ba
--- /dev/null
+++ b/comm/suite/themes/modern/navigator/webDeveloper.css
@@ -0,0 +1,205 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+@namespace html url("http://www.w3.org/1999/xhtml");
+
+/* Mostly copied from mozilla/devtools/client/themes/commandline.inc.css  */
+/* Developer Tools */
+
+/* Developer toolbar */
+
+/* NOTE: THESE NEED TO STAY IN SYNC WITH LIGHT-THEME.CSS AND DARK-THEME.CSS.
+   We are copy/pasting variables from light-theme and dark-theme,
+   since they aren't loaded in this context (within browser.css). */
+#developer-toolbar[devtoolstheme="light"] {
+  --gcli-background-color: #ebeced; /* --theme-tab-toolbar-background */
+  --gcli-input-background: #f0f1f2; /* --theme-toolbar-background */
+  --gcli-input-focused-background: #f7f7f7; /* --theme-sidebar-background */
+  --gcli-input-color: #18191a; /* --theme-body-color */
+  --gcli-border-color: #aaaaaa; /* --theme-splitter-color */
+  --selection-background: #4c9ed9; /* --theme-selection-background */
+  --selection-color: #f5f7fa; /* --theme-selection-color */
+}
+
+#developer-toolbar[devtoolstheme="dark"] {
+  --gcli-background-color: #343c45; /* --theme-toolbar-background */
+  --gcli-input-background: rgba(37, 44, 51, .6); /* --theme-tab-toolbar-background */
+  --gcli-input-focused-background: #252c33; /* --theme-tab-toolbar-background */
+  --gcli-input-color: #b6babf; /* --theme-body-color-alt */
+  --gcli-border-color: #000000; /* --theme-splitter-color */
+  --selection-background: #1d4f73; /* --theme-selection-background */
+  --selection-color: #f5f7fa; /* --theme-selection-color */
+}
+
+#developer-toolbar {
+  padding: 0;
+  background-color: var(--gcli-background-color);
+  border-top: 1px solid var(--gcli-border-color);
+}
+
+#developer-toolbar[devtoolstheme="light"] .gclitoolbar-input-node:not([focused=true])::before  {
+  filter: invert(1);
+}
+
+#developer-toolbar-toolbox-button {
+  list-style-image: url("chrome://devtools/skin/images/toggle-tools.png");
+  -moz-image-region: rect(0px, 64px, 16px, 48px);
+}
+
+#developer-toolbar-toolbox-button:hover > .toolbarbutton-icon {
+  filter: brightness(120%);
+}
+
+#developer-toolbar-toolbox-button:hover:active > .toolbarbutton-icon {
+  filter: saturate(150%);
+}
+
+#developer-toolbar-toolbox-button[checked=true] > .toolbarbutton-icon {
+  filter: hue-rotate(180deg);
+}
+
+@media (min-resolution: 1.1dppx) {
+  #developer-toolbar-toolbox-button {
+    list-style-image: url("chrome://devtools/skin/images/toggle-tools@2x.png");
+    -moz-image-region: rect(0px, 128px, 32px, 96px);
+  }
+}
+
+/* Error counter */
+
+#developer-toolbar-toolbox-button[error-count]:before {
+  color: white;
+  min-width: 16px;
+  text-shadow: none;
+  background-color: firebrick;
+  border-radius: 2px;
+  margin-inline-end: 2px;
+/*
+  Firefox browser/themes/windows/browser.css
+  color: #FDF3DE;
+  min-width: 16px;
+  text-shadow: none;
+  background-image: linear-gradient(#B4211B, #8A1915);
+  border-radius: 1px;
+  margin-inline-end: 5px;
+  Firefox browser/themes/linux/browser.css
+  color: #FDF3DE;
+  min-width: 16px;
+  text-shadow: none;
+  background-image: linear-gradient(#B4211B, #8A1915);
+  border-radius: 1px;
+  margin-inline-end: 2px;
+*/
+}
+
+/* GCLI */
+
+html|*#gcli-tooltip-frame,
+html|*#gcli-output-frame {
+  padding: 0;
+  border-width: 0;
+  background-color: transparent;
+}
+
+#gcli-output,
+#gcli-tooltip {
+  border-width: 0;
+  background-color: transparent;
+  -moz-appearance: none;
+}
+
+.gclitoolbar-input-node,
+.gclitoolbar-complete-node {
+  -moz-box-align: center;
+  padding-top: 0;
+  padding-bottom: 0;
+  padding-right: 8px;
+  text-shadow: none;
+  box-shadow: none;
+  background-color: transparent;
+}
+
+.gclitoolbar-input-node {
+  -moz-appearance: none;
+  color: var(--gcli-input-color);
+  background-color: var(--gcli-input-background);
+  background-repeat: no-repeat;
+  background-position: 4px center;
+  box-shadow: 1px 0 0 var(--gcli-border-color) inset,
+              -1px 0 0 var(--gcli-border-color) inset;
+  outline-style: none;
+  padding: 0;
+}
+
+.gclitoolbar-input-node[focused="true"] {
+  background-color: var(--gcli-input-focused-background);
+}
+
+.gclitoolbar-input-node::before {
+  content: "";
+  display: inline-block;
+  -moz-box-ordinal-group: 0;
+  width: 16px;
+  height: 16px;
+  margin: 0 2px;
+  background-image: url("chrome://devtools/skin/images/commandline-icon.png");
+  background-position: 0 center;
+  background-size: 32px 16px;
+}
+
+.gclitoolbar-input-node[focused="true"]::before {
+  background-position: -16px center;
+}
+
+@media (min-resolution: 1.1dppx) {
+  .gclitoolbar-input-node::before {
+    background-image: url("chrome://devtools/skin/images/commandline-icon@2x.png");
+  }
+}
+
+.gclitoolbar-input-node > .textbox-input-box > html|*.textbox-input::-moz-selection {
+  background-color: var(--selection-background);
+  color: var(--selection-color);
+  text-shadow: none;
+}
+
+.gclitoolbar-complete-node {
+  padding-left: 21px;
+  background-color: transparent;
+  color: transparent;
+  z-index: 100;
+  pointer-events: none;
+}
+
+.gcli-in-incomplete,
+.gcli-in-error,
+.gcli-in-ontab,
+.gcli-in-todo,
+.gcli-in-closebrace,
+.gcli-in-param,
+.gcli-in-valid {
+  margin: 0;
+  padding: 0;
+}
+
+.gcli-in-incomplete {
+  border-bottom: 2px dotted #999;
+}
+
+.gcli-in-error {
+  border-bottom: 2px dotted #F00;
+}
+
+.gcli-in-ontab {
+  color: hsl(210,0%,35%);
+}
+
+.gcli-in-todo {
+  color: hsl(210,50%,35%);
+}
+
+.gcli-in-closebrace {
+  color: hsl(0,0%,80%);
+}
diff --git a/comm/suite/themes/modern/preview.png b/comm/suite/themes/modern/preview.png
new file mode 100644
index 0000000000..df9a736b17
--- /dev/null
+++ b/comm/suite/themes/modern/preview.png
diff --git a/comm/suite/themes/modern/shared/datetimeinputpickers.css b/comm/suite/themes/modern/shared/datetimeinputpickers.css
new file mode 100644
index 0000000000..510a19d98b
--- /dev/null
+++ b/comm/suite/themes/modern/shared/datetimeinputpickers.css
@@ -0,0 +1,438 @@
+/* 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/. */
+
+/*
+ * - Arrows and the month+year toggle at the top are now styled as
+ *   buttons - properties for buttons were mostly replaced with
+ *   rulesets copied from modern's button.css.
+ *
+ * - Other colors changed to match those used in modern. */
+
+:root {
+  --font-size-default: 1.1rem;
+  --spinner-width: 3rem;
+  --spinner-margin-top-bottom: 0.4rem;
+  --spinner-item-height: 2.4rem;
+  --spinner-item-margin-bottom: 0.1rem;
+  --spinner-button-height: 1.2rem;
+  --colon-width: 2rem;
+  --day-period-spacing-width: 1rem;
+  --calendar-width: 23.1rem;
+  --date-picker-item-height: 2.5rem;
+  --date-picker-item-width: 3.3rem;
+  --nav-arrow-button-width: 2.8rem;
+
+  /* Used for selected and hovered items */
+  --border-radius: 2px;
+
+  --font-color: #000000;
+
+  /* hovered items: colors from menu.css */
+  --fill-color: #424f63;
+  --hover-font-color: #FFFFFF;
+  
+  /* --today-fill-color is var(--mmDayTodayBackground) from lightning,
+   see chrome://calendar-common/skin/widgets/minimonth.css */
+  --today-fill-color: #dfeaf4;
+  --today-border: 0.1rem solid #000000;
+
+  /* currently selected/chosen item */
+  --selected-font-color: #FFFFFF;
+  --selected-fill-color: #0996F8;
+
+  /* from button.css */
+  --button-font-color: #000000;
+  --button-fill-color: #AAB6C4;
+  --button-font-color-active: #FFFFFF;
+  --button-fill-color-active: #90A1B3;
+
+  --weekday-header-font-color: #6C6C6C;
+  --weekend-header-font-color: rgb(218, 78, 68);
+
+  --weekend-font-color: rgb(218, 78, 68);
+  --weekday-outside-font-color: rgb(153, 153, 153);
+  --weekend-outside-font-color: rgb(255, 152, 143);
+
+  --weekday-disabled-font-color: rgba(25, 25, 25, 0.2);
+  --weekend-disabled-font-color: rgba(218, 78, 68, 0.2);
+  --disabled-fill-color: rgba(235, 235, 235, 0.8);
+
+  --disabled-opacity: 0.2;
+}
+
+html {
+  font-size: 10px;
+}
+
+body {
+  margin: 0;
+  color: var(--font-color);
+  font: message-box;
+  font-size: var(--font-size-default);
+}
+/* The two following rulesets (buttons and active buttons) were copied
+   from modern's button.css (with modifications). */
+button {
+  margin: 2px;
+  border: 3px solid;
+  -moz-border-top-colors:  #000000 #BBC6D1 #B1BBC9;
+  -moz-border-right-colors: #000000 #A2AEBB #A7B4C1;
+  -moz-border-bottom-colors: #000000 #97A6B6 #9DAAB9;
+  -moz-border-left-colors:  #000000 #BBC6D1 #B1BBC9;
+  border-radius: 2px;
+  background-color: var(--button-fill-color);
+  background-clip: padding-box;
+  color: var(--button-font-color);
+  font: menu;
+}
+
+button:active,
+button.active {
+  -moz-border-top-colors:  #000000 #8290A5 #899AAC;
+  -moz-border-right-colors:  #000000 #8290A5 #899AAC;
+  -moz-border-bottom-colors:  #000000 #8290A5 #899AAC;
+  -moz-border-left-colors:  #000000 #8290A5 #899AAC;
+  background-color: var(--button-fill-color-active);
+  color: var(--button-font-color-active);
+}
+
+
+.nav {
+  display: flex;
+  width: var(--calendar-width);
+  height: 2.4rem;
+  margin-bottom: 0.8rem;
+  justify-content: space-between;
+}
+
+.nav > button {
+  width: var(--nav-arrow-button-width);
+  height: var(--date-picker-item-height);
+  -moz-context-properties: fill;
+  fill: var(--button-font-color);
+}
+
+.nav > button.active {
+  fill: var(--button-font-color-active);
+}
+
+.nav > button.prev,
+.nav > button.next:dir(rtl) {
+  background-image: url("chrome://global/skin/icons/calendar-arrow-left.svg");
+  background-repeat: no-repeat;
+  background-position: 50% 50%;
+}
+
+.nav > button.next,
+.nav > button.prev:dir(rtl) {
+  background-image: url("chrome://global/skin/icons/calendar-arrow-right.svg");
+  background-repeat: no-repeat;
+  background-position: 50% 50%;
+}
+
+.month-year-container {
+  position: absolute;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  top: 0;
+  /* .nav arrow buttons have a width of --nav-arrow-button-width as well
+     as 2px margins. The following three properties take this into
+     account to avoid overlapping these buttons and to align them
+     vertically. */
+  left: var(--nav-arrow-button-width);
+  right: var(--nav-arrow-button-width);
+  margin: 2px 4px;
+  height: var(--date-picker-item-height);
+  z-index: 10;
+}
+
+button.month-year {
+  font-size: 1.3rem;
+  padding-inline-start: 0.5rem;
+  padding-inline-end: 1.1rem;
+  min-height: var(--date-picker-item-height);
+  width: 100%;
+}
+
+
+button.month-year::after {
+  position: absolute;
+  content: "";
+  width: 2.6rem;
+  height: 1.6rem;
+  background: url("chrome://global/skin/icons/spinner-arrow-down.svg") no-repeat 50% 50%;
+  -moz-context-properties: fill;
+  fill: var(--button-font-color);
+}
+
+button.month-year.active::after {
+  background: url("chrome://global/skin/icons/spinner-arrow-up.svg") no-repeat 50% 50%;
+  fill: var(--button-font-color-active);
+}
+
+.month-year-view {
+  position: absolute;
+  z-index: 5;
+  padding-top: 3.2rem;
+  top: 0;
+  left: 0;
+  bottom: 0;
+  width: var(--calendar-width);
+  background: #DDE3EB;
+  opacity: 1;
+/*  transition: opacity 0.15s; */
+}
+
+.month-year-view.hidden {
+  visibility: hidden;
+  opacity: 0;
+}
+
+.month-year-view > .spinner-container {
+  width: 5.5rem;
+  margin: 0 0.5rem;
+}
+
+/*.month-year-view .spinner {
+  transform: scaleY(1);
+  transform-origin: top;
+  transition: transform 0.15s;
+}
+
+.month-year-view.hidden .spinner {
+  transform: scaleY(0);
+  transition: none;
+}
+
+.month-year-view .spinner > div {
+  transform: scaleY(1);
+  transition: transform 0.15s;
+}
+
+.month-year-view.hidden .spinner > div {
+  transform: scaleY(2.5);
+  transition: none;
+}*/
+
+.order-month-year > #spinner-month,
+.order-year-month > #spinner-year {
+  order: 1;
+}
+
+.order-month-year > #spinner-year,
+.order-year-month > #spinner-month {
+  order: 2;
+}
+
+.calendar-container {
+  cursor: default;
+  display: flex;
+  flex-direction: column;
+  width: var(--calendar-width);
+}
+
+.week-header {
+  display: flex;
+}
+
+.week-header > div {
+  color: var(--weekday-header-font-color);
+}
+
+.week-header > div.weekend {
+  color: var(--weekend-header-font-color);
+}
+
+.days-viewport {
+  height: 15rem;
+  overflow: hidden;
+  position: relative;
+}
+
+.days-view {
+  position: absolute;
+  display: flex;
+  flex-wrap: wrap;
+  flex-direction: row;
+}
+
+.week-header > div,
+.days-view > div {
+  align-items: center;
+  display: flex;
+  height: var(--date-picker-item-height);
+  position: relative;
+  justify-content: center;
+  width: var(--date-picker-item-width);
+}
+
+.days-view > .outside {
+  color: var(--weekday-outside-font-color);
+}
+
+.days-view > .weekend {
+  color: var(--weekend-font-color);
+}
+
+.days-view > .weekend.outside {
+  color: var(--weekend-outside-font-color);
+}
+
+.days-view > .out-of-range,
+.days-view > .off-step {
+  color: var(--weekday-disabled-font-color);
+  background: var(--disabled-fill-color);
+}
+
+.days-view > .out-of-range.weekend,
+.days-view > .off-step.weekend {
+  color: var(--weekend-disabled-font-color);
+}
+
+.days-view > .today {
+  font-weight: bold;
+}
+
+.days-view > .out-of-range::before,
+.days-view > .off-step::before {
+  display: none;
+}
+
+.days-view > div:hover::before,
+.days-view > .select::before,
+.days-view > .today::before {
+  top: 5%;
+  bottom: 5%;
+  left: 5%;
+  right: 5%;
+}
+
+#time-picker,
+.month-year-view {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+}
+
+.spinner-container {
+  display: flex;
+  flex-direction: column;
+  width: var(--spinner-width);
+}
+
+.spinner-container > button {
+  height: var(--spinner-button-height);
+  -moz-context-properties: fill;
+  fill: var(--button-font-color);
+}
+
+.spinner-container > button.active {
+  fill: var(--button-font-color-active);
+}
+
+.spinner-container > button.up {
+  background-image: url("chrome://global/skin/icons/spinner-arrow-up.svg");
+  background-repeat: no-repeat;
+  background-position: 50% 50%;
+}
+
+.spinner-container > button.down {
+  background-image: url("chrome://global/skin/icons/spinner-arrow-down.svg");
+  background-repeat: no-repeat;
+  background-position: 50% 50%;
+}
+
+.spinner-container.hide-buttons > button {
+  visibility: hidden;
+}
+
+.spinner-container > .spinner {
+  position: relative;
+  width: 100%;
+  margin: var(--spinner-margin-top-bottom) 0;
+  cursor: default;
+  overflow-y: scroll;
+  scroll-snap-type: mandatory;
+  scroll-snap-points-y: repeat(100%);
+}
+
+.spinner-container > .spinner > div {
+  box-sizing: border-box;
+  position: relative;
+  text-align: center;
+  padding: calc((var(--spinner-item-height) - var(--font-size-default)) / 2) 0;
+  margin-bottom: var(--spinner-item-margin-bottom);
+  height: var(--spinner-item-height);
+  -moz-user-select: none;
+  scroll-snap-coordinate: 0 0;
+}
+
+.spinner-container > .spinner > div::before,
+.calendar-container .days-view > div::before {
+  position: absolute;
+  top: 5%;
+  bottom: 5%;
+  left: 5%;
+  right: 5%;
+  z-index: -10;
+  border-radius: var(--border-radius);
+}
+
+.calendar-container .days-view > div:hover,
+.spinner-container > .spinner > div:hover {
+  color: var(--hover-font-color);
+}
+.calendar-container .days-view > div.today:hover::before {
+  background: var(--fill-color);
+  color: var(--hover-font-color);   
+}
+.spinner-container > .spinner > div:hover::before,
+.calendar-container .days-view > div:hover::before,
+.spinner-container > .spinner > div.selection:hover::before,
+.calendar-container .days-view > div.selection:hover::before{
+  background: var(--fill-color);
+  color: var(--hover-font-color);
+  content: "";
+}
+
+.calendar-container .days-view > div.today::before {
+  background: var(--today-fill-color);
+  border: var(--today-border);
+  content: "";
+}
+
+.spinner-container > .spinner:not(.scrolling) > div.selection,
+.calendar-container .days-view > div.selection {
+  color: var(--selected-font-color);
+}
+
+.spinner-container > .spinner > div.selection::before,
+.calendar-container .days-view > div.selection::before {
+  background: var(--selected-fill-color);
+  border: none;
+  content: "";
+}
+
+.spinner-container > .spinner > div.disabled::before,
+.spinner-container > .spinner.scrolling > div.selection::before,
+.spinner-container > .spinner.scrolling > div:hover::before {
+  display: none;
+}
+
+.spinner-container > .spinner > div.disabled {
+  opacity: var(--disabled-opacity);
+}
+
+.colon {
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  width: var(--colon-width);
+  margin-bottom: 0.3rem;
+}
+
+.spacer {
+  width: var(--day-period-spacing-width);
+}
diff --git a/comm/suite/themes/modern/shared/datetimepopup.css b/comm/suite/themes/modern/shared/datetimepopup.css
new file mode 100644
index 0000000000..52f6fc7a2d
--- /dev/null
+++ b/comm/suite/themes/modern/shared/datetimepopup.css
@@ -0,0 +1,11 @@
+/* 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/. */
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+panel[type="arrow"][side="top"],
+panel[type="arrow"][side="bottom"] {
+  margin-left: 0;
+  margin-right: 0;
+}
diff --git a/comm/suite/themes/modern/shared/icons/calendar-arrow-left.svg b/comm/suite/themes/modern/shared/icons/calendar-arrow-left.svg
new file mode 100644
index 0000000000..3ff50f1e85
--- /dev/null
+++ b/comm/suite/themes/modern/shared/icons/calendar-arrow-left.svg
@@ -0,0 +1,7 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="14" height="14" viewBox="0 0 14 14">
+  <path fill="context-fill" d="M9.2 0L11 1.7 5.5 7 11 12.3 9.2 14 2 7"/>
+</svg>
diff --git a/comm/suite/themes/modern/shared/icons/calendar-arrow-right.svg b/comm/suite/themes/modern/shared/icons/calendar-arrow-right.svg
new file mode 100644
index 0000000000..0b4978713f
--- /dev/null
+++ b/comm/suite/themes/modern/shared/icons/calendar-arrow-right.svg
@@ -0,0 +1,7 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="14" height="14" viewBox="0 0 14 14">
+  <path fill="context-fill" d="M4.8 14L3 12.3 8.5 7 3 1.7 4.8 0 12 7"/>
+</svg>
diff --git a/comm/suite/themes/modern/shared/icons/input-clear.svg b/comm/suite/themes/modern/shared/icons/input-clear.svg
new file mode 100644
index 0000000000..0abaaf9b1f
--- /dev/null
+++ b/comm/suite/themes/modern/shared/icons/input-clear.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+ <!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 12 12">
+  <style>
+    .st0 {
+      fill: #858585;
+    }
+    .st1 {
+      fill: #FFFFFF;
+    }
+  </style>
+  <circle id="Combined-Shape" class="st0" cx="6" cy="6" r="6"/>
+  <polygon id="Close_Button_-_Normal-path" class="st1" points="9,8.1 8.1,9 6,6.9 3.9,9 3,8.1 5.1,6 3,3.9 3.9,3 6,5.1 8.1,3 9,3.9 6.9,6"/>
+</svg>
diff --git a/comm/suite/themes/modern/shared/icons/spinner-arrow-down.svg b/comm/suite/themes/modern/shared/icons/spinner-arrow-down.svg
new file mode 100644
index 0000000000..420f8a3f2d
--- /dev/null
+++ b/comm/suite/themes/modern/shared/icons/spinner-arrow-down.svg
@@ -0,0 +1,7 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="10" height="6" viewBox="0 0 10 6">
+  <path fill="context-fill" d="M0 1l1-1 4 4 4-4 1 1-5 5"/>
+</svg>
diff --git a/comm/suite/themes/modern/shared/icons/spinner-arrow-up.svg b/comm/suite/themes/modern/shared/icons/spinner-arrow-up.svg
new file mode 100644
index 0000000000..6ce9923b48
--- /dev/null
+++ b/comm/suite/themes/modern/shared/icons/spinner-arrow-up.svg
@@ -0,0 +1,7 @@
+<!-- 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/. -->
+<svg xmlns="http://www.w3.org/2000/svg"
+     width="10" height="6" viewBox="0 0 10 6">
+  <path fill="context-fill" d="M0 5l1 1 4-4 4 4 1-1-5-5"/>
+</svg>