diff --git a/modules/themeManager.js b/modules/themeManager.js
index 7c0bafe9..4524d0c6 100644
--- a/modules/themeManager.js
+++ b/modules/themeManager.js
@@ -14,7 +14,7 @@
  * 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) 2011
+ * Portions created by the Initial Developer are Copyright (C) 2011-2012
  * the Initial Developer. All Rights Reserved.
  *
  * Contributor(s): SHIMODA Hiroshi <piro.outsider.reflex@gmail.com>
@@ -88,7 +88,6 @@ TreeStyleTabThemeManager.prototype = {
 
 			case 'metal':
 				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');
@@ -97,7 +96,6 @@ TreeStyleTabThemeManager.prototype = {
 
 			case 'sidebar':
 				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/skin/classic/treestyletab/Darwin-styled-inactive-3.5.css b/skin/classic/treestyletab/Darwin-styled-inactive-3.5.css
deleted file mode 100644
index 4e19e73c..00000000
--- a/skin/classic/treestyletab/Darwin-styled-inactive-3.5.css
+++ /dev/null
@@ -1,44 +0,0 @@
-@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
deleted file mode 100644
index f46bdaf8..00000000
--- a/skin/classic/treestyletab/Darwin-styled-inactive-4.css
+++ /dev/null
@@ -1,44 +0,0 @@
-@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
index 4fc6c410..66c4ca96 100644
--- a/skin/classic/treestyletab/Darwin-styled.css
+++ b/skin/classic/treestyletab/Darwin-styled.css
@@ -1,5 +1,3 @@
-@import url("platform-styled-inactive.css");
-
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 /* horizontal tree */
@@ -54,3 +52,43 @@
 	background-repeat: no-repeat;
 }
 
+#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/metal/base-inactive-3.5.css b/skin/classic/treestyletab/metal/base-inactive-3.5.css
deleted file mode 100644
index f25eb524..00000000
--- a/skin/classic/treestyletab/metal/base-inactive-3.5.css
+++ /dev/null
@@ -1,102 +0,0 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* tab bar */
-
-:root:not([active="true"]) 
-  .tabbrowser-strip[treestyletab-mode="vertical"] {
-	background: #acacac !important;
-	border-color: #797979 !important;
-}
-:root:not([active="true"])
-  .tabbrowser-strip[treestyletab-mode="vertical"][treestyletab-style~="aero"] {
-	background: transparent !important;
-}
-
-:root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-mode="vertical"]:not([overflow="true"])
-  .tabbrowser-arrowscrollbox,
-:root:not([active="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-mode="vertical"][treestyletab-tab-inverted="true"]:not([overflow="true"])
-  .tabbrowser-arrowscrollbox,
-:root:not([active="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-splitter {
-	border-color: #666666 !important;
-	background: #e4e4e4 !important;
-}
-
-
-/* buttons in the tab bar */
-
-:root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabs-newtab-button,
-:root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabs-newtab-button:hover,
-:root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabs-alltabs-button,
-:root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabs-alltabs-button:hover,
-:root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabs-container
-  > .tabs-closebutton,
-:root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-mode="vertical"]
-  > .tabs-closebutton,
-:root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabs-container
-  > .tabs-closebutton:hover,
-:root:not([active="true"])
-  .tabbrowser-tabs[treestyletab-mode="vertical"]
-  > .tabs-closebutton:hover {
-	background: #e4e4e4 !important;
-	border-color: #666666 !important;
-}
-
-:root:not([active="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-mode="vertical"][treestyletab-tab-inverted="true"]
-  .tabbrowser-arrowscrollbox
-  .tabs-newtab-button {
-	background: #cecece url("shadow-inactive-r.png") repeat-y top left !important;
-	border-color: #9a9a9a !important;
-}
-
-
-/* hacks for Tab Mix Plus */
-
-:root[treestyletab-enable-compatibility-tmp="true"]:not([active="true"])
-  tabbrowser[treestyletab-mode="vertical"]
-  .tabs-closebutton-topbox
-  > .tabs-closebutton,
-:root[treestyletab-enable-compatibility-tmp="true"]:not([active="true"])
-  tabbrowser[treestyletab-mode="vertical"]
-  .tabs-closebutton-topbox
-  > .tabs-closebutton:hover {
-	background: #e4e4e4 !important;
-	border-color: #666666 !important;
-}
diff --git a/skin/classic/treestyletab/metal/base-inactive-4.css b/skin/classic/treestyletab/metal/base-inactive-4.css
deleted file mode 100644
index f5d4de8a..00000000
--- a/skin/classic/treestyletab/metal/base-inactive-4.css
+++ /dev/null
@@ -1,93 +0,0 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* tab bar */
-
-:root:-moz-window-inactive
-  .tabbrowser-strip[treestyletab-mode="vertical"] {
-	background: #acacac !important;
-	border-color: #797979 !important;
-}
-:root:-moz-window-inactive
-  .tabbrowser-strip[treestyletab-mode="vertical"][treestyletab-style~="aero"] {
-	background: transparent !important;
-}
-
-:root:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-mode="vertical"]:not([overflow="true"])
-  .tabbrowser-arrowscrollbox,
-:root:-moz-window-inactive
-  .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-mode="vertical"][treestyletab-tab-inverted="true"]:not([overflow="true"])
-  .tabbrowser-arrowscrollbox,
-:root:-moz-window-inactive
-  .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-splitter,
-:root:-moz-window-inactive
-  .treestyletab-tabbar-toolbar
-  .treestyletab-splitter {
-	border-color: #666666 !important;
-	background: #e4e4e4 !important;
-}
-
-
-/* buttons in the tab bar */
-
-:root:-moz-window-inactive
-  .treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
-  > toolbarbutton,
-:root:-moz-window-inactive
-  .treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
-  > toolbarbutton:hover,
-:root:-moz-window-inactive
-  .treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
-  > toolbarpaletteitem
-  > toolbarbutton,
-:root:-moz-window-inactive
-  .treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
-  > toolbarpaletteitem
-  > toolbarbutton:hover {
-	background: #e4e4e4 !important;
-	border-color: #666666 !important;
-}
-
-:root:-moz-window-inactive
-  .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-mode="vertical"][treestyletab-tab-inverted="true"]
-  .tabbrowser-arrowscrollbox
-  .tabs-newtab-button {
-	background: #cecece url("shadow-inactive-r.png") repeat-y top left !important;
-	border-color: #9a9a9a !important;
-}
-
-
-
-/* hacks for Tab Mix Plus */
-
-:root[treestyletab-enable-compatibility-tmp="true"]:-moz-window-inactive
-  tabbrowser[treestyletab-mode="vertical"]
-  .tabs-closebutton-topbox
-  > .tabs-closebutton,
-:root[treestyletab-enable-compatibility-tmp="true"]:-moz-window-inactive
-  tabbrowser[treestyletab-mode="vertical"]
-  .tabs-closebutton-topbox
-  > .tabs-closebutton:hover {
-	background: #e4e4e4 !important;
-	border-color: #666666 !important;
-}
diff --git a/skin/classic/treestyletab/metal/base.css b/skin/classic/treestyletab/metal/base.css
index 0c2980a1..4739df19 100644
--- a/skin/classic/treestyletab/metal/base.css
+++ b/skin/classic/treestyletab/metal/base.css
@@ -92,6 +92,44 @@ tabbrowser[treestyletab-tabbar-position="right"]
 	border-left: 1px solid #666666 !important;
 }
 
