1.3.9 beta 8

[fix] removed most @-moz-document references because of Bug 1035091 (see
Bug 1201420)

278 files changed, 930 insertions, 989 deletions

diff --git a/xpi/content/css/addonbar_infullscreen.css b/xpi/content/css/addonbar_infullscreen.css
index 1bf848b..f4261a8 100644
--- a/xpi/content/css/addonbar_infullscreen.css
+++ b/xpi/content/css/addonbar_infullscreen.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	#main-window[inFullscreen]:not([inDOMFullscreen]) #browser-bottombox:hover #ctraddon_addon-bar{
 	  visibility: visible !important;
 	}
@@ -14,4 +14,4 @@
       width: 100% !important;
       background: none !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/alt_appbutton_icons.css b/xpi/content/css/alt_appbutton_icons.css
index c5cd4f4..34827d9 100644
--- a/xpi/content/css/alt_appbutton_icons.css
+++ b/xpi/content/css/alt_appbutton_icons.css
@@ -1,8 +1,8 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	
 	#ctraddon_appbutton > .toolbarbutton-icon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton2.png") !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/alt_appbutton_icons2.css b/xpi/content/css/alt_appbutton_icons2.css
index a99d33c..d43322e 100644
--- a/xpi/content/css/alt_appbutton_icons2.css
+++ b/xpi/content/css/alt_appbutton_icons2.css
@@ -1,8 +1,8 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	
 	#ctraddon_appbutton > .toolbarbutton-icon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton-inv.png") !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/alt_appbutton_icons3.css b/xpi/content/css/alt_appbutton_icons3.css
index a518587..2fe469b 100644
--- a/xpi/content/css/alt_appbutton_icons3.css
+++ b/xpi/content/css/alt_appbutton_icons3.css
@@ -1,8 +1,8 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	
 	#ctraddon_appbutton > .toolbarbutton-icon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton-dark.png") !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/alt_appbutton_icons4.css b/xpi/content/css/alt_appbutton_icons4.css
index 7087baa..6601fbd 100644
--- a/xpi/content/css/alt_appbutton_icons4.css
+++ b/xpi/content/css/alt_appbutton_icons4.css
@@ -1,8 +1,8 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	
 	#ctraddon_appbutton > .toolbarbutton-icon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton3.png") !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/alt_appbutton_icons5.css b/xpi/content/css/alt_appbutton_icons5.css
index cd8278e..412ebcf 100644
--- a/xpi/content/css/alt_appbutton_icons5.css
+++ b/xpi/content/css/alt_appbutton_icons5.css
@@ -1,8 +1,8 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	
 	#ctraddon_appbutton > .toolbarbutton-icon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton-grey.png") !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/alt_newtabpage.css b/xpi/content/css/alt_newtabpage.css
index 830b81a..d42d5ed 100644
--- a/xpi/content/css/alt_newtabpage.css
+++ b/xpi/content/css/alt_newtabpage.css
@@ -1,4 +1,4 @@
-@-moz-document url(about:newtab) {
+/*@-moz-document url(about:newtab) {*/
 
 	#newtab-intro-what,
 	#newtab-search-form,
@@ -119,7 +119,7 @@
 	  width: 18px !important;
    }
 
-}
+/*}*/
 
 /* remove overlay on top of new tab page */
 #newtab-window #newtab-customize-overlay {
diff --git a/xpi/content/css/alttabstoolbar.css b/xpi/content/css/alttabstoolbar.css
index c438737..60c6380 100644
--- a/xpi/content/css/alttabstoolbar.css
+++ b/xpi/content/css/alttabstoolbar.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	@media all and (-moz-windows-theme:aero) {
 		#main-window[defaultfxtheme="true"][tabsontop="false"] #navigator-toolbox #TabsToolbar:not(:-moz-lwtheme){
@@ -33,4 +33,4 @@
 	  }
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/alttabstoolbar2.css b/xpi/content/css/alttabstoolbar2.css
index 4f0158f..a8717d3 100644
--- a/xpi/content/css/alttabstoolbar2.css
+++ b/xpi/content/css/alttabstoolbar2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	@media all and (-moz-windows-theme:aero) {
 		#main-window[defaultfxtheme="true"]:not([tabsontop="false"])[sizemode="maximized"] #navigator-toolbox #TabsToolbar:not(:-moz-lwtheme){
@@ -32,4 +32,4 @@
 	  }
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton.css b/xpi/content/css/appbutton.css
index 496b665..a717538 100644
--- a/xpi/content/css/appbutton.css
+++ b/xpi/content/css/appbutton.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	window:not([chromehidden~="toolbar"]) #ctraddon_appbutton {
 	  visibility: visible !important;
@@ -10,4 +10,4 @@
 	  visibility: collapse !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton2.css b/xpi/content/css/appbutton2.css
index 431fab6..fefe3ba 100644
--- a/xpi/content/css/appbutton2.css
+++ b/xpi/content/css/appbutton2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	toolbar #ctraddon_appbutton,
 	#main-window:not([tabsintitlebar]) #ctraddon_appbutton2,
@@ -268,4 +268,4 @@
 	  background: #e3e4e6 !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton2hidden.css b/xpi/content/css/appbutton2hidden.css
index 5d82e23..72221ae 100644
--- a/xpi/content/css/appbutton2hidden.css
+++ b/xpi/content/css/appbutton2hidden.css
@@ -1,7 +1,7 @@
 @import url(appbutton2wt.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window:not([chromehidden~="toolbar"])[sizemode="normal"] #titlebar #ctraddon_appbutton2 {
 	  visibility: hidden !important;
@@ -22,4 +22,4 @@
 	  -moz-margin-start: 0px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton2io.css b/xpi/content/css/appbutton2io.css
index b48ee8a..7e8a0c4 100644
--- a/xpi/content/css/appbutton2io.css
+++ b/xpi/content/css/appbutton2io.css
@@ -1,7 +1,7 @@
 @import url(chrome://classic_theme_restorer/content/css/appbutton2.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
  
 	#ctraddon_appbutton2 .toolbarbutton-text {
 	  visibility: hidden !important;  
@@ -121,4 +121,4 @@
 	 -moz-margin-start: 32px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton2io2.css b/xpi/content/css/appbutton2io2.css
index 8f33623..6c4bc8b 100644
--- a/xpi/content/css/appbutton2io2.css
+++ b/xpi/content/css/appbutton2io2.css
@@ -1,7 +1,7 @@
 @import url(appbutton2.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
  
 	#ctraddon_appbutton2 .toolbarbutton-text {
 	  visibility: hidden !important;  
@@ -80,4 +80,4 @@
 	  -moz-margin-start: 32px;
 	}*/
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton2wt.css b/xpi/content/css/appbutton2wt.css
index 005e803..75b7d92 100644
--- a/xpi/content/css/appbutton2wt.css
+++ b/xpi/content/css/appbutton2wt.css
@@ -1,7 +1,7 @@
 @import url(appbutton2.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_appbutton2{
 	  width: 95px !important;
@@ -132,4 +132,4 @@
 	 -moz-margin-start: 97px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton2wt2.css b/xpi/content/css/appbutton2wt2.css
index c36529d..c20fab8 100644
--- a/xpi/content/css/appbutton2wt2.css
+++ b/xpi/content/css/appbutton2wt2.css
@@ -1,7 +1,7 @@
 @import url(appbutton2.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_appbutton2{
 	  width: 95px !important;
@@ -81,4 +81,4 @@
 	  -moz-margin-start: 26px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton_aurora.css b/xpi/content/css/appbutton_aurora.css
index bc0c027..ab856f1 100644
--- a/xpi/content/css/appbutton_aurora.css
+++ b/xpi/content/css/appbutton_aurora.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#ctraddon_appbutton2:not(:hover):not(:active):not([open]) {
 	  background-image: linear-gradient(hsl(208,99%,37%), hsl(214,90%,23%) 95%) !important;
@@ -58,4 +58,4 @@
 	  background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton_borderless.css b/xpi/content/css/appbutton_borderless.css
index d7d071f..1b97b5f 100644
--- a/xpi/content/css/appbutton_borderless.css
+++ b/xpi/content/css/appbutton_borderless.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window #ctraddon_appbutton2{
 	  -moz-appearance:none !important;
@@ -22,4 +22,4 @@
 	  background:none !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton_gray.css b/xpi/content/css/appbutton_gray.css
index 6c5aed6..10961fe 100644
--- a/xpi/content/css/appbutton_gray.css
+++ b/xpi/content/css/appbutton_gray.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_appbutton2:not(:hover):not(:active):not([open]){
 	  background-image: linear-gradient(lightgray, gray 95%) !important;
@@ -58,4 +58,4 @@
 	  background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton_green.css b/xpi/content/css/appbutton_green.css
index ef72e23..37f7f48 100644
--- a/xpi/content/css/appbutton_green.css
+++ b/xpi/content/css/appbutton_green.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_appbutton2:not(:hover):not(:active):not([open]){
 	  background-image: linear-gradient(lightgreen, green 95%) !important;
@@ -58,4 +58,4 @@
 	  background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton_nightly.css b/xpi/content/css/appbutton_nightly.css
index 0c7bd56..ad19837 100644
--- a/xpi/content/css/appbutton_nightly.css
+++ b/xpi/content/css/appbutton_nightly.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_appbutton2:not(:hover):not(:active):not([open]){
 	  background-image: linear-gradient(hsl(211,33%,32%), hsl(209,53%,10%) 95%) !important;
@@ -58,4 +58,4 @@
 	  background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton_orange.css b/xpi/content/css/appbutton_orange.css
index 1d57df5..5ccc848 100644
--- a/xpi/content/css/appbutton_orange.css
+++ b/xpi/content/css/appbutton_orange.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* appbutton on titlebar*/
 	#ctraddon_appbutton2:not(:hover):not(:active):not([open]){
@@ -82,4 +82,4 @@
 	  background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton_palemoon.css b/xpi/content/css/appbutton_palemoon.css
index 1f97caa..3f3bbc9 100644
--- a/xpi/content/css/appbutton_palemoon.css
+++ b/xpi/content/css/appbutton_palemoon.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#ctraddon_appbutton2:not(:hover):not(:active):not([open]){
 	  background-image: linear-gradient(rgb(82,182,247), rgb(10,98,215) 95%) !important;
@@ -58,4 +58,4 @@
 	  background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton_purple.css b/xpi/content/css/appbutton_purple.css
index 7fc24c3..1317069 100644
--- a/xpi/content/css/appbutton_purple.css
+++ b/xpi/content/css/appbutton_purple.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#ctraddon_appbutton2:not(:hover):not(:active):not([open]) {
 	  background-image: linear-gradient(rgb(153,38,211), rgb(105,19,163) 95%) !important;
@@ -47,4 +47,4 @@
 				  0 1px 1px rgba(0,0,0,.2) inset !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton_red.css b/xpi/content/css/appbutton_red.css
index 2ef9a61..27a2802 100644
--- a/xpi/content/css/appbutton_red.css
+++ b/xpi/content/css/appbutton_red.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_appbutton2:not(:hover):not(:active):not([open]){
 	  background-image: linear-gradient(pink, red 95%) !important;
@@ -58,4 +58,4 @@
 	  background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton_transparent.css b/xpi/content/css/appbutton_transparent.css
index 09966c3..300aa33 100644
--- a/xpi/content/css/appbutton_transparent.css
+++ b/xpi/content/css/appbutton_transparent.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_appbutton2:not(:hover):not(:active):not([open]){
 	  background-image: linear-gradient(rgba(255,255,255,.0), rgba(255,255,255,.0)) !important;
@@ -56,4 +56,4 @@
 	  background-image: linear-gradient(rgba(144,20,207,.4), rgba(95,0,158,.4) 95%) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton_white.css b/xpi/content/css/appbutton_white.css
index f148d87..db4ad62 100644
--- a/xpi/content/css/appbutton_white.css
+++ b/xpi/content/css/appbutton_white.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window:not([privatebrowsingmode=temporary]) #titlebar #ctraddon_appbutton2,
 	#main-window:not([privatebrowsingmode=temporary]) #navigator-toolbox #TabsToolbar #ctraddon_appbutton{
@@ -71,4 +71,4 @@
 	  background-image: linear-gradient(rgba(144,20,207,.4), rgba(95,0,158,.4) 95%) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/appbutton_wt.css b/xpi/content/css/appbutton_wt.css
index 8247f71..3cb93eb 100644
--- a/xpi/content/css/appbutton_wt.css
+++ b/xpi/content/css/appbutton_wt.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/appbuttxtextra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	window:not([chromehidden~="toolbar"]) #ctraddon_appbutton {
 	  visibility: visible !important;
@@ -36,4 +36,4 @@
 	  font-weight: bold !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/back-forward.css b/xpi/content/css/back-forward.css
index b249ac5..2e5d5c8 100644
--- a/xpi/content/css/back-forward.css
+++ b/xpi/content/css/back-forward.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/back-forwardextra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_back-forward-button{
 	  visibility: visible !important;
@@ -38,4 +38,4 @@
 	  margin-top:1px;
 	  margin-bottom:1px;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/bf_space.css b/xpi/content/css/bf_space.css
index 0805b7d..2f99fb8 100644
--- a/xpi/content/css/bf_space.css
+++ b/xpi/content/css/bf_space.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window #navigator-toolbox #nav-bar * #ctraddon_back-button {
 	  -moz-margin-end:-1px !important;
@@ -19,4 +19,4 @@
 	  -moz-padding-start:2px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/bmbar_infullscreen.css b/xpi/content/css/bmbar_infullscreen.css
index 0cf4ff2..a047323 100644
--- a/xpi/content/css/bmbar_infullscreen.css
+++ b/xpi/content/css/bmbar_infullscreen.css
@@ -1,7 +1,7 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	#main-window[inFullscreen] #PersonalToolbar{
 	  visibility: visible !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/bmbut_no_label.css b/xpi/content/css/bmbut_no_label.css
index 6e431c9..ba12f4d 100644
--- a/xpi/content/css/bmbut_no_label.css
+++ b/xpi/content/css/bmbut_no_label.css
@@ -1,8 +1,8 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#navigator-toolbox #PersonalToolbar #ctraddon_bookmarks-menu-toolbar-button .toolbarbutton-text {
 	  display: none !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/bmbut_pmenu.css b/xpi/content/css/bmbut_pmenu.css
index a90b2b1..42ec6b4 100644
--- a/xpi/content/css/bmbut_pmenu.css
+++ b/xpi/content/css/bmbut_pmenu.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/bmbut_pmenu_extra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_BMB_bookmarksPopup{
 	  -moz-appearance: none !important;
@@ -98,4 +98,4 @@
 	  border-radius: 3.5px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/chevronfix.css b/xpi/content/css/chevronfix.css
index f6cd130..0df0a81 100644
--- a/xpi/content/css/chevronfix.css
+++ b/xpi/content/css/chevronfix.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window #navigator-toolbox #nav-bar #nav-bar-customization-target > *:last-child{
 	  -moz-margin-end:2px !important;
@@ -9,4 +9,4 @@
 	  display:none !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/close_icon_t_gc.css b/xpi/content/css/close_icon_t_gc.css
index f707224..3d72216 100644
--- a/xpi/content/css/close_icon_t_gc.css
+++ b/xpi/content/css/close_icon_t_gc.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* Tabs toolbar tab close button (Fx31+) */
 	#main-window #navigator-toolbox #TabsToolbar #tabbrowser-tabs .tabbrowser-tab .tab-close-button,
@@ -28,4 +28,4 @@
 	  width: 16px !important;
 	}
 
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/close_icon_t_red.css b/xpi/content/css/close_icon_t_red.css
index b1ff0d9..c7fbaa9 100644
--- a/xpi/content/css/close_icon_t_red.css
+++ b/xpi/content/css/close_icon_t_red.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* Tabs toolbar tab close button (Fx31+) */
 	#main-window #navigator-toolbox #TabsToolbar #tabbrowser-tabs .tabbrowser-tab .tab-close-button,
@@ -28,4 +28,4 @@
 	  width: 16px !important;
 	}
 
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/close_icon_t_w10.css b/xpi/content/css/close_icon_t_w10.css
index 87fdcb7..b287dac 100644
--- a/xpi/content/css/close_icon_t_w10.css
+++ b/xpi/content/css/close_icon_t_w10.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* Tabs toolbar tab close button (Fx31+) */
 	#main-window #navigator-toolbox #TabsToolbar #tabbrowser-tabs .tabbrowser-tab .tab-close-button,
@@ -28,4 +28,4 @@
 	  width: 16px !important;
 	}
 
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/close_icon_t_w10i.css b/xpi/content/css/close_icon_t_w10i.css
index d1b00e0..2adbb54 100644
--- a/xpi/content/css/close_icon_t_w10i.css
+++ b/xpi/content/css/close_icon_t_w10i.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){/*
 
 	/* Tabs toolbar tab close button (Fx31+) */
 	#main-window #navigator-toolbox #TabsToolbar #tabbrowser-tabs .tabbrowser-tab .tab-close-button,
@@ -28,4 +28,4 @@
 	  width: 16px !important;
 	}
 
-}
+/*}*/
diff --git a/xpi/content/css/close_icon_t_w10red.css b/xpi/content/css/close_icon_t_w10red.css
index 2cc0eb4..361cd58 100644
--- a/xpi/content/css/close_icon_t_w10red.css
+++ b/xpi/content/css/close_icon_t_w10red.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* Tabs toolbar tab close button (Fx31+) */
 	#main-window #navigator-toolbox #TabsToolbar #tabbrowser-tabs .tabbrowser-tab .tab-close-button,
@@ -28,4 +28,4 @@
 	  width: 16px !important;
 	}
 
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/close_icon_t_w7.css b/xpi/content/css/close_icon_t_w7.css
index a9f174c..6c614c0 100644
--- a/xpi/content/css/close_icon_t_w7.css
+++ b/xpi/content/css/close_icon_t_w7.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* Tabs toolbar tab close button (Fx31+) */
 	#navigator-toolbox #TabsToolbar #ctraddon_tabs-closebutton{
@@ -48,4 +48,4 @@
 	  width: 16px !important;
 	}
 
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/close_icon_t_w8.css b/xpi/content/css/close_icon_t_w8.css
index 3add6fa..a07dc05 100644
--- a/xpi/content/css/close_icon_t_w8.css
+++ b/xpi/content/css/close_icon_t_w8.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* Tabs toolbar tab close button (Fx31+) */
 	#navigator-toolbox #TabsToolbar #ctraddon_tabs-closebutton{
@@ -48,4 +48,4 @@
 	  width: 16px !important;
 	}
 
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/close_onleft.css b/xpi/content/css/close_onleft.css
index aa98fbe..49e25cf 100644
--- a/xpi/content/css/close_onleft.css
+++ b/xpi/content/css/close_onleft.css
@@ -1,5 +1,5 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#TabsToolbar #tabbrowser-tabs .tabbrowser-tab:not([pinned]) .tab-close-button {
 	  -moz-box-ordinal-group: 0 !important;
@@ -7,4 +7,4 @@
 	  -moz-margin-end:4px !important;
 	}
 
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/close_onleft2.css b/xpi/content/css/close_onleft2.css
index d18c891..f002b2c 100644
--- a/xpi/content/css/close_onleft2.css
+++ b/xpi/content/css/close_onleft2.css
@@ -1,5 +1,5 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#TabsToolbar #tabbrowser-tabs .tabbrowser-tab:not([pinned]) .tab-close-button {
 	  -moz-box-ordinal-group: 0 !important;
@@ -7,4 +7,4 @@
 	  -moz-margin-end:16px !important;
 	}
 
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/closeabarbut.css b/xpi/content/css/closeabarbut.css
index ea2047a..1183dc9 100644
--- a/xpi/content/css/closeabarbut.css
+++ b/xpi/content/css/closeabarbut.css
@@ -1,9 +1,9 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#ctraddon_addon-bar #ctraddon_addonbar-close	{
 	  visibility: collapse !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/closetab_active.css b/xpi/content/css/closetab_active.css
index c425518..e888bfc 100644
--- a/xpi/content/css/closetab_active.css
+++ b/xpi/content/css/closetab_active.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	.tabbrowser-tab:not([selected="true"]) .tab-close-button {
 	  visibility: collapse !important;
 	}
@@ -12,10 +12,10 @@
 	  visibility: visible !important;
 	  display: block !important;
 	}
-}
+/*}
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
+@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
 	#ctraddon_pw_alw_tabclose{
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/closetab_forced.css b/xpi/content/css/closetab_forced.css
index 1f923ca..4a447c2 100644
--- a/xpi/content/css/closetab_forced.css
+++ b/xpi/content/css/closetab_forced.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	/* prevent TMP form hiding it, if CTRs option is active*/
 	#TabsToolbar #tabbrowser-tabs .tabbrowser-tab:not([pinned]):not([protected]) .tab-close-button {
 	  visibility: visible !important;
@@ -11,4 +11,4 @@
 	  visibility: collapse !important;
 	  display: none !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/closetab_hideonone.css b/xpi/content/css/closetab_hideonone.css
index 884f19e..18d3351 100644
--- a/xpi/content/css/closetab_hideonone.css
+++ b/xpi/content/css/closetab_hideonone.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	.tabbrowser-tab:not([pinned]):not([protected])[first-visible-tab][last-visible-tab] .tab-close-button,
 	.tabbrowser-tab:not([pinned]):not([protected])[first-tab="true"][last-tab="true"]:not([first-visible-tab]) .tab-close-button,
@@ -17,4 +17,4 @@
 	  display: none !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/closetab_none.css b/xpi/content/css/closetab_none.css
index ba979bd..250c7bc 100644
--- a/xpi/content/css/closetab_none.css
+++ b/xpi/content/css/closetab_none.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	/* hide TMPs close button on tabs toolbar, because this CTR option forces close button
 	*  to be hidden everywhere. Don't hide 'protected' tabs close button, because its used
 	*  to display a protected icon instead of close icon in that case.
@@ -11,10 +11,10 @@
 	#TabsToolbar #tabmix-tabs-closebutton{
 	  visibility: collapse !important;
 	}
-}
+/*}
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
+@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
 	#ctraddon_pw_alw_tabclose{
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/closetab_tb_end.css b/xpi/content/css/closetab_tb_end.css
index 2484a94..18dbc1d 100644
--- a/xpi/content/css/closetab_tb_end.css
+++ b/xpi/content/css/closetab_tb_end.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	.tabbrowser-tab .tab-close-button {
 	  visibility: collapse !important;
 	}
@@ -21,10 +21,10 @@
 	  -moz-margin-start: 0px !important;
 	}
 
-}
+/*}*/
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
+/*@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
 	#ctraddon_pw_alw_tabclose{
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/closetab_tb_start.css b/xpi/content/css/closetab_tb_start.css
index 306cd15..fcbd64c 100644
--- a/xpi/content/css/closetab_tb_start.css
+++ b/xpi/content/css/closetab_tb_start.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	.tabbrowser-tab .tab-close-button {
 	  visibility: collapse !important;
 	}
@@ -13,10 +13,10 @@
 	  border: none !important;
 	  padding: 0px !important;
 	}
-}
+/*}*/
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
+/*@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
 	#ctraddon_pw_alw_tabclose{
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/compactpanelmenus.css b/xpi/content/css/compactpanelmenus.css
index ec38d06..9894e82 100644
--- a/xpi/content/css/compactpanelmenus.css
+++ b/xpi/content/css/compactpanelmenus.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	.toolbarbutton-1[cui-areatype="menu-panel"] { 
 	  margin: 0px !important;
@@ -35,5 +35,4 @@
 	  animation: none !important;
 	}
 
-
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/ctraddon_appmenuitem.css b/xpi/content/css/ctraddon_appmenuitem.css
index 4d02deb..492fadb 100644
--- a/xpi/content/css/ctraddon_appmenuitem.css
+++ b/xpi/content/css/ctraddon_appmenuitem.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#appmenu_customizeMenu #ctraddon_appmenu_sep,
 	#appmenu_customizeMenu #ctraddon_appmenu_sep2,
@@ -10,4 +10,4 @@
 	  display:none !important;
 	}
 	
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/ctraddon_bmark_oinpw.css b/xpi/content/css/ctraddon_bmark_oinpw.css
index ea09233..3586e3f 100644
--- a/xpi/content/css/ctraddon_bmark_oinpw.css
+++ b/xpi/content/css/ctraddon_bmark_oinpw.css
@@ -1,9 +1,9 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_placesContext_openInPrivatewindow{
 	  visibility: visible !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/ctraddon_contextmitem.css b/xpi/content/css/ctraddon_contextmitem.css
index 0a30547..936ec9b 100644
--- a/xpi/content/css/ctraddon_contextmitem.css
+++ b/xpi/content/css/ctraddon_contextmitem.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_context_menu_entry{
 	  visibility: collapse !important;
 	  display:none !important;
 	}
 	
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/ctraddon_puictrbutton.css b/xpi/content/css/ctraddon_puictrbutton.css
index e462d92..2616dfe 100644
--- a/xpi/content/css/ctraddon_puictrbutton.css
+++ b/xpi/content/css/ctraddon_puictrbutton.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_PanelUI-CTR-button,
 	#ctraddon_PanelUI-CTR-button-separator{
@@ -11,4 +11,4 @@
 	#ctraddon_PanelUI-CTR-button {
 	  min-width: 36px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/ctraddon_toolsitem.css b/xpi/content/css/ctraddon_toolsitem.css
index 112222b..9eabf6a 100644
--- a/xpi/content/css/ctraddon_toolsitem.css
+++ b/xpi/content/css/ctraddon_toolsitem.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#menu_ToolsPopup #ctraddon_tools_menu_entry{
 	  visibility: collapse !important;
 	  display:none !important;
 	}
 	
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/cuibuttons.css b/xpi/content/css/cuibuttons.css
index d64966b..cdee216 100644
--- a/xpi/content/css/cuibuttons.css
+++ b/xpi/content/css/cuibuttons.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_cuibuttonsbox{
 	  visibility: visible !important;
@@ -104,4 +104,4 @@
 	  flex: 1 1 auto;
 	}
 	
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/empty_favicon.css b/xpi/content/css/empty_favicon.css
index bfcb3b8..eb67260 100644
--- a/xpi/content/css/empty_favicon.css
+++ b/xpi/content/css/empty_favicon.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	.tabbrowser-tab:not([pinned]) .tab-icon-image:not([src]) {
 	  display:inline !important;
@@ -10,4 +10,4 @@
 	  display:none !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/empty_favicon2.css b/xpi/content/css/empty_favicon2.css
index 6592dc0..e660c4a 100644
--- a/xpi/content/css/empty_favicon2.css
+++ b/xpi/content/css/empty_favicon2.css
@@ -1,11 +1,11 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul),
+/*@-moz-document url(chrome://browser/content/browser.xul),
 	       url(chrome://browser/content/places/places.xul),
 	       url(chrome://browser/content/history/history-panel.xul),
 	       url(chrome://browser/content/bookmarks/bookmarksPanel.xul),
 	       url(chrome://browser/content/preferences/aboutPermissions.xul),
-	       url(about:permissions) {
+	       url(about:permissions) {*/
 
   #TabsToolbar .tabbrowser-tab:not([pinned]) .tab-icon-image:not([src]) {
 	display: inline !important;
@@ -143,4 +143,4 @@
 	-moz-image-region: rect(16px, 32px, 32px, 16px) !important;
   }
 
