add a temporary workaround to make firefox scrollbars visible with gtk 3.20

7 files changed, 374 insertions, 148 deletions

diff --git a/common/gtk-3.0/3.20/gtk-dark.css b/common/gtk-3.0/3.20/gtk-dark.css
index f27e5d2..ddd8cbf 100644
--- a/common/gtk-3.0/3.20/gtk-dark.css
+++ b/common/gtk-3.0/3.20/gtk-dark.css
@@ -1762,85 +1762,122 @@ notebook {
   -GtkScrollbar-has-backward-stepper: false;
   -GtkScrollbar-has-forward-stepper: false; }
 
-scrollbar button {
+scrollbar button,
+.scrollbar button {
   border: none; }
 
-scrollbar.vertical button.down {
+scrollbar.vertical button.down,
+.scrollbar.vertical button.down {
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
 
-scrollbar.vertical button.up {
+scrollbar.vertical button.up,
+.scrollbar.vertical button.up {
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
 
-scrollbar.horizontal button.down {
+scrollbar.horizontal button.down,
+.scrollbar.horizontal button.down {
   -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); }
 
-scrollbar.horizontal button.up {
+scrollbar.horizontal button.up,
+.scrollbar.horizontal button.up {
   -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); }
 
-scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
+scrollbar.overlay-indicator:not(.dragging):not(.hovering),
+.scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
   opacity: 0.4; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
     margin: 0;
     background-color: #a5abb5;
     border: 1px solid rgba(0, 0, 0, 0.3);
     background-clip: padding-box; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough {
     border-style: none;
     background-color: transparent; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
     min-width: 4px;
     margin-top: 2px;
     margin-bottom: 2px; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
     min-height: 4px;
     margin-left: 2px;
     margin-right: 2px; }
 
-scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering {
+scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering,
+.scrollbar.overlay-indicator.dragging,
+.scrollbar.overlay-indicator.hovering {
   opacity: 0.99; }
 
-scrollbar trough {
+scrollbar trough,
+.scrollbar trough {
   background-color: #3e434f;
   border: 1px none #2b2e39; }
 
-scrollbar slider {
+scrollbar slider,
+scrollbar .slider,
+.scrollbar slider,
+.scrollbar .slider {
   background-color: #767b87; }
-  scrollbar slider:hover {
+  scrollbar slider:hover,
+  scrollbar .slider:hover,
+  .scrollbar slider:hover,
+  .scrollbar .slider:hover {
     background-color: #676b78; }
-  scrollbar slider:hover:active {
+  scrollbar slider:hover:active,
+  scrollbar .slider:hover:active,
+  .scrollbar slider:hover:active,
+  .scrollbar .slider:hover:active {
     background-color: #5294E2; }
-  scrollbar slider:disabled {
+  scrollbar slider:disabled,
+  scrollbar .slider:disabled,
+  .scrollbar slider:disabled,
+  .scrollbar .slider:disabled {
     background-color: transparent; }
 
-scrollbar slider {
+scrollbar slider,
+scrollbar .slider,
+.scrollbar slider,
+.scrollbar .slider {
   border-radius: 100px;
   margin: 3px; }
 
-scrollbar.vertical.fine-tune slider {
+scrollbar.vertical.fine-tune slider,
+.scrollbar.vertical.fine-tune slider {
   min-width: 4px;
   margin: 4px; }
 
-scrollbar.vertical slider {
+scrollbar.vertical slider,
+.scrollbar.vertical slider {
   min-height: 42px;
   min-width: 6px;
   margin: 3px; }
 
-scrollbar.vertical trough:dir(ltr) {
+scrollbar.vertical trough:dir(ltr),
+.scrollbar.vertical trough:dir(ltr) {
   border-left-style: solid; }
 
-scrollbar.vertical trough:dir(rtl) {
+scrollbar.vertical trough:dir(rtl),
+.scrollbar.vertical trough:dir(rtl) {
   border-right-style: solid; }
 
-scrollbar.horizontal.fine-tune slider {
+scrollbar.horizontal.fine-tune slider,
+.scrollbar.horizontal.fine-tune slider {
   min-height: 4px;
   margin: 4px; }
 
-scrollbar.horizontal slider {
+scrollbar.horizontal slider,
+scrollbar.horizontal .slider,
+.scrollbar.horizontal slider,
+.scrollbar.horizontal .slider {
   min-height: 6px;
   min-width: 42px;
   margin-top: 3px; }
 
-scrollbar.horizontal trough {
+scrollbar.horizontal trough,
+.scrollbar.horizontal trough {
   border-top-style: solid; }
 
 switch {
diff --git a/common/gtk-3.0/3.20/gtk-darker.css b/common/gtk-3.0/3.20/gtk-darker.css
index bc61f3b..fb0032c 100644
--- a/common/gtk-3.0/3.20/gtk-darker.css
+++ b/common/gtk-3.0/3.20/gtk-darker.css
@@ -1761,85 +1761,122 @@ notebook {
   -GtkScrollbar-has-backward-stepper: false;
   -GtkScrollbar-has-forward-stepper: false; }
 
-scrollbar button {
+scrollbar button,
+.scrollbar button {
   border: none; }
 
-scrollbar.vertical button.down {
+scrollbar.vertical button.down,
+.scrollbar.vertical button.down {
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
 
-scrollbar.vertical button.up {
+scrollbar.vertical button.up,
+.scrollbar.vertical button.up {
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
 
-scrollbar.horizontal button.down {
+scrollbar.horizontal button.down,
+.scrollbar.horizontal button.down {
   -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); }
 
-scrollbar.horizontal button.up {
+scrollbar.horizontal button.up,
+.scrollbar.horizontal button.up {
   -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); }
 
-scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
+scrollbar.overlay-indicator:not(.dragging):not(.hovering),
+.scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
   opacity: 0.4; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
     margin: 0;
     background-color: #8a8e96;
     border: 1px solid rgba(255, 255, 255, 0.6);
     background-clip: padding-box; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough {
     border-style: none;
     background-color: transparent; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
     min-width: 4px;
     margin-top: 2px;
     margin-bottom: 2px; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
     min-height: 4px;
     margin-left: 2px;
     margin-right: 2px; }
 
-scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering {
+scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering,
+.scrollbar.overlay-indicator.dragging,
+.scrollbar.overlay-indicator.hovering {
   opacity: 0.99; }
 
-scrollbar trough {
+scrollbar trough,
+.scrollbar trough {
   background-color: #fcfcfc;
   border: 1px none #dcdfe3; }
 
-scrollbar slider {
+scrollbar slider,
+scrollbar .slider,
+.scrollbar slider,
+.scrollbar .slider {
   background-color: #b8babf; }
-  scrollbar slider:hover {
+  scrollbar slider:hover,
+  scrollbar .slider:hover,
+  .scrollbar slider:hover,
+  .scrollbar .slider:hover {
     background-color: #c7c9cd; }
-  scrollbar slider:hover:active {
+  scrollbar slider:hover:active,
+  scrollbar .slider:hover:active,
+  .scrollbar slider:hover:active,
+  .scrollbar .slider:hover:active {
     background-color: #5294E2; }
-  scrollbar slider:disabled {
+  scrollbar slider:disabled,
+  scrollbar .slider:disabled,
+  .scrollbar slider:disabled,
+  .scrollbar .slider:disabled {
     background-color: transparent; }
 
-scrollbar slider {
+scrollbar slider,
+scrollbar .slider,
+.scrollbar slider,
+.scrollbar .slider {
   border-radius: 100px;
   margin: 3px; }
 
-scrollbar.vertical.fine-tune slider {
+scrollbar.vertical.fine-tune slider,
+.scrollbar.vertical.fine-tune slider {
   min-width: 4px;
   margin: 4px; }
 
-scrollbar.vertical slider {
+scrollbar.vertical slider,
+.scrollbar.vertical slider {
   min-height: 42px;
   min-width: 6px;
   margin: 3px; }
 
-scrollbar.vertical trough:dir(ltr) {
+scrollbar.vertical trough:dir(ltr),
+.scrollbar.vertical trough:dir(ltr) {
   border-left-style: solid; }
 
-scrollbar.vertical trough:dir(rtl) {
+scrollbar.vertical trough:dir(rtl),
+.scrollbar.vertical trough:dir(rtl) {
   border-right-style: solid; }
 
-scrollbar.horizontal.fine-tune slider {
+scrollbar.horizontal.fine-tune slider,
+.scrollbar.horizontal.fine-tune slider {
   min-height: 4px;
   margin: 4px; }
 
-scrollbar.horizontal slider {
+scrollbar.horizontal slider,
+scrollbar.horizontal .slider,
+.scrollbar.horizontal slider,
+.scrollbar.horizontal .slider {
   min-height: 6px;
   min-width: 42px;
   margin-top: 3px; }
 
-scrollbar.horizontal trough {
+scrollbar.horizontal trough,
+.scrollbar.horizontal trough {
   border-top-style: solid; }
 
 switch {
diff --git a/common/gtk-3.0/3.20/gtk-solid-dark.css b/common/gtk-3.0/3.20/gtk-solid-dark.css
index f1a4f92..dfe01e3 100644
--- a/common/gtk-3.0/3.20/gtk-solid-dark.css
+++ b/common/gtk-3.0/3.20/gtk-solid-dark.css
@@ -1762,85 +1762,122 @@ notebook {
   -GtkScrollbar-has-backward-stepper: false;
   -GtkScrollbar-has-forward-stepper: false; }
 
-scrollbar button {
+scrollbar button,
+.scrollbar button {
   border: none; }
 
-scrollbar.vertical button.down {
+scrollbar.vertical button.down,
+.scrollbar.vertical button.down {
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
 
-scrollbar.vertical button.up {
+scrollbar.vertical button.up,
+.scrollbar.vertical button.up {
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
 
-scrollbar.horizontal button.down {
+scrollbar.horizontal button.down,
+.scrollbar.horizontal button.down {
   -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); }
 
-scrollbar.horizontal button.up {
+scrollbar.horizontal button.up,
+.scrollbar.horizontal button.up {
   -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); }
 
-scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
+scrollbar.overlay-indicator:not(.dragging):not(.hovering),
+.scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
   opacity: 0.4; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
     margin: 0;
     background-color: #a5abb5;
     border: 1px solid rgba(0, 0, 0, 0.3);
     background-clip: padding-box; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough {
     border-style: none;
     background-color: transparent; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
     min-width: 4px;
     margin-top: 2px;
     margin-bottom: 2px; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
     min-height: 4px;
     margin-left: 2px;
     margin-right: 2px; }
 
-scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering {
+scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering,
+.scrollbar.overlay-indicator.dragging,
+.scrollbar.overlay-indicator.hovering {
   opacity: 0.99; }
 
-scrollbar trough {
+scrollbar trough,
+.scrollbar trough {
   background-color: #3e434f;
   border: 1px none #2b2e39; }
 
-scrollbar slider {
+scrollbar slider,
+scrollbar .slider,
+.scrollbar slider,
+.scrollbar .slider {
   background-color: #767b87; }
-  scrollbar slider:hover {
+  scrollbar slider:hover,
+  scrollbar .slider:hover,
+  .scrollbar slider:hover,
+  .scrollbar .slider:hover {
     background-color: #676b78; }
-  scrollbar slider:hover:active {
+  scrollbar slider:hover:active,
+  scrollbar .slider:hover:active,
+  .scrollbar slider:hover:active,
+  .scrollbar .slider:hover:active {
     background-color: #5294E2; }
-  scrollbar slider:disabled {
+  scrollbar slider:disabled,
+  scrollbar .slider:disabled,
+  .scrollbar slider:disabled,
+  .scrollbar .slider:disabled {
     background-color: transparent; }
 
-scrollbar slider {
+scrollbar slider,
+scrollbar .slider,
+.scrollbar slider,
+.scrollbar .slider {
   border-radius: 100px;
   margin: 3px; }
 
-scrollbar.vertical.fine-tune slider {
+scrollbar.vertical.fine-tune slider,
+.scrollbar.vertical.fine-tune slider {
   min-width: 4px;
   margin: 4px; }
 
-scrollbar.vertical slider {
+scrollbar.vertical slider,
+.scrollbar.vertical slider {
   min-height: 42px;
   min-width: 6px;
   margin: 3px; }
 
-scrollbar.vertical trough:dir(ltr) {
+scrollbar.vertical trough:dir(ltr),
+.scrollbar.vertical trough:dir(ltr) {
   border-left-style: solid; }
 
-scrollbar.vertical trough:dir(rtl) {
+scrollbar.vertical trough:dir(rtl),
+.scrollbar.vertical trough:dir(rtl) {
   border-right-style: solid; }
 
-scrollbar.horizontal.fine-tune slider {
+scrollbar.horizontal.fine-tune slider,
+.scrollbar.horizontal.fine-tune slider {
   min-height: 4px;
   margin: 4px; }
 
-scrollbar.horizontal slider {
+scrollbar.horizontal slider,
+scrollbar.horizontal .slider,
+.scrollbar.horizontal slider,
+.scrollbar.horizontal .slider {
   min-height: 6px;
   min-width: 42px;
   margin-top: 3px; }
 
-scrollbar.horizontal trough {
+scrollbar.horizontal trough,
+.scrollbar.horizontal trough {
   border-top-style: solid; }
 
 switch {
diff --git a/common/gtk-3.0/3.20/gtk-solid-darker.css b/common/gtk-3.0/3.20/gtk-solid-darker.css
index 1b0081a..ea9ae5b 100644
--- a/common/gtk-3.0/3.20/gtk-solid-darker.css
+++ b/common/gtk-3.0/3.20/gtk-solid-darker.css
@@ -1761,85 +1761,122 @@ notebook {
   -GtkScrollbar-has-backward-stepper: false;
   -GtkScrollbar-has-forward-stepper: false; }
 
-scrollbar button {
+scrollbar button,
+.scrollbar button {
   border: none; }
 
-scrollbar.vertical button.down {
+scrollbar.vertical button.down,
+.scrollbar.vertical button.down {
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
 
-scrollbar.vertical button.up {
+scrollbar.vertical button.up,
+.scrollbar.vertical button.up {
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
 
-scrollbar.horizontal button.down {
+scrollbar.horizontal button.down,
+.scrollbar.horizontal button.down {
   -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); }
 
-scrollbar.horizontal button.up {
+scrollbar.horizontal button.up,
+.scrollbar.horizontal button.up {
   -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); }
 
-scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
+scrollbar.overlay-indicator:not(.dragging):not(.hovering),
+.scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
   opacity: 0.4; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
     margin: 0;
     background-color: #8a8e96;
     border: 1px solid rgba(255, 255, 255, 0.6);
     background-clip: padding-box; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough {
     border-style: none;
     background-color: transparent; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
     min-width: 4px;
     margin-top: 2px;
     margin-bottom: 2px; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
     min-height: 4px;
     margin-left: 2px;
     margin-right: 2px; }
 
-scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering {
+scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering,
+.scrollbar.overlay-indicator.dragging,
+.scrollbar.overlay-indicator.hovering {
   opacity: 0.99; }
 
-scrollbar trough {
+scrollbar trough,
+.scrollbar trough {
   background-color: #fcfcfc;
   border: 1px none #dcdfe3; }
 
-scrollbar slider {
+scrollbar slider,
+scrollbar .slider,
+.scrollbar slider,
+.scrollbar .slider {
   background-color: #b8babf; }
-  scrollbar slider:hover {
+  scrollbar slider:hover,
+  scrollbar .slider:hover,
+  .scrollbar slider:hover,
+  .scrollbar .slider:hover {
     background-color: #c7c9cd; }
-  scrollbar slider:hover:active {
+  scrollbar slider:hover:active,
+  scrollbar .slider:hover:active,
+  .scrollbar slider:hover:active,
+  .scrollbar .slider:hover:active {
     background-color: #5294E2; }
-  scrollbar slider:disabled {
+  scrollbar slider:disabled,
+  scrollbar .slider:disabled,
+  .scrollbar slider:disabled,
+  .scrollbar .slider:disabled {
     background-color: transparent; }
 
-scrollbar slider {
+scrollbar slider,
+scrollbar .slider,
+.scrollbar slider,
+.scrollbar .slider {
   border-radius: 100px;
   margin: 3px; }
 
-scrollbar.vertical.fine-tune slider {
+scrollbar.vertical.fine-tune slider,
+.scrollbar.vertical.fine-tune slider {
   min-width: 4px;
   margin: 4px; }
 
-scrollbar.vertical slider {
+scrollbar.vertical slider,
+.scrollbar.vertical slider {
   min-height: 42px;
   min-width: 6px;
   margin: 3px; }
 
-scrollbar.vertical trough:dir(ltr) {
+scrollbar.vertical trough:dir(ltr),
+.scrollbar.vertical trough:dir(ltr) {
   border-left-style: solid; }
 
-scrollbar.vertical trough:dir(rtl) {
+scrollbar.vertical trough:dir(rtl),
+.scrollbar.vertical trough:dir(rtl) {
   border-right-style: solid; }
 
-scrollbar.horizontal.fine-tune slider {
+scrollbar.horizontal.fine-tune slider,
+.scrollbar.horizontal.fine-tune slider {
   min-height: 4px;
   margin: 4px; }
 
-scrollbar.horizontal slider {
+scrollbar.horizontal slider,
+scrollbar.horizontal .slider,
+.scrollbar.horizontal slider,
+.scrollbar.horizontal .slider {
   min-height: 6px;
   min-width: 42px;
   margin-top: 3px; }
 
-scrollbar.horizontal trough {
+scrollbar.horizontal trough,
+.scrollbar.horizontal trough {
   border-top-style: solid; }
 
 switch {
diff --git a/common/gtk-3.0/3.20/gtk-solid.css b/common/gtk-3.0/3.20/gtk-solid.css
index 0fc5610..4a5e82a 100644
--- a/common/gtk-3.0/3.20/gtk-solid.css
+++ b/common/gtk-3.0/3.20/gtk-solid.css
@@ -1765,85 +1765,122 @@ notebook {
   -GtkScrollbar-has-backward-stepper: false;
   -GtkScrollbar-has-forward-stepper: false; }
 
-scrollbar button {
+scrollbar button,
+.scrollbar button {
   border: none; }
 
-scrollbar.vertical button.down {
+scrollbar.vertical button.down,
+.scrollbar.vertical button.down {
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
 
-scrollbar.vertical button.up {
+scrollbar.vertical button.up,
+.scrollbar.vertical button.up {
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
 
-scrollbar.horizontal button.down {
+scrollbar.horizontal button.down,
+.scrollbar.horizontal button.down {
   -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); }
 
-scrollbar.horizontal button.up {
+scrollbar.horizontal button.up,
+.scrollbar.horizontal button.up {
   -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); }
 
-scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
+scrollbar.overlay-indicator:not(.dragging):not(.hovering),
+.scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
   opacity: 0.4; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
     margin: 0;
     background-color: #8a8e96;
     border: 1px solid rgba(255, 255, 255, 0.6);
     background-clip: padding-box; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough {
     border-style: none;
     background-color: transparent; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
     min-width: 4px;
     margin-top: 2px;
     margin-bottom: 2px; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
     min-height: 4px;
     margin-left: 2px;
     margin-right: 2px; }
 
-scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering {
+scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering,
+.scrollbar.overlay-indicator.dragging,
+.scrollbar.overlay-indicator.hovering {
   opacity: 0.99; }
 
-scrollbar trough {
+scrollbar trough,
+.scrollbar trough {
   background-color: #fcfcfc;
   border: 1px none #dcdfe3; }
 
-scrollbar slider {
+scrollbar slider,
+scrollbar .slider,
+.scrollbar slider,
+.scrollbar .slider {
   background-color: #b8babf; }
-  scrollbar slider:hover {
+  scrollbar slider:hover,
+  scrollbar .slider:hover,
+  .scrollbar slider:hover,
+  .scrollbar .slider:hover {
     background-color: #c7c9cd; }
-  scrollbar slider:hover:active {
+  scrollbar slider:hover:active,
+  scrollbar .slider:hover:active,
+  .scrollbar slider:hover:active,
+  .scrollbar .slider:hover:active {
     background-color: #5294E2; }
-  scrollbar slider:disabled {
+  scrollbar slider:disabled,
+  scrollbar .slider:disabled,
+  .scrollbar slider:disabled,
+  .scrollbar .slider:disabled {
     background-color: transparent; }
 
-scrollbar slider {
+scrollbar slider,
+scrollbar .slider,
+.scrollbar slider,
+.scrollbar .slider {
   border-radius: 100px;
   margin: 3px; }
 
-scrollbar.vertical.fine-tune slider {
+scrollbar.vertical.fine-tune slider,
+.scrollbar.vertical.fine-tune slider {
   min-width: 4px;
   margin: 4px; }
 
-scrollbar.vertical slider {
+scrollbar.vertical slider,
+.scrollbar.vertical slider {
   min-height: 42px;
   min-width: 6px;
   margin: 3px; }
 
-scrollbar.vertical trough:dir(ltr) {
+scrollbar.vertical trough:dir(ltr),
+.scrollbar.vertical trough:dir(ltr) {
   border-left-style: solid; }
 
-scrollbar.vertical trough:dir(rtl) {
+scrollbar.vertical trough:dir(rtl),
+.scrollbar.vertical trough:dir(rtl) {
   border-right-style: solid; }
 
-scrollbar.horizontal.fine-tune slider {
+scrollbar.horizontal.fine-tune slider,
+.scrollbar.horizontal.fine-tune slider {
   min-height: 4px;
   margin: 4px; }
 
-scrollbar.horizontal slider {
+scrollbar.horizontal slider,
+scrollbar.horizontal .slider,
+.scrollbar.horizontal slider,
+.scrollbar.horizontal .slider {
   min-height: 6px;
   min-width: 42px;
   margin-top: 3px; }
 
-scrollbar.horizontal trough {
+scrollbar.horizontal trough,
+.scrollbar.horizontal trough {
   border-top-style: solid; }
 
 switch {
diff --git a/common/gtk-3.0/3.20/gtk.css b/common/gtk-3.0/3.20/gtk.css
index 691808e..04b38a1 100644
--- a/common/gtk-3.0/3.20/gtk.css
+++ b/common/gtk-3.0/3.20/gtk.css
@@ -1765,85 +1765,122 @@ notebook {
   -GtkScrollbar-has-backward-stepper: false;
   -GtkScrollbar-has-forward-stepper: false; }
 
-scrollbar button {
+scrollbar button,
+.scrollbar button {
   border: none; }
 
-scrollbar.vertical button.down {
+scrollbar.vertical button.down,
+.scrollbar.vertical button.down {
   -gtk-icon-source: -gtk-icontheme("pan-down-symbolic"); }
 
-scrollbar.vertical button.up {
+scrollbar.vertical button.up,
+.scrollbar.vertical button.up {
   -gtk-icon-source: -gtk-icontheme("pan-up-symbolic"); }
 
-scrollbar.horizontal button.down {
+scrollbar.horizontal button.down,
+.scrollbar.horizontal button.down {
   -gtk-icon-source: -gtk-icontheme("pan-right-symbolic"); }
 
-scrollbar.horizontal button.up {
+scrollbar.horizontal button.up,
+.scrollbar.horizontal button.up {
   -gtk-icon-source: -gtk-icontheme("pan-left-symbolic"); }
 
-scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
+scrollbar.overlay-indicator:not(.dragging):not(.hovering),
+.scrollbar.overlay-indicator:not(.dragging):not(.hovering) {
   opacity: 0.4; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering) slider {
     margin: 0;
     background-color: #8a8e96;
     border: 1px solid rgba(255, 255, 255, 0.6);
     background-clip: padding-box; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering) trough {
     border-style: none;
     background-color: transparent; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering).vertical slider {
     min-width: 4px;
     margin-top: 2px;
     margin-bottom: 2px; }
-  scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
+  scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider,
+  .scrollbar.overlay-indicator:not(.dragging):not(.hovering).horizontal slider {
     min-height: 4px;
     margin-left: 2px;
     margin-right: 2px; }
 
-scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering {
+scrollbar.overlay-indicator.dragging, scrollbar.overlay-indicator.hovering,
+.scrollbar.overlay-indicator.dragging,
+.scrollbar.overlay-indicator.hovering {
   opacity: 0.99; }
 
-scrollbar trough {
+scrollbar trough,
+.scrollbar trough {
   background-color: #fcfcfc;
   border: 1px none #dcdfe3; }
 
-scrollbar slider {
+scrollbar slider,
+scrollbar .slider,
+.scrollbar slider,
+.scrollbar .slider {
   background-color: #b8babf; }
-  scrollbar slider:hover {
+  scrollbar slider:hover,
+  scrollbar .slider:hover,
+  .scrollbar slider:hover,
+  .scrollbar .slider:hover {
     background-color: #c7c9cd; }
-  scrollbar slider:hover:active {
+  scrollbar slider:hover:active,
+  scrollbar .slider:hover:active,
+  .scrollbar slider:hover:active,
+  .scrollbar .slider:hover:active {
     background-color: #5294E2; }
-  scrollbar slider:disabled {
+  scrollbar slider:disabled,
+  scrollbar .slider:disabled,
+  .scrollbar slider:disabled,
+  .scrollbar .slider:disabled {
     background-color: transparent; }
 
-scrollbar slider {
+scrollbar slider,
+scrollbar .slider,
+.scrollbar slider,
+.scrollbar .slider {
   border-radius: 100px;
   margin: 3px; }
 
-scrollbar.vertical.fine-tune slider {
+scrollbar.vertical.fine-tune slider,
+.scrollbar.vertical.fine-tune slider {
   min-width: 4px;
   margin: 4px; }
 
-scrollbar.vertical slider {
+scrollbar.vertical slider,
+.scrollbar.vertical slider {
   min-height: 42px;
   min-width: 6px;
   margin: 3px; }
 
-scrollbar.vertical trough:dir(ltr) {
+scrollbar.vertical trough:dir(ltr),
+.scrollbar.vertical trough:dir(ltr) {
   border-left-style: solid; }
 
-scrollbar.vertical trough:dir(rtl) {
+scrollbar.vertical trough:dir(rtl),
+.scrollbar.vertical trough:dir(rtl) {
   border-right-style: solid; }
 
-scrollbar.horizontal.fine-tune slider {
+scrollbar.horizontal.fine-tune slider,
+.scrollbar.horizontal.fine-tune slider {
   min-height: 4px;
   margin: 4px; }
 
-scrollbar.horizontal slider {
+scrollbar.horizontal slider,
+scrollbar.horizontal .slider,
+.scrollbar.horizontal slider,
+.scrollbar.horizontal .slider {
   min-height: 6px;
   min-width: 42px;
   margin-top: 3px; }
 
-scrollbar.horizontal trough {
+scrollbar.horizontal trough,
+.scrollbar.horizontal trough {
   border-top-style: solid; }
 
 switch {
diff --git a/common/gtk-3.0/3.20/sass/_common.scss b/common/gtk-3.0/3.20/sass/_common.scss
index b163e62..09c42fa 100644
--- a/common/gtk-3.0/3.20/sass/_common.scss
+++ b/common/gtk-3.0/3.20/sass/_common.scss
@@ -1859,7 +1859,8 @@ notebook {
 //
 $_scrollbar_bg_color: darken($base_color, 1%);
 
-scrollbar {
+scrollbar,
+.scrollbar {
   @at-root * {
     -GtkScrollbar-has-backward-stepper: false;
     -GtkScrollbar-has-forward-stepper: false;
@@ -1920,7 +1921,8 @@ scrollbar {
   }
 
   // slider coloring
-  slider {
+  slider,
+  .slider {
     background-color: mix($fg_color, $bg_color, 40%);
 
     &:hover { background-color: mix($fg_color, $bg_color, 30%); }
@@ -1933,7 +1935,8 @@ scrollbar {
   }
 
   // sizing
-  slider {
+  slider,
+  .slider {
     border-radius: 100px;
     margin: $_slider_margin;
   }
@@ -1964,7 +1967,8 @@ scrollbar {
       margin: $_slider_fine_tune_margin;
     }
 
-    slider {
+    slider,
+    .slider {
       min-height: 6px;
       min-width: 42px;
       margin-top: $_slider_margin;