diff --git a/content/treestyletab/treestyletabbrowser.js b/content/treestyletab/treestyletabbrowser.js
index 6c9dcff7..44b50541 100644
--- a/content/treestyletab/treestyletabbrowser.js
+++ b/content/treestyletab/treestyletabbrowser.js
@@ -1777,21 +1777,25 @@ TreeStyleTabBrowser.prototype = {
 	},
 	setTabbarStyle : function TSTBrowser_setTabbarStyle(aStyle)
 	{
-		if (/^(default|plain|flat|mixed|vertigo|metal|sidebar)$/.test(aStyle))
+		if (/^(default|plain|flat|mixed|vertigo|metal|sidebar)(-aero)?$/.test(aStyle))
 			aStyle = aStyle.toLowerCase();
 
-		if (aStyle == 'default') { // old name (for compatibility)
-			this.setTreePref('tabbar.style', aStyle = 'plain');
+		if (aStyle.indexOf('default') == 0) { // old name (for compatibility)
+			this.setTreePref('tabbar.style', aStyle = aStyle.replace('default', 'plain'));
 		}
 		else if (// dropshadow is available only on Firefox 3.5 or later.
-			aStyle == 'mixed' &&
+			aStyle.indexOf('mixed') == 0 &&
 			this.Comparator.compare(this.XULAppInfo.version, '3.5') < 0
 			) {
-			this.setTreePref('tabbar.style', aStyle = 'flat');
+			this.setTreePref('tabbar.style', aStyle = aStyle.replace('mixed', 'flat'));
 		}
 
 		if (aStyle) {
 			let additionalValues = [];
+			if (/-aero$/.test(aStyle)) {
+				additionalValues.push('aero');
+				aStyle = aStyle.replace('-aero', '')
+			}
 			if (/^(plain|flat|mixed|vertigo)$/.test(aStyle))
 				additionalValues.push('square');
 			if (/^(plain|flat|mixed)$/.test(aStyle))
diff --git a/modules/utils.js b/modules/utils.js
index 50193adc..16ecc5e2 100644
--- a/modules/utils.js
+++ b/modules/utils.js
@@ -766,6 +766,7 @@ var TreeStyleTabUtils = {
 		if (!strip) return;
 		if (aValue) {
 			strip.setAttribute(aAttr, aValue);
+			strip.ownerDocument.documentElement.setAttribute(aAttr, aValue);
 			if (this._tabStripPlaceHolder)
 				this._tabStripPlaceHolder.setAttribute(aAttr, aValue);
 			if (strip.tabsToolbarInnerBox)
@@ -773,6 +774,7 @@ var TreeStyleTabUtils = {
 		}
 		else {
 			strip.removeAttribute(aAttr);
+			strip.ownerDocument.documentElement.removeAttribute(aAttr);
 			if (this._tabStripPlaceHolder)
 				this._tabStripPlaceHolder.removeAttribute(aAttr);
 			if (strip.tabsToolbarInnerBox)
diff --git a/skin/classic/treestyletab/base.css b/skin/classic/treestyletab/base.css
index ebe07856..53ecb29d 100644
--- a/skin/classic/treestyletab/base.css
+++ b/skin/classic/treestyletab/base.css
@@ -74,5 +74,3 @@
   .tabbrowser-arrowscrollbox .tabs-newtab-button {
 	border-style: none !important;
 }
-
-
diff --git a/skin/classic/treestyletab/metal/base-inactive-3.0.css b/skin/classic/treestyletab/metal/base-inactive-3.0.css
index b6a2abdc..fff66794 100644
--- a/skin/classic/treestyletab/metal/base-inactive-3.0.css
+++ b/skin/classic/treestyletab/metal/base-inactive-3.0.css
@@ -3,29 +3,33 @@
 /* tab bar */
 
 :root:not([active="true"]) 
-  .tabbrowser-strip[treestyletab-style="metal"][treestyletab-mode="vertical"] {
+  .tabbrowser-strip[treestyletab-style~="metal"][treestyletab-mode="vertical"] {
 	background: #acacac !important;
 	border-color: #797979 !important;
 }
+:root:not([active="true"])
+  .tabbrowser-strip[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-style~="aero"] {
+	background: transparent !important;
+}
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]:not([overflow="true"])
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]:not([overflow="true"])
   .tabbrowser-arrowscrollbox,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][overflow="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][overflow="true"]
   .tabbrowser-arrowscrollbox .scrollbox-innerbox {
 	background: url("shadow-inactive-l.png") repeat-y top right !important;
 }
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]:not([overflow="true"])
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]:not([overflow="true"])
   .tabbrowser-arrowscrollbox,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"][overflow="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"][overflow="true"]
   .tabbrowser-arrowscrollbox .scrollbox-innerbox {
 	background: url("shadow-inactive-r.png") repeat-y top left !important;
 }
 
-:root:not([active="true"]) tabbrowser[treestyletab-style="metal"]
+:root:not([active="true"]) tabbrowser[treestyletab-style~="metal"]
   .treestyletab-splitter {
 	border-color: #666666 !important;
 	background: #e4e4e4 !important;
@@ -35,41 +39,41 @@
 /* buttons in the tab bar */
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-newtab-button,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-newtab-button:hover,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-alltabs-button,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-alltabs-button:hover,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-container > .tabs-closebutton,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   > .tabs-closebutton,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-container > .tabs-closebutton:hover,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   > .tabs-closebutton:hover {
 	background: #e4e4e4 !important;
 	border-color: #666666 !important;
 }
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
   .tabbrowser-arrowscrollbox .tabs-newtab-button {
 	background: #cecece url("shadow-inactive-l.png") repeat-y top right !important;
 	border-color: #9a9a9a !important;
 }
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-arrowscrollbox .tabs-newtab-button {
 	background: #cecece url("shadow-inactive-r.png") repeat-y top left !important;
 	border-color: #9a9a9a !important;
@@ -79,9 +83,9 @@
 /* hacks for Tab Mix Plus */
 
 :root[treestyletab-enable-compatibility-tmp="true"]:not([active="true"])
-  tabbrowser[treestyletab-style="metal"][treestyletab-mode="vertical"] .tabs-closebutton-topbox > .tabs-closebutton,
+  tabbrowser[treestyletab-style~="metal"][treestyletab-mode="vertical"] .tabs-closebutton-topbox > .tabs-closebutton,
 :root[treestyletab-enable-compatibility-tmp="true"]:not([active="true"])
-  tabbrowser[treestyletab-style="metal"][treestyletab-mode="vertical"] .tabs-closebutton-topbox > .tabs-closebutton:hover {
+  tabbrowser[treestyletab-style~="metal"][treestyletab-mode="vertical"] .tabs-closebutton-topbox > .tabs-closebutton:hover {
 	background: #e4e4e4 !important;
 	border-color: #666666 !important;
 }
diff --git a/skin/classic/treestyletab/metal/base-inactive-3.7.css b/skin/classic/treestyletab/metal/base-inactive-3.7.css
index 7c37a600..fd47b83d 100644
--- a/skin/classic/treestyletab/metal/base-inactive-3.7.css
+++ b/skin/classic/treestyletab/metal/base-inactive-3.7.css
@@ -3,29 +3,33 @@
 /* tab bar */
 
 :root:-moz-window-inactive
-  .tabbrowser-strip[treestyletab-style="metal"][treestyletab-mode="vertical"] {
+  .tabbrowser-strip[treestyletab-style~="metal"][treestyletab-mode="vertical"] {
 	background: #acacac !important;
 	border-color: #797979 !important;
 }
+:root:-moz-window-inactive
+  .tabbrowser-strip[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-style~="aero"] {
+	background: transparent !important;
+}
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]:not([overflow="true"])
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]:not([overflow="true"])
   .tabbrowser-arrowscrollbox,
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][overflow="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][overflow="true"]
   .tabbrowser-arrowscrollbox .scrollbox-innerbox {
 	background: url("shadow-inactive-l.png") repeat-y top right !important;
 }
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]:not([overflow="true"])
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]:not([overflow="true"])
   .tabbrowser-arrowscrollbox,
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"][overflow="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"][overflow="true"]
   .tabbrowser-arrowscrollbox .scrollbox-innerbox {
 	background: url("shadow-inactive-r.png") repeat-y top left !important;
 }
 
-:root:-moz-window-inactive tabbrowser[treestyletab-style="metal"]
+:root:-moz-window-inactive tabbrowser[treestyletab-style~="metal"]
   .treestyletab-splitter {
 	border-color: #666666 !important;
 	background: #e4e4e4 !important;
@@ -35,29 +39,29 @@
 /* buttons in the tab bar */
 
 :root:-moz-window-inactive
-  #TabsToolbar[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  #TabsToolbar[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   > toolbarbutton,
 :root:-moz-window-inactive
-  #TabsToolbar[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  #TabsToolbar[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   > toolbarbutton:hover,
 :root:-moz-window-inactive
-  #TabsToolbar[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  #TabsToolbar[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   > toolbarpaletteitem > toolbarbutton,
 :root:-moz-window-inactive
-  #TabsToolbar[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  #TabsToolbar[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   > toolbarpaletteitem > toolbarbutton:hover {
 	background: #e4e4e4 !important;
 	border-color: #666666 !important;
 }
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
   .tabbrowser-arrowscrollbox .tabs-newtab-button {
 	background: #cecece url("shadow-inactive-l.png") repeat-y top right !important;
 	border-color: #9a9a9a !important;
 }
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-arrowscrollbox .tabs-newtab-button {
 	background: #cecece url("shadow-inactive-r.png") repeat-y top left !important;
 	border-color: #9a9a9a !important;
@@ -68,10 +72,10 @@
 /* hacks for Tab Mix Plus */
 
 :root[treestyletab-enable-compatibility-tmp="true"]:-moz-window-inactive
-  tabbrowser[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  tabbrowser[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-closebutton-topbox > .tabs-closebutton,
 :root[treestyletab-enable-compatibility-tmp="true"]:-moz-window-inactive
-  tabbrowser[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  tabbrowser[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-closebutton-topbox > .tabs-closebutton:hover {
 	background: #e4e4e4 !important;
 	border-color: #666666 !important;
diff --git a/skin/classic/treestyletab/metal/base.css b/skin/classic/treestyletab/metal/base.css
index 185afee4..7a54275c 100644
--- a/skin/classic/treestyletab/metal/base.css
+++ b/skin/classic/treestyletab/metal/base.css
@@ -2,8 +2,8 @@
 
 /* tab bar */
 
-#TabsToolbar[treestyletab-style="metal"]:not([treestyletab-tabbar-position="top"]),
-#TabsToolbar[treestyletab-style="metal"][treestyletab-tabbar-position="top"]:not([treestyletab-tabbar-fixed="true"]) {
+#TabsToolbar[treestyletab-style~="metal"]:not([treestyletab-tabbar-position="top"]),
+#TabsToolbar[treestyletab-style~="metal"][treestyletab-tabbar-position="top"]:not([treestyletab-tabbar-fixed="true"]) {
 	background: transparent !important;
 	border: 0 none !important;
 	margin: 0 !important;
@@ -12,124 +12,124 @@
 	-moz-box-shadow: none !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs[treestyletab-style~="metal"]:not([treestyletab-tabbar-position="top"])
   .tabs-bottom,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-left,
-.tabbrowser-tabs[treestyletab-style="metal"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs[treestyletab-style~="metal"]:not([treestyletab-tabbar-position="top"])
   .tab-text-shadow /* Mac OS X */ {
 	display: none !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab:first-child,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab:first-child:hover,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab:first-child[selected="true"],
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab:first-child[selected="true"]:hover {
 	margin-top: 5px !important;
 }
 
-.tabbrowser-strip[treestyletab-style="metal"][treestyletab-mode="vertical"] {
+.tabbrowser-strip[treestyletab-style~="metal"][treestyletab-mode="vertical"] {
 	background: #797979 !important;
 	border: 1px solid #444444 !important;
 	border-width: 1px 0 0 !important;
 	padding: 0 !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"] {
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"] {
 	background: transparent !important;
 	margin: 0;
 	-moz-appearance: none !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]:not([overflow="true"])
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]:not([overflow="true"])
   .tabbrowser-arrowscrollbox,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][overflow="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][overflow="true"]
   .tabbrowser-arrowscrollbox .scrollbox-innerbox {
 	background: url("shadow-active-l.png") repeat-y top right !important;
 }
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]:not([overflow="true"])
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]:not([overflow="true"])
   .tabbrowser-arrowscrollbox,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"][overflow="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"][overflow="true"]
   .tabbrowser-arrowscrollbox .scrollbox-innerbox {
 	background: url("shadow-active-r.png") repeat-y top left !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-container,
-#TabsToolbar .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"] {
+#TabsToolbar .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"] {
 	padding: 0 !important;
 }
 
-tabbrowser[treestyletab-style="metal"][treestyletab-mode="vertical"]
+tabbrowser[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .treestyletab-splitter {
 	background: #b3b2b3 !important;
 	border: 0 solid #666666 !important;
 	min-width: 5px;
 	-moz-appearance: none !important;
 }
-tabbrowser[treestyletab-style="metal"][treestyletab-tabbar-position="left"]
+tabbrowser[treestyletab-style~="metal"][treestyletab-tabbar-position="left"]
   .treestyletab-splitter,
-.tabbrowser-strip[treestyletab-style="metal"][treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"],
-#TabsToolbar[treestyletab-style="metal"][treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"] {
+.tabbrowser-strip[treestyletab-style~="metal"][treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"],
+#TabsToolbar[treestyletab-style~="metal"][treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"] {
 	border-right: 1px solid #666666 !important;
 }
-tabbrowser[treestyletab-style="metal"][treestyletab-tabbar-position="right"]
+tabbrowser[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
   .treestyletab-splitter,
-.tabbrowser-strip[treestyletab-style="metal"][treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"],
-#TabsToolbar[treestyletab-style="metal"][treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"] {
+.tabbrowser-strip[treestyletab-style~="metal"][treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"],
+#TabsToolbar[treestyletab-style~="metal"][treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"] {
 	border-left: 1px solid #666666 !important;
 }
 
 
 /* tab contents */
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab .tab-icon {
 	margin: -10px -5px !important;
 	padding: 10px 5px !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab label {
 	text-shadow: 0 1px 0 rgba(255, 255, 255, 0.4);
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab:hover .tab-icon,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"]:hover .tab-icon {
 	background: url("icon-bg.png") no-repeat right center !important;
 }
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-tab-contents-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tab-contents-inverted="true"]
   .tabbrowser-tab:hover .tab-icon,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-tab-contents-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tab-contents-inverted="true"]
   .tabbrowser-tab[selected="true"]:hover .tab-icon {
 	background-position: left center !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab .tab-icon .tab-icon-image {
 	width: 16px !important;
 	height: 16px !important;
 	margin: 0 0 0 6px !important;
 }
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-tab-contents-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tab-contents-inverted="true"]
   .tabbrowser-tab .tab-icon .tab-icon-image {
 	margin: 0 6px 0 0 !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab .tab-text {
 	margin: 0 !important;
 	padding: 3px 4px 4px !important;
 	text-align: center !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab .tab-close-button {
 	z-index: 1 !important; /* for Linux */
 	margin: 0 !important;
@@ -140,28 +140,28 @@ tabbrowser[treestyletab-style="metal"][treestyletab-tabbar-position="right"]
 
 /* twisty */
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-twisty-style][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-twisty-style][treestyletab-mode="vertical"]
   .treestyletab-twisty-container {
 	position: relative;
 	margin: 0 6px 0 -6px;
 }
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-twisty-style="retro"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-twisty-style="retro"][treestyletab-mode="vertical"]
   .treestyletab-twisty-container {
 	margin: 0;
 }
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-twisty-style="retro"]:not([treestyletab-tab-contents-inverted="true"])
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-twisty-style="retro"]:not([treestyletab-tab-contents-inverted="true"])
   .tabbrowser-tab .tab-icon {
 	margin-left: -6px !important;
 }
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-twisty-style][treestyletab-tab-contents-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-twisty-style][treestyletab-tab-contents-inverted="true"]
   .treestyletab-twisty-container {
 	margin: 0 -12px 0 12px;
 }
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-twisty-style="retro"][treestyletab-tab-contents-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-twisty-style="retro"][treestyletab-tab-contents-inverted="true"]
   .treestyletab-twisty-container {
 	margin: 0 -6px 0 6px;
 }
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-twisty-style="retro"][treestyletab-tab-contents-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-twisty-style="retro"][treestyletab-tab-contents-inverted="true"]
   .tabbrowser-tab .tab-icon {
 	margin-right: -6px !important;
 }
@@ -171,49 +171,49 @@ tabbrowser[treestyletab-style="metal"][treestyletab-tabbar-position="right"]
 /* buttons in the tab bar */
 
 /* Firefox 3.6 or older */
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-newtab-button,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-newtab-button:hover,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-alltabs-button,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-alltabs-button:hover,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-container > .tabs-closebutton,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   > .tabs-closebutton,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-container > .tabs-closebutton:hover,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   > .tabs-closebutton:hover,
 /* Firefox 4.0 or later */
-#TabsToolbar[treestyletab-style="metal"][treestyletab-mode="vertical"]
+#TabsToolbar[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   > toolbarbutton,
-#TabsToolbar[treestyletab-style="metal"][treestyletab-mode="vertical"]
+#TabsToolbar[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   > toolbarbutton:hover,
-#TabsToolbar[treestyletab-style="metal"][treestyletab-mode="vertical"]
+#TabsToolbar[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   > toolbarpaletteitem > toolbarbutton,
-#TabsToolbar[treestyletab-style="metal"][treestyletab-mode="vertical"]
+#TabsToolbar[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   > toolbarpaletteitem > toolbarbutton:hover {
 	background: #b3b2b3 !important;
 	border-top: 1px solid #666666 !important;
 }
 
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-arrowscrollbox .tabs-newtab-button {
 	margin-top: 1px !important;
 	height: 18px !important;
 	border: 1px solid #666666 !important;
 }
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
   .tabbrowser-arrowscrollbox .tabs-newtab-button {
 	background: #9a9a9a url("shadow-active-l.png") repeat-y top right !important;
 	margin-left: 6px !important;
 	-moz-border-radius: 6px 0 0 6px;
 }
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-arrowscrollbox .tabs-newtab-button {
 	background: #9a9a9a url("shadow-active-r.png") repeat-y top left !important;
 	margin-right: 6px !important;
@@ -221,35 +221,35 @@ tabbrowser[treestyletab-style="metal"][treestyletab-tabbar-position="right"]
 }
 
 /* Firefox 3.6 or older */
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-tabbar-position="left"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tabbar-position="left"]
   .tabs-newtab-button,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-tabbar-position="left"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tabbar-position="left"]
   .tabs-alltabs-button,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-tabbar-position="left"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tabbar-position="left"]
   .tabs-container > .tabs-closebutton,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-tabbar-position="left"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tabbar-position="left"]
   > .tabs-closebutton,
 /* Firefox 4.0 or later */
-#TabsToolbar[treestyletab-style="metal"][treestyletab-tabbar-position="left"]
+#TabsToolbar[treestyletab-style~="metal"][treestyletab-tabbar-position="left"]
   > toolbarbutton,
-#TabsToolbar[treestyletab-style="metal"][treestyletab-tabbar-position="left"]
+#TabsToolbar[treestyletab-style~="metal"][treestyletab-tabbar-position="left"]
   > toolbarpaletteitem > toolbarbutton {
 	border-right: 1px solid #666666 !important;
 }
 
 /* Firefox 3.6 or older */
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-tabbar-position="right"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
   .tabs-newtab-button,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-tabbar-position="right"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
   .tabs-alltabs-button,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-tabbar-position="right"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
   .tabs-container > .tabs-closebutton,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-tabbar-position="right"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
   > .tabs-closebutton,
 /* Firefox 4.0 or later */
-#TabsToolbar[treestyletab-style="metal"][treestyletab-tabbar-position="right"]
+#TabsToolbar[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
   > toolbarbutton,
-#TabsToolbar[treestyletab-style="metal"][treestyletab-tabbar-position="right"]
+#TabsToolbar[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
   > toolbarpaletteitem > toolbarbutton {
 	border-left: 1px solid #666666 !important;
 }
@@ -261,23 +261,23 @@ tabbrowser[treestyletab-style="metal"][treestyletab-tabbar-position="right"]
 /* buttons in the tab bar */
 
 :root[treestyletab-enable-compatibility-tmp="true"]
-  tabbrowser[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  tabbrowser[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-closebutton-topbox > .tabs-closebutton,
 :root[treestyletab-enable-compatibility-tmp="true"]
-  tabbrowser[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  tabbrowser[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabs-closebutton-topbox > .tabs-closebutton:hover {
 	background: #b3b2b3 !important;
 	border-top: 1px solid #666666 !important;
 }
 
 :root[treestyletab-enable-compatibility-tmp="true"]
-  tabbrowser[treestyletab-style="metal"][treestyletab-tabbar-position="left"]
+  tabbrowser[treestyletab-style~="metal"][treestyletab-tabbar-position="left"]
   .tabs-closebutton-topbox > .tabs-closebutton {
 	border-right: 1px solid #666666 !important;
 }
 
 :root[treestyletab-enable-compatibility-tmp="true"]
-  tabbrowser[treestyletab-style="metal"][treestyletab-tabbar-position="right"]
+  tabbrowser[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
   .tabs-closebutton-topbox > .tabs-closebutton {
 	border-left: 1px solid #666666 !important;
 }
diff --git a/skin/classic/treestyletab/metal/metal.css b/skin/classic/treestyletab/metal/metal.css
index ccef0e10..aa166021 100644
--- a/skin/classic/treestyletab/metal/metal.css
+++ b/skin/classic/treestyletab/metal/metal.css
@@ -2,3 +2,15 @@
 @import url("base-inactive.css");
 @import url("tab.css");
 
+
+
+/* aero glass */
+
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+.tabbrowser-strip[treestyletab-style~="metal"][treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+tabbrowser[treestyletab-style~="metal"][treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+:root[treestyletab-style~="metal"][treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]) #appcontent,
+:root[treestyletab-style~="metal"][treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]) #browser {
+	background: transparent !important;
+	-moz-appearance: none !important;
+}
diff --git a/skin/classic/treestyletab/metal/tab-3.5.css b/skin/classic/treestyletab/metal/tab-3.5.css
index 32813ef4..90fb6bc8 100644
--- a/skin/classic/treestyletab/metal/tab-3.5.css
+++ b/skin/classic/treestyletab/metal/tab-3.5.css
@@ -2,13 +2,13 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab:hover,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"],
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"]:hover {
 	background: none transparent !important;
 	border: 2px solid transparent !important;
@@ -29,13 +29,13 @@
 	-moz-border-radius: 0 !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-left,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-close-button,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-right {
 	border: 10px solid transparent;
 	margin: 0 !important;
@@ -43,35 +43,35 @@
 	-moz-appearance: none !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-middle > .tab-icon {
 	margin-top: -16px !important;
 	margin-bottom: -14px !important;
 }
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-middle > .tab-text,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-middle > *,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-close-button > * {
 	margin-top: -10px !important;
 	margin-bottom: -10px !important;
 }
 
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
   .tabbrowser-tab:not([treestyletab-drop-position="self"]) {
 	border-right: 0 none !important;
 	-moz-border-right-colors: none !important;
 }
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab:not([treestyletab-drop-position="self"]) {
 	border-left: 0 none !important;
 	-moz-border-left-colors: none !important;
 }
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
   .tabbrowser-tab:not([treestyletab-drop-position="self"]) .tab-image-right,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab:not([treestyletab-drop-position="self"]) .tab-image-left {
 	padding-right: 2px !important;
 }
@@ -80,22 +80,22 @@
 
 /* background, left */
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-left {
 	border-right-width: 0;
 	-moz-border-image: url("tab-active-l.png") 10 / 10px 0 10px 10px;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-close-button {
 	border-left-width: 0;
 	border-right-width: 0;
 	-moz-border-image: url("tab-active-l.png") 10 / 10px 0 10px 0;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-right {
 	border-left-width: 0;
 	-moz-border-image: url("tab-active-l.png") 10 / 10px 10px 10px 0;
@@ -105,19 +105,19 @@
 
 /* background, right */
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-left {
 	-moz-border-image: url("tab-active-r.png") 10 / 10px 0 10px 10px;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-close-button {
 	-moz-border-image: url("tab-active-r.png") 10 / 10px 0 10px 0;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-right {
 	-moz-border-image: url("tab-active-r.png") 10 / 10px 10px 10px 0;
 }
@@ -125,19 +125,19 @@
 
 /* foreground, left */
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-left[selected="true"] {
 	-moz-border-image: url("tab-active-selected-l.png") 10 / 10px 0 10px 10px;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-middle[selected="true"],
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   [selected="true"] .tab-close-button {
 	-moz-border-image: url("tab-active-selected-l.png") 10 / 10px 0 10px 0;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-right[selected="true"] {
 	-moz-border-image: url("tab-active-selected-l.png") 10 / 10px 10px 10px 0;
 }
@@ -146,19 +146,19 @@
 
 /* foreground, right */
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-left[selected="true"] {
 	-moz-border-image: url("tab-active-selected-r.png") 10 / 10px 0 10px 10px;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-middle[selected="true"],
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   [selected="true"] .tab-close-button {
 	-moz-border-image: url("tab-active-selected-r.png") 10 / 10px 0 10px 0;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-right[selected="true"] {
 	-moz-border-image: url("tab-active-selected-r.png") 10 / 10px 10px 10px 0;
 }
@@ -167,16 +167,16 @@
 
 /* pinned tabs */
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"] >
   .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"]:hover >
   .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected] >
   .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected]:hover >
   .tab-image-middle {
 	background: none !important;
@@ -185,13 +185,13 @@
 	padding: 0 !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"],
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"]:hover,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected="true"],
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected="true"]:hover {
 	background: none !important;
 	border: none !important;
@@ -199,7 +199,7 @@
 	-moz-border-radius: 0 !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"] >
   .tab-image-middle >
   * {
@@ -207,16 +207,16 @@
 	padding: 0 !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"] >
   .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"]:hover >
   .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected="true"] >
   .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected="true"]:hover >
   .tab-image-middle {
 	background: #9d9d9d !important;
@@ -226,10 +226,10 @@
 	-moz-border-radius: 4px !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected="true"] >
   .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected="true"]:hover >
   .tab-image-middle {
 	background-color: #b3b2b3 !important;
diff --git a/skin/classic/treestyletab/metal/tab-inactive-3.5.css b/skin/classic/treestyletab/metal/tab-inactive-3.5.css
index a04bfdab..0b7b0430 100644
--- a/skin/classic/treestyletab/metal/tab-inactive-3.5.css
+++ b/skin/classic/treestyletab/metal/tab-inactive-3.5.css
@@ -3,22 +3,22 @@
 /* background, left */
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-left {
 	-moz-border-image: url("tab-inactive-l.png") 10 / 10px 0 10px 10px;
 }
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-middle,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-close-button {
 	-moz-border-image: url("tab-inactive-l.png") 10 / 10px 0 10px 0;
 }
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-right {
 	-moz-border-image: url("tab-inactive-l.png") 10 / 10px 10px 10px 0;
 }
@@ -28,22 +28,22 @@
 /* background, right */
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-left {
 	-moz-border-image: url("tab-inactive-r.png") 10 / 10px 0 10px 10px;
 }
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-middle,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-close-button {
 	-moz-border-image: url("tab-inactive-r.png") 10 / 10px 0 10px 0;
 }
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-right {
 	-moz-border-image: url("tab-inactive-r.png") 10 / 10px 10px 10px 0;
 }
@@ -53,22 +53,22 @@
 /* foreground, left */
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-left[selected="true"] {
 	-moz-border-image: url("tab-inactive-selected-l.png") 10 / 10px 0 10px 10px;
 }
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-middle[selected="true"],
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   [selected="true"] .tab-close-button {
 	-moz-border-image: url("tab-inactive-selected-l.png") 10 / 10px 0 10px 0;
 }
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-right[selected="true"] {
 	-moz-border-image: url("tab-inactive-selected-l.png") 10 / 10px 10px 10px 0;
 }
@@ -78,22 +78,22 @@
 /* foreground, right */
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-left[selected="true"] {
 	-moz-border-image: url("tab-inactive-selected-r.png") 10 / 10px 0 10px 10px;
 }
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-middle[selected="true"],
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   [selected="true"] .tab-close-button {
 	-moz-border-image: url("tab-inactive-selected-r.png") 10 / 10px 0 10px 0;
 }
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-right[selected="true"] {
 	-moz-border-image: url("tab-inactive-selected-r.png") 10 / 10px 10px 10px 0;
 }
diff --git a/skin/classic/treestyletab/metal/tab-inactive-3.7.css b/skin/classic/treestyletab/metal/tab-inactive-3.7.css
index 5162ef32..358c97f2 100644
--- a/skin/classic/treestyletab/metal/tab-inactive-3.7.css
+++ b/skin/classic/treestyletab/metal/tab-inactive-3.7.css
@@ -3,22 +3,22 @@
 /* background, left */
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-left {
 	-moz-border-image: url("tab-inactive-l.png") 10 / 10px 0 10px 10px;
 }
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-middle,
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-close-button {
 	-moz-border-image: url("tab-inactive-l.png") 10 / 10px 0 10px 0;
 }
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-right {
 	-moz-border-image: url("tab-inactive-l.png") 10 / 10px 10px 10px 0;
 }
@@ -28,22 +28,22 @@
 /* background, right */
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-left {
 	-moz-border-image: url("tab-inactive-r.png") 10 / 10px 0 10px 10px;
 }
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-middle,
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-close-button {
 	-moz-border-image: url("tab-inactive-r.png") 10 / 10px 0 10px 0;
 }
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-right {
 	-moz-border-image: url("tab-inactive-r.png") 10 / 10px 10px 10px 0;
 }
@@ -53,22 +53,22 @@
 /* foreground, left */
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-left[selected="true"] {
 	-moz-border-image: url("tab-inactive-selected-l.png") 10 / 10px 0 10px 10px;
 }
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-middle[selected="true"],
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   [selected="true"] .tab-close-button {
 	-moz-border-image: url("tab-inactive-selected-l.png") 10 / 10px 0 10px 0;
 }
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tab-image-right[selected="true"] {
 	-moz-border-image: url("tab-inactive-selected-l.png") 10 / 10px 10px 10px 0;
 }
@@ -78,22 +78,22 @@
 /* foreground, right */
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-left[selected="true"] {
 	-moz-border-image: url("tab-inactive-selected-r.png") 10 / 10px 0 10px 10px;
 }
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-middle[selected="true"],
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   [selected="true"] .tab-close-button {
 	-moz-border-image: url("tab-inactive-selected-r.png") 10 / 10px 0 10px 0;
 }
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-right[selected="true"] {
 	-moz-border-image: url("tab-inactive-selected-r.png") 10 / 10px 10px 10px 0;
 }
@@ -102,29 +102,29 @@
 /* pinned tabs */
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"] >
   .tab-image-middle,
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"]:hover >
   .tab-image-middle {
 	background: #cecece !important;
 }
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected="true"] >
   .tab-image-middle,
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected="true"]:hover >
   .tab-image-middle {
 	background: #e4e4e4 !important;
 }
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"] >
   .tab-image-middle {
 	border-color: #9a9a9a !important;
diff --git a/skin/classic/treestyletab/metal/tab.css b/skin/classic/treestyletab/metal/tab.css
index cc6d1076..192818a6 100644
--- a/skin/classic/treestyletab/metal/tab.css
+++ b/skin/classic/treestyletab/metal/tab.css
@@ -1,12 +1,12 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab:hover,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"],
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"]:hover {
 	background: transparent none !important;
 	border: 2px solid transparent !important;
@@ -25,127 +25,127 @@
 	-moz-border-radius: 0 !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab .tab-close-button > * {
 	margin: 0 !important;
 }
 
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
   .tabbrowser-tab:not([treestyletab-drop-position="self"]),
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
   .tabbrowser-tab[selected="true"]:not([treestyletab-drop-position="self"]) {
 	border-right: 0 none !important;
 	-moz-border-right-colors: none !important;
 }
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab:not([treestyletab-drop-position="self"]),
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"]:not([treestyletab-drop-position="self"]) {
 	border-left: 0 none !important;
 	-moz-border-left-colors: none !important;
 }
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
   .tabbrowser-tab:not([treestyletab-drop-position="self"]) .tab-image-right,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
   .tabbrowser-tab[selected="true"]:not([treestyletab-drop-position="self"]) .tab-image-right,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab:not([treestyletab-drop-position="self"]) .tab-image-left,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"]:not([treestyletab-drop-position="self"]) .tab-image-left {
 	width: 10px !important;
 }
 
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab:hover .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab .tab-close-button,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab:hover .tab-close-button {
 	background: url("tab-active-middle.png") repeat-x top left !important;
 	margin: 0 !important;
 	-moz-appearance: none !important;
 }
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab .tab-image-middle,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab:hover .tab-image-middle,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab .tab-close-button,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab:hover .tab-close-button {
 	background-image: url("tab-inactive-middle.png") !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab .tab-image-left,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab:hover .tab-image-left {
 	background: url("tab-active-l.png") no-repeat top left !important;
 	width: 10px !important;
 }
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab .tab-image-left,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab:hover .tab-image-left {
 	background-image: url("tab-inactive-l.png") !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab .tab-image-right,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab:hover .tab-image-right {
 	background: url("tab-active-l.png") no-repeat top right !important;
 	width: 8px !important;
 }
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab .tab-image-right,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab:hover .tab-image-right {
 	background-image: url("tab-inactive-l.png")  !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"] .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"]:hover .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"] .tab-close-button,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"]:hover .tab-close-button,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"] .tab-image-right,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"]:hover .tab-image-right {
 	background: url("tab-active-middle-selected.png") repeat-x top left !important;
 }
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"] .tab-image-middle,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"]:hover .tab-image-middle,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"] .tab-close-button,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"]:hover .tab-close-button,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"] .tab-image-right,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"]:hover .tab-image-right {
 	background-image: url("tab-inactive-middle-selected.png") !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"] .tab-image-left,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"]:hover .tab-image-left {
 	background: url("tab-active-selected-l.png") no-repeat top left !important;
 }
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"] .tab-image-left,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"]:hover .tab-image-left {
 	background-image: url("tab-inactive-selected-l.png") !important;
 }
@@ -153,93 +153,93 @@
 
 
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab:hover .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab .tab-close-button,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab:hover .tab-close-button {
 	background: url("tab-active-middle.png") repeat-x top left !important;
 }
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab .tab-image-middle,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab:hover .tab-image-middle,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab .tab-close-button,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab:hover .tab-close-button {
 	background-image: url("tab-inactive-middle.png") !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab .tab-image-left,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab:hover .tab-image-left {
 	background: url("tab-active-r.png") no-repeat top left !important;
 	width: 8px !important;
 }
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab .tab-image-left,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab:hover .tab-image-left {
 	background-image: url("tab-inactive-r.png")  !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab .tab-image-right,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab:hover .tab-image-right {
 	background: url("tab-active-r.png") no-repeat top right !important;
 	width: 10px !important;
 }
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab .tab-image-right,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab:hover .tab-image-right {
 	background-image: url("tab-inactive-r.png") !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"] .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"]:hover .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"] .tab-close-button,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"]:hover .tab-close-button,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"] .tab-image-left,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"]:hover .tab-image-left {
 	background: url("tab-active-middle-selected.png") repeat-x top left !important;
 }
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"] .tab-image-middle,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"]:hover .tab-image-middle,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"] .tab-close-button,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"]:hover .tab-close-button,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"] .tab-image-left,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"]:hover .tab-image-left {
 	background-image: url("tab-inactive-middle-selected.png") !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"] .tab-image-right,
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"]:hover .tab-image-right {
 	background: url("tab-active-selected-r.png") no-repeat top right !important;
 }
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"] .tab-image-right,
-:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+:root:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab[selected="true"]:hover .tab-image-right {
 	background-image: url("tab-inactive-selected-r.png") !important;
 }
diff --git a/skin/classic/treestyletab/sidebar/base.css b/skin/classic/treestyletab/sidebar/base.css
index 623caa06..38b126bb 100644
--- a/skin/classic/treestyletab/sidebar/base.css
+++ b/skin/classic/treestyletab/sidebar/base.css
@@ -2,43 +2,43 @@
 
 /* Unset bottom border, instead let's have a border on the right-hand
    side, much like the sidebar does. */
-.tabbrowser-strip[treestyletab-style="sidebar"][treestyletab-mode="vertical"],
-#TabsToolbar[treestyletab-style="sidebar"][treestyletab-mode="vertical"] {
+.tabbrowser-strip[treestyletab-style~="sidebar"][treestyletab-mode="vertical"],
+#TabsToolbar[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] {
   border-top: 1px solid #404040;
   border-bottom: none !important;
 }
 
 /* Background colour for the tree sidebar (light blue when window is
    active, grey otherwise) */
-.tabbrowser-strip[treestyletab-style="sidebar"][treestyletab-mode="vertical"] {
+.tabbrowser-strip[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] {
   background: transparent !important;
   background-color: #d4dde5 !important;
 }
 
 /* Don't display unnecessary clutter */
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .tabs-bottom,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .tabs-left,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .tab-text-shadow,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .treestyletab-splitter grippy {
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] .tabs-bottom,
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] .tabs-left,
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] .tab-text-shadow,
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] .treestyletab-splitter grippy {
   display: none !important;
 }
 
 /* Use the splitter to display the border of .tabbrowser-strip */
-tabbrowser[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .treestyletab-splitter {
+tabbrowser[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] .treestyletab-splitter {
   width: 1px !important;
   min-width: 1px !important;
   background-image: none;
   background-color: #404040;
 }
-.tabbrowser-strip[treestyletab-style="sidebar"][treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"] {
+.tabbrowser-strip[treestyletab-style~="sidebar"][treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"] {
   border-right: 1px solid #404040;
 }
-.tabbrowser-strip[treestyletab-style="sidebar"][treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"] {
+.tabbrowser-strip[treestyletab-style~="sidebar"][treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"] {
   border-left: 1px solid #404040;
 }
 
 /* Style tabs themselves.  Get rid of most of the initial XUL styling */
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab {
   -moz-appearance: none !important;
   background: transparent !important;
@@ -58,58 +58,58 @@ tabbrowser[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .treestyl
   border: none;
   border-top: 1px solid transparent !important;
 }
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"] {
   padding: 2px 0 0 4px !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"] {
   border-top: 1px solid #94A1C0 !important;
   background: -moz-linear-gradient(top, #A0B0CF, #7386AB) repeat-x !important;
 }
 
 /* Keep the close button at a safe distance from the tab label. */
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .tab-close-button {
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] .tab-close-button {
   margin-left: 3px;
 }
 
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 .tab-close-button image {
   list-style-image: url("closetab.png");
   opacity: 0.27;  /* turn black into #b9b9b9 */
 }
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 .tab-close-button:active image {
   opacity: 0.46;  /* turn black into #8a8a8a */
 }
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .tabbrowser-tab[selected="true"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] .tabbrowser-tab[selected="true"]
 .tab-close-button image {
   list-style-image: url("closetab-white.png");
   opacity: 1;
 }
 
 /* Always display the favicon at 100% opacity */
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 .tabbrowser-tab:not(:hover):not([selected="true"]) .tab-icon-image {
   opacity: 1.0 !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 .tabbrowser-tab:not(:hover):not([selected="true"]) > .tab-close-button {
   display: none !important;
 }
 
 /* Tab label is without special decoration except when selected: then
    the text is white and bold. */
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .tab-text {
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] .tab-text {
   font-size: 11px;
   font-weight: normal !important;
   color: #000000 !important;
   text-shadow: none !important;
   margin-bottom: 1px;
 }
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 .tabbrowser-tab[selected="true"] .tab-text {
   font-weight: bold !important;
   color: #ffffff !important;
@@ -118,21 +118,21 @@ tabbrowser[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .treestyl
 
 
 /* Make the tab counter look like the bubbles in Mail.app et.al. */
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .treestyletab-counter-container {
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] .treestyletab-counter-container {
   padding: 0 6px !important;
   background-color: #91a0c0 !important;
   -moz-border-radius: 8px !important;
 }
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .treestyletab-counter {
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] .treestyletab-counter {
   color: #ffffff !important;
   font-weight: bold !important;
   text-shadow: none !important;
 }
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 .tabbrowser-tab[selected="true"] .treestyletab-counter-container {
   background-color: #ffffff !important;
 }
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 .tabbrowser-tab[selected="true"] .treestyletab-counter {
   color: #91a0c0 !important;
 }
@@ -144,13 +144,13 @@ tabbrowser[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .treestyl
 /* Drag'n'drop styling:
    First we need to disable the standard settings from TreeStyleTab.
    Its initial CSS rules are quite explicit. :( */
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="self"][selected="true"],
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="self"][selected="true"]:hover,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="self"]:not([selected="true"]),
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="self"]:not([selected="true"]):hover {
   -moz-border-top-colors: none !important;
   -moz-border-bottom-colors: none !important;
@@ -159,7 +159,7 @@ tabbrowser[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .treestyl
 }
 
 /* Round blue rectangle around tabs that are dropping targets. */
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="self"]:not([selected="true"]) {
   border: 2px solid #577bf3 !important; /* not OSX's colour but Firefox's */
   background: #d0def5 !important;
@@ -167,25 +167,25 @@ tabbrowser[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .treestyl
 }
 
 /* White-blue-white separator for drop indicator. */
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="before"][selected="true"],
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="before"][selected="true"]:hover,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="before"]:not([selected="true"]),
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="before"]:not([selected="true"]):hover {
   border-top: 4px solid red !important;
   -moz-border-top-colors: #ffffff #577bf3 #577bf3 #ffffff !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="after"][selected="true"],
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="after"][selected="true"]:hover,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="after"]:not([selected="true"]),
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="after"]:not([selected="true"]):hover {
   border-bottom: 4px solid #577bf3 !important;
   -moz-border-bottom-colors: #ffffff #577bf3 #577bf3 #ffffff !important;
@@ -193,23 +193,23 @@ tabbrowser[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .treestyl
 
 /* Let's hack in the little round end of the drop indicator using the
    drop marker image. */
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="before"] .treestyletab-drop-marker,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="after"] .treestyletab-drop-marker {
   list-style-image: url("dropmarker.png");
 }
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="before"] .treestyletab-drop-marker-container {
   margin: -11px 22px 11px -22px;
 }
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="after"] .treestyletab-drop-marker-container {
   margin: 12px 22px -12px -22px;
 }
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"][treestyletab-allow-subtree-collapse="true"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"][treestyletab-allow-subtree-collapse="true"]
   .tabbrowser-tab[treestyletab-drop-position="before"] .treestyletab-drop-marker-container,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"][treestyletab-allow-subtree-collapse="true"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"][treestyletab-allow-subtree-collapse="true"]
   .tabbrowser-tab[treestyletab-drop-position="after"] .treestyletab-drop-marker-container {
   margin-left: -30px;
 }
