Bug 1504187 - Make all trees themeable with the WX-theme sidebar colors. r=jorgk
authorRichard Marti <richard.marti@gmail.com>
Wed, 26 Sep 2018 22:29:11 +0200
changeset 33651 e2d7001a1a8720b15e5f4f3e28143d38ea7fda7e
parent 33650 5036ddd23dc36c9d642e771f5d4ee010060b84e2
child 33652 d4e98be4fc0b4bbc5f65149e874048b600daf21e
push id388
push userclokep@gmail.com
push dateMon, 28 Jan 2019 20:54:56 +0000
reviewersjorgk
bugs1504187
Bug 1504187 - Make all trees themeable with the WX-theme sidebar colors. r=jorgk
mail/components/addrbook/content/addressbook.xul
mail/components/im/themes/chat.css
mail/themes/linux/mail/addrbook/addressbook.css
mail/themes/linux/mail/mailWindow1.css
mail/themes/linux/mail/messageIcons.css
mail/themes/linux/mail/messenger.css
mail/themes/osx/mail/addrbook/addressbook.css
mail/themes/osx/mail/mailWindow1.css
mail/themes/osx/mail/messageIcons.css
mail/themes/osx/mail/messenger.css
mail/themes/osx/mail/tagColors.css
mail/themes/shared/mail/addressbook.css
mail/themes/shared/mail/messenger.css
mail/themes/windows/mail/addrbook/addressbook.css
mail/themes/windows/mail/mailWindow1.css
mail/themes/windows/mail/messageIcons.css
mail/themes/windows/mail/messenger.css
mail/themes/windows/mail/tagColors.css
mailnews/base/src/nsMsgDBView.cpp
--- a/mail/components/addrbook/content/addressbook.xul
+++ b/mail/components/addrbook/content/addressbook.xul
@@ -684,17 +684,17 @@
                    crop="center" persist="width" ignoreincolumnpicker="true"/>
         </treecols>
         <treechildren/>
       </tree>
     </vbox>
 
     <splitter id="dirTree-splitter" collapse="before" persist="state"/>
 
-    <vbox flex="1" minwidth="100">
+    <vbox id="abResultsBox" flex="1" minwidth="100">
       <description id="localResultsOnlyMessage"
                    value="&localResultsOnlyMessage.label;"/>
       <vbox id="blankResultsPaneMessageBox"
             flex="1" pack="center" align="center">
         <description id="blankResultsPaneMessage"
                      value="&blankResultsPaneMessage.label;"/>
       </vbox>
       <!-- results pane -->
--- a/mail/components/im/themes/chat.css
+++ b/mail/components/im/themes/chat.css
@@ -843,8 +843,63 @@ toolbar[mode="text"] #statusTypeIcon > .
 
 #button-join-chat {
   list-style-image: url("chrome://messenger/skin/icons/join.svg");
 }
 
 #button-chat-accounts {
   list-style-image: url("chrome://messenger/skin/icons/accounts.svg");
 }
+
+:root[lwt-tree] #contextPane {
+  background-color: var(--sidebar-background-color);
+  border-bottom: 1px solid var(--sidebar-border-color, hsla(0,0%,60%,.4));
+  color: var(--sidebar-text-color);
+}
+
+:root[lwt-tree] #nicklist,
+:root[lwt-tree] .conv-nicklist-header,
+:root[lwt-tree] .conv-logs-header-label {
+  background-color: var(--sidebar-background-color);
+  border-bottom-color: var(--sidebar-border-color, hsla(0,0%,60%,.4));
+  color: var(--sidebar-text-color);
+}
+
+:root[lwt-tree-brighttext] #nicklist,
+:root[lwt-tree-brighttext] .conv-nicklist-header,
+:root[lwt-tree-brighttext] .conv-logs-header-label {
+  border-bottom-color: var(--sidebar-border-color, rgba(249,249,250,.2));
+}
+
+:root[lwt-tree] #participantCount {
+  color: var(--sidebar-text-color);
+}
+
+:root[lwt-tree] .conv-nicklist.theme-listbox > richlistitem {
+  color: var(--sidebar-text-color);
+  box-shadow: none;
+}
+
+:root[lwt-tree] .conv-nicklist.theme-listbox > richlistitem[selected="true"],
+:root[lwt-tree] .conv-nicklist.theme-listbox:focus > richlistitem[current="true"],
+:root[lwt-tree] .conv-nicklist.theme-listbox:focus > richlistitem[selected="true"] {
+  background-color: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
+  background-image: none;
+  border-color: var(--sidebar-border-color, hsla(0,0%,80%,.3));
+  color: var(--sidebar-highlight-text-color, var(--sidebar-text-color));
+}
+
+:root[lwt-tree-brighttext] .conv-nicklist.theme-listbox > richlistitem[selected="true"],
+:root[lwt-tree-brighttext] .conv-nicklist.theme-listbox:focus > richlistitem[current="true"],
+:root[lwt-tree-brighttext] .conv-nicklist.theme-listbox:focus > richlistitem[selected="true"] {
+  background-color: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
+  border-color: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
+}
+
+:root[lwt-tree] .conv-nicklist.theme-listbox > richlistitem[inactive]:not([selected]) > label {
+  color: var(--sidebar-text-color) !important;
+  opacity: .5;
+}
+
+:root[lwt-tree] #nicklist > richlistitem[inactive][selected] > label,
+:root[lwt-tree] #nicklist:focus > richlistitem[inactive][selected] > label {
+  color: var(--sidebar-highlight-text-color, var(--sidebar-text-color)) !important;
+}
--- a/mail/themes/linux/mail/addrbook/addressbook.css
+++ b/mail/themes/linux/mail/addrbook/addressbook.css
@@ -29,48 +29,16 @@
 #abDirTreeHeader-title {
   padding-inline-start: 4px;
 }
 
 #dirTree:not(:-moz-lwtheme) {
   border-bottom: 1px solid ThreeDShadow;
 }
 
-:root[lwt-tree] #dirTree {
-  background-color: var(--sidebar-background-color);
-  scrollbar-color: rgba(204,204,204,.5) rgba(230,230,235,.5);
-}
-
-:root[lwt-tree-brighttext] #dirTree {
-  scrollbar-color: rgba(249,249,250,.4) rgba(20,20,25,.3);
-}
-
-:root[lwt-tree] #dirTree treechildren::-moz-tree-image,
-:root[lwt-tree] #dirTree treechildren::-moz-tree-twisty,
-:root[lwt-tree] #dirTree treechildren::-moz-tree-cell-text {
-  color: var(--sidebar-text-color);
-}
-
-:root[lwt-tree] #dirTree treechildren::-moz-tree-row(selected) {
-  border-color: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
-  background: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
-}
-
-:root[lwt-tree-brighttext] #dirTree treechildren::-moz-tree-row(selected) {
-  border-color: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
-  background: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
-}
-
-:root[lwt-tree] #dirTree treechildren::-moz-tree-image(selected),
-:root[lwt-tree] #dirTree treechildren::-moz-tree-twisty(selected),
-:root[lwt-tree] #dirTree treechildren::-moz-tree-cell-text(selected) {
-
-  color: var(--sidebar-highlight-text-color, var(--sidebar-text-color));
-}
-
 /* ::::: splitters ::::: */
 
 #dirTree-splitter {
   -moz-appearance: none;
   border-inline-end: 1px solid ThreeDShadow;
   /* splitter grip area */
   width: 4px;
   /* make only the splitter border visible */
@@ -120,17 +88,17 @@
   margin-top: 2px;
   margin-bottom: 2px;
   padding: 0 8px;
 }
 
 #CardTitle {
   font-size: 150%;
   font-weight: bold;
-  border-bottom: 2px solid -moz-FieldText;
+  border-bottom: 2px solid currentColor;
   min-width: 120px;
   margin: 0px;
 }
 
 .cardViewGroup {
   margin-top: 8px;
   padding-bottom: 5px;
   min-width: 50px;
--- a/mail/themes/linux/mail/mailWindow1.css
+++ b/mail/themes/linux/mail/mailWindow1.css
@@ -57,82 +57,16 @@ treechildren::-moz-tree-row(dummy, selec
 treechildren::-moz-tree-cell-text(dummy) {
   font-weight: bold;
 }
 
 #correspondentCol {
   padding-inline-start: 17px;
 }
 
-:root[lwt-tree] #folderTree,
-:root[lwt-tree] #folderPane-toolbar {
-  background-color: var(--sidebar-background-color);
-  color: var(--sidebar-text-color);
-}
-
-:root[lwt-tree] #folderTree {
-  scrollbar-color: rgba(204,204,204,.5) rgba(230,230,235,.5);
-}
-
-:root[lwt-tree-brighttext] #folderTree {
-  scrollbar-color: rgba(249,249,250,.4) rgba(20,20,25,.3);
-}
-
-:root[lwt-tree] #folderPane-toolbar {
-  border-bottom-color: var(--sidebar-border-color, hsla(0,0%,60%,.4));
-}
-
-:root[lwt-tree-brighttext] #folderPane-toolbar {
-  border-bottom-color: var(--sidebar-border-color, rgba(249,249,250,.2));
-}
-
-:root[lwt-tree] #folderTree treechildren::-moz-tree-row(odd) {
-  background-color: transparent;
-}
-
-:root[lwt-tree] #folderTree treechildren::-moz-tree-image,
-:root[lwt-tree] #folderTree treechildren::-moz-tree-twisty,
-:root[lwt-tree] #folderTree treechildren::-moz-tree-cell-text {
-  color: var(--sidebar-text-color);
-}
-
-:root[lwt-tree] #folderTree treechildren::-moz-tree-row(selected) {
-  border-color: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
-  background: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
-}
-
-:root[lwt-tree-brighttext] #folderTree treechildren::-moz-tree-row(selected) {
-  border-color: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
-  background: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
-}
-
-:root[lwt-tree] #folderTree treechildren::-moz-tree-image(selected),
-:root[lwt-tree] #folderTree treechildren::-moz-tree-twisty(selected),
-:root[lwt-tree] #folderTree treechildren::-moz-tree-cell-text(selected) {
-  color: var(--sidebar-highlight-text-color, var(--sidebar-text-color));
-}
-
-:root[lwt-tree] #folderTree[hidecolumnpicker="false"] treecol,
-:root[lwt-tree] #folderTree[hidecolumnpicker="false"] treecolpicker {
-  -moz-appearance: none;
-  color: inherit;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  border-bottom: 1px solid var(--sidebar-border-color, hsla(0,0%,60%,.4));
-}
-
-:root[lwt-tree] #folderTree treecol {
-  border-inline-end: 1px solid var(--sidebar-border-color, hsla(0,0%,60%,.4));
-}
-
-:root[lwt-tree-brighttext] #folderTree treecol,
-:root[lwt-tree-brighttext] #folderTree treecolpicker {
-  border-color: var(--sidebar-border-color, rgba(249,249,250,.2));
-}
-
 /* ..... folder pane adjustments ..... */
 
 #folderPane-toolbar {
   min-height: 24px;
   border-bottom: 1px solid ThreeDShadow;
 }
 
 /* ..... splitter adjustments ..... */
--- a/mail/themes/linux/mail/messageIcons.css
+++ b/mail/themes/linux/mail/messageIcons.css
@@ -1,29 +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/. */
 
-/* ::::: message column icons ::::: */
-
-.treecol-image image {
-  -moz-context-properties: fill;
-  fill: currentColor;
-}
-
-treecol.treecol-image:hover:active {
-  padding-inline-start: 1px;
-}
-
-/* ..... column picker ..... */
-
-.tree-columnpicker-icon  {
-  list-style-image: url(chrome://messenger/skin/icons/columnpicker.svg);
-}
-
 /* ..... thread column ..... */
 
 .threadColumnHeader {
   list-style-image: url(chrome://messenger/skin/icons/thread-col.svg);
   padding-inline-end: 1px;
 }
 
 treechildren::-moz-tree-image(threadCol, container) {
--- a/mail/themes/linux/mail/messenger.css
+++ b/mail/themes/linux/mail/messenger.css
@@ -483,16 +483,51 @@ sidebarheader .toolbarbutton-text:not([v
 
 #alltabs-button,
 #tabbar-toolbar .toolbarbutton-1,
 #tabbar-toolbar .toolbarbutton-1[type="menu-button"] {
   margin-top: 3px;
   margin-bottom: 3px;
 }
 
+/* message column icons */
+
+.treecol-image image {
+  -moz-context-properties: fill;
+  fill: currentColor;
+}
+
+treecol.treecol-image:hover:active {
+  padding-inline-start: 1px;
+}
+
+:root[lwt-tree] treecol:not([hideheader="true"]),
+:root[lwt-tree] treecolpicker:not([hideheader="true"]) {
+  padding-inline-start: 7px;
+  padding-inline-end: 6px;
+}
+
+:root[lwt-tree] treechildren::-moz-tree-row(odd) {
+  background-color: transparent;
+}
+
+:root[lwt-tree] #threadTree treechildren::-moz-tree-row(untagged, selected),
+:root[lwt-tree] tree:not(#threadTree) treechildren::-moz-tree-row(selected),
+:root[lwt-tree]:-moz-window-inactive #threadTree treechildren::-moz-tree-row(selected) {
+  border-color: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
+  background: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
+}
+
+:root[lwt-tree-brighttext] #threadTree treechildren::-moz-tree-row(untagged, selected),
+:root[lwt-tree-brighttext] tree:not(#threadTree) treechildren::-moz-tree-row(selected),
+:root[lwt-tree-brighttext]:-moz-window-inactive #threadTree treechildren::-moz-tree-row(selected) {
+  border-color: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
+  background: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
+}
+
 /* Stock icons for the menu bar items */
 menuitem:not([type]) {
   -moz-binding: url("chrome://global/content/bindings/menu.xml#menuitem-iconic");
 }
 
 #menu_New {
   -moz-binding: url("chrome://global/content/bindings/menu.xml#menu-iconic");
   list-style-image: url("moz-icon://stock/gtk-new?size=menu");
--- a/mail/themes/osx/mail/addrbook/addressbook.css
+++ b/mail/themes/osx/mail/addrbook/addressbook.css
@@ -97,47 +97,16 @@
   }
 
   treechildren::-moz-tree-image(DirCol, IsRemote-true, IsSecure-true) {
     list-style-image: url("chrome://messenger/skin/addressbook/icons/addressbook@2x.png");
     -moz-image-region: rect(0px 128px 32px 96px);
   }
 }
 
-:root[lwt-tree] #dirTree {
-  background-color: var(--sidebar-background-color);
-  scrollbar-color: rgba(249,249,250,.4) rgba(20,20,25,.3);
-}
-
-:root[lwt-tree-brighttext] #dirTree {
-  scrollbar-color: rgba(249,249,250,.4) rgba(20,20,25,.3);
-}
-
-:root[lwt-tree] #dirTree treechildren::-moz-tree-image,
-:root[lwt-tree] #dirTree treechildren::-moz-tree-twisty,
-:root[lwt-tree] #dirTree treechildren::-moz-tree-cell-text {
-  color: var(--sidebar-text-color);
-}
-
-:root[lwt-tree] #dirTree treechildren::-moz-tree-row(selected) {
-  border-color: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
-  background: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
-}
-
-:root[lwt-tree-brighttext] #dirTree treechildren::-moz-tree-row(selected) {
-  border-color: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
-  background: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
-}
-
-:root[lwt-tree] #dirTree treechildren::-moz-tree-image(selected),
-:root[lwt-tree] #dirTree treechildren::-moz-tree-twisty(selected),
-:root[lwt-tree] #dirTree treechildren::-moz-tree-cell-text(selected) {
-  color: var(--sidebar-highlight-text-color, var(--sidebar-text-color));
-}
-
 /* ::::: splitters ::::: */
 
 splitter {
   background-color: transparent;
   width: 7px;
   min-width: 7px;
   min-height: 7px;
 }
--- a/mail/themes/osx/mail/mailWindow1.css
+++ b/mail/themes/osx/mail/mailWindow1.css
@@ -78,78 +78,16 @@
   }
 
   #folderTree treechildren::-moz-tree-twisty(selected, focus),
   #folderTree treechildren::-moz-tree-cell-text(selected, focus) {
     color: #282828;
   }
 }
 
