GTK3 submarine themes: re-work caja styling

2 files changed, 389 insertions, 485 deletions

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 7c23bc9b..8ec3c516 100644
--- a/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
@@ -2,27 +2,22 @@
  * CAJA File manager *
  *********************/
 
-/**** View ***/
+/**** Desktop View ***/
 
-/* Look out !
-FIXME This is the background color of caja view */
-/*background of icon view */
-CajaView .entry {
-    background-color: shade(@base_color, 1.0);
+/* do not flash the desktop with a color during theme switching */
+CajaDesktopWindow FMDesktopIconView .view {
+    background-color: transparent;
+    background-image: none;
 }
 
-/*background of list view */
-CajaWindow .view {
+/**** Window ***/
+
+/* background of all views */
+CajaNavigationWindow .view {
     background-color: shade (@base_color, 1.0);
     color: @theme_fg_color;
 }
 
-.caja-inactive-pane .view {
-    background-color: shade(@less_dark_color, 1.3);
-}
-
-/**** Window ***/
-
 /* caja sidebar */
 CajaWindow FMTreeView .view,
 CajaWindow CajaNotesViewer .view,
@@ -39,21 +34,6 @@ CajaWindow GtkPaned.horizontal {
     border-color: transparent;
 }
 
-/* disabled, looks uggly
-CajaWindow > GtkTable > .pane-separator,
-CajaWindow .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;
-}*/
-
 CajaWindow FMTreeView .scrollbar,
 CajaWindow CajaNotesViewer .scrollbar,
 CajaWindow CajaPlacesSidebar .scrollbar,
@@ -114,7 +94,6 @@ CajaWindow CajaHistorySidebar .view row:selected:hover {
     border-width: 1px 0px 0px 0px;
     border-color: shade (@sidebar_selected_bg, 0.90) #bbb shade (@sidebar_selected_bg, 1.05);
     text-shadow: none;
-    padding: 4px;
 }
 
 /* mouse hover item in sidebar */
@@ -134,7 +113,6 @@ CajaWindow CajaHistorySidebar .view row:hover {
     color: shade (@theme_fg_color, 0.90);
     border-radius: 6px;
     text-shadow: none;
-    padding: 4px;
 }
 
 /* shadows and borders looks strange in list view */
@@ -149,7 +127,18 @@ CajaWindow GtkTreeView row:nth-child(even):selected:hover {
 }
 
 /* Caja places bar */
-CajaWindow .button.flat:first-child {
+CajaNavigationWindow CajaSidePane .button.flat {
+    border-style: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (@button_gradient1),
+                                     to   (@button_gradient4));
+    padding: 7px 5px;
+    color: shade(@theme_fg_color, 1.00);
+    text-shadow: 0px 1px @theme_shadow_color;
+}
+
+CajaNavigationWindow CajaSidePane .button.flat:first-child {
     border-radius: 6px 0 0 6px;
     border-right-width: 0;
 /* remove left shadow */
@@ -163,7 +152,7 @@ CajaWindow .button.flat:first-child {
                 inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
 }
 
-CajaWindow .button.flat:last-child {
+CajaNavigationWindow CajaSidePane .button.flat:last-child {
     border-radius: 0 6px 6px 0;
     border-left-width: 0;
     border-left-color: @theme_bg_color;
@@ -177,78 +166,100 @@ CajaWindow .button.flat:last-child {
                 inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
 }
 
-CajaWindow .button.flat {
-    border-style: none;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@button_gradient1),
-                                     to   (@button_gradient4));
-    padding: 0px 5px;
-}
-
-CajaWindow .button.flat:hover:first-child,
-CajaWindow .button.flat:checked:checked:first-child {
-    border-radius: 6px 0 0 6px;
-    border-right-width: 0;
-    border-style: none;
+CajaNavigationWindow CajaSidePane .button.flat:hover:first-child,
+CajaNavigationWindow CajaSidePane .button.flat:checked:checked:first-child,
+CajaNavigationWindow CajaSidePane .button.flat:hover:last-child,
+CajaNavigationWindow CajaSidePane .button.flat:checked:checked:last-child {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade (@theme_bg_color, 1.20)),
                                      color-stop (0.50, shade (@theme_bg_color, 1.00)),
                                      color-stop (0.50, shade (@theme_bg_color, 0.95)),
                                      to (shade (@theme_bg_color, 0.80)));
-    color: shade(@theme_fg_color, 1.00);
-    text-shadow: 0px 1px @theme_shadow_color;
-    padding: 0px 5px;
+}
+
+CajaNavigationWindow CajaSidePane .button.flat:hover:first-child,
+CajaNavigationWindow CajaSidePane .button.flat:checked:checked:first-child {
     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 rgba(255,255,255,0), 0 1px rgba(255,255,255,0),
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);
 }
 
-CajaWindow .button.flat:hover:last-child,
-CajaWindow .button.flat:checked:checked:last-child {
-    border-radius: 0 6px 6px 0;
-    border-left-width: 0;
-    border-style: none;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade (@theme_bg_color, 1.20)),
-                                     color-stop (0.50, shade (@theme_bg_color, 1.00)),
-                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
-                                     to (shade (@theme_bg_color, 0.80)));
-    color: shade(@theme_fg_color, 1.00);
-    text-shadow: 0px 1px @theme_shadow_color;
-    padding: 0px 5px;
+CajaNavigationWindow CajaSidePane .button.flat:hover:last-child,
+CajaNavigationWindow CajaSidePane .button.flat:checked:checked:last-child {
     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);
 }
 