@@ -218,8 +218,8 @@ tabbrowser[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .treestyl
 
 /* changed from original SidebarStyleTab */
 
-#TabsToolbar[treestyletab-style="sidebar"]:not([treestyletab-tabbar-position="top"]),
-#TabsToolbar[treestyletab-style="sidebar"][treestyletab-tabbar-position="top"]:not([treestyletab-tabbar-fixed="true"]) {
+#TabsToolbar[treestyletab-style~="sidebar"]:not([treestyletab-tabbar-position="top"]),
+#TabsToolbar[treestyletab-style~="sidebar"][treestyletab-tabbar-position="top"]:not([treestyletab-tabbar-fixed="true"]) {
 	background: transparent !important;
 	border: 0 none !important;
 	margin: 0 !important;
@@ -228,79 +228,79 @@ tabbrowser[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .treestyl
 	-moz-box-shadow: none !important;
 }
 
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .treestyletab-counter-paren {
   display: none !important;
 }
 
 /* Firefox 3.6 or older */
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabs-newtab-button,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabs-newtab-button:hover,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabs-alltabs-button,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabs-alltabs-button:hover,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabs-container > .tabs-closebutton,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   > .tabs-closebutton,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabs-container > .tabs-closebutton:hover,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   > .tabs-closebutton:hover,
 /* Firefox 4.0 or later */
-#TabsToolbar[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+#TabsToolbar[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   > toolbarbutton,
-#TabsToolbar[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+#TabsToolbar[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   > toolbarbutton:hover,
-#TabsToolbar[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+#TabsToolbar[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   > toolbarpaletteitem > toolbarbutton,
-#TabsToolbar[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+#TabsToolbar[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   > toolbarpaletteitem > toolbarbutton:hover {
   -moz-appearance: none !important;
   background: transparent !important;
   border: 0 none !important;
 }
 