+:root:-moz-window-inactive
+  .tabbrowser-strip[treestyletab-mode="vertical"] {
+	background: #acacac !important;
+	border-color: #797979 !important;
+}
+:root:-moz-window-inactive
+  .tabbrowser-strip[treestyletab-mode="vertical"][treestyletab-style~="aero"] {
+	background: transparent !important;
+}
+
+:root:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-mode="vertical"]:not([overflow="true"])
+  .tabbrowser-arrowscrollbox,
+:root:-moz-window-inactive
+  .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-mode="vertical"][treestyletab-tab-inverted="true"]:not([overflow="true"])
+  .tabbrowser-arrowscrollbox,
+:root:-moz-window-inactive
+  .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-splitter,
+:root:-moz-window-inactive
+  .treestyletab-tabbar-toolbar
+  .treestyletab-splitter {
+	border-color: #666666 !important;
+	background: #e4e4e4 !important;
+}
+
 
 /* tab contents */
 
@@ -268,6 +306,40 @@ tabbrowser[treestyletab-tabbar-position="right"]
 }
 
 
+:root:-moz-window-inactive
+  .treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
+  > toolbarbutton,
+:root:-moz-window-inactive
+  .treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
+  > toolbarbutton:hover,
+:root:-moz-window-inactive
+  .treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
+  > toolbarpaletteitem
+  > toolbarbutton,
+:root:-moz-window-inactive
+  .treestyletab-tabbar-toolbar[treestyletab-mode="vertical"]
+  > toolbarpaletteitem
+  > toolbarbutton:hover {
+	background: #e4e4e4 !important;
+	border-color: #666666 !important;
+}
+
+:root:-moz-window-inactive
+  .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-mode="vertical"][treestyletab-tab-inverted="true"]
+  .tabbrowser-arrowscrollbox
+  .tabs-newtab-button {
+	background: #cecece url("shadow-inactive-r.png") repeat-y top left !important;
+	border-color: #9a9a9a !important;
+}
+
+
 
 /* hacks for Tab Mix Plus */
 
