diff --git a/chrome.manifest b/chrome.manifest
index 93dc96a7..e6e8b29b 100644
--- a/chrome.manifest
+++ b/chrome.manifest
@@ -29,14 +29,6 @@ locale	treestyletab	da-DK	jar:chrome/treestyletab.jar!/locale/da-DK/treestyletab
 
 skin	treestyletab	classic/1.0	jar:chrome/treestyletab.jar!/skin/classic/treestyletab/
 
-skin	treestyletab-platform	classic/1.0	jar:platform/WINNT/chrome/treestyletab.jar!/skin/classic/treestyletab/	os=WINNT
-skin	treestyletab-platform	classic/1.0	jar:platform/Linux/chrome/treestyletab.jar!/skin/classic/treestyletab/	os=Linux
-skin	treestyletab-platform	classic/1.0	jar:platform/Darwin/chrome/treestyletab.jar!/skin/classic/treestyletab/	os=Darwin
-
-override chrome://treestyletab-platform/skin/metal/treestyletab-inactive.css	chrome://treestyletab-platform/skin/metal/treestyletab-inactive-3.5.css	os=Darwin
-override chrome://treestyletab-platform/skin/metal/treestyletab-inactive.css	chrome://treestyletab-platform/skin/metal/treestyletab-inactive-4.css	os=Darwin appversion>=4.0b5pre
-
-
 override chrome://treestyletab/skin/group/group-icon	chrome://treestyletab/skin/group/group-fx3.png
 override chrome://treestyletab/skin/group/group-icon	chrome://treestyletab/skin/group/group-fx3-aero.png	os=WINNT osversion>=6
 
@@ -53,6 +45,31 @@ override chrome://treestyletab/skin/sidebar/inactive.css	chrome://treestyletab/s
 
 override chrome://treestyletab/skin/config.css	chrome://treestyletab/skin/config-4.css	appversion>=4.0b5pre
 
+
+override chrome://treestyletab/skin/platform-base.css	chrome://treestyletab/skin/dummy.css	os=Darwin
+override chrome://treestyletab/skin/platform-base.css	chrome://treestyletab/skin/Linux-base.css	os=Linux
+override chrome://treestyletab/skin/platform-base.css	chrome://treestyletab/skin/dummy.css	os=WINNT
+override chrome://treestyletab/skin/platform-styled.css	chrome://treestyletab/skin/Darwin-styled.css	os=Darwin
+override chrome://treestyletab/skin/platform-styled.css	chrome://treestyletab/skin/dummy.css	os=Linux
+override chrome://treestyletab/skin/platform-styled.css	chrome://treestyletab/skin/WINNT-styled.css	os=WINNT
+override chrome://treestyletab/skin/platform-styled-inactive.css	chrome://treestyletab/skin/Darwin-styled-inactive-3.5.css	os=Darwin
+override chrome://treestyletab/skin/platform-styled-inactive.css	chrome://treestyletab/skin/Darwin-styled-inactive-4.css	os=Darwin appversion>=4.0b5pre
+
+override chrome://treestyletab/skin/square/platform.css	chrome://treestyletab/skin/square/Darwin.css	os=Darwin
+override chrome://treestyletab/skin/square/platform.css	chrome://treestyletab/skin/square/Linux.css	os=Linux
+override chrome://treestyletab/skin/square/platform.css	chrome://treestyletab/skin/dummy.css	os=WINNT
+override chrome://treestyletab/skin/square/platform-inactive.css	chrome://treestyletab/skin/square/Darwin-inactive-3.5.css	os=Darwin
+override chrome://treestyletab/skin/square/platform-inactive.css	chrome://treestyletab/skin/square/Darwin-inactive-4.css	os=Darwin appversion>=4.0b5pre
+
+override chrome://treestyletab/skin/metal/platform.css	chrome://treestyletab/skin/metal/Darwin.css	os=Darwin
+override chrome://treestyletab/skin/metal/platform.css	chrome://treestyletab/skin/dummy.css	os=WINNT
+override chrome://treestyletab/skin/metal/platform.css	chrome://treestyletab/skin/dummy.css	os=Linux
+
+override chrome://treestyletab/skin/platform-config.css	chrome://treestyletab/skin/dummy.css	os=Darwin
+override chrome://treestyletab/skin/platform-config.css	chrome://treestyletab/skin/Linux-config.css	os=Linux
+override chrome://treestyletab/skin/platform-config.css	chrome://treestyletab/skin/dummy.css	os=WINNT
+
+
 resource treestyletab-modules modules/
 
 component	{305122d0-5bdc-11de-8a39-0800200c9a66}	components/AboutGroup.js
diff --git a/content/treestyletab/config.xul b/content/treestyletab/config.xul
index 53d4f7fd..1b8358f5 100644
--- a/content/treestyletab/config.xul
+++ b/content/treestyletab/config.xul
@@ -2,7 +2,7 @@
 <?xml-stylesheet href="chrome://global/skin/"?>
 <?xml-stylesheet href="config.css" type="text/css"?>
 <?xml-stylesheet href="chrome://treestyletab/skin/config.css" type="text/css"?>
-<?xml-stylesheet href="chrome://treestyletab-platform/skin/config.css" type="text/css"?>
+<?xml-stylesheet href="chrome://treestyletab/skin/platform-config.css" type="text/css"?>
 <!DOCTYPE prefwindow [
 <!ENTITY % mainDTD SYSTEM "chrome://treestyletab/locale/treestyletab.dtd">
 %mainDTD;
diff --git a/content/treestyletab/treestyletab.css b/content/treestyletab/treestyletab.css
index c09cd4b7..108bfd04 100644
--- a/content/treestyletab/treestyletab.css
+++ b/content/treestyletab/treestyletab.css
@@ -1,5 +1,3 @@
-@import url("chrome://treestyletab/content/treestyletab-tmp.css"); /* hacks for Tab Mix Plus */
-
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 @namespace html url("http://www.w3.org/1999/xhtml");
 
diff --git a/content/treestyletab/treestyletab.xul b/content/treestyletab/treestyletab.xul
index 01615dbf..ddb03e91 100644
--- a/content/treestyletab/treestyletab.xul
+++ b/content/treestyletab/treestyletab.xul
@@ -1,8 +1,17 @@
 <?xml version="1.0"?>
+
 <?xml-stylesheet href="treestyletab.css" type="text/css"?>
-<?xml-stylesheet href="chrome://treestyletab/skin/treestyletab.css" type="text/css"?>
-<?xml-stylesheet href="chrome://treestyletab-platform/skin/treestyletab.css" type="text/css"?>
+<?xml-stylesheet href="treestyletab-tmp.css" type="text/css"?><!-- hacks for Tab Mix Plus -->
+
+<?xml-stylesheet href="chrome://treestyletab/skin/base.css" type="text/css"?>
+<?xml-stylesheet href="chrome://treestyletab/skin/twisty/twisty.css" type="text/css"?>
+<?xml-stylesheet href="chrome://treestyletab/skin/ui.css" type="text/css"?>
+<?xml-stylesheet href="chrome://treestyletab/skin/tmp.css" type="text/css"?><!-- hacks for Tab Mix Plus -->
+<?xml-stylesheet href="chrome://treestyletab-platform/skin/base.css" type="text/css"?>
+<?xml-stylesheet href="chrome://treestyletab-platform/skin/platform-base.css" type="text/css"?>
+
 <?xul-overlay href="res/tabFx2Compatible.xul"?>
+
 <!DOCTYPE overlay SYSTEM "chrome://treestyletab/locale/treestyletab.dtd">
 <overlay id="treestyletab-overlay"
          xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
diff --git a/modules/themeManager.js b/modules/themeManager.js
index f884ffeb..c11dc336 100644
--- a/modules/themeManager.js
+++ b/modules/themeManager.js
@@ -57,6 +57,8 @@ TreeStyleTabThemeManager.prototype = {
 			});
 		this._lastStyles = null;
 