-#TabsToolbar[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+#TabsToolbar[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   > * {
   border: 0 none !important;
 }
 
 /* for rightside tab bar: "display:none" breaks the order of tab contents. */
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 .tabbrowser-tab:not(:hover):not([selected="true"]) > .tab-close-button {
   display: -moz-box !important;
   visibility: collapse !important;
 }
 
 /* for Windows (Winstrip/Strata) */
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tab-close-button image,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tab-close-button:active image,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tab-close-button:hover image,
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"] .tab-close-button image {
   -moz-image-region: auto !important;
 }
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"] {
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] {
   background: transparent !important;
   margin: 0;
   -moz-appearance: none !important;
 }
 
 /* for Linux (Gnomestrip) */
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tab-close-button {
   -moz-appearance: none !important;
 }
 
 /* for Multiple Tab Handler */
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
   .tabbrowser-tab:not(:hover):not([selected="true"])[multipletab-ready-to-close="true"] > .tab-close-button {
   visibility: visible !important;
 }
diff --git a/skin/classic/treestyletab/sidebar/inactive-3.6.css b/skin/classic/treestyletab/sidebar/inactive-3.6.css
index 5b30c144..c8c7384d 100644
--- a/skin/classic/treestyletab/sidebar/inactive-3.6.css
+++ b/skin/classic/treestyletab/sidebar/inactive-3.6.css
@@ -3,50 +3,50 @@
 /* Unset bottom border, instead let's have a border on the right-hand
    side, much like the sidebar does. */
 #main-window:not([active="true"])
