GTK+-3.20 Green-Submarine mate-applications.css: sync with Blue-Submarine

1 files changed, 309 insertions, 889 deletions

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 c1f44929..2b181f36 100644
--- a/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
@@ -4,108 +4,30 @@
 
 /**** Window ***/
 
-/* background of all views */
-/*Caja icon views-these are widgets w/o css nodes or valid names, .view is applied only to */
-window.background>*>paned>box>paned>box>notebook>stack>box>box>scrolledwindow.frame {
-    background-color: shade (@base_color, 1.0);
-    color: @theme_fg_color;
-}
-
-/* Caja list view */
-window.background>*>paned>box>paned>box>notebook>stack>box>box>scrolledwindow>*>treeview.view{
-    background-color: shade (@base_color, 1.0);
+/* icon and list view */
+.caja-notebook .view,
+.caja-notebook scrolledwindow.frame,
+.caja-side-pane scrolledwindow.frame,
+.caja-side-pane CajaInformationPanel .vertical {
+    border-style: none;
 }
 
 /* caja sidebar */
-window.background*>paned>box>notebook>stack>scrolledwindow.frame treeview.view,
-CajaWindow CajaNotesViewer .view,
-CajaWindow CajaPlacesSidebar .view,
-CajaWindow CajaHistorySidebar .view,
-CajaWindow CajaEmblemSidebar .frame,
-CajaWindow CajaInformationPanel .vertical {
+.caja-side-pane treeview.view,
+.caja-side-pane textview.view text,
+.caja-side-pane viewport.frame,
+.caja-side-pane CajaInformationPanel .vertical {
     background-color: shade (@theme_bg_color, 1.08);
 }
 
-/* the small line between sidebar and view */
-CajaWindow paned.horizontal {
-    -paned-handle-size: 3px;
-    border-color: transparent;
-}
-
-CajaWindow FMTreeView.frame,
-CajaWindow CajaPlacesSidebar.frame,
-CajaWindow CajaHistorySidebar.frame,
-CajaWindow CajaNotesViewer.frame {
-    border-width: 1px 1px 0px 0px;
-}
-
-CajaWindow CajaEmblemSidebar.vertical .frame,
-CajaWindow CajaInformationPanel .vertical {
-    border-width: 1px 1px 0px 0px;
-    border-style: solid;
-    border-color: @notebook_border;
-}
-
-CajaWindow CajaEmblemSidebar.vertical .frame {
-    border-width: 1px 0px 0px 0px;
-}
-
-CajaWindow CajaInformationPanel CajaSidebarTitle.vertical{
-    border-width: 0px 1px 0px 0px;
-}
-
-CajaWindow CajaInformationPanel CajaKeepLastVerticalBox.vertical {
+.caja-side-pane scrolledwindow scrollbar.vertical.left trough,
+.caja-side-pane scrolledwindow scrollbar.horizontal.bottom trough {
     border-style: none;
 }
 
-CajaWindow FMTreeView .scrollbar,
-CajaWindow CajaNotesViewer .scrollbar,
-CajaWindow CajaPlacesSidebar .scrollbar,
-CajaWindow CajaHistorySidebar .scrollbar,
-CajaWindow CajaEmblemSidebar .scrollbar {
-    background-image: none;
-    border-style: solid;
-    -GtkRange-stepper-size: 16;
-    -GtkRange-stepper-spacing: 0;
-    -GtkRange-trough-border: 0;
-    -GtkRange-arrow-scaling: 0.666;
-    -GtkRange-slider-width: 13;
-    -GtkRange-trough-under-steppers: 1;
-    -GtkScrollbar-has-backward-stepper: true;
-    -GtkScrollbar-has-forward-stepper: true;
-    -GtkScrollbar-activate-slider: 1;
-    -GtkScrollbar-min-slider-length: 31;
-    -GtkScrolledWindow-scrollbar-spacing: 0;
-    -GtkScrolledWindow-scrollbars-within-bevel: 1;
-}
-
-CajaWindow FMTreeView scrollbar trough,
-CajaWindow CajaNotesViewer  scrollbar trough,
-CajaWindow CajaPlacesSidebar  scrollbar trough,
-CajaWindow CajaHistorySidebar  scrollbar trough,
-CajaWindow CajaEmblemSidebar  scrollbar trough,
-CajaWindow FMTreeView  scrollbar trough.vertical,
-CajaWindow CajaNotesViewer  scrollbar trough.vertical,
-CajaWindow CajaPlacesSidebar  scrollbar trough.vertical,
-CajaWindow CajaHistorySidebar  scrollbar trough.vertical,
-CajaWindow CajaEmblemSidebar  scrollbar trough.vertical {
-    background-image: -gtk-gradient (linear, left top, left bottom,
-                                    from (shade (@theme_bg_color, 0.98)),
-                                    to (shade (@theme_bg_color, 1.06)));
-    border-radius: 0;
-    border-width: 0 0 0 0;
-    border-style: solid;
-    border-right-color: shade (@theme_bg_color, 0.96);
-    border-left-color: shade (@theme_bg_color, 0.96);
-}
-
 /* selected item in sidebar */
-CajaWindow FMTreeView .view row:selected,
-CajaWindow CajaPlacesSidebar .view row:selected,
-CajaWindow CajaHistorySidebar .view row:selected,
-CajaWindow FMTreeView .view row:selected:hover,
-CajaWindow CajaPlacesSidebar .view row:selected:hover,
-CajaWindow CajaHistorySidebar .view row:selected:hover {
+.caja-side-pane treeview:selected,
+.caja-side-pane treeview:selected:hover {
     background-image: -gtk-gradient (linear,
                                      left top,
                                      left bottom,
@@ -121,53 +43,44 @@ CajaWindow CajaHistorySidebar .view row:selected:hover {
 }
 
 /* mouse hover item in sidebar */
-CajaWindow FMTreeView .view row:hover,
-CajaWindow CajaPlacesSidebar .view row:hover,
-CajaWindow CajaHistorySidebar .view row:hover {
+.caja-side-pane treeview:hover {
     background-image: -gtk-gradient (linear,
                                      left top,
                                      left bottom,
                                      from (shade(@theme_bg_color, 1.05)),
                                      color-stop (0.40, shade (@theme_bg_color, 1.13)),
                                      to (shade(@theme_bg_color, 1.10)));
-    box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.0),
-                inset  1px  0px shade (@theme_selected_bg_color, 1.0),
-                inset -1px  0px shade (@theme_selected_bg_color, 1.0),
-                inset  0px -1px shade (@theme_selected_bg_color, 1.0);
+    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);
     color: shade (@theme_fg_color, 0.90);
     border-radius: 6px;
     text-shadow: none;
 }
 
-/* shadows and borders looks strange in list view */
-CajaWindow GtkTreeView row:nth-child(odd):hover,
-CajaWindow GtkTreeView row:nth-child(even):hover,
-CajaWindow GtkTreeView row:nth-child(odd):selected,
-CajaWindow GtkTreeView row:nth-child(even):selected,
-CajaWindow GtkTreeView row:nth-child(odd):selected:hover,
-CajaWindow GtkTreeView row:nth-child(even):selected:hover {
-    box-shadow:none;
-    border-radius: 0px;
-}
-
 /* moved eject button to left better for overlay scrollbars */
-CajaWindow CajaPlacesSidebar .view row {
+.caja-side-pane treeview {
     padding: 0px 4px 0px 0px;
 }
 
 /* Caja places bar */
-CajaNavigationWindow CajaSidePane .button.flat {
+.caja-side-pane button.flat,
+.caja-side-pane button.flat.toggle {
     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 {
+.caja-side-pane button.flat {
+    padding: 7px 5px
+}
+
+.caja-side-pane button.flat.toggle:first-child {
     border-radius: 6px 0 0 6px;
     border-right-width: 0;
 /* remove left shadow */
@@ -181,7 +94,7 @@ CajaNavigationWindow CajaSidePane .button.flat:first-child {
                 inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
 }
 
-CajaNavigationWindow CajaSidePane .button.flat:last-child {
+.caja-side-pane button.flat:last-child {
     border-radius: 0 6px 6px 0;
     border-left-width: 0;
     border-left-color: @theme_bg_color;
@@ -195,28 +108,34 @@ CajaNavigationWindow CajaSidePane .button.flat:last-child {
                 inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
 }
 
-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 {
+.caja-side-pane button.flat:checked:last-child,
+.caja-side-pane button.flat.toggle:checked:first-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)),
+                                     color-stop (0.50, shade (@theme_bg_color, 0.99)),
                                      to (shade (@theme_bg_color, 0.80)));
 }
 
-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),
+.caja-side-pane button.flat:hover:last-child,
+.caja-side-pane button.flat.toggle:hover:first-child {
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@button_gradient1, 1.03)),
+                                     to   (shade(@button_gradient4, 1.01)));
+}
+
+.caja-side-pane button.flat.toggle:hover:first-child,
+.caja-side-pane button.flat.toggle: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(@selected_bg_color, 0.93);
+                inset  0px -1px shade (@theme_selected_bg_color, 1.3);
 }
 
-CajaNavigationWindow CajaSidePane .button.flat:hover:last-child,
-CajaNavigationWindow CajaSidePane .button.flat:checked:checked:last-child {
+.caja-side-pane button.flat:hover:last-child,
+.caja-side-pane 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),
@@ -224,14 +143,14 @@ CajaNavigationWindow CajaSidePane .button.flat:checked:checked:last-child {
 }
 
 /* pathpar toggle button */
-CajaNavigationWindow .button.image-button {
+.caja-navigation-window button.toggle.image-button {
     padding: 5px 6px;
 }
 
 /* pathbar buttons */
-CajaPathBar .button,
-CajaPathBar .button:hover,
-CajaPathBar .button:checked {
+.caja-pathbar button,
+.caja-pathbar button:hover,
+.caja-pathbar button:checked {
     border-image: none;
     padding: 5px 6px;
     border-width: 1px;
@@ -241,38 +160,8 @@ CajaPathBar .button:checked {
     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 {
+.caja-search-bar entry,
+.caja-location-entry {
     border-style: none;
     box-shadow: inset  0px  1px shade (@theme_bg_color, 0.80),
                 inset  1px  0px shade (@theme_bg_color, 0.80),
@@ -280,16 +169,22 @@ CajaLocationBar .entry {
                 inset  0px -1px shade (@theme_bg_color, 0.80);
 }
 
-CajaSearchBar .entry:focus,
-CajaLocationBar .entry:focus {
+.caja-search-bar entry:focus,
+.caja-location-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 */
-CajaNotebook .frame GtkEventBox {
+/* eventbars, ie. search results */
+.caja-notebook box.vertical frame {
+    background-color: shade (@theme_bg_color, 1.02);
+    border-style: none;
+    border-radius: 0px;
+}
+
+.caja-notebook #caja-extra-view-widget {
     background-color: shade (@theme_bg_color, 1.05);
     border-color: @notebook_border;
     border-width: 1px;
@@ -297,219 +192,28 @@ CajaNotebook .frame GtkEventBox {
     border-radius: 4px;
 }
 
-/* what's that ? *//*
-CajaSearchBar.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;
-}*/
-/*
-.info,
-.question,
-CajaTrashBar.info,
-CajaXContentBar.info,
-CajaQueryEditor.info {
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@nautilus_cluebar_color, 1.00)),
-                                     to   (shade(@nautilus_cluebar_color, 1.00)));
-    border-radius: 0px;
-    border-width: 0px 0px 1px 0px;
-    border-style: solid;
-    border-color: transparent @nautilus_cluebar_color shade(@nautilus_cluebar_color, 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);
-}
-
-.info
-.caja-cluebar-label {
-    font: bold;
-    color: shade(@theme_fg_color, 1.00);
-    text-shadow: 0 1px @theme_shadow_color;
-}
-
-.question .button,
-.question .button:hover,
-CajaTrashBar .button,
-CajaTrashBar .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;
-}
-
-.question .button:active,
-.question .button:active:hover,
-CajaTrashBar .button:active,
-CajaTrashBar .button:active:hover,
-.question .button:checked,
-.question .button:checked:hover,
-CajaTrashBar .button:checked,
-CajaTrashBar .button:checked: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);
-}
-
-.question .button *:active,
-.question .button *:active:hover,
-CajaTrashBar .button *:active,
-CajaTrashBar .button *:active:hover,
-.question .button *:checked,
-.question .button *:checked:hover,
-CajaTrashBar .button *:checked,
-CajaTrashBar .button *:checked:hover {
-    color: shade(@theme_text_color, 1.00);
-    text-shadow: 0px 1px @theme_shadow_color;
-}
-
-.question .button:disabled,
-CajaTrashBar .button:disabled {
-    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);
-}
-
-.question .button *:disabled,
-CajaTrashBar .button *:disabled {
-    color: mix(@nautilus_cluebar_color, @theme_fg_color, 0.50);
-    text-shadow: none;
-}
-*/
-CajaQueryEditor.vertical .vertical .horizontal .button,
-CajaQueryEditor.vertical .vertical .horizontal .button:hover {
-    padding: 4px 6px;
-}
-
-
-CajaQueryEditor.vertical .vertical .horizontal .text-button,
-CajaQueryEditor.vertical .vertical .horizontal .text-button:hover {
-    padding: 6px;
-}
-
-CajaQueryEditor.vertical .vertical .horizontal .button.flat,
-CajaQueryEditor.vertical .vertical .horizontal .button.flat:hover {
-    border-radius: 5px;
-    padding: 0px 6px;
+.caja-notebook #caja-extra-view-widget button.flat {
+    padding: 4px;
+    border-radius: 6px;
 }
 
 /* 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.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)));
-    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);
-}
-
-/* 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)));
-    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 CajaZoomControl .button.flat,
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:hover,
-CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:hover:active {
+/* zoom buttons */
+.caja-navigation-window toolbar.primary-toolbar #Zoom button.flat {
     border-radius: 0px;
     border-style: solid;
     border-width: 1px 0px 1px 0px;
     padding: 0px 4px;
 }
 
-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 {
+.caja-navigation-window toolbar.primary-toolbar #Zoom button.flat:first-child {
     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 {
+.caja-navigation-window toolbar.primary-toolbar #Zoom button.flat:last-child {
     border-radius: 0px  5px 5px 0px;
     border-style: solid;
     border-width: 1px 1px 1px 0px;
@@ -517,100 +221,57 @@ CajaWindow .primary-toolbar.toolbar CajaZoomControl .button.flat:last-child:hove
 }
 
 /* ComboBox views */
-CajaWindow .primary-toolbar.toolbar GtkComboBox .button,
-CajaWindow .primary-toolbar.toolbar GtkComboBox .button:hover,
-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: 7px 0px 7px 3px;
-}
-
-/* fix for menu transition */ 
-CajaWindow .primary-toolbar.toolbar GtkComboBox .menuitem {
-    background: transparent;
+/* kill a unwanted background with transition effect*/
+.caja-navigation-window toolbar combobox button.combo {
+    background-image: none;
 }
 
-CajaWindow .primary-toolbar.toolbar GtkComboBox .menuitem:hover {
+.caja-navigation-window toolbar.primary-toolbar combobox button.combo: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)));
 }
 
+.caja-navigation-window toolbar.primary-toolbar combobox button.combo arrow {
+    color: @theme_selected_fg_color
+}
+
 /* 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;
+.caja-navigation-window toolbar.primary-toolbar #Back button.image-button,
+.caja-navigation-window toolbar.primary-toolbar #Forward button.image-button {
+    border-radius: 6px 0px 0px 6px;
     border-width: 1px 0px 1px 1px;
 }
 
 /* navigation dropdown-menu buttons */
-CajaWindow .primary-toolbar.toolbar .button.menu-button {
-    border-radius: 0px  5px 5px 0px;
-    border-style: solid;
+.caja-navigation-window toolbar.primary-toolbar toolbutton button.toggle.popup {
+    border-radius: 0px  6px 6px 0px;
     border-width: 1px 1px 1px 0px;
 }
 
-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(@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);
+.caja-property-browser scrolledwindow viewport.frame {
+    background-color: shade (@theme_bg_color, 1.1);
 }
 
-/* properties-dialog emblem page */
-FMPropertiesWindow .vertical.dialog-vbox .notebook GtkViewport {
-    background-color: @theme_notebook_color;
-}
-
-/* tab styling */
-CajaNavigationWindow CajaNotebook.notebook {
-    border-style: none;
-    /*-GtkNotebook-tab-overlap: 1; */
-}
-
-CajaNavigationWindow paned.horizontal paned.horizontal .vertical tab.top,
-CajaNavigationWindow paned.horizontal paned.horizontal .vertical tab.top:active,
-CajaNavigationWindow paned.horizontal paned.horizontal .vertical tab.top:active:hover,
-CajaNavigationWindow paned.horizontal paned.horizontal .vertical tab.reorderable-page,
-CajaNavigationWindow paned.horizontal paned.horizontal .vertical 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;
-}
-
-EelEditableLabel.entry,
-EelEditableLabel.entry:focus {
+/* EelEditableLabel (icon labels) */
+.caja-navigation-window .view .entry,
+.caja-navigation-window .view .entry:focus,
+.caja-desktop.view .entry,
+.caja-desktop.view .entry:focus {
    border-image: none;
+   border-style: solid;
    border-width: 1px;
    border-color: @theme_fg_color;
    box-shadow: none;
    border-radius: 3px;
    text-shadow: none;
+   background-image: -gtk-gradient(linear,
+                                   left top, left bottom,
+                                   from       (shade(@theme_base_color, 0.86)),
+                                   color-stop (0.15, shade(@theme_base_color, 0.96)),
+                                   color-stop (0.50, shade(@theme_base_color, 0.98)),
+                                   to         (shade(@theme_base_color, 1.00)));
 }
 
 .caja-canvas-item {
@@ -618,14 +279,14 @@ EelEditableLabel.entry:focus {
 }
 
 /* desktop mode */
-window>*>box>box>box>scrolledwindow>.view .caja-canvas-item {
+.caja-desktop.caja-canvas-item {
     color: white;
     text-shadow: 1px 1px alpha (#000000, 0.8);
 }
 
-window>*>box>box>box>scrolledwindow>.view .caja-canvas-item:active,
-window>*>box>box>box>scrolledwindow>.view .caja-canvas-item:hover,
-window>*>box>box>box>scrolledwindow>.view .caja-canvas-item:selected {
+.caja-desktop.caja-canvas-item:active,
+.caja-desktop.caja-canvas-item:hover,
+.caja-desktop.caja-canvas-item:selected {
     text-shadow: none;
 }
 
@@ -635,29 +296,21 @@ window>*>box>box>box>scrolledwindow>.view .caja-canvas-item:selected {
 
 /* first make all transparent */
 .mate-panel-menu-bar,
-PanelToplevel.background.horizontal {
+.mate-panel-menu-bar menubar,
+.mate-panel-menu-bar menuitem,
+#PanelApplet button,
+PanelToplevel.background {
     background-color: transparent;
-}
-
-.mate-panel-menu-bar .menubar,
-WnckSelector.menubar,
-PanelMenuBar.menubar,
-WnckSelector menuitem,
-PanelMenuBar menuitem,
-#PanelApplet togglebutton.button {
-    border-image: none;
     background-image: none;
-    background-color: transparent;
+    border-color: transparent;
     box-shadow: none;
+    padding: 0px;
 }
 
 /* let's started */
 /* the panel bar itself */
-PanelToplevel.background.horizontal {
-    background-color: @theme_bg_dark_color;
-}
-
-.mate-panel-menu-bar {
+.mate-panel-menu-bar,
+PanelToplevel.background {
     background-color: @theme_bg_dark_color;
     background-image: none;
     /* normal panel */
@@ -668,59 +321,54 @@ PanelToplevel.background.horizontal {
 }
 
 /* workaround to avoid unwanted black frames if switching compositor on/off */
-.mate-panel-menu-bar .window-frame.csd.popup {
+.mate-panel-menu-bar .csd.popup decoration {
     box-shadow: none;
 }
 
-/* panel grip *//*
-PanelToplevel.background.mate-custom-panel-background {
-    background-color: transparent;
-    border-radius: 3px;*/
-/* enable for making borders visible */
-/*    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); *//*
-}*/
+/* panel grip */
+PanelToplevel.background {
+    border-radius: 3px;
+}
 
 /* hide buttons */
-PanelToplevel.background .button {
+PanelToplevel > widget > button {
+    color: @menu_fg_dark_color;
     background-image: none;
     background: transparent;
     border-style: none;
     border-radius: 3px;
     padding: 0px;
-    box-shadow: none;
+    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);
 }
 
-PanelToplevel.background .button:hover,
-PanelToplevel.background .button:hover:active {
-    background-image: none;
-    color: @menu_selected_fg_dark_color;
-    border-radius: 3px;
+PanelToplevel > widget > button:hover,
+PanelToplevel > widget > button:hover:active {
+    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)));
+    text-shadow: none;
+    color: shade (@theme_selected_bg_color, 1.6);
     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);
+    border-style: none;
 }
 
 /* dictionary applet */
-GdictApplet .entry {
-    /* normal panel */
-    color: @menu_fg_dark_color;
-    /* transparent panel light desktop background */
-/*    color: @theme_fg_color; */
-    background-image: none;
-    background-color: transparent;
+#PanelApplet entry {
     border-width: 1px;
-    padding: 3px 4px;
+    margin: 3px 0px;
 }
 
-#PanelApplet {
-    border-width: 0;
-}
-
-#PanelAppletFrameDBus PanelSeparator,
 PanelSeparator {
     border-width: 0;
     background-image: -gtk-gradient (linear, left top, left bottom,
@@ -731,98 +379,31 @@ PanelSeparator {
 }
 
 /* the grid left from wnckpager and wncktasklist */
-#PanelAppletFrameDBus {
+MatePanelAppletFrameDBus {
     background-image: -gtk-scaled(url("assets/panel-grid.svg"));
     background-color: transparent;
     background-repeat: no-repeat;
     background-position: left;
 }
 
-/* set normal menubar button */
-PanelMenuBar.menubar .menuitem {
-    padding: 5px 5px;
-    transition: all 200ms ease-out;
-}
-
-/* set selected menubar button */
-PanelMenuBar.menubar .menuitem:hover {
-    padding: 5px 5px;
-    background-color: shade (@theme_bg_dark_color, 1.2);
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@menu_bg_dark_color, 2.03)),
-                                     to   (shade(@menu_bg_dark_color, 1.17)));
-    border-radius: 5px;
-    text-shadow: none;
-    color: shade (@theme_selected_bg_color, 1.6);
-    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);
-    text-shadow: none;
-    border-style: none;
-    border-width: 0px;
-}
-
-/* set normal menubar menuitem */
-PanelMenuBar.menubar .menu .menuitem {
-    padding: 6px 6px;
-    transition: all 300ms ease-out;
-}
-
-/* set selected menubar menuitem */
-PanelMenuBar.menubar .menu .menuitem:checked:hover,
-PanelMenuBar.menubar .menu .menuitem:hover:active,
-PanelMenuBar.menubar .menu .menuitem:hover {
-    padding: 6px;
-    background-color: shade (@theme_bg_dark_color, 1.2);
-    background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@menu_bg_dark_color, 2.03)),
-                                     to   (shade(@menu_bg_dark_color, 1.17)));
-    border-radius: 5px;
-    text-shadow: none;
-    color: shade (@theme_selected_bg_color, 1.6);
-    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);
-    text-shadow: none;
-    border-style: none;
-    border-width: 0px;
-}
-
-/* Mate menu button normal */
-/* makes the arrow visible, nothing more works */
-PanelMenuButton.button {
+/* most applets */
+#PanelApplet button,
+#PanelApplet button.flat,
+#PanelApplet button.toggle
+#PanelApplet button.flat.toggle {
     background-image: none;
     background-color: transparent;
-    color: shade (@menu_fg_color, 1.00);
-}
-
-/* Mate menu menuitem */
-PanelMenuButton .menu .menuitem,
-PanelMenuButton .menu .menuitem:hover {
-    padding: 6px;
-}
-
-/* desktop-applet, clockapplet, drivemount, character-map,
-dictionary */
-
-.mate-panel-menu-bar button,
-#PanelApplet .button,
-#PanelApplet .button.flat {
-    background-image: none;
-    background-color: transparent;
-/*    border-color: shade (@theme_selected_bg_color, 1.30); */
+    border-color: transparent;
+    border-style: solid;
     border-radius: 5px;
-    border-width: 0px;
+    border-width: 1px;
     /* normal panel */
     color: @menu_fg_dark_color;
     /* transparent panel light desktop background*/
 /*    color: @theme_fg_color; */
     text-shadow: none;
-    padding: 6px;
+    box-shadow: none;
+    padding: 4px;
 }
 
 #PanelApplet button:hover:active,
@@ -830,176 +411,118 @@ dictionary */
 #PanelApplet button:checked:hover,
 #PanelApplet button.flat:hover:active,
 #PanelApplet button.flat:checked,
-#PanelApplet button.flat:checked:hover {
+#PanelApplet button.flat:checked:hover,
+#PanelApplet button.toggle:hover:active,
+#PanelApplet button.toggle:checked,
+#PanelApplet button.toggle:checked:hover,
+#PanelApplet button.flat.toggle:hover:active,
+#PanelApplet button.flat.toggle:checked,
+#PanelApplet button.flat.toggle:checked:hover{
     background-image: none;
-    border-color: @selected_bg_color;
-    background-color: shade (@selected_bg_color, 0.70);
+    border-color: shade (@theme_selected_bg_color, 1.30);
+    background-color: shade (@theme_selected_bg_color, 0.90);
     border-radius: 5px;
-    border-width: 0px;
+    border-width: 1px;
     color: shade (@theme_text_dark_color, 0.90);
     text-shadow: none;
-    padding: 6px;
+    padding: 4px;
 }
 
 #PanelApplet button:hover,
-#PanelApplet button.flat:hover {
+#PanelApplet button.flat:hover,
+#PanelApplet button.toggle:hover,
+#PanelApplet button.flat.toggle:hover {
     background-image: none;
-    border-color: @selected_bg_color;
-    background-color: shade (@selected_bg_color, 1.10);
+    border-color: shade (@theme_selected_bg_color, 1.50);
+    background-color: shade (@theme_selected_bg_color, 1.10);
     border-radius: 5px;
-    border-width: 0px;
+    border-width: 1px;
     color: @selected_fg_color;
     text-shadow: none;
-    padding: 6px;
-}
-
-/* drivemount */
-DriveList button,
-DriveList button.flat,
-DriveList button:hover,
-DriveList button.flat:hover,
-DriveList button:checked,
-DriveList button.flat:checked {
     padding: 4px;
-    border-radius: 5px;
-    border-color: transparent;
-    box-shadow: none;
 }
 
-/*Wncklist */
-.mate-panel-menu-bar #PanelPlug #PanelApple button,
-.mate-panel-menu-bar #PanelPlug #PanelApplet button.flat {
-    background-image: none;
-    background-color: transparent;
-    border-radius: 5px;
-    border-width: 1px;
-    color: shade (@theme_text_dark_color, 0.65);
-    text-shadow: none;
-    padding: 2px;
+#PanelApplet  #showdesktop-button.toggle,
+#PanelApplet  #showdesktop-button.toggle:hover,
+#PanelApplet  #showdesktop-button.toggle:hover:active,
+#PanelApplet  #showdesktop-button.toggle:checked,
+#PanelApplet  #showdesktop-button.toggle:checked:hover,
+#PanelApplet  #showdesktop-button.toggle:checked:hover:active {
+    padding: 4px 2px;
 }
 
-.mate-panel-menu-bar #PanelPlug #PanelApplet button:hover:active,
-.mate-panel-menu-bar #PanelPlug #PanelApplet button:checked,
-.mate-panel-menu-bar #PanelPlug #PanelApplet button:checked:hover,
-.mate-panel-menu-bar #PanelPlug #PanelApplet button.flat:hover:active,
-.mate-panel-menu-bar #PanelPlug #PanelApplet button.flat:checked:hover,
-.mate-panel-menu-bar #PanelPlug #PanelApplet button.flat:checked {
-    background-image: none;
-    /*border-color: @selected_bg_color;*/
-	border-color:transparent;          /*can't match gtk3.18 perfect, the drawing is different*/
-    background-color: shade (@selected_bg_color, 0.70);
-    border-radius: 5px;
-    border-width: 1px;
-    color: shade (@theme_text_dark_color, 0.90);
-    text-shadow: none;
-    padding: 2px;
+.mate-panel-menu-bar > menubar > menuitem {
+    padding: 5px 5px;
 }
 
+#clock-applet-button.flat.toggle > box.horizontal > label {
+    font: normal;
+}
 
-.mate-panel-menu-bar #PanelPlug #PanelApplet button:hover,
-.mate-panel-menu-bar #PanelPlug #PanelApplet button.flat:hover {
-    background-image: none;
-    border-color: @selected_bg_color;
-    background-color: shade (@selected_bg_color, 1.10);
-    border-radius: 5px;
-    border-width: 1px;
-    color: @theme_fg_color;
-    text-shadow: none;
-    padding: 2px;
+/* drivebutton */
+#PanelApplet > grid > button,
+#PanelApplet > grid > button:hover {
+    padding: 4px;
 }
 
-/* set normal button WnckSelector */
-.mate-panel-menu-bar menubar menuitem {
-    background-image: none;
-    background-color: transparent;
-    border-style: none;
-    border-width: 1px;
-    border-radius: 5px;
+/* window-menu applet, hover is checked !! */
+#window-menu-applet-button menubar menuitem {
+    padding: 4px 8px;
 }
 
-/* set selected button WnckSelector */
-.mate-panel-menu-bar menubar menuitem:hover {
+#window-menu-applet-button > menubar > menuitem:hover  {
     background-image: none;
-    border-color: @selected_bg_color;
-    background-color: shade (@selected_bg_color, 0.70);
+    border-color: shade (@theme_selected_bg_color, 1.30);
+    background-color: shade (@theme_selected_bg_color, 0.90);
     border-radius: 5px;
     border-width: 1px;
     color: shade (@theme_text_dark_color, 0.90);
     text-shadow: none;
 }
 
-/* set WnckSelector selected menuitem */
-.mate-panel-menu-bar menubar menuitem:hover {
-    background-color: shade (@theme_bg_dark_color, 1.2);
-    color: shade (@theme_selected_bg_color, 1.3);
+/* WnckPager */
+#PanelApplet.wnck-pager widget {
     background-image: none;
-    border-radius: 6px;
+    border-color: transparent;
+    background-color: transparent;
     text-shadow: none;
-    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);
-}
-
-ClockBox,
-.mate-panel-menu-bar.menubar,
-#PanelApplet > GtkMenuBar.menubar {
-    font: normal;
-}
-
-/* WnckPager */
-WnckPager {
-	background-image: none;
-	border-color: transparent;
-	background-color: transparent;
-	text-shadow: none;
 }
 
 /* selected WnckPager */