-:root[lwt-tree] #folderTree,
-:root[lwt-tree] #folderPane-toolbar {
-  background: var(--sidebar-background-color);
-  color: var(--sidebar-text-color);
-}
-
-:root[lwt-tree] #folderTree {
-  scrollbar-color: rgba(204,204,204,.5) rgba(230,230,235,.5);
-}
-
-:root[lwt-tree-brighttext] #folderTree {
-  scrollbar-color: rgba(249,249,250,.4) rgba(20,20,25,.3);
-}
-
-:root[lwt-tree] #folderPane-toolbar {
-  border-bottom-color: var(--sidebar-border-color, hsla(0,0%,60%,.4));
-}
-
-:root[lwt-tree-brighttext] #folderPane-toolbar {
-  border-bottom-color: var(--sidebar-border-color, rgba(249,249,250,.2));
-}
-
-:root[lwt-tree] #folderTree treechildren::-moz-tree-image,
-:root[lwt-tree] #folderTree treechildren::-moz-tree-twisty,
-:root[lwt-tree] #folderTree treechildren::-moz-tree-cell-text {
-  color: var(--sidebar-text-color);
-}
-
-:root[lwt-tree] #folderTree treechildren::-moz-tree-row(selected) {
-  border-color: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
-  background: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
-}
-
-:root[lwt-tree-brighttext] #folderTree treechildren::-moz-tree-row(selected) {
-  border-color: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
-  background: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
-}
-
-:root[lwt-tree] #folderTree treechildren::-moz-tree-image(selected),
-:root[lwt-tree] #folderTree treechildren::-moz-tree-twisty(selected),
-:root[lwt-tree] #folderTree treechildren::-moz-tree-cell-text(selected) {
-  color: var(--sidebar-highlight-text-color, var(--sidebar-text-color));
-}
-
-:root[lwt-tree] #folderTree[hidecolumnpicker="false"] treecol,
-:root[lwt-tree] #folderTree[hidecolumnpicker="false"] treecolpicker {
-  -moz-appearance: none;
-  color: inherit;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  border-bottom: 1px solid var(--sidebar-border-color, hsla(0,0%,60%,.4));
-}
-
-:root[lwt-tree] #folderTree treecol {
-  border-inline-end: 1px solid var(--sidebar-border-color, hsla(0,0%,60%,.4));
-}
-
-:root[lwt-tree-brighttext] #folderTree treecol,
-:root[lwt-tree-brighttext] #folderTree treecolpicker {
-  border-color: var(--sidebar-border-color, rgba(249,249,250,.2));
-}
-
 /* ::::: group rows ::::: */
 
 treechildren::-moz-tree-row(dummy)  {
   background-image: url("chrome://messenger/skin/icons/group-background.gif");
   background-repeat: repeat-x;
   background-color: rgb(246, 246, 246);
   border: 1px solid rgb(197, 199, 202);
   margin: 0 1px;
--- a/mail/themes/osx/mail/messageIcons.css
+++ b/mail/themes/osx/mail/messageIcons.css
@@ -1,19 +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/. */
 
 /* ..... thread column ..... */
 
-.treecol-image image {
-  -moz-context-properties: fill;
-  fill: currentColor;
-}
-
 .threadColumnHeader {
   list-style-image: url(chrome://messenger/skin/icons/thread-col.svg);
 }
 
 treechildren::-moz-tree-image(threadCol, container) {
   list-style-image: url(chrome://messenger/skin/icons/threadpane-col.png);
   -moz-image-region: rect(0 16px 16px 0);
 }
@@ -38,16 +33,17 @@ treechildren::-moz-tree-image(threadCol,
   padding-inline-end: 3px;
 }
 
 treechildren::-moz-tree-image(unreadButtonColHeader) {
   list-style-image: url(chrome://messenger/skin/icons/threadpane-col.png);
   -moz-image-region: rect(0 48px 16px 32px);
 }
 
+:root[lwt-tree-brighttext] treechildren::-moz-tree-image(unreadButtonColHeader),
 treechildren::-moz-tree-image(unreadButtonColHeader, focus, selected) {
   -moz-image-region: rect(16px 48px 32px 32px);
 }
 
 treechildren::-moz-tree-image(unreadButtonColHeader, unread) {
   list-style-image: url(chrome://messenger/skin/icons/unreadmail.png) !important;
   -moz-image-region: auto !important;
 }
@@ -100,16 +96,17 @@ treechildren::-moz-tree-image(attachment
   padding-left: 3px;
 }
 
 treechildren::-moz-tree-image(flaggedCol) {
   list-style-image: url(chrome://messenger/skin/icons/threadpane-col.png);
   -moz-image-region: rect(0 48px 16px 32px);
 }
 
+:root[lwt-tree-brighttext] treechildren::-moz-tree-image(flaggedCol),
 treechildren::-moz-tree-image(flaggedCol, focus, selected) {
   -moz-image-region: rect(16px 48px 32px 32px);
 }
 
 treechildren::-moz-tree-image(flaggedCol, flagged) {
   -moz-image-region: rect(0 80px 16px 64px);
 }
 
@@ -213,22 +210,16 @@ treechildren::-moz-tree-image(threadCol,
   -moz-image-region: auto !important;
 }
 
 treechildren::-moz-tree-image(threadCol, ignoreSubthread) {
   list-style-image: url(chrome://messenger/skin/icons/message-closed-kill.png) !important;
   -moz-image-region: auto !important;
 }
 
-/* ..... column picker ..... */
-
-.tree-columnpicker-icon  {
-  list-style-image: url(chrome://messenger/skin/icons/columnpicker.svg);
-}
-
 @media (min-resolution: 2dppx) {
   treechildren::-moz-tree-image(threadCol, container) {
     list-style-image: url(chrome://messenger/skin/icons/threadpane-col@2x.png);
     -moz-image-region: rect(0 32px 32px 0);
   }
 
   treechildren::-moz-tree-image(threadCol, container, focus, selected) {
     -moz-image-region: rect(32px 32px 64px 0);
--- a/mail/themes/osx/mail/messenger.css
+++ b/mail/themes/osx/mail/messenger.css
@@ -536,16 +536,45 @@ tabmail > tabbox {
 treechildren::-moz-tree-row {
   min-height: 19px;
 }
 
 treechildren::-moz-tree-cell-text {
   padding-inline-start: 2px;
 }
 
+/* message column icons */
+
+.treecol-image image {
+  -moz-context-properties: fill;
+  fill: currentColor;
+}
+
+treecol.treecol-image:hover:active {
+  padding-inline-start: 1px;
+}
+
+:root[lwt-tree] treechildren::-moz-tree-row(odd) {
+  background-color: transparent;
+}
+
+:root[lwt-tree] #threadTree treechildren::-moz-tree-row(untagged, selected),
+:root[lwt-tree] tree:not(#threadTree) treechildren::-moz-tree-row(selected),
+:root[lwt-tree]:-moz-window-inactive #threadTree treechildren::-moz-tree-row(selected) {
+  border-color: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
+  background: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
+}
+
+:root[lwt-tree-brighttext] #threadTree treechildren::-moz-tree-row(untagged, selected),
+:root[lwt-tree-brighttext] tree:not(#threadTree) treechildren::-moz-tree-row(selected),
+:root[lwt-tree-brighttext]:-moz-window-inactive #threadTree treechildren::-moz-tree-row(selected) {
+  border-color: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
+  background: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
+}
+
 /* ::::: Notifications ::::: */
 
 notification[value="addon-install-blocked"] > button,
 notification[value="addon-install-failed"] > button,
 notification[value="addon-install-complete"] > button {
   padding: 1px 4px;
   border-radius: var(--toolbarbutton-border-radius);
   border: 1px solid rgba(60, 73, 97, 0.5);
--- a/mail/themes/osx/mail/tagColors.css
+++ b/mail/themes/osx/mail/tagColors.css
@@ -13,710 +13,710 @@
      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), .blc-FFFFFF {
-  background-color: #FFFFFF;
+  background-color: #FFFFFF !important;
 }
 .blc-FFFFFF {
   border-color: #FFFFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-CCCCCC), .lc-CCCCCC:not([_moz-menuactive]) {
   color: #CCCCCC
 }
 treechildren::-moz-tree-row(lc-CCCCCC, selected, focus), .blc-CCCCCC {
-  background-color: #CCCCCC;
+  background-color: #CCCCCC !important;
 }
 .blc-CCCCCC {
   border-color: #CCCCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-C0C0C0), .lc-C0C0C0:not([_moz-menuactive]) {
   color: #C0C0C0
 }
 treechildren::-moz-tree-row(lc-C0C0C0, selected, focus), .blc-C0C0C0 {
-  background-color: #C0C0C0;
+  background-color: #C0C0C0 !important;
 }
 .blc-C0C0C0 {
   border-color: #C0C0C0;
 }
 
 treechildren::-moz-tree-cell-text(lc-999999), .lc-999999:not([_moz-menuactive]) {
   color: #999999
 }
 treechildren::-moz-tree-row(lc-999999, selected, focus), .blc-999999 {
-  background-color: #999999;
+  background-color: #999999 !important;
 }
 .blc-999999 {
   border-color: #999999;
 }
 
 treechildren::-moz-tree-cell-text(lc-666666), .lc-666666:not([_moz-menuactive]) {
   color: #666666
 }
 treechildren::-moz-tree-row(lc-666666, selected, focus), .blc-666666 {
-  background-color: #666666;
+  background-color: #666666 !important;
 }
 .blc-666666 {
   border-color: #666666;
 }
 
 treechildren::-moz-tree-cell-text(lc-333333), .lc-333333:not([_moz-menuactive]) {
   color: #333333
 }
 treechildren::-moz-tree-row(lc-333333, selected, focus), .blc-333333 {
-  background-color: #333333;
+  background-color: #333333 !important;
 }
 .blc-333333 {
   border-color: #333333;
 }
 
 treechildren::-moz-tree-cell-text(lc-000000), .lc-000000:not([_moz-menuactive]) {
   color: #000000
 }
 treechildren::-moz-tree-row(lc-000000, selected, focus), .blc-000000 {
   /* our assumed color is #111111 and !important is needed to override it */
   color: #FFFFFF !important;
   text-shadow: 0 1px 0 rgba(46,52,54,0.4) !important; /* Tango Alumninum 6 */
-  background-color: #000000;
+  background-color: #000000 !important;
 }
 .blc-000000 {
   border-color: #000000;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCCCC), .lc-FFCCCC:not([_moz-menuactive]) {
   color: #FFCCCC
 }
 treechildren::-moz-tree-row(lc-FFCCCC, selected, focus), .blc-FFCCCC {
-  background-color: #FFCCCC;
+  background-color: #FFCCCC !important;
 }
 .blc-FFCCCC {
   border-color: #FFCCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF6666), .lc-FF6666:not([_moz-menuactive]) {
   color: #FF6666
 }
 treechildren::-moz-tree-row(lc-FF6666, selected, focus), .blc-FF6666 {
-  background-color: #FF6666;
+  background-color: #FF6666 !important;
 }
 .blc-FF6666 {
   border-color: #FF6666;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF0000), .lc-FF0000:not([_moz-menuactive]) {
   color: #FF0000
 }
 treechildren::-moz-tree-row(lc-FF0000, selected, focus), .blc-FF0000 {
-  background-color: #FF0000;
+  background-color: #FF0000 !important;
 }
 .blc-FF0000 {
   border-color: #FF0000;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC0000), .lc-CC0000:not([_moz-menuactive]) {
   color: #CC0000
 }
 treechildren::-moz-tree-row(lc-CC0000, selected, focus), .blc-CC0000 {
-  background-color: #CC0000;
+  background-color: #CC0000 !important;
 }
 .blc-CC0000 {
   border-color: #CC0000;
 }
 
 treechildren::-moz-tree-cell-text(lc-990000), .lc-990000:not([_moz-menuactive]) {
   color: #990000
 }
 treechildren::-moz-tree-row(lc-990000, selected, focus), .blc-990000 {
-  background-color: #990000;
+  background-color: #990000 !important;
 }
 .blc-990000 {
   border-color: #990000;
 }
 
 treechildren::-moz-tree-cell-text(lc-660000), .lc-660000:not([_moz-menuactive]) {
   color: #660000
 }
 treechildren::-moz-tree-row(lc-660000, selected, focus), .blc-660000 {
-  background-color: #660000;
+  background-color: #660000 !important;
 }
 .blc-660000 {
   border-color: #660000;
 }
 
 treechildren::-moz-tree-cell-text(lc-330000), .lc-330000:not([_moz-menuactive]) {
   color: #330000
 }
 treechildren::-moz-tree-row(lc-330000, selected, focus), .blc-330000 {
-  background-color: #330000;
+  background-color: #330000 !important;
 }
 .blc-330000 {
   border-color: #330000;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCC99), .lc-FFCC99:not([_moz-menuactive]) {
   color: #FFCC99
 }
 treechildren::-moz-tree-row(lc-FFCC99, selected, focus), .blc-FFCC99 {
-  background-color: #FFCC99;
+  background-color: #FFCC99 !important;
 }
 .blc-FFCC99 {
   border-color: #FFCC99;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF9966), .lc-FF9966:not([_moz-menuactive]) {
   color: #FF9966
 }
 treechildren::-moz-tree-row(lc-FF9966, selected, focus), .blc-FF9966 {
-  background-color: #FF9966;
+  background-color: #FF9966 !important;
 }
 .blc-FF9966 {
   border-color: #FF9966;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF9900), .lc-FF9900:not([_moz-menuactive]) {
   color: #FF9900
 }
 treechildren::-moz-tree-row(lc-FF9900, selected, focus), .blc-FF9900 {
-  background-color: #FF9900;
+  background-color: #FF9900 !important;
 }
 .blc-FF9900 {
   border-color: #FF9900;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF6600), .lc-FF6600:not([_moz-menuactive]) {
   color: #FF6600
 }
 treechildren::-moz-tree-row(lc-FF6600, selected, focus), .blc-FF6600 {
-  background-color: #FF6600;
+  background-color: #FF6600 !important;
 }
 .blc-FF6600 {
   border-color: #FF6600;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC6600), .lc-CC6600:not([_moz-menuactive]) {
   color: #CC6600
 }
 treechildren::-moz-tree-row(lc-CC6600, selected, focus), .blc-CC6600 {
-  background-color: #CC6600;
+  background-color: #CC6600 !important;
 }
 .blc-CC6600 {
   border-color: #CC6600;
 }
 
 treechildren::-moz-tree-cell-text(lc-993300), .lc-993300:not([_moz-menuactive]) {
   color: #993300
 }
 treechildren::-moz-tree-row(lc-993300, selected, focus), .blc-993300 {
-  background-color: #993300;
+  background-color: #993300 !important;
 }
 .blc-993300 {
   border-color: #993300;
 }
 
 treechildren::-moz-tree-cell-text(lc-663300), .lc-663300:not([_moz-menuactive]) {
   color: #663300
 }
 treechildren::-moz-tree-row(lc-663300, selected, focus), .blc-663300 {
-  background-color: #663300;
+  background-color: #663300 !important;
 }
 .blc-663300 {
   border-color: #663300;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFF99), .lc-FFFF99:not([_moz-menuactive]) {
   color: #FFFF99
 }
 treechildren::-moz-tree-row(lc-FFFF99, selected, focus), .blc-FFFF99 {
-  background-color: #FFFF99;
+  background-color: #FFFF99 !important;
 }
 .blc-FFFF99 {
   border-color: #FFFF99;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFF66), .lc-FFFF66:not([_moz-menuactive]) {
   color: #FFFF66
 }
 treechildren::-moz-tree-row(lc-FFFF66, selected, focus), .blc-FFFF66 {
-  background-color: #FFFF66;
+  background-color: #FFFF66 !important;
 }
 .blc-FFFF66 {
   border-color: #FFFF66;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCC66), .lc-FFCC66:not([_moz-menuactive]) {
   color: #FFCC66
 }
 treechildren::-moz-tree-row(lc-FFCC66, selected, focus), .blc-FFCC66 {
-  background-color: #FFCC66;
+  background-color: #FFCC66 !important;
 }
 .blc-FFCC66 {
   border-color: #FFCC66;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCC33), .lc-FFCC33:not([_moz-menuactive]) {
   color: #FFCC33
 }
 treechildren::-moz-tree-row(lc-FFCC33, selected, focus), .blc-FFCC33 {
-  background-color: #FFCC33;
+  background-color: #FFCC33 !important;
 }
 .blc-FFCC33 {
   border-color: #FFCC33;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC9933), .lc-CC9933:not([_moz-menuactive]) {
   color: #CC9933
 }
 treechildren::-moz-tree-row(lc-CC9933, selected, focus), .blc-CC9933 {
-  background-color: #CC9933;
+  background-color: #CC9933 !important;
 }
 .blc-CC9933 {
   border-color: #CC9933;
 }
 
 treechildren::-moz-tree-cell-text(lc-996633), .lc-996633:not([_moz-menuactive]) {
   color: #996633
 }
 treechildren::-moz-tree-row(lc-996633, selected, focus), .blc-996633 {
-  background-color: #996633;
+  background-color: #996633 !important;
 }
 .blc-996633 {
   border-color: #996633;
 }
 
 treechildren::-moz-tree-cell-text(lc-663333), .lc-663333:not([_moz-menuactive]) {
   color: #663333
 }
 treechildren::-moz-tree-row(lc-663333, selected, focus), .blc-663333 {
-  background-color: #663333;
+  background-color: #663333 !important;
 }
 .blc-663333 {
   border-color: #663333;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFFCC), .lc-FFFFCC:not([_moz-menuactive]) {
   color: #FFFFCC
 }
 treechildren::-moz-tree-row(lc-FFFFCC, selected, focus), .blc-FFFFCC {
-  background-color: #FFFFCC;
+  background-color: #FFFFCC !important;
 }
 .blc-FFFFCC {
   border-color: #FFFFCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFF33), .lc-FFFF33:not([_moz-menuactive]) {
   color: #FFFF33
 }
 treechildren::-moz-tree-row(lc-FFFF33, selected, focus), .blc-FFFF33 {
-  background-color: #FFFF33;
+  background-color: #FFFF33 !important;
 }
 .blc-FFFF33 {
   border-color: #FFFF33;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFF00), .lc-FFFF00:not([_moz-menuactive]) {
   color: #FFFF00
 }
 treechildren::-moz-tree-row(lc-FFFF00, selected, focus), .blc-FFFF00 {
-  background-color: #FFFF00;
+  background-color: #FFFF00 !important;
 }
 .blc-FFFF00 {
   border-color: #FFFF00;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCC00), .lc-FFCC00:not([_moz-menuactive]) {
   color: #FFCC00
 }
 treechildren::-moz-tree-row(lc-FFCC00, selected, focus), .blc-FFCC00 {
-  background-color: #FFCC00;
+  background-color: #FFCC00 !important;
 }
 .blc-FFCC00 {
   border-color: #FFCC00;
 }
 
 treechildren::-moz-tree-cell-text(lc-999900), .lc-999900:not([_moz-menuactive]) {
   color: #999900
 }
 treechildren::-moz-tree-row(lc-999900, selected, focus), .blc-999900 {
-  background-color: #999900;
+  background-color: #999900 !important;
 }
 .blc-999900 {
   border-color: #999900;
 }
 
 treechildren::-moz-tree-cell-text(lc-666600), .lc-666600:not([_moz-menuactive]) {
   color: #666600
 }
 treechildren::-moz-tree-row(lc-666600, selected, focus), .blc-666600 {
-  background-color: #666600;
+  background-color: #666600 !important;
 }
 .blc-666600 {
   border-color: #666600;
 }
 
 treechildren::-moz-tree-cell-text(lc-333300), .lc-333300:not([_moz-menuactive]) {
   color: #333300
 }
 treechildren::-moz-tree-row(lc-333300, selected, focus), .blc-333300 {
-  background-color: #333300;
+  background-color: #333300 !important;
 }
 .blc-333300 {
   border-color: #333300;
 }
 
 treechildren::-moz-tree-cell-text(lc-99FF99), .lc-99FF99:not([_moz-menuactive]) {
   color: #99FF99
 }
 treechildren::-moz-tree-row(lc-99FF99, selected, focus), .blc-99FF99 {
-  background-color: #99FF99;
+  background-color: #99FF99 !important;
 }
 .blc-99FF99 {
   border-color: #99FF99;
 }
 
 treechildren::-moz-tree-cell-text(lc-66FF99), .lc-66FF99:not([_moz-menuactive]) {
   color: #66FF99
 }
 treechildren::-moz-tree-row(lc-66FF99, selected, focus), .blc-66FF99 {
-  background-color: #66FF99;
+  background-color: #66FF99 !important;
 }
 .blc-66FF99 {
   border-color: #66FF99;
 }
 
 treechildren::-moz-tree-cell-text(lc-33FF33), .lc-33FF33:not([_moz-menuactive]) {
   color: #33FF33
 }
 treechildren::-moz-tree-row(lc-33FF33, selected, focus), .blc-33FF33 {
-  background-color: #33FF33;
+  background-color: #33FF33 !important;
 }
 .blc-33FF33 {
   border-color: #33FF33;
 }
 
 treechildren::-moz-tree-cell-text(lc-33CC00), .lc-33CC00:not([_moz-menuactive]) {
   color: #33CC00
 }
 treechildren::-moz-tree-row(lc-33CC00, selected, focus), .blc-33CC00 {
-  background-color: #33CC00;
+  background-color: #33CC00 !important;
 }
 .blc-33CC00 {
   border-color: #33CC00;
 }
 
 treechildren::-moz-tree-cell-text(lc-009900), .lc-009900:not([_moz-menuactive]) {
   color: #009900
 }
 treechildren::-moz-tree-row(lc-009900, selected, focus), .blc-009900 {
-  background-color: #009900;
+  background-color: #009900 !important;
 }
 .blc-009900 {
   border-color: #009900;
 }
 
 treechildren::-moz-tree-cell-text(lc-006600), .lc-006600:not([_moz-menuactive]) {
   color: #006600
 }
 treechildren::-moz-tree-row(lc-006600, selected, focus), .blc-006600 {
-  background-color: #006600;
+  background-color: #006600 !important;
 }
 .blc-006600 {
   border-color: #006600;
 }
 
 treechildren::-moz-tree-cell-text(lc-003300), .lc-003300:not([_moz-menuactive]) {
   color: #003300
 }
 treechildren::-moz-tree-row(lc-003300, selected, focus), .blc-003300 {
-  background-color: #003300;
+  background-color: #003300 !important;
 }
 .blc-003300 {
   border-color: #003300;
 }
 
 treechildren::-moz-tree-cell-text(lc-99FFFF), .lc-99FFFF:not([_moz-menuactive]) {
   color: #99FFFF
 }
 treechildren::-moz-tree-row(lc-99FFFF, selected, focus), .blc-99FFFF {
-  background-color: #99FFFF;
+  background-color: #99FFFF !important;
 }
 .blc-99FFFF {
   border-color: #99FFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-33FFFF), .lc-33FFFF:not([_moz-menuactive]) {
   color: #33FFFF
 }
 treechildren::-moz-tree-row(lc-33FFFF, selected, focus), .blc-33FFFF {
-  background-color: #33FFFF;
+  background-color: #33FFFF !important;
 }
 .blc-33FFFF {
   border-color: #33FFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-66CCCC), .lc-66CCCC:not([_moz-menuactive]) {
   color: #66CCCC
 }
 treechildren::-moz-tree-row(lc-66CCCC, selected, focus), .blc-66CCCC {
-  background-color: #66CCCC;
+  background-color: #66CCCC !important;
 }
 .blc-66CCCC {
   border-color: #66CCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-00CCCC), .lc-00CCCC:not([_moz-menuactive]) {
   color: #00CCCC
 }
 treechildren::-moz-tree-row(lc-00CCCC, selected, focus), .blc-00CCCC {
-  background-color: #00CCCC;
+  background-color: #00CCCC !important;
 }
 .blc-00CCCC {
   border-color: #00CCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-339999), .lc-339999:not([_moz-menuactive]) {
   color: #339999
 }
 treechildren::-moz-tree-row(lc-339999, selected, focus), .blc-339999 {
-  background-color: #339999;
+  background-color: #339999 !important;
 }
 .blc-339999 {
   border-color: #339999;
 }
 
 treechildren::-moz-tree-cell-text(lc-336666), .lc-336666:not([_moz-menuactive]) {
   color: #336666
 }
 treechildren::-moz-tree-row(lc-336666, selected, focus), .blc-336666 {
-  background-color: #336666;
+  background-color: #336666 !important;
 }
 .blc-336666 {
   border-color: #336666;
 }
 
 treechildren::-moz-tree-cell-text(lc-003333), .lc-003333:not([_moz-menuactive]) {
   color: #003333
 }
 treechildren::-moz-tree-row(lc-003333, selected, focus), .blc-003333 {
-  background-color: #003333;
+  background-color: #003333 !important;
 }
 .blc-003333 {
   border-color: #003333;
 }
 
 treechildren::-moz-tree-cell-text(lc-CCFFFF), .lc-CCFFFF:not([_moz-menuactive]) {
   color: #CCFFFF
 }
 treechildren::-moz-tree-row(lc-CCFFFF, selected, focus), .blc-CCFFFF {
-  background-color: #CCFFFF;
+  background-color: #CCFFFF !important;
 }
 .blc-CCFFFF {
   border-color: #CCFFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-66FFFF), .lc-66FFFF:not([_moz-menuactive]) {
   color: #66FFFF
 }
 treechildren::-moz-tree-row(lc-66FFFF, selected, focus), .blc-66FFFF {
-  background-color: #66FFFF;
+  background-color: #66FFFF !important;
 }
 .blc-66FFFF {
   border-color: #66FFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-33CCFF), .lc-33CCFF:not([_moz-menuactive]) {
   color: #33CCFF
 }
 treechildren::-moz-tree-row(lc-33CCFF, selected, focus), .blc-33CCFF {
-  background-color: #33CCFF;
+  background-color: #33CCFF !important;
 }
 .blc-33CCFF {
   border-color: #33CCFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-3366FF), .lc-3366FF:not([_moz-menuactive]) {
   color: #3366FF
 }
 treechildren::-moz-tree-row(lc-3366FF, selected, focus), .blc-3366FF {
-  background-color: #3366FF;
+  background-color: #3366FF !important;
 }
 .blc-3366FF {
   border-color: #3366FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-3333FF), .lc-3333FF:not([_moz-menuactive]) {
   color: #3333FF
 }
 treechildren::-moz-tree-row(lc-3333FF, selected, focus), .blc-3333FF {
-  background-color: #3333FF;
+  background-color: #3333FF !important;
 }
 .blc-3333FF {
   border-color: #3333FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-000099), .lc-000099:not([_moz-menuactive]) {
   color: #000099
 }
 treechildren::-moz-tree-row(lc-000099, selected, focus), .blc-000099 {
-  background-color: #000099;
+  background-color: #000099 !important;
 }
 .blc-000099 {
   border-color: #000099;
 }
 
 treechildren::-moz-tree-cell-text(lc-000066), .lc-000066:not([_moz-menuactive]) {
   color: #000066
 }
 treechildren::-moz-tree-row(lc-000066, selected, focus), .blc-000066 {
-  background-color: #000066;
+  background-color: #000066 !important;
 }
 .blc-000066 {
   border-color: #000066;
 }
 
 treechildren::-moz-tree-cell-text(lc-CCCCFF), .lc-CCCCFF:not([_moz-menuactive]) {
   color: #CCCCFF
 }
 treechildren::-moz-tree-row(lc-CCCCFF, selected, focus), .blc-CCCCFF {
-  background-color: #CCCCFF;
+  background-color: #CCCCFF !important;
 }
 .blc-CCCCFF {
   border-color: #CCCCFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-9999FF), .lc-9999FF:not([_moz-menuactive]) {
   color: #9999FF
 }
 treechildren::-moz-tree-row(lc-9999FF, selected, focus), .blc-9999FF {
-  background-color: #9999FF;
+  background-color: #9999FF !important;
 }
 .blc-9999FF {
   border-color: #9999FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-6666CC), .lc-6666CC:not([_moz-menuactive]) {
   color: #6666CC
 }
 treechildren::-moz-tree-row(lc-6666CC, selected, focus), .blc-6666CC {
-  background-color: #6666CC;
+  background-color: #6666CC !important;
 }
 .blc-6666CC {
   border-color: #6666CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-6633FF), .lc-6633FF:not([_moz-menuactive]) {
   color: #6633FF
 }
 treechildren::-moz-tree-row(lc-6633FF, selected, focus), .blc-6633FF {
-  background-color: #6633FF;
+  background-color: #6633FF !important;
 }
 .blc-6633FF {
   border-color: #6633FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-6600CC), .lc-6600CC:not([_moz-menuactive]) {
   color: #6600CC
 }
 treechildren::-moz-tree-row(lc-6600CC, selected, focus), .blc-6600CC {
-  background-color: #6600CC;
+  background-color: #6600CC !important;
 }
 .blc-6600CC {
   border-color: #6600CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-333399), .lc-333399:not([_moz-menuactive]) {
   color: #333399
 }
 treechildren::-moz-tree-row(lc-333399, selected, focus), .blc-333399 {
-  background-color: #333399;
+  background-color: #333399 !important;
 }
 .blc-333399 {
   border-color: #333399;
 }
 
 treechildren::-moz-tree-cell-text(lc-330099), .lc-330099:not([_moz-menuactive]) {
   color: #330099
 }
 treechildren::-moz-tree-row(lc-330099, selected, focus), .blc-330099 {
-  background-color: #330099;
+  background-color: #330099 !important;
 }
 .blc-330099 {
   border-color: #330099;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCCFF), .lc-FFCCFF:not([_moz-menuactive]) {
   color: #FFCCFF
 }
 treechildren::-moz-tree-row(lc-FFCCFF, selected, focus), .blc-FFCCFF {
-  background-color: #FFCCFF;
+  background-color: #FFCCFF !important;
 }
 .blc-FFCCFF {
   border-color: #FFCCFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF99FF), .lc-FF99FF:not([_moz-menuactive]) {
   color: #FF99FF
 }
 treechildren::-moz-tree-row(lc-FF99FF, selected, focus), .blc-FF99FF {
-  background-color: #FF99FF;
+  background-color: #FF99FF !important;
 }
 .blc-FF99FF {
   border-color: #FF99FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC66CC), .lc-CC66CC:not([_moz-menuactive]) {
   color: #CC66CC
 }
 treechildren::-moz-tree-row(lc-CC66CC, selected, focus), .blc-CC66CC {
-  background-color: #CC66CC;
+  background-color: #CC66CC !important;
 }
 .blc-CC66CC {
   border-color: #CC66CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC33CC), .lc-CC33CC:not([_moz-menuactive]) {
   color: #CC33CC
 }
 treechildren::-moz-tree-row(lc-CC33CC, selected, focus), .blc-CC33CC {
-  background-color: #CC33CC;
+  background-color: #CC33CC !important;
 }
 .blc-CC33CC {
   border-color: #CC33CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-993399), .lc-993399:not([_moz-menuactive]) {
   color: #993399
 }
 treechildren::-moz-tree-row(lc-993399, selected, focus), .blc-993399 {
-  background-color: #993399;
+  background-color: #993399 !important;
 }
 .blc-993399 {
   border-color: #993399;
 }
 
 treechildren::-moz-tree-cell-text(lc-663366), .lc-663366:not([_moz-menuactive]) {
   color: #663366
 }
 treechildren::-moz-tree-row(lc-663366, selected, focus), .blc-663366 {
-  background-color: #663366;
+  background-color: #663366 !important;
 }
 .blc-663366 {
   border-color: #663366;
 }
 
 treechildren::-moz-tree-cell-text(lc-330033), .lc-330033:not([_moz-menuactive]) {
   color: #330033
 }
 treechildren::-moz-tree-row(lc-330033, selected, focus), .blc-330033 {
-  background-color: #330033;
+  background-color: #330033 !important;
 }
 .blc-330033 {
   border-color: #330033;
 }
 
 treechildren::-moz-tree-cell-text(lc-white, selected, focus) {
   color: #FFFFFF;
 }
--- a/mail/themes/shared/mail/addressbook.css
+++ b/mail/themes/shared/mail/addressbook.css
@@ -86,16 +86,22 @@ treechildren::-moz-tree-image(DirCol, Is
 }
 
 treechildren::-moz-tree-image(DirCol, IsRemote-true, IsSecure-true) {
   list-style-image: url("chrome://messenger/skin/addressbook/icons/secure-remote-addrbook.png");
 }
 
 /* ::::: results pane ::::: */
 
+:root[lwt-tree] #abResultsBox {
+  background-color: var(--sidebar-background-color);
+  background-image: linear-gradient(rgba(255,255,255,.15), rgba(255,255,255,.15));
+  color: var(--sidebar-text-color);
+}
+
 treechildren::-moz-tree-image(GeneratedName) {
   margin-inline-end: 2px;
   list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.png");
 }
 
 treechildren::-moz-tree-image(GeneratedName, MailList) {
   margin-inline-end: 2px;
   list-style-image: url("chrome://messenger/skin/addressbook/icons/ablist.png");
@@ -123,17 +129,17 @@ treechildren::-moz-tree-cell-text(Genera
   -moz-user-select: text;
 }
 
 .CardViewText,
 .CardViewLink {
   padding-inline-start: 20px;
   padding-inline-end: 2px;
   min-width: 30px;
-  margin: 0px;
+  margin: 0;
 }
 
 .CardViewLink {
   color: -moz-nativehyperlinktext;
   cursor: pointer;
 }
 
 #blankResultsPaneMessageBox {
@@ -150,17 +156,17 @@ treechildren::-moz-tree-cell-text(Genera
 }
 
 /* Hide the splitter when the blankResultsPaneMessageBox is shown */
 #abResultsTree[hidden="true"] + #results-splitter {
   display: none;
 }
 
 html|a {
-  padding-inline-start: 0px;
+  padding-inline-start: 0;
   padding-inline-end: 2px;
   border: none !important;
   text-decoration: underline;
 }
 
 html|p {
   border: none !important;
 }
--- a/mail/themes/shared/mail/messenger.css
+++ b/mail/themes/shared/mail/messenger.css
@@ -73,16 +73,103 @@ toolbar[printpreview="true"] {
 .chromeclass-toolbar[brighttext] toolbarseparator:-moz-lwtheme {
   background-image: linear-gradient(
                     transparent 4px,
                     var(--lwt-toolbar-vertical-separator, rgba(255,255,255,.3)) 4px,
                     var(--lwt-toolbar-vertical-separator, rgba(255,255,255,.3)) calc(100% - 4px),
                     transparent calc(100% - 4px));
 }
 
+:root[lwt-tree] tree,
+:root[lwt-tree] #folderPane-toolbar {
+  background-color: var(--sidebar-background-color);
+  color: var(--sidebar-text-color);
+}
+
+:root[lwt-tree] tree {
+  scrollbar-color: rgba(204,204,204,.5) rgba(230,230,235,.5);
+}
+
+:root[lwt-tree-brighttext] tree {
+  scrollbar-color: rgba(249,249,250,.4) rgba(20,20,25,.3);
+}
+
+:root[lwt-tree] #folderPane-toolbar {
+  background-image: none;
+  border-bottom-color: var(--sidebar-border-color, hsla(0,0%,60%,.4));
+}
+
+:root[lwt-tree-brighttext] #folderPane-toolbar {
+  border-bottom-color: var(--sidebar-border-color, rgba(249,249,250,.2));
+}
+
+:root[lwt-tree] treechildren::-moz-tree-image,
+:root[lwt-tree] treechildren::-moz-tree-twisty,
+:root[lwt-tree] #threadTree treechildren::-moz-tree-cell-text(untagged),
+:root[lwt-tree] tree:not(#threadTree) treechildren::-moz-tree-cell-text {
+  color: var(--sidebar-text-color);
+}
+
+:root[lwt-tree] treechildren::-moz-tree-image(hover),
+:root[lwt-tree] treechildren::-moz-tree-twisty(hover),
+:root[lwt-tree] treechildren::-moz-tree-image(selected),
+:root[lwt-tree] treechildren::-moz-tree-twisty(selected),
+:root[lwt-tree] #threadTree treechildren::-moz-tree-cell-text(untagged, hover),
+:root[lwt-tree] tree:not(#threadTree) treechildren::-moz-tree-cell-text(hover),
+:root[lwt-tree] #threadTree treechildren::-moz-tree-cell-text(untagged, selected),
+:root[lwt-tree] tree:not(#threadTree) treechildren::-moz-tree-cell-text(selected) {
+  color: var(--sidebar-highlight-text-color, var(--sidebar-text-color));
+}
+
+:root[lwt-tree] treechildren::-moz-tree-line {
+  border-color: var(--sidebar-text-color);
+}
+
+:root[lwt-tree] treechildren::-moz-tree-line(selected) {
+  border-color: var(--sidebar-highlight-text-color, var(--sidebar-text-color));
+}
+
+:root[lwt-tree] treecol:not([hideheader="true"]),
+:root[lwt-tree] treecolpicker:not([hideheader="true"]) {
+  -moz-appearance: none;
+  color: inherit;
+  padding-top: 2px;
+  padding-bottom: 2px;
+  border-bottom: 1px solid var(--sidebar-border-color, hsla(0,0%,60%,.4));
+}
+
+:root[lwt-tree] treecol {
+  border-inline-end: 1px solid var(--sidebar-border-color, hsla(0,0%,60%,.4));
+}
+
+:root[lwt-tree-brighttext] treecol,
+:root[lwt-tree-brighttext] treecolpicker {
+  border-color: var(--sidebar-border-color, rgba(249,249,250,.2));
+}
+
+:root[lwt-tree-brighttext] treecol {
+  border-inline-end-color: var(--sidebar-border-color, rgba(249,249,250,.2));
+}
+
+:root[lwt-tree] treecol:hover,
+:root[lwt-tree] treecolpicker:hover {
+  background-color: hsla(0,0%,60%,.4);
+}
+
+:root[lwt-tree-brighttext] treecol:hover,
+:root[lwt-tree-brighttext] treecolpicker:hover {
+  background-color: rgba(249,249,250,.2);
+}
+
+/* ..... column picker ..... */
+
+.tree-columnpicker-icon  {
+  list-style-image: url(chrome://messenger/skin/icons/columnpicker.svg);
+}
+
 /* :::::: throbber :::::::::: */
 
 #throbber-box {
   width: 16px;
   min-height: 16px;
   margin: 0 3px;
 }
 
--- a/mail/themes/windows/mail/addrbook/addressbook.css
+++ b/mail/themes/windows/mail/addrbook/addressbook.css
@@ -35,17 +35,17 @@
   margin-top: 2px;
   margin-bottom: 2px;
   padding: 0 8px;
 }
 
 #CardTitle {
   font-size: 150%;
   font-weight: bold;
-  border-bottom: 2px solid -moz-FieldText;
+  border-bottom: 2px solid currentColor;
   min-width: 120px;
   margin: 0;
 }
 
 .cardViewGroup {
   margin-top: 8px;
   padding-bottom: 5px;
   min-width: 50px;
@@ -109,73 +109,16 @@ toolbox > toolbar:last-of-type {
   sidebarheader {
     -moz-appearance: none;
     background-color: #f8f8f8;
     border-top: 0;
     border-bottom: 1px solid #a9b1b8;
   }
 }
 
-:root[lwt-tree] #dirTree {
-  background-color: var(--sidebar-background-color);
-  scrollbar-color: rgba(249,249,250,.4) rgba(20,20,25,.3);
-}
-
-:root[lwt-tree-brighttext] #dirTree {
-  scrollbar-color: rgba(249,249,250,.4) rgba(20,20,25,.3);
-}
-
-:root[lwt-tree] #dirTree treechildren::-moz-tree-image,
-:root[lwt-tree] #dirTree treechildren::-moz-tree-twisty,
-:root[lwt-tree] #dirTree treechildren::-moz-tree-cell-text {
-  color: var(--sidebar-text-color);
-}
-
-:root[lwt-tree] #folderTree treechildren::-moz-tree-row(current, focus) {
-  border-color: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.6));
-  outline: none;
-}
-
-:root[lwt-tree-brighttext] #folderTree treechildren::-moz-tree-row(current, focus) {
-  border-color: var(--sidebar-highlight-background-color, rgba(249,249,250,.3));
-}
-
-:root[lwt-tree] #dirTree treechildren::-moz-tree-row(hover),
-:root[lwt-tree] #dirTree treechildren::-moz-tree-row(hover, current),
-:root[lwt-tree] #dirTree treechildren::-moz-tree-row(hover, selected),
-:root[lwt-tree] #dirTree treechildren::-moz-tree-row(selected),
-:root[lwt-tree] #dirTree treechildren::-moz-tree-row(selected, focus),
-:root[lwt-tree] #dirTree treechildren::-moz-tree-row(selected, current, focus) {
-  border-color: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
-  background: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
-  outline: none;
-}
-
-:root[lwt-tree-brighttext] #dirTree treechildren::-moz-tree-row(hover),
-:root[lwt-tree-brighttext] #dirTree treechildren::-moz-tree-row(hover, current),
-:root[lwt-tree-brighttext] #dirTree treechildren::-moz-tree-row(hover, selected),
-:root[lwt-tree-brighttext] #dirTree treechildren::-moz-tree-row(selected),
-:root[lwt-tree-brighttext] #dirTree treechildren::-moz-tree-row(selected, focus),
-:root[lwt-tree-brighttext] #dirTree treechildren::-moz-tree-row(selected, current, focus) {
-  border-color: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
-  background: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
-}
-
-:root[lwt-tree] #dirTree treechildren::-moz-tree-image(hover),
-:root[lwt-tree] #dirTree treechildren::-moz-tree-image(selected),
-:root[lwt-tree] #dirTree treechildren::-moz-tree-image(selected, focus),
-:root[lwt-tree] #dirTree treechildren::-moz-tree-twisty(hover),
-:root[lwt-tree] #dirTree treechildren::-moz-tree-twisty(selected),
-:root[lwt-tree] #dirTree treechildren::-moz-tree-twisty(selected, focus),
-:root[lwt-tree] #dirTree treechildren::-moz-tree-cell-text(hover),
-:root[lwt-tree] #dirTree treechildren::-moz-tree-cell-text(selected),
-:root[lwt-tree] #dirTree treechildren::-moz-tree-cell-text(selected, focus) {
-  color: var(--sidebar-highlight-text-color, var(--sidebar-text-color));
-}
-
 /* Don't use the listbox appearance as that gives us a blue-grey top border
    that collides with the primary toolbar border */
 #dirTree {
   border-inline-end: 1px solid transparent;
 }
 
 /* ::::: splitters ::::: */
 