-}
+/*}*/
diff --git a/xpi/content/css/empty_favicon_pt.css b/xpi/content/css/empty_favicon_pt.css
index 76d1451..4886367 100644
--- a/xpi/content/css/empty_favicon_pt.css
+++ b/xpi/content/css/empty_favicon_pt.css
@@ -1,9 +1,9 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	
 	.tabbrowser-tab[pinned] .tab-text,
 	.tabbrowser-tab[pinned] .tab-icon-image:not([src]) {
 	  display:none !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/feedinurl.css b/xpi/content/css/feedinurl.css
index 6465ed2..d6fbf2d 100644
--- a/xpi/content/css/feedinurl.css
+++ b/xpi/content/css/feedinurl.css
@@ -1,6 +1,6 @@
 @import url(chrome://ctraddon_os_special/skin/feedinurlextra.css);
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	toolbar #feed-button,
 	#urlbar[pageproxystate="invalid"] > #urlbar-icons #feed-button {
@@ -62,4 +62,4 @@
 	  -moz-box-ordinal-group:0;
 	}
 	
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/findbar_bottom_alt.css b/xpi/content/css/findbar_bottom_alt.css
index f538aac..d6d2efd 100644
--- a/xpi/content/css/findbar_bottom_alt.css
+++ b/xpi/content/css/findbar_bottom_alt.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	.browserContainer > findbar{
 	  -moz-box-ordinal-group: 10 !important;
 	}
@@ -10,4 +10,4 @@
 	.findbar-container spacer {
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/findbar_top.css b/xpi/content/css/findbar_top.css
index de9f4f8..736b095 100644
--- a/xpi/content/css/findbar_top.css
+++ b/xpi/content/css/findbar_top.css
@@ -1,8 +1,8 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	.browserContainer > findbar{
 	  -moz-box-ordinal-group: 0 !important;
 	  margin-top:-1px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/findbar_top_alt.css b/xpi/content/css/findbar_top_alt.css
index 223bc32..e82d9e8 100644
--- a/xpi/content/css/findbar_top_alt.css
+++ b/xpi/content/css/findbar_top_alt.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	.browserContainer > findbar{
 	  -moz-box-ordinal-group: 0 !important;
 	  margin-top:-1px !important;
@@ -11,4 +11,4 @@
 	.findbar-container spacer {
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/hide_zoomreset.css b/xpi/content/css/hide_zoomreset.css
index b7d34bf..e1171aa 100644
--- a/xpi/content/css/hide_zoomreset.css
+++ b/xpi/content/css/hide_zoomreset.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	toolbar #zoom-controls > separator,
 	toolbar #zoom-controls > #zoom-reset-button{
@@ -13,4 +13,4 @@
 	  -moz-padding-end:2px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/hidebmanimation.css b/xpi/content/css/hidebmanimation.css
index 5311839..0d604c3 100644
--- a/xpi/content/css/hidebmanimation.css
+++ b/xpi/content/css/hidebmanimation.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#bookmarked-notification {
 	  visibility: collapse !important;
@@ -12,4 +12,4 @@
 	  animation: none !important;
 	}
 	
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/hidenavbar.css b/xpi/content/css/hidenavbar.css
index 1079df6..a327b49 100644
--- a/xpi/content/css/hidenavbar.css
+++ b/xpi/content/css/hidenavbar.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	#main-window:not([customizing]):not([tabsontop="false"]) #nav-bar{
 	  min-height:2px !important;
 	  height:2px !important;
@@ -29,4 +29,4 @@
 	  height:0px !important;
 	  max-height:0px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/hidepagereportbutton.css b/xpi/content/css/hidepagereportbutton.css
index 7cc9eb9..2df6d2e 100644
--- a/xpi/content/css/hidepagereportbutton.css
+++ b/xpi/content/css/hidepagereportbutton.css
@@ -1,9 +1,9 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#urlbar #page-report-button {
 	  display: none !important;
 	} 
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/hidepanelanimation.css b/xpi/content/css/hidepanelanimation.css
index cc284b4..89522e2 100644
--- a/xpi/content/css/hidepanelanimation.css
+++ b/xpi/content/css/hidepanelanimation.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	panel[type="arrow"][animate],
 	#BMB_bookmarksPopup{
@@ -12,4 +12,4 @@
 	#main-window * #ctraddon_BMB_bookmarksPopup{
 	  transition-duration: 0.01s !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/hideprivatemask.css b/xpi/content/css/hideprivatemask.css
index cdf3a3d..a00c11d 100644
--- a/xpi/content/css/hideprivatemask.css
+++ b/xpi/content/css/hideprivatemask.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	* #private-browsing-indicator-titlebar,
 	* #private-browsing-indicator,
@@ -8,4 +8,4 @@
 	  visibility: collapse !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/hidesidebarclose.css b/xpi/content/css/hidesidebarclose.css
index 1694fd7..26713ac 100644
--- a/xpi/content/css/hidesidebarclose.css
+++ b/xpi/content/css/hidesidebarclose.css
@@ -1,9 +1,9 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	sidebarheader .close-icon {
 	  display: none !important;
 	} 
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/hideurlbargo.css b/xpi/content/css/hideurlbargo.css
index 9a5e8bd..80a7372 100644
--- a/xpi/content/css/hideurlbargo.css
+++ b/xpi/content/css/hideurlbargo.css
@@ -1,9 +1,9 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* hide urlbars go button */
 	#urlbar-container #urlbar-go-button{
 	  visibility: collapse !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/hideurlbarrelstop.css b/xpi/content/css/hideurlbarrelstop.css
index aa56a0d..48b6ee2 100644
--- a/xpi/content/css/hideurlbarrelstop.css
+++ b/xpi/content/css/hideurlbarrelstop.css
@@ -1,5 +1,5 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* hide urlbars stop/reload buttons */
 	#urlbar-container #urlbar-reload-button,
@@ -7,4 +7,4 @@
 	  visibility: collapse !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/higher_addonsbar.css b/xpi/content/css/higher_addonsbar.css
index e78548a..d46d6fc 100644
--- a/xpi/content/css/higher_addonsbar.css
+++ b/xpi/content/css/higher_addonsbar.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_addon-bar > * {
 	  margin-top: 4px !important;
 	  margin-bottom: 4px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/invicons_addonbar.css b/xpi/content/css/invicons_addonbar.css
index 2491b54..10e4e5a 100644
--- a/xpi/content/css/invicons_addonbar.css
+++ b/xpi/content/css/invicons_addonbar.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/invicons_addonbarextra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
   @media not all and (min-resolution: 2dppx) {
 	#ctraddon_addon-bar :-moz-any(#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_bookmarks-menu-toolbar-button,#ctraddon_bookmarks-button,#ctraddon_history-button,#ctraddon_history-menu-toolbar-button,#ctraddon_go-button) .toolbarbutton-icon,
 	#ctraddon_addon-bar :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button:not([starred]), #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #ctraddon_addon-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #web-apps-button),
@@ -137,4 +137,4 @@
 		}
 	  }
   }
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/invicons_bookmarksbar.css b/xpi/content/css/invicons_bookmarksbar.css
index 3dc8ae1..b02ffee 100644
--- a/xpi/content/css/invicons_bookmarksbar.css
+++ b/xpi/content/css/invicons_bookmarksbar.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/invicons_bookmarksbarextra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
   @media not all and (min-resolution: 2dppx) {
 	#PersonalToolbar :-moz-any(#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_bookmarks-menu-toolbar-button,#ctraddon_bookmarks-button,#ctraddon_history-button,#ctraddon_history-menu-toolbar-button,#ctraddon_go-button) .toolbarbutton-icon,
 	#PersonalToolbar :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button:not([starred]), #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #web-apps-button),
@@ -137,4 +137,4 @@
 		}
 	  }
   }
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/invicons_extrabar.css b/xpi/content/css/invicons_extrabar.css
index 1739555..c58a660 100644
--- a/xpi/content/css/invicons_extrabar.css
+++ b/xpi/content/css/invicons_extrabar.css
@@ -1,10 +1,10 @@
 @import url(chrome://ctraddon_os_special/skin/invicons_extrabarextra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
   @media not all and (min-resolution: 2dppx) {
 	toolbar[id^=ctraddon_extra-bar] :-moz-any(#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_bookmarks-menu-toolbar-button,#ctraddon_bookmarks-button,#ctraddon_history-button,#ctraddon_history-menu-toolbar-button,#ctraddon_go-button) .toolbarbutton-icon,
-	toolbar[id^=ctraddon_extra-bar] :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button:not([starred]), #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #web-apps-button),
+	toolbar[id^=ctraddon_extra-bar] :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button:not([starred]), #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #web-apps-button),
 	toolbar[id^=ctraddon_extra-bar] #panic-button:not([open]),
 	toolbar[id^=ctraddon_extra-bar] #pocket-button:not([open]),
 	toolbar[id^=ctraddon_extra-bar] #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
@@ -73,7 +73,7 @@
 	  @media (min-resolution: 1.1dppx) {
 		
 		#main-window[fx40plus="true"] toolbar[id^=ctraddon_extra-bar] :-moz-any(#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_bookmarks-menu-toolbar-button,#ctraddon_bookmarks-button,#ctraddon_history-button,#ctraddon_history-menu-toolbar-button,#ctraddon_go-button) .toolbarbutton-icon,
-		#main-window[fx40plus="true"] toolbar[id^=ctraddon_extra-bar] :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button:not([starred]), #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, toolbar[id^=ctraddon_extra-bar]-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #web-apps-button),
+		#main-window[fx40plus="true"] toolbar[id^=ctraddon_extra-bar] :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button:not([starred]), #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #web-apps-button),
 		#main-window[fx40plus="true"] toolbar[id^=ctraddon_extra-bar] #panic-button:not([open]),
 		#main-window[fx40plus="true"] toolbar[id^=ctraddon_extra-bar] #pocket-button:not([open]),
 		#main-window[fx40plus="true"] toolbar[id^=ctraddon_extra-bar] #bookmarks-menu-button > .toolbarbutton-menubutton-dropmarker > .dropmarker-icon {
@@ -137,4 +137,4 @@
 		}
 	  }
   }
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/invicons_menubar.css b/xpi/content/css/invicons_menubar.css
index 20b21ee..53e8bc6 100644
--- a/xpi/content/css/invicons_menubar.css
+++ b/xpi/content/css/invicons_menubar.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/invicons_menubarextra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
   @media not all and (min-resolution: 2dppx) {
 	#toolbar-menubar :-moz-any(#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_bookmarks-menu-toolbar-button,#ctraddon_bookmarks-button,#ctraddon_history-button,#ctraddon_history-menu-toolbar-button,#ctraddon_go-button) .toolbarbutton-icon,
 	#toolbar-menubar :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button:not([starred]), #new-tab-button, #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #web-apps-button),
@@ -137,4 +137,4 @@
 		}
 	  }
   }
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/invicons_navbar.css b/xpi/content/css/invicons_navbar.css
index 6f14157..a668eb6 100644
--- a/xpi/content/css/invicons_navbar.css
+++ b/xpi/content/css/invicons_navbar.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/invicons_navbarextra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
   @media not all and (min-resolution: 2dppx) {
 	
 	#nav-bar :-moz-any(#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_bookmarks-menu-toolbar-button,#ctraddon_bookmarks-button,#ctraddon_history-button,#ctraddon_history-menu-toolbar-button,#ctraddon_go-button) .toolbarbutton-icon,
@@ -139,4 +139,4 @@
 	  }
   }
   
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/invicons_tabsbar.css b/xpi/content/css/invicons_tabsbar.css
index 02796e0..5bea471 100644
--- a/xpi/content/css/invicons_tabsbar.css
+++ b/xpi/content/css/invicons_tabsbar.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/invicons_tabsbarextra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
   @media not all and (min-resolution: 2dppx) {
 	#TabsToolbar :-moz-any(#ctraddon_back-button,#ctraddon_forward-button,#ctraddon_stop-button,#ctraddon_reload-button,#ctraddon_bookmarks-menu-toolbar-button,#ctraddon_bookmarks-button,#ctraddon_history-button,#ctraddon_history-menu-toolbar-button,#ctraddon_go-button) .toolbarbutton-icon,
 	#TabsToolbar :-moz-any(#back-button, #forward-button, #home-button, #print-button, #downloads-button, #bookmarks-menu-button:not([starred]), #new-window-button, #fullscreen-button, #sync-button, #feed-button, #tabview-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #cut-button, #copy-button, #paste-button, #e10s-button, #web-apps-button),
@@ -145,4 +145,4 @@
 		}
 	  }
   }
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/alt_addonsmanagerextra.css b/xpi/content/css/linux/alt_addonsmanagerextra.css
index cbfba1d..47c3d0b 100644
--- a/xpi/content/css/linux/alt_addonsmanagerextra.css
+++ b/xpi/content/css/linux/alt_addonsmanagerextra.css
@@ -1,4 +1,4 @@
-@-moz-document url(about:addons) {
+/*@-moz-document url(about:addons) {*/
 
 	/* fix issue where menulists on Linux become too big */
 	#addons-page #detail-view menulist,
@@ -7,4 +7,4 @@
 	  height: 26px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/appbutton_on_navbarextra.css b/xpi/content/css/linux/appbutton_on_navbarextra.css
index e281578..c9a274a 100644
--- a/xpi/content/css/linux/appbutton_on_navbarextra.css
+++ b/xpi/content/css/linux/appbutton_on_navbarextra.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	/* style appmenu */
 	#main-window[defaultfxtheme="true"] #appmenu-popup {
 	  margin-top:-6px;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/appbuttxtextra.css b/xpi/content/css/linux/appbuttxtextra.css
index 8104ca1..d77b81a 100644
--- a/xpi/content/css/linux/appbuttxtextra.css
+++ b/xpi/content/css/linux/appbuttxtextra.css
@@ -1,8 +1,8 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#TabsToolbar #ctraddon_appbutton .toolbarbutton-text {
 	  margin: -1px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/back-forwardextra.css b/xpi/content/css/linux/back-forwardextra.css
index 0390a49..46f7b26 100644
--- a/xpi/content/css/linux/back-forwardextra.css
+++ b/xpi/content/css/linux/back-forwardextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#urlbar-container[forwarddisabled] > #urlbar-wrapper > #urlbar > #notification-popup-box[hidden] + *,
 	#urlbar-container[forwarddisabled] > #urlbar-wrapper > #urlbar,
@@ -56,4 +56,4 @@
 	  margin-left: 4px !important; /* for both ltr and rtl */
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/bf_urlbarfixextra.css b/xpi/content/css/linux/bf_urlbarfixextra.css
index 45cb09b..10b3fc9 100644
--- a/xpi/content/css/linux/bf_urlbarfixextra.css
+++ b/xpi/content/css/linux/bf_urlbarfixextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#urlbar:-moz-locale-dir(ltr) {
 	  border-top-left-radius: 2px !important;
@@ -12,4 +12,4 @@
 	  border-bottom-right-radius: 2px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/bmbut_pmenu_extra.css b/xpi/content/css/linux/bmbut_pmenu_extra.css
index 5c93ace..68c21cb 100644
--- a/xpi/content/css/linux/bmbut_pmenu_extra.css
+++ b/xpi/content/css/linux/bmbut_pmenu_extra.css
@@ -1,9 +1,9 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	
 	#ctraddon_BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
 	#ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
 	  background: -moz-dialog !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/classictabsextra.css b/xpi/content/css/linux/classictabsextra.css
index cbf86e6..6359570 100644
--- a/xpi/content/css/linux/classictabsextra.css
+++ b/xpi/content/css/linux/classictabsextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	.tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
 	  -moz-padding-start: 0px !important;
@@ -61,4 +61,4 @@
 	#TabsToolbar #tabbrowser-tabs .tabbrowser-tab[pinned]:-moz-lwtheme{
 	  background-size: calc(100% - 1px) calc(100% - 4px) !important;
 	}
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/classictabsextra2.css b/xpi/content/css/linux/classictabsextra2.css
index 7d08b98..1b973ea 100644
--- a/xpi/content/css/linux/classictabsextra2.css
+++ b/xpi/content/css/linux/classictabsextra2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	.tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
 	  -moz-padding-start: 0px !important;
@@ -55,4 +55,4 @@
 	  padding-top:0 !important;
 	  padding-bottom:0 !important;
 	}
-}
+/*}*/
diff --git a/xpi/content/css/linux/classictabsextra2c2.css b/xpi/content/css/linux/classictabsextra2c2.css
index f4bfec5..8b7d217 100644
--- a/xpi/content/css/linux/classictabsextra2c2.css
+++ b/xpi/content/css/linux/classictabsextra2c2.css
@@ -1,16 +1,8 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* tab colors */
-	/*.tabs-newtab-button:not(:-moz-lwtheme),
-	.tabbrowser-tab:not(:-moz-lwtheme) .tab-content {
-	  background-image: linear-gradient(hsla(0,0%,100%,.2), hsla(0,0%,45%,.2) 2px, hsla(0,0%,32%,.2) 80%) !important;
-	}
-	.tabs-newtab-button:hover:not(:-moz-lwtheme),
-	.tabbrowser-tab:not([selected]):hover:not(:-moz-lwtheme) .tab-content {
-	  background-image: linear-gradient(hsla(0,0%,100%,.6), hsla(0,0%,100%,.2) 4px, hsla(0,0%,75%,.2) 80%) !important;
-	}*/
 	.tabbrowser-tab[selected]:not(:-moz-lwtheme) .tab-content {
 	  background-image: linear-gradient(rgba(255,255,255,.8) 1px, rgba(255,255,255,.5) 3px, rgba(255,255,255,.3) 32%),
 						linear-gradient(-moz-dialog, -moz-dialog) !important;
@@ -54,4 +46,4 @@
 	  padding-bottom:0 !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/classictabsextrac2.css b/xpi/content/css/linux/classictabsextrac2.css
index 0fcb92f..9602ec3 100644
--- a/xpi/content/css/linux/classictabsextrac2.css
+++ b/xpi/content/css/linux/classictabsextrac2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* tab colors */
 	.tabs-newtab-button:not(:-moz-lwtheme),
@@ -54,4 +54,4 @@
 	  padding-bottom:0 !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/curvedtabsextra.css b/xpi/content/css/linux/curvedtabsextra.css
index 42a876e..d2f802f 100644
--- a/xpi/content/css/linux/curvedtabsextra.css
+++ b/xpi/content/css/linux/curvedtabsextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	
 	#main-window:not([fx40plus="true"]) .tabbrowser-tab:not(:-moz-lwtheme):not([selected=true]):not(:hover) .tab-stack .tab-background-middle,
 	#main-window:not([fx40plus="true"]) .tabbrowser-tab:not(:-moz-lwtheme):not([selected=true]):not(:hover) .tab-background-start,
@@ -43,4 +43,4 @@
 	  padding-top:0 !important;
 	  padding-bottom:0 !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/feedinurlextra.css b/xpi/content/css/linux/feedinurlextra.css
index 4d39952..728a358 100644
--- a/xpi/content/css/linux/feedinurlextra.css
+++ b/xpi/content/css/linux/feedinurlextra.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#urlbar-icons #feed-button .toolbarbutton-icon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/feedinurlbar_lin.png") !important;
 	  -moz-image-region: rect(0px 18px 18px 0px) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/highertabsposextra.css b/xpi/content/css/linux/highertabsposextra.css
index a6271ea..5f47154 100644
--- a/xpi/content/css/linux/highertabsposextra.css
+++ b/xpi/content/css/linux/highertabsposextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window:not([tabsontop="false"]) #TabsToolbar:not([tabsontop="false"]) {
 	  margin-top:0px !important;
@@ -11,4 +11,4 @@
 	#main-window[sizemode="maximized"]:not([tabsontop="false"]) #titlebar-placeholder-on-TabsToolbar-for-captions-buttons{
 	  -moz-margin-start: 2px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/mode_icons_and_text_extra.css b/xpi/content/css/linux/mode_icons_and_text_extra.css
index 40c288b..6ede7f5 100644
--- a/xpi/content/css/linux/mode_icons_and_text_extra.css
+++ b/xpi/content/css/linux/mode_icons_and_text_extra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#nav-bar .toolbarbutton-1:not([type="menu-button"]) .toolbarbutton-icon {
 	  min-width: 18px !important;
@@ -59,4 +59,4 @@
 	  box-shadow:none !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/mode_icons_and_text_extra3.css b/xpi/content/css/linux/mode_icons_and_text_extra3.css
index b10e7af..3e080a2 100644
--- a/xpi/content/css/linux/mode_icons_and_text_extra3.css
+++ b/xpi/content/css/linux/mode_icons_and_text_extra3.css
@@ -1,9 +1,9 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window #navigator-toolbox #nav-bar toolbarbutton[type="menu-button"] toolbarbutton image{
 	  width:18px !important;
 	  padding:0px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/mode_icons_big_extra.css b/xpi/content/css/linux/mode_icons_big_extra.css
index 9397280..0f23526 100644
--- a/xpi/content/css/linux/mode_icons_big_extra.css
+++ b/xpi/content/css/linux/mode_icons_big_extra.css
@@ -1,7 +1,6 @@
-/*AGENT_SHEET*/
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	#nav-bar :-moz-any(#back-button, #forward-button)[cui-areatype="toolbar"] {
 	  list-style-image: url(chrome://browser/skin/menuPanel.png) !important;
 	}
@@ -114,4 +113,4 @@
 	  height:36px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/nav_txtonlyextra.css b/xpi/content/css/linux/nav_txtonlyextra.css
index 15a33a2..1a2cedb 100644
--- a/xpi/content/css/linux/nav_txtonlyextra.css
+++ b/xpi/content/css/linux/nav_txtonlyextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#navigator-toolbox #nav-bar .toolbarbutton-1:not(.tabs-newtab-button):not(.tab-close-button):not([disabled]):hover .toolbarbutton-text {
 	  border: 1px solid transparent !important;
@@ -20,4 +20,4 @@
 	  font-size: 12px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/nocontexticonsextra.css b/xpi/content/css/linux/nocontexticonsextra.css
index a8d7322..093fb03 100644
--- a/xpi/content/css/linux/nocontexticonsextra.css
+++ b/xpi/content/css/linux/nocontexticonsextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#context-back image,
 	#context-forward image,
@@ -30,4 +30,4 @@
       -moz-margin-start:4px !important; /* 21 -17 */
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/overlayextra.css b/xpi/content/css/linux/overlayextra.css
index 3119d25..16802f2 100644
--- a/xpi/content/css/linux/overlayextra.css
+++ b/xpi/content/css/linux/overlayextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_bookmarks-menu-toolbar-button,
 	#ctraddon_bookmarks-button{
@@ -145,32 +145,32 @@
 	  margin: 0 !important;
 	}
 