-WnckPager:selected {
-	background-image: linear-gradient(to bottom,
-		@theme_selected_bg_color,
-		shade (@theme_selected_bg_color, 0.36));
+#PanelApplet.wnck-pager widget:selected {
+    background-image: linear-gradient(to bottom,
+                                      @theme_selected_bg_color,
+                                      shade (@theme_selected_bg_color, 0.36));
 }
 
-/* prelight of WnckPager */
-WnckPager:hover {
+/* hover of WnckPager */
+#PanelApplet.wnck-pager widget:hover {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_selected_bg_color, 0.56),
                                       @theme_selected_bg_color);
 }
 
-/* no background for icon-padding area */
-GtkTrayIcon.background {
-    background-color: transparent;
-}
-
-NaTrayApplet {
+na-tray-applet {
     -NaTrayApplet-icon-padding: 3px;
     -NaTrayApplet-icon-size: 16;
 }
 
 /* system-monitor-applet */
-#PanelApplet .horizontal .vertical .frame {
-    box-shadow: inset  0px  1px shade (@menu_bg_dark_color, 1.3),
-                inset  1px  0px shade (@menu_bg_dark_color, 1.3),
-                inset -1px  0px shade (@menu_bg_dark_color, 1.3),
-                inset  0px -1px shade (@menu_bg_dark_color, 1.3);
+#PanelApplet > box.horizontal > box.vertical > frame {
+    box-shadow: inset  0px  1px shade (@menu_bg_dark_color, 1.5),
+                inset  1px  0px shade (@menu_bg_dark_color, 1.5),
+                inset -1px  0px shade (@menu_bg_dark_color, 1.5),
+                inset  0px -1px shade (@menu_bg_dark_color, 1.5);
     border-style: none;
     border-radius: 6px;
 }
 
