GTK3 Submarine themes : adjust buttons on black bg, + style nemo preferences

8 files changed, 388 insertions, 155 deletions

diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
index c152893b..3d5a93e5 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
@@ -2214,10 +2214,9 @@ GtkHandleBox,
 .primary-toolbar .toolbar .button:hover,

 .primary-toolbar.toolbar .button:hover {

     background-image: -gtk-gradient (linear,

-                     left top, left bottom,

-                     from (alpha (shade (@theme_bg_dark_color, 1.00), 0.0)),

-                     color-stop (0.50, shade (@theme_bg_dark_color, 0.83) ),

-                     to (alpha (shade (@theme_bg_dark_color, 0.91), 0.0)));

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     border-width: 1px;

     border-radius: 5px;

     border-style: solid;

@@ -2261,8 +2260,8 @@ GtkHandleBox,
 .primary-toolbar.toolbar .button:checked:checked {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

-                                     from (shade(@button_raised_gradient_color_b, 0.90)),

-                                     to   (shade(@button_raised_gradient_color_a, 0.80)));

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     border-image: none;

     border-color: transparent;

     border-width: 1px;

@@ -3420,8 +3419,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     border-radius: 5px;

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

-                                     from (shade(@button_raised_gradient_color_b, 0.90)),

-                                     to (shade(@button_raised_gradient_color_a, 0.80)));

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     border-top-color: shade(@button_raised_gradient_color_a, 0.50);

     border-bottom-color: shade(@button_raised_gradient_color_a, 0.50);

     border-right-color: shade(@button_raised_gradient_color_a, 0.50);

@@ -4910,30 +4909,44 @@ GtkOverlay.osd {
 }

 

 .popover.scale-popup .flat.button.image-button {

-    background-image: none;

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     border-radius: 4px;

-    box-shadow: inset  0px  2px alpha(#fff, 0.11),

-                inset  2px  0px alpha(#fff, 0.09),

-                inset -2px  0px alpha(#fff, 0.09),

-                inset  0px -2px alpha(#fff, 0.07),

-                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),

-                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),

-                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),

-                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

+    box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),

+                inset  1px  0px shade (@theme_selected_bg_color, 1.3),

+                inset -1px  0px shade (@theme_selected_bg_color, 1.3),

+                inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

 .popover.scale-popup .flat.button.image-button:hover {

     -gtk-image-effect: highlight;

-    background-image: none;

-    border-radius: 4px;

+}

+

+.popover .list {

+    background-color: @theme_base_color;

+}

+

+/* more/less volume button */

+.popover .image-button:hover {

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),

                 inset  1px  0px shade (@theme_selected_bg_color, 1.3),

                 inset -1px  0px shade (@theme_selected_bg_color, 1.3),

                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

-.popover .list {

-    background-color: @theme_base_color;

+.popover .image-button:insensitive {

+    background-image: none;

+    background-color: transparent;

+    box-shadow: inset  0px  1px @insensitive_border_color,

+                inset  1px  0px @insensitive_border_color,

+                inset -1px  0px @insensitive_border_color,

+                inset  0px -1px @insensitive_border_color;

 }

 

 GtkModelButton.button,

@@ -5018,7 +5031,10 @@ GtkModelButton.button:selected,
 .linked GtkModelButton.button:hover:last-child,

 .linked GtkModelButton.button:active:hover:last-child,

 .linked GtkModelButton.button:checked:hover:last-child {

-    background-image: none;

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     background-color: shade (@theme_bg_dark_color, 1.2);

     color: shade (@theme_selected_bg_color, 1.6);

     text-shadow: none;

@@ -5031,6 +5047,21 @@ GtkModelButton.button:selected,
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);

 }

 

+.csd .popover .linked GtkModelButton.button:checked,

+.csd .popover .linked GtkModelButton.button:hover,

+.csd .popover .linked GtkModelButton.button:active:hover,

+.csd .popover .linked GtkModelButton.button:checked:hover {

+    color: @fg_dark_color;

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

+    box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),

+                inset  1px  0px shade (@theme_selected_bg_color, 1.3),

+                inset -1px  0px shade (@theme_selected_bg_color, 1.3),

+                inset  0px -1px shade (@theme_selected_bg_color, 1.3);

+}