-CajaWindow .button.flat:hover {
-    border-style: none;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@button_gradient1, 1.03)),
-                                     to   (shade(@button_gradient4, 1.01)));
-    color: shade(@theme_fg_color, 1.00);
-    text-shadow: 0px 1px @theme_shadow_color;
-    padding: 0px 5px;
+/* pathpar toggle button */
+CajaNavigationWindow .button.image-button {
+    padding: 5px 6px;
 }
 
-/* some overrides for button.flat */
-/* zoom button */
-CajaWindow .primary-toolbar .button.flat,
-CajaWindow .primary-toolbar .button.flat:first-child,
-CajaWindow .primary-toolbar .button.flat:last-child {
-    background-color: transparent;
-    background-image: none;
+/* pathbar buttons */
+CajaPathBar .button,
+CajaPathBar .button:hover,
+CajaPathBar .button:checked {
     border-image: none;
-    box-shadow: none;
+    padding: 5px 6px;
+    border-width: 1px;
+    border-left-width: 0;
+    border-right-width: 0;
+    border-radius: 5px;
+    border-color: transparent;
+}
+
+CajaSearchBar .entry,
+CajaLocationBar .entry {
+    padding: 7px 4px;
+}
+
+CajaSearchBar .entry,
+CajaSearchBar .entry:focus,
+CajaLocationBar .entry,
+CajaLocationBar .entry:focus {
+    -GtkEntry-inner-border: 1;
 }
 
-/* eventbars, ie. searchbar */
+CajaSearchBar .entry {
+    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);
+}
+
+/* search/clean icon */
+CajaSearchBar .entry.image,
+CajaLocationBar .entry.image {
+    padding: 0px 0px 0px 4px;
+}
+
+CajaSearchBar .entry,
+CajaLocationBar .entry {
+    border-style: none;
+    box-shadow: inset  0px  1px shade (@theme_bg_color, 0.80),
+                inset  1px  0px shade (@theme_bg_color, 0.80),
+                inset -1px  0px shade (@theme_bg_color, 0.80),
+                inset  0px -1px shade (@theme_bg_color, 0.80);
+}
+
+CajaSearchBar .entry:focus,
+CajaLocationBar .entry:focus {
+    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);
+}
+
+/* eventbars, ie. search results */
 CajaNotebook .frame GtkEventBox {
     background-color: shade (@theme_bg_color, 1.05);
     border-color: @notebook_border;
@@ -257,6 +268,7 @@ CajaNotebook .frame GtkEventBox {
     border-radius: 4px;
 }
 
+/* what's that ? *//*
 CajaSearchBar.info {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
@@ -272,8 +284,8 @@ CajaSearchBar.info {
                 inset -1px  0px alpha(#fff, 0.06),
                 inset  0px -1px alpha(#fff, 0.06);
     color: @toolbar_fg_color;
-}
-
+}*/
+/*
 .info,
 .question,
 CajaTrashBar.info,
@@ -293,31 +305,6 @@ CajaQueryEditor.info {
                 inset  0px -1px alpha(#fff, 0.06);
 }
 
-CajaSearchBar .entry {
-    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);
-}
-
-CajaSearchBar .entry:focus {
-    /* Like the normal inputl */
-}
-
-CajaSearchBar .entry,
-CajaSearchBar .entry:focus {
-    -GtkEntry-inner-border: 1;
-}
-
-CajaSearchBar .entry.image {
-    color: shade(@nautilus_cluebar_color, 0.60);
-}
-
 .info
 .caja-cluebar-label {
     font: bold;
@@ -355,14 +342,13 @@ CajaTrashBar .button:active:hover,
 .question .button:checked:hover,
 CajaTrashBar .button:checked,
 CajaTrashBar .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 */
+   *//* 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);
@@ -391,7 +377,6 @@ CajaTrashBar .button *:checked:hover {
 
 .question .button:insensitive,
 CajaTrashBar .button:insensitive {
-/* .button:active:hover */
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@nautilus_cluebar_color, 0.95)),
@@ -409,34 +394,7 @@ CajaTrashBar .button *:insensitive {
     color: mix(@nautilus_cluebar_color, @theme_fg_color, 0.50);
     text-shadow: none;
 }
-
-CajaWindow .sidebar .frame {
-    border-width: 0px;
-    border-style: none;
-}
-
-CajaSearchBar,
-CajaWindow .primary-toolbar.toolbar .button * {
-    padding: 2px 4px;
-}
-
-CajaSearchBar .entry,
-CajaLocationBar .entry {
-    padding: 4px 6px;
-    border-style: none;
-    box-shadow: inset  0px  1px shade (@theme_bg_color, 0.80),
-                inset  1px  0px shade (@theme_bg_color, 0.80),
-                inset -1px  0px shade (@theme_bg_color, 0.80),
-                inset  0px -1px shade (@theme_bg_color, 0.80);
-}
-
-CajaSearchBar .entry:focus {
-    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);
-}
-
+*/
 CajaQueryEditor.vertical .vertical .horizontal .button,
 CajaQueryEditor.vertical .vertical .horizontal .button:hover {
     padding: 4px 6px;
@@ -454,79 +412,79 @@ CajaQueryEditor.vertical .vertical .horizontal .button.flat:hover {
     padding: 0px 6px;
 }
 
-CajaWindow .primary-toolbar.toolbar .entry {
-    padding: 3px 8px;
-}
-
-CajaWindow .primary-toolbar.toolbar .button,
-CajaWindow .primary-toolbar.toolbar .button:active,
-CajaWindow .primary-toolbar.toolbar .button:checked,
-CajaWindow .primary-toolbar.toolbar .button:hover,
-CajaWindow .primary-toolbar.toolbar .button:active:hover,
-CajaWindow .primary-toolbar.toolbar .button:checked:hover {
-    padding: 0px 1px 0px 1px;
+/* primary-toolbar */
+CajaWindow .primary-toolbar.toolbar .button.image-button,
+CajaWindow .primary-toolbar.toolbar .button.image-button:hover,
+CajaWindow .primary-toolbar.toolbar .button.image-button:checked,
+CajaWindow .primary-toolbar.toolbar .button.image-button:active:hover,
+CajaWindow .primary-toolbar.toolbar .button.image-button:checked:hover {
+    padding: 3px 4px;
     border-image: none;
     border-width: 1px;
+    border-style: solid;
     border-radius: 5px;
     border-color: transparent;
 }
 
-CajaWindow .primary-toolbar .toolbar .button:active,
-CajaWindow .primary-toolbar.toolbar .button:active,
-CajaWindow .primary-toolbar .toolbar .button:active:hover,
-CajaWindow .primary-toolbar.toolbar .button:active:hover,
-CajaWindow .primary-toolbar .toolbar .button:checked,
-CajaWindow .primary-toolbar.toolbar .button:checked,
-CajaWindow .primary-toolbar .toolbar .button:checked:hover,
-CajaWindow .primary-toolbar.toolbar .button:checked:hover {
+CajaWindow .primary-toolbar.toolbar .button.image-button:hover,
+CajaWindow .primary-toolbar.toolbar .button.image-button:hover:active,
+CajaWindow .primary-toolbar.toolbar .button.image-button:checked,
+CajaWindow .primary-toolbar.toolbar .button.image-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)));
-    border-width: 1px;
-    border-style: solid; 
-    border-radius: 5px;
-    border-image: none;
-    border-top-color: transparent;
-    border-left-color: alpha (#fff, 0.01);
-    border-right-color: alpha (#fff, 0.01);
-    border-bottom-color: alpha (#fff, 0.05);
-    border-width: 1px;
-    border-radius: 3px;
-    border-style: solid;
     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);
 }
 
-CajaWindow .primary-toolbar .toolbar .button:hover,
-CajaWindow .primary-toolbar.toolbar .button:hover {
+/* some overrides for button.flat */
+/* zoom button */
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat {
+    background-color: transparent;
+    background-image: none;
+    border-image: none;
+    box-shadow: none;
+}
+
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat: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)));
-    border-width: 1px;
-    border-radius: 5px;
-    border-style: solid;
     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);
 }
 