@@ -298,3 +370,15 @@ tabbrowser[treestyletab-tabbar-position="right"]
   > .tabs-closebutton {
 	border-left: 1px solid #666666 !important;
 }
+
+:root[treestyletab-enable-compatibility-tmp="true"]:-moz-window-inactive
+  tabbrowser[treestyletab-mode="vertical"]
+  .tabs-closebutton-topbox
+  > .tabs-closebutton,
+:root[treestyletab-enable-compatibility-tmp="true"]:-moz-window-inactive
+  tabbrowser[treestyletab-mode="vertical"]
+  .tabs-closebutton-topbox
+  > .tabs-closebutton:hover {
+	background: #e4e4e4 !important;
+	border-color: #666666 !important;
+}
diff --git a/skin/classic/treestyletab/metal/tab-3.5.css b/skin/classic/treestyletab/metal/tab-3.5.css
deleted file mode 100644
index b2384120..00000000
--- a/skin/classic/treestyletab/metal/tab-3.5.css
+++ /dev/null
@@ -1,338 +0,0 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab,
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab:hover,
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[selected="true"],
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[selected="true"]:hover {
-	background: none transparent !important;
-	border: 2px solid transparent !important;
-	color: black !important;
-	height: auto !important;
-	max-height: none !important;
-	min-height: 6px !important;
-	margin-top: -2px !important;
-	margin-right: 0;
-	margin-bottom: -2px !important;
-	margin-left: 0;
-	padding: 0 !important;
-	-moz-appearance: none !important;
-	-moz-border-top-colors: transparent transparent !important;
-	-moz-border-right-colors: transparent transparent !important;
-	-moz-border-bottom-colors: transparent transparent !important;
-	-moz-border-left-colors: transparent transparent !important;
-	-moz-border-radius: 0 !important;
-}
-
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tab-image-left,
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tab-image-middle,
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tab-close-button,
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tab-image-right {
-	border: 10px solid transparent;
-	margin: 0 !important;
-	position: relative !important;
-	-moz-appearance: none !important;
-}
-
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tab-image-middle > .tab-icon {
-	margin-top: -16px !important;
-	margin-bottom: -14px !important;
-}
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tab-image-middle > .tab-text,
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tab-image-middle > *,
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tab-close-button > * {
-	margin-top: -10px !important;
-	margin-bottom: -10px !important;
-}
-
-
-.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-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-mode="vertical"]:not([treestyletab-tab-inverted="true"])
-  .tabbrowser-tab:not([treestyletab-drop-position="self"]) .tab-image-right,
-.tabbrowser-tabs[treestyletab-mode="vertical"][treestyletab-tab-inverted="true"]
-  .tabbrowser-tab:not([treestyletab-drop-position="self"]) .tab-image-left {
-	padding-right: 2px !important;
-}
-
-
-
-/* background, left */
-
-.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-mode="vertical"]
-  .tab-image-middle,
-.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-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;
-}
-
-
-
-/* background, right */
-
-.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-mode="vertical"][treestyletab-tab-inverted="true"]
-  .tab-image-middle,
-.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-mode="vertical"][treestyletab-tab-inverted="true"]
-  .tab-image-right {
-	-moz-border-image: url("tab-active-r.png") 10 / 10px 10px 10px 0;
-}
-
-
-/* foreground, left */
-
-.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-mode="vertical"]
-  .tab-image-middle[selected="true"],
-.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-mode="vertical"]
-  .tab-image-right[selected="true"] {
-	-moz-border-image: url("tab-active-selected-l.png") 10 5 10 10 / 10px 5px 10px 0;
-}
-
-
-
-/* foreground, right */
-
-.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-mode="vertical"][treestyletab-tab-inverted="true"]
-  .tab-image-middle[selected="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-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;
-}
-
-
-
-/* pinned tabs */
-
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[pinned="true"]
-  > .tab-image-middle,
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[pinned="true"]:hover
-  > .tab-image-middle,
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[pinned="true"][selected]
-  > .tab-image-middle,
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[pinned="true"][selected]:hover
-  > .tab-image-middle {
-	background: none !important;
-	-moz-border-image: none !important;
-	margin: 0 !important;
-	padding: 0 !important;
-}
-
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[pinned="true"],
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[pinned="true"]:hover,
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[pinned="true"][selected="true"],
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[pinned="true"][selected="true"]:hover {
-	background: none !important;
-	border: none !important;
-	padding: 0 !important;
-	-moz-border-radius: 0 !important;
-}
-
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[pinned="true"]
-  > .tab-image-middle
-  > * {
-	margin: 0 !important;
-	padding: 0 !important;
-}
-
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[pinned="true"]
-  > .tab-image-middle,
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[pinned="true"]:hover
-  > .tab-image-middle,
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[pinned="true"][selected="true"]
-  > .tab-image-middle,
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[pinned="true"][selected="true"]:hover
-  > .tab-image-middle {
-	background: #9d9d9d !important;
-	border: 1px solid #666666 !important;
-	margin: 1px 0 0 1px !important;
-	padding: 2px 0 !important;
-	-moz-border-radius: 4px !important;
-}
-
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[pinned="true"][selected="true"]
-  > .tab-image-middle,
-.tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[pinned="true"][selected="true"]:hover
-  > .tab-image-middle {
-	background-color: #b3b2b3 !important;
-}
-
-
-
-
-/* inactive */
-
-/* background, left */
-
-:root:not([active="true"])
-  .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-mode="vertical"]
-  .tab-image-middle,
-:root:not([active="true"])
-  .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-mode="vertical"]
-  .tab-image-right {
-	-moz-border-image: url("tab-inactive-l.png") 10 5 10 10 / 10px 5px 10px 0;
-}
-
-
-
-/* background, right */
-
-:root:not([active="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-mode="vertical"][treestyletab-tab-inverted="true"]
-  .tab-image-middle,
-:root:not([active="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-mode="vertical"][treestyletab-tab-inverted="true"]
-  .tab-image-right {
-	-moz-border-image: url("tab-inactive-r.png") 10 / 10px 10px 10px 0;
-}
-
-
-
-/* foreground, left */
-
-:root:not([active="true"])
-  .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-mode="vertical"]
-  .tab-image-middle[selected="true"],
-:root:not([active="true"])
-  .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-mode="vertical"]
-  .tab-image-right[selected="true"] {
-	-moz-border-image: url("tab-inactive-selected-l.png") 10 5 10 10 / 10px 5px 10px 0;
-}
-
-
-
-/* foreground, right */
-
-:root:not([active="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-mode="vertical"][treestyletab-tab-inverted="true"]
-  .tab-image-middle[selected="true"],
-:root:not([active="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-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.css
similarity index 100%
rename from skin/classic/treestyletab/metal/tab-4.css
rename to skin/classic/treestyletab/metal/tab.css
diff --git a/skin/classic/treestyletab/sidebar/base.css b/skin/classic/treestyletab/sidebar/base.css
index b825b7de..a86545ce 100644
--- a/skin/classic/treestyletab/sidebar/base.css
+++ b/skin/classic/treestyletab/sidebar/base.css
@@ -7,6 +7,13 @@
 	border-top: 1px solid #404040;
 	border-bottom: none !important;
 }
+#main-window:-moz-window-inactive
+  .tabbrowser-strip:not(.treestyletab-tabbar-placeholder):not([treestyletab-style~="aero"])[treestyletab-mode="vertical"],
+#main-window:-moz-window-inactive
+  .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) */
@@ -14,11 +21,20 @@
 	background: transparent !important;
 	background-color: #d4dde5 !important;
 }
+#main-window:-moz-window-inactive
+  .tabbrowser-strip:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"] {
+	background-color: #e8e8e8 !important;
+}
 /* autohide */
 .treestyletab-tabbar-toolbar[treestyletab-tabbar-autohide][treestyletab-mode="vertical"]
   #treestyletab-tabbar-resizer-box {
 	background: rgba(212, 221, 229, 0.75);
 }
+#main-window:-moz-window-inactive
+  .treestyletab-tabbar-toolbar[treestyletab-tabbar-autohide]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"]
+  #treestyletab-tabbar-resizer-box {
+	background: rgba(232, 232, 232, 0.75);
+}
 
 /* Don't display unnecessary clutter */
 .tabbrowser-tabs[treestyletab-mode="vertical"]