-}
+/*}*/
 
 .ctraddon_maconly,
 .ctraddon_windowsonly{
   visibility: collapse !important;
 }
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	#ctraddon_appbutton_list2{
+/*@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane #ctraddon_appbutton_list2{
 	  visibility: visible !important;
 	}
 
-	#ctraddon_pw_menubarnofog,
-	#ctraddon_pw_altmenubar,
-	#ctraddon_tabs_in_titlebar,
+	#ClassicTRoptionsPane #ctraddon_pw_menubarnofog,
+	#ClassicTRoptionsPane #ctraddon_pw_altmenubar,
+	#ClassicTRoptionsPane #ctraddon_tabs_in_titlebar,
 	.ctraddon_winmaconly,
-	#ctraddon_appbutton_list1{
+	#ClassicTRoptionsPane #ctraddon_appbutton_list1{
 	  visibility: collapse !important;
 	  display:none !important;
 	}
-	#ctraddon_pw_okbutton{
+	#ClassicTRoptionsPane #ctraddon_pw_okbutton{
 	  display: inline !important;
 	}
 	
-	#ctraddon_pw_cappbutc1,
-	#ctraddon_pw_cappbutc2 {
+	#ClassicTRoptionsPane #ctraddon_pw_cappbutc1,
+	#ClassicTRoptionsPane #ctraddon_pw_cappbutc2 {
 	  width:170px !important;
 	}
 
@@ -180,15 +180,15 @@
 	  width:70px !important;
 	  max-width:90px !important;
 	}
-	#ctraddon_pw_starinurl label{
+	#ClassicTRoptionsPane #ctraddon_pw_starinurl label{
 	  background: -moz-image-rect(url('chrome://classic_theme_restorer/content/images/starbutton1lin.png'),
 				  0, 72, 18, 36) no-repeat left !important;
 	  -moz-padding-start:20px !important;
 	  min-height:16px !important;
 	}
-	#ctraddon_pw_feedinurl label{
+	#ClassicTRoptionsPane #ctraddon_pw_feedinurl label{
 	  background:url('chrome://classic_theme_restorer/content/images/feedinurlbar_lin.png') no-repeat left !important;
 	  -moz-padding-start:20px !important;
 	  min-height:16px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/smallnavbutextra.css b/xpi/content/css/linux/smallnavbutextra.css
index fe95a1f..1aa4f68 100644
--- a/xpi/content/css/linux/smallnavbutextra.css
+++ b/xpi/content/css/linux/smallnavbutextra.css
@@ -1,5 +1,5 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#nav-bar .toolbarbutton-1{
 	  padding: 0px !important;
@@ -217,4 +217,4 @@
 	  -moz-margin-start: 1px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/starinurlextra.css b/xpi/content/css/linux/starinurlextra.css
index 7ea58d7..72d7ca7 100644
--- a/xpi/content/css/linux/starinurlextra.css
+++ b/xpi/content/css/linux/starinurlextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	
 	#urlbar-icons #bookmarks-menu-button .toolbarbutton-icon {
 	  -moz-image-region: rect(0px 18px 18px 0px);
@@ -48,4 +48,4 @@
 	#main-window[defaultfxtheme="true"] #editBookmarkPanelStarIcon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/starred48lin.png") !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/tabmokcolorextra.css b/xpi/content/css/linux/tabmokcolorextra.css
index 84d9419..efdd04c 100644
--- a/xpi/content/css/linux/tabmokcolorextra.css
+++ b/xpi/content/css/linux/tabmokcolorextra.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window .tabbrowser-arrowscrollbox > .scrollbutton-up,
 	#main-window .tabbrowser-arrowscrollbox > .scrollbutton-down {
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/tab-arrow-left-inverted.png) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/linux/tabsontop_offextra.css b/xpi/content/css/linux/tabsontop_offextra.css
index 82dc60e..49a264e 100644
--- a/xpi/content/css/linux/tabsontop_offextra.css
+++ b/xpi/content/css/linux/tabsontop_offextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#TabsToolbar:not(:-moz-lwtheme){
 	  -moz-appearance: none !important;
@@ -49,4 +49,4 @@
 	  -moz-appearance: none !important;
 	}
 	
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/alt_addonsmanagerextra.css b/xpi/content/css/mac/alt_addonsmanagerextra.css
index ca225f2..8f2440f 100644
--- a/xpi/content/css/mac/alt_addonsmanagerextra.css
+++ b/xpi/content/css/mac/alt_addonsmanagerextra.css
@@ -1,4 +1,4 @@
-@-moz-document url(about:addons) {
+/*@-moz-document url(about:addons) {*/
 
 	/* fix issue where menulists on Linux become too big */
 	#addons-page #detail-view menulist,
@@ -7,4 +7,4 @@
 	  height: 22px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/appbuttxtextra.css b/xpi/content/css/mac/appbuttxtextra.css
index cbfad70..c698983 100644
--- a/xpi/content/css/mac/appbuttxtextra.css
+++ b/xpi/content/css/mac/appbuttxtextra.css
@@ -1,8 +1,8 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#TabsToolbar #ctraddon_appbutton .toolbarbutton-text {
 	  padding:3px 4px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/back-forwardextra.css b/xpi/content/css/mac/back-forwardextra.css
index 0f20509..ce0a57c 100644
--- a/xpi/content/css/mac/back-forwardextra.css
+++ b/xpi/content/css/mac/back-forwardextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#main-window:not([defaultfxtheme="true"]) #notification-popup-box[hidden] + *,
 	#main-window:not([defaultfxtheme="true"]) #notification-popup-box + .notification-anchor-icon {
@@ -68,4 +68,4 @@
 	#main-window[defaultfxtheme="true"] #nav-bar .searchbar-textbox[focused]{
 	  border-color: -moz-mac-focusring !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/bf_urlbarfixextra.css b/xpi/content/css/mac/bf_urlbarfixextra.css
index cca909a..98ed260 100644
--- a/xpi/content/css/mac/bf_urlbarfixextra.css
+++ b/xpi/content/css/mac/bf_urlbarfixextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#urlbar:-moz-locale-dir(ltr) {
 	  border-top-left-radius: 2.5px !important;
@@ -11,4 +11,4 @@
 	  border-bottom-right-radius: 2.5px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/bmbut_pmenu_extra.css b/xpi/content/css/mac/bmbut_pmenu_extra.css
index cc27ca3..89ee6e9 100644
--- a/xpi/content/css/mac/bmbut_pmenu_extra.css
+++ b/xpi/content/css/mac/bmbut_pmenu_extra.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_BMB_bookmarksPopup menu:not([_moz-menuactive]),
 	#ctraddon_BMB_bookmarksPopup menuitem:not([_moz-menuactive]) {
 	  -moz-appearance:none !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/classictabsextra2c2.css b/xpi/content/css/mac/classictabsextra2c2.css
index da840ce..30cab5f 100644
--- a/xpi/content/css/mac/classictabsextra2c2.css
+++ b/xpi/content/css/mac/classictabsextra2c2.css
@@ -1,25 +1,12 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* tab colors */
-	/*.tabs-newtab-button:not(:-moz-lwtheme),
-	.tabbrowser-tab:not(:-moz-lwtheme) .tab-content {
-	  background-image: linear-gradient(to top, #676f76 0px, transparent 1px),linear-gradient(to top, #a1a1a1,#c0c0c0,#cccccc,#d4d4d4) !important;
-	}
-	.tabs-newtab-button:hover:not(:-moz-lwtheme),
-	.tabbrowser-tab:not([selected]):hover:not(:-moz-lwtheme) .tab-content {
-	  background-image: linear-gradient(to top, #676f76 0px, transparent 1px),linear-gradient(to top,#b3b3b3,#cfcfcf,#dedede,#e5e5e5) !important;
-	}*/
 	.tabbrowser-tab[selected]:not(:-moz-lwtheme) .tab-content {
 	  background-image: linear-gradient(to top,#eaeaea,#e2e2e2,#ededed,#fcfcfc) !important;
 	}
 
-	/*.tabbrowser-tab:not(:-moz-lwtheme):not([selected=true]):not(:hover),
-	.tabbrowser-tab:not(:-moz-lwtheme):not([selected=true]):hover {
-	  color:black !important;
-	}*/
-	
 	/* tab colors lightweight theme */
 	.tabbrowser-tab[selected]:-moz-lwtheme .tab-content {
 	  background-image: linear-gradient(rgba(255,255,255,.7), rgba(255,255,255,.5) 50%) !important;
@@ -57,4 +44,4 @@
 	  margin-right:-10px !important;
 	}
 
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/classictabsextrac2.css b/xpi/content/css/mac/classictabsextrac2.css
index b02a2d9..99445ad 100644
--- a/xpi/content/css/mac/classictabsextrac2.css
+++ b/xpi/content/css/mac/classictabsextrac2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* tab colors */
 	.tabs-newtab-button:not(:-moz-lwtheme),
@@ -57,4 +57,4 @@
 	  margin-right:-10px !important;
 	}
 
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/curvedtabsextra.css b/xpi/content/css/mac/curvedtabsextra.css
index 6f11356..cc2ce9b 100644
--- a/xpi/content/css/mac/curvedtabsextra.css
+++ b/xpi/content/css/mac/curvedtabsextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	
 	#main-window:not([fx40plus="true"]) .tabbrowser-tab:not(:-moz-lwtheme):not([selected=true]):not(:hover) .tab-stack .tab-background-middle,
 	#main-window:not([fx40plus="true"]) .tabbrowser-tab:not(:-moz-lwtheme):not([selected=true]):not(:hover) .tab-background-start,
@@ -30,4 +30,4 @@
 	.tabbrowser-tab:not(:-moz-lwtheme):not([selected=true]):hover{
 	  color: black !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/feedinurlextra.css b/xpi/content/css/mac/feedinurlextra.css
index f2ea710..085e11d 100644
--- a/xpi/content/css/mac/feedinurlextra.css
+++ b/xpi/content/css/mac/feedinurlextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	@media not all and (min-resolution: 2dppx) {
 
@@ -26,4 +26,4 @@
 	  margin-bottom:-8px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/highertabsposextra.css b/xpi/content/css/mac/highertabsposextra.css
index b5cfb56..8f1847b 100644
--- a/xpi/content/css/mac/highertabsposextra.css
+++ b/xpi/content/css/mac/highertabsposextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window[tabsintitlebar][sizemode="normal"]:not([tabsontop="false"]):not([customizing]) #TabsToolbar {
 	  margin-top: -6px !important;
@@ -8,4 +8,4 @@
 	#main-window[tabsintitlebar]:not([sizemode="normal"]):not([tabsontop="false"]):not([customizing]) #TabsToolbar {
 	  margin-top: -10px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/invicons_addonbarextra.css b/xpi/content/css/mac/invicons_addonbarextra.css
index 53055f7..506df15 100644
--- a/xpi/content/css/mac/invicons_addonbarextra.css
+++ b/xpi/content/css/mac/invicons_addonbarextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	@media (min-resolution: 2dppx) {
 
@@ -97,4 +97,4 @@
 	  }
 		  
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/invicons_bookmarksbarextra.css b/xpi/content/css/mac/invicons_bookmarksbarextra.css
index f2f6f2b..f30f2a1 100644
--- a/xpi/content/css/mac/invicons_bookmarksbarextra.css
+++ b/xpi/content/css/mac/invicons_bookmarksbarextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	@media (min-resolution: 2dppx) {
 
@@ -97,4 +97,4 @@
 	  }
 		  
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/invicons_extrabarextra.css b/xpi/content/css/mac/invicons_extrabarextra.css
index 876a8ae..b7982f1 100644
--- a/xpi/content/css/mac/invicons_extrabarextra.css
+++ b/xpi/content/css/mac/invicons_extrabarextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	@media (min-resolution: 2dppx) {
 
@@ -95,6 +95,6 @@
 	  toolbar[id^=ctraddon_extra-bar] :-moz-any(#ctraddon_back-button, #ctraddon_forward-button, #ctraddon_bookmarks-menu-toolbar-button, #ctraddon_bookmarks-button, #ctraddon_history-button,#ctraddon_history-menu-toolbar-button, #ctraddon_reload-button, #ctraddon_stop-button,#ctraddon_go-button) > .toolbarbutton-icon {
 		width: 18px !important;
 	  }
-		  
+
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/invicons_menubarextra.css b/xpi/content/css/mac/invicons_menubarextra.css
index 89a220f..6432290 100644
--- a/xpi/content/css/mac/invicons_menubarextra.css
+++ b/xpi/content/css/mac/invicons_menubarextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	@media (min-resolution: 2dppx) {
 
@@ -95,6 +95,6 @@
 	  #toolbar-menubar :-moz-any(#ctraddon_back-button, #ctraddon_forward-button, #ctraddon_bookmarks-menu-toolbar-button, #ctraddon_bookmarks-button, #ctraddon_history-button,#ctraddon_history-menu-toolbar-button, #ctraddon_reload-button, #ctraddon_stop-button,#ctraddon_go-button) > .toolbarbutton-icon {
 		width: 18px !important;
 	  }
-		  
+
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/invicons_navbarextra.css b/xpi/content/css/mac/invicons_navbarextra.css
index 526e51d..64e0700 100644
--- a/xpi/content/css/mac/invicons_navbarextra.css
+++ b/xpi/content/css/mac/invicons_navbarextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	@media (min-resolution: 2dppx) {
 
@@ -97,4 +97,4 @@
 	  }
 
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/invicons_tabsbarextra.css b/xpi/content/css/mac/invicons_tabsbarextra.css
index c475b5f..b1783ee 100644
--- a/xpi/content/css/mac/invicons_tabsbarextra.css
+++ b/xpi/content/css/mac/invicons_tabsbarextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	@media (min-resolution: 2dppx) {
 
@@ -143,4 +143,4 @@
 		list-style-image: url(chrome://browser/skin/tabbrowser/alltabs-box-bkgnd-icon-inverted.png) !important;
 	  }
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/mode_icons_and_text_extra.css b/xpi/content/css/mac/mode_icons_and_text_extra.css
index abbc575..5b77bc1 100644
--- a/xpi/content/css/mac/mode_icons_and_text_extra.css
+++ b/xpi/content/css/mac/mode_icons_and_text_extra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	toolbar .toolbarbutton-1:not([type="menu-button"]),
 	toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
@@ -100,4 +100,4 @@
 	  border:0px solid transparent !important;
 	  padding:0 !important;
 	}
-}
+/*}*/
diff --git a/xpi/content/css/mac/mode_icons_big_extra.css b/xpi/content/css/mac/mode_icons_big_extra.css
index 6ab4b43..017884e 100644
--- a/xpi/content/css/mac/mode_icons_big_extra.css
+++ b/xpi/content/css/mac/mode_icons_big_extra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#nav-bar #loop-call-button[cui-areatype="toolbar"] > .toolbarbutton-badge-container  image {
 	  min-width:30px !important;
@@ -30,4 +30,4 @@
 	  border-color: -moz-mac-focusring !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/nav_txtonlyextra.css b/xpi/content/css/mac/nav_txtonlyextra.css
index fc9f131..458df6a 100644
--- a/xpi/content/css/mac/nav_txtonlyextra.css
+++ b/xpi/content/css/mac/nav_txtonlyextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	toolbar .toolbarbutton-1:not([type="menu-button"]),
 	toolbar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
@@ -50,4 +50,4 @@
 	  margin-top:-6px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/nocontexticonsextra.css b/xpi/content/css/mac/nocontexticonsextra.css
index 2563ab1..c266f2c 100644
--- a/xpi/content/css/mac/nocontexticonsextra.css
+++ b/xpi/content/css/mac/nocontexticonsextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#context-back image,
 	#context-forward image,
@@ -30,4 +30,4 @@
       -moz-margin-start:21px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/overlayextra.css b/xpi/content/css/mac/overlayextra.css
index 2e1d13d..0afa9b0 100644
--- a/xpi/content/css/mac/overlayextra.css
+++ b/xpi/content/css/mac/overlayextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_bookmarks-menu-toolbar-button,
 	#ctraddon_bookmarks-button {
@@ -211,7 +211,7 @@
 	  visibility:collapse !important;
 	  display:none !important;
 	}
-}
+/*}*/
 
 .ctraddon_winlinonly,
 .ctraddon_linuxonly,
@@ -219,16 +219,16 @@
   visibility: collapse !important;
 }
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	#ctraddon_appbutton_list2{
+/*@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane #ctraddon_appbutton_list2{
 	  visibility: visible !important;
 	}
-	#ctraddon_pw_nbcompact,
-	#ctraddon_pw_menubargroup,
-	#ctraddon_pw_menubarnofog,
-	#ctraddon_pw_altmenubar,
-	#ctraddon_wincontrols,
-	#ctraddon_appbutton_list1{
+	#ClassicTRoptionsPane #ctraddon_pw_nbcompact,
+	#ClassicTRoptionsPane #ctraddon_pw_menubargroup,
+	#ClassicTRoptionsPane #ctraddon_pw_menubarnofog,
+	#ClassicTRoptionsPane #ctraddon_pw_altmenubar,
+	#ClassicTRoptionsPane #ctraddon_wincontrols,
+	#ClassicTRoptionsPane #ctraddon_appbutton_list1{
 	  visibility: collapse !important;
 	  display:none !important;
 	}
@@ -239,15 +239,15 @@
 	  width:500px;
 	  max-width:600px;
 	}
-	#ctraddon_pw_starinurl label{
+	#ClassicTRoptionsPane #ctraddon_pw_starinurl label{
 	  background: -moz-image-rect(url('chrome://classic_theme_restorer/content/images/starbutton1osx.png'),
 				  0, 72, 18, 36) no-repeat left !important;
 	  -moz-padding-start:20px !important;
 	  min-height:16px !important;
 	}
-	#ctraddon_pw_feedinurl label{
+	#ClassicTRoptionsPane #ctraddon_pw_feedinurl label{
 	  background:url('chrome://classic_theme_restorer/content/images/feedinurlbar_mac.png') no-repeat left !important;
 	  -moz-padding-start:20px !important;
 	  min-height:16px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/smallnavbutextra.css b/xpi/content/css/mac/smallnavbutextra.css
index bbdedf8..74f4cd4 100644
--- a/xpi/content/css/mac/smallnavbutextra.css
+++ b/xpi/content/css/mac/smallnavbutextra.css
@@ -1,5 +1,5 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#nav-bar .toolbarbutton-1:not([type="menu-button"]),
 	#nav-bar .toolbarbutton-1 > .toolbarbutton-menubutton-button,
@@ -264,4 +264,4 @@
 	  padding: 0 !important;
 	  -moz-margin-start: 1px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/starinurlextra.css b/xpi/content/css/mac/starinurlextra.css
index ef266d9..5416303 100644
--- a/xpi/content/css/mac/starinurlextra.css
+++ b/xpi/content/css/mac/starinurlextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	@media not all and (min-resolution: 2dppx) {
 
@@ -70,4 +70,4 @@
 		  -moz-image-region: rect(0, 96px, 32px, 64px);
 		}
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/tabmokcolorextra.css b/xpi/content/css/mac/tabmokcolorextra.css
index a43c371..5277f06 100644
--- a/xpi/content/css/mac/tabmokcolorextra.css
+++ b/xpi/content/css/mac/tabmokcolorextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	@media (min-resolution: 2dppx) {
 	  #navigator-toolbox #TabsToolbar > #tabbrowser-tabs > .tabbrowser-arrowscrollbox > .scrollbutton-up:-moz-locale-dir(ltr),
@@ -26,4 +26,4 @@
 	  }
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mac/tabsontop_offextra.css b/xpi/content/css/mac/tabsontop_offextra.css
index 8a53dca..4fa0cc2 100644
--- a/xpi/content/css/mac/tabsontop_offextra.css
+++ b/xpi/content/css/mac/tabsontop_offextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#main-window[tabsintitlebar] #titlebar{
 	  padding-top: 0px !important;
@@ -66,4 +66,4 @@
 	  padding-bottom: 4px !important;
 	}
 	
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/menubar_altpos.css b/xpi/content/css/menubar_altpos.css
index 078d164..2db639f 100644
--- a/xpi/content/css/menubar_altpos.css
+++ b/xpi/content/css/menubar_altpos.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window[tabsintitlebar]:not([inFullscreen])[sizemode="normal"] #tab-view-deck #navigator-toolbox #toolbar-menubar[inactive="true"]:not([autohide="true"]),
 	#main-window[tabsintitlebar]:not([inFullscreen])[sizemode="normal"] #tab-view-deck #navigator-toolbox #toolbar-menubar[inactive="true"][autohide="false"],
@@ -13,4 +13,4 @@
 	  -moz-margin-start: 0 !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/menubar_altpos2.css b/xpi/content/css/menubar_altpos2.css
index ed7629c..84e008d 100644
--- a/xpi/content/css/menubar_altpos2.css
+++ b/xpi/content/css/menubar_altpos2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window[tabsintitlebar][chromehidden~="menubar"][sizemode="normal"] #toolbar-menubar ~ #TabsToolbar,
 	#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive] ~ #TabsToolbar {
@@ -68,4 +68,4 @@
 	  display: none !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/menubar_infullscreen.css b/xpi/content/css/menubar_infullscreen.css
index 754c6f7..c86c83a 100644
--- a/xpi/content/css/menubar_infullscreen.css
+++ b/xpi/content/css/menubar_infullscreen.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	#main-window[inFullscreen] #toolbar-menubar{
 	  visibility: visible !important;
 	}
 	#main-window[tabsintitlebar][inFullscreen] #titlebar:not([hidden]) ~ * #toolbar-menubar {
 	  -moz-margin-start: 0px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/menubar_nofog.css b/xpi/content/css/menubar_nofog.css
index e4ecbf3..1899266 100644
--- a/xpi/content/css/menubar_nofog.css
+++ b/xpi/content/css/menubar_nofog.css
@@ -1,9 +1,9 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window #main-menubar {
 	  background:none !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/menuitems_forceleft.css b/xpi/content/css/menuitems_forceleft.css
index c3de7ae..5f597e3 100644
--- a/xpi/content/css/menuitems_forceleft.css
+++ b/xpi/content/css/menuitems_forceleft.css
@@ -1,9 +1,9 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	
 	#wrapper-menubar-items,
 	#menubar-items{
 	  -moz-box-ordinal-group:0 !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/menuitems_forceright.css b/xpi/content/css/menuitems_forceright.css
index 7173825..00294da 100644
--- a/xpi/content/css/menuitems_forceright.css
+++ b/xpi/content/css/menuitems_forceright.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#wrapper-menubar-items,
 	#menubar-items{
 	  -moz-box-ordinal-group:1000 !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/menupopupscrollbar.css b/xpi/content/css/menupopupscrollbar.css
index 4cd0076..78c74ec 100644
--- a/xpi/content/css/menupopupscrollbar.css
+++ b/xpi/content/css/menupopupscrollbar.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	menupopup scrollbox {
 	  overflow-y: auto !important
 	}
@@ -8,4 +8,4 @@
 	menupopup .autorepeatbutton-down {
 	  display: none !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mode_iat_no_vt.css b/xpi/content/css/mode_iat_no_vt.css
index c53eaab..d73dbb5 100644
--- a/xpi/content/css/mode_iat_no_vt.css
+++ b/xpi/content/css/mode_iat_no_vt.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	* #vertical-toolbar .toolbarbutton-1 .toolbarbutton-text {
 	  visibility: collapse !important;
@@ -9,4 +9,4 @@
 	  min-width: unset !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mode_icons_and_text.css b/xpi/content/css/mode_icons_and_text.css
index 90e6a20..5f66b5f 100644
--- a/xpi/content/css/mode_icons_and_text.css
+++ b/xpi/content/css/mode_icons_and_text.css
@@ -2,7 +2,7 @@
 @import url(chrome://ctraddon_os_special/skin/mode_icons_and_text_extra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#nav-bar .toolbarbutton-1 .toolbarbutton-text,
 	#nav-bar .toolbarbutton-menubutton-dropmarker > image,
@@ -159,4 +159,4 @@
 	  box-shadow:none !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mode_icons_and_text2.css b/xpi/content/css/mode_icons_and_text2.css
index de169a3..1fb7b2d 100644
--- a/xpi/content/css/mode_icons_and_text2.css
+++ b/xpi/content/css/mode_icons_and_text2.css
@@ -1,7 +1,7 @@
 @import url(chrome://classic_theme_restorer/content/css/mode_icons_and_text.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	toolbox :-moz-any(#toolbar-menubar, #nav-bar, #PersonalToolbar, toolbar[id^=ctraddon_extra-bar], #vertical-toolbar) .toolbarbutton-1:not(.tabs-newtab-button):not(.tab-close-button):not([type="menu-button"]) {
 	  min-width: 0px !important;
@@ -9,4 +9,4 @@
 	toolbox #ctraddon_addon-bar .toolbarbutton-1:not(.tabs-newtab-button):not(.tab-close-button):not([type="menu-button"]) {
 	  min-width: 57px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mode_icons_and_text3.css b/xpi/content/css/mode_icons_and_text3.css
index 7ae1f17..ac97345 100644
--- a/xpi/content/css/mode_icons_and_text3.css
+++ b/xpi/content/css/mode_icons_and_text3.css
@@ -2,7 +2,7 @@
 @import url(chrome://ctraddon_os_special/skin/back-forwardextra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	/* navigation toolbar */
 	#nav-bar .toolbarbutton-1 .toolbarbutton-text,
 	#nav-bar .toolbarbutton-menubutton-dropmarker > image,