+

 /* middle button*/

 .linked GtkModelButton.button:hover,

 .linked GtkModelButton.button:active:hover,

@@ -5150,9 +5181,9 @@ GtkModelButton.button:selected,
     border-image: none;

     border-radius: 5px;

     border-width: 1px;

-    border-color: @transparent;

+    border-color: transparent;

     background: none;

-    background-color: @transparent;

+    background-color: transparent;

 }

 

 .titlebar .button:hover,

@@ -5163,13 +5194,14 @@ GtkModelButton.button:selected,
 .titlebar .button:checked,

 .titlebar .button:checked:checked,

 .titlebar .titlebutton:checked:checked {

-    background-image: linear-gradient(to bottom,

-                                      @button_hover_gradient_color_a,

-                                      @button_hover_gradient_color_b);

-    background-color: @transparent;

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

+    background-color: transparent;

     border-radius: 5px;

     border-width: 1px;

-    border-color: @transparent;

+    border-color: transparent;

     box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),

                 inset  1px  0px shade (@theme_selected_bg_color, 1.3),

                 inset -1px  0px shade (@theme_selected_bg_color, 1.3),

@@ -5253,6 +5285,10 @@ GtkModelButton.button:selected,
 .titlebar .linked .button:checked:hover,

 .titlebar .button.raised.linked:checked:hover,

 .titlebar .raised.linked .button:checked:hover {

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     padding: 5px 5px 6px 5px;

     box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),

                 inset  1px  0px shade (@theme_selected_bg_color, 1.3),

@@ -5310,6 +5346,10 @@ GtkModelButton.button:selected,
 .titlebar .linked .button:checked:hover:first-child,

 .titlebar .button.raised.linked:checked:hover:first-child,

 .titlebar .raised.linked .button:checked:hover:first-child {

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     padding: 5px 5px 6px 5px;

     box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),

                 inset  1px  0px shade (@theme_selected_bg_color, 1.3),

@@ -5367,6 +5407,10 @@ GtkModelButton.button:selected,
 .titlebar .linked .button:checked:hover:last-child,

 .titlebar .button.raised.linked:checked:hover:last-child,

 .titlebar .raised.linked .button:checked:hover:last-child {

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     padding: 5px 5px 6px 5px;

     box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),

                 inset  1px  0px shade (@theme_selected_bg_color, 1.3),

@@ -5392,7 +5436,6 @@ GtkModelButton.button:selected,
 .titlebar .raised.linked .button:checked:only-child,

 .titlebar .raised.linked .button:checked:hover:only-child,

 .titlebar .linked .button:insensitive:only-child,