@@ -44,12 +60,28 @@ tabbrowser[treestyletab-mode="vertical"]
 	background-image: none;
 	background-color: #404040;
 }
+#main-window:-moz-window-inactive
+  tabbrowser:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"]
+  .treestyletab-splitter,
+#main-window:-moz-window-inactive
+  .treestyletab-tabbar-toolbar:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"]
+  .treestyletab-splitter {
+	background-color: #868686;
+}
 .tabbrowser-strip[treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"] {
 	border-right: 1px solid #404040;
 }
+#main-window:-moz-window-inactive
+  .tabbrowser-strip[treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"] {
+	border-right-color: #868686;
+}
 .tabbrowser-strip[treestyletab-tabbar-position="right"][treestyletab-tabbar-fixed="true"] {
 	border-left: 1px solid #404040;
 }
+#main-window:-moz-window-inactive
+  .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 */
 .tabbrowser-tabs[treestyletab-mode="vertical"]
@@ -102,6 +134,13 @@ tabbrowser[treestyletab-mode="vertical"]
 	background: -moz-linear-gradient(top, #A0B0CF, #7386AB) repeat-x !important;
 }
 
+#main-window:-moz-window-inactive
+  .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;  
+}
+
 /* Keep the close button at a safe distance from the tab label. */
 .tabbrowser-tabs[treestyletab-mode="vertical"]
   .tab-close-button {
@@ -185,6 +224,23 @@ tabbrowser[treestyletab-mode="vertical"]
 	color: #91a0c0 !important;
 }
 
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
+  .treestyletab-counter-container {
+	background-color: #b5b5b5 !important;
+}
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
+  .tabbrowser-tab[selected="true"]
+  .treestyletab-counter-container {
+	background-color: #ffffff !important;
+}
+#main-window:-moz-window-inactive
+  .tabbrowser-tabs[treestyletab-mode="vertical"]
+  .tabbrowser-tab[selected="true"]
+  .treestyletab-counter {
+	color: #929292 !important;
+}
 
 
 