--- a/mail/themes/windows/mail/mailWindow1.css
+++ b/mail/themes/windows/mail/mailWindow1.css
@@ -14,16 +14,27 @@
 @import url("chrome://messenger/skin/messageIcons.css");
 @import url("chrome://messenger/skin/shared/mailWindow1.css");
 
 #folderPane-toolbar {
   border-top-style: none;
   border-bottom: 1px solid ThreeDShadow;
 }
 
+:root[lwt-tree-brighttext] #folderPane-toolbar {
+  border-bottom-color: var(--sidebar-border-color, rgba(249,249,250,.2));
+  --toolbarbutton-hover-background: rgba(255, 255, 255, .25);
+  --toolbarbutton-hover-bordercolor: rgba(255, 255, 255, .5);
+  --toolbarbutton-header-bordercolor: rgba(255, 255, 255, .25);
+  --toolbarbutton-active-background: rgba(255, 255, 255, .4);
+  --toolbarbutton-active-bordercolor: rgba(255, 255, 255, .7);
+  --toolbarbutton-active-boxshadow: 0 0 0 1px rgba(255, 255, 255, .4) inset;
+  --toolbarbutton-checkedhover-backgroundcolor: rgba(255, 255, 255, .5);
+}
+
 /* Give viewPickerPopup a menu look */
 #viewPickerPopup {
   background-color: menu;
 }
 
 #viewPickerPopup > menu,
 #viewPickerPopup > menuitem {
   padding-inline-end: 1px;
