GTK+-3.20 Submarine themes: adjustements for nemo and cinnamon-settings

4 files changed, 173 insertions, 910 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 856918e0..942ade67 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
@@ -829,7 +829,8 @@ button menuitem menubar {
     padding: 4px 8px;

 }

 

-button {

+button,

+button.raised {

     padding: 6px;

     min-height: 20px;

     min-width: 20px;

@@ -2693,9 +2694,10 @@ toolbar separator:disabled {
     primary toolbar raised buttons

 *************************************/

 

+/* ie. cimnnamon-settings (button.raised) */

 toolbar .raised button,

 toolbar button.raised {

-    padding: 2px;

+    padding: 6px;

 }

 

 toolbar menubar button {

@@ -3028,6 +3030,7 @@ calendar.header stackswitcher > button.titlebutton > image {
     padding-bottom: 3px;

 }

 

+toolbar .raised stackswitcher.linked.stack-switcher > button.text-button.radio,

 stackswitcher.linked.stack-switcher > button.text-button.radio,

 stackswitcher > button.text-button.radio,

 stackswitcher > .linked.stackswitcher > button.text-button.radio,

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 6e215a81..e9d3e4cf 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/other-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/other-applications.css
@@ -1,375 +1,99 @@
 /* nemo */
 
-NemoSearchBar.info {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@toolbar_gradient_base, 0.89)),
-                                     color-stop (0.20, shade(@toolbar_gradient_base, 0.97)),
-                                     to   (shade(@toolbar_gradient_base, 1.01)));
-    border-radius: 0px;
-    border-width: 0px 0px 1px 0px;
-    border-style: solid;
-    border-color: alpha(#000, 0.00) @toolbar_gradient_base shade(@toolbar_gradient_base, 0.75);
-    box-shadow: inset  0px  1px alpha(#fff, 0.06),
-                inset  1px  0px alpha(#fff, 0.06),
-                inset -1px  0px alpha(#fff, 0.06),
-                inset  0px -1px alpha(#fff, 0.06);
-    color: @toolbar_fg_color;
-}
-
-NemoTrashBar.info,
-NemoXContentBar.info,
-NemoQueryEditor.info {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 1.00)),
-                                     to   (shade(@nautilus_cluebar_color, 1.00)));
+/* NemoTrashBar, NemoXContentBar, NemoQueryEditor */
+.nemo-window-pane > notebook box.vertical box.vertical infobar.horizontal.info revealer .horizontal,
+.nemo-window-pane box.vertical.toolbar.primary-toolbar {
+    background-color: shade (@theme_bg_color, 1.05);
     border-radius: 0px;
     border-width: 0px 0px 1px 0px;
     border-style: solid;
-    border-color: transparent @nautilus_cluebar_color shade(@nautilus_cluebar_color, 0.75);
+    border-color: transparent;
     box-shadow: inset  0px  1px alpha(#fff, 0.06),
                 inset  1px  0px alpha(#fff, 0.06),
                 inset -1px  0px alpha(#fff, 0.06),
                 inset  0px -1px alpha(#fff, 0.06);
 }
 
-NemoSearchBar,
-NemoSearchBar * {
-    padding: 0px;
-}
-
-NemoSearchBar .entry {
-    padding: 4px 8px;
-    border-width: 0px;
-    border-radius: 4px;
-    box-shadow: inset  0px  3px alpha(#000, 0.03),
-                inset  0px  2px alpha(#000, 0.05),
-                inset  2px  0px alpha(#000, 0.04),
-                inset -2px  0px alpha(#000, 0.04),
-                inset  0px -2px alpha(#000, 0.03),
-                inset  0px  1px shade(@toolbar_gradient_base, 0.70),
-                inset  1px  0px shade(@toolbar_gradient_base, 0.80),
-                inset -1px  0px shade(@toolbar_gradient_base, 0.80),
-                inset  0px -1px shade(@toolbar_gradient_base, 0.90);
-}
-
-NemoSearchBar .entry.image {
-    color: shade(@nautilus_cluebar_color, 0.60);
-}
-
-
-NemoSearchBar GtkLabel {
-    color: @toolbar_fg_color;
-       text-shadow: 0 1px @toolbar_shadow_color;
-}
-
-.nemo-cluebar-label {
-    font: bold;
-    color: @fg_dark_color;
-    text-shadow: 0 1px @theme_shadow_color;
-}
-
-NemoTrashBar .button,
-NemoTrashBar .button:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 1.08)),
-                                     color-stop (0.45, shade(@nautilus_cluebar_color, 1.02)),
-                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.96)),
-                                     to   (shade(@nautilus_cluebar_color, 0.92)));
-    box-shadow: inset  0px  2px alpha(#fff, 0.09),
-                inset  2px  0px alpha(#fff, 0.07),
-                inset -2px  0px alpha(#fff, 0.07),
-                inset  0px -2px alpha(#fff, 0.05),
-                inset  0px  1px shade(@nautilus_cluebar_color, 0.80),
-                inset  1px  0px shade(@nautilus_cluebar_color, 0.70),
-                inset -1px  0px shade(@nautilus_cluebar_color, 0.70),
-                inset  0px -1px shade(@nautilus_cluebar_color, 0.60);
-    color: shade(@theme_fg_color, 1.00);
-    text-shadow: 0px 1px @theme_shadow_color;
-}
-
-NemoTrashBar .button:active,
-NemoTrashBar .button:active:hover,
-NemoTrashBar .button:checked,
-NemoTrashBar .button:checked:hover {
-/* .button:active:hover */
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 1.00)),
-                                     color-stop (0.45, shade(@nautilus_cluebar_color, 0.95)),
-                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.91)),
-                                     to   (shade(@nautilus_cluebar_color, 0.87)));
-    /* outer */
-    border-top-color:    alpha(@focused_entry_border, 0.20);
-    border-right-color:  alpha(@focused_entry_border, 0.25);
-    border-left-color:   alpha(@focused_entry_border, 0.25);
-    border-bottom-color: alpha(#fff, 0.10);
-    box-shadow: inset  0px  2px alpha(#fff, 0.09),
-                inset  2px  0px alpha(#fff, 0.07),
-                inset -2px  0px alpha(#fff, 0.07),
-                inset  0px -2px alpha(#fff, 0.05),
-                inset  0px  1px shade(@nautilus_cluebar_color, 0.75),
-                inset  1px  0px shade(@nautilus_cluebar_color, 0.65),
-                inset -1px  0px shade(@nautilus_cluebar_color, 0.65),
-                inset  0px -1px shade(@nautilus_cluebar_color, 0.55);
-}
-
-NemoTrashBar .button *:active,
-NemoTrashBar .button *:active:hover,
-NemoTrashBar .button *:checked,
-NemoTrashBar .button *:checked:hover {
+.nemo-window-pane > notebook box.vertical box.vertical infobar.horizontal.info revealer .horizontal label {
     color: shade(@theme_text_color, 1.00);
     text-shadow: 0px 1px @theme_shadow_color;
 }
 
-NemoTrashBar .button:disabled {
-/* .button:active:hover */
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 0.95)),
-                                     color-stop (0.45, shade(@nautilus_cluebar_color, 0.90)),
-                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.88)),
-                                     to   (shade(@nautilus_cluebar_color, 0.89)));
-    box-shadow: inset  0px  1px shade(@nautilus_cluebar_color, 0.85),
-                inset  1px  0px shade(@nautilus_cluebar_color, 0.81),
-                inset -1px  0px shade(@nautilus_cluebar_color, 0.81),
-                inset  0px -1px shade(@nautilus_cluebar_color, 0.78);
-}
-
-NemoTrashBar .button *:disabled {
+.nemo-window-pane > notebook box.vertical box.vertical infobar.horizontal.info revealer .horizontal label:disabled {
     color: mix(@nautilus_cluebar_color, @theme_fg_color, 0.50);
-    text-shadow: none;
-}
-
-NemoWindow .sidebar .frame {
-    border-width: 0px;
-    border-style: none;
-    border-top-width: 0;
-    border-bottom-width: 0;
 }
 
-/* disable shadow and radius for nemo, looks strange */
-.nemo-window .sidebar .view row:hover,
-.nemo-window .sidebar .view row:selected,
-.nemo-window .sidebar .view row:selected:hover {
+/* disable radius for nemo, looks strange */
+.nemo-window .sidebar treeview.view {
     border-radius: 0px;
-    box-shadow: none;
 }
 
-/* to avoid unexpected light backgrounds */
-NemoToolbar.vertical {
-    background-color: @theme_bg_dark_color;
-}
-
-NemoToolbar .linked .button,
-NemoToolbar .linked .button:first-child,
-NemoToolbar .linked .button:last-child,
-NemoToolbar .toolbar .raised .button,
-NemoToolbar .toolbar .raised .button:first-child,
-NemoToolbar .toolbar .raised .button:last-child,
-NemoToolbar .toolbar .raised .button:only-child {
-    padding: 4px;
-}
-
-NemoToolbar .linked .button:focus,
-NemoToolbar .linked .button:focus:first-child,
-NemoToolbar .linked .button:focus:last-child {
-    box-shadow: none;
+.nemo-window .sidebar treeview.view:selected,
+.nemo-window .sidebar treeview.view:selected:hover {
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 1.2),
+                                      shade (@theme_selected_bg_color, 0.7));
+    color: @theme_selected_fg_color;
+    border-radius: 0px;
 }
 
 .nemo-window toolbar.primary-toolbar button image {
     color: @theme_fg_dark_color;
 }
 
-.nemo-window toolbar.primary-toolbar button,
-.nemo-window toolbar.primary-toolbar button:hover {
-    padding: 4px;
+.nemo-window toolbar.primary-toolbar .raised button,
+.nemo-window toolbar.primary-toolbar .raised.linked button,
+.nemo-window toolbar.primary-toolbar .raised button:hover,
+.nemo-window toolbar.primary-toolbar .raised.linked button:hover,
+.nemo-window toolbar.primary-toolbar .raised.linked button:focus,
+.nemo-window toolbar.primary-toolbar .raised.linked button:checked:hover:active,
+.nemo-window toolbar.primary-toolbar .raised.linked button:focus:checked:hover:active {
+    padding: 4px 7px;
 }
 
 .nemo-window toolbar.primary-toolbar entry {
-    padding: 3px 8px;
-}
-/*
-NemoWindow .primary-toolbar.toolbar .button:active,
-NemoWindow .primary-toolbar.toolbar .button:active:hover,
-NemoWindow .primary-toolbar.toolbar .button:checked,
-NemoWindow .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)));
-    border-width: 1px;
-    border-style: solid; 
-    border-radius: 5px;
-    border-image: none;
-    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),
-                inset  0px -1px shade (@theme_selected_bg_color, 1.3);
+    padding: 3px 4px;
 }
 
-NemoWindow .primary-toolbar.toolbar .button,
-NemoWindow .primary-toolbar.toolbar .button:active,
-NemoWindow .primary-toolbar.toolbar .button:checked,
-NemoWindow .primary-toolbar.toolbar .button:hover,
-NemoWindow .primary-toolbar.toolbar .button:active:hover,
-NemoWindow .primary-toolbar.toolbar .button:checked:hover {
-    background-color: transparent;
-    padding: 4px;
-    border-image: none;
-    border-width: 1px;
-    border-radius: 5px;
-    border-color: transparent;
-}
-*/
-.nemo-window toolbar.primary-toolbar NemoPathbarButton {
-    padding: 4px;
-    border-image: none;
-    border-style: solid;
-    border-radius: 0px;
-    border-width: 0px;
-    border-color: transparent;
-}
-
-.nemo-window toolbar.primary-toolbar NemoPathbarButton {
-    background-color: transparent;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@button_raised_gradient_color_a),
-                                     to (@button_raised_gradient_color_b));
-    border-color: transparent;
-    border-width: 0px;
-    color: shade(@theme_fg_dark_color, 0.90);
+/* pathbar */
+.nemo-window widget.raised.linked > button:nth-child(first) widget {
+    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+    color: @menu_fg_dark_color;
 }
 
-.nemo-window toolbar.primary-toolbar NemoPathbarButton * {
-    color: shade(@theme_text_dark_color, 1.00);
-    text-shadow: 0px 1px @theme_shadow_dark_color;
-    border-color: transparent;
+.nemo-window widget.raised.linked > button:nth-child(last) widget {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+    color: @menu_fg_dark_color;
 }
 
-.nemo-window toolbar.primary-toolbar NemoPathbarButton *:hover {
-    color: shade(@theme_text_dark_color, 1.00);
-}
-.nemo-window toolbar.primary-toolbar NemoPathbarButton * {
-    -GtkArrow-arrow-scaling: 0.7;
+.nemo-window widget.raised.linked > button:nth-child(first) widget:disabled,
+.nemo-window widget.raised.linked > button:nth-child(last) widget:disabled {
+    color: @insensitive_fg_color;
 }
 
-.nemo-window toolbar.primary-toolbar NemoPathbarButton,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:first-child,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:last-child,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:only-child {
-    transition: all 400ms ease-out;
+.nemo-window widget.raised.linked > button:nth-child(first),
+.nemo-window widget.raised.linked > button:nth-child(first):hover,
+.nemo-window widget.raised.linked > button:nth-child(first):backdrop {
+   margin: 0px -1px 0px -1px;
+   padding: 0px;
 }
 
-.nemo-window toolbar.primary-toolbar NemoPathbarButton,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:first-child,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:last-child,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:only-child,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:hover,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:first-child:hover,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:last-child:hover,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:only-child:hover {
-    padding: 4px;
+.nemo-window widget.raised.linked > button:nth-child(last),
+.nemo-window widget.raised.linked > button:nth-child(last):hover,
+.nemo-window widget.raised.linked > button:nth-child(last):backdrop {
+   margin: 0px -1px 0px -1px;
+   padding: 0px;
 }
 
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:active,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:checked {
-    background-color: transparent;
-    background-image: none;
-    border-image: none;
-    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),
-                inset  0px -1px shade (@theme_selected_bg_color, 1.3);
-}
-
-.nemo-window toolbar.primary-toolbar NemoPathbarButton *:active,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton *:active:hover,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton *:checked,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton *:checked:hover {
-    font: bold;
-    color: shade(@theme_text_dark_color, 1.00);
-    text-shadow: 1px 1px @theme_shadow_dark_color;
-}
-/*
-NemoWindow .primary-toolbar.toolbar .button:active,
-NemoWindow .primary-toolbar.toolbar .button:active:hover,
-NemoWindow .primary-toolbar.toolbar .button:checked,
-NemoWindow .primary-toolbar.toolbar .button:checked:hover {
-    padding: 4px;
-    background-color: transparent;
-    background-image: none;
-    border-width: 1px;
-    border-style: solid;
-    border-radius: 5px;
-    border-image: none;
-    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),
-                inset  0px -1px shade (@theme_selected_bg_color, 1.3);
-}
-
-NemoWindow .primary-toolbar .toolbar .button:hover,
-NemoWindow .primary-toolbar.toolbar .button:hover {
-    background-color: transparent;
-    padding: 4px;
-    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;
-    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),
-                inset  0px -1px shade (@theme_selected_bg_color, 1.3);
-}
-*/
-.nemo-window toolbar.primary-toolbar {
-    background-color: @theme_bg_color;
+.nemo-window widget.raised.linked > button.text-button.toggle,
+.nemo-window widget.raised.linked > button.text-button.toggle:nth-child(first) {
+    margin: 0px 0px 0px 0px;
+    padding: 0px 6px;
 }
 
-/* workaround for broken first/last-child logic with linked buttons
-   in pathbar with gtk+-3.18 */
-NemoPathBar:dir(ltr).raised.linked .button.text-button,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:active,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:active:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:active:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:active:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:only-child {
-	border-right-width: 1px;
-	border-left-width: 1px;
-	border-radius: 6px;
+.nemo-window widget.raised.linked > button.text-button.toggle:nth-child(last) {
+    margin: 0px 0px 0px 0px;
+    padding: 0px 6px;
 }
 
 /* Nemo statusbar */
@@ -386,132 +110,14 @@ NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:only
     padding: 6px;
 }
 
-/* small buttons statusbar nemo */
-.nemo-window box.toolbar.horizontal button image,
-.nemo-window box.toolbar.horizontal button image:active,
-.nemo-window box.toolbar.horizontal button image:active:hover,
-.nemo-window box.toolbar.horizontal button image:checked,
-.nemo-window box.toolbar.horizontal button image:checked:hover,
-.nemo-window box.toolbar.horizontal button image:hover {
-    color: @theme_fg_color;
-}
-
-.nemo-window box.toolbar.horizontal button:hover,
-.nemo-window box.toolbar.horizontal button:active,
-.nemo-window box.toolbar.horizontal button:active:hover,
-.nemo-window box.toolbar.horizontal button:checked,
-.nemo-window box.toolbar.horizontal button:checked:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@button_gradient1, 1.03)),
-                                     color-stop (0.48, shade(@button_gradient2, 1.03)),
-                                     color-stop (0.52, shade(@button_gradient3, 1.03)),
-                                     to   (shade(@button_gradient4, 1.01)));
-    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),
-                inset  0px -1px shade (@theme_selected_bg_color, 1.3);
+/* kill unwanted colors */
+.nemo-window .nemo-window-pane notebook {
+    background-color: @theme_bg_color;
 }
 
-.nemo-window-pane notebook {
-/*    -GtkNotebook-initial-gap: 0; */
+/* icon and compat mode, FIXME .view is broken with 3.20 */
+.nemo-window .nemo-window-pane > notebook scrolledwindow {
     background-color: @theme_base_color;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_base_color, 1.00)),
-                                     to   (shade(@theme_base_color, 1.00)));
-    border-width: 0px;
-    border-style: none;
-    border-left-style: none;
-    border-right-style: none;
-    border-radius: 0px;
-    border-top-color: shade(@notebook_border, 1.00);
-    border-left-color: @transparent;
-    border-bottom-color: @transparent;
-    border-right-color: @transparent;
-    box-shadow: none;
-}
-
-
-.nemo-window-pane notebook tab {
-    border-width: 0px 1px;
-    border-style: solid;
-    border-color:       shade(@notebook_border, 1.00);
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@sidebar_background, 0.90)),
-                                     color-stop (0.15, shade(@sidebar_background, 1.00)),
-                                     to   (shade(@sidebar_background, 1.00)));
-    box-shadow: inset  0px  1px alpha(#000, 0.08),
-                inset  1px  0px alpha(#000, 0.04),
-                inset -1px  0px alpha(#000, 0.04),
-                inset  0px -1px shade(@notebook_border, 1.00);
-}
-
-.nemo-window-pane notebook tab:active {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_base_color, 0.90)),
-                                     color-stop (0.15, shade(@theme_base_color, 1.00)),
-                                     to   (shade(@theme_base_color, 1.00)));
-    border-image: none;
-    border-left-color: shade(@notebook_border, 1.00);
-    border-right-color: shade(@notebook_border, 1.00);
-    box-shadow: inset  0px  1px alpha(#000, 0.08),
-                inset  1px  0px alpha(#fff, 0.04),
-                inset -1px  0px alpha(#fff, 0.04);
-}
-
-.nemo-window-pane notebook tab.top {
-    padding: 0px 6px;
-    border-radius: 0px;
-}
-
-.nemo-window-pane notebook tab:first-child,
-.nemo-window-pane notebook tab:first-child:active,
-.nemo-window-pane notebook tab:first-child:checked {
-    border-width: 0px 1px 0px 0px;
-    border-radius: 0px;
-}
-
-.nemo-window-pane notebook tab:last-child,
-.nemo-window-pane notebook tab:last-child:active,
-.nemo-window-pane notebook tab:last-child:checked {
-    border-width: 0px 0px 0px 1px;
-    border-radius: 0px;
-}
-
-.nemo-window-pane notebook tab label {
-    padding: 0px;
-    color: @theme_text_color;
-    text-shadow: 0px 1px @theme_shadow_color;
-}
-
-.nemo-window-pane notebook tab button image {
-    border-radius: 3px;
-    color: mix(@theme_fg_color, @sidebar_background, 0.30);
-    border-style: solid;
-    border-color: transparent;
-    border-width: 1px;
-    padding: 0;
-    -gtk-icon-shadow: 1px 1px @theme_shadow_color;
-}
-
-.nemo-window-pane notebook tab button image:hover {
-    color: @theme_fg_color; 
-    border-color: alpha(black, 0.1); 
-}
-
-.nemo-window-pane notebook tab button image:checked,
-.nemo-window-pane notebook tab button image:active:hover {
-    background-color: alpha(black, 0.15); 
-    color: shade(@theme_fg_color, 1.00);
-    -gtk-icon-shadow: 0px 1px @theme_shadow_color;
-    border-color: alpha(black, 0.27) 
-                  alpha(black, 0.13) 
-                  alpha(black, 0.13) 
-                  alpha(black, 0.13); 
 }
 
 .nemo-canvas-item {
@@ -625,6 +231,28 @@ NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:only
     border-radius: 4px;
 }
 
+/* Cinnamon-Settings */
+
+toolbar.cs-header {
+    background-color: transparent;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_base, 1.00)),
+                                     to (shade(@button_base, 0.93)));
+    border-style: solid;
+    border-radius: 3px 3px 0px 0px;
+    border-top-color:    shade(@button_border, 1.05);
+    border-left-color:   shade(@button_border, 1.05);
+    border-right-color:  shade(@button_border, 1.05);
+    border-bottom-color: shade(@button_border, 0.95);
+    box-shadow: inset  0px  1px alpha(#fff, 0.09),
+                inset  1px  0px alpha(#fff, 0.07),
+                inset -1px  0px alpha(#fff, 0.07),
+                inset  0px -1px alpha(#fff, 0.05);
+    border-width: 1px;
+    margin: -2px  -2px  0px  -2px;
+}
+
 /* CompizConfigManager */
 
 .ccsm-window notebook.frame scrolledwindow viewport widget.notebook {
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 12e7b8a3..bb75d805 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
@@ -829,7 +829,8 @@ button menuitem menubar {
     padding: 4px 8px;

 }

 

-button {

+button,

+button.raised {

     padding: 6px;

     min-height: 20px;

     min-width: 20px;

@@ -2691,9 +2692,10 @@ toolbar separator:disabled {
     primary toolbar raised buttons

 *************************************/

 

+/* ie. cimnnamon-settings (button.raised) */

 toolbar .raised button,

 toolbar button.raised {

-    padding: 2px;

+    padding: 6px;

 }

 

 toolbar menubar button {

@@ -3026,6 +3028,7 @@ calendar.header stackswitcher > button.titlebutton > image {
     padding-bottom: 3px;

 }

 

+toolbar .raised stackswitcher.linked.stack-switcher > button.text-button.radio,

 stackswitcher.linked.stack-switcher > button.text-button.radio,

 stackswitcher > button.text-button.radio,

 stackswitcher > .linked.stackswitcher > button.text-button.radio,

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 60bc591c..406010a6 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/other-applications.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/other-applications.css
@@ -1,375 +1,99 @@
 /* nemo */
 
-NemoSearchBar.info {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@toolbar_gradient_base, 0.89)),
-                                     color-stop (0.20, shade(@toolbar_gradient_base, 0.97)),
-                                     to   (shade(@toolbar_gradient_base, 1.01)));
-    border-radius: 0px;
-    border-width: 0px 0px 1px 0px;
-    border-style: solid;
-    border-color: alpha(#000, 0.00) @toolbar_gradient_base shade(@toolbar_gradient_base, 0.75);
-    box-shadow: inset  0px  1px alpha(#fff, 0.06),
-                inset  1px  0px alpha(#fff, 0.06),
-                inset -1px  0px alpha(#fff, 0.06),
-                inset  0px -1px alpha(#fff, 0.06);
-    color: @toolbar_fg_color;
-}
-
-NemoTrashBar.info,
-NemoXContentBar.info,
-NemoQueryEditor.info {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 1.00)),
-                                     to   (shade(@nautilus_cluebar_color, 1.00)));
+/* NemoTrashBar, NemoXContentBar, NemoQueryEditor */
+.nemo-window-pane > notebook box.vertical box.vertical infobar.horizontal.info revealer .horizontal,
+.nemo-window-pane box.vertical.toolbar.primary-toolbar {
+    background-color: shade (@theme_bg_color, 1.05);
     border-radius: 0px;
     border-width: 0px 0px 1px 0px;
     border-style: solid;
-    border-color: transparent @nautilus_cluebar_color shade(@nautilus_cluebar_color, 0.75);
+    border-color: transparent;
     box-shadow: inset  0px  1px alpha(#fff, 0.06),
                 inset  1px  0px alpha(#fff, 0.06),
                 inset -1px  0px alpha(#fff, 0.06),
                 inset  0px -1px alpha(#fff, 0.06);
 }
 
-NemoSearchBar,
-NemoSearchBar * {
-    padding: 0px;
-}
-
-NemoSearchBar .entry {
-    padding: 4px 8px;
-    border-width: 0px;
-    border-radius: 4px;
-    box-shadow: inset  0px  3px alpha(#000, 0.03),
-                inset  0px  2px alpha(#000, 0.05),
-                inset  2px  0px alpha(#000, 0.04),
-                inset -2px  0px alpha(#000, 0.04),
-                inset  0px -2px alpha(#000, 0.03),
-                inset  0px  1px shade(@toolbar_gradient_base, 0.70),
-                inset  1px  0px shade(@toolbar_gradient_base, 0.80),
-                inset -1px  0px shade(@toolbar_gradient_base, 0.80),
-                inset  0px -1px shade(@toolbar_gradient_base, 0.90);
-}
-
-NemoSearchBar .entry.image {
-    color: shade(@nautilus_cluebar_color, 0.60);
-}
-
-
-NemoSearchBar GtkLabel {
-    color: @toolbar_fg_color;
-       text-shadow: 0 1px @toolbar_shadow_color;
-}
-
-.nemo-cluebar-label {
-    font: bold;
-    color: @fg_dark_color;
-    text-shadow: 0 1px @theme_shadow_color;
-}
-
-NemoTrashBar .button,
-NemoTrashBar .button:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 1.08)),
-                                     color-stop (0.45, shade(@nautilus_cluebar_color, 1.02)),
-                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.96)),
-                                     to   (shade(@nautilus_cluebar_color, 0.92)));
-    box-shadow: inset  0px  2px alpha(#fff, 0.09),
-                inset  2px  0px alpha(#fff, 0.07),
-                inset -2px  0px alpha(#fff, 0.07),
-                inset  0px -2px alpha(#fff, 0.05),
-                inset  0px  1px shade(@nautilus_cluebar_color, 0.80),
-                inset  1px  0px shade(@nautilus_cluebar_color, 0.70),
-                inset -1px  0px shade(@nautilus_cluebar_color, 0.70),
-                inset  0px -1px shade(@nautilus_cluebar_color, 0.60);
-    color: shade(@theme_fg_color, 1.00);
-    text-shadow: 0px 1px @theme_shadow_color;
-}
-
-NemoTrashBar .button:active,
-NemoTrashBar .button:active:hover,
-NemoTrashBar .button:checked,
-NemoTrashBar .button:checked:hover {
-/* .button:active:hover */
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 1.00)),
-                                     color-stop (0.45, shade(@nautilus_cluebar_color, 0.95)),
-                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.91)),
-                                     to   (shade(@nautilus_cluebar_color, 0.87)));
-    /* outer */
-    border-top-color:    alpha(@focused_entry_border, 0.20);
-    border-right-color:  alpha(@focused_entry_border, 0.25);
-    border-left-color:   alpha(@focused_entry_border, 0.25);
-    border-bottom-color: alpha(#fff, 0.10);
-    box-shadow: inset  0px  2px alpha(#fff, 0.09),
-                inset  2px  0px alpha(#fff, 0.07),
-                inset -2px  0px alpha(#fff, 0.07),
-                inset  0px -2px alpha(#fff, 0.05),
-                inset  0px  1px shade(@nautilus_cluebar_color, 0.75),
-                inset  1px  0px shade(@nautilus_cluebar_color, 0.65),
-                inset -1px  0px shade(@nautilus_cluebar_color, 0.65),
-                inset  0px -1px shade(@nautilus_cluebar_color, 0.55);
-}
-
-NemoTrashBar .button *:active,
-NemoTrashBar .button *:active:hover,
-NemoTrashBar .button *:checked,
-NemoTrashBar .button *:checked:hover {
+.nemo-window-pane > notebook box.vertical box.vertical infobar.horizontal.info revealer .horizontal label {
     color: shade(@theme_text_color, 1.00);
     text-shadow: 0px 1px @theme_shadow_color;
 }
 
-NemoTrashBar .button:disabled {
-/* .button:active:hover */
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 0.95)),
-                                     color-stop (0.45, shade(@nautilus_cluebar_color, 0.90)),
-                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.88)),
-                                     to   (shade(@nautilus_cluebar_color, 0.89)));
-    box-shadow: inset  0px  1px shade(@nautilus_cluebar_color, 0.85),
-                inset  1px  0px shade(@nautilus_cluebar_color, 0.81),
-                inset -1px  0px shade(@nautilus_cluebar_color, 0.81),
-                inset  0px -1px shade(@nautilus_cluebar_color, 0.78);
-}
-
-NemoTrashBar .button *:disabled {
+.nemo-window-pane > notebook box.vertical box.vertical infobar.horizontal.info revealer .horizontal label:disabled {
     color: mix(@nautilus_cluebar_color, @theme_fg_color, 0.50);
-    text-shadow: none;
 }
 
-NemoWindow .sidebar .frame {
-    border-width: 0px;
-    border-style: none;
-    border-top-width: 0;
-    border-bottom-width: 0;
-}
-
-/* disable shadow and radius for nemo, looks strange */
-.nemo-window .sidebar .view row:hover,
-.nemo-window .sidebar .view row:selected,
-.nemo-window .sidebar .view row:selected:hover {
+/* disable radius for nemo, looks strange */
+.nemo-window .sidebar treeview.view {
     border-radius: 0px;
-    box-shadow: none;
-}
-
-/* to avoid unexpected light backgrounds */
-NemoToolbar.vertical {
-    background-color: @theme_bg_dark_color;
-}
-
-NemoToolbar .linked .button,
-NemoToolbar .linked .button:first-child,
-NemoToolbar .linked .button:last-child,
-NemoToolbar .toolbar .raised .button,
-NemoToolbar .toolbar .raised .button:first-child,
-NemoToolbar .toolbar .raised .button:last-child,
-NemoToolbar .toolbar .raised .button:only-child {
-    padding: 4px;
 }
 
-NemoToolbar .linked .button:focus,
-NemoToolbar .linked .button:focus:first-child,
-NemoToolbar .linked .button:focus:last-child {
-    box-shadow: none;
+.nemo-window .sidebar treeview.view:selected,
+.nemo-window .sidebar treeview.view:selected:hover {
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 1.2),
+                                      shade (@theme_selected_bg_color, 0.7));
+    color: @theme_selected_fg_color;
+    border-radius: 0px;
 }
 
 .nemo-window toolbar.primary-toolbar button image {
     color: @theme_fg_dark_color;
 }
 
-.nemo-window toolbar.primary-toolbar button,
-.nemo-window toolbar.primary-toolbar button:hover {
-    padding: 4px;
+.nemo-window toolbar.primary-toolbar .raised button,
+.nemo-window toolbar.primary-toolbar .raised.linked button,
+.nemo-window toolbar.primary-toolbar .raised button:hover,
+.nemo-window toolbar.primary-toolbar .raised.linked button:hover,
+.nemo-window toolbar.primary-toolbar .raised.linked button:focus,
+.nemo-window toolbar.primary-toolbar .raised.linked button:checked:hover:active,
+.nemo-window toolbar.primary-toolbar .raised.linked button:focus:checked:hover:active {
+    padding: 4px 7px;
 }
 
 .nemo-window toolbar.primary-toolbar entry {
-    padding: 3px 8px;
-}
-/*
-NemoWindow .primary-toolbar.toolbar .button:active,
-NemoWindow .primary-toolbar.toolbar .button:active:hover,
-NemoWindow .primary-toolbar.toolbar .button:checked,
-NemoWindow .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)));
-    border-width: 1px;
-    border-style: solid; 
-    border-radius: 5px;
-    border-image: none;
-    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),
-                inset  0px -1px shade (@theme_selected_bg_color, 1.3);
+    padding: 3px 4px;
 }
 
-NemoWindow .primary-toolbar.toolbar .button,
-NemoWindow .primary-toolbar.toolbar .button:active,
-NemoWindow .primary-toolbar.toolbar .button:checked,
-NemoWindow .primary-toolbar.toolbar .button:hover,
-NemoWindow .primary-toolbar.toolbar .button:active:hover,
-NemoWindow .primary-toolbar.toolbar .button:checked:hover {
-    background-color: transparent;
-    padding: 4px;
-    border-image: none;
-    border-width: 1px;
-    border-radius: 5px;
-    border-color: transparent;
-}
-*/
-.nemo-window toolbar.primary-toolbar NemoPathbarButton {
-    padding: 4px;
-    border-image: none;
-    border-style: solid;
-    border-radius: 0px;
-    border-width: 0px;
-    border-color: transparent;
-}
-
-.nemo-window toolbar.primary-toolbar NemoPathbarButton {
-    background-color: transparent;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@button_raised_gradient_color_a),
-                                     to (@button_raised_gradient_color_b));
-    border-color: transparent;
-    border-width: 0px;
-    color: shade(@theme_fg_dark_color, 0.90);
-}
-
-.nemo-window toolbar.primary-toolbar NemoPathbarButton * {
-    color: shade(@theme_text_dark_color, 1.00);
-    text-shadow: 0px 1px @theme_shadow_dark_color;
-    border-color: transparent;
+/* pathbar */
+.nemo-window widget.raised.linked > button:nth-child(first) widget {
+    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+    color: @menu_fg_dark_color;
 }
 
-.nemo-window toolbar.primary-toolbar NemoPathbarButton *:hover {
-    color: shade(@theme_text_dark_color, 1.00);
-}
-.nemo-window toolbar.primary-toolbar NemoPathbarButton * {
-    -GtkArrow-arrow-scaling: 0.7;
+.nemo-window widget.raised.linked > button:nth-child(last) widget {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+    color: @menu_fg_dark_color;
 }
 
-.nemo-window toolbar.primary-toolbar NemoPathbarButton,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:first-child,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:last-child,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:only-child {
-    transition: all 400ms ease-out;
+.nemo-window widget.raised.linked > button:nth-child(first) widget:disabled,
+.nemo-window widget.raised.linked > button:nth-child(last) widget:disabled {
+    color: @insensitive_fg_color;
 }
 
-.nemo-window toolbar.primary-toolbar NemoPathbarButton,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:first-child,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:last-child,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:only-child,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:hover,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:first-child:hover,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:last-child:hover,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:only-child:hover {
-    padding: 4px;
+.nemo-window widget.raised.linked > button:nth-child(first),
+.nemo-window widget.raised.linked > button:nth-child(first):hover,
+.nemo-window widget.raised.linked > button:nth-child(first):backdrop {
+   margin: 0px -1px 0px -1px;
+   padding: 0px;
 }
 
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:active,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton:checked {
-    background-color: transparent;
-    background-image: none;
-    border-image: none;
-    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),
-                inset  0px -1px shade(@selected_bg_color, 0.93);
-}
-
-.nemo-window toolbar.primary-toolbar NemoPathbarButton *:active,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton *:active:hover,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton *:checked,
-.nemo-window toolbar.primary-toolbar NemoPathbarButton *:checked:hover {
-    font: bold;
-    color: shade(@theme_text_dark_color, 1.00);
-    text-shadow: 1px 1px @theme_shadow_dark_color;
-}
-/*
-NemoWindow .primary-toolbar.toolbar .button:active,
-NemoWindow .primary-toolbar.toolbar .button:active:hover,
-NemoWindow .primary-toolbar.toolbar .button:checked,
-NemoWindow .primary-toolbar.toolbar .button:checked:hover {
-    padding: 4px;
-    background-color: transparent;
-    background-image: none;
-    border-width: 1px;
-    border-style: solid;
-    border-radius: 5px;
-    border-image: none;
-    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),
-                inset  0px -1px shade(@selected_bg_color, 0.93);
+.nemo-window widget.raised.linked > button:nth-child(last),
+.nemo-window widget.raised.linked > button:nth-child(last):hover,
+.nemo-window widget.raised.linked > button:nth-child(last):backdrop {
+   margin: 0px -1px 0px -1px;
+   padding: 0px;
 }
 
-NemoWindow .primary-toolbar .toolbar .button:hover,
-NemoWindow .primary-toolbar.toolbar .button:hover {
-    background-color: transparent;
-    padding: 4px;
-    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;
-    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),
-                inset  0px -1px shade(@selected_bg_color, 0.93);
-}
-*/
-.nemo-window toolbar.primary-toolbar {
-    background-color: @theme_bg_color;
+.nemo-window widget.raised.linked > button.text-button.toggle,
+.nemo-window widget.raised.linked > button.text-button.toggle:nth-child(first) {
+    margin: 0px 0px 0px 0px;
+    padding: 0px 6px;
 }
 
-/* workaround for broken first/last-child logic with linked buttons
-   in pathbar with gtk+-3.18 */
-NemoPathBar:dir(ltr).raised.linked .button.text-button,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:active,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:active:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:active:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:active:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:only-child {
-	border-right-width: 1px;
-	border-left-width: 1px;
-	border-radius: 6px;
+.nemo-window widget.raised.linked > button.text-button.toggle:nth-child(last) {
+    margin: 0px 0px 0px 0px;
+    padding: 0px 6px;
 }
 
 /* Nemo statusbar */
@@ -386,132 +110,14 @@ NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:only
     padding: 6px;
 }
 
-/* small buttons statusbar nemo */
-.nemo-window box.toolbar.horizontal button image,
-.nemo-window box.toolbar.horizontal button image:active,
-.nemo-window box.toolbar.horizontal button image:active:hover,
-.nemo-window box.toolbar.horizontal button image:checked,
-.nemo-window box.toolbar.horizontal button image:checked:hover,
-.nemo-window box.toolbar.horizontal button image:hover {
-    color: @theme_fg_color;
-}
-
-.nemo-window box.toolbar.horizontal button:hover,
-.nemo-window box.toolbar.horizontal button:active,
-.nemo-window box.toolbar.horizontal button:active:hover,
-.nemo-window box.toolbar.horizontal button:checked,
-.nemo-window box.toolbar.horizontal button:checked:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@button_gradient1, 1.03)),
-                                     color-stop (0.48, shade(@button_gradient2, 1.03)),
-                                     color-stop (0.52, shade(@button_gradient3, 1.03)),
-                                     to   (shade(@button_gradient4, 1.01)));
-    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),
-                inset  0px -1px shade(@selected_bg_color, 0.93);
+/* kill unwanted colors */
+.nemo-window .nemo-window-pane notebook {
+    background-color: @theme_bg_color;
 }
 
-.nemo-window-pane notebook {
-/*    -GtkNotebook-initial-gap: 0; */
+/* icon and compat mode, FIXME .view is broken with 3.20 */
+.nemo-window .nemo-window-pane > notebook scrolledwindow {
     background-color: @theme_base_color;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_base_color, 1.00)),
-                                     to   (shade(@theme_base_color, 1.00)));
-    border-width: 0px;
-    border-style: none;
-    border-left-style: none;
-    border-right-style: none;
-    border-radius: 0px;
-    border-top-color: shade(@notebook_border, 1.00);
-    border-left-color: @transparent;
-    border-bottom-color: @transparent;
-    border-right-color: @transparent;
-    box-shadow: none;
-}
-
-
-.nemo-window-pane notebook tab {
-    border-width: 0px 1px;
-    border-style: solid;
-    border-color:       shade(@notebook_border, 1.00);
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@sidebar_background, 0.90)),
-                                     color-stop (0.15, shade(@sidebar_background, 1.00)),
-                                     to   (shade(@sidebar_background, 1.00)));
-    box-shadow: inset  0px  1px alpha(#000, 0.08),
-                inset  1px  0px alpha(#000, 0.04),
-                inset -1px  0px alpha(#000, 0.04),
-                inset  0px -1px shade(@notebook_border, 1.00);
-}
-
-.nemo-window-pane notebook tab:active {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_base_color, 0.90)),
-                                     color-stop (0.15, shade(@theme_base_color, 1.00)),
-                                     to   (shade(@theme_base_color, 1.00)));
-    border-image: none;
-    border-left-color: shade(@notebook_border, 1.00);
-    border-right-color: shade(@notebook_border, 1.00);
-    box-shadow: inset  0px  1px alpha(#000, 0.08),
-                inset  1px  0px alpha(#fff, 0.04),
-                inset -1px  0px alpha(#fff, 0.04);
-}
-
-.nemo-window-pane notebook tab.top {
-    padding: 0px 6px;
-    border-radius: 0px;
-}
-
-.nemo-window-pane notebook tab:first-child,
-.nemo-window-pane notebook tab:first-child:active,
-.nemo-window-pane notebook tab:first-child:checked {
-    border-width: 0px 1px 0px 0px;
-    border-radius: 0px;
-}
-
-.nemo-window-pane notebook tab:last-child,
-.nemo-window-pane notebook tab:last-child:active,
-.nemo-window-pane notebook tab:last-child:checked {
-    border-width: 0px 0px 0px 1px;
-    border-radius: 0px;
-}
-
-.nemo-window-pane notebook tab label {
-    padding: 0px;
-    color: @theme_text_color;
-    text-shadow: 0px 1px @theme_shadow_color;
-}
-
-.nemo-window-pane notebook tab button image {
-    border-radius: 3px;
-    color: mix(@theme_fg_color, @sidebar_background, 0.30);
-    border-style: solid;
-    border-color: transparent;
-    border-width: 1px;
-    padding: 0;
-    -gtk-icon-shadow: 1px 1px @theme_shadow_color;
-}
-
-.nemo-window-pane notebook tab button image:hover {
-    color: @theme_fg_color; 
-    border-color: alpha(black, 0.1); 
-}
-
-.nemo-window-pane notebook tab button image:checked,
-.nemo-window-pane notebook tab button image:active:hover {
-    background-color: alpha(black, 0.15); 
-    color: shade(@theme_fg_color, 1.00);
-    -gtk-icon-shadow: 0px 1px @theme_shadow_color;
-    border-color: alpha(black, 0.27) 
-                  alpha(black, 0.13) 
-                  alpha(black, 0.13) 
-                  alpha(black, 0.13); 
 }
 
 .nemo-canvas-item {
@@ -566,10 +172,10 @@ NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:only
                                      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);
+    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 */
@@ -625,6 +231,29 @@ NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:only
     border-radius: 4px;
 }
 
+/* Cinnamon-Settings */
+
+toolbar.cs-header {
+    background-color: transparent;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_base, 1.00)),
+                                     to (shade(@button_base, 0.93)));
+    border-style: solid;
+    border-radius: 3px 3px 0px 0px;
+    border-top-color:    shade(@button_border, 1.05);
+    border-left-color:   shade(@button_border, 1.05);
+    border-right-color:  shade(@button_border, 1.05);
+    border-bottom-color: shade(@button_border, 0.95);
+    box-shadow: inset  0px  1px alpha(#fff, 0.09),
+                inset  1px  0px alpha(#fff, 0.07),
+                inset -1px  0px alpha(#fff, 0.07),
+                inset  0px -1px alpha(#fff, 0.05);
+    border-width: 1px;
+    margin: -2px  -2px  0px  -2px;
+}
+
+
 /* CompizConfigManager */
 
 .ccsm-window notebook.frame scrolledwindow viewport widget.notebook {