@@ -191,4 +191,4 @@
 	toolbar:not(#nav-bar):not(#TabsToolbar) #zoompage-item .toolbarbutton-1:not([type="menu-button"]) {
 	  min-width: unset !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mode_icons_and_text4.css b/xpi/content/css/mode_icons_and_text4.css
index 6a3e014..dc28fd4 100644
--- a/xpi/content/css/mode_icons_and_text4.css
+++ b/xpi/content/css/mode_icons_and_text4.css
@@ -1,7 +1,7 @@
 @import url(chrome://classic_theme_restorer/content/css/mode_icons_and_text3.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	toolbox #nav-bar toolbaritem .toolbarbutton-1:not([type="menu-button"]),
 	toolbox #nav-bar .toolbarbutton-1:not([type="menu-button"]),
@@ -18,4 +18,4 @@
 	toolbox #ctraddon_addon-bar .toolbarbutton-1:not(.tabs-newtab-button):not(.tab-close-button):not([type="menu-button"]) {
 	  min-width: 57px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mode_icons_big.css b/xpi/content/css/mode_icons_big.css
index 08c86dc..f3960d1 100644
--- a/xpi/content/css/mode_icons_big.css
+++ b/xpi/content/css/mode_icons_big.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/mode_icons_big_extra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#nav-bar :-moz-any(#home-button, #print-button, #downloads-button, #bookmarks-menu-button, #new-tab-button, #new-window-button, #cut-button, #copy-button, #paste-button, #fullscreen-button, #zoom-out-button, #zoom-reset-button, #zoom-in-button, #sync-button, #feed-button, #webrtc-status-button, #social-share-button, #open-file-button, #find-button, #developer-button, #preferences-button, #privatebrowsing-button, #save-page-button, #switch-to-metro-button, #add-ons-button, #history-panelmenu, #nav-bar-overflow-button, #PanelUI-menu-button, #characterencoding-button, #email-link-button, #sidebar-button,#e10s-button,#panic-button,#web-apps-button)[cui-areatype="toolbar"] {
 	  list-style-image: url(chrome://browser/skin/menuPanel.png) !important;
@@ -286,4 +286,4 @@
 	  min-width: 32px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mode_to_no_vt.css b/xpi/content/css/mode_to_no_vt.css
index c50ea47..b7e0ce9 100644
--- a/xpi/content/css/mode_to_no_vt.css
+++ b/xpi/content/css/mode_to_no_vt.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	* #vertical-toolbar .toolbarbutton-1 .toolbarbutton-text	{
 	  display: none !important;
@@ -12,4 +12,4 @@
 	  visibility: visible !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/mode_txtonly.css b/xpi/content/css/mode_txtonly.css
index 2ae5215..c441fbc 100644
--- a/xpi/content/css/mode_txtonly.css
+++ b/xpi/content/css/mode_txtonly.css
@@ -2,7 +2,7 @@
 @import url(chrome://ctraddon_os_special/skin/nav_txtonlyextra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#navigator-toolbox #nav-bar .toolbarbutton-1:not(.tabs-newtab-button):not(.tab-close-button) .toolbarbutton-text {
       border: 1px solid transparent;
@@ -113,4 +113,4 @@
 	toolbar .toolbarbutton-badge-stack {
 	  display: none !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/navbar_compact.css b/xpi/content/css/navbar_compact.css
index 6a6a98c..3569bac 100644
--- a/xpi/content/css/navbar_compact.css
+++ b/xpi/content/css/navbar_compact.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#nav-bar-customization-target,
 	#nav-bar-overflow-button {
@@ -29,4 +29,4 @@
 	  padding-top: 0px !important;
 	  padding-bottom: 0px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/no_devtheme.css b/xpi/content/css/no_devtheme.css
index 25accb8..4ad88c8 100644
--- a/xpi/content/css/no_devtheme.css
+++ b/xpi/content/css/no_devtheme.css
@@ -5,10 +5,10 @@
 	}
 
 }
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#customization-lwtheme-menu *[label="Developer Edition"]{
 	  display:none !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/no_resizer_xp.css b/xpi/content/css/no_resizer_xp.css
index 4fe3c3c..4c8e65e 100644
--- a/xpi/content/css/no_resizer_xp.css
+++ b/xpi/content/css/no_resizer_xp.css
@@ -1,4 +1,3 @@
-/*AGENT_SHEET*/
 @namespace html url("http://www.w3.org/1999/xhtml"); /* namespace for HTML elements */
 html resizer {
 	display: none !important;
diff --git a/xpi/content/css/noaddonbarbg.css b/xpi/content/css/noaddonbarbg.css
index 6e453ed..17bb13d 100644
--- a/xpi/content/css/noaddonbarbg.css
+++ b/xpi/content/css/noaddonbarbg.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#browser-bottombox,
 	#browser-bottombox #ctraddon_addon-bar {
@@ -8,4 +8,4 @@
 	  background: transparent !important;
 	}
 	
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/nobookbarbg.css b/xpi/content/css/nobookbarbg.css
index 34bd37f..18d7790 100644
--- a/xpi/content/css/nobookbarbg.css
+++ b/xpi/content/css/nobookbarbg.css
@@ -1,7 +1,7 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	#navigator-toolbox #PersonalToolbar {
 	  background: transparent !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/nocontexticons.css b/xpi/content/css/nocontexticons.css
index 4516fe9..42cf898 100644
--- a/xpi/content/css/nocontexticons.css
+++ b/xpi/content/css/nocontexticons.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/nocontexticonsextra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
   #context-navigation{
 	-moz-appearance:none !important;
@@ -16,4 +16,4 @@
     visibility:visible !important;
   }
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/nonavbarbg.css b/xpi/content/css/nonavbarbg.css
index 1b9b295..c9fc884 100644
--- a/xpi/content/css/nonavbarbg.css
+++ b/xpi/content/css/nonavbarbg.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#navigator-toolbox toolbar:not(#PersonalToolbar):not(#TabsToolbar) {
 	  background: transparent !important;
@@ -11,4 +11,4 @@
 	  background:unset !important;
 	}
 	
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/nonavborder.css b/xpi/content/css/nonavborder.css
index 6d1e195..72ca82a 100644
--- a/xpi/content/css/nonavborder.css
+++ b/xpi/content/css/nonavborder.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#navigator-toolbox toolbar:not(#TabsToolbar):not(#PersonalToolbar) {
 	  border-left: 0px !important;
@@ -22,4 +22,4 @@
 	  }
 	}
 	
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/nonavtbborder.css b/xpi/content/css/nonavtbborder.css
index 31343ae..2002057 100644
--- a/xpi/content/css/nonavtbborder.css
+++ b/xpi/content/css/nonavtbborder.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#main-window #navigator-toolbox #nav-bar,
 	#main-window #navigator-toolbox toolbar {
@@ -20,4 +20,4 @@
 		border-top: unset !important; 
 	  }
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/notabbg.css b/xpi/content/css/notabbg.css
index 0d9a3bc..e9d337f 100644
--- a/xpi/content/css/notabbg.css
+++ b/xpi/content/css/notabbg.css
@@ -1,11 +1,11 @@
 @import url(notabfog.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	#main-window[defaultfxtheme="true"][devtoolstheme] #browser-panel,
 	#main-window[defaultfxtheme="true"] #navigator-toolbox #TabsToolbar:not(:-moz-lwtheme) #tabbrowser-tabs,
 	#main-window[defaultfxtheme="true"] #navigator-toolbox #TabsToolbar:not(:-moz-lwtheme),
 	#main-window[defaultfxtheme="true"][tabsontop="false"] #navigator-toolbox #TabsToolbar:not(:-moz-lwtheme) {
 	  background: none !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/notabfog.css b/xpi/content/css/notabfog.css
index 3f93826..62e5781 100644
--- a/xpi/content/css/notabfog.css
+++ b/xpi/content/css/notabfog.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	#TabsToolbar:not(:-moz-lwtheme)::after,
 	#TabsToolbar:not(:-moz-lwtheme)::before {
 	  box-shadow: none !important;
@@ -9,4 +9,4 @@
 	#tabbrowser-tabs .tabbrowser-arrowscrollbox .arrowscrollbox-overflow-end-indicator {
 	  background-image: none !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/notextshadow.css b/xpi/content/css/notextshadow.css
index deaeb62..5ed5b69 100644
--- a/xpi/content/css/notextshadow.css
+++ b/xpi/content/css/notextshadow.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
   #main-window #toolbar-menubar,
   #main-window #nav-bar,
   #main-window #navigator-toolbox #TabsToolbar .tabbrowser-tab .tab-text,
@@ -8,4 +8,4 @@
   #main-window #ctraddon_addon-bar{
     text-shadow:none!important;
   }
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/padlock2_classic.css b/xpi/content/css/padlock2_classic.css
index c70a53a..18be2ff 100644
--- a/xpi/content/css/padlock2_classic.css
+++ b/xpi/content/css/padlock2_classic.css
@@ -1,5 +1,5 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#urlbar .verifiedDomain #page-proxy-favicon[pageproxystate="valid"],
 	#urlbar .verifiedIdentity #page-proxy-favicon[pageproxystate="valid"] {
@@ -7,4 +7,4 @@
 	  -moz-image-region: rect(0, 16px, 16px, 0) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/padlock2_modern.css b/xpi/content/css/padlock2_modern.css
index fca2aa6..a254eb4 100644
--- a/xpi/content/css/padlock2_modern.css
+++ b/xpi/content/css/padlock2_modern.css
@@ -1,5 +1,5 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	
 	#urlbar .verifiedDomain #page-proxy-favicon[pageproxystate="valid"],
 	#urlbar .verifiedIdentity #page-proxy-favicon[pageproxystate="valid"] {
@@ -7,4 +7,4 @@
 	  -moz-image-region: rect(0, 16px, 16px, 0) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/padlock2_none.css b/xpi/content/css/padlock2_none.css
index e47f3c2..5b9ae62 100644
--- a/xpi/content/css/padlock2_none.css
+++ b/xpi/content/css/padlock2_none.css
@@ -1,5 +1,5 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	
 	#urlbar .verifiedDomain #page-proxy-favicon[pageproxystate="valid"],
 	#urlbar .verifiedIdentity #page-proxy-favicon[pageproxystate="valid"] {
@@ -7,4 +7,4 @@
 	  -moz-image-region: rect(0, 16px, 16px, 0) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/padlock_classic.css b/xpi/content/css/padlock_classic.css
index 421a464..f536e99 100644
--- a/xpi/content/css/padlock_classic.css
+++ b/xpi/content/css/padlock_classic.css
@@ -1,5 +1,5 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#identity-popup.verifiedDomain,
 	#identity-popup.verifiedIdentity {
@@ -23,4 +23,4 @@
 	  background: url("chrome://classic_theme_restorer/content/images/padlock_classic.png") no-repeat center right !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/padlock_default.css b/xpi/content/css/padlock_default.css
index 9026345..8a451e6 100644
--- a/xpi/content/css/padlock_default.css
+++ b/xpi/content/css/padlock_default.css
@@ -1,5 +1,5 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#identity-popup.verifiedDomain,
 	#identity-popup.verifiedIdentity {
@@ -97,4 +97,4 @@
 					0, 16, 16, 0) no-repeat center right !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/padlock_extra.css b/xpi/content/css/padlock_extra.css
index 2240980..03929a2 100644
--- a/xpi/content/css/padlock_extra.css
+++ b/xpi/content/css/padlock_extra.css
@@ -1,5 +1,5 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#identity-popup.chromeUI,
 	#identity-popup.mixedActiveContent,
@@ -215,4 +215,4 @@
 					0, 16, 16, 0) no-repeat center right !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/padlock_modern.css b/xpi/content/css/padlock_modern.css
index 9254adc..592e017 100644
--- a/xpi/content/css/padlock_modern.css
+++ b/xpi/content/css/padlock_modern.css
@@ -1,5 +1,5 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	
 	#identity-popup.verifiedDomain,
 	#identity-popup.verifiedIdentity {
@@ -23,4 +23,4 @@
 	  background: url("chrome://classic_theme_restorer/content/images/padlock_modern.png") no-repeat center right !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/panelmenu_nolabels.css b/xpi/content/css/panelmenu_nolabels.css
index 20a7815..1a1a21c 100644
--- a/xpi/content/css/panelmenu_nolabels.css
+++ b/xpi/content/css/panelmenu_nolabels.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	#PanelUI-contents label {
 	  visibility: collapse !important;
 	}
 	#PanelUI-contents #zoom-reset-button label {
 	  visibility: visible !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/panelmenucolor.css b/xpi/content/css/panelmenucolor.css
index 6d71f86..8229fef 100644
--- a/xpi/content/css/panelmenucolor.css
+++ b/xpi/content/css/panelmenucolor.css
@@ -1,9 +1,9 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	.panel-arrowcontent,
 	.panel-subviews,
 	#BMB_bookmarksPopup menupopup box {
 	  background: linear-gradient(white, -moz-dialog 30px) !important;    
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/panelmenucolor2.css b/xpi/content/css/panelmenucolor2.css
index 1d1a4c3..fbb07f2 100644
--- a/xpi/content/css/panelmenucolor2.css
+++ b/xpi/content/css/panelmenucolor2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	.panel-arrowcontent,
 	.panel-subviews,
 	#BMB_bookmarksPopup menupopup box,
@@ -8,4 +8,4 @@
 	#ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
 	  background: linear-gradient(white, -moz-dialog 30px) !important;    
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/paneluibutton_tweak.css b/xpi/content/css/paneluibutton_tweak.css
index add0394..0807762 100644
--- a/xpi/content/css/paneluibutton_tweak.css
+++ b/xpi/content/css/paneluibutton_tweak.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#TabsToolbar #ctraddon_appbutton,
 	#main-window #titlebar #ctraddon_appbutton2{
@@ -109,9 +109,9 @@
 	  border-radius: 0 4px 0 0 !important;
 	}
 
-}
+/*}
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
+@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
 
 	#ctraddon_pw_appbuttonc_aurora,
 	#ctraddon_pw_appbuttonc_nightly,
@@ -126,4 +126,4 @@
 	  display: none !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/smallnavbut.css b/xpi/content/css/smallnavbut.css
index c85b5e7..079f57e 100644
--- a/xpi/content/css/smallnavbut.css
+++ b/xpi/content/css/smallnavbut.css
@@ -1,15 +1,10 @@
 @import url(chrome://ctraddon_os_special/skin/smallnavbutextra.css);
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
  
-  /*#navigator-toolbox #nav-bar #nav-bar-customization-target > *:not(#urlbar-container):not(#search-container){
-	margin-top:unset !important;
-	margin-bottom:unset !important;
-  }*/
-
   #restman-button{
 	margin-top:1px !important;
 	margin-bottom:1px !important;
   }
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/spaces_extra.css b/xpi/content/css/spaces_extra.css
index c87ac2a..7ee9b79 100644
--- a/xpi/content/css/spaces_extra.css
+++ b/xpi/content/css/spaces_extra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 			   
 	/* spaces, flexible spaces, separators on toolbars in customizing mode */
 	/* on palette */
@@ -69,4 +69,4 @@
       padding-top: 38px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/starinurl.css b/xpi/content/css/starinurl.css
index a5e9399..3722b6a 100644
--- a/xpi/content/css/starinurl.css
+++ b/xpi/content/css/starinurl.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/starinurlextra.css);
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	toolbar #bookmarks-menu-button,
 	#BMB_bookmarksPopup,
@@ -102,4 +102,4 @@
 	#flagfox-button{
 	  -moz-box-ordinal-group:0;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/statusbar.css b/xpi/content/css/statusbar.css
index 191453f..c6b0f2e 100644
--- a/xpi/content/css/statusbar.css
+++ b/xpi/content/css/statusbar.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window:not([customizing]) #status-bar{
 	  -moz-appearance: none !important;
@@ -52,4 +52,4 @@
 	  display: inline !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/svgfilters.css b/xpi/content/css/svgfilters.css
index 12aa8a7..7f5c94b 100644
--- a/xpi/content/css/svgfilters.css
+++ b/xpi/content/css/svgfilters.css
@@ -2,7 +2,7 @@
 	Taken with permission from 'Patrick Dimpseys' "SVG Colors Theme v0.4"
 */
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	/*Blue*/
 	#ctraddon_navigator-throbber,
@@ -189,4 +189,4 @@
 	  filter: none !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tab_sep-inv.css b/xpi/content/css/tab_sep-inv.css
index d70fbda..2863576 100644
--- a/xpi/content/css/tab_sep-inv.css
+++ b/xpi/content/css/tab_sep-inv.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window #navigator-toolbox #TabsToolbar #tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
 	#main-window #navigator-toolbox #TabsToolbar .tabbrowser-tab:not([visuallyselected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
@@ -26,4 +26,4 @@
 	  -moz-margin-end: -1.5px !important;
 	}
   
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tab_sep.css b/xpi/content/css/tab_sep.css
index 0788ded..8b40ffe 100644
--- a/xpi/content/css/tab_sep.css
+++ b/xpi/content/css/tab_sep.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window #navigator-toolbox #TabsToolbar #tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
 	#main-window #navigator-toolbox #TabsToolbar .tabbrowser-tab:not([visuallyselected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
@@ -28,4 +28,4 @@
 	  -moz-margin-end: -1.5px !important;
 	}
   
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tab_sep_luna.css b/xpi/content/css/tab_sep_luna.css
index 716cb8f..fa99e94 100644
--- a/xpi/content/css/tab_sep_luna.css
+++ b/xpi/content/css/tab_sep_luna.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window #navigator-toolbox #TabsToolbar #tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
 	#main-window #navigator-toolbox #TabsToolbar .tabbrowser-tab:not([visuallyselected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
@@ -28,4 +28,4 @@
 	  -moz-margin-end: -1.5px !important;
 	}
   
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tab_sep_solid-inv.css b/xpi/content/css/tab_sep_solid-inv.css
index ff823ff..8a1961c 100644
--- a/xpi/content/css/tab_sep_solid-inv.css
+++ b/xpi/content/css/tab_sep_solid-inv.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window #navigator-toolbox #TabsToolbar #tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
 	#main-window #navigator-toolbox #TabsToolbar .tabbrowser-tab:not([visuallyselected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
@@ -24,4 +24,4 @@
 	  padding-top: unset !important;
 	  padding-bottom: unset !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tab_sep_solid-inv2.css b/xpi/content/css/tab_sep_solid-inv2.css
index 32c5148..dd6a395 100644
--- a/xpi/content/css/tab_sep_solid-inv2.css
+++ b/xpi/content/css/tab_sep_solid-inv2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window #navigator-toolbox #TabsToolbar #tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
 	#main-window #navigator-toolbox #TabsToolbar .tabbrowser-tab:not([visuallyselected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
@@ -24,4 +24,4 @@
 	  padding-bottom: unset !important;
 	}
   
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tab_sep_solid.css b/xpi/content/css/tab_sep_solid.css
index 29f6adb..d8dcd63 100644
--- a/xpi/content/css/tab_sep_solid.css
+++ b/xpi/content/css/tab_sep_solid.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window #navigator-toolbox #TabsToolbar #tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
 	#main-window #navigator-toolbox #TabsToolbar .tabbrowser-tab:not([visuallyselected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
@@ -25,4 +25,4 @@
 	  padding-bottom: unset !important;
 	}
   
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tab_sep_solid2.css b/xpi/content/css/tab_sep_solid2.css
index 334f956..9432a9a 100644
--- a/xpi/content/css/tab_sep_solid2.css
+++ b/xpi/content/css/tab_sep_solid2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window #navigator-toolbox #TabsToolbar #tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
 	#main-window #navigator-toolbox #TabsToolbar .tabbrowser-tab:not([visuallyselected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
@@ -24,4 +24,4 @@
 	  padding-bottom: unset !important;
 	}
   
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tab_sep_xp.css b/xpi/content/css/tab_sep_xp.css
index db07ec1..1b3b3a3 100644
--- a/xpi/content/css/tab_sep_xp.css
+++ b/xpi/content/css/tab_sep_xp.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window #navigator-toolbox #TabsToolbar #tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
 	#main-window #navigator-toolbox #TabsToolbar .tabbrowser-tab:not([visuallyselected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
@@ -28,4 +28,4 @@
 	  -moz-margin-end: -1.5px !important;
 	}
   
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabmokcolor.css b/xpi/content/css/tabmokcolor.css
index 2899cda..ddbec67 100644
--- a/xpi/content/css/tabmokcolor.css
+++ b/xpi/content/css/tabmokcolor.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/tabmokcolorextra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
   
 	#main-window .tabs-newtab-button,
 	#main-window #TabsToolbar > #new-tab-button,
@@ -60,4 +60,4 @@
 	  -moz-image-region: rect(0, 16px, 16px, 0) !important;	
 	}
   
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabmokcolor2.css b/xpi/content/css/tabmokcolor2.css
index d959303..44bdfbc 100644
--- a/xpi/content/css/tabmokcolor2.css
+++ b/xpi/content/css/tabmokcolor2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
   
   #main-window .tabbrowser-tab:not([selected]):not(:-moz-lwtheme) {
 	color: white !important;
@@ -11,4 +11,4 @@
 	  0px 0px 3px black !important;
   }
   
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabmokcolor3.css b/xpi/content/css/tabmokcolor3.css
index f5cc051..6f565cf 100644
--- a/xpi/content/css/tabmokcolor3.css
+++ b/xpi/content/css/tabmokcolor3.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window #navigator-toolbox #TabsToolbar #tabbrowser-tabs[movingtab] > .tabbrowser-tab[beforeselected]:not([last-visible-tab])::after,
 	#main-window #navigator-toolbox #TabsToolbar .tabbrowser-tab:not([visuallyselected]):not([afterselected-visible]):not([afterhovered]):not([first-visible-tab]):not(:hover)::before,
@@ -13,4 +13,4 @@
       opacity:1.0 !important;
 	}
   
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabmokcolor4.css b/xpi/content/css/tabmokcolor4.css
index 1590b07..f03d44f 100644
--- a/xpi/content/css/tabmokcolor4.css
+++ b/xpi/content/css/tabmokcolor4.css
@@ -1,9 +1,9 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
   
 	.tabbrowser-tab:not([selected]) .tab-icon-image:not([src]) {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/default_dot_favicon_white.png") !important;
 	}
   
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabs_curved-r-osx.css b/xpi/content/css/tabs_curved-r-osx.css
index 1abecf9..6c9d22f 100644
--- a/xpi/content/css/tabs_curved-r-osx.css
+++ b/xpi/content/css/tabs_curved-r-osx.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	.tabs-newtab-button:not(:-moz-lwtheme) {
 	  background-position: left bottom, 30px bottom, right bottom;
@@ -161,18 +161,18 @@
 	  clip-path: none !important;
 	}
 
-}
+/*}
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	.tabcolorbox,
-	.tabhovcolorbox,
-	.tabpencolorbox,
-	.tabunrcolorbox,
-	#ctraddon_ccap_t_curved{
+@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane .tabcolorbox,
+	#ClassicTRoptionsPane .tabhovcolorbox,
+	#ClassicTRoptionsPane .tabpencolorbox,
+	#ClassicTRoptionsPane .tabunrcolorbox,
+	#ClassicTRoptionsPane #ctraddon_ccap_t_curved{
 	  visibility: visible !important;
 	}
 	
-	#ctraddon_ccap_t_default{
+	#ClassicTRoptionsPane #ctraddon_ccap_t_default{
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabs_curved.css b/xpi/content/css/tabs_curved.css
index 5790690..a6aa3f3 100644
--- a/xpi/content/css/tabs_curved.css
+++ b/xpi/content/css/tabs_curved.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/curvedtabsextra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	.tabs-newtab-button:not(:-moz-lwtheme) {
 	  background-position: left bottom, 30px bottom, right bottom;
@@ -111,18 +111,18 @@
 	  clip-path: none !important;
 	}
 	
-}
+/*}
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	.tabcolorbox,
-	.tabhovcolorbox,
-	.tabpencolorbox,
-	.tabunrcolorbox,
-	#ctraddon_ccap_t_curved{
+@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane .tabcolorbox,
+	#ClassicTRoptionsPane .tabhovcolorbox,
+	#ClassicTRoptionsPane .tabpencolorbox,
+	#ClassicTRoptionsPane .tabunrcolorbox,
+	#ClassicTRoptionsPane #ctraddon_ccap_t_curved{
 	  visibility: visible !important;
 	}
 	
-	#ctraddon_ccap_t_default{
+	#ClassicTRoptionsPane #ctraddon_ccap_t_default{
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabs_curvedall.css b/xpi/content/css/tabs_curvedall.css
index 2c2295b..beafc4d 100644
--- a/xpi/content/css/tabs_curvedall.css
+++ b/xpi/content/css/tabs_curvedall.css
@@ -1,7 +1,6 @@
-/*AGENT_SHEET*/
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#titlebar-placeholder-on-TabsToolbar-for-captions-buttons{
 	  -moz-margin-start: 0px !important;
@@ -238,20 +237,20 @@
 	  -moz-margin-start:-12px !important;
 	  -moz-margin-end:-14px !important;
 	}
