some refactoring

7 files changed, 275 insertions, 436 deletions

diff --git a/common/gtk-3.0/3.16/gtk-contained-dark.css b/common/gtk-3.0/3.16/gtk-contained-dark.css
index a418860..5a46986 100644
--- a/common/gtk-3.0/3.16/gtk-contained-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-dark.css
@@ -3720,56 +3720,6 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view {
   NemoWindow .source-list.sidebar.view .separator,
   MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow .source-list.sidebar.view .separator {
     color: transparent; }
-  GtkFileChooserDialog .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NautilusWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NautilusWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NemoWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NemoWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  MarlinViewWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider {
-    background-color: #e7eaee;
-    border: 1px solid rgba(0, 0, 0, 0.3); }
-  GtkFileChooserDialog .sidebar .scrollbar .trough,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough,
-  NautilusWindow .sidebar .scrollbar .trough,
-  NautilusWindow .source-list.sidebar.view .scrollbar .trough,
-  NemoWindow .sidebar .scrollbar .trough,
-  NemoWindow .source-list.sidebar.view .scrollbar .trough,
-  MarlinViewWindow .sidebar .scrollbar .trough, MarlinViewWindow .source-list.sidebar.view .scrollbar .trough {
-    background-color: rgba(0, 0, 0, 0.2);
-    border: none; }
-  GtkFileChooserDialog .sidebar .scrollbar .slider,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider,
-  NautilusWindow .sidebar .scrollbar .slider,
-  NautilusWindow .source-list.sidebar.view .scrollbar .slider,
-  NemoWindow .sidebar .scrollbar .slider,
-  NemoWindow .source-list.sidebar.view .scrollbar .slider,
-  MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider {
-    background-color: rgba(231, 234, 238, 0.7); }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:hover,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:hover,
-    NautilusWindow .sidebar .scrollbar .slider:hover,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:hover,
-    NemoWindow .sidebar .scrollbar .slider:hover,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:hover,
-    MarlinViewWindow .sidebar .scrollbar .slider:hover, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:hover {
-      background-color: #f6f7f9; }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    NautilusWindow .sidebar .scrollbar .slider:prelight:active,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    NemoWindow .sidebar .scrollbar .slider:prelight:active,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    MarlinViewWindow .sidebar .scrollbar .slider:prelight:active, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:prelight:active {
-      background-color: #5294E2; }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:insensitive,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:insensitive,
-    NautilusWindow .sidebar .scrollbar .slider:insensitive,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:insensitive,
-    NemoWindow .sidebar .scrollbar .slider:insensitive,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:insensitive,
-    MarlinViewWindow .sidebar .scrollbar .slider:insensitive, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:insensitive {
-      background-color: transparent; }
 
 GtkFileChooserDialog.maximized .sidebar,
 NautilusWindow.maximized .sidebar,
@@ -3877,20 +3827,6 @@ GeditFileBrowserWidget {
   background-color: rgba(53, 57, 69, 0.95); }
   .maximized GeditFileBrowserWidget {
     background-color: #353945; }
-  GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider {
-    background-color: #e7eaee;
-    border: 1px solid rgba(0, 0, 0, 0.3); }
-  GeditFileBrowserWidget .scrollbar .trough {
-    background-color: rgba(0, 0, 0, 0.2);
-    border: none; }
-  GeditFileBrowserWidget .scrollbar .slider {
-    background-color: rgba(231, 234, 238, 0.7); }
-    GeditFileBrowserWidget .scrollbar .slider:hover {
-      background-color: #e7eaee; }
-    GeditFileBrowserWidget .scrollbar .slider:prelight:active {
-      background-color: #5294E2; }
-    GeditFileBrowserWidget .scrollbar .slider:insensitive {
-      background-color: transparent; }
   GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: rgba(37, 40, 49, 0.95); }
@@ -3950,6 +3886,47 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
     color: rgba(186, 195, 207, 0.55);
     background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); }
 
+GtkFileChooserDialog .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+NautilusWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+NemoWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+MarlinViewWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider, GeditFileBrowserWidget .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider {
+  background-color: #e7eaee;
+  border: 1px solid rgba(0, 0, 0, 0.3); }
+
+GtkFileChooserDialog .sidebar .scrollbar .trough,
+GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough,
+NautilusWindow .sidebar .scrollbar .trough,
+NautilusWindow .source-list.sidebar.view .scrollbar .trough,
+NemoWindow .sidebar .scrollbar .trough,
+NemoWindow .source-list.sidebar.view .scrollbar .trough,
+MarlinViewWindow .sidebar .scrollbar .trough, MarlinViewWindow .source-list.sidebar.view .scrollbar .trough, GeditFileBrowserWidget .scrollbar .trough {
+  background-color: rgba(0, 0, 0, 0.2);
+  border: none; }
+
+GtkFileChooserDialog .sidebar .scrollbar .slider,
+GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider,
+NautilusWindow .sidebar .scrollbar .slider,
+NautilusWindow .source-list.sidebar.view .scrollbar .slider,
+NemoWindow .sidebar .scrollbar .slider,
+NemoWindow .source-list.sidebar.view .scrollbar .slider,
+MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserWidget .scrollbar .slider {
+  background-color: rgba(231, 234, 238, 0.7); }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:hover,
+  NautilusWindow .sidebar .scrollbar .slider:hover,
+  NemoWindow .sidebar .scrollbar .slider:hover,
+  MarlinViewWindow .sidebar .scrollbar .slider:hover, GeditFileBrowserWidget .scrollbar .slider:hover {
+    background-color: #f6f7f9; }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active,
+  NautilusWindow .sidebar .scrollbar .slider:prelight:active,
+  NemoWindow .sidebar .scrollbar .slider:prelight:active,
+  MarlinViewWindow .sidebar .scrollbar .slider:prelight:active, GeditFileBrowserWidget .scrollbar .slider:prelight:active {
+    background-color: #5294E2; }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:insensitive,
+  NautilusWindow .sidebar .scrollbar .slider:insensitive,
+  NemoWindow .sidebar .scrollbar .slider:insensitive,
+  MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive {
+    background-color: transparent; }
+
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #D3DAE3;
 @define-color theme_text_color #D3DAE3;
diff --git a/common/gtk-3.0/3.16/gtk-contained-darker.css b/common/gtk-3.0/3.16/gtk-contained-darker.css
index 6c2f78b..9928a37 100644
--- a/common/gtk-3.0/3.16/gtk-contained-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-darker.css
@@ -3713,56 +3713,6 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view {
   NemoWindow .source-list.sidebar.view .separator,
   MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow .source-list.sidebar.view .separator {
     color: transparent; }
-  GtkFileChooserDialog .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NautilusWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NautilusWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NemoWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NemoWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  MarlinViewWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider {
-    background-color: #e7eaee;
-    border: 1px solid rgba(0, 0, 0, 0.3); }
-  GtkFileChooserDialog .sidebar .scrollbar .trough,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough,
-  NautilusWindow .sidebar .scrollbar .trough,
-  NautilusWindow .source-list.sidebar.view .scrollbar .trough,
-  NemoWindow .sidebar .scrollbar .trough,
-  NemoWindow .source-list.sidebar.view .scrollbar .trough,
-  MarlinViewWindow .sidebar .scrollbar .trough, MarlinViewWindow .source-list.sidebar.view .scrollbar .trough {
-    background-color: rgba(0, 0, 0, 0.2);
-    border: none; }
-  GtkFileChooserDialog .sidebar .scrollbar .slider,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider,
-  NautilusWindow .sidebar .scrollbar .slider,
-  NautilusWindow .source-list.sidebar.view .scrollbar .slider,
-  NemoWindow .sidebar .scrollbar .slider,
-  NemoWindow .source-list.sidebar.view .scrollbar .slider,
-  MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider {
-    background-color: rgba(231, 234, 238, 0.7); }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:hover,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:hover,
-    NautilusWindow .sidebar .scrollbar .slider:hover,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:hover,
-    NemoWindow .sidebar .scrollbar .slider:hover,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:hover,
-    MarlinViewWindow .sidebar .scrollbar .slider:hover, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:hover {
-      background-color: #f6f7f9; }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    NautilusWindow .sidebar .scrollbar .slider:prelight:active,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    NemoWindow .sidebar .scrollbar .slider:prelight:active,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    MarlinViewWindow .sidebar .scrollbar .slider:prelight:active, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:prelight:active {
-      background-color: #5294E2; }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:insensitive,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:insensitive,
-    NautilusWindow .sidebar .scrollbar .slider:insensitive,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:insensitive,
-    NemoWindow .sidebar .scrollbar .slider:insensitive,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:insensitive,
-    MarlinViewWindow .sidebar .scrollbar .slider:insensitive, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:insensitive {
-      background-color: transparent; }
 
 GtkFileChooserDialog.maximized .sidebar,
 NautilusWindow.maximized .sidebar,
@@ -3870,20 +3820,6 @@ GeditFileBrowserWidget {
   background-color: rgba(53, 57, 69, 0.95); }
   .maximized GeditFileBrowserWidget {
     background-color: #353945; }
-  GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider {
-    background-color: #e7eaee;
-    border: 1px solid rgba(0, 0, 0, 0.3); }
-  GeditFileBrowserWidget .scrollbar .trough {
-    background-color: rgba(0, 0, 0, 0.2);
-    border: none; }
-  GeditFileBrowserWidget .scrollbar .slider {
-    background-color: rgba(231, 234, 238, 0.7); }
-    GeditFileBrowserWidget .scrollbar .slider:hover {
-      background-color: #e7eaee; }
-    GeditFileBrowserWidget .scrollbar .slider:prelight:active {
-      background-color: #5294E2; }
-    GeditFileBrowserWidget .scrollbar .slider:insensitive {
-      background-color: transparent; }
   GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: rgba(37, 40, 49, 0.95); }
@@ -3943,6 +3879,47 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
     color: rgba(186, 195, 207, 0.55);
     background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); }
 
+GtkFileChooserDialog .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+NautilusWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+NemoWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+MarlinViewWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider, GeditFileBrowserWidget .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider {
+  background-color: #e7eaee;
+  border: 1px solid rgba(0, 0, 0, 0.3); }
+
+GtkFileChooserDialog .sidebar .scrollbar .trough,
+GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough,
+NautilusWindow .sidebar .scrollbar .trough,
+NautilusWindow .source-list.sidebar.view .scrollbar .trough,
+NemoWindow .sidebar .scrollbar .trough,
+NemoWindow .source-list.sidebar.view .scrollbar .trough,
+MarlinViewWindow .sidebar .scrollbar .trough, MarlinViewWindow .source-list.sidebar.view .scrollbar .trough, GeditFileBrowserWidget .scrollbar .trough {
+  background-color: rgba(0, 0, 0, 0.2);
+  border: none; }
+
+GtkFileChooserDialog .sidebar .scrollbar .slider,
+GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider,
+NautilusWindow .sidebar .scrollbar .slider,
+NautilusWindow .source-list.sidebar.view .scrollbar .slider,
+NemoWindow .sidebar .scrollbar .slider,
+NemoWindow .source-list.sidebar.view .scrollbar .slider,
+MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserWidget .scrollbar .slider {
+  background-color: rgba(231, 234, 238, 0.7); }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:hover,
+  NautilusWindow .sidebar .scrollbar .slider:hover,
+  NemoWindow .sidebar .scrollbar .slider:hover,
+  MarlinViewWindow .sidebar .scrollbar .slider:hover, GeditFileBrowserWidget .scrollbar .slider:hover {
+    background-color: #f6f7f9; }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active,
+  NautilusWindow .sidebar .scrollbar .slider:prelight:active,
+  NemoWindow .sidebar .scrollbar .slider:prelight:active,
+  MarlinViewWindow .sidebar .scrollbar .slider:prelight:active, GeditFileBrowserWidget .scrollbar .slider:prelight:active {
+    background-color: #5294E2; }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:insensitive,
+  NautilusWindow .sidebar .scrollbar .slider:insensitive,
+  NemoWindow .sidebar .scrollbar .slider:insensitive,
+  MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive {
+    background-color: transparent; }
+
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #5c616c;
 @define-color theme_text_color #5c616c;
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
index 50f8d54..97d54ae 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-dark.css
@@ -3720,56 +3720,6 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view {
   NemoWindow .source-list.sidebar.view .separator,
   MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow .source-list.sidebar.view .separator {
     color: transparent; }
-  GtkFileChooserDialog .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NautilusWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NautilusWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NemoWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NemoWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  MarlinViewWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider {
-    background-color: #e7eaee;
-    border: 1px solid rgba(0, 0, 0, 0.3); }
-  GtkFileChooserDialog .sidebar .scrollbar .trough,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough,
-  NautilusWindow .sidebar .scrollbar .trough,
-  NautilusWindow .source-list.sidebar.view .scrollbar .trough,
-  NemoWindow .sidebar .scrollbar .trough,
-  NemoWindow .source-list.sidebar.view .scrollbar .trough,
-  MarlinViewWindow .sidebar .scrollbar .trough, MarlinViewWindow .source-list.sidebar.view .scrollbar .trough {
-    background-color: rgba(0, 0, 0, 0.2);
-    border: none; }
-  GtkFileChooserDialog .sidebar .scrollbar .slider,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider,
-  NautilusWindow .sidebar .scrollbar .slider,
-  NautilusWindow .source-list.sidebar.view .scrollbar .slider,
-  NemoWindow .sidebar .scrollbar .slider,
-  NemoWindow .source-list.sidebar.view .scrollbar .slider,
-  MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider {
-    background-color: rgba(231, 234, 238, 0.7); }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:hover,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:hover,
-    NautilusWindow .sidebar .scrollbar .slider:hover,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:hover,
-    NemoWindow .sidebar .scrollbar .slider:hover,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:hover,
-    MarlinViewWindow .sidebar .scrollbar .slider:hover, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:hover {
-      background-color: #f6f7f9; }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    NautilusWindow .sidebar .scrollbar .slider:prelight:active,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    NemoWindow .sidebar .scrollbar .slider:prelight:active,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    MarlinViewWindow .sidebar .scrollbar .slider:prelight:active, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:prelight:active {
-      background-color: #5294E2; }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:insensitive,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:insensitive,
-    NautilusWindow .sidebar .scrollbar .slider:insensitive,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:insensitive,
-    NemoWindow .sidebar .scrollbar .slider:insensitive,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:insensitive,
-    MarlinViewWindow .sidebar .scrollbar .slider:insensitive, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:insensitive {
-      background-color: transparent; }
 
 GtkFileChooserDialog.maximized .sidebar,
 NautilusWindow.maximized .sidebar,
@@ -3877,20 +3827,6 @@ GeditFileBrowserWidget {
   background-color: #353945; }
   .maximized GeditFileBrowserWidget {
     background-color: #353945; }
-  GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider {
-    background-color: #e7eaee;
-    border: 1px solid rgba(0, 0, 0, 0.3); }
-  GeditFileBrowserWidget .scrollbar .trough {
-    background-color: rgba(0, 0, 0, 0.2);
-    border: none; }
-  GeditFileBrowserWidget .scrollbar .slider {
-    background-color: rgba(231, 234, 238, 0.7); }
-    GeditFileBrowserWidget .scrollbar .slider:hover {
-      background-color: #e7eaee; }
-    GeditFileBrowserWidget .scrollbar .slider:prelight:active {
-      background-color: #5294E2; }
-    GeditFileBrowserWidget .scrollbar .slider:insensitive {
-      background-color: transparent; }
   GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: #252831; }
@@ -3950,6 +3886,47 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
     color: rgba(186, 195, 207, 0.55);
     background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); }
 
+GtkFileChooserDialog .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+NautilusWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+NemoWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+MarlinViewWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider, GeditFileBrowserWidget .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider {
+  background-color: #e7eaee;
+  border: 1px solid rgba(0, 0, 0, 0.3); }
+
+GtkFileChooserDialog .sidebar .scrollbar .trough,
+GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough,
+NautilusWindow .sidebar .scrollbar .trough,
+NautilusWindow .source-list.sidebar.view .scrollbar .trough,
+NemoWindow .sidebar .scrollbar .trough,
+NemoWindow .source-list.sidebar.view .scrollbar .trough,
+MarlinViewWindow .sidebar .scrollbar .trough, MarlinViewWindow .source-list.sidebar.view .scrollbar .trough, GeditFileBrowserWidget .scrollbar .trough {
+  background-color: rgba(0, 0, 0, 0.2);
+  border: none; }
+
+GtkFileChooserDialog .sidebar .scrollbar .slider,
+GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider,
+NautilusWindow .sidebar .scrollbar .slider,
+NautilusWindow .source-list.sidebar.view .scrollbar .slider,
+NemoWindow .sidebar .scrollbar .slider,
+NemoWindow .source-list.sidebar.view .scrollbar .slider,
+MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserWidget .scrollbar .slider {
+  background-color: rgba(231, 234, 238, 0.7); }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:hover,
+  NautilusWindow .sidebar .scrollbar .slider:hover,
+  NemoWindow .sidebar .scrollbar .slider:hover,
+  MarlinViewWindow .sidebar .scrollbar .slider:hover, GeditFileBrowserWidget .scrollbar .slider:hover {
+    background-color: #f6f7f9; }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active,
+  NautilusWindow .sidebar .scrollbar .slider:prelight:active,
+  NemoWindow .sidebar .scrollbar .slider:prelight:active,
+  MarlinViewWindow .sidebar .scrollbar .slider:prelight:active, GeditFileBrowserWidget .scrollbar .slider:prelight:active {
+    background-color: #5294E2; }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:insensitive,
+  NautilusWindow .sidebar .scrollbar .slider:insensitive,
+  NemoWindow .sidebar .scrollbar .slider:insensitive,
+  MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive {
+    background-color: transparent; }
+
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #D3DAE3;
 @define-color theme_text_color #D3DAE3;
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
index f182c9c..f80b217 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid-darker.css
@@ -3713,56 +3713,6 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view {
   NemoWindow .source-list.sidebar.view .separator,
   MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow .source-list.sidebar.view .separator {
     color: transparent; }
-  GtkFileChooserDialog .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NautilusWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NautilusWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NemoWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NemoWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  MarlinViewWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider {
-    background-color: #e7eaee;
-    border: 1px solid rgba(0, 0, 0, 0.3); }
-  GtkFileChooserDialog .sidebar .scrollbar .trough,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough,
-  NautilusWindow .sidebar .scrollbar .trough,
-  NautilusWindow .source-list.sidebar.view .scrollbar .trough,
-  NemoWindow .sidebar .scrollbar .trough,
-  NemoWindow .source-list.sidebar.view .scrollbar .trough,
-  MarlinViewWindow .sidebar .scrollbar .trough, MarlinViewWindow .source-list.sidebar.view .scrollbar .trough {
-    background-color: rgba(0, 0, 0, 0.2);
-    border: none; }
-  GtkFileChooserDialog .sidebar .scrollbar .slider,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider,
-  NautilusWindow .sidebar .scrollbar .slider,
-  NautilusWindow .source-list.sidebar.view .scrollbar .slider,
-  NemoWindow .sidebar .scrollbar .slider,
-  NemoWindow .source-list.sidebar.view .scrollbar .slider,
-  MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider {
-    background-color: rgba(231, 234, 238, 0.7); }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:hover,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:hover,
-    NautilusWindow .sidebar .scrollbar .slider:hover,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:hover,
-    NemoWindow .sidebar .scrollbar .slider:hover,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:hover,
-    MarlinViewWindow .sidebar .scrollbar .slider:hover, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:hover {
-      background-color: #f6f7f9; }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    NautilusWindow .sidebar .scrollbar .slider:prelight:active,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    NemoWindow .sidebar .scrollbar .slider:prelight:active,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    MarlinViewWindow .sidebar .scrollbar .slider:prelight:active, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:prelight:active {
-      background-color: #5294E2; }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:insensitive,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:insensitive,
-    NautilusWindow .sidebar .scrollbar .slider:insensitive,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:insensitive,
-    NemoWindow .sidebar .scrollbar .slider:insensitive,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:insensitive,
-    MarlinViewWindow .sidebar .scrollbar .slider:insensitive, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:insensitive {
-      background-color: transparent; }
 
 GtkFileChooserDialog.maximized .sidebar,
 NautilusWindow.maximized .sidebar,
@@ -3870,20 +3820,6 @@ GeditFileBrowserWidget {
   background-color: #353945; }
   .maximized GeditFileBrowserWidget {
     background-color: #353945; }
-  GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider {
-    background-color: #e7eaee;
-    border: 1px solid rgba(0, 0, 0, 0.3); }
-  GeditFileBrowserWidget .scrollbar .trough {
-    background-color: rgba(0, 0, 0, 0.2);
-    border: none; }
-  GeditFileBrowserWidget .scrollbar .slider {
-    background-color: rgba(231, 234, 238, 0.7); }
-    GeditFileBrowserWidget .scrollbar .slider:hover {
-      background-color: #e7eaee; }
-    GeditFileBrowserWidget .scrollbar .slider:prelight:active {
-      background-color: #5294E2; }
-    GeditFileBrowserWidget .scrollbar .slider:insensitive {
-      background-color: transparent; }
   GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: #252831; }
@@ -3943,6 +3879,47 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
     color: rgba(186, 195, 207, 0.55);
     background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); }
 
+GtkFileChooserDialog .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+NautilusWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+NemoWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+MarlinViewWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider, GeditFileBrowserWidget .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider {
+  background-color: #e7eaee;
+  border: 1px solid rgba(0, 0, 0, 0.3); }
+
+GtkFileChooserDialog .sidebar .scrollbar .trough,
+GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough,
+NautilusWindow .sidebar .scrollbar .trough,
+NautilusWindow .source-list.sidebar.view .scrollbar .trough,
+NemoWindow .sidebar .scrollbar .trough,
+NemoWindow .source-list.sidebar.view .scrollbar .trough,
+MarlinViewWindow .sidebar .scrollbar .trough, MarlinViewWindow .source-list.sidebar.view .scrollbar .trough, GeditFileBrowserWidget .scrollbar .trough {
+  background-color: rgba(0, 0, 0, 0.2);
+  border: none; }
+
+GtkFileChooserDialog .sidebar .scrollbar .slider,
+GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider,
+NautilusWindow .sidebar .scrollbar .slider,
+NautilusWindow .source-list.sidebar.view .scrollbar .slider,
+NemoWindow .sidebar .scrollbar .slider,
+NemoWindow .source-list.sidebar.view .scrollbar .slider,
+MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserWidget .scrollbar .slider {
+  background-color: rgba(231, 234, 238, 0.7); }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:hover,
+  NautilusWindow .sidebar .scrollbar .slider:hover,
+  NemoWindow .sidebar .scrollbar .slider:hover,
+  MarlinViewWindow .sidebar .scrollbar .slider:hover, GeditFileBrowserWidget .scrollbar .slider:hover {
+    background-color: #f6f7f9; }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active,
+  NautilusWindow .sidebar .scrollbar .slider:prelight:active,
+  NemoWindow .sidebar .scrollbar .slider:prelight:active,
+  MarlinViewWindow .sidebar .scrollbar .slider:prelight:active, GeditFileBrowserWidget .scrollbar .slider:prelight:active {
+    background-color: #5294E2; }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:insensitive,
+  NautilusWindow .sidebar .scrollbar .slider:insensitive,
+  NemoWindow .sidebar .scrollbar .slider:insensitive,
+  MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive {
+    background-color: transparent; }
+
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #5c616c;
 @define-color theme_text_color #5c616c;
diff --git a/common/gtk-3.0/3.16/gtk-contained-solid.css b/common/gtk-3.0/3.16/gtk-contained-solid.css
index 3f7301b..465c939 100644
--- a/common/gtk-3.0/3.16/gtk-contained-solid.css
+++ b/common/gtk-3.0/3.16/gtk-contained-solid.css
@@ -3713,56 +3713,6 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view {
   NemoWindow .source-list.sidebar.view .separator,
   MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow .source-list.sidebar.view .separator {
     color: transparent; }
-  GtkFileChooserDialog .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NautilusWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NautilusWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NemoWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NemoWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  MarlinViewWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider {
-    background-color: #e7eaee;
-    border: 1px solid rgba(0, 0, 0, 0.3); }
-  GtkFileChooserDialog .sidebar .scrollbar .trough,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough,
-  NautilusWindow .sidebar .scrollbar .trough,
-  NautilusWindow .source-list.sidebar.view .scrollbar .trough,
-  NemoWindow .sidebar .scrollbar .trough,
-  NemoWindow .source-list.sidebar.view .scrollbar .trough,
-  MarlinViewWindow .sidebar .scrollbar .trough, MarlinViewWindow .source-list.sidebar.view .scrollbar .trough {
-    background-color: rgba(0, 0, 0, 0.2);
-    border: none; }
-  GtkFileChooserDialog .sidebar .scrollbar .slider,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider,
-  NautilusWindow .sidebar .scrollbar .slider,
-  NautilusWindow .source-list.sidebar.view .scrollbar .slider,
-  NemoWindow .sidebar .scrollbar .slider,
-  NemoWindow .source-list.sidebar.view .scrollbar .slider,
-  MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider {
-    background-color: rgba(231, 234, 238, 0.7); }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:hover,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:hover,
-    NautilusWindow .sidebar .scrollbar .slider:hover,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:hover,
-    NemoWindow .sidebar .scrollbar .slider:hover,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:hover,
-    MarlinViewWindow .sidebar .scrollbar .slider:hover, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:hover {
-      background-color: #f6f7f9; }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    NautilusWindow .sidebar .scrollbar .slider:prelight:active,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    NemoWindow .sidebar .scrollbar .slider:prelight:active,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    MarlinViewWindow .sidebar .scrollbar .slider:prelight:active, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:prelight:active {
-      background-color: #5294E2; }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:insensitive,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:insensitive,
-    NautilusWindow .sidebar .scrollbar .slider:insensitive,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:insensitive,
-    NemoWindow .sidebar .scrollbar .slider:insensitive,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:insensitive,
-    MarlinViewWindow .sidebar .scrollbar .slider:insensitive, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:insensitive {
-      background-color: transparent; }
 
 GtkFileChooserDialog.maximized .sidebar,
 NautilusWindow.maximized .sidebar,
@@ -3870,20 +3820,6 @@ GeditFileBrowserWidget {
   background-color: #353945; }
   .maximized GeditFileBrowserWidget {
     background-color: #353945; }
-  GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider {
-    background-color: #e7eaee;
-    border: 1px solid rgba(0, 0, 0, 0.3); }
-  GeditFileBrowserWidget .scrollbar .trough {
-    background-color: rgba(0, 0, 0, 0.2);
-    border: none; }
-  GeditFileBrowserWidget .scrollbar .slider {
-    background-color: rgba(231, 234, 238, 0.7); }
-    GeditFileBrowserWidget .scrollbar .slider:hover {
-      background-color: #e7eaee; }
-    GeditFileBrowserWidget .scrollbar .slider:prelight:active {
-      background-color: #5294E2; }
-    GeditFileBrowserWidget .scrollbar .slider:insensitive {
-      background-color: transparent; }
   GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: #252831; }
@@ -3943,6 +3879,47 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
     color: rgba(186, 195, 207, 0.55);
     background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.25)); }
 
+GtkFileChooserDialog .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+NautilusWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+NemoWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+MarlinViewWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider, GeditFileBrowserWidget .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider {
+  background-color: #e7eaee;
+  border: 1px solid rgba(0, 0, 0, 0.3); }
+
+GtkFileChooserDialog .sidebar .scrollbar .trough,
+GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough,
+NautilusWindow .sidebar .scrollbar .trough,
+NautilusWindow .source-list.sidebar.view .scrollbar .trough,
+NemoWindow .sidebar .scrollbar .trough,
+NemoWindow .source-list.sidebar.view .scrollbar .trough,
+MarlinViewWindow .sidebar .scrollbar .trough, MarlinViewWindow .source-list.sidebar.view .scrollbar .trough, GeditFileBrowserWidget .scrollbar .trough {
+  background-color: rgba(0, 0, 0, 0.2);
+  border: none; }
+
+GtkFileChooserDialog .sidebar .scrollbar .slider,
+GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider,
+NautilusWindow .sidebar .scrollbar .slider,
+NautilusWindow .source-list.sidebar.view .scrollbar .slider,
+NemoWindow .sidebar .scrollbar .slider,
+NemoWindow .source-list.sidebar.view .scrollbar .slider,
+MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserWidget .scrollbar .slider {
+  background-color: rgba(231, 234, 238, 0.7); }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:hover,
+  NautilusWindow .sidebar .scrollbar .slider:hover,
+  NemoWindow .sidebar .scrollbar .slider:hover,
+  MarlinViewWindow .sidebar .scrollbar .slider:hover, GeditFileBrowserWidget .scrollbar .slider:hover {
+    background-color: #f6f7f9; }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active,
+  NautilusWindow .sidebar .scrollbar .slider:prelight:active,
+  NemoWindow .sidebar .scrollbar .slider:prelight:active,
+  MarlinViewWindow .sidebar .scrollbar .slider:prelight:active, GeditFileBrowserWidget .scrollbar .slider:prelight:active {
+    background-color: #5294E2; }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:insensitive,
+  NautilusWindow .sidebar .scrollbar .slider:insensitive,
+  NemoWindow .sidebar .scrollbar .slider:insensitive,
+  MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive {
+    background-color: transparent; }
+
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #5c616c;
 @define-color theme_text_color #5c616c;
diff --git a/common/gtk-3.0/3.16/gtk-contained.css b/common/gtk-3.0/3.16/gtk-contained.css
index e09415c..ae5daca 100644
--- a/common/gtk-3.0/3.16/gtk-contained.css
+++ b/common/gtk-3.0/3.16/gtk-contained.css
@@ -3713,56 +3713,6 @@ MarlinViewWindow .sidebar, MarlinViewWindow .source-list.sidebar.view {
   NemoWindow .source-list.sidebar.view .separator,
   MarlinViewWindow .sidebar .separator, MarlinViewWindow GtkPlacesSidebar.sidebar .view.separator, MarlinViewWindow .source-list.sidebar.view .separator {
     color: transparent; }
-  GtkFileChooserDialog .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NautilusWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NautilusWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NemoWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  NemoWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider,
-  MarlinViewWindow .sidebar .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider {
-    background-color: #e7eaee;
-    border: 1px solid rgba(0, 0, 0, 0.3); }
-  GtkFileChooserDialog .sidebar .scrollbar .trough,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough,
-  NautilusWindow .sidebar .scrollbar .trough,
-  NautilusWindow .source-list.sidebar.view .scrollbar .trough,
-  NemoWindow .sidebar .scrollbar .trough,
-  NemoWindow .source-list.sidebar.view .scrollbar .trough,
-  MarlinViewWindow .sidebar .scrollbar .trough, MarlinViewWindow .source-list.sidebar.view .scrollbar .trough {
-    background-color: rgba(0, 0, 0, 0.2);
-    border: none; }
-  GtkFileChooserDialog .sidebar .scrollbar .slider,
-  GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider,
-  NautilusWindow .sidebar .scrollbar .slider,
-  NautilusWindow .source-list.sidebar.view .scrollbar .slider,
-  NemoWindow .sidebar .scrollbar .slider,
-  NemoWindow .source-list.sidebar.view .scrollbar .slider,
-  MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider {
-    background-color: rgba(231, 234, 238, 0.7); }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:hover,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:hover,
-    NautilusWindow .sidebar .scrollbar .slider:hover,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:hover,
-    NemoWindow .sidebar .scrollbar .slider:hover,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:hover,
-    MarlinViewWindow .sidebar .scrollbar .slider:hover, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:hover {
-      background-color: #f6f7f9; }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    NautilusWindow .sidebar .scrollbar .slider:prelight:active,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    NemoWindow .sidebar .scrollbar .slider:prelight:active,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:prelight:active,
-    MarlinViewWindow .sidebar .scrollbar .slider:prelight:active, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:prelight:active {
-      background-color: #5294E2; }
-    GtkFileChooserDialog .sidebar .scrollbar .slider:insensitive,
-    GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider:insensitive,
-    NautilusWindow .sidebar .scrollbar .slider:insensitive,
-    NautilusWindow .source-list.sidebar.view .scrollbar .slider:insensitive,
-    NemoWindow .sidebar .scrollbar .slider:insensitive,
-    NemoWindow .source-list.sidebar.view .scrollbar .slider:insensitive,
-    MarlinViewWindow .sidebar .scrollbar .slider:insensitive, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider:insensitive {
-      background-color: transparent; }
 
 GtkFileChooserDialog.maximized .sidebar,
 NautilusWindow.maximized .sidebar,
@@ -3870,20 +3820,6 @@ GeditFileBrowserWidget {
   background-color: rgba(53, 57, 69, 0.95); }
   .maximized GeditFileBrowserWidget {
     background-color: #353945; }
-  GeditFileBrowserWidget .scrollbar.overlay-indicator:not(.dragging):not(.hovering) .slider {
-    background-color: #e7eaee;
-    border: 1px solid rgba(0, 0, 0, 0.3); }
-  GeditFileBrowserWidget .scrollbar .trough {
-    background-color: rgba(0, 0, 0, 0.2);
-    border: none; }
-  GeditFileBrowserWidget .scrollbar .slider {
-    background-color: rgba(231, 234, 238, 0.7); }
-    GeditFileBrowserWidget .scrollbar .slider:hover {
-      background-color: #e7eaee; }
-    GeditFileBrowserWidget .scrollbar .slider:prelight:active {
-      background-color: #5294E2; }
-    GeditFileBrowserWidget .scrollbar .slider:insensitive {
-      background-color: transparent; }
   GeditFileBrowserWidget .horizontal {
     background-color: transparent;
     border-color: rgba(37, 40, 49, 0.95); }
@@ -3943,6 +3879,47 @@ GtkFileChooserDialog .dialog-vbox > .frame .entry {
     color: rgba(186, 195, 207, 0.55);
     background-image: linear-gradient(to bottom, rgba(102, 109, 132, 0.2)); }
 
+GtkFileChooserDialog .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+NautilusWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+NemoWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider,
+MarlinViewWindow .sidebar .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider, GeditFileBrowserWidget .overlay-indicator.scrollbar:not(.dragging):not(.hovering) .slider {
+  background-color: #e7eaee;
+  border: 1px solid rgba(0, 0, 0, 0.3); }
+
+GtkFileChooserDialog .sidebar .scrollbar .trough,
+GtkFileChooserDialog .source-list.sidebar.view .scrollbar .trough,
+NautilusWindow .sidebar .scrollbar .trough,
+NautilusWindow .source-list.sidebar.view .scrollbar .trough,
+NemoWindow .sidebar .scrollbar .trough,
+NemoWindow .source-list.sidebar.view .scrollbar .trough,
+MarlinViewWindow .sidebar .scrollbar .trough, MarlinViewWindow .source-list.sidebar.view .scrollbar .trough, GeditFileBrowserWidget .scrollbar .trough {
+  background-color: rgba(0, 0, 0, 0.2);
+  border: none; }
+
+GtkFileChooserDialog .sidebar .scrollbar .slider,
+GtkFileChooserDialog .source-list.sidebar.view .scrollbar .slider,
+NautilusWindow .sidebar .scrollbar .slider,
+NautilusWindow .source-list.sidebar.view .scrollbar .slider,
+NemoWindow .sidebar .scrollbar .slider,
+NemoWindow .source-list.sidebar.view .scrollbar .slider,
+MarlinViewWindow .sidebar .scrollbar .slider, MarlinViewWindow .source-list.sidebar.view .scrollbar .slider, GeditFileBrowserWidget .scrollbar .slider {
+  background-color: rgba(231, 234, 238, 0.7); }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:hover,
+  NautilusWindow .sidebar .scrollbar .slider:hover,
+  NemoWindow .sidebar .scrollbar .slider:hover,
+  MarlinViewWindow .sidebar .scrollbar .slider:hover, GeditFileBrowserWidget .scrollbar .slider:hover {
+    background-color: #f6f7f9; }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:prelight:active,
+  NautilusWindow .sidebar .scrollbar .slider:prelight:active,
+  NemoWindow .sidebar .scrollbar .slider:prelight:active,
+  MarlinViewWindow .sidebar .scrollbar .slider:prelight:active, GeditFileBrowserWidget .scrollbar .slider:prelight:active {
+    background-color: #5294E2; }
+  GtkFileChooserDialog .sidebar .scrollbar .slider:insensitive,
+  NautilusWindow .sidebar .scrollbar .slider:insensitive,
+  NemoWindow .sidebar .scrollbar .slider:insensitive,
+  MarlinViewWindow .sidebar .scrollbar .slider:insensitive, GeditFileBrowserWidget .scrollbar .slider:insensitive {
+    background-color: transparent; }
+
 /* GTK NAMED COLORS */
 @define-color theme_fg_color #5c616c;
 @define-color theme_text_color #5c616c;
diff --git a/common/gtk-3.0/3.16/sass/_transparent_widgets.scss b/common/gtk-3.0/3.16/sass/_transparent_widgets.scss
index 0a8b7b7..4a362e7 100644
--- a/common/gtk-3.0/3.16/sass/_transparent_widgets.scss
+++ b/common/gtk-3.0/3.16/sass/_transparent_widgets.scss
@@ -50,32 +50,7 @@ MarlinViewWindow {
 
     .separator { color: transparent; }
 
-    .scrollbar {
-
-      &.overlay-indicator:not(.dragging):not(.hovering) .slider {
-        background-color: lighten($dark_sidebar_fg, 15%);
-        border: 1px solid transparentize(black, 0.7);
-      }
-
-      // trough coloring
-      .trough {
-        background-color: transparentize(black, 0.8);
-        border: none;
-      }
-
-      // slider coloring
-      .slider {
-        background-color: transparentize(lighten($dark_sidebar_fg, 15%), 0.3);
-
-        &:hover { background-color: lighten($dark_sidebar_fg, 20%); }
-
-        &:prelight:active { background-color: $selected_bg_color; }
-
-        &:insensitive {
-          background-color: transparent;
-        }
-      }
-    }
+    .scrollbar { @extend %dark_sidebar_scrollbar }
   }
   &.maximized .sidebar { background-color: opacify($dark_sidebar_bg, 1); }
 
@@ -188,32 +163,7 @@ GeditFileBrowserWidget {
 
   .maximized & { background-color: opacify($dark_sidebar_bg, 1); }
 
-  .scrollbar {
-
-    &.overlay-indicator:not(.dragging):not(.hovering) .slider {
-      background-color: lighten($dark_sidebar_fg, 15%);
-      border: 1px solid transparentize(black, 0.7);
-    }
-
-    // trough coloring
-    .trough {
-      background-color: transparentize(black, 0.8);
-      border: none;
-    }
-
-    // slider coloring
-    .slider {
-      background-color: transparentize(lighten($dark_sidebar_fg, 15%), 0.3);
-
-      &:hover { background-color: lighten($dark_sidebar_fg, 15%); }
-
-      &:prelight:active { background-color: $selected_bg_color; }
-
-      &:insensitive {
-        background-color: transparent;
-      }
-    }
-  }
+  .scrollbar { @extend %dark_sidebar_scrollbar; }
 
   .horizontal {
     background-color: transparent;
@@ -249,3 +199,30 @@ GeditWindow.background.csd GeditFileBrowserView.view {
   &:focus { @include entry(osd-focus); }
   &:insensitive { @include entry(osd-insensitive); }
 }
+
+%dark_sidebar_scrollbar {
+
+  &.overlay-indicator:not(.dragging):not(.hovering) .slider {
+    background-color: lighten($dark_sidebar_fg, 15%);
+    border: 1px solid transparentize(black, 0.7);
+  }
+
+  // trough coloring
+  .trough {
+    background-color: transparentize(black, 0.8);
+    border: none;
+  }
+
+  // slider coloring
+  .slider {
+    background-color: transparentize(lighten($dark_sidebar_fg, 15%), 0.3);
+
+    &:hover { background-color: lighten($dark_sidebar_fg, 20%); }
+
+    &:prelight:active { background-color: $selected_bg_color; }
+
+    &:insensitive {
+      background-color: transparent;
+    }
+  }
+}