-/* buttons toolbar caja */
-CajaWindow .toolbar .button GtkImage:active,
-CajaWindow .toolbar .button GtkImage:active:hover,
-CajaWindow .toolbar .button GtkImage:checked,
-CajaWindow .toolbar .button GtkImage:checked:hover,
-CajaWindow .toolbar .button GtkImage:hover,
-CajaWindow .toolbar .button GtkImage {
-    color: @theme_fg_color;
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat,
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:hover,
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:hover:active {
+    border-radius: 0px;
+    border-style: solid;
+    border-width: 1px 0px 1px 0px;
+    padding: 0px 4px;
 }
 
-CajaWindow .primary-toolbar.toolbar .button GtkImage {
-    color: @theme_fg_dark_color;
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:first-child,
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:first-child:hover,
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:first-child:hover:active {
+    border-radius: 5px 0px 0px 5px;
+    border-style: solid;
+    border-width: 1px 0px 1px 1px;
+    padding: 0px 5px;
+}
+
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:last-child,
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:last-child:hover,
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:last-child:hover:active {
+    border-radius: 0px  5px 5px 0px;
+    border-style: solid;
+    border-width: 1px 1px 1px 0px;
+    padding: 0px 5px;
 }
 
 /* ComboBox views */
@@ -536,81 +494,50 @@ CajaWindow .primary-toolbar.toolbar GtkComboBox .button:active,
 CajaWindow .primary-toolbar.toolbar GtkComboBox .button:checked,
 CajaWindow .primary-toolbar.toolbar GtkComboBox .button:active:hover,
 CajaWindow .primary-toolbar.toolbar GtkComboBox .button:checked:hover {
-    padding: 4px 0px 4px 3px;
+    padding: 7px 0px 7px 3px;
 }
 
 /* fix for menu transition */
 CajaWindow .primary-toolbar.toolbar GtkComboBox .menuitem {
     background: transparent;
-    transition: all 300ms ease-out;
 }
 
 CajaWindow .primary-toolbar.toolbar GtkComboBox .menuitem:hover {
-    background-color: shade (@theme_bg_dark_color, 1.2);
-}
-
-/* toogle pathbar button */
-CajaWindow GtkPaned .button:active:only-child,
-CajaWindow GtkPaned .button:checked:only-child {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
-                                     from (@button_gradient1),
-                                     color-stop (0.48, @button_gradient2),
-                                     color-stop (0.52, @button_gradient3),
-                                     to   (@button_gradient4));
-    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);
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
 }
 