-}
+/*}
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	.tabcolorbox,
-	.tabhovcolorbox,
-	.tabactcolorbox,
-	#ntabcolorbox,
-	#ntabhovcolorbox,
-	#ctraddon_customsqtab_cb,
-	#ctraddon_ccap_t_default{
+@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane .tabcolorbox,
+	#ClassicTRoptionsPane .tabhovcolorbox,
+	#ClassicTRoptionsPane .tabactcolorbox,
+	#ClassicTRoptionsPane #ntabcolorbox,
+	#ClassicTRoptionsPane #ntabhovcolorbox,
+	#ClassicTRoptionsPane #ctraddon_customsqtab_cb,
+	#ClassicTRoptionsPane #ctraddon_ccap_t_default{
 	  visibility: collapse !important;
 	}
 	
-	#ctraddon_ccap_t_curvedaero{
+	#ClassicTRoptionsPane #ctraddon_ccap_t_curvedaero{
 	  visibility: visible !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabs_devedextra.css b/xpi/content/css/tabs_devedextra.css
index e5bb01e..dd0d356 100644
--- a/xpi/content/css/tabs_devedextra.css
+++ b/xpi/content/css/tabs_devedextra.css
@@ -1,26 +1,26 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	#main-window[developertheme="true"] #navigator-toolbox #TabsToolbar .tabs-newtab-button,
 	#main-window[developertheme="true"] #navigator-toolbox #TabsToolbar .tabs-newtab-button:hover {
 	  background-size: 100% !important;
 	}
-}
+/*}
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	.tabactcolorbox,
-	.tabcolorbox,
-	.tabhovcolorbox,
-	.tabpencolorbox,
-	.tabunrcolorbox,
-	.ntabcolorbox,
-	.ntabhovcolorbox,
-	#ntabcolorbox,
-	#ntabhovcolorbox,
+@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane .tabactcolorbox,
+	#ClassicTRoptionsPane .tabcolorbox,
+	#ClassicTRoptionsPane .tabhovcolorbox,
+	#ClassicTRoptionsPane .tabpencolorbox,
+	#ClassicTRoptionsPane .tabunrcolorbox,
+	#ClassicTRoptionsPane .ntabcolorbox,
+	#ClassicTRoptionsPane .ntabhovcolorbox,
+	#ClassicTRoptionsPane #ntabcolorbox,
+	#ClassicTRoptionsPane #ntabhovcolorbox,
 	#ClassicTRoptionsPane[defaultfxtheme="true"] #ctraddon_pw_colors_ntab_t,
-	#ctraddon_pw_tabs_devtabs{
+	#ClassicTRoptionsPane #ctraddon_pw_tabs_devtabs{
 	  visibility: visible !important;
 	}
-	#ctraddon_ccap_t_default{
+	#ClassicTRoptionsPane #ctraddon_ccap_t_default{
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabs_squared-osx.css b/xpi/content/css/tabs_squared-osx.css
index 533fdba..3ed9572 100644
--- a/xpi/content/css/tabs_squared-osx.css
+++ b/xpi/content/css/tabs_squared-osx.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	.tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
 	  -moz-padding-end: 22px !important;
@@ -377,23 +377,23 @@
 	  -moz-margin-start:2px !important;
 	  -moz-margin-end:1px !important;
 	}
-}
+/*}
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	.tabcolorbox,
-	.tabhovcolorbox,
-	.tabpencolorbox,
-	.tabunrcolorbox,
-	.ntabcolorbox,
-	.ntabhovcolorbox,
-	#ntabcolorbox,
-	#ntabhovcolorbox,
-	#ctraddon_ccap_t_squared,
+@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane .tabcolorbox,
+	#ClassicTRoptionsPane .tabhovcolorbox,
+	#ClassicTRoptionsPane .tabpencolorbox,
+	#ClassicTRoptionsPane .tabunrcolorbox,
+	#ClassicTRoptionsPane .ntabcolorbox,
+	#ClassicTRoptionsPane .ntabhovcolorbox,
+	#ClassicTRoptionsPane #ntabcolorbox,
+	#ClassicTRoptionsPane #ntabhovcolorbox,
+	#ClassicTRoptionsPane #ctraddon_ccap_t_squared,
 	#ClassicTRoptionsPane[defaultfxtheme="true"] #ctraddon_pw_colors_ntab_t{
 	  visibility: visible !important;
 	}
 	
-	#ctraddon_ccap_t_default{
+	#ClassicTRoptionsPane #ctraddon_ccap_t_default{
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabs_squared-osx2.css b/xpi/content/css/tabs_squared-osx2.css
index cf42a51..e565936 100644
--- a/xpi/content/css/tabs_squared-osx2.css
+++ b/xpi/content/css/tabs_squared-osx2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	.tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
 	  -moz-padding-end: 22px !important;
@@ -396,14 +396,14 @@
 	  -moz-margin-start:2px !important;
 	  -moz-margin-end:1px !important;
 	}
-}
+/*}
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	#ctraddon_ccap_t_squared2{
+@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane #ctraddon_ccap_t_squared2{
 	  visibility: visible !important;
 	}
 	
-	#ctraddon_ccap_t_default{
+	#ClassicTRoptionsPane #ctraddon_ccap_t_default{
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabs_squared-r-osx.css b/xpi/content/css/tabs_squared-r-osx.css
index f2301b6..8d386b6 100644
--- a/xpi/content/css/tabs_squared-r-osx.css
+++ b/xpi/content/css/tabs_squared-r-osx.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	
 	.tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
 	  -moz-padding-end: 22px !important;
@@ -386,23 +386,23 @@
 	  -moz-margin-start:2px !important;
 	  -moz-margin-end:1px !important;
 	}
-}
+/*}
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	.tabcolorbox,
-	.tabhovcolorbox,
-	.tabpencolorbox,
-	.tabunrcolorbox,
-	.ntabcolorbox,
-	.ntabhovcolorbox,
-	#ntabcolorbox,
-	#ntabhovcolorbox,
-	#ctraddon_ccap_t_squared,
+@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane .tabcolorbox,
+	#ClassicTRoptionsPane .tabhovcolorbox,
+	#ClassicTRoptionsPane .tabpencolorbox,
+	#ClassicTRoptionsPane .tabunrcolorbox,
+	#ClassicTRoptionsPane .ntabcolorbox,
+	#ClassicTRoptionsPane .ntabhovcolorbox,
+	#ClassicTRoptionsPane #ntabcolorbox,
+	#ClassicTRoptionsPane #ntabhovcolorbox,
+	#ClassicTRoptionsPane #ctraddon_ccap_t_squared,
 	#ClassicTRoptionsPane[defaultfxtheme="true"] #ctraddon_pw_colors_ntab_t{
 	  visibility: visible !important;
 	}
 	
-	#ctraddon_ccap_t_default{
+	#ClassicTRoptionsPane #ctraddon_ccap_t_default{
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabs_squared-r-osx2.css b/xpi/content/css/tabs_squared-r-osx2.css
index 737cd14..27a635a 100644
--- a/xpi/content/css/tabs_squared-r-osx2.css
+++ b/xpi/content/css/tabs_squared-r-osx2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	
 	.tabbrowser-arrowscrollbox > .arrowscrollbox-scrollbox {
 	  -moz-padding-end: 22px !important;
@@ -404,14 +404,14 @@
 	  -moz-margin-start:2px !important;
 	  -moz-margin-end:1px !important;
 	}
-}
+/*}
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	#ctraddon_ccap_t_squared2{
+@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane #ctraddon_ccap_t_squared2{
 	  visibility: visible !important;
 	}
 	
-	#ctraddon_ccap_t_default{
+	#ClassicTRoptionsPane #ctraddon_ccap_t_default{
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabs_squared.css b/xpi/content/css/tabs_squared.css
index 9746bd5..9a43e77 100644
--- a/xpi/content/css/tabs_squared.css
+++ b/xpi/content/css/tabs_squared.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/classictabsextra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	
 	#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"]:not([customizing="true"]) ~ #TabsToolbar #ctraddon_appbutton{
 	  margin-left:-2px !important;
@@ -387,23 +387,23 @@
 	  -moz-margin-start:2px !important;
 	  -moz-margin-end:1px !important;
 	}
-}
+/*}
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	.tabcolorbox,
-	.tabhovcolorbox,
-	.tabpencolorbox,
-	.tabunrcolorbox,
-	.ntabcolorbox,
-	.ntabhovcolorbox,
-	#ntabcolorbox,
-	#ntabhovcolorbox,
-	#ctraddon_ccap_t_squared,
+@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane .tabcolorbox,
+	#ClassicTRoptionsPane .tabhovcolorbox,
+	#ClassicTRoptionsPane .tabpencolorbox,
+	#ClassicTRoptionsPane .tabunrcolorbox,
+	#ClassicTRoptionsPane .ntabcolorbox,
+	#ClassicTRoptionsPane .ntabhovcolorbox,
+	#ClassicTRoptionsPane #ntabcolorbox,
+	#ClassicTRoptionsPane #ntabhovcolorbox,
+	#ClassicTRoptionsPane #ctraddon_ccap_t_squared,
 	#ClassicTRoptionsPane[defaultfxtheme="true"] #ctraddon_pw_colors_ntab_t{
 	  visibility: visible !important;
 	}
 	
-	#ctraddon_ccap_t_default{
+	#ClassicTRoptionsPane #ctraddon_ccap_t_default{
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabs_squared2.css b/xpi/content/css/tabs_squared2.css
index 4e4dad1..f8fd3e0 100644
--- a/xpi/content/css/tabs_squared2.css
+++ b/xpi/content/css/tabs_squared2.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/classictabsextra2.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	
 	#main-window[tabsintitlebar][sizemode="normal"] #toolbar-menubar[autohide="true"][inactive="true"]:not([customizing="true"]) ~ #TabsToolbar #ctraddon_appbutton{
 	  margin-left:-2px !important;
@@ -400,14 +400,14 @@
 	  -moz-margin-start:2px !important;
 	  -moz-margin-end:1px !important;
 	}
-}
+/*}
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	#ctraddon_ccap_t_squared2{
+@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane #ctraddon_ccap_t_squared2{
 	  visibility: visible !important;
 	}
 	
-	#ctraddon_ccap_t_default{
+	#ClassicTRoptionsPane #ctraddon_ccap_t_default{
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabs_squared2c2.css b/xpi/content/css/tabs_squared2c2.css
index be1f2d7..45d0f53 100644
--- a/xpi/content/css/tabs_squared2c2.css
+++ b/xpi/content/css/tabs_squared2c2.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/classictabsextra2c2.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* main tab tweaks */
 	.tab-background,
@@ -273,14 +273,14 @@
 	  -moz-margin-start:2px !important;
 	  -moz-margin-end:1px !important;
 	}
-}
+/*}
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	#ctraddon_ccap_t_squared2{
+@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane #ctraddon_ccap_t_squared2{
 	  visibility: visible !important;
 	}
 	
-	#ctraddon_ccap_t_default{
+	#ClassicTRoptionsPane #ctraddon_ccap_t_default{
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabs_squaredc2.css b/xpi/content/css/tabs_squaredc2.css
index 9482947..715e5eb 100644
--- a/xpi/content/css/tabs_squaredc2.css
+++ b/xpi/content/css/tabs_squaredc2.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/classictabsextrac2.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* main tab tweaks */
 	.tab-background,
@@ -267,23 +267,23 @@
 	  -moz-margin-start:2px !important;
 	  -moz-margin-end:1px !important;
 	}
-}
+/*}
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	.tabcolorbox,
-	.tabhovcolorbox,
-	.tabpencolorbox,
-	.tabunrcolorbox,
-	.ntabcolorbox,
-	.ntabhovcolorbox,
-	#ntabcolorbox,
-	#ntabhovcolorbox,
-	#ctraddon_ccap_t_squaredc2,
+@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane .tabcolorbox,
+	#ClassicTRoptionsPane .tabhovcolorbox,
+	#ClassicTRoptionsPane .tabpencolorbox,
+	#ClassicTRoptionsPane .tabunrcolorbox,
+	#ClassicTRoptionsPane .ntabcolorbox,
+	#ClassicTRoptionsPane .ntabhovcolorbox,
+	#ClassicTRoptionsPane #ntabcolorbox,
+	#ClassicTRoptionsPane #ntabhovcolorbox,
+	#ClassicTRoptionsPane #ctraddon_ccap_t_squaredc2,
 	#ClassicTRoptionsPane[defaultfxtheme="true"] #ctraddon_pw_colors_ntab_t{
 	  visibility: visible !important;
 	}
 	
-	#ctraddon_ccap_t_default{
+	#ClassicTRoptionsPane #ctraddon_ccap_t_default{
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabsontop_off.css b/xpi/content/css/tabsontop_off.css
index 259b82f..b0db0c7 100644
--- a/xpi/content/css/tabsontop_off.css
+++ b/xpi/content/css/tabsontop_off.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/tabsontop_offextra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* toolbars above navigator-toolbox (only one at a time can be visible anyway) */
 	#print-preview-toolbar,
@@ -101,4 +101,4 @@
 	  }
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabsontop_off2.css b/xpi/content/css/tabsontop_off2.css
index b395733..875afb5 100644
--- a/xpi/content/css/tabsontop_off2.css
+++ b/xpi/content/css/tabsontop_off2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* toolbars above navigator-toolbox (only one at a time can visible anyway) */
 	#print-preview-toolbar,
@@ -73,4 +73,4 @@
 	  border: none !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tabssquare_edges.css b/xpi/content/css/tabssquare_edges.css
index 6773880..4a1bb13 100644
--- a/xpi/content/css/tabssquare_edges.css
+++ b/xpi/content/css/tabssquare_edges.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
   
 	#TabsToolbar .tabs-newtab-button,
 	#TabsToolbar .tabbrowser-tab .tab-background-middle,
@@ -10,4 +10,4 @@
 	  border-top-right-radius: 0px !important;
 	}
   
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tbconmenu.css b/xpi/content/css/tbconmenu.css
index 781d49b..20b7902 100644
--- a/xpi/content/css/tbconmenu.css
+++ b/xpi/content/css/tbconmenu.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
   
 	#toolbar-context-menu .customize-context-moveToPanel,
 	#toolbar-context-menu .customize-context-removeFromToolbar,
@@ -12,4 +12,4 @@
 	  display: none !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/tbsep_winc.css b/xpi/content/css/tbsep_winc.css
index 754dfc0..2e9a7af 100644
--- a/xpi/content/css/tbsep_winc.css
+++ b/xpi/content/css/tbsep_winc.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
   
   @media all and (-moz-windows-classic) {
 	#main-window[defaultfxtheme="true"] #navigator-toolbox toolbar:not(#toolbar-menubar):not(#nav-bar):not(#addon-bar) {
@@ -9,4 +9,4 @@
 	}
   }
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/thirdpartythemes.css b/xpi/content/css/thirdpartythemes.css
index f0c40af..96a1e28 100644
--- a/xpi/content/css/thirdpartythemes.css
+++ b/xpi/content/css/thirdpartythemes.css
@@ -1,5 +1,5 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	/* FXChrome support */
 	#main-window[currenttheme="FXChrome"] .ctraddon-toolbarbutton .toolbarbutton-icon{
@@ -80,4 +80,4 @@
 		}
 	  }
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/throbberalt.css b/xpi/content/css/throbberalt.css
index 253d4f8..b2b174b 100644
--- a/xpi/content/css/throbberalt.css
+++ b/xpi/content/css/throbberalt.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	.tab-throbber {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/throbber-connecting-alt.png") !important;
@@ -10,4 +10,4 @@
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/throbber-loading-alt.png") !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/throbberalt2.css b/xpi/content/css/throbberalt2.css
index af502e0..c29df89 100644
--- a/xpi/content/css/throbberalt2.css
+++ b/xpi/content/css/throbberalt2.css
@@ -1,9 +1,9 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	.tab-throbber[progress] {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/throbber-loading-fx39.png") !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/transp_top_tb_w10.css b/xpi/content/css/transp_top_tb_w10.css
index 4c7835f..e4717a6 100644
--- a/xpi/content/css/transp_top_tb_w10.css
+++ b/xpi/content/css/transp_top_tb_w10.css
@@ -1,5 +1,5 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
   /* allows titlebar colors for Fx titlebar/tabs toolbar */
   @media (-moz-os-version: windows-win10) {
     #main-window[fx40plus="true"]:not([customizing]){
@@ -36,5 +36,5 @@
       }
 	}
   }
-}
+/*}*/
 
diff --git a/xpi/content/css/urlbar_dropm.css b/xpi/content/css/urlbar_dropm.css
index 0495c05..806439d 100644
--- a/xpi/content/css/urlbar_dropm.css
+++ b/xpi/content/css/urlbar_dropm.css
@@ -1,8 +1,8 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	
 	.urlbar-history-dropmarker{
 	  -moz-box-ordinal-group:100 !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/verifiedcolors.css b/xpi/content/css/verifiedcolors.css
index d74f563..2e739bd 100644
--- a/xpi/content/css/verifiedcolors.css
+++ b/xpi/content/css/verifiedcolors.css
@@ -1,5 +1,5 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	/* Restore classic colors for verified identity and verified domain */
 	
@@ -46,4 +46,4 @@
 	  -moz-border-end: 1px solid;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/appbuthigherpositionextra.css b/xpi/content/css/win8/appbuthigherpositionextra.css
index d164cbe..00698e5 100644
--- a/xpi/content/css/win8/appbuthigherpositionextra.css
+++ b/xpi/content/css/win8/appbuthigherpositionextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window[tabsintitlebar][sizemode="normal"]:not([tabsontop="false"]) #toolbar-menubar[autohide="true"][inactive="true"]:not([customizing="true"]) ~ #TabsToolbar #ctraddon_appbutton{
 	  margin-top:-16px !important;
@@ -21,4 +21,4 @@
 	  border-radius: 0 0 0 0 !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/appbutton_on_navbarextra.css b/xpi/content/css/win8/appbutton_on_navbarextra.css
index 54951c1..3716769 100644
--- a/xpi/content/css/win8/appbutton_on_navbarextra.css
+++ b/xpi/content/css/win8/appbutton_on_navbarextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	/* style appmenu */
 	#main-window[defaultfxtheme="true"] #appmenu-popup {
@@ -8,4 +8,4 @@
 	  -moz-margin-start:2px;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/back-forwardextra.css b/xpi/content/css/win8/back-forwardextra.css
index c701400..e6552ac 100644
--- a/xpi/content/css/win8/back-forwardextra.css
+++ b/xpi/content/css/win8/back-forwardextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window:not([defaultfxtheme="true"]) #notification-popup-box[hidden] + *,
 	#main-window:not([defaultfxtheme="true"]) #notification-popup-box + .notification-anchor-icon {
@@ -112,4 +112,4 @@
 	  margin-left: 8px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/bf_urlbarfixextra.css b/xpi/content/css/win8/bf_urlbarfixextra.css
index 3b8a846..8cdeab2 100644
--- a/xpi/content/css/win8/bf_urlbarfixextra.css
+++ b/xpi/content/css/win8/bf_urlbarfixextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
   @media (-moz-os-version: windows-win8) {
 	#urlbar:-moz-locale-dir(ltr) {
@@ -13,4 +13,4 @@
 	  border-bottom-right-radius: 2px !important;
 	}
   }
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/bmbut_pmenu_extra.css b/xpi/content/css/win8/bmbut_pmenu_extra.css
index 2215c32..9fb5c3c 100644
--- a/xpi/content/css/win8/bmbut_pmenu_extra.css
+++ b/xpi/content/css/win8/bmbut_pmenu_extra.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	
 	#ctraddon_BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
 	#ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
 	  background: var(--panel-arrowcontent-background) !important;
 	  border: var(--panel-arrowcontent-border) !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/classictabsextra.css b/xpi/content/css/win8/classictabsextra.css
index 8e4fb60..7a0531e 100644
--- a/xpi/content/css/win8/classictabsextra.css
+++ b/xpi/content/css/win8/classictabsextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* Tabs toolbar tab close button (Fx31+) */
 	#ctraddon_tabs-closebutton{
@@ -152,4 +152,4 @@
 	  background-size: calc(100% - 1px) calc(100% - 3px) !important;
 	}
 	
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/classictabsextra2.css b/xpi/content/css/win8/classictabsextra2.css
index 915f729..a8ef2e6 100644
--- a/xpi/content/css/win8/classictabsextra2.css
+++ b/xpi/content/css/win8/classictabsextra2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* Tabs toolbar tab close button (Fx31+) */
 	#ctraddon_tabs-closebutton{
@@ -136,4 +136,4 @@
 	  }
 	}
 	
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/classictabsextra2c2.css b/xpi/content/css/win8/classictabsextra2c2.css
index e87c03f..edcd2e6 100644
--- a/xpi/content/css/win8/classictabsextra2c2.css
+++ b/xpi/content/css/win8/classictabsextra2c2.css
@@ -1,26 +1,12 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* tab colors */
-	/*.tabs-newtab-button:not(:-moz-lwtheme),
-	.tabbrowser-tab:not(:-moz-lwtheme) .tab-content {
-	  background-image: linear-gradient(transparent, hsla(0,0%,45%,.1) 1px, hsla(0,0%,32%,.2) 80%, hsla(0,0%,0%,.2)),
-						linear-gradient(-moz-dialog, -moz-dialog) !important;
-	}
-	.tabs-newtab-button:hover:not(:-moz-lwtheme),
-	.tabbrowser-tab:not([selected]):hover:not(:-moz-lwtheme) .tab-content {
-	  background-image: linear-gradient(hsla(0,0%,100%,.3) 1px, hsla(0,0%,75%,.2) 80%, hsla(0,0%,60%,.2)),
-						linear-gradient(-moz-dialog, -moz-dialog) !important;
-	}*/
 	.tabbrowser-tab[selected]:not(:-moz-lwtheme) .tab-content {
 	  background-image: linear-gradient(rgba(255,255,255,.7), rgba(255,255,255,.4) 50%),
 						linear-gradient(-moz-dialog, -moz-dialog) !important;
 	}
-	/*.tabbrowser-tab:not(:-moz-lwtheme):not([selected=true]):not(:hover),
-	.tabbrowser-tab:not(:-moz-lwtheme):not([selected=true]):hover {
-	  color:black !important;
-	}*/
 	
 	/* tab colors lightweight theme */
 	.tabbrowser-tab[selected]:-moz-lwtheme .tab-content {
@@ -146,4 +132,4 @@
 	}
 	/**/
 
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/classictabsextrac2.css b/xpi/content/css/win8/classictabsextrac2.css
index 292245d..f9e2447 100644
--- a/xpi/content/css/win8/classictabsextrac2.css
+++ b/xpi/content/css/win8/classictabsextrac2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* tab colors */
 	.tabs-newtab-button:not(:-moz-lwtheme),
@@ -146,4 +146,4 @@
 	}
 	/**/
 
-}
+/*}*/
diff --git a/xpi/content/css/win8/curvedtabsextra.css b/xpi/content/css/win8/curvedtabsextra.css
index db844ea..b55ef05 100644
--- a/xpi/content/css/win8/curvedtabsextra.css
+++ b/xpi/content/css/win8/curvedtabsextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#titlebar-placeholder-on-TabsToolbar-for-captions-buttons{
 	  -moz-margin-start: 0px !important;
@@ -45,4 +45,4 @@
 	  width: 16px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/feedinurlextra.css b/xpi/content/css/win8/feedinurlextra.css
index b435d89..0852201 100644
--- a/xpi/content/css/win8/feedinurlextra.css
+++ b/xpi/content/css/win8/feedinurlextra.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#urlbar-icons #feed-button .toolbarbutton-icon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/feedinurlbar.png") !important;
 	  -moz-image-region: rect(0px 18px 18px 0px) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/highertabsposextra.css b/xpi/content/css/win8/highertabsposextra.css
index a0df733..01c4f5e 100644
--- a/xpi/content/css/win8/highertabsposextra.css
+++ b/xpi/content/css/win8/highertabsposextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window:not([tabsontop="false"]) #TabsToolbar:not([tabsontop="false"]):not(:-moz-lwtheme) {
 	  margin-top:0px !important;
@@ -14,4 +14,4 @@
 	#main-window[sizemode="maximized"]:not([tabsontop="false"]) #titlebar-placeholder-on-TabsToolbar-for-captions-buttons{
 	  -moz-margin-start: 2px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/invicons_tabsbarextra.css b/xpi/content/css/win8/invicons_tabsbarextra.css
index e071d01..82ed20f 100644
--- a/xpi/content/css/win8/invicons_tabsbarextra.css
+++ b/xpi/content/css/win8/invicons_tabsbarextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	@media not all and (min-resolution: 2dppx) {
 
@@ -18,4 +18,4 @@
 		}
 
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/menubarextra.css b/xpi/content/css/win8/menubarextra.css
index c6d30b5..f498bbd 100644
--- a/xpi/content/css/win8/menubarextra.css
+++ b/xpi/content/css/win8/menubarextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window:not([tabsintitlebar])[tabsontop='false'] #toolbar-menubar:not([inactive="true"]),
     #main-window:not([tabsintitlebar])[tabsontop='false'] #toolbar-menubar[autohide="false"] {
@@ -55,4 +55,4 @@
 
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/mode_icons_and_text_extra.css b/xpi/content/css/win8/mode_icons_and_text_extra.css
index d7f3026..58edb94 100644
--- a/xpi/content/css/win8/mode_icons_and_text_extra.css
+++ b/xpi/content/css/win8/mode_icons_and_text_extra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#nav-bar toolbaritem .toolbarbutton-1 .toolbarbutton-text,
 	#nav-bar .toolbarbutton-1:not([type="menu-button"]) .toolbarbutton-text,
@@ -25,4 +25,4 @@
 	  padding:0px 3px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/mode_icons_big_extra.css b/xpi/content/css/win8/mode_icons_big_extra.css
index 9bfd8e5..feda88e 100644
--- a/xpi/content/css/win8/mode_icons_big_extra.css
+++ b/xpi/content/css/win8/mode_icons_big_extra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#nav-bar :-moz-any(#back-button, #forward-button)[cui-areatype="toolbar"] {
 	  list-style-image: url(chrome://browser/skin/menuPanel.png) !important;
@@ -193,4 +193,4 @@
 		}
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/nav_txtonlyextra.css b/xpi/content/css/win8/nav_txtonlyextra.css
index 01ff53a..b30fc30 100644
--- a/xpi/content/css/win8/nav_txtonlyextra.css
+++ b/xpi/content/css/win8/nav_txtonlyextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	
 	#navigator-toolbox #nav-bar .toolbarbutton-1:not(.tabs-newtab-button):not(.tab-close-button):not([disabled]):hover .toolbarbutton-text {
 	  border: 1px solid;
@@ -26,4 +26,4 @@
 	  padding-bottom: 3px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/nocontexticonsextra.css b/xpi/content/css/win8/nocontexticonsextra.css
index ba729dc..216f586 100644
--- a/xpi/content/css/win8/nocontexticonsextra.css
+++ b/xpi/content/css/win8/nocontexticonsextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#context-back image,
 	#context-forward image,
@@ -64,4 +64,4 @@
 	  margin-bottom:-4px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/overlayextra.css b/xpi/content/css/win8/overlayextra.css