+		const BASE = 'chrome://treestyletab/skin/';
+
 		var styles = [];
 		switch (aStyle)
 		{
@@ -64,21 +66,42 @@ TreeStyleTabThemeManager.prototype = {
 			default:
 
 			case 'flat':
+				styles.push(BASE+'square/base.css');
+				styles.push(BASE+'square/dropshadow.css');
+				styles.push(BASE+'platform-styled.css');
+				styles.push(BASE+'square/platform.css');
+				break;
+
 			case 'mixed':
-				styles.push('chrome://treestyletab/skin/square/square.css');
-				styles.push('chrome://treestyletab/skin/square/dropshadow.css');
+				styles.push(BASE+'square/base.css');
+				styles.push(BASE+'square/mixed.css');
+				styles.push(BASE+'square/tab-surface.css');
+				styles.push(BASE+'square/dropshadow.css');
+				styles.push(BASE+'platform-styled.css');
+				styles.push(BASE+'square/platform.css');
 				break;
 
 			case 'vertigo':
-				styles.push('chrome://treestyletab/skin/square/square.css');
+				styles.push(BASE+'skin/square/square.css');
+				styles.push(BASE+'skin/square/vertigo.css');
+				styles.push(BASE+'platform-styled.css');
+				styles.push(BASE+'square/platform.css');
 				break;
 
 			case 'metal':
-				styles.push('chrome://treestyletab/skin/metal/metal.css');
+				styles.push(BASE+'metal/base.css');
+				styles.push(BASE+'metal/base-inactive.css');
+				styles.push(BASE+'metal/tab.css');
+				styles.push(BASE+'metal/aero.css');
+				styles.push(BASE+'platform-styled.css');
+				styles.push(BASE+'metal/platform.css');
 				break;
 
 			case 'sidebar':
-				styles.push('chrome://treestyletab/skin/sidebar/sidebar.css');
+				styles.push(BASE+'sidebar/base.css');
+				styles.push(BASE+'sidebar/inactive.css');
+				styles.push(BASE+'sidebar/aero.css');
+				styles.push(BASE+'platform-styled.css');
 				break;
 		}
 
diff --git a/platform/Darwin/skin/classic/treestyletab/license.txt b/platform/Darwin/skin/classic/treestyletab/license.txt
deleted file mode 100644
index efcff07b..00000000
--- a/platform/Darwin/skin/classic/treestyletab/license.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-***** BEGIN LICENSE BLOCK *****
-Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
-The contents of these files are subject to the Mozilla Public License Version
-1.1 (the "License"); you may not use these files except in compliance with
-the License. You may obtain a copy of the License at
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an "AS IS" basis,
-WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-for the specific language governing rights and limitations under the
-License.
-
-The Original Code is the Tree Style Tab.
-
-The Initial Developer of the Original Code is SHIMODA Hiroshi.
-Portions created by the Initial Developer are Copyright (C) 2008-2010
-the Initial Developer. All Rights Reserved.
-
-Contributor(s): SHIMODA Hiroshi <piro@p.club.ne.jp>
-
-Alternatively, the contents of these files may be used under the terms of
-either the GNU General Public License Version 2 or later (the "GPL"), or
-the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-in which case the provisions of the GPL or the LGPL are applicable instead
-of those above. If you wish to allow use of your version of these files only
-under the terms of either the GPL or the LGPL, and not to allow others to
-use your version of these files under the terms of the MPL, indicate your
-decision by deleting the provisions above and replace them with the notice
-and other provisions required by the GPL or the LGPL. If you do not delete
-the provisions above, a recipient may use your version of these files under
-the terms of any one of the MPL, the GPL or the LGPL.
-
-***** END LICENSE BLOCK *****
diff --git a/platform/Darwin/skin/classic/treestyletab/treestyletab-inactive-3.5.css b/platform/Darwin/skin/classic/treestyletab/treestyletab-inactive-3.5.css
deleted file mode 100644
index 14ee922f..00000000
--- a/platform/Darwin/skin/classic/treestyletab/treestyletab-inactive-3.5.css
+++ /dev/null
@@ -1,88 +0,0 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* Square */
-
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
-  .tabbrowser-tab
-  .tab-image-middle,
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
-  .tabbrowser-tab
-  .tab-close-button,
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
-  .tabbrowser-tab[selected="true"]
-  .tab-image-middle,
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
-  .tabbrowser-tab[selected="true"]
-  .tab-close-button,
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"]
-  .tabbrowser-tab
-  .tab-image-middle,
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"]
-  .tabbrowser-tab
-  .tab-close-button,
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"]
-  .tabbrowser-tab[selected="true"]
-  .tab-image-middle,
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"]
-  .tabbrowser-tab[selected="true"]
-  .tab-close-button {
-	height: auto;
-	margin: 0 !important;
-	padding: 0 !important;
-	background: transparent;
-	width: 0;
-}
-
-
-/* Metal */
-
-/* horizontal tree */
-
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab:not([selected="true"])
-  .tab-image-middle,
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab:not([selected="true"])
-  .tab-close-button,
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab[selected="true"]
-  .tab-image-middle,
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab[selected="true"]
-  .tab-image-middle {
-	background-position: left bottom;
-	background-repeat: repeat-x;
-}
-
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab:not([selected="true"])
-  .tab-image-left,
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab:not([selected="true"])
-  .tab-image-left,
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab[selected="true"]
-  .tab-image-left,
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab[selected="true"]
-  .tab-image-left {
-	background-position: left bottom;
-	background-repeat: no-repeat;
-}
-
diff --git a/platform/Darwin/skin/classic/treestyletab/treestyletab-inactive-4.css b/platform/Darwin/skin/classic/treestyletab/treestyletab-inactive-4.css
deleted file mode 100644
index 07a5e6d2..00000000
--- a/platform/Darwin/skin/classic/treestyletab/treestyletab-inactive-4.css
+++ /dev/null
@@ -1,88 +0,0 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* Square */
-
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
-  .tabbrowser-tab
-  .tab-image-middle,
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
-  .tabbrowser-tab
-  .tab-close-button,
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
-  .tabbrowser-tab[selected="true"]
-  .tab-image-middle,
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
-  .tabbrowser-tab[selected="true"]
-  .tab-close-button,
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"]
-  .tabbrowser-tab
-  .tab-image-middle,
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"]
-  .tabbrowser-tab
-  .tab-close-button,
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"]
-  .tabbrowser-tab[selected="true"]
-  .tab-image-middle,
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"]
-  .tabbrowser-tab[selected="true"]
-  .tab-close-button {
-	height: auto;
-	margin: 0 !important;
-	padding: 0 !important;
-	background: transparent;
-	width: 0;
-}
-
-
-/* Metal */
-
-/* horizontal tree */
-
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab:not([selected="true"])
-  .tab-image-middle,
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab:not([selected="true"])
-  .tab-close-button,
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab[selected="true"]
-  .tab-close-button,
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab[selected="true"]
-  .tab-close-button {
-	background-position: left bottom;
-	background-repeat: repeat-x;
-}
-
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab:not([selected="true"])
-  .tab-image-right,
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab:not([selected="true"])
-  .tab-image-right,
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab[selected="true"]
-  .tab-image-right,
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab[selected="true"]
-  .tab-image-right {
-	background-position: left bottom;
-	background-repeat: no-repeat;
-}
-
diff --git a/platform/Darwin/skin/classic/treestyletab/treestyletab.css b/platform/Darwin/skin/classic/treestyletab/treestyletab.css
deleted file mode 100644
index c3de5389..00000000
--- a/platform/Darwin/skin/classic/treestyletab/treestyletab.css
+++ /dev/null
@@ -1,93 +0,0 @@
-@import url("treestyletab-inactive.css");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* Square */
-
-tabbrowser[treestyletab-style~="square"][treestyletab-tabbar-position="left"]:not([treestyletab-tabbar-fixed="true"])
-  .treestyletab-splitter {
-	border-right: 1px solid ThreeDShadow !important;
-	-moz-border-right-colors: ThreeDShadow !important;
-}
-tabbrowser[treestyletab-style~="square"][treestyletab-tabbar-position="right"]:not([treestyletab-tabbar-fixed="true"])
-  .treestyletab-splitter {
-	border-left: 1px solid ThreeDShadow !important;
-	-moz-border-left-colors: ThreeDShadow !important;
-}
-
-tabbrowser[treestyletab-style~="square"]:not([treestyletab-style="vertigo"])[treestyletab-mode="vertical"]
-  .tabbrowser-tab {
-	z-index: 1 !important;
-}
-tabbrowser[treestyletab-style~="square"]:not([treestyletab-style="vertigo"])[treestyletab-mode="vertical"]
-  .tabbrowser-tab:not([pinned="true"]) {
-	position: relative !important;
-}
-
-
-/* Metal */
-
-.tabbrowser-tabs[treestyletab-style="metal"][treestyletab-mode="vertical"]
-  .tabbrowser-tab
-  .tab-close-button {
-	padding-left: 0 !important;
-	padding-right: 0 !important;
-}
-
-.tabbrowser-strip[treestyletab-style="metal"][treestyletab-mode="vertical"] {
-	border-bottom: 0 none !important;
-}
-
-
-/* horizontal tree */
-
-.tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"] {
-	height: auto;
-	background: #bbb;
-}
-
-#main-window
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"] {
-	background: #777;
-}
-
-#main-window
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab:not([selected="true"])
-  .tab-image-middle,
-#main-window
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab:not([selected="true"])
-  .tab-close-button,
-#main-window
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab[selected="true"]
-  .tab-image-middle,
-#main-window
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab[selected="true"]
-  .tab-close-button {
-	background-position: left bottom;
-	background-repeat: repeat-x;
-}
-
-#main-window
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab:not([selected="true"])
-  .tab-image-left,
-#main-window
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab:not([selected="true"])
-  .tab-image-right,
-#main-window
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab[selected="true"]
-  .tab-image-left,
-#main-window
-  .tabbrowser-tabs[treestyletab-style][treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab[selected="true"]
-  .tab-image-right {
-	background-position: left bottom;
-	background-repeat: no-repeat;
-}
-
diff --git a/platform/Linux/skin/classic/treestyletab/license.txt b/platform/Linux/skin/classic/treestyletab/license.txt
deleted file mode 100644
index efcff07b..00000000
--- a/platform/Linux/skin/classic/treestyletab/license.txt
+++ /dev/null
@@ -1,34 +0,0 @@
-***** BEGIN LICENSE BLOCK *****
-Version: MPL 1.1/GPL 2.0/LGPL 2.1
-
-The contents of these files are subject to the Mozilla Public License Version
-1.1 (the "License"); you may not use these files except in compliance with
-the License. You may obtain a copy of the License at
-http://www.mozilla.org/MPL/
-
-Software distributed under the License is distributed on an "AS IS" basis,
-WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-for the specific language governing rights and limitations under the
-License.
-
-The Original Code is the Tree Style Tab.
-
-The Initial Developer of the Original Code is SHIMODA Hiroshi.
-Portions created by the Initial Developer are Copyright (C) 2008-2010
-the Initial Developer. All Rights Reserved.
-
-Contributor(s): SHIMODA Hiroshi <piro@p.club.ne.jp>
-
-Alternatively, the contents of these files may be used under the terms of
-either the GNU General Public License Version 2 or later (the "GPL"), or
-the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-in which case the provisions of the GPL or the LGPL are applicable instead
-of those above. If you wish to allow use of your version of these files only
-under the terms of either the GPL or the LGPL, and not to allow others to
-use your version of these files under the terms of the MPL, indicate your
-decision by deleting the provisions above and replace them with the notice
-and other provisions required by the GPL or the LGPL. If you do not delete
-the provisions above, a recipient may use your version of these files under
-the terms of any one of the MPL, the GPL or the LGPL.
-
-***** END LICENSE BLOCK *****
diff --git a/platform/Linux/skin/classic/treestyletab/treestyletab.css b/platform/Linux/skin/classic/treestyletab/treestyletab.css
deleted file mode 100644
index 060c60a9..00000000
--- a/platform/Linux/skin/classic/treestyletab/treestyletab.css
+++ /dev/null
@@ -1,37 +0,0 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-
-/* horizontal tree */
-
-.tabbrowser-tabs[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab:not([selected="true"]),
-.tabbrowser-tabs[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab[selected="true"] {
-	padding-top: 0;
-	padding-bottom: 0;
-	margin-bottom: 0;
-	height: 1.5em;
-	-moz-border-radius: 0 0 0 0;
-}
-
-
-/* vertical tree */
-
-.tabbrowser-strip[treestyletab-style~="square"][treestyletab-tabbar-position="left"]:not([treestyletab-tabbar-transparent="full"]),
-.treestyletab-tabbar-toolbar[treestyletab-style~="square"][treestyletab-tabbar-position="left"]:not([treestyletab-tabbar-transparent="full"]) {
-	border-right: 1px solid ThreeDShadow !important;
-	-moz-border-right-colors: none !important;
-}
-.tabbrowser-strip[treestyletab-style~="square"][treestyletab-tabbar-position="right"]:not([treestyletab-tabbar-transparent="full"]),
-.treestyletab-tabbar-toolbar[treestyletab-style~="square"][treestyletab-tabbar-position="right"]:not([treestyletab-tabbar-transparent="full"]) {
-	border-left: 1px solid ThreeDShadow !important;
-	-moz-border-right-colors: none !important;
-}
-
-
-/* splitter for floating & autohide tab bar */
-.treestyletab-tabbar-toolbar .treestyletab-splitter {
-	width: 6px;
-	-moz-appearance: none;
-}
-
diff --git a/platform/WINNT/skin/classic/treestyletab/treestyletab.css b/platform/WINNT/skin/classic/treestyletab/treestyletab.css
deleted file mode 100644
index 51332ea9..00000000
--- a/platform/WINNT/skin/classic/treestyletab/treestyletab.css
+++ /dev/null
@@ -1,18 +0,0 @@
-/* horizontal tree */
-
-.tabbrowser-tabs[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab:not([selected="true"]),
-.tabbrowser-tabs[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab[selected="true"],
-.tabbrowser-tabs[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab:hover:not([selected="true"]),
-.tabbrowser-tabs[treestyletab-style][treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
-  .tabbrowser-tab:hover[selected="true"] {
-	padding-top: 0;
-	padding-bottom: 0;
-	margin-bottom: 3px;
-	height: auto;
-	-moz-border-radius: 0 0 0 0;
-	border-top-width: 1px;
-}
-
diff --git a/skin/classic/treestyletab/Darwin-styled-inactive-3.5.css b/skin/classic/treestyletab/Darwin-styled-inactive-3.5.css
new file mode 100644
index 00000000..4e19e73c
--- /dev/null
+++ b/skin/classic/treestyletab/Darwin-styled-inactive-3.5.css
@@ -0,0 +1,44 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* horizontal tree */
+
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab:not([selected="true"])
+  .tab-image-middle,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab:not([selected="true"])
+  .tab-close-button,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab[selected="true"]
+  .tab-image-middle,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab[selected="true"]
+  .tab-image-middle {
+	background-position: left bottom;
+	background-repeat: repeat-x;
+}
+
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab:not([selected="true"])
+  .tab-image-left,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab:not([selected="true"])
+  .tab-image-left,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab[selected="true"]
+  .tab-image-left,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab[selected="true"]
+  .tab-image-left {
+	background-position: left bottom;
+	background-repeat: no-repeat;
+}
+
diff --git a/skin/classic/treestyletab/Darwin-styled-inactive-4.css b/skin/classic/treestyletab/Darwin-styled-inactive-4.css
new file mode 100644
index 00000000..f46bdaf8
--- /dev/null
+++ b/skin/classic/treestyletab/Darwin-styled-inactive-4.css
@@ -0,0 +1,44 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* horizontal tree */
+
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab:not([selected="true"])
+  .tab-image-middle,
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab:not([selected="true"])
+  .tab-close-button,
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab[selected="true"]
+  .tab-close-button,
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab[selected="true"]
+  .tab-close-button {
+	background-position: left bottom;
+	background-repeat: repeat-x;
+}
+
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab:not([selected="true"])
+  .tab-image-right,
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab:not([selected="true"])
+  .tab-image-right,
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab[selected="true"]
+  .tab-image-right,
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab[selected="true"]
+  .tab-image-right {
+	background-position: left bottom;
+	background-repeat: no-repeat;
+}
+
diff --git a/skin/classic/treestyletab/Darwin-styled.css b/skin/classic/treestyletab/Darwin-styled.css
new file mode 100644
index 00000000..4fc6c410
--- /dev/null
+++ b/skin/classic/treestyletab/Darwin-styled.css
@@ -0,0 +1,56 @@
+@import url("platform-styled-inactive.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* horizontal tree */
+
+.tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"] {
+	height: auto;
+	background: #bbb;
+}
+
+#main-window
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"] {
+	background: #777;
+}
+
+#main-window
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab:not([selected="true"])
+  .tab-image-middle,
+#main-window
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab:not([selected="true"])
+  .tab-close-button,
+#main-window
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab[selected="true"]
+  .tab-image-middle,
+#main-window
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab[selected="true"]
+  .tab-close-button {
+	background-position: left bottom;
+	background-repeat: repeat-x;
+}
+
+#main-window
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab:not([selected="true"])
+  .tab-image-left,
+#main-window
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab:not([selected="true"])
+  .tab-image-right,
+#main-window
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab[selected="true"]
+  .tab-image-left,
+#main-window
+  .tabbrowser-tabs[treestyletab-mode="horizontal"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab[selected="true"]
+  .tab-image-right {
+	background-position: left bottom;
+	background-repeat: no-repeat;
+}
+
diff --git a/skin/classic/treestyletab/Linux-base.css b/skin/classic/treestyletab/Linux-base.css
new file mode 100644
index 00000000..700d9e4c
--- /dev/null
+++ b/skin/classic/treestyletab/Linux-base.css
@@ -0,0 +1,8 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* splitter for floating & autohide tab bar */
+.treestyletab-tabbar-toolbar .treestyletab-splitter {
+	width: 6px;
+	-moz-appearance: none;
+}
+
diff --git a/platform/Linux/skin/classic/treestyletab/config.css b/skin/classic/treestyletab/Linux-config.css
similarity index 100%
rename from platform/Linux/skin/classic/treestyletab/config.css
rename to skin/classic/treestyletab/Linux-config.css
diff --git a/skin/classic/treestyletab/Linux-styled.css b/skin/classic/treestyletab/Linux-styled.css
new file mode 100644
index 00000000..c4b89f8a
--- /dev/null
+++ b/skin/classic/treestyletab/Linux-styled.css
@@ -0,0 +1,15 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+
+/* horizontal tree */
+
+.tabbrowser-tabs[treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab:not([selected="true"]),
+.tabbrowser-tabs[treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab[selected="true"] {
+	padding-top: 0;
+	padding-bottom: 0;
+	margin-bottom: 0;
+	height: 1.5em;
+	-moz-border-radius: 0 0 0 0;
+}
diff --git a/skin/classic/treestyletab/WINNT-styled.css b/skin/classic/treestyletab/WINNT-styled.css
new file mode 100644
index 00000000..690fed2a
--- /dev/null
+++ b/skin/classic/treestyletab/WINNT-styled.css
@@ -0,0 +1,18 @@
+/* horizontal tree */
+
+.tabbrowser-tabs[treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab:not([selected="true"]),
+.tabbrowser-tabs[treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab[selected="true"],
+.tabbrowser-tabs[treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab:hover:not([selected="true"]),
+.tabbrowser-tabs[treestyletab-tabbar-position="top"][treestyletab-tabs-indented="true"]
+  .tabbrowser-tab:hover[selected="true"] {
+	padding-top: 0;
+	padding-bottom: 0;
+	margin-bottom: 3px;
+	height: auto;
+	-moz-border-radius: 0 0 0 0;
+	border-top-width: 1px;
+}
+
diff --git a/skin/classic/treestyletab/dummy.css b/skin/classic/treestyletab/dummy.css
index cb4f428c..d3f5a12f 100644
--- a/skin/classic/treestyletab/dummy.css
+++ b/skin/classic/treestyletab/dummy.css
@@ -1 +1 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
diff --git a/skin/classic/treestyletab/metal/Darwin.css b/skin/classic/treestyletab/metal/Darwin.css
new file mode 100644
index 00000000..1d0dad8b
--- /dev/null
+++ b/skin/classic/treestyletab/metal/Darwin.css
@@ -0,0 +1,14 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* Metal */
+
+.tabbrowser-tabs[treestyletab-mode="vertical"]
+  .tabbrowser-tab
+  .tab-close-button {
+	padding-left: 0 !important;
+	padding-right: 0 !important;
+}
+
+.tabbrowser-strip[treestyletab-mode="vertical"] {
+	border-bottom: 0 none !important;
+}
diff --git a/skin/classic/treestyletab/metal/aero.css b/skin/classic/treestyletab/metal/aero.css
new file mode 100644
index 00000000..6ec1a8c3
--- /dev/null
+++ b/skin/classic/treestyletab/metal/aero.css
@@ -0,0 +1,10 @@
+/* aero glass */
+
+.tabbrowser-tabs[treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+.tabbrowser-strip[treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+tabbrowser[treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+:root[treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]) #appcontent,
+:root[treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]) #browser {
+	background: transparent !important;
+	-moz-appearance: none !important;
+}
diff --git a/skin/classic/treestyletab/metal/base-inactive-3.5.css b/skin/classic/treestyletab/metal/base-inactive-3.5.css
index c2852ccd..f25eb524 100644
--- a/skin/classic/treestyletab/metal/base-inactive-3.5.css
+++ b/skin/classic/treestyletab/metal/base-inactive-3.5.css
@@ -3,36 +3,36 @@
 /* tab bar */
 
 :root:not([active="true"]) 
-  .tabbrowser-strip[treestyletab-style~="metal"][treestyletab-mode="vertical"] {
+  .tabbrowser-strip[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"] {
+  .tabbrowser-strip[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-mode="vertical"]:not([overflow="true"])
   .tabbrowser-arrowscrollbox,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][overflow="true"]
+  .tabbrowser-tabs[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-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-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"]
+  tabbrowser
   .treestyletab-splitter {
 	border-color: #666666 !important;
 	background: #e4e4e4 !important;
@@ -42,44 +42,44 @@
 /* buttons in the tab bar */
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-newtab-button,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-newtab-button:hover,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-alltabs-button,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-alltabs-button:hover,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-container
   > .tabs-closebutton,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
   > .tabs-closebutton,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-container
   > .tabs-closebutton:hover,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[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-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-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-arrowscrollbox
   .tabs-newtab-button {
 	background: #cecece url("shadow-inactive-r.png") repeat-y top left !important;
@@ -90,11 +90,11 @@
 /* hacks for Tab Mix Plus */
 
 :root[treestyletab-enable-compatibility-tmp="true"]:not([active="true"])
-  tabbrowser[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  tabbrowser[treestyletab-mode="vertical"]
   .tabs-closebutton-topbox
   > .tabs-closebutton,
 :root[treestyletab-enable-compatibility-tmp="true"]:not([active="true"])
-  tabbrowser[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  tabbrowser[treestyletab-mode="vertical"]
   .tabs-closebutton-topbox
   > .tabs-closebutton:hover {
 	background: #e4e4e4 !important;
diff --git a/skin/classic/treestyletab/metal/base-inactive-4.css b/skin/classic/treestyletab/metal/base-inactive-4.css
index 8a231e73..f5d4de8a 100644
--- a/skin/classic/treestyletab/metal/base-inactive-4.css
+++ b/skin/classic/treestyletab/metal/base-inactive-4.css
@@ -3,38 +3,38 @@
 /* tab bar */
 
 :root:-moz-window-inactive
-  .tabbrowser-strip[treestyletab-style~="metal"][treestyletab-mode="vertical"] {
+  .tabbrowser-strip[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"] {
+  .tabbrowser-strip[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-mode="vertical"]:not([overflow="true"])
   .tabbrowser-arrowscrollbox,
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][overflow="true"]
+  .tabbrowser-tabs[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-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-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"]
+  tabbrowser
   .treestyletab-splitter,
 :root:-moz-window-inactive
-  .treestyletab-tabbar-toolbar[treestyletab-style~="metal"]
+  .treestyletab-tabbar-toolbar
   .treestyletab-splitter {
 	border-color: #666666 !important;
 	background: #e4e4e4 !important;
@@ -44,17 +44,17 @@
 /* buttons in the tab bar */
 
 :root:-moz-window-inactive
-  .treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
   > toolbarbutton,
 :root:-moz-window-inactive
-  .treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
   > toolbarbutton:hover,
 :root:-moz-window-inactive
-  .treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
   > toolbarpaletteitem
   > toolbarbutton,
 :root:-moz-window-inactive
-  .treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
   > toolbarpaletteitem
   > toolbarbutton:hover {
 	background: #e4e4e4 !important;
@@ -62,14 +62,14 @@
 }
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
+  .tabbrowser-tabs[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-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-arrowscrollbox
   .tabs-newtab-button {
 	background: #cecece url("shadow-inactive-r.png") repeat-y top left !important;
@@ -81,11 +81,11 @@
 /* hacks for Tab Mix Plus */
 
 :root[treestyletab-enable-compatibility-tmp="true"]:-moz-window-inactive
-  tabbrowser[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  tabbrowser[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-mode="vertical"]
   .tabs-closebutton-topbox
   > .tabs-closebutton:hover {
 	background: #e4e4e4 !important;
diff --git a/skin/classic/treestyletab/metal/base.css b/skin/classic/treestyletab/metal/base.css
index 42a1594d..7196074e 100644
--- a/skin/classic/treestyletab/metal/base.css
+++ b/skin/classic/treestyletab/metal/base.css
@@ -2,8 +2,8 @@
 
 /* tab bar */
 
-.treestyletab-tabbar-toolbar[treestyletab-style~="metal"]:not([treestyletab-tabbar-position="top"]),
-.treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-tabbar-position="top"]:not([treestyletab-tabbar-fixed="true"]) {
+.treestyletab-tabbar-toolbar:not([treestyletab-tabbar-position="top"]),
+.treestyletab-tabbar-toolbar[treestyletab-tabbar-position="top"]:not([treestyletab-tabbar-fixed="true"]) {
 	background: transparent !important;
 	border: 0 none !important;
 	margin: 0 !important;
@@ -13,119 +13,119 @@
 	box-shadow: none !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="metal"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabs-bottom,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-left,
-.tabbrowser-tabs[treestyletab-style~="metal"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs: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-mode="vertical"]
   .tabbrowser-tab:first-child,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:first-child:hover,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:first-child[selected="true"],
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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-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-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-mode="vertical"]:not([overflow="true"])
   .tabbrowser-arrowscrollbox,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][overflow="true"]
+.tabbrowser-tabs[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-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-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-mode="vertical"]
   .tabs-container,
 .treestyletab-tabbar-toolbar
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"] {
+  .tabbrowser-tabs[treestyletab-mode="vertical"] {
 	padding: 0 !important;
 }
 
-tabbrowser[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+tabbrowser[treestyletab-mode="vertical"]
   .treestyletab-splitter,
-.treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.treestyletab-tabbar-toolbar[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-tabbar-position="left"]
   .treestyletab-splitter,
-.treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-tabbar-position="left"]
+.treestyletab-tabbar-toolbar[treestyletab-tabbar-position="left"]
   .treestyletab-splitter,
-.tabbrowser-strip[treestyletab-style~="metal"][treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"],
-.treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"] {
+.tabbrowser-strip[treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"],
+.treestyletab-tabbar-toolbar[treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"] {
 	border-right: 1px solid #666666 !important;
 }
-tabbrowser[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
+tabbrowser[treestyletab-tabbar-position="right"]
   .treestyletab-splitter,
-.treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
+.treestyletab-tabbar-toolbar[treestyletab-tabbar-position="right"]
   .treestyletab-splitter,
-.tabbrowser-strip[treestyletab-style~="metal"][treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"],
-.treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"] {
+.tabbrowser-strip[treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"],
+.treestyletab-tabbar-toolbar[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-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-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-mode="vertical"]
   .tabbrowser-tab:hover
   .tab-icon,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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-tab-contents-inverted="true"]
   .tabbrowser-tab:hover
   .tab-icon,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tab-contents-inverted="true"]
+.tabbrowser-tabs[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-mode="vertical"]
   .tabbrowser-tab
   .tab-icon
   .tab-icon-image {
@@ -133,14 +133,14 @@ tabbrowser[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
 	height: 16px !important;
 	margin: 0 0 0 6px !important;
 }
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tab-contents-inverted="true"]
+.tabbrowser-tabs[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-mode="vertical"]
   .tabbrowser-tab
   .tab-text {
 	margin: 0 !important;
@@ -148,7 +148,7 @@ tabbrowser[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
 	text-align: center !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab
   .tab-close-button {
 	z-index: 1 !important; /* for Linux */
@@ -159,7 +159,7 @@ tabbrowser[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
 	text-align: center !important;
 }
 /* this is not required on Firefox 4 */
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab
   > .tab-close-button {
 	margin-top: 0 !important;
@@ -170,33 +170,33 @@ tabbrowser[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
 /* twisty */
 
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-twisty-style][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-twisty-style][treestyletab-mode="vertical"]
   .tabbrowser-tab:not([pinned="true"])
   .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-twisty-style="retro"][treestyletab-mode="vertical"]
   .tabbrowser-tab:not([pinned="true"])
   .treestyletab-twisty-container {
 	margin: 0;
 }
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-twisty-style="retro"]:not([treestyletab-tab-contents-inverted="true"])
+.tabbrowser-tabs[treestyletab-twisty-style="retro"]:not([treestyletab-tab-contents-inverted="true"])
   .tabbrowser-tab:not([pinned="true"])
   .tab-icon {
 	margin-left: -6px !important;
 }
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-twisty-style][treestyletab-tab-contents-inverted="true"]
+.tabbrowser-tabs[treestyletab-twisty-style][treestyletab-tab-contents-inverted="true"]
   .tabbrowser-tab:not([pinned="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-twisty-style="retro"][treestyletab-tab-contents-inverted="true"]
   .tabbrowser-tab:not([pinned="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-twisty-style="retro"][treestyletab-tab-contents-inverted="true"]
   .tabbrowser-tab:not([pinned="true"])
   .tab-icon {
 	margin-right: -6px !important;
@@ -207,33 +207,33 @@ 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-mode="vertical"]
   .tabs-newtab-button,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-newtab-button:hover,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-alltabs-button,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-alltabs-button:hover,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-container
   > .tabs-closebutton,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   > .tabs-closebutton,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-container
   > .tabs-closebutton:hover,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   > .tabs-closebutton:hover,
 /* Firefox 4.0 or later */
-.treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
   > toolbarbutton,
-.treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
   > toolbarbutton:hover,
-.treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
   > toolbarpaletteitem
   > toolbarbutton,
-.treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
   > toolbarpaletteitem
   > toolbarbutton:hover {
 	background: #b3b2b3 !important;
@@ -241,21 +241,21 @@ tabbrowser[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
 }
 
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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-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-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-arrowscrollbox
   .tabs-newtab-button {
 	background: #9a9a9a url("shadow-active-r.png") repeat-y top left !important;
@@ -264,37 +264,37 @@ 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-tabbar-position="left"]
   .tabs-newtab-button,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tabbar-position="left"]
+.tabbrowser-tabs[treestyletab-tabbar-position="left"]
   .tabs-alltabs-button,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tabbar-position="left"]
+.tabbrowser-tabs[treestyletab-tabbar-position="left"]
   .tabs-container > .tabs-closebutton,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tabbar-position="left"]
+.tabbrowser-tabs[treestyletab-tabbar-position="left"]
   > .tabs-closebutton,
 /* Firefox 4.0 or later */
-.treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-tabbar-position="left"]
+.treestyletab-tabbar-toolbar[treestyletab-tabbar-position="left"]
   > toolbarbutton,
-.treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-tabbar-position="left"]
+.treestyletab-tabbar-toolbar[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-tabbar-position="right"]
   .tabs-newtab-button,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
+.tabbrowser-tabs[treestyletab-tabbar-position="right"]
   .tabs-alltabs-button,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
+.tabbrowser-tabs[treestyletab-tabbar-position="right"]
   .tabs-container
   > .tabs-closebutton,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
+.tabbrowser-tabs[treestyletab-tabbar-position="right"]
   > .tabs-closebutton,
 /* Firefox 4.0 or later */
-.treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
+.treestyletab-tabbar-toolbar[treestyletab-tabbar-position="right"]
   > toolbarbutton,
-.treestyletab-tabbar-toolbar[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
+.treestyletab-tabbar-toolbar[treestyletab-tabbar-position="right"]
   > toolbarpaletteitem
   > toolbarbutton {
 	border-left: 1px solid #666666 !important;
@@ -307,11 +307,11 @@ 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-mode="vertical"]
   .tabs-closebutton-topbox
   > .tabs-closebutton,
 :root[treestyletab-enable-compatibility-tmp="true"]
-  tabbrowser[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  tabbrowser[treestyletab-mode="vertical"]
   .tabs-closebutton-topbox
   > .tabs-closebutton:hover {
 	background: #b3b2b3 !important;
@@ -319,14 +319,14 @@ tabbrowser[treestyletab-style~="metal"][treestyletab-tabbar-position="right"]
 }
 
 :root[treestyletab-enable-compatibility-tmp="true"]
-  tabbrowser[treestyletab-style~="metal"][treestyletab-tabbar-position="left"]
+  tabbrowser[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-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
deleted file mode 100644
index aa166021..00000000
--- a/skin/classic/treestyletab/metal/metal.css
+++ /dev/null
@@ -1,16 +0,0 @@
-@import url("base.css");
-@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 2f2c3c5a..b2384120 100644
--- a/skin/classic/treestyletab/metal/tab-3.5.css
+++ b/skin/classic/treestyletab/metal/tab-3.5.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-mode="vertical"]
   .tabbrowser-tab,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:hover,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"],
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"]:hover {
 	background: none transparent !important;
 	border: 2px solid transparent !important;
@@ -27,13 +27,13 @@
 	-moz-border-radius: 0 !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-image-left,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-close-button,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-image-right {
 	border: 10px solid transparent;
 	margin: 0 !important;
@@ -41,35 +41,35 @@
 	-moz-appearance: none !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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-mode="vertical"]
   .tab-image-middle > .tab-text,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-image-middle > *,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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-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-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-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-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab:not([treestyletab-drop-position="self"]) .tab-image-left {
 	padding-right: 2px !important;
 }
@@ -78,22 +78,22 @@
 
 /* background, left */
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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-mode="vertical"]
   .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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-mode="vertical"]
   .tab-image-right {
 	border-left-width: 0;
 	-moz-border-image: url("tab-active-l.png") 10 5 10 10 / 10px 5px 10px 0;
@@ -103,19 +103,19 @@
 
 /* background, right */
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-left {
 	-moz-border-image: url("tab-active-r.png") 10 10 10 5 / 10px 0 10px 5px;
 }
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[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-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-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-right {
 	-moz-border-image: url("tab-active-r.png") 10 / 10px 10px 10px 0;
 }
@@ -123,19 +123,19 @@
 
 /* foreground, left */
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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-mode="vertical"]
   .tab-image-middle[selected="true"],
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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-mode="vertical"]
   .tab-image-right[selected="true"] {
 	-moz-border-image: url("tab-active-selected-l.png") 10 5 10 10 / 10px 5px 10px 0;
 }
@@ -144,19 +144,19 @@
 
 /* foreground, right */
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-left[selected="true"] {
 	-moz-border-image: url("tab-active-selected-r.png") 10 10 10 5 / 10px 0 10px 5px;
 }
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[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-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-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;
 }
@@ -165,16 +165,16 @@
 
 /* pinned tabs */
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"]
   > .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"]:hover
   > .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected]
   > .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected]:hover
   > .tab-image-middle {
 	background: none !important;
@@ -183,13 +183,13 @@
 	padding: 0 !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"],
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"]:hover,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected="true"],
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected="true"]:hover {
 	background: none !important;
 	border: none !important;
@@ -197,7 +197,7 @@
 	-moz-border-radius: 0 !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"]
   > .tab-image-middle
   > * {
@@ -205,16 +205,16 @@
 	padding: 0 !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"]
   > .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"]:hover
   > .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected="true"]
   > .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected="true"]:hover
   > .tab-image-middle {
 	background: #9d9d9d !important;
@@ -224,10 +224,10 @@
 	-moz-border-radius: 4px !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected="true"]
   > .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned="true"][selected="true"]:hover
   > .tab-image-middle {
 	background-color: #b3b2b3 !important;
@@ -241,22 +241,22 @@
 /* background, left */
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[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-mode="vertical"]
   .tab-image-middle,
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[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-mode="vertical"]
   .tab-image-right {
 	-moz-border-image: url("tab-inactive-l.png") 10 5 10 10 / 10px 5px 10px 0;
 }
@@ -266,22 +266,22 @@
 /* background, right */
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-left {
 	-moz-border-image: url("tab-inactive-r.png") 10 10 10 5 / 10px 0 10px 5px;
 }
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[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-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-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-right {
 	-moz-border-image: url("tab-inactive-r.png") 10 / 10px 10px 10px 0;
 }
@@ -291,22 +291,22 @@
 /* foreground, left */
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[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-mode="vertical"]
   .tab-image-middle[selected="true"],
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[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-mode="vertical"]
   .tab-image-right[selected="true"] {
 	-moz-border-image: url("tab-inactive-selected-l.png") 10 5 10 10 / 10px 5px 10px 0;
 }
@@ -316,22 +316,22 @@
 /* foreground, right */
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-image-left[selected="true"] {
 	-moz-border-image: url("tab-inactive-selected-r.png") 10 10 10 5 / 10px 0 10px 5px;
 }
 
 :root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[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-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-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-4.css b/skin/classic/treestyletab/metal/tab-4.css
index ff96d95a..ca65573c 100644
--- a/skin/classic/treestyletab/metal/tab-4.css
+++ b/skin/classic/treestyletab/metal/tab-4.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-mode="vertical"]
   .tabbrowser-tab,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:hover,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"],
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"]:hover {
 	border: 2px solid transparent !important;
 	color: black !important;
@@ -25,21 +25,21 @@
 	-moz-border-left-colors: transparent transparent !important;
 	-moz-border-radius: 0 !important;
 }
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   :-moz-any(.tabbrowser-tab:not([pinned]),
             .tabbrowser-tab[pinned]:not([titlechanged])),
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   :-moz-any(.tabbrowser-tab:not([pinned]),
             .tabbrowser-tab[pinned]:not([titlechanged])):hover,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"],
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"]:hover {
 	background: none transparent !important;
 }
 
 /* for Mac OS X, Firefox 4 */
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   :-moz-any(.tab-content:not([pinned]):not([selected="true"]),
             .tab-content[pinned]:not([titlechanged]):not([selected="true"]),
             .tab-content:not([pinned])[selected="true"],
@@ -54,7 +54,7 @@
 	border: 0 none !important;
 	background: transparent !important;
 }
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   :-moz-any(.tab-background-start:not([selected="true"]),
             .tab-background-middle:not([selected="true"]),
             .tab-background-end:not([selected="true"]),
@@ -63,22 +63,22 @@
             .tab-background-end[selected="true"]) {
 	mask: none !important;
 }
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   :-moz-any(.tab-background-start[pinned][titlechanged],
             .tab-background-end[pinned][titlechanged]) {
 	visibility: collapse !important;
 }
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-background {
 	margin: 0 !important;
 }
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-content {
 	margin-left: 0 !important;
 	margin-right: 0 !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-content {
 	border: 10px solid transparent;
 	margin: 0 !important;
@@ -86,13 +86,13 @@
 }
 
 /*
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-icon {
 	margin-top: -16px !important;
 	margin-bottom: -14px !important;
 }
 */
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-content > * {
 	position: relative !important;
 	margin-top: -10px !important;
@@ -100,19 +100,19 @@
 }
 
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]:not([treestyletab-tab-inverted="true"])
+.tabbrowser-tabs[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-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-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-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab:not([treestyletab-drop-position="self"]) .tab-image-left {
 	padding-right: 2px !important;
 }
@@ -120,25 +120,25 @@
 
 
 /* background, left */
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-content {
 	-moz-border-image: url("tab-active-l.png") 10 5 10 10 / 10px 5px 10px 10px !important;
 }
 
 /* background, right */
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-content {
 	-moz-border-image: url("tab-active-r.png") 10 10 10 5 / 10px 10px 10px 5px !important;
 }
 
 /* foreground, left */
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-content[selected="true"] {
 	-moz-border-image: url("tab-active-selected-l.png") 10 5 10 10 / 10px 5px 10px 10px !important;
 }
 
 /* foreground, right */
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-content[selected="true"] {
 	-moz-border-image: url("tab-active-selected-r.png") 10 10 10 5 / 10px 10px 10px 5px !important;
 }
@@ -146,61 +146,61 @@
 
 /* pinned tabs */
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:not(:hover)
   .tab-content[pinned],
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:hover
   .tab-content[pinned],
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[selected]:not(:hover)
   .tab-content[pinned],
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[selected]:hover
   .tab-content[pinned] {
 	-moz-border-image: none !important;
 	margin: 0 !important;
 	padding: 0 !important;
 }
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:not(:hover)
   .tab-content[pinned]:not([titlechanged]),
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:hover
   .tab-content[pinned]:not([titlechanged]),
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:not(:hover)
   .tab-content[pinned][selected],
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:hover
   .tab-content[pinned][selected] {
 	background: none !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned]:not(:hover),
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned]:hover,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned][selected="true"]:not(:hover),
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned][selected="true"]:hover {
 	border: none !important;
 	padding: 0 !important;
 	-moz-border-radius: 0 !important;
 }
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned]:not([titlechanged]):not(:hover),
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned]:not([titlechanged]):hover,
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned][selected="true"]:not(:hover),
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned][selected="true"]:hover {
 	background: none !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab
   .tab-content[pinned]
   * {
@@ -208,16 +208,16 @@
 	padding: 0 !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:not(:hover)
   .tab-content[pinned],
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:hover
   .tab-content[pinned],
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:not(:hover)
   .tab-content[pinned][selected="true"],
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:hover
   .tab-content[pinned][selected="true"] {
 	line-height: 1 !important;
@@ -226,25 +226,25 @@
 	padding: 2px 4px 2px 3px !important;
 	-moz-border-radius: 4px !important;
 }
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:not(:hover)
   .tab-content[pinned]:not([titlechanged]),
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:hover
   .tab-content[pinned]:not([titlechanged]),
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:not(:hover)
   .tab-content[selected="true"][pinned],
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:hover
   .tab-content[selected="true"][pinned] {
 	background: #9d9d9d !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:not(:hover)
   .tab-content[selected="true"][pinned],
-.tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:hover
   .tab-content[selected="true"][pinned] {
 	background-color: #b3b2b3 !important;
@@ -257,28 +257,28 @@
 
 /* background, left */
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-content {
 	-moz-border-image: url("tab-inactive-l.png") 10 5 10 10 / 10px 5px 10px 10px !important;
 }
 
 /* background, right */
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-content {
 	-moz-border-image: url("tab-inactive-r.png") 10 10 10 5 / 10px 10px 10px 5px !important;
 }
 
 /* foreground, left */
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-content[selected="true"] {
 	-moz-border-image: url("tab-inactive-selected-l.png") 10 5 10 10 / 10px 5px 10px 10px !important;
 }
 
 /* foreground, right */
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tab-content[selected="true"] {
 	-moz-border-image: url("tab-inactive-selected-r.png") 10 10 10 5 / 10px 10px 10px 5px !important;
 }
@@ -287,29 +287,29 @@
 /* pinned tabs */
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab
   .tab-content[pinned]:not([titlechanged]),
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:hover
   .tab-content[pinned]:not([titlechanged]) {
 	background: #cecece !important;
 }
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab
   .tab-content[pinned][selected="true"],
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:hover
   .tab-content[pinned][selected="true"] {
 	background: #e4e4e4 !important;
 }
 
 :root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="metal"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab
   .tab-content[pinned] {
 	border-color: #9a9a9a !important;
diff --git a/skin/classic/treestyletab/sidebar/aero.css b/skin/classic/treestyletab/sidebar/aero.css
new file mode 100644
index 00000000..19ef3ee3
--- /dev/null
+++ b/skin/classic/treestyletab/sidebar/aero.css
@@ -0,0 +1,14 @@
+/* aero glass */
+
+.tabbrowser-tabs[treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+.tabbrowser-strip[treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+tabbrowser[treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+:root[treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]) #appcontent,
+:root[treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]) #browser {
+	background: transparent !important;
+	-moz-appearance: none !important;
+}
+.tabbrowser-strip[treestyletab-style~="aero"][treestyletab-mode="vertical"],
+.treestyletab-tabbar-toolbar[treestyletab-style~="aero"][treestyletab-mode="vertical"] {
+	border-top: none 0 !important;
+}
diff --git a/skin/classic/treestyletab/sidebar/base.css b/skin/classic/treestyletab/sidebar/base.css
index 1feeb9a0..839fd4bf 100644
--- a/skin/classic/treestyletab/sidebar/base.css
+++ b/skin/classic/treestyletab/sidebar/base.css
@@ -2,52 +2,52 @@
 
 /* Unset bottom border, instead let's have a border on the right-hand
    side, much like the sidebar does. */
-.tabbrowser-strip:not(.treestyletab-tabbar-placeholder)[treestyletab-style~="sidebar"][treestyletab-mode="vertical"],
-.treestyletab-tabbar-toolbar[treestyletab-style~="sidebar"][treestyletab-mode="vertical"] {
+.tabbrowser-strip:not(.treestyletab-tabbar-placeholder)[treestyletab-mode="vertical"],
+.treestyletab-tabbar-toolbar[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-mode="vertical"] {
 	background: transparent !important;
 	background-color: #d4dde5 !important;
 }
 
 /* Don't display unnecessary clutter */
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-bottom,
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-left,
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-text-shadow,
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .treestyletab-splitter grippy,
-.treestyletab-tabbar-toolbar[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.treestyletab-tabbar-toolbar[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"]
+tabbrowser[treestyletab-mode="vertical"]
   .treestyletab-splitter,
-.treestyletab-tabbar-toolbar[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.treestyletab-tabbar-toolbar[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-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-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-mode="vertical"]
   .tabbrowser-tab {
 	-moz-appearance: none !important;
 	-moz-border-top-colors: none !important;
@@ -66,55 +66,55 @@ tabbrowser[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 	border: none;
 	border-top: 1px solid transparent !important;
 }
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:not([pinned]),
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned]:not([titlechanged]) {
 	background: transparent !important;
 }
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   :-moz-any(.tabbrowser-tab[pinned],
             .tab-background[pinned]) {
 	padding: 0 !important;
 	line-height: 1 !important;
 }
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[pinned]
   .tab-stack {
 	max-height: 24px !important;
 }
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-content[pinned] {
 	padding: 2px 2px 3px !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"] {
 	border-top: 1px solid #94A1C0 !important;
 }
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"] {
 	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"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-close-button {
 	margin-left: 3px;
 }
 
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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-mode="vertical"]
   .tab-close-button:active
   image {
 	opacity: 0.46;  /* turn black into #8a8a8a */
 }
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"]
   .tab-close-button
   image {
@@ -123,13 +123,13 @@ tabbrowser[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 }
 
 /* Always display the favicon at 100% opacity */
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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-mode="vertical"]
   .tabbrowser-tab:not(:hover):not([selected="true"])
   .tab-close-button {
 	display: none !important;
@@ -137,7 +137,7 @@ tabbrowser[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 
 /* Tab label is without special decoration except when selected: then
    the text is white and bold. */
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-text {
 	font-size: 11px;
 	font-weight: normal !important;
@@ -145,7 +145,7 @@ tabbrowser[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 	text-shadow: none !important;
 	margin-bottom: 1px;
 }
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"] .tab-text {
 	font-weight: bold !important;
 	color: #ffffff !important;
@@ -154,24 +154,24 @@ tabbrowser[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 
 
 /* Make the tab counter look like the bubbles in Mail.app et.al. */
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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"]
+.tabbrowser-tabs[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-mode="vertical"]
   .tabbrowser-tab[selected="true"]
   .treestyletab-counter-container {
 	background-color: #ffffff !important;
 }
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"]
   .treestyletab-counter {
 	color: #91a0c0 !important;
@@ -184,13 +184,13 @@ tabbrowser[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 /* 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-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="self"][selected="true"],
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="self"][selected="true"]:hover,
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="self"]:not([selected="true"]),
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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;
@@ -199,7 +199,7 @@ tabbrowser[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 }
 
 /* Round blue rectangle around tabs that are dropping targets. */
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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;
@@ -207,25 +207,25 @@ tabbrowser[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 }
 
 /* White-blue-white separator for drop indicator. */
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="before"][selected="true"],
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="before"][selected="true"]:hover,
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="before"]:not([selected="true"]),
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="after"][selected="true"],
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="after"][selected="true"]:hover,
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="after"]:not([selected="true"]),
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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;
@@ -233,28 +233,28 @@ tabbrowser[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 
 /* 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-mode="vertical"]
   .tabbrowser-tab[treestyletab-drop-position="before"]
   .treestyletab-drop-marker,
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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-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-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-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-mode="vertical"][treestyletab-allow-subtree-collapse="true"]
   .tabbrowser-tab[treestyletab-drop-position="after"]
   .treestyletab-drop-marker-container {
 	margin-left: -30px;
@@ -264,8 +264,8 @@ tabbrowser[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 
 /* changed from original SidebarStyleTab */
 
-.treestyletab-tabbar-toolbar[treestyletab-style~="sidebar"]:not([treestyletab-tabbar-position="top"]),
-.treestyletab-tabbar-toolbar[treestyletab-style~="sidebar"][treestyletab-tabbar-position="top"]:not([treestyletab-tabbar-fixed="true"]) {
+.treestyletab-tabbar-toolbar:not([treestyletab-tabbar-position="top"]),
+.treestyletab-tabbar-toolbar[treestyletab-tabbar-position="top"]:not([treestyletab-tabbar-fixed="true"]) {
 	background: transparent !important;
 	border: 0 none !important;
 	margin: 0 !important;
@@ -275,39 +275,39 @@ tabbrowser[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 	box-shadow: none !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .treestyletab-counter-paren {
 	display: none !important;
 }
 
 /* Firefox 3.6 or older */
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
-  .tabs-newtab-button,
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
+  .tabs-newtab-button:not(:hover),
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-newtab-button:hover,
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
-  .tabs-alltabs-button,
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
+  .tabs-alltabs-button:not(:hover),
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-alltabs-button:hover,
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-container
-  > .tabs-closebutton,
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
-  > .tabs-closebutton,
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+  > .tabs-closebutton:not(:hover),
+.tabbrowser-tabs[treestyletab-mode="vertical"]
+  > .tabs-closebutton:not(:hover),
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-container
   > .tabs-closebutton:hover,
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   > .tabs-closebutton:hover,
 /* Firefox 4.0 or later */
-.treestyletab-tabbar-toolbar[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
-  > toolbarbutton,
-.treestyletab-tabbar-toolbar[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
+  > toolbarbutton:not(:hover),
+.treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
   > toolbarbutton:hover,
-.treestyletab-tabbar-toolbar[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
   > toolbarpaletteitem
-  > toolbarbutton,
-.treestyletab-tabbar-toolbar[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+  > toolbarbutton:not(:hover),
+.treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
   > toolbarpaletteitem
   > toolbarbutton:hover {
 	-moz-appearance: none !important;
@@ -315,13 +315,13 @@ tabbrowser[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 	border: 0 none !important;
 }
 
-.treestyletab-tabbar-toolbar[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.treestyletab-tabbar-toolbar[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-mode="vertical"]
   .tabbrowser-tab:not(:hover):not([selected="true"])
   .tab-close-button {
 	display: -moz-box !important;
@@ -329,42 +329,42 @@ tabbrowser[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
 }
 
 /* for Windows (Winstrip/Strata) */
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-close-button
   image,
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-close-button:active
   image,
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-close-button:hover
   image,
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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-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-mode="vertical"]
   .tab-close-button {
 	-moz-appearance: none !important;
 }
 
 /* for Mac OS X, Firefox 4 */
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   :-moz-any(.tab-content:not([selected="true"]):not([pinned]),
             .tab-content:not([selected="true"])[pinned]:not([titlechanged]),
             .tab-content[selected="true"]) {
 	border: 0 none !important;
 	background: transparent !important;
 }
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   :-moz-any(.tab-background-start:not([selected="true"]),
             .tab-background-middle:not([selected="true"]),
             .tab-background-end:not([selected="true"]),
@@ -373,7 +373,7 @@ tabbrowser[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
             .tab-background-end[selected="true"]) {
 	mask: none !important;
 }
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   :-moz-any(.tab-background-start:not([selected="true"]),
             .tab-background-middle:not([selected="true"]):not([pinned]),
             .tab-background-middle:not([selected="true"])[pinned]:not([titlechanged]),
@@ -383,29 +383,29 @@ tabbrowser[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
             .tab-background-end[selected="true"]) {
 	background: transparent !important;
 }
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   :-moz-any(.tab-background-start[pinned][titlechanged],
             .tab-background-end[pinned][titlechanged]) {
 	visibility: collapse !important;
 }
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-background {
 	margin: 0 !important;
 }
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-content {
 	margin-left: 0 !important;
 	margin-right: 0 !important;
 	-moz-border-image: none !important;
 }
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:not([treestyletab-drop-position])
   .tab-content {
 	border: 0 none !important;
 }
 
 /* for Multiple Tab Handler */
-.tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[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 0956ab37..bb512819 100644
--- a/skin/classic/treestyletab/sidebar/inactive-3.6.css
+++ b/skin/classic/treestyletab/sidebar/inactive-3.6.css
@@ -3,35 +3,35 @@
 /* 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"]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"] {
+  .tabbrowser-strip: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"]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"] {
+  .tabbrowser-strip: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"]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"]
+  tabbrowser: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-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-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-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"] {
 	border-top: 1px solid #979797 !important;
 	background: -moz-linear-gradient(top, #B4B4B4, #8A8A8A) repeat-x !important;  
@@ -39,18 +39,18 @@
 
 /* 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"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
   .treestyletab-counter-container {
 	background-color: #b5b5b5 !important;
 }
 #main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[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"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"]
   .treestyletab-counter {
 	color: #929292 !important;
diff --git a/skin/classic/treestyletab/sidebar/inactive-4.css b/skin/classic/treestyletab/sidebar/inactive-4.css
index 486c8ca2..eececdac 100644
--- a/skin/classic/treestyletab/sidebar/inactive-4.css
+++ b/skin/classic/treestyletab/sidebar/inactive-4.css
@@ -3,40 +3,40 @@
 /* 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:not(.treestyletab-tabbar-placeholder)[treestyletab-style~="sidebar"]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"],
+  .tabbrowser-strip:not(.treestyletab-tabbar-placeholder):not([treestyletab-style~="aero"])[treestyletab-mode="vertical"],
 #main-window:-moz-window-inactive
-  .treestyletab-tabbar-toolbar[treestyletab-style~="sidebar"]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"] {
+  .treestyletab-tabbar-toolbar: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"]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"] {
+  .tabbrowser-strip: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"]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"]
+  tabbrowser:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"]
   .treestyletab-splitter,
 #main-window:-moz-window-inactive
-  .treestyletab-tabbar-toolbar[treestyletab-style~="sidebar"]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"]
+  .treestyletab-tabbar-toolbar: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-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-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-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"] {
 	border-top: 1px solid #979797 !important;
 	background: -moz-linear-gradient(top, #B4B4B4, #8A8A8A) repeat-x !important;  
@@ -44,18 +44,18 @@
 
 /* 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"]
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
   .treestyletab-counter-container {
 	background-color: #b5b5b5 !important;
 }
 #main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-style~="sidebar"][treestyletab-mode="vertical"]
+  .tabbrowser-tabs[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"]
+  .tabbrowser-tabs[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
deleted file mode 100644
index 9f29aa2c..00000000
--- a/skin/classic/treestyletab/sidebar/sidebar.css
+++ /dev/null
@@ -1,18 +0,0 @@
-@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"],
-.treestyletab-tabbar-toolbar[treestyletab-style~="sidebar"][treestyletab-style~="aero"][treestyletab-mode="vertical"] {
-	border-top: none 0 !important;
-}
diff --git a/skin/classic/treestyletab/square/Darwin-inactive-3.5.css b/skin/classic/treestyletab/square/Darwin-inactive-3.5.css
new file mode 100644
index 00000000..fa511adf
--- /dev/null
+++ b/skin/classic/treestyletab/square/Darwin-inactive-3.5.css
@@ -0,0 +1,42 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* Square */
+
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
+  .tabbrowser-tab
+  .tab-image-middle,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
+  .tabbrowser-tab
+  .tab-close-button,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
+  .tabbrowser-tab[selected="true"]
+  .tab-image-middle,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
+  .tabbrowser-tab[selected="true"]
+  .tab-close-button,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-tabbar-position="bottom"]
+  .tabbrowser-tab
+  .tab-image-middle,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-tabbar-position="bottom"]
+  .tabbrowser-tab
+  .tab-close-button,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-tabbar-position="bottom"]
+  .tabbrowser-tab[selected="true"]
+  .tab-image-middle,
+#main-window:not([active="true"])
+  .tabbrowser-tabs[treestyletab-tabbar-position="bottom"]
+  .tabbrowser-tab[selected="true"]
+  .tab-close-button {
+	height: auto;
+	margin: 0 !important;
+	padding: 0 !important;
+	background: transparent;
+	width: 0;
+}
diff --git a/skin/classic/treestyletab/square/Darwin-inactive-4.css b/skin/classic/treestyletab/square/Darwin-inactive-4.css
new file mode 100644
index 00000000..b1346fff
--- /dev/null
+++ b/skin/classic/treestyletab/square/Darwin-inactive-4.css
@@ -0,0 +1,42 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* Square */
+
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
+  .tabbrowser-tab
+  .tab-image-middle,
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
+  .tabbrowser-tab
+  .tab-close-button,
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
+  .tabbrowser-tab[selected="true"]
+  .tab-image-middle,
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
+  .tabbrowser-tab[selected="true"]
+  .tab-close-button,
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-tabbar-position="bottom"]
+  .tabbrowser-tab
+  .tab-image-middle,
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-tabbar-position="bottom"]
+  .tabbrowser-tab
+  .tab-close-button,
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-tabbar-position="bottom"]
+  .tabbrowser-tab[selected="true"]
+  .tab-image-middle,
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-tabbar-position="bottom"]
+  .tabbrowser-tab[selected="true"]
+  .tab-close-button {
+	height: auto;
+	margin: 0 !important;
+	padding: 0 !important;
+	background: transparent;
+	width: 0;
+}
diff --git a/skin/classic/treestyletab/square/Darwin.css b/skin/classic/treestyletab/square/Darwin.css
new file mode 100644
index 00000000..51df66a1
--- /dev/null
+++ b/skin/classic/treestyletab/square/Darwin.css
@@ -0,0 +1,25 @@
+@import url("platform-inactive.css");
+
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* Square */
+
+tabbrowser[treestyletab-tabbar-position="left"]:not([treestyletab-tabbar-fixed="true"])
+  .treestyletab-splitter {
+	border-right: 1px solid ThreeDShadow !important;
+	-moz-border-right-colors: ThreeDShadow !important;
+}
+tabbrowser[treestyletab-tabbar-position="right"]:not([treestyletab-tabbar-fixed="true"])
+  .treestyletab-splitter {
+	border-left: 1px solid ThreeDShadow !important;
+	-moz-border-left-colors: ThreeDShadow !important;
+}
+
+tabbrowser:not([treestyletab-style="vertigo"])[treestyletab-mode="vertical"]
+  .tabbrowser-tab {
+	z-index: 1 !important;
+}
+tabbrowser:not([treestyletab-style="vertigo"])[treestyletab-mode="vertical"]
+  .tabbrowser-tab:not([pinned="true"]) {
+	position: relative !important;
+}
diff --git a/skin/classic/treestyletab/square/Linux.css b/skin/classic/treestyletab/square/Linux.css
new file mode 100644
index 00000000..8c0a2649
--- /dev/null
+++ b/skin/classic/treestyletab/square/Linux.css
@@ -0,0 +1,14 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+/* vertical tree */
+
+.tabbrowser-strip[treestyletab-tabbar-position="left"]:not([treestyletab-tabbar-transparent="full"]),
+.treestyletab-tabbar-toolbar[treestyletab-tabbar-position="left"]:not([treestyletab-tabbar-transparent="full"]) {
+	border-right: 1px solid ThreeDShadow !important;
+	-moz-border-right-colors: none !important;
+}
+.tabbrowser-strip[treestyletab-tabbar-position="right"]:not([treestyletab-tabbar-transparent="full"]),
+.treestyletab-tabbar-toolbar[treestyletab-tabbar-position="right"]:not([treestyletab-tabbar-transparent="full"]) {
+	border-left: 1px solid ThreeDShadow !important;
+	-moz-border-right-colors: none !important;
+}
diff --git a/skin/classic/treestyletab/square/base.css b/skin/classic/treestyletab/square/base.css
index 27433b0b..43db130c 100644
--- a/skin/classic/treestyletab/square/base.css
+++ b/skin/classic/treestyletab/square/base.css
@@ -2,24 +2,24 @@
 
 /* Default style */
 
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"]),
-.treestyletab-tabbar-toolbar[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"]) {
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"]),
+.treestyletab-tabbar-toolbar:not([treestyletab-tabbar-position="top"]) {
 	background: transparent !important;
 	margin: 0 !important;
 	padding: 0 !important;
 	-moz-appearance: none;
 }
-.tabbrowser-strip[treestyletab-style~="square"][treestyletab-style~="border"]:not([treestyletab-tabbar-position="top"]) {
+.tabbrowser-strip[treestyletab-style~="border"]:not([treestyletab-tabbar-position="top"]) {
 	background: darkgray !important;
 	-moz-appearance: none;
 }
 
-.tabbrowser-strip[treestyletab-style~="square"][treestyletab-mode="vertical"],
-.treestyletab-tabbar-toolbar[treestyletab-style~="square"][treestyletab-mode="vertical"],
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"],
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
+.tabbrowser-strip[treestyletab-mode="vertical"],
+.treestyletab-tabbar-toolbar[treestyletab-mode="vertical"],
+.tabbrowser-tabs[treestyletab-mode="vertical"],
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-arrowscrollbox,
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-container {
 	height: auto !important;
 	max-height: none !important;
@@ -27,8 +27,8 @@
 	padding-right: 0 !important;
 }
 
-.treestyletab-tabbar-toolbar[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"]),
-.treestyletab-tabbar-toolbar[treestyletab-style~="square"][treestyletab-tabbar-position="top"]:not([treestyletab-tabbar-fixed="true"]) {
+.treestyletab-tabbar-toolbar:not([treestyletab-tabbar-position="top"]),
+.treestyletab-tabbar-toolbar[treestyletab-tabbar-position="top"]:not([treestyletab-tabbar-fixed="true"]) {
 	border: 0 none !important;
 	margin: 0 !important;
 	padding: 0 !important;
@@ -36,29 +36,29 @@
 	box-shadow: none !important;
 }
 
-.tabbrowser-strip[treestyletab-style~="square"][treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"],
-.treestyletab-tabbar-toolbar[treestyletab-style~="square"][treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"] {
+.tabbrowser-strip[treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"],
+.treestyletab-tabbar-toolbar[treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"] {
 	border-right: 1px solid ThreeDShadow !important;
 	-moz-border-right-colors: none !important;
 }
-.tabbrowser-strip[treestyletab-style~="square"][treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"],
-.treestyletab-tabbar-toolbar[treestyletab-style~="square"][treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"] {
+.tabbrowser-strip[treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"],
+.treestyletab-tabbar-toolbar[treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"] {
 	border-left: 1px solid ThreeDShadow !important;
 	-moz-border-left-colors: none !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-left,
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabs-bottom,
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tab-text-shadow /* Mac OS X */ {
 	display: none !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab,
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab:not([selected="true"]) {
 	-moz-appearance: none !important;
 	min-height: 2em;
@@ -79,34 +79,34 @@
 	-moz-border-image: none !important;
 	-moz-box-align: stretch !important;
 }
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab:not([pinned]),
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab:not([pinned]):not([selected="true"]) {
 	background: ThreeDFace !important;
 }
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   :-moz-any(.tabbrowser-tab[pinned]:not([titlechanged]),
             .tabbrowser-tab[pinned]:not([titlechanged]):not([selected="true"])),
 :root[tabFx2Compatible-flags~="mac"]
-  .tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   :-moz-any(.tabbrowser-tab[pinned],
             .tabbrowser-tab[pinned][titlechanged]) {
 	background: ThreeDFace !important;
 }
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"][treestyletab-firsttab-border="true"]
+.tabbrowser-tabs[treestyletab-mode="vertical"][treestyletab-firsttab-border="true"]
   .tabbrowser-tab:not([pinned="true"]):not([selected="true"]):first-child {
 	-moz-border-top-colors: ThreeDShadow transparent !important;
 }
 
 /* for Mac OS X, Firefox 4 */
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   :-moz-any(.tab-content:not([selected="true"]),
             .tab-content[selected="true"]) {
 	border: 0 none !important;
 	background: transparent !important;
 }
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   :-moz-any(.tab-background-start:not([selected="true"]),
             .tab-background-middle:not([selected="true"]),
             .tab-background-end:not([selected="true"]),
@@ -115,7 +115,7 @@
             .tab-background-end[selected="true"]) {
 	mask: none !important;
 }
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   :-moz-any(.tab-background-start:not([selected="true"]),
             .tab-background-middle:not([selected="true"]):not([pinned]),
             .tab-background-middle:not([selected="true"])[pinned]:not([titlechanged]),
@@ -125,48 +125,48 @@
             .tab-background-end[selected="true"]) {
 	background: transparent !important;
 }
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   :-moz-any(.tab-background-start[pinned][titlechanged],
             .tab-background-end[pinned][titlechanged]) {
 	visibility: collapse !important;
 }
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-background {
 	margin: 0 !important;
 }
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-content {
 	margin-left: 0 !important;
 	margin-right: 0 !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tab-icon-image {
 	margin-left: 0;
 }
 
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab[selected="true"] {
 	margin: 0 !important;
 	padding: 0 0.2em !important;
 	-moz-border-top-colors: ThreeDHighlight transparent !important;
 	-moz-border-bottom-colors: ThreeDShadow transparent !important;
 }
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab[selected="true"] {
 	background-color: ThreeDHighlight !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab
   .tab-image-left,
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab
   .tab-image-right,
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab:not([selected="true"])
   .tab-image-left,
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab:not([selected="true"])
   .tab-image-right {
 	height: auto;
@@ -177,16 +177,16 @@
 }
 
 
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab
   .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab
   .tab-close-button,
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab:not([selected="true"]):not(:hover)
   .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab:not([selected="true"]):not(:hover)
   .tab-image-middle
   .tab-close-button {
@@ -195,39 +195,39 @@
 	padding: 0 !important;
 	background: transparent;
 }
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab[selected="true"]
   .tab-image-middle,
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab[selected="true"]
   .tab-close-button {
 	background: transparent;
 }
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab,
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:not([selected="true"]) {
 	border-left: 2px solid !important;
 	-moz-border-left-colors: ThreeDLightShadow transparent !important;
 	border-right: 2px solid !important;
 	-moz-border-right-colors: ThreeDLightShadow transparent !important;
 }
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab[selected="true"] {
 	-moz-border-left-colors: ThreeDLightShadow transparent !important;
 	-moz-border-right-colors: ThreeDLightShadow transparent !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab
   .tab-close-button {
 	margin-right: 0 !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"]
+.tabbrowser-tabs[treestyletab-tabbar-position="bottom"]
   .tabbrowser-tab,
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-tabbar-position="bottom"]
+.tabbrowser-tabs[treestyletab-tabbar-position="bottom"]
   .tabbrowser-tab:not([selected="true"]) {
 	border-right: 2px solid !important;
 	-moz-border-right-colors: ThreeDShadow transparent !important;
@@ -236,162 +236,39 @@
 }
 
 /* Mac OS X */
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab {
 	text-align: start !important; 
 	-moz-box-pack: start !important;
 }
 
 
-/* Vertigo style */
+/* padding */
 
-.tabbrowser-tabs[treestyletab-style~="vertigo"]:not([treestyletab-tabbar-position="top"]) {
-	background: transparent !important;
-}
-
-.tabbrowser-tabs[treestyletab-style~="vertigo"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab:not([selected="true"]) {
-	-moz-border-top-colors: transparent transparent !important;
-	-moz-border-bottom-colors: transparent transparent !important;
-}
-.tabbrowser-tabs[treestyletab-style~="vertigo"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab:not([selected="true"]):not([pinned]),
-.tabbrowser-tabs[treestyletab-style~="vertigo"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab:not([selected="true"])[pinned]:not([titlechanged])) {
-	background: transparent !important;
-}
-.tabbrowser-tabs[treestyletab-style~="vertigo"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab:not([selected="true"]):hover {
-	-moz-border-top-colors: #e0e8f6 #e0e8f6 !important;
-	-moz-border-bottom-colors: #e0e8f6 #e0e8f6 !important;
-}
-.tabbrowser-tabs[treestyletab-style~="vertigo"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab:not([selected="true"]):not([pinned]):hover,
-.tabbrowser-tabs[treestyletab-style~="vertigo"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab:not([selected="true"])[pinned]:not([titlechanged]):hover {
-	background-color: #e0e8f6 !important;
-}
-.tabbrowser-tabs[treestyletab-style~="vertigo"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab[selected="true"] {
-	-moz-border-top-colors: #c1d2ee #c1d2ee !important;
-	-moz-border-bottom-colors: #c1d2ee #c1d2ee !important;
-}
-.tabbrowser-tabs[treestyletab-style~="vertigo"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab[selected="true"] {
-	background-color: #c1d2ee !important;
-}
-.tabbrowser-tabs[treestyletab-style~="vertigo"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab[selected="true"]:hover {
-	-moz-border-top-colors: #d1e2fe #d1e2fe !important;
-	-moz-border-bottom-colors: #d1e2fe #d1e2fe !important;
-}
-.tabbrowser-tabs[treestyletab-style~="vertigo"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab[selected="true"]:hover {
-	background-color: #d1e2fe !important;
-}
-
-.tabbrowser-tabs[treestyletab-style~="vertigo"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab:not([selected="true"]),
-.tabbrowser-tabs[treestyletab-style~="vertigo"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
-  .tabbrowser-tab:not([selected="true"]) {
-	-moz-border-left-colors: transparent transparent !important;
-	-moz-border-right-colors: transparent transparent !important;
-}
-.tabbrowser-tabs[treestyletab-style~="vertigo"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab:not([selected="true"]):hover,
-.tabbrowser-tabs[treestyletab-style~="vertigo"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
-  .tabbrowser-tab:not([selected="true"]):hover {
-	-moz-border-left-colors: #e0e8f6 #e0e8f6 !important;
-	-moz-border-right-colors: #e0e8f6 #e0e8f6 !important;
-}
-.tabbrowser-tabs[treestyletab-style~="vertigo"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab[selected="true"],
-.tabbrowser-tabs[treestyletab-style~="vertigo"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
-  .tabbrowser-tab[selected="true"] {
-	-moz-border-left-colors: #c1d2ee #c1d2ee !important;
-	-moz-border-right-colors: #c1d2ee #c1d2ee !important;
-}
-.tabbrowser-tabs[treestyletab-style~="vertigo"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab[selected="true"]:hover,
-.tabbrowser-tabs[treestyletab-style~="vertigo"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
-  .tabbrowser-tab[selected="true"]:hover {
-	-moz-border-left-colors: #d1e2fe #d1e2fe !important;
-	-moz-border-right-colors: #d1e2fe #d1e2fe !important;
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab:not([selected="true"]) {
+	padding: 0 0.2em !important;
 }
 
-
-/* Mixed style */
-
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"][treestyletab-mode="vertical"]
-  .tabbrowser-tab {
-	-moz-border-right-colors: transparent transparent !important;
-	-moz-border-left-colors: transparent transparent !important;
-}
-
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab:not([selected="true"]):hover {
-	-moz-border-top-colors: #e0e8f6 transparent !important;
-	-moz-border-left-colors: #e0e8f6 transparent !important;
-}
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab:not([selected="true"]):not([pinned]):hover,
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab:not([selected="true"])[pinned]:not([titlechanged]):hover {
-	background-color: #e0e8f6 !important;
-}
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"][treestyletab-mode="vertical"][treestyletab-firsttab-border="true"]
-  .tabbrowser-tab:first-child:not([selected="true"]):hover {
-	-moz-border-top-colors: ThreeDShadow #e0e8f6 !important;
-}
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
-  .tabbrowser-tab:not([selected="true"]):hover {
-	-moz-border-right-colors: #e0e8f6 transparent !important;
-}
-
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab[selected="true"] {
-	-moz-border-top-colors: #c1d2ee transparent !important;
-	-moz-border-left-colors: #c1d2ee transparent !important;
-}
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab[selected="true"] {
-	background-color: #c1d2ee !important;
-}
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"][treestyletab-mode="vertical"][treestyletab-firsttab-border="true"]
-  .tabbrowser-tab:first-child[selected="true"] {
-	-moz-border-top-colors: ThreeDShadow #c1d2ee !important;
-}
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
-  .tabbrowser-tab[selected="true"] {
-	-moz-border-right-colors: #c1d2ee transparent !important;
-}
-
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab[selected="true"]:hover {
-	-moz-border-top-colors: #d1e2fe transparent !important;
-	-moz-border-left-colors: #d1e2fe transparent !important;
-}
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab[selected="true"]:hover {
-	background-color: #d1e2fe !important;
-}
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"][treestyletab-mode="vertical"][treestyletab-firsttab-border="true"]
-  .tabbrowser-tab:first-child[selected="true"]:hover {
-	-moz-border-top-colors: ThreeDShadow #d1e2fe !important;
-}
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
-  .tabbrowser-tab[selected="true"]:hover {
-	-moz-border-right-colors: #d1e2fe transparent !important;
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab
+  .tab-content[selected="true"]:not([pinned]),
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab
+  .tab-content:not([selected="true"]):not([pinned]) {
+	padding: 0 0.2em !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 {
+.tabbrowser-tabs[treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+.tabbrowser-strip[treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+tabbrowser[treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]),
+:root[treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]) #appcontent,
+:root[treestyletab-style~="aero"]:not([treestyletab-tabbar-position="top"]) #browser {
 	background: transparent !important;
 	-moz-appearance: none !important;
 }
diff --git a/skin/classic/treestyletab/square/dropshadow.css b/skin/classic/treestyletab/square/dropshadow.css
index cabe05d0..7f66df05 100644
--- a/skin/classic/treestyletab/square/dropshadow.css
+++ b/skin/classic/treestyletab/square/dropshadow.css
@@ -3,24 +3,24 @@
 
 /* drop-shadow of vertival tabs */
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="shadow"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab:not([pinned="true"]) {
 	-moz-box-shadow: -0.3em 0.3em 0.2em rgba(0, 0, 0, 0.15);
 	box-shadow: -0.3em 0.3em 0.2em rgba(0, 0, 0, 0.15);
 }
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="shadow"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+.tabbrowser-tabs[treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
   .tabbrowser-tab:not([pinned="true"]) {
 	-moz-box-shadow: 0.3em 0.3em 0.2em rgba(0, 0, 0, 0.15);
 	box-shadow: 0.3em 0.3em 0.2em rgba(0, 0, 0, 0.15);
 }
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="shadow"][treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabs-container:not([overflow="true"])
   .tabbrowser-arrowscrollbox
   .tabs-newtab-button,
 .treestyletab-tabbar-toolbar
-  .tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="shadow"][treestyletab-mode="vertical"]:not([overflow="true"])
+  .tabbrowser-tabs[treestyletab-mode="vertical"]:not([overflow="true"])
   .tabbrowser-arrowscrollbox
   .tabs-newtab-button {
 	-moz-box-shadow: 0 0.3em 0.2em rgba(0, 0, 0, 0.15);
@@ -28,18 +28,18 @@
 }
 
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="shadow"][treestyletab-mode="vertical"]:not([overflow="true"])
+.tabbrowser-tabs[treestyletab-mode="vertical"]:not([overflow="true"])
   .tabbrowser-arrowscrollbox,
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="shadow"][treestyletab-mode="vertical"][overflow="true"]
+.tabbrowser-tabs[treestyletab-mode="vertical"][overflow="true"]
   .tabbrowser-arrowscrollbox
   .scrollbox-innerbox {
 	-moz-box-shadow: inset -0.2em 0.2em 0.3em rgba(0, 0, 0, 0.15) !important;
 	box-shadow: inset -0.2em 0.2em 0.3em rgba(0, 0, 0, 0.15) !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="shadow"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]:not([overflow="true"])
+.tabbrowser-tabs[treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]:not([overflow="true"])
   .tabbrowser-arrowscrollbox,
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="shadow"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"][overflow="true"]
+.tabbrowser-tabs[treestyletab-mode="vertical"][treestyletab-tab-inverted="true"][overflow="true"]
   .tabbrowser-arrowscrollbox
   .scrollbox-innerbox {
 	-moz-box-shadow: inset 0.2em 0.2em 0.3em rgba(0, 0, 0, 0.15) !important;
@@ -49,9 +49,9 @@
 
 /* Transparent tabs are shown above solid tabs.
    We have to set z-index to show all tabs in the same layer. */
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-style="vertigo"])[treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-tab,
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-style="vertigo"])[treestyletab-mode="vertical"]
+.tabbrowser-tabs[treestyletab-mode="vertical"]
   .tabbrowser-arrowscrollbox
   .tabs-newtab-button {
 	position: relative;
diff --git a/skin/classic/treestyletab/square/mixed.css b/skin/classic/treestyletab/square/mixed.css
new file mode 100644
index 00000000..11afafc7
--- /dev/null
+++ b/skin/classic/treestyletab/square/mixed.css
@@ -0,0 +1,63 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.tabbrowser-tabs[treestyletab-style~="color"][treestyletab-mode="vertical"]
+  .tabbrowser-tab {
+	-moz-border-right-colors: transparent transparent !important;
+	-moz-border-left-colors: transparent transparent !important;
+}
+
+.tabbrowser-tabs[treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab:not([selected="true"]):hover {
+	-moz-border-top-colors: #e0e8f6 transparent !important;
+	-moz-border-left-colors: #e0e8f6 transparent !important;
+}
+.tabbrowser-tabs[treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab:not([selected="true"]):not([pinned]):hover,
+.tabbrowser-tabs[treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab:not([selected="true"])[pinned]:not([titlechanged]):hover {
+	background-color: #e0e8f6 !important;
+}
+.tabbrowser-tabs[treestyletab-style~="color"][treestyletab-mode="vertical"][treestyletab-firsttab-border="true"]
+  .tabbrowser-tab:first-child:not([selected="true"]):hover {
+	-moz-border-top-colors: ThreeDShadow #e0e8f6 !important;
+}
+.tabbrowser-tabs[treestyletab-style~="color"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tab:not([selected="true"]):hover {
+	-moz-border-right-colors: #e0e8f6 transparent !important;
+}
+
+.tabbrowser-tabs[treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab[selected="true"] {
+	-moz-border-top-colors: #c1d2ee transparent !important;
+	-moz-border-left-colors: #c1d2ee transparent !important;
+}
+.tabbrowser-tabs[treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab[selected="true"] {
+	background-color: #c1d2ee !important;
+}
+.tabbrowser-tabs[treestyletab-style~="color"][treestyletab-mode="vertical"][treestyletab-firsttab-border="true"]
+  .tabbrowser-tab:first-child[selected="true"] {
+	-moz-border-top-colors: ThreeDShadow #c1d2ee !important;
+}
+.tabbrowser-tabs[treestyletab-style~="color"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tab[selected="true"] {
+	-moz-border-right-colors: #c1d2ee transparent !important;
+}
+
+.tabbrowser-tabs[treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab[selected="true"]:hover {
+	-moz-border-top-colors: #d1e2fe transparent !important;
+	-moz-border-left-colors: #d1e2fe transparent !important;
+}
+.tabbrowser-tabs[treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab[selected="true"]:hover {
+	background-color: #d1e2fe !important;
+}
+.tabbrowser-tabs[treestyletab-style~="color"][treestyletab-mode="vertical"][treestyletab-firsttab-border="true"]
+  .tabbrowser-tab:first-child[selected="true"]:hover {
+	-moz-border-top-colors: ThreeDShadow #d1e2fe !important;
+}
+.tabbrowser-tabs[treestyletab-style~="color"][treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tab[selected="true"]:hover {
+	-moz-border-right-colors: #d1e2fe transparent !important;
+}
diff --git a/skin/classic/treestyletab/square/square.css b/skin/classic/treestyletab/square/square.css
deleted file mode 100644
index 7db444c1..00000000
--- a/skin/classic/treestyletab/square/square.css
+++ /dev/null
@@ -1,5 +0,0 @@
-@import url("base.css");
-@import url("tab-surface.css");
-/* dynamically applied by themeManager.js
-@import url("dropshadow.css");
-*/
diff --git a/skin/classic/treestyletab/square/tab-surface-3.css b/skin/classic/treestyletab/square/tab-surface-3.css
index a036ac0c..852103b2 100644
--- a/skin/classic/treestyletab/square/tab-surface-3.css
+++ b/skin/classic/treestyletab/square/tab-surface-3.css
@@ -1,39 +1,30 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* padding */
-
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab[selected="true"],
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab:not([selected="true"]) {
-	padding: 0 0.2em !important;
-}
-
 /* surface */
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab,
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab:not([selected="true"]) {
 	background-image: url("tab-bg.png") !important;
 	background-repeat: repeat-x !important;
 	background-position: 1px 1px !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab[selected="true"] {
 	background-image: url("tab-bg-highlighted.png") !important;
 }
 
 /* hover */
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab:not([selected="true"]):hover {
 	background-color: ThreeDFace !important;
 	background-image: url("tab-bg-hover.png") !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab[selected="true"]:hover {
 	background-color: #c1d2ee !important;
 	background-image: url("tab-bg-selected-hover.png") !important;
diff --git a/skin/classic/treestyletab/square/tab-surface-4.css b/skin/classic/treestyletab/square/tab-surface-4.css
index afc49608..26457ff6 100644
--- a/skin/classic/treestyletab/square/tab-surface-4.css
+++ b/skin/classic/treestyletab/square/tab-surface-4.css
@@ -1,34 +1,15 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* padding */
-
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab[selected="true"],
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab:not([selected="true"]) {
-	padding: 0 !important;
-}
-
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab
-  .tab-content[selected="true"]:not([pinned]),
-.tabbrowser-tabs[treestyletab-style~="square"]:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab
-  .tab-content:not([selected="true"]):not([pinned]) {
-	padding: 0 0.2em !important;
-}
-
-
 /* surface */
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab
   .tab-background {
 	-moz-transition: background 0.5s ease-out !important;
 	transition: background 0.5s ease-out !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab
   :-moz-any(.tab-background:not([pinned]),
             .tab-background:not([titlechanged])[pinned]) {
@@ -41,7 +22,7 @@
 }
 
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab
   .tab-background[selected="true"] {
 	background-color: #c1d2ee !important;
@@ -55,7 +36,7 @@
 
 /* hover */
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab:hover
   :-moz-any(.tab-background:not([pinned]),
             .tab-background[pinned]:not([titlechanged])) {
@@ -67,7 +48,7 @@
 	                  ) !important;
 }
 
-.tabbrowser-tabs[treestyletab-style~="square"][treestyletab-style~="color"]:not([treestyletab-tabbar-position="top"])
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
   .tabbrowser-tab:hover
   .tab-background[selected="true"] {
 	background-color: #d1e2fe !important;
diff --git a/skin/classic/treestyletab/square/vertigo.css b/skin/classic/treestyletab/square/vertigo.css
new file mode 100644
index 00000000..444a2c99
--- /dev/null
+++ b/skin/classic/treestyletab/square/vertigo.css
@@ -0,0 +1,75 @@
+@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
+
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"]) {
+	background: transparent !important;
+}
+
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab:not([selected="true"]) {
+	-moz-border-top-colors: transparent transparent !important;
+	-moz-border-bottom-colors: transparent transparent !important;
+}
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab:not([selected="true"]):not([pinned]),
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab:not([selected="true"])[pinned]:not([titlechanged])) {
+	background: transparent !important;
+}
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab:not([selected="true"]):hover {
+	-moz-border-top-colors: #e0e8f6 #e0e8f6 !important;
+	-moz-border-bottom-colors: #e0e8f6 #e0e8f6 !important;
+}
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab:not([selected="true"]):not([pinned]):hover,
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab:not([selected="true"])[pinned]:not([titlechanged]):hover {
+	background-color: #e0e8f6 !important;
+}
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab[selected="true"] {
+	-moz-border-top-colors: #c1d2ee #c1d2ee !important;
+	-moz-border-bottom-colors: #c1d2ee #c1d2ee !important;
+}
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab[selected="true"] {
+	background-color: #c1d2ee !important;
+}
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab[selected="true"]:hover {
+	-moz-border-top-colors: #d1e2fe #d1e2fe !important;
+	-moz-border-bottom-colors: #d1e2fe #d1e2fe !important;
+}
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab[selected="true"]:hover {
+	background-color: #d1e2fe !important;
+}
+
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab:not([selected="true"]),
+.tabbrowser-tabs[treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tab:not([selected="true"]) {
+	-moz-border-left-colors: transparent transparent !important;
+	-moz-border-right-colors: transparent transparent !important;
+}
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab:not([selected="true"]):hover,
+.tabbrowser-tabs[treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tab:not([selected="true"]):hover {
+	-moz-border-left-colors: #e0e8f6 #e0e8f6 !important;
+	-moz-border-right-colors: #e0e8f6 #e0e8f6 !important;
+}
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab[selected="true"],
+.tabbrowser-tabs[treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tab[selected="true"] {
+	-moz-border-left-colors: #c1d2ee #c1d2ee !important;
+	-moz-border-right-colors: #c1d2ee #c1d2ee !important;
+}
+.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
+  .tabbrowser-tab[selected="true"]:hover,
+.tabbrowser-tabs[treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-tab[selected="true"]:hover {
+	-moz-border-left-colors: #d1e2fe #d1e2fe !important;
+	-moz-border-right-colors: #d1e2fe #d1e2fe !important;
+}
diff --git a/skin/classic/treestyletab/treestyletab-tmp.css b/skin/classic/treestyletab/tmp.css
similarity index 100%
rename from skin/classic/treestyletab/treestyletab-tmp.css
rename to skin/classic/treestyletab/tmp.css
diff --git a/skin/classic/treestyletab/treestyletab.css b/skin/classic/treestyletab/treestyletab.css
deleted file mode 100644
index 9ddff5b4..00000000
--- a/skin/classic/treestyletab/treestyletab.css
+++ /dev/null
@@ -1,10 +0,0 @@
-@import url("base.css");
-/* dynamically applied by themeManager.js
-@import url("square/square.css");
-@import url("metal/metal.css");
-@import url("sidebar/sidebar.css");
-*/
-
-@import url("ui.css");
-
-@import url("treestyletab-tmp.css"); /* hacks for Tab Mix Plus */
diff --git a/skin/classic/treestyletab/ui.css b/skin/classic/treestyletab/ui.css
index 46d99457..79106040 100644
--- a/skin/classic/treestyletab/ui.css
+++ b/skin/classic/treestyletab/ui.css
@@ -1,5 +1,3 @@
-@import url("twisty/twisty.css");
-
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* tree UI */