-/* caja pathbar toogle button */
-CajaWindow GtkPaned .button:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade (@theme_bg_color, 1.20)),
-                                     color-stop (0.50, shade (@theme_bg_color, 1.00)),
-                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
-                                     to (shade (@theme_bg_color, 0.80)));
+/* navigation buttons */
+CajaWindow .primary-toolbar.toolbar GtkMenuToolButton .button.image-button,
+CajaWindow .primary-toolbar.toolbar GtkMenuToolButton .button.image-button:hover,
+CajaWindow .primary-toolbar.toolbar GtkMenuToolButton .button.image-button:hover:active {
+    border-radius: 5px 0px 0px 5px;
+    border-style: solid;
+    border-width: 1px 0px 1px 1px;
 }
 
-CajaPathBar .button {
-    border-image: none;
-    padding: 4px 3px;
-    border-width: 1px;
-    border-left-width: 0;
-    border-right-width: 0;
-    border-radius: 5px;
-    border-color: transparent;
+/* navigation dropdown-menu buttons */
+CajaWindow .primary-toolbar.toolbar .button.menu-button {
+    border-radius: 0px  5px 5px 0px;
+    border-style: solid;
+    border-width: 1px 1px 1px 0px;
 }
 
-CajaPathBar .button:selected,
-CajaPathBar .button:hover,
-CajaPathBar .button:active,
-CajaPathBar .button:checked,
-CajaPathBar .button:active:hover,
-CajaPathBar .button:checked:hover {
+CajaWindow .primary-toolbar.toolbar .button.menu-button .menuitem {
+    background: transparent;
+}
+
+CajaWindow .primary-toolbar.toolbar .button.menu-button .menuitem:hover {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
-                                     from (shade (@theme_bg_color, 1.20)),
-                                     color-stop (0.50, shade (@theme_bg_color, 1.00)),
-                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
-                                     to (shade (@theme_bg_color, 0.80)));
-    border-radius: 6px;
+                                     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);
-    padding: 4px 3px;
-    border-width: 1px;
-    border-left-width: 0;
-    border-right-width: 0;
-    border-radius: 5px;
-    border-color: transparent;
 }
 
 /* properties-dialog emblem page */
@@ -618,17 +545,44 @@ FMPropertiesWindow .vertical.dialog-vbox .notebook GtkViewport {
     background-color: @theme_notebook_color;
 }
 
+/* tab styling */
+CajaNavigationWindow CajaNotebook.notebook {
+    border-style: none;
+    -GtkNotebook-tab-overlap: 1;
+}
+
+CajaNavigationWindow CajaNotebook.notebook tab.top:active,
+CajaNavigationWindow CajaNotebook.notebook tab.top:active:hover,
+CajaNavigationWindow CajaNotebook.notebook tab.reorderable-page,
+CajaNavigationWindow CajaNotebook.notebook tab.reorderable-page:hover {
+    border-radius: 4px 4px 0px 0px;
+    border-width: 1px 1px 0px 1px;
+    border-color: @notebook_border;
+    border-style: solid;
+    padding: 3px 4px;
+    box-shadow: none;
+}
+
+CajaNavigationWindow CajaNotebook.notebook.header {
+    border-radius: 4px 4px 0px 0px;
+    border-style: none;
+}
+
+CajaNavigationWindow CajaNotebook.notebook tab .button.flat {
+    padding: 0px;
+    border-radius: 4px;
+}
+/*
 .caja-canvas-item {
     border-radius: 3px;
 }
 
-/* desktop mode */
+*//* desktop mode *//*
 .caja-desktop.caja-canvas-item {
     color: white;
     text-shadow: 1px 1px black;
 }
 