index 4814153..e5cd68c 100644
--- a/xpi/content/css/win8/overlayextra.css
+++ b/xpi/content/css/win8/overlayextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	
 	#ctraddon_bookmarks-menu-toolbar-button,
 	#ctraddon_bookmarks-button {
@@ -391,7 +391,7 @@
 	  }
 	}
 
-}
+/*}*/
 
 .ctraddon_nonwindows,
 .ctraddon_linuxonly,
@@ -399,25 +399,25 @@
   visibility: collapse !important;
 }
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	#ctraddon_appbutton_list1{
+/*@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane #ctraddon_appbutton_list1{
 	  visibility: visible !important;
 	}
-	#tabs_curvedall,
-	#ctraddon_appbutton_list2{
+	#ClassicTRoptionsPane #tabs_curvedall,
+	#ClassicTRoptionsPane #ctraddon_appbutton_list2{
 	  visibility: collapse !important;
 	  display:none !important;
 	}
-	#ctraddon_pw_okbutton{
+	#ClassicTRoptionsPane #ctraddon_pw_okbutton{
 	  display: inline !important;
 	}
-	#ctraddon_pw_starinurl label{
+	#ClassicTRoptionsPane #ctraddon_pw_starinurl label{
 	  background: -moz-image-rect(url('chrome://classic_theme_restorer/content/images/starbutton1.png'),
 				  0, 72, 18, 36) no-repeat left !important;
 	  -moz-padding-start:20px !important;
 	  min-height:16px !important;
 	}
-	#ctraddon_pw_feedinurl label{
+	#ClassicTRoptionsPane #ctraddon_pw_feedinurl label{
 	  background:url('chrome://classic_theme_restorer/content/images/feedinurlbar.png') no-repeat left !important;
 	  -moz-padding-start:20px !important;
 	  min-height:16px !important;
@@ -427,4 +427,4 @@
 	  display: none !important;
 	  visibility: collapse !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/smallnavbutextra.css b/xpi/content/css/win8/smallnavbutextra.css
index 4ed3f60..d9c7f54 100644
--- a/xpi/content/css/win8/smallnavbutextra.css
+++ b/xpi/content/css/win8/smallnavbutextra.css
@@ -1,5 +1,5 @@
 /*@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);*/
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#nav-bar #notification-popup-box + *{
 	  -moz-padding-start: 9px !important;
@@ -498,4 +498,4 @@
 	  padding: 0 !important;
 	  -moz-margin-start: 1px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/starinurlextra.css b/xpi/content/css/win8/starinurlextra.css
index 214b34e..1693b78 100644
--- a/xpi/content/css/win8/starinurlextra.css
+++ b/xpi/content/css/win8/starinurlextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#urlbar-icons #bookmarks-menu-button .toolbarbutton-icon {
 	  -moz-image-region: rect(0px 18px 18px 0px);
@@ -48,4 +48,4 @@
 	#main-window[defaultfxtheme="true"] #editBookmarkPanelStarIcon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/starred48.png") !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/tabmokcolorextra.css b/xpi/content/css/win8/tabmokcolorextra.css
index 04a946f..3c4822f 100644
--- a/xpi/content/css/win8/tabmokcolorextra.css
+++ b/xpi/content/css/win8/tabmokcolorextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window .tabbrowser-arrowscrollbox > .scrollbutton-up,
 	#main-window .tabbrowser-arrowscrollbox > .scrollbutton-down {
@@ -11,4 +11,4 @@
 	  width: 16px!important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/win8/tabsontop_offextra.css b/xpi/content/css/win8/tabsontop_offextra.css
index cbf2d29..3bee314 100644
--- a/xpi/content/css/win8/tabsontop_offextra.css
+++ b/xpi/content/css/win8/tabsontop_offextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#main-window[defaultfxtheme="true"][tabsontop="false"][sizemode="normal"] #TabsToolbar:not(:-moz-lwtheme) {
 	  border-left: 1px solid hsla(209,67%,12%,0.35) !important;
@@ -69,4 +69,4 @@
 	  margin-top: 8px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/appbuthigherpositionextra.css b/xpi/content/css/winaero/appbuthigherpositionextra.css
index c0b8334..9155d66 100644
--- a/xpi/content/css/winaero/appbuthigherpositionextra.css
+++ b/xpi/content/css/winaero/appbuthigherpositionextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window[tabsintitlebar][sizemode="normal"]:not([tabsontop="false"]) #toolbar-menubar[autohide="true"][inactive="true"]:not([customizing="true"]) ~ #TabsToolbar #ctraddon_appbutton{
 	  margin-top:-16px !important;
@@ -28,4 +28,4 @@
 	  border-radius: 0 0 0 0 !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/appbutton_on_navbarextra.css b/xpi/content/css/winaero/appbutton_on_navbarextra.css
index 54951c1..3716769 100644
--- a/xpi/content/css/winaero/appbutton_on_navbarextra.css
+++ b/xpi/content/css/winaero/appbutton_on_navbarextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	/* style appmenu */
 	#main-window[defaultfxtheme="true"] #appmenu-popup {
@@ -8,4 +8,4 @@
 	  -moz-margin-start:2px;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/back-forwardextra.css b/xpi/content/css/winaero/back-forwardextra.css
index 784311c..ded9dd4 100644
--- a/xpi/content/css/winaero/back-forwardextra.css
+++ b/xpi/content/css/winaero/back-forwardextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window:not([defaultfxtheme="true"]) #notification-popup-box[hidden] + *,
 	#main-window:not([defaultfxtheme="true"]) #notification-popup-box + .notification-anchor-icon {
@@ -85,4 +85,4 @@
 	  margin-left: 8px !important;
 	}
 	
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/bf_urlbarfixextra.css b/xpi/content/css/winaero/bf_urlbarfixextra.css
index 45cb09b..10b3fc9 100644
--- a/xpi/content/css/winaero/bf_urlbarfixextra.css
+++ b/xpi/content/css/winaero/bf_urlbarfixextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#urlbar:-moz-locale-dir(ltr) {
 	  border-top-left-radius: 2px !important;
@@ -12,4 +12,4 @@
 	  border-bottom-right-radius: 2px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/bmbut_pmenu_extra.css b/xpi/content/css/winaero/bmbut_pmenu_extra.css
index 2215c32..9fb5c3c 100644
--- a/xpi/content/css/winaero/bmbut_pmenu_extra.css
+++ b/xpi/content/css/winaero/bmbut_pmenu_extra.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	
 	#ctraddon_BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
 	#ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
 	  background: var(--panel-arrowcontent-background) !important;
 	  border: var(--panel-arrowcontent-border) !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/classictabsextra.css b/xpi/content/css/winaero/classictabsextra.css
index eea38b9..e15175b 100644
--- a/xpi/content/css/winaero/classictabsextra.css
+++ b/xpi/content/css/winaero/classictabsextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* Tabs toolbar tab close button (Fx31+) */
 	#ctraddon_tabs-closebutton{
@@ -199,4 +199,4 @@
 	  background-size: calc(100% - 1px) calc(100% - 4px) !important;
 	}
 	
-}
+/*}*/
diff --git a/xpi/content/css/winaero/classictabsextra2.css b/xpi/content/css/winaero/classictabsextra2.css
index ebb1099..38734f0 100644
--- a/xpi/content/css/winaero/classictabsextra2.css
+++ b/xpi/content/css/winaero/classictabsextra2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	
 	/* Tabs toolbar tab close button (Fx31+) */
 	#ctraddon_tabs-closebutton{
@@ -161,7 +161,6 @@
 		  list-style-image: url(chrome://browser/skin/tabbrowser/newtab.png) !important;
 		}
 
-
     }
 	
-}
+/*}*/
diff --git a/xpi/content/css/winaero/classictabsextra2c2.css b/xpi/content/css/winaero/classictabsextra2c2.css
index 3fe47ca..5087ef3 100644
--- a/xpi/content/css/winaero/classictabsextra2c2.css
+++ b/xpi/content/css/winaero/classictabsextra2c2.css
@@ -1,41 +1,19 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* tab colors */
 	@media all and (-moz-windows-theme:aero) {
-		/*.tabs-newtab-button:not(:-moz-lwtheme),
-		.tabbrowser-tab:not(:-moz-lwtheme) .tab-content {
-		  background-image: linear-gradient(to top,#b4c0cc,#c8d4e1,#d1deec) !important;
-		}
-		.tabs-newtab-button:hover:not(:-moz-lwtheme),
-		.tabbrowser-tab:not([selected]):hover:not(:-moz-lwtheme) .tab-content {
-		  background-image: linear-gradient(to top,#d0dce8,#dce7f3,#e5effa) !important;
-		}*/
 		.tabbrowser-tab[selected]:not(:-moz-lwtheme) .tab-content {
 		  background-image: linear-gradient(to top,#eaf2fb,#eef5fc,#fbfdff) !important;
 		}
 	}
 	
 	@media all and (-moz-windows-classic) {
-		/*.tabs-newtab-button:not(:-moz-lwtheme),
-		.tabbrowser-tab:not(:-moz-lwtheme) .tab-content {
-		  background-image: linear-gradient(transparent, hsla(0,0%,45%,.1) 1px, hsla(0,0%,32%,.2) 80%, hsla(0,0%,0%,.2)),
-							linear-gradient(-moz-dialog, -moz-dialog) !important;
-		}
-		.tabs-newtab-button:hover:not(:-moz-lwtheme),
-		.tabbrowser-tab:not([selected]):hover:not(:-moz-lwtheme) .tab-content {
-		  background-image: linear-gradient(hsla(0,0%,100%,.3) 1px, hsla(0,0%,75%,.2) 80%, hsla(0,0%,60%,.2)),
-							linear-gradient(-moz-dialog, -moz-dialog) !important;
-		}*/
 		.tabbrowser-tab[selected]:not(:-moz-lwtheme) .tab-content {
 		  background-image: linear-gradient(rgba(255,255,255,.7), rgba(255,255,255,.4) 50%),
 							linear-gradient(-moz-dialog, -moz-dialog) !important;
 		}
-		/*.tabbrowser-tab:not(:-moz-lwtheme):not([selected=true]):not(:hover),
-		.tabbrowser-tab:not(:-moz-lwtheme):not([selected=true]):hover {
-		  color:black !important;
-		}*/
 		
 		.tabs-newtab-button:not(:-moz-lwtheme):not(#privateTab-afterTabs-openNewPrivateTab),
 		#TabsToolbar > #new-tab-button:not(:-moz-lwtheme) {
@@ -177,4 +155,4 @@
 		  margin-bottom: 0px !important;
 		}
 	}
-}
+/*}*/
diff --git a/xpi/content/css/winaero/classictabsextrac2.css b/xpi/content/css/winaero/classictabsextrac2.css
index 3fdc12e..ede0244 100644
--- a/xpi/content/css/winaero/classictabsextrac2.css
+++ b/xpi/content/css/winaero/classictabsextrac2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* tab colors */
 	@media all and (-moz-windows-theme:aero) {
@@ -177,4 +177,4 @@
 		  margin-bottom: 0px !important;
 		}
 	}
-}
+/*}*/
diff --git a/xpi/content/css/winaero/curvedtabsextra.css b/xpi/content/css/winaero/curvedtabsextra.css
index 396c8a7..fe8319a 100644
--- a/xpi/content/css/winaero/curvedtabsextra.css
+++ b/xpi/content/css/winaero/curvedtabsextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#titlebar-placeholder-on-TabsToolbar-for-captions-buttons{
 	  -moz-margin-start: 0px !important;
@@ -99,4 +99,4 @@
 
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/feedinurlextra.css b/xpi/content/css/winaero/feedinurlextra.css
index b435d89..0852201 100644
--- a/xpi/content/css/winaero/feedinurlextra.css
+++ b/xpi/content/css/winaero/feedinurlextra.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#urlbar-icons #feed-button .toolbarbutton-icon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/feedinurlbar.png") !important;
 	  -moz-image-region: rect(0px 18px 18px 0px) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/highertabsposextra.css b/xpi/content/css/winaero/highertabsposextra.css
index a0df733..01c4f5e 100644
--- a/xpi/content/css/winaero/highertabsposextra.css
+++ b/xpi/content/css/winaero/highertabsposextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window:not([tabsontop="false"]) #TabsToolbar:not([tabsontop="false"]):not(:-moz-lwtheme) {
 	  margin-top:0px !important;
@@ -14,4 +14,4 @@
 	#main-window[sizemode="maximized"]:not([tabsontop="false"]) #titlebar-placeholder-on-TabsToolbar-for-captions-buttons{
 	  -moz-margin-start: 2px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/invicons_tabsbarextra.css b/xpi/content/css/winaero/invicons_tabsbarextra.css
index e071d01..82ed20f 100644
--- a/xpi/content/css/winaero/invicons_tabsbarextra.css
+++ b/xpi/content/css/winaero/invicons_tabsbarextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	@media not all and (min-resolution: 2dppx) {
 
@@ -18,4 +18,4 @@
 		}
 
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/menubarextra.css b/xpi/content/css/winaero/menubarextra.css
index df86129..62f6de0 100644
--- a/xpi/content/css/winaero/menubarextra.css
+++ b/xpi/content/css/winaero/menubarextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	@media all and (-moz-windows-theme:aero) {
 	  #main-window:not([tabsintitlebar])[tabsontop='false'] #toolbar-menubar:not([inactive="true"]),
@@ -57,4 +57,4 @@
 
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/mode_icons_and_text_extra.css b/xpi/content/css/winaero/mode_icons_and_text_extra.css
index d7f3026..58edb94 100644
--- a/xpi/content/css/winaero/mode_icons_and_text_extra.css
+++ b/xpi/content/css/winaero/mode_icons_and_text_extra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#nav-bar toolbaritem .toolbarbutton-1 .toolbarbutton-text,
 	#nav-bar .toolbarbutton-1:not([type="menu-button"]) .toolbarbutton-text,
@@ -25,4 +25,4 @@
 	  padding:0px 3px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/mode_icons_big_extra.css b/xpi/content/css/winaero/mode_icons_big_extra.css
index fd49278..8699955 100644
--- a/xpi/content/css/winaero/mode_icons_big_extra.css
+++ b/xpi/content/css/winaero/mode_icons_big_extra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	#nav-bar :-moz-any(#back-button, #forward-button)[cui-areatype="toolbar"] {
 	  list-style-image: url(chrome://browser/skin/menuPanel.png) !important;
 	}
@@ -162,4 +162,4 @@
 		}
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/nav_txtonlyextra.css b/xpi/content/css/winaero/nav_txtonlyextra.css
index e3e3fa7..2d8a131 100644
--- a/xpi/content/css/winaero/nav_txtonlyextra.css
+++ b/xpi/content/css/winaero/nav_txtonlyextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 	
 	#navigator-toolbox #nav-bar .toolbarbutton-1:not(.tabs-newtab-button):not(.tab-close-button):not([disabled]):hover .toolbarbutton-text {
 	  border: 1px solid;
@@ -29,4 +29,4 @@
 		}
 	}
 	
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/nocontexticonsextra.css b/xpi/content/css/winaero/nocontexticonsextra.css
index 5ad0833..d7d148e 100644
--- a/xpi/content/css/winaero/nocontexticonsextra.css
+++ b/xpi/content/css/winaero/nocontexticonsextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#context-back image,
 	#context-forward image,
@@ -88,4 +88,4 @@
 		}
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/overlayextra.css b/xpi/content/css/winaero/overlayextra.css
index 253f6a4..5dd267d 100644
--- a/xpi/content/css/winaero/overlayextra.css
+++ b/xpi/content/css/winaero/overlayextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	
 	#ctraddon_bookmarks-menu-toolbar-button,
 	#ctraddon_bookmarks-button{
@@ -421,7 +421,7 @@
 	  border-bottom: 1px solid rgba(0,0,0,.15) !important;
 	}
 
-}
+/*}*/
 
 .ctraddon_nonwindows,
 .ctraddon_linuxonly,
@@ -429,34 +429,34 @@
   visibility: collapse !important;
 }
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	#ctraddon_appbutton_list1{
+/*@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane #ctraddon_appbutton_list1{
 	  visibility: visible !important;
 	}
-	#ctraddon_appbutton_list2{
+	#ClassicTRoptionsPane #ctraddon_appbutton_list2{
 	  visibility: collapse !important;
 	  display:none !important;
 	}
 	
 	@media not all and (-moz-windows-glass) {
-		#ctraddon_pw_menubarnofog{
+		#ClassicTRoptionsPane #ctraddon_pw_menubarnofog{
 		  visibility: collapse !important;
 		  display:none !important;
 		}
 	}
-	#ctraddon_pw_okbutton{
+	#ClassicTRoptionsPane #ctraddon_pw_okbutton{
 	  display: inline !important;
 	}
 
-	#ctraddon_pw_starinurl label{
+	#ClassicTRoptionsPane #ctraddon_pw_starinurl label{
 	  background: -moz-image-rect(url('chrome://classic_theme_restorer/content/images/starbutton1.png'),
 				  0, 72, 18, 36) no-repeat left !important;
 	  -moz-padding-start:20px !important;
 	  min-height:16px !important;
 	}
-	#ctraddon_pw_feedinurl label{
+	#ClassicTRoptionsPane #ctraddon_pw_feedinurl label{
 	  background:url('chrome://classic_theme_restorer/content/images/feedinurlbar.png') no-repeat left !important;
 	  -moz-padding-start:20px !important;
 	  min-height:16px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/smallnavbutextra.css b/xpi/content/css/winaero/smallnavbutextra.css
index 2e1512b..0553a4f 100644
--- a/xpi/content/css/winaero/smallnavbutextra.css
+++ b/xpi/content/css/winaero/smallnavbutextra.css
@@ -1,5 +1,5 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#nav-bar #notification-popup-box + *{
 	  -moz-padding-start: 9px !important;
@@ -456,4 +456,4 @@
 	  padding: 0 !important;
 	  -moz-margin-start: 1px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/starinurlextra.css b/xpi/content/css/winaero/starinurlextra.css
index 214b34e..1693b78 100644
--- a/xpi/content/css/winaero/starinurlextra.css
+++ b/xpi/content/css/winaero/starinurlextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#urlbar-icons #bookmarks-menu-button .toolbarbutton-icon {
 	  -moz-image-region: rect(0px 18px 18px 0px);
@@ -48,4 +48,4 @@
 	#main-window[defaultfxtheme="true"] #editBookmarkPanelStarIcon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/starred48.png") !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/tabmokcolorextra.css b/xpi/content/css/winaero/tabmokcolorextra.css
index 84d9419..efdd04c 100644
--- a/xpi/content/css/winaero/tabmokcolorextra.css
+++ b/xpi/content/css/winaero/tabmokcolorextra.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window .tabbrowser-arrowscrollbox > .scrollbutton-up,
 	#main-window .tabbrowser-arrowscrollbox > .scrollbutton-down {
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/tab-arrow-left-inverted.png) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winaero/tabsontop_offextra.css b/xpi/content/css/winaero/tabsontop_offextra.css
index 842e72a..661b084 100644
--- a/xpi/content/css/winaero/tabsontop_offextra.css
+++ b/xpi/content/css/winaero/tabsontop_offextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	@media not all and (-moz-windows-glass) {
 		#main-window:not([tabsintitlebar])[tabsontop="false"][sizemode="maximized"] #TabsToolbar .tabbrowser-tabs,
@@ -106,4 +106,4 @@
 	  margin-top: 8px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/windowcontrols.css b/xpi/content/css/windowcontrols.css
index 5cc196b..4da05d7 100644
--- a/xpi/content/css/windowcontrols.css
+++ b/xpi/content/css/windowcontrols.css
@@ -1,9 +1,9 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul),
-			   url(chrome://global/content/customizeToolbar.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul),
+			   url(chrome://global/content/customizeToolbar.xul) {*/
 
-   #main-window[inFullscreen] #autohide-context {
+	#main-window[inFullscreen] #autohide-context {
 	  visibility:collapse !important;
 	}
 
@@ -20,4 +20,4 @@
 	  -moz-box-align: start !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/appbuthigherpositionextra.css b/xpi/content/css/winxp/appbuthigherpositionextra.css
index b6cbb8f..1116366 100644
--- a/xpi/content/css/winxp/appbuthigherpositionextra.css
+++ b/xpi/content/css/winxp/appbuthigherpositionextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window[tabsintitlebar][sizemode="normal"]:not([tabsontop="false"]) #toolbar-menubar[autohide="true"][inactive="true"]:not([customizing="true"]) ~ #TabsToolbar #ctraddon_appbutton{
 	  margin-top:-19px !important;
@@ -19,4 +19,4 @@
 	#main-window[tabsintitlebar] #toolbar-menubar[autohide="true"][inactive="true"]:not([customizing="true"]) ~ #TabsToolbar #ctraddon_appbutton[open] {
 	  border-radius: 0 0 0 0 !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/appbutton_on_navbarextra.css b/xpi/content/css/winxp/appbutton_on_navbarextra.css
index 54951c1..3716769 100644
--- a/xpi/content/css/winxp/appbutton_on_navbarextra.css
+++ b/xpi/content/css/winxp/appbutton_on_navbarextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	/* style appmenu */
 	#main-window[defaultfxtheme="true"] #appmenu-popup {
@@ -8,4 +8,4 @@
 	  -moz-margin-start:2px;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/back-forwardextra.css b/xpi/content/css/winxp/back-forwardextra.css
index 4f23a4d..ed618da 100644
--- a/xpi/content/css/winxp/back-forwardextra.css
+++ b/xpi/content/css/winxp/back-forwardextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#main-window:not([defaultfxtheme="true"]) #notification-popup-box[hidden] + *,
 	#main-window:not([defaultfxtheme="true"]) #notification-popup-box + .notification-anchor-icon {
@@ -66,4 +66,4 @@
 	#main-window[fx31="true"] #urlbar-container[forwarddisabled] > #urlbar-wrapper > #urlbar {
 	  margin-left: 8px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/bf_urlbarfixextra.css b/xpi/content/css/winxp/bf_urlbarfixextra.css
index c199517..dbb7ccf 100644
--- a/xpi/content/css/winxp/bf_urlbarfixextra.css
+++ b/xpi/content/css/winxp/bf_urlbarfixextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#urlbar:-moz-locale-dir(ltr) {
 	  border-top-left-radius: 2px !important;
@@ -11,4 +11,4 @@
 	  border-bottom-right-radius: 2px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/bmbut_pmenu_extra.css b/xpi/content/css/winxp/bmbut_pmenu_extra.css
index 2215c32..9fb5c3c 100644
--- a/xpi/content/css/winxp/bmbut_pmenu_extra.css
+++ b/xpi/content/css/winxp/bmbut_pmenu_extra.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	
 	#ctraddon_BMB_bookmarksPopup menupopup[placespopup=true] > hbox,
 	#ctraddon_BMB_bookmarksPopup #ctraddon_BMB_subscribeToPageSubmenuMenupopup {
 	  background: var(--panel-arrowcontent-background) !important;
 	  border: var(--panel-arrowcontent-border) !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/classictabsextra.css b/xpi/content/css/winxp/classictabsextra.css
index 4a0b75b..10e05fd 100644
--- a/xpi/content/css/winxp/classictabsextra.css
+++ b/xpi/content/css/winxp/classictabsextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* Tabs toolbar tab close button (Fx31+) */
 	#ctraddon_tabs-closebutton{
@@ -150,4 +150,4 @@
 	  background-size: calc(100% - 1px) calc(100% - 4px) !important;
 	}
 
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/classictabsextra2.css b/xpi/content/css/winxp/classictabsextra2.css
index 941a71f..f600505 100644
--- a/xpi/content/css/winxp/classictabsextra2.css
+++ b/xpi/content/css/winxp/classictabsextra2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* Tabs toolbar tab close button (Fx31+) */
 	#ctraddon_tabs-closebutton{
@@ -126,4 +126,4 @@
 	  background-image: none;
 	}
 
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/classictabsextra2c2.css b/xpi/content/css/winxp/classictabsextra2c2.css
index 06c2da5..7dabc0e 100644
--- a/xpi/content/css/winxp/classictabsextra2c2.css
+++ b/xpi/content/css/winxp/classictabsextra2c2.css
@@ -1,26 +1,12 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* tab colors */
-	/*.tabs-newtab-button:not(:-moz-lwtheme),
-	.tabbrowser-tab:not(:-moz-lwtheme) .tab-content {
-	  background-image: linear-gradient(transparent, hsla(0,0%,45%,.1) 1px, hsla(0,0%,32%,.2) 80%, hsla(0,0%,0%,.2)),
-						linear-gradient(-moz-dialog, -moz-dialog) !important;
-	}
-	.tabs-newtab-button:hover:not(:-moz-lwtheme),
-	.tabbrowser-tab:not([selected]):hover:not(:-moz-lwtheme) .tab-content {
-	  background-image: linear-gradient(hsla(0,0%,100%,.3) 1px, hsla(0,0%,75%,.2) 80%, hsla(0,0%,60%,.2)),
-						linear-gradient(-moz-dialog, -moz-dialog) !important;
-	}*/
 	.tabbrowser-tab[selected]:not(:-moz-lwtheme) .tab-content {
 	  background-image: linear-gradient(rgba(255,255,255,.7), rgba(255,255,255,.4) 50%),
 						linear-gradient(-moz-dialog, -moz-dialog) !important;
 	}