-/* Classic icon style */
-.mate-panel-menu-bar {
-    -PanelMenuBar-icon-visible: true;
-}
-
 /* volume applet */
 .mate-panel-applet-slider {
     background: transparent;
 }
 
-.mate-panel-applet-slider .frame {
+.mate-panel-applet-slider frame {
     background-color: rgba(0,0,0,0.5);
     border-image: none;
     border-style: none;
@@ -1012,13 +535,13 @@ NaTrayApplet {
                 inset  0px -1px shade(@selected_bg_color, 0.93);
 }
 
-.mate-panel-applet-slider .frame .frame{
+.mate-panel-applet-slider frame frame {
     background-color:transparent;
     box-shadow: none;
 }
 
 /* brightness applet */
-.mate-panel-applet-slider .frame .button {
+.mate-panel-applet-slider frame button {
     padding: 4px 0px;
     background-image: none;
     background-color: transparent;
@@ -1028,11 +551,12 @@ NaTrayApplet {
     margin: 0px;
 }
 
-.mate-panel-applet-slider .frame .button:disabled {
+.mate-panel-applet-slider frame button:disabled {
     box-shadow: none;
 }
 
-.mate-panel-applet-slider .frame .button:hover {
+.mate-panel-applet-slider frame button:hover {
+    padding: 4px 0px;
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (alpha(shade(@theme_selected_bg_color, 1.43) ,0.6)),
@@ -1043,38 +567,34 @@ NaTrayApplet {
  * Mate-terminal *
  ****************/
 
+.mate-terminal notebook {
+    border-color: @menu_bg_dark_color;
+}
+
 /* Background mate-terminal, this isn't the normal way to style that! */
-TerminalWindow .entry {
+.mate-terminal vte {
     -TerminalWindow-background-darkness: 0.95;
     background-color: @terminal_background_color;
     color: @selected_fg_color;
 }
 
-TerminalWindow .grip {
-    background-color: shade (@theme_bg_color, 1.0);
-    background-image: url("assets/resize-grip.svg");
-    -GtkWindow-resize-grip-default: true;
-    -GtkWindow-resize-grip-width: 13;
-    -GtkWindow-resize-grip-height: 13;
-}
-
 /****************
  * Pluma        *
  ****************/
 
 /* pluma line numbers */
-PlumaView {
+.pluma-window textview {
     background-color: shade (@bg_color, 1.07);
 }
 
 /* Pluma status bar */
-PlumaWindow .button.flat {
+.pluma-window statusbar.horizontal frame button.flat.toggle {
     border-style: none;
     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)),
+                                     color-stop (0.45, shade(@nautilus_cluebar_color, 1.00)),
+                                     color-stop (0.52, shade(@nautilus_cluebar_color, 0.99)),
                                      to   (shade(@nautilus_cluebar_color, 0.92)));
     box-shadow: inset  0px  2px alpha(#fff, 0.09),
                 inset  2px  0px alpha(#fff, 0.07),
@@ -1088,14 +608,14 @@ PlumaWindow .button.flat {
     padding: 2px 5px;
 }
 
-PlumaWindow .button.flat:hover {
+.pluma-window statusbar.horizontal frame button.flat.toggle:hover {
     border-style: none;
     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)));
+                                     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)));
     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),
@@ -1106,41 +626,16 @@ PlumaWindow .button.flat:hover {
     padding: 2px 5px;
 }
 
-/* notebook text area */
-PlumaWindow .notebook {
-    border-style: none;
-   /* -GtkNotebook-tab-overlap: 1;*/
-}
-
-PlumaWindow .notebook tab.top {
-    border-radius: 4px 4px 0px 0px;
-    border-width: 1px 1px 0px 1px;
-    border-color: @notebook_border;
-    border-style: solid;
-    padding: 5px 4px;
-}
-
-PlumaWindow .notebook.header {
-    border-radius: 0px;
-    border-style: none;
-}
-
-/* surpress styling of close button */
-PlumaWindow .notebook tab .button.flat {
-    background-image: none;
-    box-shadow: none;
-    padding: 1px;
-}
-
-PlumaWindow .notebook tab .button.flat:hover {
-    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);
+/* FIXME , does not work anymore since GtkArrow is widget *//*
+#pluma-status-combo-button.flat.toggle box.horizontal widget {
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+    min-height: 16px
+    min-width: 16px;
 }
+*/
 
 /* Printpreview */
-PlumaPrintPreview.vertical .toolbar.horizontal {
+.pluma-print-preview toolbar.horizontal {
    background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@theme_bg_dark_color, 1.00)),
@@ -1157,269 +652,194 @@ PlumaPrintPreview.vertical .toolbar.horizontal {
     color: @theme_fg_dark_color;
 }
 
-PlumaPrintPreview.vertical .toolbar.horizontal .button {
-    background-image: none;
+.pluma-print-preview toolbar.horizontal button {
     box-shadow: none;
 }
 
-PlumaPrintPreview.vertical .toolbar.horizontal .button:hover {
+.pluma-print-preview toolbar.horizontal button:hover {
     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);
 }
 
-PlumaPrintPreview.vertical .toolbar.horizontal .button.text-button {
+.pluma-print-preview toolbar.horizontal toolbutton button.text-button {
     padding: 0px 10px;
 }
 
-PlumaPrintPreview.vertical .toolbar.horizontal .button.text-button:hover {
+.pluma-print-preview toolbar.horizontal toolbutton button.text-button label {
     color: @theme_fg_dark_color;
 }
 
-PlumaPrintPreview.vertical GtkLayout {
-    background-color: @theme_base_color;
+.pluma-print-preview toolbar.horizontal toolitem entry {
+    margin: 4px 0px;
 }
 
 /* sidebar file-browser */
-PlumaPanel.vertical {
+.pluma-window paned.horizontal box.vertical {
     background-image: linear-gradient(to bottom,
                                       shade(@theme_bg_color, 1.14),
                                       shade(@theme_bg_color, 1.1));
     border-radius: 4px 4px 0px 0px;
     border-width: 1px 0px 0px 0px;
     border-style: solid;
-    border-color: @borders;
+    border-color: @notebook_border;
     box-shadow: none;
 }
 
-/* header */
-PlumaPanel.vertical .horizontal .horizontal .label {
-    padding: 4px 2px;
+.pluma-window paned.horizontal notebook.frame {
+    border-radius: 0px;
+    border-style: none;
 }
 
-PlumaPanel.vertical PlumaCloseButton.button.flat {
+.pluma-window paned.horizontal toolbar.horizontal button {
+    padding: 6px 3px ;
     box-shadow: none;
-    background-image: none;
-    border-style: none;
+    border-style:none;
 }
 
-PlumaPanel.vertical PlumaCloseButton.button.flat:hover {
-    border-radius: 4px;
-    border-style: none;
-    /*-gtk-image-effect: highlight;*/
+.pluma-window paned.horizontal toolbar.horizontal button:hover {
+    border-style:none;
+    background-image: -gtk-gradient (linear,
+                                     left top, left bottom,
+                                     from (shade(@menu_bg_dark_color, 2.03)),
+                                     to   (shade(@menu_bg_dark_color, 1.17)));
     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);
 }
 
-PlumaPanel.vertical .notebook {
-    border-radius: 0px;
+/* textview */
+.pluma-window paned.horizontal paned.vertical notebook {
+    border-style: none;
 }
 
-PlumaFileBrowserWidget.vertical togglebutton.button {
-    padding: 4px ;
+.pluma-window paned.horizontal paned.vertical notebook box.vertical {
+    border-style: none;
 }
 
-PlumaFileBrowserWidget.vertical .toolbar.horizontal {
-   background-image: -gtk-gradient (linear,
-                                     left top, left bottom,
-                                     from (shade(@theme_bg_dark_color, 1.00)),
-                                     to   (shade(@theme_bg_dark_color, 0.95)));
+#caja-tab-close-button.flat,
+.pluma-window notebook button.flat {
     border-image: none;
-    border-width: 0px 0px 1px 0px;
-    border-radius: 0px;
+    background-image: none;
+    background-color: transparent;
+    border-radius: 4px;
     border-style: solid;
-    border-color: @primay-toolbar-border;
-    padding: 3px 3px;
-    box-shadow: none;
-    -GtkWidget-window-dragging: true;
-    -GtkToolbar-button-relief: normal;
-    color: @theme_fg_dark_color;
-}
-
-PlumaFileBrowserWidget.vertical .horizontal.toolbar .button,
-PlumaFileBrowserWidget.vertical .horizontal.toolbar .button.menu-button {
-    padding: 6px 3px ;
-}
-
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.image-button {
-    padding: 6px 4px ;
-}
-
-PlumaFileBrowserWidget.vertical {
-    background-color: @theme_bg_color;
-}
-
-PlumaDocumentsPanel .view,
-PlumaFileBrowserWidget .view {
-    background-color: shade (@theme_bg_color, 1.08);
-}
-
-/* color of of expander arrow */
-PlumaFileBrowserWidget.vertical GtkExpander:hover {
-    color: @theme_fg_color;
-}
-
-PlumaWindow .notebook.frame.bottom,
-PlumaWindow .notebook.header.bottom {
-    border-width: 0px 0px 0px 0px;
-}
-
-PlumaWindow .notebook tab.bottom {
-    padding: 2px 10px 4px 10px;
+    border-color: transparent;
+    border-width: 1px;
+    padding: 1px;
+    -gtk-icon-shadow: none;
 }
 
 /***********************
  * Mate-Control-Center *
  ***********************/
 
-/* background */
-ShellWindow .enty,
-ShellWindow AppResizer SlabSection {
-    background-color: @theme_base_color;
-}
-
-/* button of sidebar */
-ShellWindow .button.flat {
+#MyControlCenter button.flat {
     border-image: none;
     border-radius: 6px;
     padding: 4px;
 }
 
-ShellWindow .button.flat:hover {
-    border-radius: 6px;
-    padding: 4px;
-}
+/*********
+ * Atril *
+ *********/
 
-/* button of applications */
-ShellWindow GtkScrolledWindow .button.flat {
-    padding: 4px 0px;
-    border-image: none;
+.atril-window paned.horizontal notebook scrolledwindow {
+    border-style: none;
 }
 
-/* button hover of applications */
-ShellWindow GtkScrolledWindow .button.flat:hover {
-    padding: 4px 0px;
-    border-radius: 12px;
-    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-top-color: alpha(@focused_entry_outer, 0.65);
-    border-right-color: alpha(@focused_entry_outer, 0.75);
-    border-left-color: alpha(@focused_entry_outer, 0.75);
-    border-bottom-color: alpha(@focused_entry_outer, 0.80);
-    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);
+/* atril and eom */
+EggToolbarEditor.vertical scrolledwindow {
+    border-color: @notebook_border;
+    border-width: 1px;
+    border-radius: 0px;
+    border-style: solid;
 }
 
-/* logout dialog */
-GsmLogoutDialog * {
-    -GtkDialog-button-spacing: 0;
+EggToolbarEditor.vertical scrolledwindow viewport.frame {
+    background-color: shade (@base_color, 1.0);
 }
 
-/***********************
- * Engrampa *
- ***********************/
+/**************
+ * mate-media *
+ **************/
 
-FrWindow .toolbar.primary-toolbar {
-    border-color: @primay-toolbar-border;
-    border-width: 0 0 1px 0;
+GvcMixerDialog box.horizontal {
+    margin: 0px -3px 0px -3px;
 }
 
-/*********
- * Atril *
- *********/
-
-EvWindow .vertical.primary-toolbar .horizontal.toolbar {
-    padding: 1px 4px;
+GvcMixerDialog box.horizontal box.horizontal frame {
+    background-color: shade (@theme_bg_color, 1.1);
+    border-color: @notebook_border;
 }
 
-/* size of page entry */
-EvPageActionWidget .entry {
-    padding: 4px;
+GvcMixerDialog box.horizontal box.horizontal frame label {
+    padding: 0px 0px 0px 14px;
 }
 
-EvWindow .toolbar .button,
-EvWindow .toolbar .button.flat {
-    padding: 0px 4px;
+GvcMixerDialog notebook.frame:nth-child(even) {
+    border-radius: 3px 3px 0px 0px;
 }
 
-EvWindow .vertical.primary-toolbar .horizontal.toolbar EphyZoomControl togglebutton:hover.button {
-    padding: 4px;
-    border-radius: 4px;
+GvcMixerDialog notebook.frame frame {
+    border-style: none;
 }
 
-EvSidebar .flat.button {
-    border-radius: 4px;
-    padding: 4px;
+/* fix weird borders in application page */
+GvcMixerDialog notebook.frame scrolledwindow.frame {
+    border-style: none;
 }
 
-/* atril and eom */
-EggToolbarEditor.vertical GtkScrolledWindow .frame {
-    background-color: shade (@base_color, 1.0);
+GvcMixerDialog notebook.frame scrolledwindow.frame viewport.frame {
+    background-color: shade (@theme_bg_color, 1.1);
+}
+ /* needed because of 'border-style: none' for application page */
+GvcMixerDialog notebook.frame box.vertical frame scrolledwindow.frame {
     border-color: @notebook_border;
-    border-width: 1px;
-    border-radius: 0px;
     border-style: solid;
 }
 
-/**************
- * mate-media *
- **************/
-
-GvcMixerDialog .frame.flat {
-    border-style: none;
+GvcMixerDialog notebook.frame box.vertical box.horizontal frame label {
+    padding: 0px 0px 0px 6px;
 }
 
-GvcMixerDialog .vertical.dialog-vbox .notebook GtkScrolledWindow.frame {
-    border-style: none;
-    border-radius: 0px 0px 4px 4px;
+GvcMixerDialog notebook.frame box.vertical box.horizontal box.horizontal label {
+    padding: 0px 0px 0px 6px;
 }
 
-GvcMixerDialog .vertical.dialog-vbox .notebook .frame.flat GtkScrolledWindow.frame {
-    border-width: 1px;
-    border-radius: 0px;
-    border-style: solid;
+GvcMixerDialog notebook.frame box.vertical box.horizontal box.horizontal frame box.horizontal box.horizontal label {
+    padding: 0px 0px 0px 10px;
 }
-
 /*******
  * Eom *
  *******/
 
-EomWindow .vertical.primary-toolbar .horizontal.toolbar {
-    border-bottom-color: @theme_bg_dark_color;
-}
-
-EomThumbNav .button.flat {
+.eom-window .vertical .vertical .vertical .horizontal button.flat {
     border-width: 1px;
     border-color: @button_border;
     border-image: none;
 }
 
-EomThumbNav .button.flat:first-child {
+.eom-window .vertical .vertical .vertical .horizontal button.flat:first-child {
     border-radius: 5px 0px 0px 5px;
     border-right-width: 0px;
 }
 
-EomThumbNav .button.flat:last-child {
+.eom-window .vertical .vertical .vertical .horizontal button.flat:last-child {
     border-radius: 0px 5px 5px 0px;
     border-left-width: 0px;
 }
 
-EomThumbNav .button.flat:hover {
+.eom-window .vertical .vertical .vertical .horizontal button.flat:hover {
     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);
 }
 
-EomThumbNav .button.flat:disabled {
+.eom-window .vertical .vertical .vertical .horizontal button.flat:disabled {
     border-color: transparent;
 }
+