@@ -588,111 +599,16 @@ treechildren::-moz-tree-cell-text(dummy)
 
   #viewPicker > .menulist-label-box > .menulist-label,
   #locationFolders > .menulist-label-box > .menulist-label {
     margin-top: 0 !important;
     margin-bottom: 0 !important;
   }
 }
 
-:root[lwt-tree] #folderTree,
-:root[lwt-tree] #folderPane-toolbar {
-  background-color: var(--sidebar-background-color);
-  color: var(--sidebar-text-color);
-}
-
-:root[lwt-tree] #folderTree {
-  scrollbar-color: rgba(204,204,204,.5) rgba(230,230,235,.5);
-}
-
-:root[lwt-tree-brighttext] #folderTree {
-  scrollbar-color: rgba(249,249,250,.4) rgba(20,20,25,.3);
-}
-
-:root[lwt-tree] #folderPane-toolbar {
-  border-bottom-color: var(--sidebar-border-color, hsla(0,0%,60%,.4));
-}
-
-:root[lwt-tree-brighttext] #folderPane-toolbar {
-  border-bottom-color: var(--sidebar-border-color, rgba(249,249,250,.2));
-  --toolbarbutton-hover-background: rgba(255, 255, 255, .25);
-  --toolbarbutton-hover-bordercolor: rgba(255, 255, 255, .5);
-  --toolbarbutton-header-bordercolor: rgba(255, 255, 255, .25);
-  --toolbarbutton-active-background: rgba(255, 255, 255, .4);
-  --toolbarbutton-active-bordercolor: rgba(255, 255, 255, .7);
-  --toolbarbutton-active-boxshadow: 0 0 0 1px rgba(255, 255, 255, .4) inset;
-  --toolbarbutton-checkedhover-backgroundcolor: rgba(255, 255, 255, .5);
-}
-
-:root[lwt-tree] #folderTree treechildren::-moz-tree-image,
-:root[lwt-tree] #folderTree treechildren::-moz-tree-twisty,
-:root[lwt-tree] #folderTree treechildren::-moz-tree-cell-text {
-  color: var(--sidebar-text-color);
-}
-
-:root[lwt-tree] #folderTree treechildren::-moz-tree-row(current, focus) {
-  border-color: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.6));
-  outline: none;
-}
-
-:root[lwt-tree-brighttext] #folderTree treechildren::-moz-tree-row(current, focus) {
-  border-color: var(--sidebar-highlight-background-color, rgba(249,249,250,.3));
-}
-
-:root[lwt-tree] #folderTree treechildren::-moz-tree-row(hover),
-:root[lwt-tree] #folderTree treechildren::-moz-tree-row(hover, current),
-:root[lwt-tree] #folderTree treechildren::-moz-tree-row(hover, selected),
-:root[lwt-tree] #folderTree treechildren::-moz-tree-row(selected),
-:root[lwt-tree] #folderTree treechildren::-moz-tree-row(selected, focus),
-:root[lwt-tree] #folderTree treechildren::-moz-tree-row(selected, current, focus) {
-  border-color: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
-  background: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
-  outline: none;
-}
-
-:root[lwt-tree-brighttext] #folderTree treechildren::-moz-tree-row(hover),
-:root[lwt-tree-brighttext] #folderTree treechildren::-moz-tree-row(hover, current),
-:root[lwt-tree-brighttext] #folderTree treechildren::-moz-tree-row(hover, selected),
-:root[lwt-tree-brighttext] #folderTree treechildren::-moz-tree-row(selected),
-:root[lwt-tree-brighttext] #folderTree treechildren::-moz-tree-row(selected, focus),
-:root[lwt-tree-brighttext] #folderTree treechildren::-moz-tree-row(selected, current, focus) {
-  border-color: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
-  background: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
-}
-
-:root[lwt-tree] #folderTree treechildren::-moz-tree-image(hover),
-:root[lwt-tree] #folderTree treechildren::-moz-tree-image(selected),
-:root[lwt-tree] #folderTree treechildren::-moz-tree-image(selected, focus),
-:root[lwt-tree] #folderTree treechildren::-moz-tree-twisty(hover),
-:root[lwt-tree] #folderTree treechildren::-moz-tree-twisty(selected),
-:root[lwt-tree] #folderTree treechildren::-moz-tree-twisty(selected, focus),
-:root[lwt-tree] #folderTree treechildren::-moz-tree-cell-text(hover),
-:root[lwt-tree] #folderTree treechildren::-moz-tree-cell-text(selected),
-:root[lwt-tree] #folderTree treechildren::-moz-tree-cell-text(selected, focus) {
-  color: var(--sidebar-highlight-text-color, var(--sidebar-text-color));
-}
-
-:root[lwt-tree] #folderTree[hidecolumnpicker="false"] treecol,
-:root[lwt-tree] #folderTree[hidecolumnpicker="false"] treecolpicker {
-  -moz-appearance: none;
-  color: inherit;
-  padding-top: 2px;
-  padding-bottom: 2px;
-  border-bottom: 1px solid var(--sidebar-border-color, hsla(0,0%,60%,.4));
-}
-
-:root[lwt-tree] #folderTree treecol {
-  border-inline-end: 1px solid var(--sidebar-border-color, hsla(0,0%,60%,.4));
-}
-
-:root[lwt-tree-brighttext] #folderTree treecol,
-:root[lwt-tree-brighttext] #folderTree treecolpicker {
-  border-color: var(--sidebar-border-color, rgba(249,249,250,.2));
-}
-
 #viewPicker > .menulist-label-box > .menulist-icon,
 #locationFolders > .menulist-label-box > .menulist-icon {
   min-height: 16px;
 }
 
 @media (-moz-os-version: windows-win7) and (-moz-windows-default-theme) {
   @media (-moz-windows-glass: 0) {
     #messengerWindow:not([tabsintitlebar]) > #navigation-toolbox:not(:-moz-lwtheme) {
--- a/mail/themes/windows/mail/messageIcons.css
+++ b/mail/themes/windows/mail/messageIcons.css
@@ -1,32 +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/. */
 
-.treecol-image image {
-  padding-inline-start: 1px;
-  padding-inline-end: 2px;
-  padding-bottom: 3px;
-  -moz-context-properties: fill;
-  fill: currentColor;
-}
-
-@media (-moz-windows-classic) {
-  .treecol-image image {
-    padding-bottom: 2px;
-  }
-}
-
-/* ..... column picker ..... */
-
-.tree-columnpicker-icon  {
-  list-style-image: url(chrome://messenger/skin/icons/columnpicker.svg);
-}
-
 /* ..... thread column ..... */
 
 .threadColumnHeader {
   list-style-image: url(chrome://messenger/skin/icons/thread-col.svg);
 }
 
 treechildren::-moz-tree-image(threadCol, container) {
   list-style-image: url(chrome://messenger/skin/icons/thread.png);
--- a/mail/themes/windows/mail/messenger.css
+++ b/mail/themes/windows/mail/messenger.css
@@ -304,16 +304,24 @@ sidebarheader .toolbarbutton-text:not([v
   margin-bottom: 0;
 }
 
 menulist.folderMenuItem menu:not(.folderMenuItem) {
   padding-top: 3px;
   padding-bottom: 3px;
 }
 
+.treecol-image image {
+  padding-inline-start: 1px;
+  padding-inline-end: 2px;
+  padding-bottom: 2px;
+  -moz-context-properties: fill;
+  fill: currentColor;
+}
+
 treechildren::-moz-tree-row {
   min-height: 18px;
 }
 
 treechildren::-moz-tree-row(multicol, odd) {
   background-color: transparent;
 }
 
@@ -468,16 +476,42 @@ treechildren::-moz-tree-indentation {
 
     treechildren::-moz-tree-row {
       border-radius: 3px;
       -moz-outline-radius: 3px;
     }
   }
 }
 
+:root[lwt-tree] treechildren::-moz-tree-row(current, focus) {
+  border-color: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.6));
+  outline: none;
+}
+
+:root[lwt-tree-brighttext] treechildren::-moz-tree-row(current, focus) {
+  border-color: var(--sidebar-highlight-background-color, rgba(249,249,250,.3));
+}
+
+:root[lwt-tree] treechildren::-moz-tree-row(hover),
+:root[lwt-tree] #threadTree treechildren::-moz-tree-row(untagged, selected),
+:root[lwt-tree]:-moz-window-inactive #threadTree treechildren::-moz-tree-row(selected),
+:root[lwt-tree] tree:not(#threadTree) treechildren::-moz-tree-row(selected) {
+  border-color: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
+  background: var(--sidebar-highlight-background-color, hsla(0,0%,80%,.3));
+  outline: none;
+}
+
+:root[lwt-tree-brighttext] treechildren::-moz-tree-row(hover),
+:root[lwt-tree-brighttext] #threadTree treechildren::-moz-tree-row(untagged, selected),
+:root[lwt-tree-brighttext]:-moz-window-inactive #threadTree treechildren::-moz-tree-row(selected),
+:root[lwt-tree-brighttext] tree:not(#threadTree) treechildren::-moz-tree-row(selected) {
+  border-color: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
+  background: var(--sidebar-highlight-background-color, rgba(249,249,250,.1));
+}
+
 /* Give menupopup[type="folder"] a menu look */
 menupopup[type="folder"] {
   -moz-appearance: menupopup;
 }
 
 menupopup[type="folder"] menu[_moz-menuactive="true"],
 menupopup[type="folder"] menuitem[_moz-menuactive="true"] {
   color: -moz-MenuHoverText;
--- a/mail/themes/windows/mail/tagColors.css
+++ b/mail/themes/windows/mail/tagColors.css
@@ -13,1524 +13,1524 @@
      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), .blc-FFFFFF {
-  background-color: #FFFFFF;
+  background-color: #FFFFFF !important;
 }
 .blc-FFFFFF {
   border-color: #FFFFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-CCCCCC), .lc-CCCCCC:not([_moz-menuactive]) {
   color: #CCCCCC
 }
 treechildren::-moz-tree-row(lc-CCCCCC, selected, focus), .blc-CCCCCC {
-  background-color: #CCCCCC;
+  background-color: #CCCCCC !important;
 }
 .blc-CCCCCC {
   border-color: #CCCCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-C0C0C0), .lc-C0C0C0:not([_moz-menuactive]) {
   color: #C0C0C0
 }
 treechildren::-moz-tree-row(lc-C0C0C0, selected, focus), .blc-C0C0C0 {
-  background-color: #C0C0C0;
+  background-color: #C0C0C0 !important;
 }
 .blc-C0C0C0 {
   border-color: #C0C0C0;
 }
 
 treechildren::-moz-tree-cell-text(lc-999999), .lc-999999:not([_moz-menuactive]) {
   color: #999999
 }
 treechildren::-moz-tree-row(lc-999999, selected, focus), .blc-999999 {
-  background-color: #999999;
+  background-color: #999999 !important;
 }
 .blc-999999 {
   border-color: #999999;
 }
 
 treechildren::-moz-tree-cell-text(lc-666666), .lc-666666:not([_moz-menuactive]) {
   color: #666666
 }
 treechildren::-moz-tree-row(lc-666666, selected, focus), .blc-666666 {
-  background-color: #666666;
+  background-color: #666666 !important;
 }
 .blc-666666 {
   border-color: #666666;
 }
 
 treechildren::-moz-tree-cell-text(lc-333333), .lc-333333:not([_moz-menuactive]) {
   color: #333333
 }
 treechildren::-moz-tree-row(lc-333333, selected, focus), .blc-333333 {
-  background-color: #333333;
+  background-color: #333333 !important;
 }
 .blc-333333 {
   border-color: #333333;
 }
 
 treechildren::-moz-tree-cell-text(lc-000000), .lc-000000:not([_moz-menuactive]) {
   color: #000000
 }
 treechildren::-moz-tree-row(lc-000000, selected, focus), .blc-000000 {
   /* our assumed color is #111111 and !important is needed to override it */
   color: #FFFFFF !important;
   text-shadow: 0 1px 0 rgba(46,52,54,0.4) !important; /* Tango Alumninum 6 */
-  background-color: #000000;
+  background-color: #000000 !important;
 }
 .blc-000000 {
   border-color: #000000;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCCCC), .lc-FFCCCC:not([_moz-menuactive]) {
   color: #FFCCCC
 }
 treechildren::-moz-tree-row(lc-FFCCCC, selected, focus), .blc-FFCCCC {
-  background-color: #FFCCCC;
+  background-color: #FFCCCC !important;
 }
 .blc-FFCCCC {
   border-color: #FFCCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF6666), .lc-FF6666:not([_moz-menuactive]) {
   color: #FF6666
 }
 treechildren::-moz-tree-row(lc-FF6666, selected, focus), .blc-FF6666 {
-  background-color: #FF6666;
+  background-color: #FF6666 !important;
 }
 .blc-FF6666 {
   border-color: #FF6666;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF0000), .lc-FF0000:not([_moz-menuactive]) {
   color: #FF0000
 }
 treechildren::-moz-tree-row(lc-FF0000, selected, focus), .blc-FF0000 {
-  background-color: #FF0000;
+  background-color: #FF0000 !important;
 }
 .blc-FF0000 {
   border-color: #FF0000;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC0000), .lc-CC0000:not([_moz-menuactive]) {
   color: #CC0000
 }
 treechildren::-moz-tree-row(lc-CC0000, selected, focus), .blc-CC0000 {
-  background-color: #CC0000;
+  background-color: #CC0000 !important;
 }
 .blc-CC0000 {
   border-color: #CC0000;
 }
 
 treechildren::-moz-tree-cell-text(lc-990000), .lc-990000:not([_moz-menuactive]) {
   color: #990000
 }
 treechildren::-moz-tree-row(lc-990000, selected, focus), .blc-990000 {
-  background-color: #990000;
+  background-color: #990000 !important;
 }
 .blc-990000 {
   border-color: #990000;
 }
 
 treechildren::-moz-tree-cell-text(lc-660000), .lc-660000:not([_moz-menuactive]) {
   color: #660000
 }
 treechildren::-moz-tree-row(lc-660000, selected, focus), .blc-660000 {
-  background-color: #660000;
+  background-color: #660000 !important;
 }
 .blc-660000 {
   border-color: #660000;
 }
 
 treechildren::-moz-tree-cell-text(lc-330000), .lc-330000:not([_moz-menuactive]) {
   color: #330000
 }
 treechildren::-moz-tree-row(lc-330000, selected, focus), .blc-330000 {
-  background-color: #330000;
+  background-color: #330000 !important;
 }
 .blc-330000 {
   border-color: #330000;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCC99), .lc-FFCC99:not([_moz-menuactive]) {
   color: #FFCC99
 }
 treechildren::-moz-tree-row(lc-FFCC99, selected, focus), .blc-FFCC99 {
-  background-color: #FFCC99;
+  background-color: #FFCC99 !important;
 }
 .blc-FFCC99 {
   border-color: #FFCC99;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF9966), .lc-FF9966:not([_moz-menuactive]) {
   color: #FF9966
 }
 treechildren::-moz-tree-row(lc-FF9966, selected, focus), .blc-FF9966 {
-  background-color: #FF9966;
+  background-color: #FF9966 !important;
 }
 .blc-FF9966 {
   border-color: #FF9966;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF9900), .lc-FF9900:not([_moz-menuactive]) {
   color: #FF9900
 }
 treechildren::-moz-tree-row(lc-FF9900, selected, focus), .blc-FF9900 {
-  background-color: #FF9900;
+  background-color: #FF9900 !important;
 }
 .blc-FF9900 {
   border-color: #FF9900;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF6600), .lc-FF6600:not([_moz-menuactive]) {
   color: #FF6600
 }
 treechildren::-moz-tree-row(lc-FF6600, selected, focus), .blc-FF6600 {
-  background-color: #FF6600;
+  background-color: #FF6600 !important;
 }
 .blc-FF6600 {
   border-color: #FF6600;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC6600), .lc-CC6600:not([_moz-menuactive]) {
   color: #CC6600
 }
 treechildren::-moz-tree-row(lc-CC6600, selected, focus), .blc-CC6600 {
-  background-color: #CC6600;
+  background-color: #CC6600 !important;
 }
 .blc-CC6600 {
   border-color: #CC6600;
 }
 
 treechildren::-moz-tree-cell-text(lc-993300), .lc-993300:not([_moz-menuactive]) {
   color: #993300
 }
 treechildren::-moz-tree-row(lc-993300, selected, focus), .blc-993300 {
-  background-color: #993300;
+  background-color: #993300 !important;
 }
 .blc-993300 {
   border-color: #993300;
 }
 
 treechildren::-moz-tree-cell-text(lc-663300), .lc-663300:not([_moz-menuactive]) {
   color: #663300
 }
 treechildren::-moz-tree-row(lc-663300, selected, focus), .blc-663300 {
-  background-color: #663300;
+  background-color: #663300 !important;
 }
 .blc-663300 {
   border-color: #663300;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFF99), .lc-FFFF99:not([_moz-menuactive]) {
   color: #FFFF99
 }
 treechildren::-moz-tree-row(lc-FFFF99, selected, focus), .blc-FFFF99 {
-  background-color: #FFFF99;
+  background-color: #FFFF99 !important;
 }
 .blc-FFFF99 {
   border-color: #FFFF99;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFF66), .lc-FFFF66:not([_moz-menuactive]) {
   color: #FFFF66
 }
 treechildren::-moz-tree-row(lc-FFFF66, selected, focus), .blc-FFFF66 {
-  background-color: #FFFF66;
+  background-color: #FFFF66 !important;
 }
 .blc-FFFF66 {
   border-color: #FFFF66;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCC66), .lc-FFCC66:not([_moz-menuactive]) {
   color: #FFCC66
 }
 treechildren::-moz-tree-row(lc-FFCC66, selected, focus), .blc-FFCC66 {
-  background-color: #FFCC66;
+  background-color: #FFCC66 !important;
 }
 .blc-FFCC66 {
   border-color: #FFCC66;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCC33), .lc-FFCC33:not([_moz-menuactive]) {
   color: #FFCC33
 }
 treechildren::-moz-tree-row(lc-FFCC33, selected, focus), .blc-FFCC33 {
-  background-color: #FFCC33;
+  background-color: #FFCC33 !important;
 }
 .blc-FFCC33 {
   border-color: #FFCC33;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC9933), .lc-CC9933:not([_moz-menuactive]) {
   color: #CC9933
 }
 treechildren::-moz-tree-row(lc-CC9933, selected, focus), .blc-CC9933 {
-  background-color: #CC9933;
+  background-color: #CC9933 !important;
 }
 .blc-CC9933 {
   border-color: #CC9933;
 }
 
 treechildren::-moz-tree-cell-text(lc-996633), .lc-996633:not([_moz-menuactive]) {
   color: #996633
 }
 treechildren::-moz-tree-row(lc-996633, selected, focus), .blc-996633 {
-  background-color: #996633;
+  background-color: #996633 !important;
 }
 .blc-996633 {
   border-color: #996633;
 }
 
 treechildren::-moz-tree-cell-text(lc-663333), .lc-663333:not([_moz-menuactive]) {
   color: #663333
 }
 treechildren::-moz-tree-row(lc-663333, selected, focus), .blc-663333 {
-  background-color: #663333;
+  background-color: #663333 !important;
 }
 .blc-663333 {
   border-color: #663333;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFFCC), .lc-FFFFCC:not([_moz-menuactive]) {
   color: #FFFFCC
 }
 treechildren::-moz-tree-row(lc-FFFFCC, selected, focus), .blc-FFFFCC {
-  background-color: #FFFFCC;
+  background-color: #FFFFCC !important;
 }
 .blc-FFFFCC {
   border-color: #FFFFCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFF33), .lc-FFFF33:not([_moz-menuactive]) {
   color: #FFFF33
 }
 treechildren::-moz-tree-row(lc-FFFF33, selected, focus), .blc-FFFF33 {
-  background-color: #FFFF33;
+  background-color: #FFFF33 !important;
 }
 .blc-FFFF33 {
   border-color: #FFFF33;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFFF00), .lc-FFFF00:not([_moz-menuactive]) {
   color: #FFFF00
 }
 treechildren::-moz-tree-row(lc-FFFF00, selected, focus), .blc-FFFF00 {
-  background-color: #FFFF00;
+  background-color: #FFFF00 !important;
 }
 .blc-FFFF00 {
   border-color: #FFFF00;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCC00), .lc-FFCC00:not([_moz-menuactive]) {
   color: #FFCC00
 }
 treechildren::-moz-tree-row(lc-FFCC00, selected, focus), .blc-FFCC00 {
-  background-color: #FFCC00;
+  background-color: #FFCC00 !important;
 }
 .blc-FFCC00 {
   border-color: #FFCC00;
 }
 
 treechildren::-moz-tree-cell-text(lc-999900), .lc-999900:not([_moz-menuactive]) {
   color: #999900
 }
 treechildren::-moz-tree-row(lc-999900, selected, focus), .blc-999900 {
-  background-color: #999900;
+  background-color: #999900 !important;
 }
 .blc-999900 {
   border-color: #999900;
 }
 
 treechildren::-moz-tree-cell-text(lc-666600), .lc-666600:not([_moz-menuactive]) {
   color: #666600
 }
 treechildren::-moz-tree-row(lc-666600, selected, focus), .blc-666600 {
-  background-color: #666600;
+  background-color: #666600 !important;
 }
 .blc-666600 {
   border-color: #666600;
 }
 
 treechildren::-moz-tree-cell-text(lc-333300), .lc-333300:not([_moz-menuactive]) {
   color: #333300
 }
 treechildren::-moz-tree-row(lc-333300, selected, focus), .blc-333300 {
-  background-color: #333300;
+  background-color: #333300 !important;
 }
 .blc-333300 {
   border-color: #333300;
 }
 
 treechildren::-moz-tree-cell-text(lc-99FF99), .lc-99FF99:not([_moz-menuactive]) {
   color: #99FF99
 }
 treechildren::-moz-tree-row(lc-99FF99, selected, focus), .blc-99FF99 {
-  background-color: #99FF99;
+  background-color: #99FF99 !important;
 }
 .blc-99FF99 {
   border-color: #99FF99;
 }
 
 treechildren::-moz-tree-cell-text(lc-66FF99), .lc-66FF99:not([_moz-menuactive]) {
   color: #66FF99
 }
 treechildren::-moz-tree-row(lc-66FF99, selected, focus), .blc-66FF99 {
-  background-color: #66FF99;
+  background-color: #66FF99 !important;
 }
 .blc-66FF99 {
   border-color: #66FF99;
 }
 
 treechildren::-moz-tree-cell-text(lc-33FF33), .lc-33FF33:not([_moz-menuactive]) {
   color: #33FF33
 }
 treechildren::-moz-tree-row(lc-33FF33, selected, focus), .blc-33FF33 {
-  background-color: #33FF33;
+  background-color: #33FF33 !important;
 }
 .blc-33FF33 {
   border-color: #33FF33;
 }
 
 treechildren::-moz-tree-cell-text(lc-33CC00), .lc-33CC00:not([_moz-menuactive]) {
   color: #33CC00
 }
 treechildren::-moz-tree-row(lc-33CC00, selected, focus), .blc-33CC00 {
-  background-color: #33CC00;
+  background-color: #33CC00 !important;
 }
 .blc-33CC00 {
   border-color: #33CC00;
 }
 
 treechildren::-moz-tree-cell-text(lc-009900), .lc-009900:not([_moz-menuactive]) {
   color: #009900
 }
 treechildren::-moz-tree-row(lc-009900, selected, focus), .blc-009900 {
-  background-color: #009900;
+  background-color: #009900 !important;
 }
 .blc-009900 {
   border-color: #009900;
 }
 
 treechildren::-moz-tree-cell-text(lc-006600), .lc-006600:not([_moz-menuactive]) {
   color: #006600
 }
 treechildren::-moz-tree-row(lc-006600, selected, focus), .blc-006600 {
-  background-color: #006600;
+  background-color: #006600 !important;
 }
 .blc-006600 {
   border-color: #006600;
 }
 
 treechildren::-moz-tree-cell-text(lc-003300), .lc-003300:not([_moz-menuactive]) {
   color: #003300
 }
 treechildren::-moz-tree-row(lc-003300, selected, focus), .blc-003300 {
-  background-color: #003300;
+  background-color: #003300 !important;
 }
 .blc-003300 {
   border-color: #003300;
 }
 
 treechildren::-moz-tree-cell-text(lc-99FFFF), .lc-99FFFF:not([_moz-menuactive]) {
   color: #99FFFF
 }
 treechildren::-moz-tree-row(lc-99FFFF, selected, focus), .blc-99FFFF {
-  background-color: #99FFFF;
+  background-color: #99FFFF !important;
 }
 .blc-99FFFF {
   border-color: #99FFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-33FFFF), .lc-33FFFF:not([_moz-menuactive]) {
   color: #33FFFF
 }
 treechildren::-moz-tree-row(lc-33FFFF, selected, focus), .blc-33FFFF {
-  background-color: #33FFFF;
+  background-color: #33FFFF !important;
 }
 .blc-33FFFF {
   border-color: #33FFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-66CCCC), .lc-66CCCC:not([_moz-menuactive]) {
   color: #66CCCC
 }
 treechildren::-moz-tree-row(lc-66CCCC, selected, focus), .blc-66CCCC {
-  background-color: #66CCCC;
+  background-color: #66CCCC !important;
 }
 .blc-66CCCC {
   border-color: #66CCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-00CCCC), .lc-00CCCC:not([_moz-menuactive]) {
   color: #00CCCC
 }
 treechildren::-moz-tree-row(lc-00CCCC, selected, focus), .blc-00CCCC {
-  background-color: #00CCCC;
+  background-color: #00CCCC !important;
 }
 .blc-00CCCC {
   border-color: #00CCCC;
 }
 
 treechildren::-moz-tree-cell-text(lc-339999), .lc-339999:not([_moz-menuactive]) {
   color: #339999
 }
 treechildren::-moz-tree-row(lc-339999, selected, focus), .blc-339999 {
-  background-color: #339999;
+  background-color: #339999 !important;
 }
 .blc-339999 {
   border-color: #339999;
 }
 
 treechildren::-moz-tree-cell-text(lc-336666), .lc-336666:not([_moz-menuactive]) {
   color: #336666
 }
 treechildren::-moz-tree-row(lc-336666, selected, focus), .blc-336666 {
-  background-color: #336666;
+  background-color: #336666 !important;
 }
 .blc-336666 {
   border-color: #336666;
 }
 
 treechildren::-moz-tree-cell-text(lc-003333), .lc-003333:not([_moz-menuactive]) {
   color: #003333
 }
 treechildren::-moz-tree-row(lc-003333, selected, focus), .blc-003333 {
-  background-color: #003333;
+  background-color: #003333 !important;
 }
 .blc-003333 {
   border-color: #003333;
 }
 
 treechildren::-moz-tree-cell-text(lc-CCFFFF), .lc-CCFFFF:not([_moz-menuactive]) {
   color: #CCFFFF
 }
 treechildren::-moz-tree-row(lc-CCFFFF, selected, focus), .blc-CCFFFF {
-  background-color: #CCFFFF;
+  background-color: #CCFFFF !important;
 }
 .blc-CCFFFF {
   border-color: #CCFFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-66FFFF), .lc-66FFFF:not([_moz-menuactive]) {
   color: #66FFFF
 }
 treechildren::-moz-tree-row(lc-66FFFF, selected, focus), .blc-66FFFF {
-  background-color: #66FFFF;
+  background-color: #66FFFF !important;
 }
 .blc-66FFFF {
   border-color: #66FFFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-33CCFF), .lc-33CCFF:not([_moz-menuactive]) {
   color: #33CCFF
 }
 treechildren::-moz-tree-row(lc-33CCFF, selected, focus), .blc-33CCFF {
-  background-color: #33CCFF;
+  background-color: #33CCFF !important;
 }
 .blc-33CCFF {
   border-color: #33CCFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-3366FF), .lc-3366FF:not([_moz-menuactive]) {
   color: #3366FF
 }
 treechildren::-moz-tree-row(lc-3366FF, selected, focus), .blc-3366FF {
-  background-color: #3366FF;
+  background-color: #3366FF !important;
 }
 .blc-3366FF {
   border-color: #3366FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-3333FF), .lc-3333FF:not([_moz-menuactive]) {
   color: #3333FF
 }
 treechildren::-moz-tree-row(lc-3333FF, selected, focus), .blc-3333FF {
-  background-color: #3333FF;
+  background-color: #3333FF !important;
 }
 .blc-3333FF {
   border-color: #3333FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-000099), .lc-000099:not([_moz-menuactive]) {
   color: #000099
 }
 treechildren::-moz-tree-row(lc-000099, selected, focus), .blc-000099 {
-  background-color: #000099;
+  background-color: #000099 !important;
 }
 .blc-000099 {
   border-color: #000099;
 }
 
 treechildren::-moz-tree-cell-text(lc-000066), .lc-000066:not([_moz-menuactive]) {
   color: #000066
 }
 treechildren::-moz-tree-row(lc-000066, selected, focus), .blc-000066 {
-  background-color: #000066;
+  background-color: #000066 !important;
 }
 .blc-000066 {
   border-color: #000066;
 }
 
 treechildren::-moz-tree-cell-text(lc-CCCCFF), .lc-CCCCFF:not([_moz-menuactive]) {
   color: #CCCCFF
 }
 treechildren::-moz-tree-row(lc-CCCCFF, selected, focus), .blc-CCCCFF {
-  background-color: #CCCCFF;
+  background-color: #CCCCFF !important;
 }
 .blc-CCCCFF {
   border-color: #CCCCFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-9999FF), .lc-9999FF:not([_moz-menuactive]) {
   color: #9999FF
 }
 treechildren::-moz-tree-row(lc-9999FF, selected, focus), .blc-9999FF {
-  background-color: #9999FF;
+  background-color: #9999FF !important;
 }
 .blc-9999FF {
   border-color: #9999FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-6666CC), .lc-6666CC:not([_moz-menuactive]) {
   color: #6666CC
 }
 treechildren::-moz-tree-row(lc-6666CC, selected, focus), .blc-6666CC {
-  background-color: #6666CC;
+  background-color: #6666CC !important;
 }
 .blc-6666CC {
   border-color: #6666CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-6633FF), .lc-6633FF:not([_moz-menuactive]) {
   color: #6633FF
 }
 treechildren::-moz-tree-row(lc-6633FF, selected, focus), .blc-6633FF {
-  background-color: #6633FF;
+  background-color: #6633FF !important;
 }
 .blc-6633FF {
   border-color: #6633FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-6600CC), .lc-6600CC:not([_moz-menuactive]) {
   color: #6600CC
 }
 treechildren::-moz-tree-row(lc-6600CC, selected, focus), .blc-6600CC {
-  background-color: #6600CC;
+  background-color: #6600CC !important;
 }
 .blc-6600CC {
   border-color: #6600CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-333399), .lc-333399:not([_moz-menuactive]) {
   color: #333399
 }
 treechildren::-moz-tree-row(lc-333399, selected, focus), .blc-333399 {
-  background-color: #333399;
+  background-color: #333399 !important;
 }
 .blc-333399 {
   border-color: #333399;
 }
 
 treechildren::-moz-tree-cell-text(lc-330099), .lc-330099:not([_moz-menuactive]) {
   color: #330099
 }
 treechildren::-moz-tree-row(lc-330099, selected, focus), .blc-330099 {
-  background-color: #330099;
+  background-color: #330099 !important;
 }
 .blc-330099 {
   border-color: #330099;
 }
 
 treechildren::-moz-tree-cell-text(lc-FFCCFF), .lc-FFCCFF:not([_moz-menuactive]) {
   color: #FFCCFF
 }
 treechildren::-moz-tree-row(lc-FFCCFF, selected, focus), .blc-FFCCFF {
-  background-color: #FFCCFF;
+  background-color: #FFCCFF !important;
 }
 .blc-FFCCFF {
   border-color: #FFCCFF;
 }
 
 treechildren::-moz-tree-cell-text(lc-FF99FF), .lc-FF99FF:not([_moz-menuactive]) {
   color: #FF99FF
 }
 treechildren::-moz-tree-row(lc-FF99FF, selected, focus), .blc-FF99FF {
-  background-color: #FF99FF;
+  background-color: #FF99FF !important;
 }
 .blc-FF99FF {
   border-color: #FF99FF;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC66CC), .lc-CC66CC:not([_moz-menuactive]) {
   color: #CC66CC
 }
 treechildren::-moz-tree-row(lc-CC66CC, selected, focus), .blc-CC66CC {
-  background-color: #CC66CC;
+  background-color: #CC66CC !important;
 }
 .blc-CC66CC {
   border-color: #CC66CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-CC33CC), .lc-CC33CC:not([_moz-menuactive]) {
   color: #CC33CC
 }
 treechildren::-moz-tree-row(lc-CC33CC, selected, focus), .blc-CC33CC {
-  background-color: #CC33CC;
+  background-color: #CC33CC !important;
 }
 .blc-CC33CC {
   border-color: #CC33CC;
 }
 
 treechildren::-moz-tree-cell-text(lc-993399), .lc-993399:not([_moz-menuactive]) {
   color: #993399
 }
 treechildren::-moz-tree-row(lc-993399, selected, focus), .blc-993399 {
-  background-color: #993399;
+  background-color: #993399 !important;
 }
 .blc-993399 {
   border-color: #993399;
 }
 
 treechildren::-moz-tree-cell-text(lc-663366), .lc-663366:not([_moz-menuactive]) {
   color: #663366
 }
 treechildren::-moz-tree-row(lc-663366, selected, focus), .blc-663366 {
-  background-color: #663366;
+  background-color: #663366 !important;
 }
 .blc-663366 {
   border-color: #663366;
 }
 
 treechildren::-moz-tree-cell-text(lc-330033), .lc-330033:not([_moz-menuactive]) {
   color: #330033
 }
 treechildren::-moz-tree-row(lc-330033, selected, focus), .blc-330033 {
-  background-color: #330033;
+  background-color: #330033 !important;
 }
 .blc-330033 {
   border-color: #330033;
 }
 
 treechildren::-moz-tree-cell-text(lc-white, selected, focus) {
   color: #FFFFFF;
 }
 treechildren::-moz-tree-cell-text(lc-black, selected, focus), .blc-black {
   color: #000000;
 }
 
 @media (-moz-windows-default-theme) {
   treechildren::-moz-tree-row(lc-CCCCCC, selected, focus) {
     border-color: #CCCCCC;
     background: linear-gradient(rgba(204, 204, 204, .5),
-                                rgba(204, 204, 204, .5));
+                                rgba(204, 204, 204, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-CCCCCC, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-C0C0C0, selected, focus) {
     border-color: #C0C0C0;
     background: linear-gradient(rgba(192, 192, 192, .5),
-                                rgba(192, 192, 192, .5));
+                                rgba(192, 192, 192, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-C0C0C0, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-999999, selected, focus) {
     border-color: #999999;
     background: linear-gradient(rgba(153, 153, 153, .5),
-                                rgba(153, 153, 153, .5));
+                                rgba(153, 153, 153, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-999999, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-666666, selected, focus) {
     border-color: #666666;
     background: linear-gradient(rgba(102, 102, 102, .5),
-                                rgba(102, 102, 102, .5));
+                                rgba(102, 102, 102, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-666666, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-333333, selected, focus) {
     border-color: #333333;
-    background: linear-gradient(rgba(51, 51, 51, .5), rgba(51, 51, 51, .5));
+    background: linear-gradient(rgba(51, 51, 51, .5), rgba(51, 51, 51, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-000000, selected, focus) {
     border-color: #000;
-    background: linear-gradient(rgba(0, 0, 0, .5), rgba(0, 0, 0, .5));
+    background: linear-gradient(rgba(0, 0, 0, .5), rgba(0, 0, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FFCCCC, selected, focus) {
     border-color: #FFCCCC;
     background: linear-gradient(rgba(255, 204, 204, .5),
-                                rgba(255, 204, 204, .5));
+                                rgba(255, 204, 204, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-FFCCCC, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-FF6666, selected, focus) {
     border-color: #FF6666;
     background: linear-gradient(rgba(255, 102, 102, .5),
-                                rgba(255, 102, 102, .5));
+                                rgba(255, 102, 102, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-FF6666, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-FF0000, selected, focus) {
     border-color: #FF0000;
-    background: linear-gradient(rgba(255, 0, 0, .5), rgba(255, 0, 0, .5));
+    background: linear-gradient(rgba(255, 0, 0, .5), rgba(255, 0, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-CC0000, selected, focus) {
     border-color: #CC0000;
-    background: linear-gradient(rgba(204, 0, 0, .5), rgba(204, 0, 0, .5));
+    background: linear-gradient(rgba(204, 0, 0, .5), rgba(204, 0, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-990000, selected, focus) {
     border-color: #990000;
-    background: linear-gradient(rgba(153, 0, 0, .5), rgba(153, 0, 0, .5));
+    background: linear-gradient(rgba(153, 0, 0, .5), rgba(153, 0, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-660000, selected, focus) {
     border-color: #660000;
-    background: linear-gradient(rgba(102, 0, 0, .5), rgba(102, 0, 0, .5));
+    background: linear-gradient(rgba(102, 0, 0, .5), rgba(102, 0, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-330000, selected, focus) {
     border-color: #330000;
-    background: linear-gradient(rgba(51, 0, 0, .5), rgba(51, 0, 0, .5));
+    background: linear-gradient(rgba(51, 0, 0, .5), rgba(51, 0, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FFCC99, selected, focus) {
     border-color: #FFCC99;
     background: linear-gradient(rgba(255, 204, 153, .5),
-                                rgba(255, 204, 153, .5));
+                                rgba(255, 204, 153, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-FFCC99, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-FF9966, selected, focus) {
     border-color: #FF9966;
     background: linear-gradient(rgba(255, 153, 102, .5),
-                                rgba(255, 153, 102, .5));
+                                rgba(255, 153, 102, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-FF9966, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-FF9900, selected, focus) {
     border-color: #FF9900;
-    background: linear-gradient(rgba(255, 153, 0, .5), rgba(255, 153, 0, .5));
+    background: linear-gradient(rgba(255, 153, 0, .5), rgba(255, 153, 0, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-FF9900, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-FF6600, selected, focus) {
     border-color: #FF6600;
-    background: linear-gradient(rgba(255, 102, 0, .5), rgba(255, 102, 0, .5));
+    background: linear-gradient(rgba(255, 102, 0, .5), rgba(255, 102, 0, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-FF6600, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-CC6600, selected, focus) {
     border-color: #CC6600;
-    background: linear-gradient(rgba(204, 102, 0, .5), rgba(204, 102, 0, .5));
+    background: linear-gradient(rgba(204, 102, 0, .5), rgba(204, 102, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-993300, selected, focus) {
     border-color: #993300;
-    background: linear-gradient(rgba(153, 51, 0, .5), rgba(153, 51, 0, .5));
+    background: linear-gradient(rgba(153, 51, 0, .5), rgba(153, 51, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-663300, selected, focus) {
     border-color: #663300;
-    background: linear-gradient(rgba(102, 51, 0, .5), rgba(102, 51, 0, .5));
+    background: linear-gradient(rgba(102, 51, 0, .5), rgba(102, 51, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FFFF99, selected, focus) {
     border-color: #FFFF99;
     background: linear-gradient(rgba(255, 255, 153, .5),
-                                rgba(255, 255, 153, .5));
+                                rgba(255, 255, 153, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-FFFF99, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-FFFF66, selected, focus) {
     border-color: #FFFF66;
     background: linear-gradient(rgba(255, 255, 102, .5),
-                                rgba(255, 255, 102, .5));
+                                rgba(255, 255, 102, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-FFFF66, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-FFCC66, selected, focus) {
     border-color: #FFCC66;
     background: linear-gradient(rgba(255, 204, 102, .5),
-                                rgba(255, 204, 102, .5));
+                                rgba(255, 204, 102, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-FFCC66, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-FFCC33, selected, focus) {
     border-color: #FFCC33;
     background: linear-gradient(rgba(255, 204, 51, .5),
-                                rgba(255, 204, 51, .5));
+                                rgba(255, 204, 51, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-FFCC33, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-CC9933, selected, focus) {
     border-color: #CC9933;
     background: linear-gradient(rgba(204, 153, 51, .5),
-                                rgba(204, 153, 51, .5));
+                                rgba(204, 153, 51, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-CC9933, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-996633, selected, focus) {
     border-color: #996633;
     background: linear-gradient(rgba(153, 102, 51, .5),
-                                rgba(153, 102, 51, .5));
+                                rgba(153, 102, 51, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-663333, selected, focus) {
     border-color: #663333;
-    background: linear-gradient(rgba(102, 51, 51, .5), rgba(102, 51, 51, .5));
+    background: linear-gradient(rgba(102, 51, 51, .5), rgba(102, 51, 51, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FFFFCC, selected, focus) {
     border-color: #FFFFCC;
     background: linear-gradient(rgba(255, 255, 204, .5),
-                                rgba(255, 255, 204, .5));
+                                rgba(255, 255, 204, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-FFFFCC, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-FFFF33, selected, focus) {
     border-color: #FFFF33;
     background: linear-gradient(rgba(255, 255, 51, .5),
-                                rgba(255, 255, 51, .5));
+                                rgba(255, 255, 51, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-FFFF33, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-FFFF00, selected, focus) {
     border-color: #FFFF00;
-    background: linear-gradient(rgba(255, 255, 0, .5), rgba(255, 255, 0, .5));
+    background: linear-gradient(rgba(255, 255, 0, .5), rgba(255, 255, 0, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-FFFF00, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-FFCC00, selected, focus) {
     border-color: #FFCC00;
-    background: linear-gradient(rgba(255, 204, 0, .5), rgba(255, 204, 0, .5));
+    background: linear-gradient(rgba(255, 204, 0, .5), rgba(255, 204, 0, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-FFCC00, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-999900, selected, focus) {
     border-color: #999900;
-    background: linear-gradient(rgba(153, 153, 0, .5), rgba(153, 153, 0, .5));
+    background: linear-gradient(rgba(153, 153, 0, .5), rgba(153, 153, 0, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-999900, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-666600, selected, focus) {
     border-color: #666600;
-    background: linear-gradient(rgba(102, 102, 0, .5), rgba(102, 102, 0, .5));
+    background: linear-gradient(rgba(102, 102, 0, .5), rgba(102, 102, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-333300, selected, focus) {
     border-color: #333300;
-    background: linear-gradient(rgba(51, 51, 0, .5), rgba(51, 51, 0, .5));
+    background: linear-gradient(rgba(51, 51, 0, .5), rgba(51, 51, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-99FF99, selected, focus) {
     border-color: #99FF99;
     background: linear-gradient(rgba(153, 255, 153, .5),
-                                rgba(153, 255, 153, .5));
+                                rgba(153, 255, 153, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-99FF99, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-66FF99, selected, focus) {
     border-color: #66FF99;
     background: linear-gradient(rgba(102, 255, 153, .5),
-                                rgba(102, 255, 153, .5));
+                                rgba(102, 255, 153, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-66FF99, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-33FF33, selected, focus) {
     border-color: #33FF33;
-    background: linear-gradient(rgba(51, 255, 51, .5), rgba(51, 255, 51, .5));
+    background: linear-gradient(rgba(51, 255, 51, .5), rgba(51, 255, 51, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-33FF33, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-33CC00, selected, focus) {
     border-color: #33CC00;
-    background: linear-gradient(rgba(51, 204, 0, .5), rgba(51, 204, 0, .5));
+    background: linear-gradient(rgba(51, 204, 0, .5), rgba(51, 204, 0, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-33CC00, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-009900, selected, focus) {
     border-color: #009900;
-    background: linear-gradient(rgba(0, 153, 0, .5), rgba(0, 153, 0, .5));
+    background: linear-gradient(rgba(0, 153, 0, .5), rgba(0, 153, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-006600, selected, focus) {
     border-color: #006600;
-    background: linear-gradient(rgba(0, 102, 0, .5), rgba(0, 102, 0, .5));
+    background: linear-gradient(rgba(0, 102, 0, .5), rgba(0, 102, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-003300, selected, focus) {
     border-color: #003300;
-    background: linear-gradient(rgba(0, 51, 0, .5), rgba(0, 51, 0, .5));
+    background: linear-gradient(rgba(0, 51, 0, .5), rgba(0, 51, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-99FFFF, selected, focus) {
     border-color: #99FFFF;
     background: linear-gradient(rgba(153, 255, 255, .5),
-                                rgba(153, 255, 255, .5));
+                                rgba(153, 255, 255, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-99FFFF, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-33FFFF, selected, focus) {
     border-color: #33FFFF;
     background: linear-gradient(rgba(51, 255, 255, .5),
-                                rgba(51, 255, 255, .5));
+                                rgba(51, 255, 255, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-33FFFF, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-66CCCC, selected, focus) {
     border-color: #66CCCC;
     background: linear-gradient(rgba(102, 204, 204, .5),
-                                rgba(102, 204, 204, .5));
+                                rgba(102, 204, 204, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-66CCCC, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-00CCCC, selected, focus) {
     border-color: #00CCCC;
-    background: linear-gradient(rgba(0, 204, 204, .5), rgba(0, 204, 204, .5));
+    background: linear-gradient(rgba(0, 204, 204, .5), rgba(0, 204, 204, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-00CCCC, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-339999, selected, focus) {
     border-color: #339999;
     background: linear-gradient(rgba(51, 153, 153, .5),
-                                rgba(51, 153, 153, .5));
+                                rgba(51, 153, 153, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-339999, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-336666, selected, focus) {
     border-color: #336666;
     background: linear-gradient(rgba(51, 102, 102, .5),
-                                rgba(51, 102, 102, .5));
+                                rgba(51, 102, 102, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-003333, selected, focus) {
     border-color: #003333;
-    background: linear-gradient(rgba(0, 51, 51, .5), rgba(0, 51, 51, .5));
+    background: linear-gradient(rgba(0, 51, 51, .5), rgba(0, 51, 51, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-CCFFFF, selected, focus) {
     border-color: #CCFFFF;
     background: linear-gradient(rgba(204, 255, 255, .5),
-                                rgba(204, 255, 255, .5));
+                                rgba(204, 255, 255, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-CCFFFF, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-66FFFF, selected, focus) {
     border-color: #66FFFF;
     background: linear-gradient(rgba(102, 255, 255, .5),
-                                rgba(102, 255, 255, .5));
+                                rgba(102, 255, 255, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-66FFFF, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-33CCFF, selected, focus) {
     border-color: #33CCFF;
     background: linear-gradient(rgba(51, 204, 255, .5),
-                                rgba(51, 204, 255, .5));
+                                rgba(51, 204, 255, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-33CCFF, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-3366FF, selected, focus) {
     border-color: #3366FF;
     background: linear-gradient(rgba(51, 102, 255, .5),
-                                rgba(51, 102, 255, .5));
+                                rgba(51, 102, 255, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-3333FF, selected, focus) {
     border-color: #3333FF;
-    background: linear-gradient(rgba(51, 51, 255, .5), rgba(51, 51, 255, .5));
+    background: linear-gradient(rgba(51, 51, 255, .5), rgba(51, 51, 255, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-000099, selected, focus) {
     border-color: #000099;
-    background: linear-gradient(rgba(0, 0, 153, .5), rgba(0, 0, 153, .5));
+    background: linear-gradient(rgba(0, 0, 153, .5), rgba(0, 0, 153, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-000066, selected, focus) {
     border-color: #000066;
-    background: linear-gradient(rgba(0, 0, 102, .5), rgba(0, 0, 102, .5));
+    background: linear-gradient(rgba(0, 0, 102, .5), rgba(0, 0, 102, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-CCCCFF, selected, focus) {
     border-color: #CCCCFF;
     background: linear-gradient(rgba(204, 204, 255, .5),
-                                rgba(204, 204, 255, .5));
+                                rgba(204, 204, 255, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-CCCCFF, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-9999FF, selected, focus) {
     border-color: #9999FF;
     background: linear-gradient(rgba(153, 153, 255, .5),
-                                rgba(153, 153, 255, .5));
+                                rgba(153, 153, 255, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-9999FF, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-6666CC, selected, focus) {
     border-color: #6666CC;
     background: linear-gradient(rgba(102, 102, 204, .5),
-                                rgba(102, 102, 204, .5));
+                                rgba(102, 102, 204, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-6633FF, selected, focus) {
     border-color: #6633FF;
     background: linear-gradient(rgba(102, 51, 255, .5),
-                                rgba(102, 51, 255, .5));
+                                rgba(102, 51, 255, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-6600CC, selected, focus) {
     border-color: #6600CC;
-    background: linear-gradient(rgba(102, 0, 204, .5), rgba(102, 0, 204, .5));
+    background: linear-gradient(rgba(102, 0, 204, .5), rgba(102, 0, 204, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-333399, selected, focus) {
     border-color: #333399;
-    background: linear-gradient(rgba(51, 51, 153, .5), rgba(51, 51, 153, .5));
+    background: linear-gradient(rgba(51, 51, 153, .5), rgba(51, 51, 153, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-330099, selected, focus) {
     border-color: #330099;
-    background: linear-gradient(rgba(51, 0, 153, .5), rgba(51, 0, 153, .5));
+    background: linear-gradient(rgba(51, 0, 153, .5), rgba(51, 0, 153, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FFCCFF, selected, focus) {
     border-color: #FFCCFF;
     background: linear-gradient(rgba(255, 204, 255, .5),
-                                rgba(255, 204, 255, .5));
+                                rgba(255, 204, 255, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-FFCCFF, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-FF99FF, selected, focus) {
     border-color: #FF99FF;
     background: linear-gradient(rgba(255, 153, 255, .5),
-                                rgba(255, 153, 255, .5));
+                                rgba(255, 153, 255, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-FF99FF, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-CC66CC, selected, focus) {
     border-color: #CC66CC;
     background: linear-gradient(rgba(204, 102, 204, .5),
-                                rgba(204, 102, 204, .5));
+                                rgba(204, 102, 204, .5)) !important;
   }
   treechildren::-moz-tree-cell-text(lc-CC66CC, selected, focus) {
     color: #000;
   }
 
   treechildren::-moz-tree-row(lc-CC33CC, selected, focus) {
     border-color: #CC33CC;
     background: linear-gradient(rgba(204, 51, 204, .5),
-                                rgba(204, 51, 204, .5));
+                                rgba(204, 51, 204, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-993399, selected, focus) {
     border-color: #993399;
     background: linear-gradient(rgba(153, 51, 153, .5),
-                                rgba(153, 51, 153, .5));
+                                rgba(153, 51, 153, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-663366, selected, focus) {
     border-color: #663366;
     background: linear-gradient(rgba(102, 51, 102, .5),
-                                rgba(102, 51, 102, .5));
+                                rgba(102, 51, 102, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-330033, selected, focus) {
     border-color: #330033;
-    background: linear-gradient(rgba(51, 0, 51, .5), rgba(51, 0, 51, .5));
+    background: linear-gradient(rgba(51, 0, 51, .5), rgba(51, 0, 51, .5)) !important;
   }
 }
 
 @media (-moz-os-version: windows-win7) and (-moz-windows-default-theme) {
   treechildren::-moz-tree-row(lc-CCCCCC, selected, focus) {
     background: linear-gradient(rgba(204, 204, 204, .28),
-                                rgba(204, 204, 204, .5));
+                                rgba(204, 204, 204, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-C0C0C0, selected, focus) {
     background: linear-gradient(rgba(192, 192, 192, .28),
-                                rgba(192, 192, 192, .5));
+                                rgba(192, 192, 192, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-999999, selected, focus) {
     background: linear-gradient(rgba(153, 153, 153, .28),
-                                rgba(153, 153, 153, .5));
+                                rgba(153, 153, 153, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-666666, selected, focus) {
     background: linear-gradient(rgba(102, 102, 102, .28),
-                                rgba(102, 102, 102, .5));
+                                rgba(102, 102, 102, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-333333, selected, focus) {
-    background: linear-gradient(rgba(51, 51, 51, .28), rgba(51, 51, 51, .5));
+    background: linear-gradient(rgba(51, 51, 51, .28), rgba(51, 51, 51, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-000000, selected, focus) {
-    background: linear-gradient(rgba(0, 0, 0, .28), rgba(0, 0, 0, .5));
+    background: linear-gradient(rgba(0, 0, 0, .28), rgba(0, 0, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FFCCCC, selected, focus) {
     background: linear-gradient(rgba(255, 204, 204, .28),
-                                rgba(255, 204, 204, .5));
+                                rgba(255, 204, 204, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FF6666, selected, focus) {
     background: linear-gradient(rgba(255, 102, 102, .28),
-                                rgba(255, 102, 102, .5));
+                                rgba(255, 102, 102, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FF0000, selected, focus) {
-    background: linear-gradient(rgba(255, 0, 0, .28), rgba(255, 0, 0, .5));
+    background: linear-gradient(rgba(255, 0, 0, .28), rgba(255, 0, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-CC0000, selected, focus) {
-    background: linear-gradient(rgba(204, 0, 0, .28), rgba(204, 0, 0, .5));
+    background: linear-gradient(rgba(204, 0, 0, .28), rgba(204, 0, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-990000, selected, focus) {
-    background: linear-gradient(rgba(153, 0, 0, .28), rgba(153, 0, 0, .5));
+    background: linear-gradient(rgba(153, 0, 0, .28), rgba(153, 0, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-660000, selected, focus) {
-    background: linear-gradient(rgba(102, 0, 0, .28), rgba(102, 0, 0, .5));
+    background: linear-gradient(rgba(102, 0, 0, .28), rgba(102, 0, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-330000, selected, focus) {
-    background: linear-gradient(rgba(51, 0, 0, .28), rgba(51, 0, 0, .5));
+    background: linear-gradient(rgba(51, 0, 0, .28), rgba(51, 0, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FFCC99, selected, focus) {
     background: linear-gradient(rgba(255, 204, 153, .28),
-                                rgba(255, 204, 153, .5));
+                                rgba(255, 204, 153, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FF9966, selected, focus) {
     background: linear-gradient(rgba(255, 153, 102, .28),
-                                rgba(255, 153, 102, .5));
+                                rgba(255, 153, 102, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FF9900, selected, focus) {
-    background: linear-gradient(rgba(255, 153, 0, .28), rgba(255, 153, 0, .5));
+    background: linear-gradient(rgba(255, 153, 0, .28), rgba(255, 153, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FF6600, selected, focus) {
-    background: linear-gradient(rgba(255, 102, 0, .28), rgba(255, 102, 0, .5));
+    background: linear-gradient(rgba(255, 102, 0, .28), rgba(255, 102, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-CC6600, selected, focus) {
-    background: linear-gradient(rgba(204, 102, 0, .28), rgba(204, 102, 0, .5));
+    background: linear-gradient(rgba(204, 102, 0, .28), rgba(204, 102, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-993300, selected, focus) {
-    background: linear-gradient(rgba(153, 51, 0, .28), rgba(153, 51, 0, .5));
+    background: linear-gradient(rgba(153, 51, 0, .28), rgba(153, 51, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-663300, selected, focus) {
-    background: linear-gradient(rgba(102, 51, 0, .28), rgba(102, 51, 0, .5));
+    background: linear-gradient(rgba(102, 51, 0, .28), rgba(102, 51, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FFFF99, selected, focus) {
     background: linear-gradient(rgba(255, 255, 153, .28),
-                                rgba(255, 255, 153, .5));
+                                rgba(255, 255, 153, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FFFF66, selected, focus) {
     background: linear-gradient(rgba(255, 255, 102, .28),
-                                rgba(255, 255, 102, .5));
+                                rgba(255, 255, 102, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FFCC66, selected, focus) {
     background: linear-gradient(rgba(255, 204, 102, .28),
-                                rgba(255, 204, 102, .5));
+                                rgba(255, 204, 102, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FFCC33, selected, focus) {
     background: linear-gradient(rgba(255, 204, 51, .28),
-                                rgba(255, 204, 51, .5));
+                                rgba(255, 204, 51, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-CC9933, selected, focus) {
     background: linear-gradient(rgba(204, 153, 51, .28),
-                                rgba(204, 153, 51, .5));
+                                rgba(204, 153, 51, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-996633, selected, focus) {
     background: linear-gradient(rgba(153, 102, 51, .28),
-                                rgba(153, 102, 51, .5));
+                                rgba(153, 102, 51, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-663333, selected, focus) {
-    background: linear-gradient(rgba(102, 51, 51, .28), rgba(102, 51, 51, .5));
+    background: linear-gradient(rgba(102, 51, 51, .28), rgba(102, 51, 51, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FFFFCC, selected, focus) {
     background: linear-gradient(rgba(255, 255, 204, .28),
-                                rgba(255, 255, 204, .5));
+                                rgba(255, 255, 204, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FFFF33, selected, focus) {
     background: linear-gradient(rgba(255, 255, 51, .28),
-                                rgba(255, 255, 51, .5));
+                                rgba(255, 255, 51, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FFFF00, selected, focus) {
-    background: linear-gradient(rgba(255, 255, 0, .28), rgba(255, 255, 0, .5));
+    background: linear-gradient(rgba(255, 255, 0, .28), rgba(255, 255, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FFCC00, selected, focus) {
-    background: linear-gradient(rgba(255, 204, 0, .28), rgba(255, 204, 0, .5));
+    background: linear-gradient(rgba(255, 204, 0, .28), rgba(255, 204, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-999900, selected, focus) {
-    background: linear-gradient(rgba(153, 153, 0, .28), rgba(153, 153, 0, .5));
+    background: linear-gradient(rgba(153, 153, 0, .28), rgba(153, 153, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-666600, selected, focus) {
-    background: linear-gradient(rgba(102, 102, 0, .28), rgba(102, 102, 0, .5));
+    background: linear-gradient(rgba(102, 102, 0, .28), rgba(102, 102, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-333300, selected, focus) {
-    background: linear-gradient(rgba(51, 51, 0, .28), rgba(51, 51, 0, .5));
+    background: linear-gradient(rgba(51, 51, 0, .28), rgba(51, 51, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-99FF99, selected, focus) {
     background: linear-gradient(rgba(153, 255, 153, .28),
-                                rgba(153, 255, 153, .5));
+                                rgba(153, 255, 153, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-66FF99, selected, focus) {
     background: linear-gradient(rgba(102, 255, 153, .28),
-                                rgba(102, 255, 153, .5));
+                                rgba(102, 255, 153, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-33FF33, selected, focus) {
-    background: linear-gradient(rgba(51, 255, 51, .28), rgba(51, 255, 51, .5));
+    background: linear-gradient(rgba(51, 255, 51, .28), rgba(51, 255, 51, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-33CC00, selected, focus) {
-    background: linear-gradient(rgba(51, 204, 0, .28), rgba(51, 204, 0, .5));
+    background: linear-gradient(rgba(51, 204, 0, .28), rgba(51, 204, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-009900, selected, focus) {
-    background: linear-gradient(rgba(0, 153, 0, .28), rgba(0, 153, 0, .5));
+    background: linear-gradient(rgba(0, 153, 0, .28), rgba(0, 153, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-006600, selected, focus) {
-    background: linear-gradient(rgba(0, 102, 0, .28), rgba(0, 102, 0, .5));
+    background: linear-gradient(rgba(0, 102, 0, .28), rgba(0, 102, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-003300, selected, focus) {
-    background: linear-gradient(rgba(0, 51, 0, .28), rgba(0, 51, 0, .5));
+    background: linear-gradient(rgba(0, 51, 0, .28), rgba(0, 51, 0, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-99FFFF, selected, focus) {
     background: linear-gradient(rgba(153, 255, 255, .28),
-                                rgba(153, 255, 255, .5));
+                                rgba(153, 255, 255, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-33FFFF, selected, focus) {
     background: linear-gradient(rgba(51, 255, 255, .28),
-                                rgba(51, 255, 255, .5));
+                                rgba(51, 255, 255, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-66CCCC, selected, focus) {
     background: linear-gradient(rgba(102, 204, 204, .28),
-                                rgba(102, 204, 204, .5));
+                                rgba(102, 204, 204, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-00CCCC, selected, focus) {
-    background: linear-gradient(rgba(0, 204, 204, .28), rgba(0, 204, 204, .5));
+    background: linear-gradient(rgba(0, 204, 204, .28), rgba(0, 204, 204, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-339999, selected, focus) {
     background: linear-gradient(rgba(51, 153, 153, .28),
-                                rgba(51, 153, 153, .5));
+                                rgba(51, 153, 153, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-336666, selected, focus) {
     background: linear-gradient(rgba(51, 102, 102, .28),
-                                rgba(51, 102, 102, .5));
+                                rgba(51, 102, 102, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-003333, selected, focus) {
-    background: linear-gradient(rgba(0, 51, 51, .28), rgba(0, 51, 51, .5));
+    background: linear-gradient(rgba(0, 51, 51, .28), rgba(0, 51, 51, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-CCFFFF, selected, focus) {
     background: linear-gradient(rgba(204, 255, 255, .28),
-                                rgba(204, 255, 255, .5));
+                                rgba(204, 255, 255, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-66FFFF, selected, focus) {
     background: linear-gradient(rgba(102, 255, 255, .28),
-                                rgba(102, 255, 255, .5));
+                                rgba(102, 255, 255, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-33CCFF, selected, focus) {
     background: linear-gradient(rgba(51, 204, 255, .28),
-                                rgba(51, 204, 255, .5));
+                                rgba(51, 204, 255, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-3366FF, selected, focus) {
     border-color: #3366FF;
     background: linear-gradient(rgba(51, 102, 255, .28),
-                                rgba(51, 102, 255, .5));
+                                rgba(51, 102, 255, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-3333FF, selected, focus) {
-    background: linear-gradient(rgba(51, 51, 255, .28), rgba(51, 51, 255, .5));
+    background: linear-gradient(rgba(51, 51, 255, .28), rgba(51, 51, 255, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-000099, selected, focus) {
-    background: linear-gradient(rgba(0, 0, 153, .28), rgba(0, 0, 153, .5));
+    background: linear-gradient(rgba(0, 0, 153, .28), rgba(0, 0, 153, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-000066, selected, focus) {
-    background: linear-gradient(rgba(0, 0, 102, .28), rgba(0, 0, 102, .5));
+    background: linear-gradient(rgba(0, 0, 102, .28), rgba(0, 0, 102, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-CCCCFF, selected, focus) {
     background: linear-gradient(rgba(204, 204, 255, .28),
-                                rgba(204, 204, 255, .5));
+                                rgba(204, 204, 255, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-9999FF, selected, focus) {
     background: linear-gradient(rgba(153, 153, 255, .28),
-                                rgba(153, 153, 255, .5));
+                                rgba(153, 153, 255, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-6666CC, selected, focus) {
     background: linear-gradient(rgba(102, 102, 204, .28),
-                                rgba(102, 102, 204, .5));
+                                rgba(102, 102, 204, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-6633FF, selected, focus) {
     background: linear-gradient(rgba(102, 51, 255, .28),
-                                rgba(102, 51, 255, .5));
+                                rgba(102, 51, 255, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-6600CC, selected, focus) {
-    background: linear-gradient(rgba(102, 0, 204, .28), rgba(102, 0, 204, .5));
+    background: linear-gradient(rgba(102, 0, 204, .28), rgba(102, 0, 204, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-333399, selected, focus) {
-    background: linear-gradient(rgba(51, 51, 153, .28), rgba(51, 51, 153, .5));
+    background: linear-gradient(rgba(51, 51, 153, .28), rgba(51, 51, 153, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-330099, selected, focus) {
-    background: linear-gradient(rgba(51, 0, 153, .28), rgba(51, 0, 153, .5));
+    background: linear-gradient(rgba(51, 0, 153, .28), rgba(51, 0, 153, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FFCCFF, selected, focus) {
     background: linear-gradient(rgba(255, 204, 255, .28),
-                                rgba(255, 204, 255, .5));
+                                rgba(255, 204, 255, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-FF99FF, selected, focus) {
     background: linear-gradient(rgba(255, 153, 255, .28),
-                                rgba(255, 153, 255, .5));
+                                rgba(255, 153, 255, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-CC66CC, selected, focus) {
     background: linear-gradient(rgba(204, 102, 204, .28),
-                                rgba(204, 102, 204, .5));
+                                rgba(204, 102, 204, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-CC33CC, selected, focus) {
     background: linear-gradient(rgba(204, 51, 204, .28),
-                                rgba(204, 51, 204, .5));
+                                rgba(204, 51, 204, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-993399, selected, focus) {
     background: linear-gradient(rgba(153, 51, 153, .28),
-                                rgba(153, 51, 153, .5));
+                                rgba(153, 51, 153, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-663366, selected, focus) {
     background: linear-gradient(rgba(102, 51, 102, .28),
-                                rgba(102, 51, 102, .5));
+                                rgba(102, 51, 102, .5)) !important;
   }
 
   treechildren::-moz-tree-row(lc-330033, selected, focus) {
-    background: linear-gradient(rgba(51, 0, 51, .28), rgba(51, 0, 51, .5));
+    background: linear-gradient(rgba(51, 0, 51, .28), rgba(51, 0, 51, .5)) !important;
   }
 }
--- a/mailnews/base/src/nsMsgDBView.cpp
+++ b/mailnews/base/src/nsMsgDBView.cpp
@@ -1417,17 +1417,19 @@ nsMsgDBView::GetRowProperties(int32_t in
   if (NS_FAILED(rv) || !msgHdr)
   {
     ClearHdrCache();
     return NS_MSG_INVALID_DBVIEW_INDEX;
   }
 
   nsCString keywordProperty;
   FetchRowKeywords(index, msgHdr, keywordProperty);
-  if (!keywordProperty.IsEmpty())
+  if (keywordProperty.IsEmpty())
+    properties.AppendLiteral(" untagged");
+  else
     AppendKeywordProperties(keywordProperty, properties, false);
 
   // Give the custom column handlers a chance to style the row.
   for (int i = 0; i < m_customColumnHandlers.Count(); i++)
   {
     nsString extra;
     m_customColumnHandlers[i]->GetRowProperties(index, extra);
     if (!extra.IsEmpty())
@@ -1548,17 +1550,19 @@ nsMsgDBView::GetCellProperties(int32_t a
     else
       properties.AppendLiteral(" notjunk");
 
     NS_ASSERTION(NS_SUCCEEDED(rv), "Converting junkScore to integer failed.");
   }
 
   nsCString keywords;
   FetchRowKeywords(aRow, msgHdr, keywords);
-  if (!keywords.IsEmpty())
+  if (keywords.IsEmpty())
+    properties.AppendLiteral(" untagged");
+  else
     AppendKeywordProperties(keywords, properties, true);
 
   // This is a double fetch of the keywords property since we also fetch
   // it for the tags - do we want to do this?
   // I'm not sure anyone uses the kw- property, though it could be nice
   // for people wanting to extend the thread pane.
   nsCString keywordProperty;
   msgHdr->GetStringProperty("keywords", getter_Copies(keywordProperty));