-.caja-desktop.caja-canvas-item:active,
 .caja-desktop.caja-canvas-item:checked {
     background-image: none;
     color: @theme_text_color;
@@ -638,13 +592,12 @@ FMPropertiesWindow .vertical.dialog-vbox .notebook GtkViewport {
     color: @theme_selected_fg_color;
 }
 
-.caja-desktop.caja-canvas-item:active,
 .caja-desktop.caja-canvas-item:checked,
 .caja-desktop.caja-canvas-item:prelight,
 .caja-desktop.caja-canvas-item:selected {
     text-shadow: none;
 }
-
+*/
 /****************
  * Mate-Panel *
  ****************/
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 194a32db..cb5f1582 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
@@ -2,27 +2,21 @@
  * CAJA File manager *
  *********************/
 
-/**** View ***/
+/**** Desktop View ***/
 
-/* Look out !
-FIXME This is the background color of caja view */
-/*background of icon view */
-CajaView .entry {
-    background-color: shade(@base_color, 1.0);
-}
+/* do not flash the desktop with a color during theme switching */
+CajaDesktopWindow FMDesktopIconView .view {
+    background-color: transparent;
+    background-image: none;
+
+/**** Window ***/
 
-/*background of list view */
-CajaWindow .view {
+/* background of all views */
+CajaNavigationWindow .view {
     background-color: shade (@base_color, 1.0);
     color: @theme_fg_color;
 }
 
-.caja-inactive-pane .view {
-    background-color: shade(@less_dark_color, 1.3);
-}
-
-/**** Window ***/
-
 /* caja sidebar */
 CajaWindow FMTreeView .view,
 CajaWindow CajaNotesViewer .view,
@@ -39,21 +33,6 @@ CajaWindow GtkPaned.horizontal {
     border-color: transparent;
 }
 
-/* disabled, looks uggly
-CajaWindow > GtkTable > .pane-separator,
-CajaWindow .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;
-}*/
-
 CajaWindow FMTreeView .scrollbar,
 CajaWindow CajaNotesViewer .scrollbar,
 CajaWindow CajaPlacesSidebar .scrollbar,
@@ -114,7 +93,6 @@ CajaWindow CajaHistorySidebar .view row:selected:hover {
     border-width: 1px 0px 0px 0px;
     border-color: shade (@sidebar_selected_bg, 0.90) #bbb shade (@sidebar_selected_bg, 1.05);
     text-shadow: none;
-    padding: 4px;
 }
 
 /* mouse hover item in sidebar */
@@ -134,7 +112,6 @@ CajaWindow CajaHistorySidebar .view row:hover {
     color: shade (@theme_fg_color, 0.90);
     border-radius: 6px;
     text-shadow: none;
-    padding: 4px;
 }
 
 /* shadows and borders looks strange in list view */
@@ -149,7 +126,18 @@ CajaWindow GtkTreeView row:nth-child(even):selected:hover {
 }
 
 /* Caja places bar */
-CajaWindow .button.flat:first-child {
+CajaNavigationWindow CajaSidePane .button.flat {
+    border-style: none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (@button_gradient1),
+                                     to   (@button_gradient4));
+    padding: 7px 5px;
+    color: shade(@theme_fg_color, 1.00);
+    text-shadow: 0px 1px @theme_shadow_color;
+}
+
+CajaNavigationWindow CajaSidePane .button.flat:first-child {
     border-radius: 6px 0 0 6px;
     border-right-width: 0;
 /* remove left shadow */
@@ -163,7 +151,7 @@ CajaWindow .button.flat:first-child {
                 inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
 }
 
-CajaWindow .button.flat:last-child {
+CajaNavigationWindow CajaSidePane .button.flat:last-child {
     border-radius: 0 6px 6px 0;
     border-left-width: 0;
     border-left-color: @theme_bg_color;
@@ -177,75 +165,97 @@ CajaWindow .button.flat:last-child {
                 inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
 }
 
-CajaWindow .button.flat {
-    border-style: none;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (@button_gradient1),
-                                     to   (@button_gradient4));
-    padding: 0px 5px;
-}
-
-CajaWindow .button.flat:hover:first-child,
-CajaWindow .button.flat:checked:checked:first-child {
-    border-radius: 6px 0 0 6px;
-    border-right-width: 0;
-    border-style: none;
+CajaNavigationWindow CajaSidePane .button.flat:hover:first-child,
+CajaNavigationWindow CajaSidePane .button.flat:checked:checked:first-child,
+CajaNavigationWindow CajaSidePane .button.flat:hover:last-child,
+CajaNavigationWindow CajaSidePane .button.flat:checked:checked:last-child {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade (@theme_bg_color, 1.20)),
                                      color-stop (0.50, shade (@theme_bg_color, 1.00)),
                                      color-stop (0.50, shade (@theme_bg_color, 0.95)),
                                      to (shade (@theme_bg_color, 0.80)));
-    color: shade(@theme_fg_color, 1.00);
-    text-shadow: 0px 1px @theme_shadow_color;
-    padding: 0px 5px;
+}
+
+CajaNavigationWindow CajaSidePane .button.flat:hover:first-child,
+CajaNavigationWindow CajaSidePane .button.flat:checked:checked:first-child {
     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
                 inset  1px  0px shade(@selected_bg_color, 0.97),
                 inset -1px  0px rgba(255,255,255,0), 0 1px rgba(255,255,255,0),
                 inset  0px -1px shade(@selected_bg_color, 0.93);
 }
 
-CajaWindow .button.flat:hover:last-child,
-CajaWindow .button.flat:checked:checked:last-child {
-    border-radius: 0 6px 6px 0;
-    border-left-width: 0;
-    border-style: none;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade (@theme_bg_color, 1.20)),
-                                     color-stop (0.50, shade (@theme_bg_color, 1.00)),
-                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
-                                     to (shade (@theme_bg_color, 0.80)));
-    color: shade(@theme_fg_color, 1.00);
-    text-shadow: 0px 1px @theme_shadow_color;
-    padding: 0px 5px;
+CajaNavigationWindow CajaSidePane .button.flat:hover:last-child,
+CajaNavigationWindow CajaSidePane .button.flat:checked:checked:last-child {
     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);
 }
 
-CajaWindow .button.flat:hover {
-    border-style: none;
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@button_gradient1, 1.03)),
-                                     to   (shade(@button_gradient4, 1.01)));
-    color: shade(@theme_fg_color, 1.00);
-    text-shadow: 0px 1px @theme_shadow_color;
-    padding: 0px 5px;
+/* pathpar toggle button */
+CajaNavigationWindow .button.image-button {
+    padding: 5px 6px;
 }
 