-

 .titlebar .button.raised.linked:insensitive:only-child,

 .titlebar .raised.linked .button:insensitive:only-child {

     background-image: -gtk-gradient (linear,

@@ -5421,6 +5464,10 @@ GtkModelButton.button:selected,
 .titlebar .linked .button:checked:hover:only-child,

 .titlebar .button.raised.linked:checked:hover:only-child,

 .titlebar .raised.linked .button:checked:hover:only-child {

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     padding: 5px 5px 6px 5px;

     box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),

                 inset  1px  0px shade (@theme_selected_bg_color, 1.3),

diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
index 4039334f..ce3ba29a 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
@@ -481,8 +481,8 @@ CajaWindow .primary-toolbar .toolbar .button:checked:hover,
 CajaWindow .primary-toolbar.toolbar .button:checked:hover {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
-                                     from (shade(@button_raised_gradient_color_b, 0.90)),
-                                     to (shade(@button_raised_gradient_color_a, 0.80)));
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
     border-width: 1px;
     border-style: solid; 
     border-radius: 5px;
@@ -504,9 +504,8 @@ CajaWindow .primary-toolbar .toolbar .button:hover,
 CajaWindow .primary-toolbar.toolbar .button:hover {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
-                                     from (alpha (shade (@theme_bg_dark_color, 1.00), 0.0)),
-                                     color-stop (0.50, shade (@theme_bg_dark_color, 0.83) ),
-                                     to (alpha (shade (@theme_bg_dark_color, 0.91), 0.0))); 
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
     border-width: 1px;
     border-radius: 5px;
     border-style: solid;
@@ -738,7 +737,10 @@ PanelMenuBar.menubar .menuitem {
 PanelMenuBar.menubar .menuitem:hover {
     padding: 5px 5px;
     background-color: shade (@theme_bg_dark_color, 1.2);
-    background-image: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
     border-radius: 6px;
     text-shadow: none;
     color: shade (@theme_selected_bg_color, 1.6);
@@ -763,7 +765,10 @@ PanelMenuBar.menubar .menu .menuitem:active:hover,
 PanelMenuBar.menubar .menu .menuitem:hover {
     padding: 6px;
     background-color: shade (@theme_bg_dark_color, 1.2);
-    background-image: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
     border-radius: 6px;
     text-shadow: none;
     color: shade (@theme_selected_bg_color, 1.6);
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/menu.css b/desktop-themes/Blue-Submarine/gtk-3.0/menu.css
index dac625ba..35c67f45 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/menu.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/menu.css
@@ -180,7 +180,10 @@ GtkComboBox .menuitem:hover * {
 .menu .menuitem:hover {
     /* contextual menu item-selected */
     background-color: shade (@theme_bg_dark_color, 1.2);
-    background-image: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
     color: shade (@theme_selected_bg_color, 1.6);
     text-shadow: 0px 1px @theme_selected_shadow_color;
     border-radius: 6px;
diff --git a/desktop-themes/Blue-Submarine/gtk-3.0/other-applications.css b/desktop-themes/Blue-Submarine/gtk-3.0/other-applications.css
index 27228f82..b5508d53 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/other-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/other-applications.css
@@ -39,11 +39,6 @@ NemoSearchBar * {
     padding: 0px;
 }
 
-/* searchbar border */
-NemoWindow.background GtkGrid.vertical .horizontal {
-    border-color: @primay-toolbar-border;
-}
-
 NemoSearchBar .entry {
     padding: 2px 8px;
     border-width: 0px;
@@ -186,8 +181,11 @@ NemoWindow .sidebar .scrollbar.trough {
 }
 
 /* the small line between sidebar and view */
-NemoWindow * {
-    -GtkPaned-handle-size: 3px;
+NemoWindow GtkPaned.horizontal {
+    border-color: shade(@theme_bg_color, 0.80);
+    border-style: solid;
+    border-width: 0px 1px 0px 0px;
+    -GtkPaned-handle-size: 4px;
 }
 
 NemoWindow .sidebar .frame {
@@ -205,23 +203,9 @@ NemoWindow .sidebar .view row:selected:hover {
     box-shadow: none;
 }
 
-/* disabled, looks uggly
-NemoWindow > GtkTable > .pane-separator,
-NemoWindow .pane-separator {
-    background-color: @sidebar_background;
-    background-image: -gtk-gradient (linear,
-                                     left top, right top,
-                                     from (@sidebar_background),
-                                     color-stop(0.50, @sidebar_background),
-                                     to   (shade(@theme_bg_color, 0.60)));
-    border-style: solid;
-    border-width: 0px;
-    border-color: @sidebar_background;
-    border-image: none;
-}*/
-
-NemoWindow .primary-toolbar.toolbar .button GtkImage {
-    color: @theme_fg_dark_color;
+/* to avoid unexpected light backgrounds */
+NemoToolbar.vertical {
+    background-color: @theme_bg_dark_color;
 }
 
 NemoToolbar .linked .button,
@@ -240,6 +224,10 @@ NemoToolbar .linked .button:focus:last-child {
     box-shadow: none;
 }
 
+NemoWindow .primary-toolbar.toolbar .button GtkImage {
+    color: @theme_fg_dark_color;
+}
+
 NemoWindow .primary-toolbar.toolbar .button,
 NemoWindow .primary-toolbar.toolbar .button:hover {
     padding: 4px;
@@ -360,7 +348,10 @@ NemoWindow .primary-toolbar.toolbar .button:checked,
 NemoWindow .primary-toolbar.toolbar .button:checked:hover {
     padding: 4px;
     background-color: transparent;
-    background-image: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
     border-width: 1px;
     border-style: solid;
     border-radius: 5px;
@@ -376,7 +367,10 @@ NemoWindow .primary-toolbar .toolbar .button:hover,
 NemoWindow .primary-toolbar.toolbar .button:hover {
     background-color: transparent;
     padding: 4px;
-    background-image: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
     border-width: 1px;
     border-radius: 5px;
     border-style: solid;
@@ -451,21 +445,6 @@ NemoWindow .notebook {
     box-shadow: none;
 }
 
-/*
-NemoWindow .notebook {
-    -GtkNotebook-initial-gap: 0;
-    border-width: 1px 0px 0px 0px;
-    border-radius: 0px;
-    border-image: none;
-
-    border-top-color: shade(@sidebar_background, 0.75);
-    border-left-color: @transparent;
-    border-bottom-color: @transparent;
-    border-right-color: @transparent;
-
-}
-*/
-
 /* Nemo notebook */
 GtkDialog.background .vertical.dialog-vbox .notebook .frame {
     background-color: shade (@theme_bg_color, 1.1);
@@ -582,3 +561,84 @@ NemoWindow .notebook tab .button GtkImage:active:hover {
     text-shadow: none;
 }
 
+/* stack-switcher ie. nemo preferences */
+.vertical.dialog-vbox .horizontal.primary-toolbar {
+    background-color: transparent;
+    border-color: @primay-toolbar-border;
+    border-width: 1px 0px;
+    padding: 1px 0px;
+}
+
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button {
+    color: @menu_fg_dark_color;
+    text-shadow: none;
+    box-shadow: none;
+    padding: 5px 2px;
+}
+
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:hover,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:checked,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:checked:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),
+                inset  1px  0px shade (@theme_selected_bg_color, 1.3),
+                inset -1px  0px shade (@theme_selected_bg_color, 1.3),
+                inset  0px -1px shade (@theme_selected_bg_color, 1.3);
+}
+
+/* middle most button */
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:focus,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:hover,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:checked {
+    border-right-width: 0px;
+    border-left-width:  0px;
+    border-radius: 0px;
+}
+
+/* left most button */
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:first-child,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:focus:first-child,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:hover:first-child,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:checked:first-child {
+    border-radius: 6px 0 0 6px;
+    border-width: 1px;
+    border-right-width: 0px;
+}
+
+/* right most button */
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:last-child,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:focus:last-child,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:hover:last-child,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:checked:last-child {
+    border-radius: 0 6px 6px 0;
+    border-width: 1px;
+    border-left-width: 0px;
+}
+
+.vertical.dialog-vbox .view.frame {
+    background-color: shade (@theme_bg_color, 1.1);
+    border-color: @borders;
+}
+
+.vertical.dialog-vbox .view.frame  GtkViewport.frame {
+    background-color: shade (@theme_bg_color, 1.1);
+}
+
+.vertical.dialog-vbox .view.frame  GtkViewport.frame .vertical GtkSeparator.separator.horizontal {
+    border-color: @borders;
+    border-width: 0 0 1px 0;
+}
+
+.vertical.dialog-vbox .view.frame  GtkViewport.frame .vertical .vertical .vertical .text-button {
+    background-color: transparent;
+}
+
+.vertical.dialog-vbox .view.frame  GtkViewport.frame .vertical .vertical .vertical .text-button:hover {
+    background-color: shade (@theme_bg_color, 1.05);
+    border-radius: 4px;
+}
+
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
index 34194db8..219e39c5 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
@@ -2196,10 +2196,10 @@ GtkHandleBox,
 .primary-toolbar .toolbar .button:hover,

 .primary-toolbar.toolbar .button:hover {

     background-image: -gtk-gradient (linear,

-                     left top, left bottom,

-                     from (alpha (shade (@theme_bg_dark_color, 1.00), 0.0)),

-                     color-stop (0.50, shade (@theme_bg_dark_color, 0.83) ),

-                     to   (alpha (shade (@theme_bg_dark_color, 0.91), 0.0)));

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

+

     border-width: 1px;

     border-radius: 5px;

     border-style: solid;

@@ -2243,8 +2243,8 @@ GtkHandleBox,
 .primary-toolbar.toolbar .button:checked:checked {

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

-                                     from (shade(@button_raised_gradient_color_b, 0.90)),

-                                     to   (shade(@button_raised_gradient_color_a, 0.80)));

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     border-image: none;

     border-color: transparent;

     border-width: 1px;

@@ -2385,6 +2385,7 @@ GtkHandleBox,
 .toolbar .raised .button:insensitive:checked,

 .toolbar .raised.button:insensitive:checked {

     background-image: -gtk-gradient (linear,

+

                                      left top, left bottom,

                                      from (shade(@button_raised_gradient_color_a, 0.88)),

                                      to   (shade(@button_raised_gradient_color_b, 1.00)));

@@ -3406,8 +3407,8 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
     border-radius: 5px;

     background-image: -gtk-gradient (linear,

                                      left top, left bottom,

-                                     from (shade(@button_raised_gradient_color_b, 0.90)),

-                                     to (shade(@button_raised_gradient_color_a, 0.80)));

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     border-top-color: shade(@button_raised_gradient_color_a, 0.50);

     border-bottom-color: shade(@button_raised_gradient_color_a, 0.50);

     border-right-color: shade(@button_raised_gradient_color_a, 0.50);

@@ -4895,30 +4896,44 @@ GtkOverlay.osd {
 }

 

 .popover.scale-popup .flat.button.image-button {

-    background-image: none;

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     border-radius: 4px;

-    box-shadow: inset  0px  2px alpha(#fff, 0.11),

-                inset  2px  0px alpha(#fff, 0.09),

-                inset -2px  0px alpha(#fff, 0.09),

-                inset  0px -2px alpha(#fff, 0.07),

-                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),

-                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),

-                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),

-                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);

+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),

+                inset  1px  0px shade(@selected_bg_color, 0.97),

+                inset -1px  0px shade(@selected_bg_color, 0.93),

+                inset  0px -1px shade(@selected_bg_color, 0.93);

 }

 

 .popover.scale-popup .flat.button.image-button:hover {

     -gtk-image-effect: highlight;

-    background-image: none;

-    border-radius: 4px;

+}

+

+.popover .list {

+    background-color: @theme_base_color;

+}

+

+/* more/less volume button */

+.popover .image-button:hover {

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),

                 inset  1px  0px shade(@selected_bg_color, 0.97),

                 inset -1px  0px shade(@selected_bg_color, 0.93),

                 inset  0px -1px shade(@selected_bg_color, 0.93);

 }

 

-.popover .list {

-    background-color: @theme_base_color;

+.popover .image-button:insensitive {

+    background-image: none;

+    background-color: transparent;

+    box-shadow: inset  0px  1px @insensitive_border_color,

+                inset  1px  0px @insensitive_border_color,

+                inset -1px  0px @insensitive_border_color,

+                inset  0px -1px @insensitive_border_color;

 }

 

 GtkModelButton.button,

@@ -5003,7 +5018,10 @@ GtkModelButton.button:selected,
 .linked GtkModelButton.button:hover:last-child,

 .linked GtkModelButton.button:active:hover:last-child,

 .linked GtkModelButton.button:checked:hover:last-child {

-    background-image: none;

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     background-color: shade (@theme_bg_dark_color, 1.2);

     color: shade (@theme_selected_bg_color, 1.3);

     text-shadow: none;

@@ -5016,6 +5034,21 @@ GtkModelButton.button:selected,
                 inset  0px -1px shade(@selected_bg_color, 0.93);

 }

 

+.csd .popover .linked GtkModelButton.button:checked,

+.csd .popover .linked GtkModelButton.button:hover,

+.csd .popover .linked GtkModelButton.button:active:hover,

+.csd .popover .linked GtkModelButton.button:checked:hover {

+    color: @fg_dark_color;

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),

+                inset  1px  0px shade(@selected_bg_color, 0.97),

+                inset -1px  0px shade(@selected_bg_color, 0.93),

+                inset  0px -1px shade(@selected_bg_color, 0.93);

+}

+

 /* middle button*/

 .linked GtkModelButton.button:hover,

 .linked GtkModelButton.button:active:hover,

@@ -5148,13 +5181,14 @@ GtkModelButton.button:selected,
 .titlebar .button:checked,

 .titlebar .button:checked:checked,

 .titlebar .titlebutton:checked:checked {

-    background-image: linear-gradient(to bottom,

-                                      @button_hover_gradient_color_a,

-                                      @button_hover_gradient_color_b);

-    background-color: @transparent;

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

+    background-color: transparent;

     border-radius: 5px;

     border-width: 1px;

-    border-color: @transparent;

+    border-color: transparent;

     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),

                 inset  1px  0px shade(@selected_bg_color, 0.97),

                 inset -1px  0px shade(@selected_bg_color, 0.93),

@@ -5238,6 +5272,10 @@ GtkModelButton.button:selected,
 .titlebar .linked .button:checked:hover,

 .titlebar .button.raised.linked:checked:hover,

 .titlebar .raised.linked .button:checked:hover {

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     padding: 5px 5px 6px 5px;

     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),

                 inset  1px  0px shade(@selected_bg_color, 0.97),

@@ -5295,6 +5333,10 @@ GtkModelButton.button:selected,
 .titlebar .linked .button:checked:hover:first-child,

 .titlebar .button.raised.linked:checked:hover:first-child,

 .titlebar .raised.linked .button:checked:hover:first-child {

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     padding: 5px 5px 6px 5px;

     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),

                 inset  1px  0px shade(@selected_bg_color, 0.97),

@@ -5352,6 +5394,10 @@ GtkModelButton.button:selected,
 .titlebar .linked .button:checked:hover:last-child,

 .titlebar .button.raised.linked:checked:hover:last-child,

 .titlebar .raised.linked .button:checked:hover:last-child {

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     padding: 5px 5px 6px 5px;

     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),

                 inset  1px  0px shade(@selected_bg_color, 0.97),

@@ -5405,6 +5451,10 @@ GtkModelButton.button:selected,
 .titlebar .linked .button:checked:hover:only-child,

 .titlebar .button.raised.linked:checked:hover:only-child,

 .titlebar .raised.linked .button:checked:hover:only-child {

+    background-image: -gtk-gradient (linear,

+                                     left top, left bottom,

+                                     from (shade(@menu_bg_dark_color, 2.03)),

+                                     to   (shade(@menu_bg_dark_color, 1.17)));

     padding: 5px 5px 6px 5px;

     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),

                 inset  1px  0px shade(@selected_bg_color, 0.97),

diff --git a/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css b/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
index b0712c33..d6048f43 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
@@ -482,8 +482,8 @@ CajaWindow .primary-toolbar .toolbar .button:checked:hover,
 CajaWindow .primary-toolbar.toolbar .button:checked:hover {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
-                                     from (shade(@button_raised_gradient_color_b, 0.90)),
-                                     to (shade(@button_raised_gradient_color_a, 0.80)));
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
     border-width: 1px;
     border-style: solid; 
     border-radius: 5px;
@@ -505,9 +505,8 @@ CajaWindow .primary-toolbar .toolbar .button:hover,
 CajaWindow .primary-toolbar.toolbar .button:hover {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
-                                     from (alpha (shade (@theme_bg_dark_color, 1.00), 0.0)),
-                                     color-stop (0.50, shade (@theme_bg_dark_color, 0.83) ),
-                                     to (alpha (shade (@theme_bg_dark_color, 0.91), 0.0)));
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
     border-width: 1px;
     border-radius: 5px;
     border-style: solid;
@@ -739,7 +738,10 @@ PanelMenuBar.menubar .menuitem {
 PanelMenuBar.menubar .menuitem:hover {
     padding: 5px 5px;
     background-color: shade (@theme_bg_dark_color, 1.2);
-    background-image: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
     border-radius: 6px;
     text-shadow: none;
     color: shade (@theme_selected_bg_color, 1.6);
@@ -764,7 +766,10 @@ PanelMenuBar.menubar .menu .menuitem:active:hover,
 PanelMenuBar.menubar .menu .menuitem:hover {
     padding: 6px;
     background-color: shade (@theme_bg_dark_color, 1.2);
-    background-image: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
     border-radius: 6px;
     text-shadow: none;
     color: shade (@theme_selected_bg_color, 1.6);
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/menu.css b/desktop-themes/Green-Submarine/gtk-3.0/menu.css
index 61fecf9e..4e97b5b5 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/menu.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/menu.css
@@ -177,7 +177,10 @@ GtkComboBox .menuitem:hover * {
 .menu .menuitem:hover {
     /* contextual menu item-selected */
     background-color: shade (@theme_bg_dark_color, 1.2);
-    background-image: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
     color: shade (@theme_selected_bg_color, 1.3);
     text-shadow: 0px 1px @theme_selected_shadow_color;
     border-radius: 6px;
diff --git a/desktop-themes/Green-Submarine/gtk-3.0/other-applications.css b/desktop-themes/Green-Submarine/gtk-3.0/other-applications.css
index 4fcaca36..8356dcbf 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/other-applications.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/other-applications.css
@@ -39,11 +39,6 @@ NemoSearchBar * {
     padding: 0px;
 }
 
-/* searchbar border */
-NemoWindow.background GtkGrid.vertical .horizontal {
-    border-color: @primay-toolbar-border;
-}
-
 NemoSearchBar .entry {
     padding: 2px 8px;
     border-width: 0px;
@@ -186,8 +181,11 @@ NemoWindow .sidebar .scrollbar.trough {
 }
 
 /* the small line between sidebar and view */
-NemoWindow * {
-    -GtkPaned-handle-size: 3px;
+NemoWindow GtkPaned.horizontal {
+    border-color: shade(@theme_bg_color, 0.80);
+    border-style: solid;
+    border-width: 0px 1px 0px 0px;
+    -GtkPaned-handle-size: 4px;
 }
 
 NemoWindow .sidebar .frame {
@@ -241,23 +239,9 @@ NemoWindow FMTreeView .view row:hover {
     padding: 4px;
 }
 
-/* disabled, looks uggly
-NemoWindow > GtkTable > .pane-separator,
-NemoWindow .pane-separator {
-    background-color: @sidebar_background;
-    background-image: -gtk-gradient (linear,
-                                     left top, right top,
-                                     from (@sidebar_background),
-                                     color-stop(0.50, @sidebar_background),
-                                     to   (shade(@theme_bg_color, 0.60)));
-    border-style: solid;
-    border-width: 0px;
-    border-color: @sidebar_background;
-    border-image: none;
-}*/
-
-NemoWindow .primary-toolbar.toolbar .button GtkImage {
-    color: @theme_fg_dark_color;
+/* to avoid unexpected light backgrounds */
+NemoToolbar.vertical {
+    background-color: @theme_bg_dark_color;
 }
 
 NemoToolbar .linked .button,
@@ -276,6 +260,10 @@ NemoToolbar .linked .button:focus:last-child {
     box-shadow: none;
 }
 
+NemoWindow .primary-toolbar.toolbar .button GtkImage {
+    color: @theme_fg_dark_color;
+}
+
 NemoWindow .primary-toolbar.toolbar .button,
 NemoWindow .primary-toolbar.toolbar .button:hover {
     padding: 4px;
@@ -396,7 +384,10 @@ NemoWindow .primary-toolbar.toolbar .button:checked,
 NemoWindow .primary-toolbar.toolbar .button:checked:hover {
     padding: 4px;
     background-color: transparent;
-    background-image: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
     border-width: 1px;
     border-style: solid;
     border-radius: 5px;
@@ -412,7 +403,10 @@ NemoWindow .primary-toolbar .toolbar .button:hover,
 NemoWindow .primary-toolbar.toolbar .button:hover {
     background-color: transparent;
     padding: 4px;
-    background-image: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
     border-width: 1px;
     border-radius: 5px;
     border-style: solid;
@@ -487,21 +481,6 @@ NemoWindow .notebook {
     box-shadow: none;
 }
 
-/*
-NemoWindow .notebook {
-    -GtkNotebook-initial-gap: 0;
-    border-width: 1px 0px 0px 0px;
-    border-radius: 0px;
-    border-image: none;
-
-    border-top-color: shade(@sidebar_background, 0.75);
-    border-left-color: @transparent;
-    border-bottom-color: @transparent;
-    border-right-color: @transparent;
-
-}
-*/
-
 /* Nemo notebook */
 GtkDialog.background .vertical.dialog-vbox .notebook .frame {
     background-color: shade (@theme_bg_color, 1.1);
@@ -618,3 +597,84 @@ NemoWindow .notebook tab .button GtkImage:active:hover {
     text-shadow: none;
 }
 
+/* stack-switcher ie. nemo preferences */
+.vertical.dialog-vbox .horizontal.primary-toolbar {
+    background-color: transparent;
+    border-color: @primay-toolbar-border;
+    border-width: 1px 0px;
+    padding: 1px 0px;
+}
+
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button {
+    color: @menu_fg_dark_color;
+    text-shadow: none;
+    box-shadow: none;
+    padding: 5px 2px;
+}
+
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:hover,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:checked,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:checked:hover {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
+    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
+                inset  1px  0px shade(@selected_bg_color, 0.97),
+                inset -1px  0px shade(@selected_bg_color, 0.93),
+                inset  0px -1px shade(@selected_bg_color, 0.93);
+}
+
+/* middle most button */
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:focus,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:hover,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:checked {
+    border-right-width: 0px;
+    border-left-width:  0px;
+    border-radius: 0px;
+}
+
+/* left most button */
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:first-child,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:focus:first-child,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:hover:first-child,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:checked:first-child {
+    border-radius: 6px 0 0 6px;
+    border-width: 1px;
+    border-right-width: 0px;
+}
+
+/* right most button */
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:last-child,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:focus:last-child,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:hover:last-child,
+.vertical.dialog-vbox .horizontal.primary-toolbar .horizontal.linked.stack-switcher .button.text-button:checked:last-child {
+    border-radius: 0 6px 6px 0;
+    border-width: 1px;
+    border-left-width: 0px;
+}
+
+.vertical.dialog-vbox .view.frame {
+    background-color: shade (@theme_bg_color, 1.1);
+    border-color: @borders;
+}
+
+.vertical.dialog-vbox .view.frame  GtkViewport.frame {
+    background-color: shade (@theme_bg_color, 1.1);
+}
+
+.vertical.dialog-vbox .view.frame  GtkViewport.frame .vertical GtkSeparator.separator.horizontal {
+    border-color: @borders;
+    border-width: 0 0 1px 0;
+}
+
+.vertical.dialog-vbox .view.frame  GtkViewport.frame .vertical .vertical .vertical .text-button {
+    background-color: transparent;
+}
+
+.vertical.dialog-vbox .view.frame  GtkViewport.frame .vertical .vertical .vertical .text-button:hover {
+    background-color: shade (@theme_bg_color, 1.05);
+    border-radius: 4px;
+}
+