-.tabbrowser-strip[treestyletab-style="sidebar"][treestyletab-mode="vertical"],
+.tabbrowser-strip[treestyletab-style~="sidebar"]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"],
 #main-window:not([active="true"])
-#TabsToolbar[treestyletab-style="sidebar"][treestyletab-mode="vertical"] {
+#TabsToolbar[treestyletab-style~="sidebar"]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"] {
   border-top: 1px solid #868686;
 }
 
 /* Background colour for the tree sidebar (light blue when window is
    active, grey otherwise) */
 #main-window:not([active="true"])
-.tabbrowser-strip[treestyletab-style="sidebar"][treestyletab-mode="vertical"] {
+.tabbrowser-strip[treestyletab-style~="sidebar"]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"] {
   background-color: #e8e8e8 !important;
 }
 
 /* Use the splitter to display the border of .tabbrowser-strip */
 #main-window:not([active="true"])
-tabbrowser[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .treestyletab-splitter {
+tabbrowser[treestyletab-style~="sidebar"]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"] .treestyletab-splitter {
   background-color: #868686;
 }
 #main-window:not([active="true"])
-.tabbrowser-strip[treestyletab-style="sidebar"][treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"] {
+.tabbrowser-strip[treestyletab-style~="sidebar"][treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"] {
   border-right-color: #868686;
 }
 #main-window:not([active="true"])
-.tabbrowser-strip[treestyletab-style="sidebar"][treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"] {
+.tabbrowser-strip[treestyletab-style~="sidebar"][treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"] {
   border-left-color: #868686;
 }
 
 /* Style tabs themselves.  Get rid of most of the initial XUL styling */
 #main-window:not([active="true"])
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .tabbrowser-tab[selected="true"] {
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] .tabbrowser-tab[selected="true"] {
   border-top: 1px solid #979797 !important;
   background: -moz-linear-gradient(top, #B4B4B4, #8A8A8A) repeat-x !important;  
 }
 
 /* Make the tab counter look like the bubbles in Mail.app et.al. */
 #main-window:not([active="true"])
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .treestyletab-counter-container {
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] .treestyletab-counter-container {
   background-color: #b5b5b5 !important;
 }
-#main-window:not([active="true"]) .tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+#main-window:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 .tabbrowser-tab[selected="true"] .treestyletab-counter-container {
   background-color: #ffffff !important;
 }
-#main-window:not([active="true"]) .tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+#main-window:not([active="true"]) .tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 .tabbrowser-tab[selected="true"] .treestyletab-counter {
   color: #929292 !important;
 }
diff --git a/skin/classic/treestyletab/sidebar/inactive-3.7.css b/skin/classic/treestyletab/sidebar/inactive-3.7.css
index 4d80cf72..4fc77c9f 100644
--- a/skin/classic/treestyletab/sidebar/inactive-3.7.css
+++ b/skin/classic/treestyletab/sidebar/inactive-3.7.css
@@ -3,50 +3,50 @@
 /* Unset bottom border, instead let's have a border on the right-hand
    side, much like the sidebar does. */
 #main-window:-moz-window-inactive
-.tabbrowser-strip[treestyletab-style="sidebar"][treestyletab-mode="vertical"],
+.tabbrowser-strip[treestyletab-style~="sidebar"]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"],
 #main-window:-moz-window-inactive
-#TabsToolbar[treestyletab-style="sidebar"][treestyletab-mode="vertical"] {
+#TabsToolbar[treestyletab-style~="sidebar"]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"] {
   border-top: 1px solid #868686;
 }
 
 /* Background colour for the tree sidebar (light blue when window is
    active, grey otherwise) */
 #main-window:-moz-window-inactive
-.tabbrowser-strip[treestyletab-style="sidebar"][treestyletab-mode="vertical"] {
+.tabbrowser-strip[treestyletab-style~="sidebar"]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"] {
   background-color: #e8e8e8 !important;
 }
 
 /* Use the splitter to display the border of .tabbrowser-strip */
 #main-window:-moz-window-inactive
-tabbrowser[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .treestyletab-splitter {
+tabbrowser[treestyletab-style~="sidebar"]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"] .treestyletab-splitter {
   background-color: #868686;
 }
 #main-window:-moz-window-inactive
-.tabbrowser-strip[treestyletab-style="sidebar"][treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"] {
+.tabbrowser-strip[treestyletab-style~="sidebar"][treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"] {
   border-right-color: #868686;
 }
 #main-window:-moz-window-inactive
-.tabbrowser-strip[treestyletab-style="sidebar"][treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"] {
+.tabbrowser-strip[treestyletab-style~="sidebar"][treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"] {
   border-left-color: #868686;
 }
 
 /* Style tabs themselves.  Get rid of most of the initial XUL styling */
 #main-window:-moz-window-inactive
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .tabbrowser-tab[selected="true"] {
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] .tabbrowser-tab[selected="true"] {
   border-top: 1px solid #979797 !important;
   background: -moz-linear-gradient(top, #B4B4B4, #8A8A8A) repeat-x !important;  
 }
 
 /* Make the tab counter look like the bubbles in Mail.app et.al. */
 #main-window:-moz-window-inactive
-.tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"] .treestyletab-counter-container {
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] .treestyletab-counter-container {
   background-color: #b5b5b5 !important;
 }
-#main-window:-moz-window-inactive .tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+#main-window:-moz-window-inactive .tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 .tabbrowser-tab[selected="true"] .treestyletab-counter-container {
   background-color: #ffffff !important;
 }
-#main-window:-moz-window-inactive .tabbrowser-tabs[treestyletab-style="sidebar"][treestyletab-mode="vertical"]
+#main-window:-moz-window-inactive .tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 .tabbrowser-tab[selected="true"] .treestyletab-counter {
   color: #929292 !important;
 }
diff --git a/skin/classic/treestyletab/sidebar/sidebar.css b/skin/classic/treestyletab/sidebar/sidebar.css
index 9d7b4940..efc4b6f2 100644
--- a/skin/classic/treestyletab/sidebar/sidebar.css
+++ b/skin/classic/treestyletab/sidebar/sidebar.css
@@ -1,2 +1,18 @@
 @import url("base.css");
 @import url("inactive.css");
+
+
+/* aero glass */
+
+.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+.tabbrowser-strip[treestyletab-style~="sidebar"][treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+tabbrowser[treestyletab-style~="sidebar"][treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+:root[treestyletab-style~="sidebar"][treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]) #appcontent,
+:root[treestyletab-style~="sidebar"][treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]) #browser {
+	background: transparent !important;
+	-moz-appearance: none !important;
+}
+.tabbrowser-strip[treestyletab-style~="sidebar"][treestyletab-style~="aero"][treestyletab-mode="vertical"],
+#TabsToolbar[treestyletab-style~="sidebar"][treestyletab-style~="aero"][treestyletab-mode="vertical"] {
+	border-top: none 0 !important;
+}
diff --git a/skin/classic/treestyletab/square/square.css b/skin/classic/treestyletab/square/square.css
index 8dc3464e..45385bd3 100644
--- a/skin/classic/treestyletab/square/square.css
+++ b/skin/classic/treestyletab/square/square.css
@@ -318,3 +318,15 @@
   .tabbrowser-tab[pinned="true"] {
 	-moz-border-right-colors: ThreeDShadow transparent !important;
 }
+
+
+/* aero glass */
+
+.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+.tabbrowser-strip[treestyletab-style~="square"][treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+tabbrowser[treestyletab-style~="square"][treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+:root[treestyletab-style~="square"][treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]) #appcontent,
+:root[treestyletab-style~="square"][treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]) #browser {
+	background: transparent !important;
+	-moz-appearance: none !important;
+}
diff --git a/skin/classic/treestyletab/ui.css b/skin/classic/treestyletab/ui.css
index 5d995dc2..82d30a82 100644
--- a/skin/classic/treestyletab/ui.css
+++ b/skin/classic/treestyletab/ui.css
@@ -176,4 +176,3 @@ tabbrowser[treestyletab-tabbar-position="right"] .treestyletab-tabbar-toggler {
 tabbrowser[treestyletab-tabbar-position="bottom"] .treestyletab-tabbar-toggler {
 	border-top: 1px solid ThreeDShadow;
 }
-