-/* some overrides for button.flat */
-/* zoom button */
-CajaWindow .primary-toolbar .button.flat,
-CajaWindow .primary-toolbar .button.flat:first-child,
-CajaWindow .primary-toolbar .button.flat:last-child {
-    background-color: transparent;
-    background-image: none;
+/* pathbar buttons */
+CajaPathBar .button,
+CajaPathBar .button:hover,
+CajaPathBar .button:checked {
     border-image: none;
-    box-shadow: none;
+    padding: 5px 6px;
+    border-width: 1px;
+    border-left-width: 0;
+    border-right-width: 0;
+    border-radius: 5px;
+    border-color: transparent;
+}
+
+CajaSearchBar .entry,
+CajaLocationBar .entry {
+    padding: 7px 4px;
+}
+
+CajaSearchBar .entry,
+CajaSearchBar .entry:focus,
+CajaLocationBar .entry,
+CajaLocationBar .entry:focus {
+    -GtkEntry-inner-border: 1;
+}
+
+CajaSearchBar .entry {
+    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);
+}
+
+/* search/clean icon */
+CajaSearchBar .entry.image,
+CajaLocationBar .entry.image {
+    padding: 0px 0px 0px 4px;
+}
+
+CajaSearchBar .entry,
+CajaLocationBar .entry {
+    border-style: none;
+    box-shadow: inset  0px  1px shade (@theme_bg_color, 0.80),
+                inset  1px  0px shade (@theme_bg_color, 0.80),
+                inset -1px  0px shade (@theme_bg_color, 0.80),
+                inset  0px -1px shade (@theme_bg_color, 0.80);
+}
+
+CajaSearchBar .entry:focus,
+CajaLocationBar .entry:focus {
+    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);
 }
 
 /* eventbars, ie. searchbar */
@@ -257,6 +267,7 @@ CajaNotebook .frame GtkEventBox {
     border-radius: 4px;
 }
 