-	/*.tabbrowser-tab:not(:-moz-lwtheme):not([selected=true]):not(:hover),
-	.tabbrowser-tab:not(:-moz-lwtheme):not([selected=true]):hover {
-	  color:black !important;
-	}*/
 	
 	.tabs-newtab-button:not(:-moz-lwtheme):not(#privateTab-afterTabs-openNewPrivateTab),
 	#TabsToolbar > #new-tab-button:not(:-moz-lwtheme) {
@@ -143,4 +129,4 @@
 		}
 	}
 
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/classictabsextrac2.css b/xpi/content/css/winxp/classictabsextrac2.css
index 38cae74..19f8c4a 100644
--- a/xpi/content/css/winxp/classictabsextrac2.css
+++ b/xpi/content/css/winxp/classictabsextrac2.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	/* tab colors */
 	.tabs-newtab-button:not(:-moz-lwtheme),
@@ -143,4 +143,4 @@
 		}
 	}
 
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/curvedtabsextra.css b/xpi/content/css/winxp/curvedtabsextra.css
index 04c901a..df3695b 100644
--- a/xpi/content/css/winxp/curvedtabsextra.css
+++ b/xpi/content/css/winxp/curvedtabsextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#titlebar-placeholder-on-TabsToolbar-for-captions-buttons{
 	  -moz-margin-start: 0px !important;
@@ -67,4 +67,4 @@
 	  -moz-image-region: rect(0, 16px, 16px, 0) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/feedinurlextra.css b/xpi/content/css/winxp/feedinurlextra.css
index b435d89..0852201 100644
--- a/xpi/content/css/winxp/feedinurlextra.css
+++ b/xpi/content/css/winxp/feedinurlextra.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#urlbar-icons #feed-button .toolbarbutton-icon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/feedinurlbar.png") !important;
 	  -moz-image-region: rect(0px 18px 18px 0px) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/highertabsposextra.css b/xpi/content/css/winxp/highertabsposextra.css
index a0df733..01c4f5e 100644
--- a/xpi/content/css/winxp/highertabsposextra.css
+++ b/xpi/content/css/winxp/highertabsposextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window:not([tabsontop="false"]) #TabsToolbar:not([tabsontop="false"]):not(:-moz-lwtheme) {
 	  margin-top:0px !important;
@@ -14,4 +14,4 @@
 	#main-window[sizemode="maximized"]:not([tabsontop="false"]) #titlebar-placeholder-on-TabsToolbar-for-captions-buttons{
 	  -moz-margin-start: 2px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/invicons_tabsbarextra.css b/xpi/content/css/winxp/invicons_tabsbarextra.css
index e071d01..82ed20f 100644
--- a/xpi/content/css/winxp/invicons_tabsbarextra.css
+++ b/xpi/content/css/winxp/invicons_tabsbarextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	@media not all and (min-resolution: 2dppx) {
 
@@ -18,4 +18,4 @@
 		}
 
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/mode_icons_and_text_extra.css b/xpi/content/css/winxp/mode_icons_and_text_extra.css
index d7f3026..58edb94 100644
--- a/xpi/content/css/winxp/mode_icons_and_text_extra.css
+++ b/xpi/content/css/winxp/mode_icons_and_text_extra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#nav-bar toolbaritem .toolbarbutton-1 .toolbarbutton-text,
 	#nav-bar .toolbarbutton-1:not([type="menu-button"]) .toolbarbutton-text,
@@ -25,4 +25,4 @@
 	  padding:0px 3px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/mode_icons_big_extra.css b/xpi/content/css/winxp/mode_icons_big_extra.css
index e7d3935..b62108b 100644
--- a/xpi/content/css/winxp/mode_icons_big_extra.css
+++ b/xpi/content/css/winxp/mode_icons_big_extra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 	#nav-bar :-moz-any(#back-button, #forward-button)[cui-areatype="toolbar"] {
 	  list-style-image: url(chrome://browser/skin/menuPanel.png) !important;
 	}
@@ -155,4 +155,4 @@
 		}
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/nav_txtonlyextra.css b/xpi/content/css/winxp/nav_txtonlyextra.css
index 4dc521a..d770b55 100644
--- a/xpi/content/css/winxp/nav_txtonlyextra.css
+++ b/xpi/content/css/winxp/nav_txtonlyextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#navigator-toolbox #nav-bar .toolbarbutton-1:not(.tabs-newtab-button):not(.tab-close-button):not([disabled]):hover .toolbarbutton-text {
 	  border: 1px solid;
@@ -26,4 +26,4 @@
 	  padding-bottom: 3px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/nocontexticonsextra.css b/xpi/content/css/winxp/nocontexticonsextra.css
index d78dce0..f97a734 100644
--- a/xpi/content/css/winxp/nocontexticonsextra.css
+++ b/xpi/content/css/winxp/nocontexticonsextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#context-back image,
 	#context-forward image,
@@ -34,4 +34,4 @@
 	  margin-bottom:-5px !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/overlayextra.css b/xpi/content/css/winxp/overlayextra.css
index decfe7b..0974b58 100644
--- a/xpi/content/css/winxp/overlayextra.css
+++ b/xpi/content/css/winxp/overlayextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#ctraddon_bookmarks-menu-toolbar-button,
 	#ctraddon_bookmarks-button{
@@ -281,28 +281,28 @@
   visibility: collapse !important;
 }
 
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	#ctraddon_pw_noresizerxp,
-	#ctraddon_appbutton_list1{
+/*@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane #ctraddon_pw_noresizerxp,
+	#ClassicTRoptionsPane #ctraddon_appbutton_list1{
 	  visibility: visible !important;
 	}
-	#ctraddon_pw_menubarnofog,
-	#ctraddon_pw_altmenubar,
-	#ctraddon_appbutton_list2{
+	#ClassicTRoptionsPane #ctraddon_pw_menubarnofog,
+	#ClassicTRoptionsPane #ctraddon_pw_altmenubar,
+	#ClassicTRoptionsPane #ctraddon_appbutton_list2{
 	  visibility: collapse !important;
 	  display:none !important;
 	}
-	#ctraddon_pw_okbutton{
+	#ClassicTRoptionsPane #ctraddon_pw_okbutton{
 	  display: inline !important;
 	}
-	#ctraddon_pw_starinurl label{
+	#ClassicTRoptionsPane #ctraddon_pw_starinurl label{
 	  background:url('chrome://classic_theme_restorer/content/images/appmenu_bookmarks.png') no-repeat left !important;
 	  -moz-padding-start:20px !important;
 	  min-height:16px !important;
 	}
-	#ctraddon_pw_feedinurl label{
+	#ClassicTRoptionsPane #ctraddon_pw_feedinurl label{
 	  background:url('chrome://classic_theme_restorer/content/images/feedinurlbar.png') no-repeat left !important;
 	  -moz-padding-start:20px !important;
 	  min-height:16px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/smallnavbutextra.css b/xpi/content/css/winxp/smallnavbutextra.css
index 6964855..a8622d6 100644
--- a/xpi/content/css/winxp/smallnavbutextra.css
+++ b/xpi/content/css/winxp/smallnavbutextra.css
@@ -1,5 +1,5 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#nav-bar #notification-popup-box + *{
 	  -moz-padding-start: 9px !important;
@@ -388,4 +388,4 @@
 	  padding: 0 !important;
 	  -moz-margin-start: 1px !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/starinurlextra.css b/xpi/content/css/winxp/starinurlextra.css
index 214b34e..1693b78 100644
--- a/xpi/content/css/winxp/starinurlextra.css
+++ b/xpi/content/css/winxp/starinurlextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#urlbar-icons #bookmarks-menu-button .toolbarbutton-icon {
 	  -moz-image-region: rect(0px 18px 18px 0px);
@@ -48,4 +48,4 @@
 	#main-window[defaultfxtheme="true"] #editBookmarkPanelStarIcon {
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/starred48.png") !important;
 	}
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/tabmokcolorextra.css b/xpi/content/css/winxp/tabmokcolorextra.css
index 84d9419..efdd04c 100644
--- a/xpi/content/css/winxp/tabmokcolorextra.css
+++ b/xpi/content/css/winxp/tabmokcolorextra.css
@@ -1,10 +1,10 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window .tabbrowser-arrowscrollbox > .scrollbutton-up,
 	#main-window .tabbrowser-arrowscrollbox > .scrollbutton-down {
 	  list-style-image: url(chrome://classic_theme_restorer/content/images/tab-arrow-left-inverted.png) !important;
 	}
 
-}
\ No newline at end of file
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/css/winxp/tabsontop_offextra.css b/xpi/content/css/winxp/tabsontop_offextra.css
index c7d7c7f..acfff82 100644
--- a/xpi/content/css/winxp/tabsontop_offextra.css
+++ b/xpi/content/css/winxp/tabsontop_offextra.css
@@ -1,6 +1,6 @@
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul){
+/*@-moz-document url(chrome://browser/content/browser.xul){*/
 
 	#main-window[tabsintitlebar]:not([inFullscreen]) #navigator-toolbox #toolbar-menubar{
 	  margin-top: 4px !important;
@@ -54,4 +54,4 @@
 	#main-window[currenttheme^="LavaFox"][tabsintitlebar]:not([inFullscreen])[sizemode="maximized"] #navigator-toolbox #toolbar-menubar[autohide="true"][inactive="true"]{
 	  margin-top: 8px !important;
 	}
-}
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/overlay.css b/xpi/content/overlay.css
index 84463e1..7a2c0d7 100644
--- a/xpi/content/overlay.css
+++ b/xpi/content/overlay.css
@@ -1,7 +1,7 @@
 @import url(chrome://ctraddon_os_special/skin/overlayextra.css);
 @namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);
 
-@-moz-document url(chrome://browser/content/browser.xul) {
+/*@-moz-document url(chrome://browser/content/browser.xul) {*/
 
 	#main-window {
 	  min-width: 300px !important;
@@ -472,86 +472,86 @@
 	  min-width: 0px !important;
 	}
 
-}
+/*}*/
 
 /* style/hide settings on CTRs options window */
-@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {
-	#ctraddon_pw_noresizerxp,
-	#ctraddon_combrelstopinfo,
-	#ctraddon_appbutton_list1,
-	#ctraddon_appbutton_list2{
+/*@-moz-document url(chrome://classic_theme_restorer/content/options.xul) {*/
+	#ClassicTRoptionsPane #ctraddon_pw_noresizerxp,
+	#ClassicTRoptionsPane #ctraddon_combrelstopinfo,
+	#ClassicTRoptionsPane #ctraddon_appbutton_list1,
+	#ClassicTRoptionsPane #ctraddon_appbutton_list2{
 	  visibility: collapse;
 	}
-	.ctraddon_tabcolorlabel,
-	.ctraddon_font1{
+	#ClassicTRoptionsPane .ctraddon_tabcolorlabel,
+	#ClassicTRoptionsPane .ctraddon_font1{
 	  font-weight:bold;
 	  font-style:italic;
 	}
-	.ctraddon_topic{
+	#ClassicTRoptionsPane .ctraddon_topic{
 	  font-weight:bold;
 	}
-	.ctraddon_font2{
+	#ClassicTRoptionsPane .ctraddon_font2{
 	  font-style:italic;
 	}
 	
-	.tabcolorbox,
-	.tabhovcolorbox,
-	.tabpencolorbox,
-	.tabunrcolorbox,
-	.ntabcolorbox,
-	.ntabhovcolorbox,
-	#ntabcolorbox,
-	#ntabhovcolorbox,
+	#ClassicTRoptionsPane .tabcolorbox,
+	#ClassicTRoptionsPane .tabhovcolorbox,
+	#ClassicTRoptionsPane .tabpencolorbox,
+	#ClassicTRoptionsPane .tabunrcolorbox,
+	#ClassicTRoptionsPane .ntabcolorbox,
+	#ClassicTRoptionsPane .ntabhovcolorbox,
+	#ClassicTRoptionsPane #ntabcolorbox,
+	#ClassicTRoptionsPane #ntabhovcolorbox,
 	#ClassicTRoptionsPane[defaultfxtheme="true"] #ctraddon_pw_colors_ntab_t,
-	#ctraddon_pw_tabs_devtabs{
+	#ClassicTRoptionsPane #ctraddon_pw_tabs_devtabs{
 	  visibility: collapse;
 	}
 	
-	#ctraddon_ccap_t_squared,
-	#ctraddon_ccap_t_squaredc2,
-	#ctraddon_ccap_t_squared2,
-	#ctraddon_ccap_t_curved,
-	#ctraddon_ccap_t_curvedaero{
+	#ClassicTRoptionsPane #ctraddon_ccap_t_squared,
+	#ClassicTRoptionsPane #ctraddon_ccap_t_squaredc2,
+	#ClassicTRoptionsPane #ctraddon_ccap_t_squared2,
+	#ClassicTRoptionsPane #ctraddon_ccap_t_curved,
+	#ClassicTRoptionsPane #ctraddon_ccap_t_curvedaero{
 	  visibility: collapse;
 	}
 	
 	#ClassicTRoptionsPane[defaultfxtheme="true"] textbox{
 	  min-height:22px !important;
 	}
-	#ctraddon_fontbox textbox {
+	#ClassicTRoptionsPane #ctraddon_fontbox textbox {
 	  min-width: 50px !important;
 	  width: 122px !important;
 	  max-width: 122px !important;
 	}
 	
-	#ctraddon_pw_tab_ctabheight,
-	#ctraddon_pw_tabMinWidth,
-	#ctraddon_pw_tabMaxWidth,
-	#ctraddon_pw_tabClipWidth{
+	#ClassicTRoptionsPane #ctraddon_pw_tab_ctabheight,
+	#ClassicTRoptionsPane #ctraddon_pw_tabMinWidth,
+	#ClassicTRoptionsPane #ctraddon_pw_tabMaxWidth,
+	#ClassicTRoptionsPane #ctraddon_pw_tabClipWidth{
 	  width:60px !important;
 	  max-width:80px !important;
 	}
 	
-	#ctraddon_pw_nbisizedelay,
-	#ctraddon_pw_am_extrabars{
+	#ClassicTRoptionsPane #ctraddon_pw_nbisizedelay,
+	#ClassicTRoptionsPane #ctraddon_pw_am_extrabars{
 	  width:50px !important;
 	}
 	
 	@media not all and (-moz-windows-theme:aero) {
-	  #tabs_curvedall{
+	  #ClassicTRoptionsPane #tabs_curvedall{
 		visibility: collapse;
 		display:none;
 	  }
 	}
 	
-	.ctraddontabs, .ctraddontabpanel{
+	#ClassicTRoptionsPane .ctraddontabs, .ctraddontabpanel{
 	  border: 1px solid;
 	}
 	
-	.ctraddonsuboption{
+	#ClassicTRoptionsPane .ctraddonsuboption{
 	  -moz-padding-start:21px;
 	}
-	.ctraddonsuboption2{
+	#ClassicTRoptionsPane .ctraddonsuboption2{
 	  -moz-padding-start:39px;
 	}
 	
@@ -579,30 +579,30 @@
 	  }
 	}
 	
-	radio.ctraddontab {
+	#ClassicTRoptionsPane radio.ctraddontab {
 	  -moz-appearance: none;
 	  margin: 0;
 	  padding: 1px;
 	  border: solid 1px transparent;
 	}
 
-	radio.ctraddontab[selected] {
+	#ClassicTRoptionsPane radio.ctraddontab[selected] {
 	  background: Highlight;
 	  color: HighlightText;
 	}
 	
-	radio.ctraddontab:not([selected]):hover {
+	#ClassicTRoptionsPane radio.ctraddontab:not([selected]):hover {
 	  background: -moz-CellHighlight;
 	  color: -moz-CellHighlightText;
 	}
 	
-	radio.ctraddontab .radio-spacer-box,
-	radio.ctraddontab .radio-check,
-	radio.ctraddontab .radio-check-box1 {
+	#ClassicTRoptionsPane radio.ctraddontab .radio-spacer-box,
+	#ClassicTRoptionsPane radio.ctraddontab .radio-check,
+	#ClassicTRoptionsPane radio.ctraddontab .radio-check-box1 {
 	  visibility: collapse;
 	}
 
-	.ctraddontabs {
+	#ClassicTRoptionsPane .ctraddontabs {
 	  overflow-x: hidden;
 	  overflow-y: auto;
 	  min-width: 180px;
@@ -610,7 +610,7 @@
 	  max-width: 180px;
 	}
 	
-	.ctraddontabpanel {
+	#ClassicTRoptionsPane .ctraddontabpanel {
 	  height:430px;
 	  max-height:480px;
 	  min-width:500px;
@@ -620,23 +620,23 @@
 	  overflow-y:auto;
 	}
 	
-	.ctraddontabpanel {
+	#ClassicTRoptionsPane .ctraddontabpanel {
 	  visibility: collapse;
 	}
 	
-	.ctraddontabpanel[selected="true"] {
+	#ClassicTRoptionsPane .ctraddontabpanel[selected="true"] {
 	  visibility: visible;
 	}
-	#ctraddon_pw_tabs_tabpanels tabpanel checkbox,
-	#ctraddon_pw_tabs_tabpanels tabpanel groupbox {
+	#ClassicTRoptionsPane #ctraddon_pw_tabs_tabpanels tabpanel checkbox,
+	#ClassicTRoptionsPane #ctraddon_pw_tabs_tabpanels tabpanel groupbox {
 	  max-width:400px !important;
 	}
 	
-	#ctraddon_pw_splitter {
+	#ClassicTRoptionsPane #ctraddon_pw_splitter {
 	  border:0;
 	}
 	
-	#ctraddon_pw_radiorestart{
+	#ClassicTRoptionsPane #ctraddon_pw_radiorestart{
 	  font-weight:bold;
 	  color:red;
 	  border:1px solid red;
@@ -644,50 +644,50 @@
 	  background: yellow;
 	}
 
-	.acprefdesc {
+	#ClassicTRoptionsPane .acprefdesc {
 	  font-size:95%;
 	}
 	
 	@media not all and (-moz-windows-classic) {
-	  #ctraddon_pw_tbsep_winc,
-	  #ctraddon_pw_hidetbwote_winc {
+	  #ClassicTRoptionsPane #ctraddon_pw_tbsep_winc,
+	  #ClassicTRoptionsPane #ctraddon_pw_hidetbwote_winc {
 		visibility: collapse !important;
 	  }
 	}
 	
 	@media not all and (-moz-os-version: windows-win10) {
-	  #ctraddon_pw_transpttbw10 {
+	  #ClassicTRoptionsPane #ctraddon_pw_transpttbw10 {
 		visibility: collapse;
 	  }
 	}
 	
 	/* additional icons for some preference*/
 	
-	#ctraddon_altabico_white{
+	#ClassicTRoptionsPane #ctraddon_altabico_white{
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton.png");
 	  -moz-margin-end:0;
 	}
-	#ctraddon_altabico_dark{
+	#ClassicTRoptionsPane #ctraddon_altabico_dark{
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton2.png");
 	  margin-left: 0;
 	  margin-right: 0;
 	}
-	#ctraddon_altabico_grey{
+	#ClassicTRoptionsPane #ctraddon_altabico_grey{
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton3.png");
 	  margin-left: 0;
 	  margin-right: 0;
 	}
-	#ctraddon_altabico_white_nd{
+	#ClassicTRoptionsPane #ctraddon_altabico_white_nd{
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton-inv.png");
 	  margin-left: 0;
 	  margin-right: 0;
 	}
-	#ctraddon_altabico_dark_nd{
+	#ClassicTRoptionsPane #ctraddon_altabico_dark_nd{
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton-dark.png");
 	  margin-left: 0;
 	  margin-right: 0;
 	}
-	#ctraddon_altabico_grey_nd{
+	#ClassicTRoptionsPane #ctraddon_altabico_grey_nd{
 	  list-style-image: url("chrome://classic_theme_restorer/content/images/appbutton-grey.png");
 	  margin-left: 0;
 	  margin-right: 0;
@@ -698,18 +698,20 @@
 	   At least 'padding-left' does not create an empty space in front of ootion labels on rtl locales
 	*/
 	
-	#ctraddon_pw_tab_emptyfavicon label,
-	#ctraddon_pw_tab_noemptypticon label {
+	#ClassicTRoptionsPane #ctraddon_pw_tab_emptyfavicon label,
+	#ClassicTRoptionsPane #ctraddon_pw_tab_noemptypticon label {
 	  background:url('chrome://classic_theme_restorer/content/images/default_dot_favicon.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 	
 	/* Tab/General close - pref icons */
-	#ctraddon_closeicon_def, #ctraddon_closeicong_def {
+	#ClassicTRoptionsPane #ctraddon_closeicon_def,
+	#ClassicTRoptionsPane #ctraddon_closeicong_def {
 	  -moz-margin-end:-1px;
 	}
-	#ctraddon_closeicon_red, #ctraddon_closeicong_red {
+	#ClassicTRoptionsPane #ctraddon_closeicon_red,
+	#ClassicTRoptionsPane #ctraddon_closeicong_red {
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/close_alt.png');
 	  -moz-image-region: rect(0px, 16px, 16px, 0px);
 	}
@@ -717,151 +719,177 @@
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/close.png');
 	  -moz-image-region: rect(0px, 16px, 16px, 0px);
 	}
-	#ctraddon_closeicon_w8, #ctraddon_closeicong_w8{
+	#ClassicTRoptionsPane #ctraddon_closeicon_w8,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w8{
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/close2.png');
 	  -moz-image-region: rect(0px, 16px, 16px, 0px);
 	}
-	#ctraddon_closeicon_w10, #ctraddon_closeicong_w10 {
+	#ClassicTRoptionsPane #ctraddon_closeicon_w10,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w10 {
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/close_w10.png');
 	  -moz-image-region: rect(0px, 20px, 20px, 0px);
 	}
-	#ctraddon_closeicon_w10i, #ctraddon_closeicong_w10i {
+	#ClassicTRoptionsPane #ctraddon_closeicon_w10i,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w10i {
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/close_w10i.png');
 	  -moz-image-region: rect(0px, 20px, 20px, 0px);
 	}
-	#ctraddon_closeicon_w10red, #ctraddon_closeicong_w10red {
+	#ClassicTRoptionsPane #ctraddon_closeicon_w10red,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w10red {
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/close_w10red.png');
 	  -moz-image-region: rect(0px, 20px, 20px, 0px);
 	}
-	#ctraddon_closeicon_gc, #ctraddon_closeicong_gc{
+	#ClassicTRoptionsPane #ctraddon_closeicon_gc,
+	#ClassicTRoptionsPane #ctraddon_closeicong_gc{
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/close_gc.png');
 	  -moz-image-region: rect(0px, 16px, 16px, 0px);
 	}
 	
-	#ctraddon_closeicon_red:hover, #ctraddon_closeicong_red:hover,
-	#ctraddon_closeicon_w7:hover, #ctraddon_closeicong_w7:hover,
-	#ctraddon_closeicon_w8:hover, #ctraddon_closeicong_w8:hover,
-	#ctraddon_closeicon_gc:hover, #ctraddon_closeicong_gc:hover {
+	#ClassicTRoptionsPane #ctraddon_closeicon_red:hover,
+	#ClassicTRoptionsPane #ctraddon_closeicong_red:hover,
+	#ClassicTRoptionsPane #ctraddon_closeicon_w7:hover,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w7:hover,
+	#ClassicTRoptionsPane #ctraddon_closeicon_w8:hover,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w8:hover,
+	#ClassicTRoptionsPane #ctraddon_closeicon_gc:hover,
+	#ClassicTRoptionsPane #ctraddon_closeicong_gc:hover {
 	  -moz-image-region: rect(0px, 32px, 16px, 16px);
 	}
-	#ctraddon_closeicon_red:active, #ctraddon_closeicong_red:active,
-	#ctraddon_closeicon_w7:active, #ctraddon_closeicong_w7:active,
-	#ctraddon_closeicon_w8:active, #ctraddon_closeicong_w8:active,
-	#ctraddon_closeicon_gc:active, #ctraddon_closeicong_gc:active{
+	#ClassicTRoptionsPane #ctraddon_closeicon_red:active,
+	#ClassicTRoptionsPane #ctraddon_closeicong_red:active,
+	#ClassicTRoptionsPane #ctraddon_closeicon_w7:active,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w7:active,
+	#ClassicTRoptionsPane #ctraddon_closeicon_w8:active,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w8:active,
+	#ClassicTRoptionsPane #ctraddon_closeicon_gc:active,
+	#ClassicTRoptionsPane #ctraddon_closeicong_gc:active{
 	  -moz-image-region: rect(0px, 48px, 16px, 32px);
 	}
-	#ctraddon_closeicon_w10:hover, #ctraddon_closeicong_w10:hover,
-	#ctraddon_closeicon_w10i:hover, #ctraddon_closeicong_w10i:hover,
-	#ctraddon_closeicon_w10red:hover, #ctraddon_closeicong_w10red:hover {
+	#ClassicTRoptionsPane #ctraddon_closeicon_w10:hover,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w10:hover,
+	#ClassicTRoptionsPane #ctraddon_closeicon_w10i:hover,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w10i:hover,
+	#ClassicTRoptionsPane #ctraddon_closeicon_w10red:hover,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w10red:hover {
 	  -moz-image-region: rect(0px, 40px, 20px, 20px);
 	}
-	#ctraddon_closeicon_w10:active, #ctraddon_closeicong_w10:active,
-	#ctraddon_closeicon_w10i:active, #ctraddon_closeicong_w10i:active,
-	#ctraddon_closeicon_w10red:active, #ctraddon_closeicong_w10red:active {
+	#ClassicTRoptionsPane #ctraddon_closeicon_w10:active,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w10:active,
+	#ClassicTRoptionsPane #ctraddon_closeicon_w10i:active,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w10i:active,
+	#ClassicTRoptionsPane #ctraddon_closeicon_w10red:active,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w10red:active {
 	  -moz-image-region: rect(0px, 60px, 20px, 40px);
 	}
 	