diff --git a/skin/classic/treestyletab/sidebar/inactive-3.6.css b/skin/classic/treestyletab/sidebar/inactive-3.6.css
deleted file mode 100644
index 36739655..00000000
--- a/skin/classic/treestyletab/sidebar/inactive-3.6.css
+++ /dev/null
@@ -1,63 +0,0 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* 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: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:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"] {
-	background-color: #e8e8e8 !important;
-}
-/* autohide */
-#main-window:not([active="true"])
-  .treestyletab-tabbar-toolbar[treestyletab-tabbar-autohide]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"]
-  #treestyletab-tabbar-resizer-box {
-	background: rgba(232, 232, 232, 0.75);
-}
-
-/* Use the splitter to display the border of .tabbrowser-strip */
-#main-window:not([active="true"])
-  tabbrowser:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"]
-  .treestyletab-splitter {
-	background-color: #868686;
-}
-#main-window:not([active="true"])
-  .tabbrowser-strip[treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"] {
-	border-right-color: #868686;
-}
-#main-window:not([active="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-mode="vertical"]
-  .tabbrowser-tab[selected="true"] {
-	border-top: 1px solid #979797 !important;
-	background: -moz-linear-gradient(top, #B4B4B4, #8A8A8A) repeat-x !important;  
-}
-
-/* Make the tab counter look like the bubbles in Mail.app et.al. */
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-mode="vertical"]
-  .treestyletab-counter-container {
-	background-color: #b5b5b5 !important;
-}
-#main-window:not([active="true"])
-  .tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[selected="true"]
-  .treestyletab-counter-container {
-	background-color: #ffffff !important;
-}
-#main-window:not([active="true"])
-  .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
deleted file mode 100644
index dad67637..00000000
--- a/skin/classic/treestyletab/sidebar/inactive-4.css
+++ /dev/null
@@ -1,68 +0,0 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* 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):not([treestyletab-style~="aero"])[treestyletab-mode="vertical"],
-#main-window:-moz-window-inactive
-  .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:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"] {
-	background-color: #e8e8e8 !important;
-}
-/* autohide */
-#main-window:-moz-window-inactive
-  .treestyletab-tabbar-toolbar[treestyletab-tabbar-autohide]:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"]
-  #treestyletab-tabbar-resizer-box {
-	background: rgba(232, 232, 232, 0.75);
-}
-
-/* Use the splitter to display the border of .tabbrowser-strip */
-#main-window:-moz-window-inactive
-  tabbrowser:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"]
-  .treestyletab-splitter,
-#main-window:-moz-window-inactive
-  .treestyletab-tabbar-toolbar:not([treestyletab-style~="aero"])[treestyletab-mode="vertical"]
-  .treestyletab-splitter {
-	background-color: #868686;
-}
-#main-window:-moz-window-inactive
-  .tabbrowser-strip[treestyletab-tabbar-position="left"][treestyletab-tabbar-fixed="true"] {
-	border-right-color: #868686;
-}
-#main-window:-moz-window-inactive
-  .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-mode="vertical"]
-  .tabbrowser-tab[selected="true"] {
-	border-top: 1px solid #979797 !important;
-	background: -moz-linear-gradient(top, #B4B4B4, #8A8A8A) repeat-x !important;  
-}
-
-/* Make the tab counter look like the bubbles in Mail.app et.al. */
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-mode="vertical"]
-  .treestyletab-counter-container {
-	background-color: #b5b5b5 !important;
-}
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[selected="true"]
-  .treestyletab-counter-container {
-	background-color: #ffffff !important;
-}
-#main-window:-moz-window-inactive
-  .tabbrowser-tabs[treestyletab-mode="vertical"]
-  .tabbrowser-tab[selected="true"]
-  .treestyletab-counter {
-	color: #929292 !important;
-}
diff --git a/skin/classic/treestyletab/square/Darwin-inactive-3.5.css b/skin/classic/treestyletab/square/Darwin-inactive-3.5.css
deleted file mode 100644
index fa511adf..00000000
--- a/skin/classic/treestyletab/square/Darwin-inactive-3.5.css
+++ /dev/null
@@ -1,42 +0,0 @@
-@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
deleted file mode 100644
index b1346fff..00000000
--- a/skin/classic/treestyletab/square/Darwin-inactive-4.css
+++ /dev/null
@@ -1,42 +0,0 @@
-@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
index 51df66a1..aeae200a 100644
--- a/skin/classic/treestyletab/square/Darwin.css
+++ b/skin/classic/treestyletab/square/Darwin.css
@@ -23,3 +23,42 @@ tabbrowser:not([treestyletab-style="vertigo"])[treestyletab-mode="vertical"]
   .tabbrowser-tab:not([pinned="true"]) {
 	position: relative !important;
 }
+
+#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/tab-surface-3.css b/skin/classic/treestyletab/square/tab-surface-3.css
deleted file mode 100644
index 852103b2..00000000
--- a/skin/classic/treestyletab/square/tab-surface-3.css
+++ /dev/null
@@ -1,32 +0,0 @@
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-
-/* surface */
-
-.tabbrowser-tabs:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab,
-.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:not([treestyletab-tabbar-position="top"])
-  .tabbrowser-tab[selected="true"] {
-	background-image: url("tab-bg-highlighted.png") !important;
-}
-
-/* hover */
-
-.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: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.css
similarity index 100%
rename from skin/classic/treestyletab/square/tab-surface-4.css
rename to skin/classic/treestyletab/square/tab-surface.css