+/* what's that ? *//*
 CajaSearchBar.info {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
@@ -272,8 +283,8 @@ CajaSearchBar.info {
                 inset -1px  0px alpha(#fff, 0.06),
                 inset  0px -1px alpha(#fff, 0.06);
     color: @toolbar_fg_color;
-}
-
+}*/
+/*
 .info,
 .question,
 CajaTrashBar.info,
@@ -293,31 +304,6 @@ CajaQueryEditor.info {
                 inset  0px -1px alpha(#fff, 0.06);
 }
 
-CajaSearchBar .entry {
-    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);
-}
-
-CajaSearchBar .entry:focus {
-    /* Like the normal inputl */
-}
-
-CajaSearchBar .entry,
-CajaSearchBar .entry:focus {
-    -GtkEntry-inner-border: 1;
-}
-
-CajaSearchBar .entry.image {
-    color: shade(@nautilus_cluebar_color, 0.60);
-}
-
 .info
 .caja-cluebar-label {
     font: bold;
@@ -355,14 +341,13 @@ CajaTrashBar .button:active:hover,
 .question .button:checked:hover,
 CajaTrashBar .button:checked,
 CajaTrashBar .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 */
+   *//* 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);
@@ -391,7 +376,6 @@ CajaTrashBar .button *:checked:hover {
 
 .question .button:insensitive,
 CajaTrashBar .button:insensitive {
-/* .button:active:hover */
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@nautilus_cluebar_color, 0.95)),
@@ -409,35 +393,7 @@ CajaTrashBar .button *:insensitive {
     color: mix(@nautilus_cluebar_color, @theme_fg_color, 0.50);
     text-shadow: none;
 }
-
-CajaWindow .sidebar .frame {
-    border-width: 0px;
-    border-style: none;
-}
-
-CajaSearchBar,
-CajaSearchBar *,
-CajaWindow .primary-toolbar.toolbar .button * {
-    padding: 2px 4px;
-}
-
-CajaSearchBar .entry,
-CajaLocationBar .entry {
-    padding: 4px 6px;
-    border-style: none;
-    box-shadow: inset  0px  1px shade (@theme_bg_color, 0.80),
-                inset  1px  0px shade (@theme_bg_color, 0.80),
-                inset -1px  0px shade (@theme_bg_color, 0.80),
-                inset  0px -1px shade (@theme_bg_color, 0.80);
-}
-
-CajaSearchBar .entry:focus {
-    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);
-}
-
+*/
 CajaQueryEditor.vertical .vertical .horizontal .button,
 CajaQueryEditor.vertical .vertical .horizontal .button:hover {
     padding: 4px 6px;
@@ -455,79 +411,79 @@ CajaQueryEditor.vertical .vertical .horizontal .button.flat:hover {
     padding: 0px 6px;
 }
 
-CajaWindow .primary-toolbar.toolbar .entry {
-    padding: 3px 8px;
-}
-
-CajaWindow .primary-toolbar.toolbar .button,
-CajaWindow .primary-toolbar.toolbar .button:active,
-CajaWindow .primary-toolbar.toolbar .button:checked,
-CajaWindow .primary-toolbar.toolbar .button:hover,
-CajaWindow .primary-toolbar.toolbar .button:active:hover,
-CajaWindow .primary-toolbar.toolbar .button:checked:hover {
-    padding: 0px 1px 0px 1px;
+/* primary-toolbar */
+CajaWindow .primary-toolbar.toolbar .button.image-button,
+CajaWindow .primary-toolbar.toolbar .button.image-button:hover,
+CajaWindow .primary-toolbar.toolbar .button.image-button:checked,
+CajaWindow .primary-toolbar.toolbar .button.image-button:active:hover,
+CajaWindow .primary-toolbar.toolbar .button.image-button:checked:hover {
+    padding: 3px 4px;
     border-image: none;
     border-width: 1px;
+    border-style: solid;
     border-radius: 5px;
     border-color: transparent;
 }
 
-CajaWindow .primary-toolbar .toolbar .button:active,
-CajaWindow .primary-toolbar.toolbar .button:active,
-CajaWindow .primary-toolbar .toolbar .button:active:hover,
-CajaWindow .primary-toolbar.toolbar .button:active:hover,
-CajaWindow .primary-toolbar .toolbar .button:checked,
-CajaWindow .primary-toolbar.toolbar .button:checked,
-CajaWindow .primary-toolbar .toolbar .button:checked:hover,
-CajaWindow .primary-toolbar.toolbar .button:checked:hover {
+CajaWindow .primary-toolbar.toolbar .button.image-button:hover,
+CajaWindow .primary-toolbar.toolbar .button.image-button:hover:active,
+CajaWindow .primary-toolbar.toolbar .button.image-button:checked,
+CajaWindow .primary-toolbar.toolbar .button.image-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)));
-    border-width: 1px;
-    border-style: solid; 
-    border-radius: 5px;
-    border-image: none;
-    border-top-color: transparent;
-    border-left-color: alpha (#fff, 0.01);
-    border-right-color: alpha (#fff, 0.01);
-    border-bottom-color: alpha (#fff, 0.05);
-    border-width: 1px;
-    border-radius: 3px;
-    border-style: solid;
     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);
 }
 
-CajaWindow .primary-toolbar .toolbar .button:hover,
-CajaWindow .primary-toolbar.toolbar .button:hover {
+/* some overrides for button.flat */
+/* zoom button */
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat {
+    background-color: transparent;
+    background-image: none;
+    border-image: none;
+    box-shadow: none;
+}
+
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat: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)));
-    border-width: 1px;
-    border-radius: 5px;
-    border-style: solid;
     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);
 }
 
-/* buttons toolbar caja */
-CajaWindow .toolbar .button GtkImage:active,
-CajaWindow .toolbar .button GtkImage:active:hover,
-CajaWindow .toolbar .button GtkImage:checked,
-CajaWindow .toolbar .button GtkImage:checked:hover,
-CajaWindow .toolbar .button GtkImage:hover,
-CajaWindow .toolbar .button GtkImage {
-    color: @theme_fg_color;
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat,
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:hover,
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:hover:active {
+    border-radius: 0px;
+    border-style: solid;
+    border-width: 1px 0px 1px 0px;
+    padding: 0px 4px;
 }
 
-CajaWindow .primary-toolbar.toolbar .button GtkImage {
-    color: @theme_fg_dark_color;
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:first-child,
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:first-child:hover,
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:first-child:hover:active {
+    border-radius: 5px 0px 0px 5px;
+    border-style: solid;
+    border-width: 1px 0px 1px 1px;
+    padding: 0px 5px;
+}
+
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:last-child,
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:last-child:hover,
+CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:last-child:hover:active {
+    border-radius: 0px  5px 5px 0px;
+    border-style: solid;
+    border-width: 1px 1px 1px 0px;
+    padding: 0px 5px;
 }
 
 /* ComboBox views */
@@ -537,81 +493,50 @@ CajaWindow .primary-toolbar.toolbar GtkComboBox .button:active,
 CajaWindow .primary-toolbar.toolbar GtkComboBox .button:checked,
 CajaWindow .primary-toolbar.toolbar GtkComboBox .button:active:hover,
 CajaWindow .primary-toolbar.toolbar GtkComboBox .button:checked:hover {
-    padding: 4px 0px 4px 3px;
+    padding: 7px 0px 7px 3px;
 }
 
 /* fix for menu transition */ 
 CajaWindow .primary-toolbar.toolbar GtkComboBox .menuitem {
     background: transparent;
-    transition: all 300ms ease-out;
 }
 
 CajaWindow .primary-toolbar.toolbar GtkComboBox .menuitem:hover {
-    background-color: shade (@theme_bg_dark_color, 1.2);
-}
-
-/* toogle pathbar button */
-CajaWindow GtkPaned .button:active:only-child,
-CajaWindow GtkPaned .button:checked:only-child {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
-                                     from (@button_gradient1),
-                                     color-stop (0.48, @button_gradient2),
-                                     color-stop (0.52, @button_gradient3),
-                                     to   (@button_gradient4));
-    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);
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
 }
 