-	#ctraddon_pw_closeicon radio image ,
-	#ctraddon_pw_closeicong radio image {
+	#ClassicTRoptionsPane #ctraddon_pw_closeicon radio image ,
+	#ClassicTRoptionsPane #ctraddon_pw_closeicong radio image {
 	  width: 22px;
 	  padding: 2px 2px;
 	}
 
-	#ctraddon_closeicon_red, #ctraddon_closeicong_red,
-	#ctraddon_closeicon_w7, #ctraddon_closeicong_w7,
-	#ctraddon_closeicon_w8, #ctraddon_closeicong_w8,
-	#ctraddon_closeicon_w10, #ctraddon_closeicong_w10,
-	#ctraddon_closeicon_w10i, #ctraddon_closeicong_w10i,
-	#ctraddon_closeicon_w10red, #ctraddon_closeicong_w10red,
-	#ctraddon_closeicon_gc, #ctraddon_closeicong_gc {
+	#ClassicTRoptionsPane #ctraddon_closeicon_red,
+	#ClassicTRoptionsPane #ctraddon_closeicong_red,
+	#ClassicTRoptionsPane #ctraddon_closeicon_w7,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w7,
+	#ClassicTRoptionsPane #ctraddon_closeicon_w8,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w8,
+	#ClassicTRoptionsPane #ctraddon_closeicon_w10,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w10,
+	#ClassicTRoptionsPane #ctraddon_closeicon_w10i,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w10i,
+	#ClassicTRoptionsPane #ctraddon_closeicon_w10red,
+	#ClassicTRoptionsPane #ctraddon_closeicong_w10red,
+	#ClassicTRoptionsPane #ctraddon_closeicon_gc,
+	#ClassicTRoptionsPane #ctraddon_closeicong_gc {
 	  margin-left: -4px;
 	  margin-right: -4px;
 	}
 
-	#ctraddon_pw_closeicon radio .radio-check-box1,
-	#ctraddon_pw_closeicon #ctraddon_closeicon_def image,
-	#ctraddon_pw_closeicong radio .radio-check-box1,
-	#ctraddon_pw_closeicong #ctraddon_closeicong_def image {
+	#ClassicTRoptionsPane #ctraddon_pw_closeicon radio .radio-check-box1,
+	#ClassicTRoptionsPane #ctraddon_pw_closeicon #ctraddon_closeicon_def image,
+	#ClassicTRoptionsPane #ctraddon_pw_closeicong radio .radio-check-box1,
+	#ClassicTRoptionsPane #ctraddon_pw_closeicong #ctraddon_closeicong_def image {
 	  display: none;
 	}
-	#ctraddon_pw_closeicon #ctraddon_closeicon_def:not([selected="true"]) label,
-	#ctraddon_pw_closeicon radio:not([selected="true"]) image,
-	#ctraddon_pw_closeicong #ctraddon_closeicong_def:not([selected="true"]) label,
-	#ctraddon_pw_closeicong radio:not([selected="true"]) image{
+	#ClassicTRoptionsPane #ctraddon_pw_closeicon #ctraddon_closeicon_def:not([selected="true"]) label,
+	#ClassicTRoptionsPane #ctraddon_pw_closeicon radio:not([selected="true"]) image,
+	#ClassicTRoptionsPane #ctraddon_pw_closeicong #ctraddon_closeicong_def:not([selected="true"]) label,
+	#ClassicTRoptionsPane #ctraddon_pw_closeicong radio:not([selected="true"]) image{
 	  border: 1px solid transparent;
 	}
-	#ctraddon_pw_closeicon #ctraddon_closeicon_def[selected="true"] label,
-	#ctraddon_pw_closeicon radio[selected="true"] image,
-	#ctraddon_pw_closeicon #ctraddon_closeicon_def:not([selected="true"]):hover label,
-	#ctraddon_pw_closeicong #ctraddon_closeicong_def[selected="true"] label,
-	#ctraddon_pw_closeicong radio[selected="true"] image,
-	#ctraddon_pw_closeicong #ctraddon_closeicong_def:not([selected="true"]):hover label {
+	#ClassicTRoptionsPane #ctraddon_pw_closeicon #ctraddon_closeicon_def[selected="true"] label,
+	#ClassicTRoptionsPane #ctraddon_pw_closeicon radio[selected="true"] image,
+	#ClassicTRoptionsPane #ctraddon_pw_closeicon #ctraddon_closeicon_def:not([selected="true"]):hover label,
+	#ClassicTRoptionsPane #ctraddon_pw_closeicong #ctraddon_closeicong_def[selected="true"] label,
+	#ClassicTRoptionsPane #ctraddon_pw_closeicong radio[selected="true"] image,
+	#ClassicTRoptionsPane #ctraddon_pw_closeicong #ctraddon_closeicong_def:not([selected="true"]):hover label {
 	  border: 1px solid Highlight;
 	}
 
 	/* tab separator settings */
-	#ctraddon_tabsep_def {
+	#ClassicTRoptionsPane #ctraddon_tabsep_def {
 	  -moz-margin-end:-4px;
 	}
-	#ctraddon_tabsep_black{
+	#ClassicTRoptionsPane #ctraddon_tabsep_black{
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/tab-separator.png');
       -moz-image-region: rect(0px, 3px, 24px, 0px);
 	}
-	#ctraddon_tabsep_luna{
+	#ClassicTRoptionsPane #ctraddon_tabsep_luna{
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/tab-separator-luna-blue.png');
       -moz-image-region: rect(0px, 3px, 24px, 0px);
 	}
-	#ctraddon_tabsep_xp{
+	#ClassicTRoptionsPane #ctraddon_tabsep_xp{
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/tab-separator-XP.png');
       -moz-image-region: rect(0px, 3px, 24px, 0px);
 	}
-	#ctraddon_tabsep_white{
+	#ClassicTRoptionsPane #ctraddon_tabsep_white{
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/tab-separator-inv.png');
       -moz-image-region: rect(0px, 3px, 24px, 0px);
 	}
-	#ctraddon_tabsep_black_sol{
+	#ClassicTRoptionsPane #ctraddon_tabsep_black_sol{
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/tab-separator_solid.png');
 	  -moz-image-region: rect(0px, 1px, 18px, 0px);
 	}
-	#ctraddon_tabsep_white_sol {
+	#ClassicTRoptionsPane #ctraddon_tabsep_white_sol {
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/tab-separator_solid-inv.png');
 	  -moz-image-region: rect(0px, 1px, 18px, 0px);
 	}
-	#ctraddon_tabsep_black_sol2{
+	#ClassicTRoptionsPane #ctraddon_tabsep_black_sol2{
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/tab-separator_solid.png');
 	  -moz-image-region: rect(0px, 1px, 24px, 0px);
 	}
-	#ctraddon_tabsep_white_sol2 {
+	#ClassicTRoptionsPane #ctraddon_tabsep_white_sol2 {
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/tab-separator_solid-inv.png');
 	  -moz-image-region: rect(0px, 1px, 24px, 0px);
 	}
-	#ctraddon_tabsep_black,
-	#ctraddon_tabsep_white,
-	#ctraddon_tabsep_luna,
-	#ctraddon_tabsep_xp,
-	#ctraddon_tabsep_black_sol,
-	#ctraddon_tabsep_white_sol,
-	#ctraddon_tabsep_black_sol2,
-	#ctraddon_tabsep_white_sol2{
+	#ClassicTRoptionsPane #ctraddon_tabsep_black,
+	#ClassicTRoptionsPane #ctraddon_tabsep_white,
+	#ClassicTRoptionsPane #ctraddon_tabsep_luna,
+	#ClassicTRoptionsPane #ctraddon_tabsep_xp,
+	#ClassicTRoptionsPane #ctraddon_tabsep_black_sol,
+	#ClassicTRoptionsPane #ctraddon_tabsep_white_sol,
+	#ClassicTRoptionsPane #ctraddon_tabsep_black_sol2,
+	#ClassicTRoptionsPane #ctraddon_tabsep_white_sol2{
 	  margin-left: -4px;
 	  margin-right: -4px;
 	}
 	
-	#ctraddon_pw_tabseparator radio .radio-check-box1,
-	#ctraddon_pw_tabseparator #ctraddon_tabsep_def image {
+	#ClassicTRoptionsPane #ctraddon_pw_tabseparator radio .radio-check-box1,
+	#ClassicTRoptionsPane #ctraddon_pw_tabseparator #ctraddon_tabsep_def image {
 	  display: none;
 	}
-	#ctraddon_pw_tabseparator #ctraddon_tabsep_def:not([selected="true"]) label,
-	#ctraddon_pw_tabseparator radio:not([selected="true"]) image{
+	#ClassicTRoptionsPane #ctraddon_pw_tabseparator #ctraddon_tabsep_def:not([selected="true"]) label,
+	#ClassicTRoptionsPane #ctraddon_pw_tabseparator radio:not([selected="true"]) image{
 	  border: 1px solid transparent;
 	}
-	#ctraddon_pw_tabseparator #ctraddon_tabsep_def[selected="true"] label,
-	#ctraddon_pw_tabseparator radio[selected="true"] image,
-	#ctraddon_pw_tabseparator #ctraddon_tabsep_def:not([selected="true"]):hover label,
-	#ctraddon_pw_tabseparator radio:not([selected="true"]):hover image {
+	#ClassicTRoptionsPane #ctraddon_pw_tabseparator #ctraddon_tabsep_def[selected="true"] label,
+	#ClassicTRoptionsPane #ctraddon_pw_tabseparator radio[selected="true"] image,
+	#ClassicTRoptionsPane #ctraddon_pw_tabseparator #ctraddon_tabsep_def:not([selected="true"]):hover label,
+	#ClassicTRoptionsPane #ctraddon_pw_tabseparator radio:not([selected="true"]):hover image {
 	  border: 1px solid Highlight;
 	}
-	#ctraddon_pw_tabseparator radio image {
+	#ClassicTRoptionsPane #ctraddon_pw_tabseparator radio image {
 	  padding: 1px 6px;
 	}
 	
@@ -873,214 +901,213 @@
 	}
 
 	/**/
-	#ctraddon_alt_abicons label,
-	#ctraddon_alt_abicons2 label {
+	#ClassicTRoptionsPane #ctraddon_alt_abicons label,
+	#ClassicTRoptionsPane #ctraddon_alt_abicons2 label {
 	  background:url('chrome://classic_theme_restorer/content/images/appbutton-dark.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 	
-	#ctraddon_pw_backforward label{
+	#ClassicTRoptionsPane #ctraddon_pw_backforward label{
 	  background:url('chrome://classic_theme_restorer/content/images/back-forward.png') no-repeat left !important;
 	  padding-left:36px !important;
 	  min-height:16px !important;
 	}
 	
-	#ctraddon_pw_hideprivmask label {
+	#ClassicTRoptionsPane #ctraddon_pw_hideprivmask label {
 	  background:url('chrome://classic_theme_restorer/content/images/appmenu_private.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 
-	#ctraddon_pw_stopreload label {
+	#ClassicTRoptionsPane #ctraddon_pw_stopreload label {
 	  background:url('chrome://classic_theme_restorer/content/images/stop_mac.png') no-repeat left,
 				 url('chrome://classic_theme_restorer/content/images/reload_mac.png') no-repeat 4% 50% !important;
 	  padding-left:36px !important;
 	  min-height:16px !important;
 	}
 	
-	#ctraddon_wincontrols label{
+	#ClassicTRoptionsPane #ctraddon_wincontrols label{
 	  background: -moz-image-rect(url('chrome://classic_theme_restorer/content/images/windowControls.png'),
 					16, 49, 32, 0) no-repeat left !important;
 	  padding-left:52px !important;
 	  min-height:16px !important;
 	}
 	
-	#ctraddon_pw_emptyfavicon2 label {
+	#ClassicTRoptionsPane #ctraddon_pw_emptyfavicon2 label {
 	  background:url('chrome://classic_theme_restorer/content/images/default_favicon.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 
-	#ctraddon_pw_activitythrobber label {
+	#ClassicTRoptionsPane #ctraddon_pw_activitythrobber label {
 	  background:url('chrome://classic_theme_restorer/content/images/throbber_notloading.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 	
-	#ctraddon_pw_hideurelstop label{
+	#ClassicTRoptionsPane #ctraddon_pw_hideurelstop label{
 	  background:url('chrome://classic_theme_restorer/content/images/stop_mac.png') no-repeat left,
 				 url('chrome://classic_theme_restorer/content/images/reload_mac.png') no-repeat 4% 50% !important;
 	  padding-left:36px !important;
 	  min-height:16px !important;
 	}
 	
-	#ctraddon_pw_hideurlgo label {
+	#ClassicTRoptionsPane #ctraddon_pw_hideurlgo label {
 	  background:url('chrome://classic_theme_restorer/content/images/urlgo.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 
-	#ctraddon_pw_urlbardropm label{
+	#ClassicTRoptionsPane #ctraddon_pw_urlbardropm label{
 	  background:url('chrome://classic_theme_restorer/content/images/pw_urlbar_dropmarker.png') no-repeat left !important;
 	  padding-left:20px !important;
 	}
-	#ctraddon_pw_urlbarpblocked label{
+	#ClassicTRoptionsPane #ctraddon_pw_urlbarpblocked label{
 	  background:url('chrome://classic_theme_restorer/content/images/pw_urlbar_popup_blocked.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 
-	#ctraddon_pw_oldsearch label {
+	#ClassicTRoptionsPane #ctraddon_pw_oldsearch label {
 	  background:url('chrome://classic_theme_restorer/content/images/newsearch.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 
-	#ctraddon_pw_loopcall label {
+	#ClassicTRoptionsPane #ctraddon_pw_loopcall label {
 	  background:url('chrome://classic_theme_restorer/content/images/loopcall.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 	
-	#ctraddon_pw_altoptionsp label,
-	#ctraddon_pw_oldprefs label {
+	#ClassicTRoptionsPane #ctraddon_pw_altoptionsp label,
+	#ClassicTRoptionsPane #ctraddon_pw_oldprefs label {
 	  background:url('chrome://classic_theme_restorer/content/images/prefs_incontent.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 	
-	#ctraddon_pw_alt_newtabp label {
+	#ClassicTRoptionsPane #ctraddon_pw_alt_newtabp label {
 	  background: -moz-image-rect(url(chrome://classic_theme_restorer/content/images/newtab_controls.png), 0, 160, 16, 144) no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 	
-	#ctraddon_pw_bmbutpanelm label,
-	#ctraddon_pw_bmbutnotext label {
+	#ClassicTRoptionsPane #ctraddon_pw_bmbutpanelm label,
+	#ClassicTRoptionsPane #ctraddon_pw_bmbutnotext label {
 	  background:url('chrome://classic_theme_restorer/content/images/bookmarks.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 
-	#ctraddon_pw_skipprintpr label {
+	#ClassicTRoptionsPane #ctraddon_pw_skipprintpr label {
 	  background:url('chrome://classic_theme_restorer/content/images/appmenu_print.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 	
-	#ctraddon_pw_xpinstallui label,
-	#ctraddon_pw_alt_addonsm label {
+	#ClassicTRoptionsPane #ctraddon_pw_xpinstallui label,
+	#ClassicTRoptionsPane #ctraddon_pw_alt_addonsm label {
 	  background:url('chrome://classic_theme_restorer/content/images/appmenu_addons.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 	
-	#ctraddon_pw_alt_addonsp label,
-	#ctraddon_pw_addonversion label,
-	#ctraddon_pw_am_nowarning label {
+	#ClassicTRoptionsPane #ctraddon_pw_alt_addonsp label,
+	#ClassicTRoptionsPane #ctraddon_pw_addonversion label,
+	#ClassicTRoptionsPane #ctraddon_pw_am_nowarning label {
 	  background:url('chrome://classic_theme_restorer/content/images/appmenu_addons_lin.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 
-	#ctraddon_pw_noresizerxp label {
+	#ClassicTRoptionsPane #ctraddon_pw_noresizerxp label {
 	  background:url('chrome://classic_theme_restorer/content/images/resizer.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 	
-	#ctraddon_pw_readermode label,
-	#ctraddon_pw_readermode2 label {
+	#ClassicTRoptionsPane #ctraddon_pw_readermode label,
+	#ClassicTRoptionsPane #ctraddon_pw_readermode2 label {
 	  background:url('chrome://classic_theme_restorer/content/images/reader-mode.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 	
-	#ctraddon_pw_pocket label {
+	#ClassicTRoptionsPane #ctraddon_pw_pocket label {
 	  background:url('chrome://classic_theme_restorer/content/images/pocket.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:16px !important;
 	}
 	
 	/* Padlock icons */
-	#ctraddon_pw_padlock_default label{
+	#ClassicTRoptionsPane #ctraddon_pw_padlock_default label{
 	  background: -moz-image-rect(url('chrome://classic_theme_restorer/content/images/padlock_default1.png'),
 				  0, 16, 16, 0) no-repeat left !important;
 	  padding-left:20px !important;
 	}
-	#ctraddon_padlock_list[value="padlock_default"] {
+	#ClassicTRoptionsPane #ctraddon_padlock_list[value="padlock_default"] {
 	 list-style-image:url('chrome://classic_theme_restorer/content/images/padlock_default1.png');
 	 -moz-image-region: rect(0, 16px, 16px, 0);
 	}
-	#ctraddon_pw_padlock_classic label{
+	#ClassicTRoptionsPane #ctraddon_pw_padlock_classic label{
 	  background:url('chrome://classic_theme_restorer/content/images/padlock_classic.png') no-repeat left !important;
 	  padding-left:20px !important;
 	}
-	#ctraddon_padlock_list[value="padlock_classic"] {
+	#ClassicTRoptionsPane #ctraddon_padlock_list[value="padlock_classic"] {
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/padlock_classic.png');
 	}
-	#ctraddon_pw_padlock_modern label{
+	#ClassicTRoptionsPane #ctraddon_pw_padlock_modern label{
 	  background:url('chrome://classic_theme_restorer/content/images/padlock_modern.png') no-repeat left !important;
 	  padding-left:20px !important;
 	}
-	#ctraddon_padlock_list[value="padlock_modern"] {
+	#ClassicTRoptionsPane #ctraddon_padlock_list[value="padlock_modern"] {
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/padlock_modern.png');
 	}
-	#ctraddon_pw_padlock_none label{
+	#ClassicTRoptionsPane #ctraddon_pw_padlock_none label{
 	  padding-left:20px !important;
 	}
 
-	#ctraddon_pw_tabsaudioico label{
+	#ClassicTRoptionsPane #ctraddon_pw_tabsaudioico label{
 	  background:url('chrome://classic_theme_restorer/content/images/tabaudio.png') no-repeat left !important;
 	  padding-left:20px !important;
 	}
 	
 	/* tab throbber */
-	#ctraddon_closeicon_def {
+	#ClassicTRoptionsPane #ctraddon_closeicon_def {
 	  -moz-margin-end:0;
 	}
-	#ctraddon_pw_tabthrobber_alt {
+	#ClassicTRoptionsPane #ctraddon_pw_tabthrobber_alt {
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/throbber-loading-alt.png');
 	}
-	#ctraddon_pw_tabthrobber_f39{
+	#ClassicTRoptionsPane #ctraddon_pw_tabthrobber_f39{
 	  list-style-image:url('chrome://classic_theme_restorer/content/images/throbber-loading-fx39.png');
 	}
 
-	#ctraddon_pw_tabthrobber_alt,
-	#ctraddon_pw_tabthrobber_f39 {
+	#ClassicTRoptionsPane #ctraddon_pw_tabthrobber_alt,
+	#ClassicTRoptionsPane #ctraddon_pw_tabthrobber_f39 {
 	  margin-left: -1px;
 	  margin-right: -1px;
 	}
 
 	/*CTR icons*/
-	#ctraddon_pw_toolsitem label,
-	#ctraddon_pw_appmenuitem label,
-	#ctraddon_pw_contextitem label,
-	#ctraddon_pw_puictrbutton label{
+	#ClassicTRoptionsPane #ctraddon_pw_toolsitem label,
+	#ClassicTRoptionsPane #ctraddon_pw_appmenuitem label,
+	#ClassicTRoptionsPane #ctraddon_pw_contextitem label,
+	#ClassicTRoptionsPane #ctraddon_pw_puictrbutton label{
 	  background:url('chrome://classic_theme_restorer/content/images/appmenu_ctr.png') no-repeat left !important;
 	  padding-left:20px !important;
 	  min-height:18px !important;
 	}
 	
-	#ctraddon_pw_toolsitem:-moz-locale-dir(rtl) label,
-	#ctraddon_pw_appmenuitem:-moz-locale-dir(rtl) label,
-	#ctraddon_pw_contextitem:-moz-locale-dir(rtl) label,
-	#ctraddon_pw_puictrbutton:-moz-locale-dir(rtl) label{
+	#ClassicTRoptionsPane #ctraddon_pw_toolsitem:-moz-locale-dir(rtl) label,
+	#ClassicTRoptionsPane #ctraddon_pw_appmenuitem:-moz-locale-dir(rtl) label,
+	#ClassicTRoptionsPane #ctraddon_pw_contextitem:-moz-locale-dir(rtl) label,
+	#ClassicTRoptionsPane #ctraddon_pw_puictrbutton:-moz-locale-dir(rtl) label{
 	  background:url('chrome://classic_theme_restorer/content/images/appmenu_ctr.png') no-repeat right !important;
 	  padding-right:20px !important;
 	  min-height:18px !important;
 	}
-	
-	
-}
\ No newline at end of file
+
+/*}*/
\ No newline at end of file
diff --git a/xpi/content/overlay.js b/xpi/content/overlay.js
index 7c492cc..97876a2 100644
--- a/xpi/content/overlay.js
+++ b/xpi/content/overlay.js
@@ -814,7 +814,7 @@ classicthemerestorerjs.ctr = {
 		  case "nbcompact":
 			if (branch.getBoolPref("nbcompact") && branch.getBoolPref("backforward") && classicthemerestorerjs.ctr.osstring!="Darwin"&& branch.getBoolPref("smallnavbut")==false && classicthemerestorerjs.ctr.fxdefaulttheme==true){
 			  classicthemerestorerjs.ctr.loadUnloadCSS("nbcompact",true);
-			  console.log(branch.getCharPref("nav_txt_ico").indexOf('iconstxt'));
+			  /*console.log(branch.getCharPref("nav_txt_ico").indexOf('iconstxt'));*/
 			  if (branch.getCharPref("nav_txt_ico").indexOf('iconstxt')!=-1)
 				branch.setCharPref("nav_txt_ico",'icons');
 			}
@@ -3374,7 +3374,6 @@ classicthemerestorerjs.ctr = {
 			
 				this.aerocolors=ios.newURI("data:text/css;charset=utf-8," + encodeURIComponent('\
 					@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);\
-					@-moz-document url(chrome://browser/content/browser.xul) {\
 						/* Toolbars */\
 						#main-window[defaultfxtheme="true"] :not(#theFoxOnlyBetter-slimChrome-toolbars) > #nav-bar:not(:-moz-lwtheme){\
 						  background-image: linear-gradient(#eaf2fb,#dbeaf9) !important;\
@@ -3460,7 +3459,6 @@ classicthemerestorerjs.ctr = {
 							  border-bottom: none !important;\
 							}\
 						}\
-					}\
 					'+aero_color_tabs+'\
 					'+aero_color_addonsm+'\
 					'+aero_color_optionsp+'\
@@ -3478,7 +3476,6 @@ classicthemerestorerjs.ctr = {
 			
 				this.appbutton_color=ios.newURI("data:text/css;charset=utf-8," + encodeURIComponent('\
 					@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);\
-					@-moz-document url(chrome://browser/content/browser.xul) {\
 						#navigator-toolbox #TabsToolbar #ctraddon_panelui-button #PanelUI-menu-button {\
 						  background: linear-gradient('+this.prefs.getCharPref('cappbutc1')+', '+this.prefs.getCharPref('cappbutc2')+' 95%) !important;\
 						  border-color: rgba(83,42,6,.9) !important;\
@@ -3508,7 +3505,6 @@ classicthemerestorerjs.ctr = {
 			
 				this.appbutton_color=ios.newURI("data:text/css;charset=utf-8," + encodeURIComponent('\
 					@namespace url(http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul);\
-					@-moz-document url(chrome://browser/content/browser.xul) {\
 						#ctraddon_appbutton2:not(:hover):not(:active):not([open]){\
 						  background-image: linear-gradient('+this.prefs.getCharPref('cappbutc1')+', '+this.prefs.getCharPref('cappbutc2')+' 95%) !important;\
 						  border-color: hsla(210,59%,13%,.9) !important;\
@@ -3560,7 +3556,6 @@ classicthemerestorerjs.ctr = {
 						#main-window[privatebrowsingmode=temporary]  #ctraddon_appbutton2[open] {\
 						  background-image: linear-gradient(rgb(144,20,207), rgb(95,0,158) 95%) !important;\
 						}\
-					}\
 				'), null, null);
 			
 				applyNewSheet(this.appbutton_color);
diff --git a/xpi/install.rdf b/xpi/install.rdf
index 07d029a..ce0ee47 100644
--- a/xpi/install.rdf
+++ b/xpi/install.rdf
@@ -5,7 +5,7 @@
 	<Description rdf:about="urn:mozilla:install-manifest">
 		<em:id>ClassicThemeRestorer@ArisT2Noia4dev</em:id>
 		<em:name>Classic Theme Restorer</em:name>
-		<em:version>1.3.9beta7</em:version>
+		<em:version>1.3.9beta8</em:version>
 		<em:type>2</em:type>
 		<em:multiprocessCompatible>true</em:multiprocessCompatible>