-/* caja pathbar toogle button */
-CajaWindow GtkPaned .button:hover {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade (@theme_bg_color, 1.20)),
-                                     color-stop (0.50, shade (@theme_bg_color, 1.00)),
-                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
-                                     to (shade (@theme_bg_color, 0.80)));
+/* navigation buttons */
+CajaWindow .primary-toolbar.toolbar GtkMenuToolButton .button.image-button,
+CajaWindow .primary-toolbar.toolbar GtkMenuToolButton .button.image-button:hover,
+CajaWindow .primary-toolbar.toolbar GtkMenuToolButton .button.image-button:hover:active {
+    border-radius: 5px 0px 0px 5px;
+    border-style: solid;
+    border-width: 1px 0px 1px 1px;
 }
 
-CajaPathBar .button {
-    border-image: none;
-    padding: 4px 3px;
-    border-width: 1px;
-    border-left-width: 0;
-    border-right-width: 0;
-    border-radius: 5px;
-    border-color: transparent;
+/* navigation dropdown-menu buttons */
+CajaWindow .primary-toolbar.toolbar .button.menu-button {
+    border-radius: 0px  5px 5px 0px;
+    border-style: solid;
+    border-width: 1px 1px 1px 0px;
 }
 
-CajaPathBar .button:selected,
-CajaPathBar .button:hover,
-CajaPathBar .button:active,
-CajaPathBar .button:checked,
-CajaPathBar .button:active:hover,
-CajaPathBar .button:checked:hover {
+CajaWindow .primary-toolbar.toolbar .button.menu-button .menuitem {
+    background: transparent;
+}
+
+CajaWindow .primary-toolbar.toolbar .button.menu-button .menuitem:hover {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
-                                     from (shade (@theme_bg_color, 1.20)),
-                                     color-stop (0.50, shade (@theme_bg_color, 1.00)),
-                                     color-stop (0.50, shade (@theme_bg_color, 0.95)),
-                                     to (shade (@theme_bg_color, 0.80)));
-    border-radius: 6px;
+                                     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);
-    padding: 4px 3px;
-    border-width: 1px;
-    border-left-width: 0;
-    border-right-width: 0;
-    border-radius: 5px;
-    border-color: transparent;
 }
 
 /* properties-dialog emblem page */
@@ -619,17 +544,44 @@ FMPropertiesWindow .vertical.dialog-vbox .notebook GtkViewport {
     background-color: @theme_notebook_color;
 }
 
+/* tab styling */
+CajaNavigationWindow CajaNotebook.notebook {
+    border-style: none;
+    -GtkNotebook-tab-overlap: 1;
+}
+
+CajaNavigationWindow CajaNotebook.notebook tab.top:active,
+CajaNavigationWindow CajaNotebook.notebook tab.top:active:hover,
+CajaNavigationWindow CajaNotebook.notebook tab.reorderable-page,
+CajaNavigationWindow CajaNotebook.notebook tab.reorderable-page:hover {
+    border-radius: 4px 4px 0px 0px;
+    border-width: 1px 1px 0px 1px;
+    border-color: @notebook_border;
+    border-style: solid;
+    padding: 3px 4px;
+    box-shadow: none;
+}
+
+CajaNavigationWindow CajaNotebook.notebook.header {
+    border-radius: 4px 4px 0px 0px;
+    border-style: none;
+}
+
+CajaNavigationWindow CajaNotebook.notebook tab .button.flat {
+    padding: 0px;
+    border-radius: 4px;
+}
+/*
 .caja-canvas-item {
     border-radius: 3px;
 }
 
-/* desktop mode */
+*//* desktop mode *//*
 .caja-desktop.caja-canvas-item {
     color: white;
     text-shadow: 1px 1px black;
 }
 
-.caja-desktop.caja-canvas-item:active,
 .caja-desktop.caja-canvas-item:checked {
     background-image: none;
     color: @theme_text_color;
@@ -639,13 +591,12 @@ FMPropertiesWindow .vertical.dialog-vbox .notebook GtkViewport {
     color: @theme_selected_fg_color;
 }
 
-.caja-desktop.caja-canvas-item:active,
 .caja-desktop.caja-canvas-item:checked,
 .caja-desktop.caja-canvas-item:prelight,
 .caja-desktop.caja-canvas-item:selected {
     text-shadow: none;
 }
-
+*/
 /****************
  * Mate-Panel *
  ****************/