Merge pull request #8 from mate-desktop/master

Merge master 2-26-2016

8 files changed, 881 insertions, 909 deletions

diff --git a/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css b/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css
index 405c79bd..95bd1c28 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css
@@ -21,7 +21,7 @@
 }
 
 .nautilus-desktop.nautilus-canvas-item:active,
-.nautilus-desktop.nautilus-canvas-item:prelight,
+.nautilus-desktop.nautilus-canvas-item:hover,
 .nautilus-desktop.nautilus-canvas-item:selected {
 	text-shadow: none;
 }
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css
index a2cb0048..90dfed7a 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css
@@ -31,7 +31,7 @@
 
 @define-color inactive_frame_color #ccc;
 
-@define-color sidebar_bg shade (@theme_bg_color, 1.025);
+@define-color sidebar_bg shade (@theme_bg_color, 1.08);
 @define-color sidebar_bg_unfocused mix(@sidebar_bg, @theme_unfocused_base_color, 0.5);
 
 @define-color sidebar_scrollbar_trough shade(@sidebar_bg, 0.8);
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css
index 8840df4b..81074f8c 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-assets.css
@@ -25,8 +25,8 @@
 
 headerbar > box > separator.vertical,
 .header-bar > GtkBox > .separator.vertical {
-	-GtkWidget-wide-separators: 1; /* deprecated, but ignored */
-	-GtkWidget-separator-width: 2px; /* deprecated, but ignored */
+/*	-GtkWidget-wide-separators: 1;  deprecated */
+/*	-GtkWidget-separator-width: 2px;  deprecated */
 	background: transparent;
 	border-width: 0 1px 0 1px;
 	border-style: solid;
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css
index e832ba40..88b50edd 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css
@@ -3,14 +3,12 @@ button,
 toolbar button.raised,
 toolbar .raised button,
 toolbar combobox button,
-spinbutton.vertical button,
 toolbar.primary-toolbar .linked button,
 toolbar.primary-toolbar .raised button,
 .button,
 .toolbar .button.raised,
 .toolbar .raised .button,
-.toolbar GtkComboBox .button,
-.spinbutton.vertical .button {
+.toolbar GtkComboBox .button {
 	background-image: linear-gradient(to bottom, 
 		@button_gradient_color_a,
 		@button_gradient_color_b);
@@ -21,10 +19,6 @@ toolbar.primary-toolbar .raised button,
 button:checked,
 button:active,
 button:active:hover,
-spinbutton.vertical button:checked,
-spinbutton.vertical button:checked:hover,
-spinbutton.vertical button:active,
-spinbutton.vertical button:active:hover,
 toolbar button:active,
 toolbar button:active:hover,
 toolbar button.raised:active,
@@ -40,10 +34,6 @@ toolbar .raised button:checked:hover,
 .button:checked,
 .button:active,
 .button:active:hover,
-.spinbutton.vertical .button:checked,
-.spinbutton.vertical .button:checked:hover,
-.spinbutton.vertical .button:active,
-.spinbutton.vertical .button:active:hover,
 .toolbar .button:active,
 .toolbar .button:active:hover,
 .toolbar .button.raised:active,
@@ -76,7 +66,6 @@ row trough,
 
 button:checked:hover,
 button:active:hover,
-spinbutton.vertical button:active:hover,
 toolbar button:active:hover,
 toolbar button.raised:active:hover,
 toolbar .raised button:active:hover,
@@ -86,7 +75,6 @@ toolbar .raised button:checked:hover,
 row trough:hover,
 .button:checked:hover,
 .button:active:hover,
-.spinbutton.vertical .button:active:hover,
 .toolbar .button:active:hover,
 .toolbar .button.raised:active:hover,
 .toolbar .raised .button:active:hover,
@@ -135,13 +123,11 @@ toolbar button:hover,
 toolbar button.raised:hover,
 toolbar .raised button:hover,
 toolbar combobox button:hover,
-spinbutton.vertical button:hover,
 .button:hover,
 .toolbar .button:hover,
 .toolbar .button.raised:hover,
 .toolbar .raised .button:hover,
-.toolbar GtkComboBox .button:hover,
-.spinbutton.vertical .button:hover {
+.toolbar GtkComboBox .button:hover {
 	background-color: transparent;
 	background-image: linear-gradient(to bottom,
 		@button_hover_gradient_color_a,
@@ -159,12 +145,10 @@ toolbar.primary-toolbar button:hover,
 
 /* Insensitive button background */
 button:disabled,
-spinbutton.vertical button:disabled,
 toolbar combobox button:disabled,
 toolbar button.raised:disabled,
 toolbar .raised button:disabled,
 .button:disabled,
-.spinbutton.vertical button:disabled,
 .toolbar GtkComboBox button:disabled,
 .toolbar .button.raised:disabled,
 .toolbar .raised .button:disabled {
@@ -216,20 +200,12 @@ GtkComboBox.combobox-entry .button:hover,
 toolbar.primary-toolbar combobox entry button:active,
 toolbar.primary-toolbar combobox entry button:checked,
 combobox entry button:active,
-spinbutton button:active,
-spinbutton button:active:hover,
 combobox entry button:checked,
-spinbutton button:checked,
-spinbutton button:checked:hover,
 .primary-toolbar GtkComboBox.combobox-entry .button:active,
 .primary-toolbar GtkComboBox.combobox-entry .button:checked,
 /* .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,*/
 GtkComboBox.combobox-entry .button:active,
-.spinbutton .button:active,
-.spinbutton .button:active:hover,
-GtkComboBox.combobox-entry .button:checked,
-.spinbutton .button:checked,
-.spinbutton .button:checked:hover {
+GtkComboBox.combobox-entry .button:checked {
 	background-image: linear-gradient(to bottom,
 		shade(@entry_background_a, 0.9),
 		@entry_background_b);
@@ -255,7 +231,7 @@ GtkStack column-header .button {
                                       shade(@theme_bg_color, 1.1));
 }
 
-treeview header button,
+treeview header button:hover,
 column-header.button:hover,
 column-header .button:hover {
 	background-image: linear-gradient(to bottom,
@@ -359,11 +335,11 @@ scale.vertical progressbar,
 
 /* Progressbar backgrounds */
 
-progressbar,
-row progressbar,
-row progressbar:hover,
-row progressbar:selected,
-row progressbar:selected:focus,
+progressbar progress,
+row progressbar progress,
+row:hover progressbar progress,
+row:selected progressbar progress,
+row:selected:focus progressbar progress,
 .progressbar,
 .progressbar row,
 .progressbar row:hover,
@@ -385,7 +361,7 @@ row progressbar:selected:focus,
 	box-shadow: inset 1px 1px alpha(white, 0.2), inset -1px -1px alpha(white, 0.1);
 }
 
-progressbar.vertical,
+progressbar.vertical progress,
 .progressbar.vertical {
 	background-image: linear-gradient(to right top,
 		alpha (@progressbar_pattern, 0.25),
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
index aa45d706..9d9960d3 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
@@ -6,23 +6,15 @@ button:active,
 button:checked,
 combobox entry entry,
 combobox entry button,
-spinbutton.vertical button:active,
-spinbutton.vertical button:checked,
 toolbar.inline-toolbar.vertical button:active,
 toolbar.inline-toolbar.vertical button:checked,
-stack box.linked.verticalspinbutton.horizontal.entry.spinbutton.vertical button:active,
-stack box.linked.verticalspinbutton.horizontal.entry.spinbutton.vertical button:checked,
 .entry,
 .button:active,
 .button:checked,
 GtkComboBox.combobox-entry .entry,
 GtkComboBox.combobox-entry .button,
-.spinbutton.vertical .button:active,
-.spinbutton.vertical .button:checked,
 .inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button:active,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button:checked {
+.inline-toolbar.toolbar.vertical .button:checked {
 	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -39,20 +31,16 @@ trough highlight,
 
 entry:disabled,
 button:active:disabled,
-spinbutton.vertical button:disabled,
 combobox entry entry:disabled,
 combobox entry button:disabled,
 toolbar.inline-toolbar.vertical button:disabled,
 toolbar.inline-toolbar.vertical button.default:disabled,
-stack box.linked.vertical spinbutton.horizontal.entry.spinbutton.vertical button:disabled,
 .entry:disabled,
 .button:active:disabled,
-.spinbutton.vertical .button:disabled,
 GtkComboBox.combobox-entry .entry:disabled,
 GtkComboBox.combobox-entry .button:disabled,
 .inline-toolbar.toolbar.vertical .button:disabled,
-.inline-toolbar.toolbar.vertical .button.default:disabled,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button:disabled {
+.inline-toolbar.toolbar.vertical .button.default:disabled {
 	border-image: url("borders/button-active-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -62,20 +50,16 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .bu
 
 button:disabled,
 button.default:disabled,
-spinbutton.vertical button:disabled,
 toolbar.inline-toolbar button:disabled,
 toolbar.inline-toolbar button.default:disabled,
 toolbar.inline-toolbar.vertical button:disabled,
 toolbar.inline-toolbar.vertical button.default:disabled,
-stack box.linked.vertical spinbutton.horizontal.entry.spinbutton.vertical button:disabled,
 .button:disabled,
 .button.default:disabled,
-.spinbutton.vertical .button:disabled,
 .inline-toolbar.toolbar .button:disabled,
 .inline-toolbar.toolbar .button.default:disabled,
 .inline-toolbar.toolbar.vertical .button:disabled,
-.inline-toolbar.toolbar.vertical .button.default:disabled,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button:disabled {
+.inline-toolbar.toolbar.vertical .button.default:disabled {
 	border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -99,32 +83,20 @@ button:checked:focus,
 button.default:active,
 button.default:checked,
 combobox entry button:focus,
-spinbutton.vertical button:active:focus,
-spinbutton.vertical button:checked:focus,
 toolbar.inline-toolbar.vertical button:active:focus,
 toolbar.inline-toolbar.vertical button:checked:focus
 toolbar.inline-toolbar.vertical button.default:active,
 toolbar.inline-toolbar.vertical button.default:checked,
-stack box.linked.vertical spinbutton.horizontal.entry.spinbutton button:active,
-stack box.linked.vertical spinbutton.horizontal.entry.spinbutton button:checked,
-stack box.linked.vertical spinbutton.horizontal.entry.spinbutton button:active:focus,
-stack box.linked.vertical spinbutton.horizontal.entry.spinbutton button:checked:focus,
 .entry:focus,
 .button:active:focus,
 .button:checked:focus,
 .button.default:active,
 .button.default:checked,
 GtkComboBox.combobox-entry .button:focus,
-.spinbutton.vertical .button:active:focus,
-.spinbutton.vertical .button:checked:focus,
 .inline-toolbar.toolbar.vertical .button:active:focus,
 .inline-toolbar.toolbar.vertical .button:checked:focus
 .inline-toolbar.toolbar.vertical .button.default:active,
-.inline-toolbar.toolbar.vertical .button.default:checked,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:active,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:active:focus,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:checked:focus {
+.inline-toolbar.toolbar.vertical .button.default:checked {
 	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -149,8 +121,7 @@ GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton .button:chec
 
 button,
 .button
-/*.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button*/ {
+/*.inline-toolbar.toolbar.vertical .button*/ {
 	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -158,12 +129,8 @@ button,
 	border-color: transparent;
 }
 
-spinbutton.vertical button,
 toolbar.inline-toolbar.vertical button,
-stack box.linked.vertical spinbutton.horizontal.entry.spinbutton.vertical .button,
-.spinbutton.vertical .button,
-.inline-toolbar.toolbar.vertical .button,
-GtkStack .linked.vertical GtkSpinButton.horizontal.entry.spinbutton.vertical .button {
+.inline-toolbar.toolbar.vertical .button {
 	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -398,13 +365,15 @@ column-header .button.dnd {
 
 /* ie. yumex-dnf */
 stack treeview header button,
+stack treeview header button:focus,
 GtkStack column-header .button {
     border-width: 0px 1px 1px 0px;
-	border-color: transparent;
+    border-color: transparent;
     border-style: solid;
-	border-image: linear-gradient(to bottom,
-		alpha(@borders, 0.0),
-		shade(@borders, 1.0)) 0 1 1 0;
+    border-radius: 0px;
+    border-image: linear-gradient(to bottom,
+                                  alpha(@borders, 0.0),
+                                  shade(@borders, 1.0)) 0 1 1 0;
 }
 
 treeview header button:disabled,
@@ -478,9 +447,50 @@ button.destructive-action:active,
 .destructive-action.button,
 .destructive-action.button:checked,
 .destructive-action.button:active {
-	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-	border-radius: 3px;
-	border-width: 2px;
-	border-style: solid;
-	border-color: transparent;
+    border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+    border-radius: 3px;
+    border-width: 2px;
+    border-style: solid;
+    border-color: transparent;
+}
+
+button.image-button.radio:dir(ltr) {
+    border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+    border-radius: 4px;
+    border-width: 2px;
+    border-style: solid;
+    border-color: transparent;
+    border-radius: 3px;
 }
+
+button.image-button.radio.default:dir(ltr),
+button.image-button.radio:dir(ltr):focus {
+    border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+    border-radius: 4px;
+    border-width: 2px;
+    border-style: solid;
+    border-color: transparent;
+}
+
+button.image-button.radio:dir(ltr):checked {
+    border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+    border-radius: 4px;
+    border-width: 2px;
+    border-style: solid;
+    border-color: transparent;
+}
+
+button.image-button.radio:dir(ltr):hover,
+button.image-button.radio:dir(ltr):checked:focus,
+button.image-button.radio:dir(ltr):checked:hover,
+button.image-button.radio:dir(ltr):checked:focus:hover,
+button.image-button.radio:dir(ltr):focus:hover:active,
+button.image-button.radio:dir(ltr):checked:focus:hover:active,
+button.image-button.radio.default:dir(ltr):checked {
+    border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+    border-radius: 4px;
+    border-width: 2px;
+    border-style: solid;
+    border-color: transparent;
+}
+
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
index 7f3e6fbc..3040df8b 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -2,19 +2,19 @@
 /*	engine: none; */
 	padding: 0;
 	background-clip: padding-box;
-	-GtkButton-child-displacement-x: 1;
-	-GtkButton-child-displacement-y: 1;
-	-GtkButtonBox-child-min-height: 26;
-	-GtkCheckButton-indicator-size: 16;
-	-GtkCheckMenuItem-indicator-size: 12;
+/*	-GtkButton-child-displacement-x: 1; deprecated */
+/*	-GtkButton-child-displacement-y: 1; deprecated */
+/*	-GtkButtonBox-child-min-height: 26; deprecated */
+/*	-GtkCheckButton-indicator-size: 16; deprecated */
+/*	-GtkCheckMenuItem-indicator-size: 12; deprecated */
 	-GtkDialog-button-spacing: 4;
 	-GtkDialog-action-area-border: 10; /* buttons mate-appearance-properties */
-	-GtkExpander-expander-size: 11;
+/*	-GtkExpander-expander-size: 11; deprecated */
 /*	-GtkMenu-horizontal-padding: 0; */
 /*	-GtkMenu-vertical-padding: 0; */
-	-GtkPaned-handle-size: 1;
+/*	-GtkPaned-handle-size: 1; deprecated */
 	-GtkScrolledWindow-scrollbar-spacing: 0;
-	-GtkScrolledWindow-scrollbars-within-bevel: 1;
+/*	-GtkScrolledWindow-scrollbars-within-bevel: 1; deprecated */
 	-GtkTextView-error-underline-color: @error_color;
 	-GtkToolButton-icon-spacing: 4;
 	-GtkToolItemGroup-expander-size: 11;
@@ -22,7 +22,7 @@
 	-GtkTreeView-horizontal-separator: 4;
 /*	-GtkWidget-focus-padding: 2;  deprecated */
 /*	-GtkWidget-focus-line-width: 0; */
-	-GtkStatusbar-shadow-type: none;
+/*	-GtkStatusbar-shadow-type: none;  deprecated */
 	-GtkIMHtml-hyperlink-color: @link_color;
 	-GtkHTML-link-color: @link_color;
 	-WnckTasklist-fade-overlay-rect: 0;
@@ -68,11 +68,11 @@
 
 /* Apply effects to insensitive and prelit images */
 *:disabled {
-	-gtk-image-effect: dim;
+	-gtk-icon-effect: dim;
 }
 
 *:hover {
-	-gtk-image-effect: highlight;
+	-gtk-icon-effect: highlight;
 }
 
 .gtkstyle-fallback {
@@ -136,22 +136,28 @@ GtkTextView {
 /************
  * Tooltips *
  ************/
-.tooltip,
-.tooltip.background {
+tooltip {
 	padding: 4px;
 	border-style: solid;
 	border-width: 1px;
 	border-color: shade(@theme_tooltip_bg_color, 0.50);
-	border-radius: 0px;
+	border-radius: 2px;
+}
 
+tooltip.background {
 	background-color: @theme_tooltip_bg_color;
 	color: @theme_tooltip_fg_color;
-
 	text-shadow: none;
 }
 
-.tooltip * {
+tooltip decoration {
+    background-color: transparent;
+}
+
+tooltip * {
 	background-color: transparent;
+	color: @theme_tooltip_fg_color;
+	padding: 4px;
 }
 
 /*********************
@@ -165,28 +171,22 @@ GtkTextView {
 
 spinner,
 .spinner {
-	background-image: none;
-	background-color: blue;
+	background: none;
 	opacity: 0;
 	-gtk-icon-source: -gtk-icontheme("process-working-symbolic");
 }
 
-spinner:active,
-.spinner:active {
+spinner:checked,
+.spinner:checked {
 	opacity: 1;
 	animation: spin 1s linear infinite;
 }
 
-spinner:active:disabled,
-.spinner:active:disabled {
+spinner:checked:disabled,
+.spinner:checked:disabled {
 	opacity: 0.5;
 }
 
-button spinner:active,
-.button .spinner:active {
-	color: @theme_fg_color;
-}
-
 /*****************
  * Miscellaneous *
  *****************/
@@ -202,18 +202,21 @@ rubberband {
 	border-radius: 0px;
 }
 
-GtkStatusbar label,
+statusbar label,
+statusbar frame,
 GtkStatusbar .label,
 GtkStatusbar .frame.flat {
 	color: @theme_fg_color;
-	-GtkStatusbar-shadow-type: none;
+/*	-GtkStatusbar-shadow-type: none;  deprecated */
 }
 
+statusbar frame,
 GtkStatusbar .frame.flat {
 	padding: 1px;
-	border-width: 0;
+    border-style: none;
 }
 
+statusbar frame button.flat,
 GtkStatusbar .frame.flat .button.flat {
     padding: 0px;
 }
@@ -225,7 +228,8 @@ GtkStatusbar .frame.flat .button.flat {
 	border-radius: 0;
 }
 
-treeview view separator,
+treeview.view separator,
+treeview.view .separator, /* why ?*/
 treeview separator,
 separator,
 separator:hover,
@@ -234,7 +238,12 @@ GtkTreeView.separator,
 .separator,
 .separator:hover {
 	color: @view_separators;
-	background-color: transparent;
+	background-color: @view_separators;
+}
+
+/*Keep treeviews from jumping, separators drawn at 0 by default until hovered*/
+treeview.view.separator {
+    min-height: 2px;
 }
 
 .toolbar separator,
@@ -243,34 +252,12 @@ GtkTreeView.separator,
 	color: transparent;
 }
 
-.pane-separator {
-	-GtkPaned-handle-size: 1;
-	border-width: 0 1px 1px 1px;
-	border-style: solid;
-	border-color: @borders;
-	background-color: @sidebar_bg;
-	background-image: url("assets/null.png");
-	color: @borders;
-}
-
-.pane-separator:hover,
-.pane-separator:selected {
-	color: @theme_text_color;
-}
-
-notebook .pane-separator,
-notebook .pane-separator:hover,
-.notebook .pane-separator,
-.notebook .pane-separator:hover {
-	background-color: @theme_base_color;
-}
-
 /************************
  * overshoot/undershoot *
  ************************/
 
 /* displays at end of mouse scrolling */
-.overshoot.top {
+overshoot.top {
     background-image: -gtk-gradient(radial,
                                     center top, 0,
                                     center top, 0.5,
@@ -289,7 +276,7 @@ notebook .pane-separator:hover,
     box-shadow: none;
 }
 
-.overshoot.top:backdrop {
+overshoot.top:backdrop {
     background-image: -gtk-gradient(radial,
                                     center top, 0,
                                     center top, 0.5,
@@ -303,7 +290,7 @@ notebook .pane-separator:hover,
     box-shadow: none;
 }
 
-.overshoot.bottom {
+overshoot.bottom {
     background-image: -gtk-gradient(radial,
                                     center bottom, 0,
                                     center bottom, 0.5,
@@ -322,7 +309,7 @@ notebook .pane-separator:hover,
     box-shadow: none;
 }
 
-.overshoot.bottom:backdrop {
+overshoot.bottom:backdrop {
     background-image: -gtk-gradient(radial,
                                     center bottom, 0,
                                     center bottom, 0.5,
@@ -336,7 +323,7 @@ notebook .pane-separator:hover,
     box-shadow: none;
 }
 
-.overshoot.left {
+overshoot.left {
     background-image: -gtk-gradient(radial,
                                     left center, 0,
                                     left center, 0.5,
@@ -355,7 +342,7 @@ notebook .pane-separator:hover,
     box-shadow: none;
 }
 
-.overshoot.left:backdrop {
+overshoot.left:backdrop {
     background-image: -gtk-gradient(radial,
                                     left center, 0,
                                     left center, 0.5,
@@ -369,7 +356,7 @@ notebook .pane-separator:hover,
     box-shadow: none;
 }
 
-.overshoot.right {
+overshoot.right {
     background-image: -gtk-gradient(radial,
                                     right center, 0,
                                     right center, 0.5,
@@ -388,7 +375,7 @@ notebook .pane-separator:hover,
     box-shadow: none;
 }
 
-.overshoot.right:backdrop {
+overshoot.right:backdrop {
     background-image: -gtk-gradient(radial,
                                     right center, 0,
                                     right center, 0.5,
@@ -403,7 +390,7 @@ notebook .pane-separator:hover,
 }
 
 /* result is disable undershoot */
-.undershoot.top {
+undershoot.top {
     background-color: transparent;
     background-image: linear-gradient(to left,
                                       rgba(255, 255, 255, 0.2) 50%,
@@ -414,7 +401,7 @@ notebook .pane-separator:hover,
     background-position: center top;
 }
 
-.undershoot.bottom {
+undershoot.bottom {
     background-color: transparent;
     background-image: linear-gradient(to left,
                                       rgba(255, 255, 255, 0.2) 50%,
@@ -425,7 +412,7 @@ notebook .pane-separator:hover,
     background-position: center bottom;
 }
 
-.undershoot.left {
+undershoot.left {
     background-color: transparent;
     background-image: linear-gradient(to top,
                                       rgba(255, 255, 255, 0.2) 50%,
@@ -436,7 +423,7 @@ notebook .pane-separator:hover,
     background-position: left center;
 }
 
-.undershoot.right {
+undershoot.right {
     background-color: transparent;
     background-image: linear-gradient(to top,
                                       rgba(255, 255, 255, 0.2) 50%,
@@ -454,7 +441,7 @@ notebook .pane-separator:hover,
 entry,
 .entry {
 	border-style: solid;
-	padding: 5px 4px 6px; /*4px;*/
+	padding: 4px; /*4px;*/
 
 	/* border-image defined in the -assets variants */
 
@@ -550,215 +537,154 @@ entry:active,
 	/* background-image in assets */
 }
 
-/*******************
- * Symbolic images *
- *******************/
-image,
-.image {
-	color: @internal_element_color;
-}
-
-image:hover,
-.image:hover {
-	color: @internal_element_prelight;
-}
+/*****************
+ * GtkSpinButton *
+ *****************/
 
-image:selected,
-image:selected:hover,
-.image:selected,
-.image:selected:hover {
-	color: @theme_selected_fg_color;
+spinbutton,
+spinbutton:focus {
+    background-image: linear-gradient(to bottom,
+                                      @entry_background_a,
+                                      @entry_background_b);
+    border-color: @borders;
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 3px;
+    padding: 0px;
 }
 
-view image,
-view image:hover,
-.view.image,
-.view.image:hover {
-	color: @view_symbolic_color;
+spinbutton:disabled {
+    background-color: @insensitive_bg_color;
+    background-image: none;
+    border-color: @borders;
 }
 
-view image:selected,
-view image:selected:hover,
-.view.image:selected,
-.view.image:selected:hover {
-	color: @theme_selected_fg_color;
+spinbutton button,
+spinbutton button:focus,
+spinbutton button:active,
+spinbutton button:focus:active,
+spinbutton button:disabled {
+    border-style: none;
+    border-image: none;
+    padding: 5px;
+    border-radius: 0px;
+    box-shadow: inset 1px 0 @inset_dark_color;
 }
 
-/*****************
- * GtkSpinButton *
- *****************/
-
 spinbutton button,
-.spinbutton .button {
-	background-color: transparent;
-	background-image: none;
-	color: @internal_element_color;
-	padding: 2px 6px;
-	border-width: 0;
-	border-radius: 0;
-	border-style: none;
-	border-image: none;
-	box-shadow: inset 1px 0 @inset_dark_color;
+spinbutton button:focus {
+    background-image: linear-gradient(to bottom,
+                                      @button_gradient_color_a,
+                                      @button_gradient_color_b);
+    background-color: transparent;
+    color: @internal_element_color;
 }
 
-spinbutton button:disabled,
-.spinbutton .button:disabled {
-	color: @internal_element_insensitive;
+spinbutton button:hover {
+    background-color: transparent;
+    background-image: linear-gradient(to bottom,
+                                      @button_hover_gradient_color_a,
+                                      @button_hover_gradient_color_b);
+    color: @internal_element_prelight;
 }
 
 spinbutton button:active,
-spinbutton button:hover,
-.spinbutton .button:active,
-.spinbutton .button:hover {
-	color: @internal_element_prelight;
+spinbutton button:active:hover {
+    background-image: linear-gradient(to bottom,
+                                      @button_active_gradient_color_a,
+                                      @button_active_gradient_color_b);
+    background-color: transparent;
+    color: @internal_element_prelight;
 }
 
-spinbutton button:first-child,
-.spinbutton .button:first-child {
-	border-radius: 3px 0 0 3px;
-	box-shadow: none;
+spinbutton button:disabled {
+    color: @internal_element_insensitive;
 }
 
-spinbutton button:last-child,
-.spinbutton .button:last-child {
-	border-radius: 0 3px 3px 0;
+spinbutton button:first-child {
+    border-radius: 0px;
 }
 
-spinbutton button:dir(rtl),
-.spinbutton .button:dir(rtl) {
-	box-shadow: inset -1px 0 @inset_dark_color;
+spinbutton button:last-child {
+    border-radius: 0 3px 3px 0;
 }
 
-/* Add back the glowy effect from the entry covered by the pushed button background*/
-spinbutton button:active,
-spinbutton button:active:focus,
-.spinbutton .button:active,
-.spinbutton .button:active:focus {
-	padding: 2px 4px;
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
+spinbutton button:dir(rtl) {
+    box-shadow: inset -1px 0 @inset_dark_color;
 }
 
-spinbutton button:first-child:active,
-spinbutton button:first-child:active:focus,
-.spinbutton .button:first-child:active,
-.spinbutton .button:first-child:active:focus {
-	padding: 2px 4px;
-	box-shadow: inset 1px 1px alpha(@theme_selected_bg_color, 0.2),
-		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
+spinbutton.horizontal entry,
+spinbutton.horizontal entry:focus,
+stack box.vertical.linked spinbutton.horizontal entry,
+stack box.vertical.linked spinbutton.horizontal entry:focus {
+    padding: 0px 10px 0px 2px;
+    border-image:none;
+    border-style: none;
+    box-shadow: inset 1px 0 @inset_dark_color;
 }
 
-spinbutton button:last-child:active,
-spinbutton button:last-child:active:focus,
-.spinbutton .button:last-child:active,
-.spinbutton .button:last-child:active:focus {
-	padding: 2px 4px;
-	box-shadow: inset 1px 0 @inset_dark_color,
-		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
-		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
+spinbutton.horizontal button,
+spinbutton.horizontal button:focus,
+stack box.vertical.linked spinbutton.horizontal button,
+stack box.vertical.linked spinbutton.horizontal button:focus {
+    padding: 0px 6px 0px 6px;
 }
 
-spinbutton.vertical button,
-.spinbutton.vertical .button {
-	padding: 4px;
-	-gtk-icon-shadow: 0 1px @button_text_shadow;
+spinbutton.vertical entry,
+spinbutton.vertical entry:focus {
+    padding: 6px 4px 6px 2px;
+    border-image:none;
+    border-style: solid;
+    border-width: 1px 0px 1px 0px;
+    border-color: @borders;
+    border-radius: 0px;
 }
 
 spinbutton.vertical button,
-spinbutton.vertical button:hover,
-.spinbutton.vertical .button,
-.spinbutton.vertical .button:hover {
-	padding: 4px;
-	color: @theme_fg_color;
+spinbutton.vertical button:focus {
+    border-color: @borders;
+    border-width: 0px;
+    border-style: solid;
+    padding: 5px;
+    color: @theme_fg_color;
 }
 
-spinbutton.vertical button:disabled,
-.spinbutton.vertical .button:disabled {
-	color: @insensitive_fg_color;
+spinbutton.vertical button:disabled {
+    color: @insensitive_fg_color;
+    -gtk-icon-shadow: none;
 }
 
 spinbutton.vertical button:active,
-.spinbutton.vertical .button:active {
-	color: @button_active_text;
-	-gtk-icon-shadow: 0 1px @button_active_text_shadow;
-}
-
-/* :disabled:disabled to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-spinbutton.vertical button:disabled:disabled,
-.spinbutton.vertical .button:disabled:disabled {
-	-gtk-icon-shadow: none;
+spinbutton.vertical button:hover:active {
+    color: @button_active_text;
+    -gtk-icon-shadow: 0 1px @button_active_text_shadow;
 }
 
 spinbutton.vertical button,
-spinbutton.vertical button:active:active,
-.spinbutton.vertical .button,
-/* :active:active to override the dark overriden style for
-   normal spinbutton buttons, yeah we lack !important */
-.spinbutton.vertical .button:active:active {
-	box-shadow: none;
-}
-
-spinbutton.vertical button:first-child,
-spinbutton.vertical button:active:first-child,
-.spinbutton.vertical .button:first-child,
-.spinbutton.vertical .button:active:first-child {
-	border-image-width: 3px 3px 0 3px;
-	border-width: 2px 1px 0 1px;
-	border-bottom-left-radius: 0; 
-	border-bottom-right-radius: 0;
-	padding: 4px;
+spinbutton.vertical button:active {
+    border-radius: 3px 3px 0 0;
 }
 
 spinbutton.vertical button:last-child,
-spinbutton.vertical button:active:last-child,
-.spinbutton.vertical .button:last-child,
-.spinbutton.vertical .button:active:last-child {
-	border-image-width: 0 3px 4px 3px;
-	border-width: 0 1px 2px 1px;
-	border-top-left-radius: 0; 
-	border-top-right-radius: 0;
-	padding: 4px;
+spinbutton.vertical button:active:last-child {
+    border-radius: 0 0 3px 3px;
 }
 
-spinbutton.vertical entry,
-.spinbutton.vertical.entry {
-	border-image: none;
-	border-color: alpha(@borders, 0.1);
-	border-width: 0 1px 0 1px;
-	border-style: solid;
-	border-radius: 0;
-	box-shadow: inset 1px 0 0 0 @borders, 
-		inset -1px 0 0 0 @borders,
-		inset 0 1px 0 0 @borders,
-		inset 0 -1px 0 0 @borders;
-
-	/* I'm using box-shadow as borders, so I need to compensate
-	   with padding. Those two values need to be entry padding +1 */
-	padding-top: 5px;
-	padding-bottom: 5px;
-}
-
-spinbutton.vertical entry:disabled,
-.spinbutton.vertical.entry:disabled {
-	border-color: alpha(@borders, 0.1);
-	box-shadow: inset 0 1px alpha(@borders, 0.4),
-		inset 0 -1px alpha(@borders, 0.4);
+stack box.vertical.linked spinbutton.horizontal {
+    border-radius: 0px;
 }
 
-spinbutton.vertical entry:focus,
-.spinbutton.vertical.entry:focus {
-	border-color: alpha(@borders, 0.1);
-	box-shadow: inset 1px 0 0 0 @theme_selected_bg_color, 
-		inset -1px 0 0 0 @theme_selected_bg_color,
-		inset 0 1px 0 0 @theme_selected_bg_color,
-		inset 0 -1px 0 0 @theme_selected_bg_color;
+stack box.vertical.linked spinbutton.horizontal button {
+    border-radius: 0px;
+    border-style: none;
+    box-shadow: inset 1px 0 @inset_dark_color;
 }
 
 /*****************
  * Color Chooser *
  *****************/
+colorswatch,
+colorswatch:selected,
 GtkColorSwatch,
 GtkColorSwatch:selected {
 	border-width: 1px;
@@ -772,57 +698,57 @@ GtkColorSwatch:selected {
 	background-clip: border-box;
 }
 
-GtkColorSwatch:hover,
-GtkColorSwatch:selected:hover {
+colorswatch:hover,
+colorswatch:selected:hover {
 	border-color: alpha(black, 0.45);
 }
 
-GtkColorSwatch.color-dark:hover {
+colorswatch.color-dark:hover {
 	background-image: linear-gradient(to bottom,
 		alpha(white, 0) 40%,
 		alpha(white, 0.3)
 		);
 }
 
-GtkColorSwatch.color-light:hover {
+colorswatch.color-light:hover {
 	background-image: linear-gradient(to top,
 		alpha(black, 0) 40%,
 		alpha(black, 0.1)
 		);
 }
 
-GtkColorSwatch.color-light:selected:hover,
-GtkColorSwatch.color-dark:selected:hover {
+colorswatch.color-light:selected:hover,
+colorswatch.color-dark:selected:hover {
 	background-image: none;
 }
 
-GtkColorSwatch.left,
-GtkColorSwatch:first-child {
+colorswatch.left,
+colorswatch:first-child {
 	border-top-left-radius: 6px;
 	border-bottom-left-radius: 6px;
 }
 
-GtkColorSwatch.right,
-GtkColorSwatch:last-child {
+colorswatch.right,
+colorswatch:last-child {
 	border-top-right-radius: 6px;
 	border-bottom-right-radius: 6px;
 }
 
-GtkColorSwatch:only-child {
+colorswatch:only-child {
 	border-radius: 6px;
 }
 
-GtkColorSwatch.top {
+colorswatch.top {
 	border-top-left-radius: 6px;
 	border-top-right-radius: 6px;
 }
 
-GtkColorSwatch.bottom {
+colorswatch.bottom {
 	border-bottom-left-radius: 6px;
 	border-bottom-right-radius: 6px;
 }
 
-GtkColorChooserWidget #add-color-button {
+colorchooser #add-color-button {
 	background-clip: padding-box;
 	border-color: mix(@borders, @theme_bg_color, 0.3);
 	background-color: mix(@borders, @theme_bg_color, 0.3);
@@ -830,7 +756,7 @@ GtkColorChooserWidget #add-color-button {
 	box-shadow: none;
 }
 
-GtkColorChooserWidget #add-color-button:hover {
+colorchooser #add-color-button:hover {
 	border-color: @borders;
 	background-color: @borders;
 	color: @theme_base_color;
@@ -855,12 +781,13 @@ GtkColorChooserWidget #add-color-button:hover {
 	color: #cccccc;
 }
 
-GtkColorEditor GtkColorSwatch {
+box.horizontal colorswatch,
+GtkColorEditor colorswatch {
 	border-radius: 6px;
 }
 
-GtkColorEditor GtkColorSwatch.color-dark:hover,
-GtkColorEditor GtkColorSwatch.color-light:hover {
+GtkColorEditor colorswatch.color-dark:hover,
+GtkColorEditor colorswatch.color-light:hover {
 	background-image: none;
 	border-color: alpha(black, 0.3);
 }
@@ -884,6 +811,14 @@ GtkProgressBar {
 	font-size: smaller;
 }
 
+progressbar.horizontal {
+    min-height: 16px;
+}
+
+progressbar.vertical {
+    min-width: 16px;
+}
+
 /* progress component */
 progressbar.horizontal trough,
 progressbar.horizontal progress {
@@ -918,25 +853,22 @@ progressbar progress.bottom {
 }
 
 progressbar progress,
-progressbar row,
-progressbar row:hover,
-progressbar row:selected,
-progressbar row:selected:focus,
+row progressbar,
+row:hover progressbar,
+row:selected progressbar,
+row:selected:focus progressbar,
 .progressbar,
 .progressbar row,
 .progressbar row:hover,
 .progressbar row:selected,
 .progressbar row:selected:focus {
-/*	border-radius: 16px; */
 	border-width: 1px;
-/*	min-height: 16px;
-	min-width: 16px; */
 	border-style: solid;
 	border-color: @progressbar_border;
 }
 
-progressbar row:selected,
-progressbar row:selected:focus,
+row:selected progressbar,
+row:selected:focus progressbar,
 .progressbar row:selected,
 .progressbar row:selected:focus {
 	border-color: shade(@progressbar_border, 0.85);
@@ -962,14 +894,16 @@ row trough,
 
 levelbar,
 GtkLevelBar {
-	-GtkLevelBar-min-block-width: 34;
-	-GtkLevelBar-min-block-height: 3;
+/*   -GtkLevelBar-min-block-width: 34;
+    -GtkLevelBar-min-block-height: 3; deprecated */
+    min-width: 34px;
+    min-height: 3px;
 }
 
 levelbar.vertical,
 GtkLevelBar.vertical {
-	-GtkLevelBar-min-block-width: 3;
-	-GtkLevelBar-min-block-height: 34;
+    min-width: 3px;
+    min-height: 34px;
 }
 
 levelbar trough,
@@ -1083,7 +1017,7 @@ scale.vertical trough,
 }
 
 scale trough,
-scale trough.highlight,
+scale trough highlight,
 .scale.trough,
 .scale.trough.highlight {
 	border-color: alpha(@theme_base_color, 0.0);
@@ -1094,7 +1028,7 @@ scale trough.highlight,
 }
 
 scale.vertical trough,
-scale.vertical trough.highlight,
+scale.vertical trough highlight,
 .scale.trough.vertical,
 .scale.trough.highlight.vertical {
 	border-color: alpha(@theme_base_color, 0.0);
@@ -1111,29 +1045,35 @@ scale.vertical trough,
 	border-color: @borders;
 }
 
-scale trough.highlight,
-scale.vertical trough.highlight,
+scale trough highlight,
+scale.vertical trough highlight,
 .scale.trough.highlight,
 .scale.trough.highlight.vertical {
 	border-color: @scale_highlight_border;
 }
 
 scale trough:disabled,
-scale trough.highlight:disabled,
 scale.vertical trough:disabled,
-scale.vertical trough.highlight:disabled,
 .scale.trough:disabled,
+.scale.trough.vertical:disabled {
+	background-color: shade(@insensitive_bg_color, 0.96);
+	border-color: shade(@insensitive_scale_borders, 1.0);
+	box-shadow: none;
+	background-image: none;
+}
+
+scale trough highlight:disabled,
+scale.vertical trough highlight:disabled,
 .scale.trough.highlight:disabled,
-.scale.trough.vertical:disabled,
 .scale.trough.highlight.vertical:disabled {
-	background-color: shade(@insensitive_bg_color, 0.96);
+	background-color: shade(@scale_highlight_bg, 1.16);
 	border-color: shade(@insensitive_scale_borders, 1.0);
 	box-shadow: none;
 	background-image: none;
 }
 
-scale trough.highlight,
-scale.vertical trough.highlight,
+scale trough highlight,
+scale.vertical trough highlight,
 .scale.trough.highlight,
 .scale.trough.vertical.highlight {
 	background-image: none;
@@ -1163,13 +1103,13 @@ scale.vertical trough,
 		inset -1px 0 alpha(@theme_base_color, 0.4);
 }
 
-scale trough.highlight,
+scale trough highlight,
 .scale.trough.highlight {
 	box-shadow: inset 0 1px alpha(@theme_base_color, 0.2),
 		inset 0 -1px shade(@theme_selected_bg_color, 0.7);
 }
 
-scale.vertical trough.highlight,
+scale.vertical trough highlight,
 .scale.trough.vertical.highlight {
 	box-shadow: inset 1px 0 alpha(@theme_base_color, 0.2),
 		inset -1px 0 shade(@theme_selected_bg_color, 0.7);
@@ -1198,7 +1138,7 @@ frame action-bar,
 	border-width: 1px 0 0; 
 }
 
-scrolledwindow,
+scrolledwindow.frame,
 GtkScrolledWindow.frame {
     -gtk-icon-style: regular;
 	border-style: solid;
@@ -1209,12 +1149,17 @@ GtkScrolledWindow.frame {
 }
 
 /* avoid double borders when a viewport is 
- * packed into a GtkScrolledWindow */
-scrolledwindow viewport,
+ * packed into a GtkScrolledWindow, + avoid double borders in general */
+scrolledwindow viewport.frame,
+frame box stack scrolledwindow,
 GtkScrolledWindow viewport.frame {
 	border-style: none;
 }
 
+frame box.vertical scrolledwindow.frame {
+    border-width: 1px 0px 1px 0px;
+}
+
 /***********
  * Buttons *
  ***********/
@@ -1245,15 +1190,15 @@ toolbar.primary-toolbar button.image-button,
 button,
 .button {
 	transition: all 400ms ease-out;
-	-GtkButton-image-spacing: 4;
-	-GtkButton-interior-focus: true;
-	-GtkButton-default-border: 0;
-	-GtkButton-inner-border: 3;
-	-GtkArrow-arrow-scaling: 0.5; /* deprecated, but ignored */
-
+    min-height: 16px;
+    min-width: 16px;
+/*	-GtkButton-image-spacing: 4; deprecated, but ignored */
+/*	-GtkButton-interior-focus: true; deprecated, but ignored */
+/*	-GtkButton-default-border: 0; deprecated, but ignored */
+/*	-GtkButton-inner-border: 3; deprecated, but ignored */
+/*	-GtkArrow-arrow-scaling: 0.5; deprecated, but ignored */
 	border-style: solid;
 	border-color: transparent;
-
 	text-shadow: 0 1px @button_text_shadow;
 }
 
@@ -1291,6 +1236,17 @@ button.image-button.circular-button,
    border-color: @borders;
 }
 
+/* arrows */
+#gtk-toolbar-arrow,
+button.toggle.popup image {
+    color: @menu_controls_color;
+}
+
+#gtk-toolbar-arrow:disabled,
+button.toggle.popup image:disabled {
+    color: @insensitive_fg_color;
+}
+
 /* We may want a background for focused buttons, but in the meantime let's remove it too */
 toolbar.primary-toolbar button,
 toolbar.primary-toolbar button:disabled,
@@ -2321,7 +2277,7 @@ GtkCalendar.header .stack-switcher > .button.titlebutton > GtkImage {
 
 stackswitcher > button.text-button,
 .stack-switcher > .button.text-button {
-	padding: 5px 10px 6px; 
+	padding: 5px 10px 6px;
 }
 
 stackswitcher > button.image-button,
@@ -2372,6 +2328,45 @@ stackswitcher > button.needs-attention:checked > image,
 	background-image: none; 
 }
 
+stackswitcher  > button:dir(ltr).text-button.radio,
+stackswitcher  > button:dir(ltr).text-button.radio:hover,
+stackswitcher  > button:dir(ltr).text-button.radio:hover:active,
+stackswitcher  > button:dir(ltr).text-button.radio:active,
+stackswitcher  > button:dir(ltr).text-button.radio:checked,
+stackswitcher  > button:dir(ltr).text-button.radio:checked:hover,
+stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active  {
+    padding: 5px 10px 6px;
+    border-width: 1px 0px 1px 0px;
+    border-image-width: 3px 0px 4px 0;
+    border-style: solid;
+    border-color: @borders;
+    border-radius: 0px;
+}
+
+stackswitcher  > button:dir(ltr).text-button.radio:first-child,
+stackswitcher  > button:dir(ltr).text-button.radio:hover:first-child,
+stackswitcher  > button:dir(ltr).text-button.radio:hover:active:first-child,
+stackswitcher  > button:dir(ltr).text-button.radio:active:first-child,
+stackswitcher  > button:dir(ltr).text-button.radio:checked:first-child,
+stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:first-child,
+stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active:first-child {
+    border-width: 1px 0px 1px 1px;
+    border-image-width: 3px 0 4px 3px;
+    border-radius: 3px 0px 0px 3px;
+}
+
+stackswitcher  > button:dir(ltr).text-button.radio:last-child,
+stackswitcher  > button:dir(ltr).text-button.radio:hover:last-child,
+stackswitcher  > button:dir(ltr).text-button.radio:hover:active:last-child,
+stackswitcher  > button:dir(ltr).text-button.radio:active:last-child,
+stackswitcher  > button:dir(ltr).text-button.radio:checked:last-child,
+stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:last-child,
+stackswitcher  > button:dir(ltr).text-button.radio:checked:hover:active:last-child {
+    border-width: 1px 1px 1px 0px;
+    border-image-width: 3px 3px 4px 0;
+    border-radius: 0px 3px 3px 0px;
+}
+
 /*****************
  * Notebooks and *
  * tabs          *
@@ -2386,7 +2381,7 @@ notebook,
     border-width: 0px;
     background-color: shade (@theme_bg_color, 1.1);
 /*    -GtkNotebook-initial-gap: 0; */
-/*    -GtkNotebook-arrow-spacing: 5; *//* deprecated, but ignored */
+/*    -GtkNotebook-arrow-spacing: 5; deprecated */
 /*    -GtkNotebook-tab-curvature: 0;
     -GtkNotebook-tab-overlap: 0;
     -GtkNotebook-has-tab-gap: false;
@@ -2396,7 +2391,7 @@ notebook,
 
 notebook :hover,
 .notebook :hover {
-    -gtk-image-effect: highlight; /* deprecated, but ignored */
+    -gtk-icon-effect: highlight; /* deprecated, but ignored */
     color: @theme_fg_color;
 }
 
@@ -2426,31 +2421,38 @@ notebook header,
                                       shade(@theme_bg_color, 0.96),
                                       shade(@theme_bg_color, 1.0));
     border-width: 0px;
-    box-shadow: inset 0 1px 0 0 alpha(@borders, 0.4), inset 0 -1px 0 0 alpha(@borders, 1.0);
 }
 
 notebook header.top,
 .notebook.header.top {
     border-width: 1px;
-    border-radius: 4px 4px 0px 0px;
+    border-radius: 0px;
+    box-shadow: inset  0px  1px 0 0 alpha(@borders, 0.4),
+                inset  0px -1px 0 0 alpha(@borders, 0.4);
 }
 
 notebook header.bottom,
 .notebook.header.bottom {
     border-width: 1px;
-    border-radius: 0px 0px 4px 4px;
+    border-radius: 0px;
+    box-shadow: inset  0px  1px 0 0 alpha(@borders, 0.4),
+                inset  0px -1px 0 0 alpha(@borders, 0.4);
 }
 
 notebook header.left,
 .notebook.header.left {
     border-width: 1px;
-    border-radius: 4px 0px 0px 4px;
+    border-radius: 0px;
+    box-shadow: inset  1px  0px alpha(@borders, 0.4),
+                inset -1px  0px alpha(@borders, 0.4);
 }
 
 notebook header.right,
 .notebook.header.right {
     border-width: 1px;
-    border-radius: 0px 4px 4px 0px;
+    border-radius: 0px;
+    box-shadow: inset  1px  0px alpha(@borders, 0.4),
+                inset -1px  0px alpha(@borders, 0.4);
 }
 
 notebook viewport,
@@ -2487,10 +2489,18 @@ notebook header tab .active-page label,
     color: @theme_fg_color;
 }
 
+/* tabs in caja and pluma */
+notebook header tab {
+    padding: 4px;
+    border-style: solid;
+    border-width: 0px 1px 0px 1px;
+    border-color: transparent;
+}
+
 /* horizontal tabs */
 
-notebook header.top tab,
-notebook header.bottom tab,
+notebook.frame header.top tab,
+notebook.frame header.bottom tab,
 .notebook tab.top,
 /* wtf, why this doesn't work? */
 .notebook tab.bottom {
@@ -2557,8 +2567,8 @@ notebook header.bottom tab:hover,
 
 /* vertical tabs */
 
-notebook header.left tab,
-notebook header.right tab,
+notebook.frame header.left tab,
+notebook.frame header.right tab,
 .notebook tab.left,
 .notebook tab.right {
     padding: 5px 20px;
@@ -2639,6 +2649,7 @@ notebook tab.reorderable-page:active,
 }
 
 /* close button styling */
+notebook button.flat,
 notebook button.flat.small-button,
 .notebook tab .button {
     color: mix (@theme_fg_color, @theme_bg_color, 0.85);
@@ -2663,6 +2674,7 @@ notebook .active-page button.flat.small-button,
     -gtk-icon-shadow: 0 1px @button_text_shadow;
 }
 
+notebook button.flat:hover,
 notebook button.flat.small-button:hover,
 .notebook tab .button:hover {
     color: @theme_fg_color;
@@ -2672,6 +2684,8 @@ notebook button.flat.small-button:hover,
     background-color: transparent;
 }
 
+notebook button.flat:active,
+notebook button.flat:active:hover,
 notebook button.flat.small-button:active,
 notebook button.flat.small-button:active:hover,
 .notebook tab .button:active,
@@ -2688,22 +2702,26 @@ notebook button.flat.small-button:active:hover,
 
 notebook header.top tabs arrow.up,
 notebook header.bottom tabs arrow.up {
-      -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+    color: @menu_controls_color;
 }
 
 notebook header.top tabs arrow.down,
 notebook header.bottom tabs arrow.down {
-      -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+    color: @menu_controls_color;
 }
 
 notebook header.left tabs arrow.up,
 notebook header.right tabs arrow.up {
-      -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+    -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
+    color: @menu_controls_color;
 }
 
 notebook header.left tabs arrow.down,
 notebook header.right tabs arrow.down {
-      -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+    color: @menu_controls_color;
 }
 
 notebook header tabs arrow,
@@ -2745,8 +2763,8 @@ notebook header tabs arrow:disabled,
 combobox,
 GtkComboBox {
 	padding: 0;
-	-GtkComboBox-arrow-scaling: 0.5; /* deprecated, but ignored */
-	-GtkComboBox-shadow-type: none;
+/*	-GtkComboBox-arrow-scaling: 0.5; deprecated */
+/*	-GtkComboBox-shadow-type: none; deprecated */
 	text-shadow: 0 1px @button_text_shadow;
 }
 
@@ -2759,7 +2777,7 @@ GtkComboBox:disabled {
 combobox separator,
 GtkComboBox .separator {
 	/* always disable separators */
-	-GtkWidget-wide-separators: true; /* deprecated, but ignored */
+/*	-GtkWidget-wide-separators: true; deprecated */
 	-GtkWidget-horizontal-separator: 0;
 	-GtkWidget-vertical-separator: 0;
 }
@@ -2865,10 +2883,20 @@ GtkComboBox .button {
     color: @theme_fg_color;
 }
 
+combobox.linked button.combo,
+combobox.linked button.combo:checked {
+	border-right-width: 2px;
+	border-left-width: 0;
+	border-image-width: 3px 4px 4px 0;
+	border-bottom-left-radius: 0;
+	border-top-left-radius: 0;
+}
+
 combobox arrow {
-  -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
-  min-height: 16px;
-  min-width: 16px;
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+    color: @menu_controls_color;
+    min-height: 16px;
+    min-width: 16px;
 }
 
 /********************
@@ -2877,12 +2905,12 @@ combobox arrow {
 
 button.font separator,
 GtkFileChooserButton separator,
-GtkFileChooserWidget horizontal.separator,
+filechooser horizontal.separator,
 GtkFontButton .separator,
 GtkFileChooserButton .separator,
 GtkFileChooserWidget horizontal.separator {
 	/* always disable separators */
-	-GtkWidget-wide-separators: true; /* deprecated, but ignored */
+/*	-GtkWidget-wide-separators: true; deprecated */
 	-GtkWidget-horizontal-separator: 0;
 	-GtkWidget-vertical-separator: 0;
 }
@@ -2897,11 +2925,6 @@ GtkFileChooserButton GtkImage:last-child {
 	color: @internal_element_color;
 }
 
-GtkFileChooserWidget.vertical GtkPaned.horizontal {
-    -GtkPaned-handle-size: 3px;
-    border-color: transparent;
-}
-
 /**************
  * Scrollbars *
  **************/
@@ -3205,7 +3228,7 @@ menubar menuitem:hover,
 menu menuitem,
 .menu .menuitem {
     background-color: transparent;
-    -GtkMenuItem-arrow-scaling: 0.6; /* deprecated, but ignored */
+/*    -GtkMenuItem-arrow-scaling: 0.6; deprecated */
     transition: all 150ms ease-out;
     padding: 6px 5px;
 }
@@ -3267,14 +3290,32 @@ GtkModelMenuItem GtkBox GtkImage {
 
 menuitem arrow,
 .menuitem.arrow {
-	color: @menu_controls_color;
+    min-height: 16px;
+    min-width: 16px;
+    margin-left: 10px;
+    color: @menu_controls_color;
+}
+
+menu menuitem arrow:dir(ltr) {
+	-gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+}
+
+menu menuitem arrow:dir(rtl) {
+        -gtk-icon-source: -gtk-icontheme("pan-end-symbolic-rtl");
+}
+
+menu arrow.top {
+      -gtk-icon-source: -gtk-icontheme("pan-up-symbolic");
+}
+
+menu arrow.bottom {
+      -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
 }
 
 menuitem separator,
 .menuitem.separator {
 	color: @menu_separator;
-
-	-GtkMenuItem-horizontal-padding: 0; /* deprecated, but ignored */
+/*	-GtkMenuItem-horizontal-padding: 0; deprecated */
 }
 
 menuitem check,
@@ -3291,6 +3332,9 @@ menuitem radio:disabled,
 .menuitem.radio:disabled {
 	background-image: none;
 	background-color: transparent;
+	min-height: 12px;
+	min-width: 12px;
+	background-position: center center;
 }
 
 menuitem check:checked,
@@ -3447,6 +3491,11 @@ radio:disabled,
 	border-style: none;
 }
 
+check,
+radio {
+	padding: 0px 6px 0px 0px;
+}
+
 checkbutton:hover,
 checkbutton:active:hover,
 checkbutton:selected,
@@ -3898,6 +3947,7 @@ toolbar.inline-toolbar.vertical:last-child,
 /***********
  * Sidebar *
  ***********/
+.sidebar .view,
 placessidebar .view,
 .sidebar,
 GtkPlacesSidebar.sidebar .view {
@@ -4344,9 +4394,15 @@ progressbar .osd,
 .osd GtkProgressBar,
 GtkProgressBar.osd {
 	padding: 0;
-	-GtkProgressBar-xspacing: 0;
-	-GtkProgressBar-yspacing: 3px;
-	-GtkProgressBar-min-horizontal-bar-height: 3px;
+/*	-GtkProgressBar-xspacing: 0; deprecated */
+/*	-GtkProgressBar-yspacing: 3px; deprecated */
+/*	-GtkProgressBar-min-horizontal-bar-height: 3px; deprecated */
+	min-height: 3px;
+}
+
+.osd progressbar.horizontal,
+progressbar.horizontal .osd {
+	min-height: 3px;
 }
 
 .osd progressbar trough,
@@ -5450,6 +5506,8 @@ GtkTreeView.view.expander:checked {
 
 expander arrow,
 GtkExpander {
+    min-width: 16px;
+    min-height: 16px;
     -gtk-icon-style: regular;
 	-gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
 }
@@ -5518,48 +5576,57 @@ list,
 }
 
 list row,
+list row.activatable,
 .list-row {
     padding: 2px;
     transition: all 200ms ease-in;
-	background-image: none;
-	background-color: @theme_base_color;
+    background-image: none;
+    background-color: @theme_base_color;
 }
 
 list row:hover,
+list row.activatable:hover,
 .list-row:hover {
-	background-image: none;
-	background-color: shade (@theme_selected_bg_color, 1.55);
-	color: shade (@theme_selected_bg_color, 0.35);
+    padding: 2px;
+    background-image: none;
+    background-color: shade (@theme_selected_bg_color, 1.55);
+    color: shade (@theme_selected_bg_color, 0.35);
 }
 
 list row:selected,
 list row:selected:hover,
+list row.activatable:selected,
+list row.activatable:selected:hover,
 .list-row:selected,
 .list-row:selected:hover {
-	border-width: 0;
-	border-style: solid;
-	border-color: shade (@theme_selected_bg_color, 0.85);
-	background-color: @theme_selected_bg_color;
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	box-shadow: none;
-	color: @theme_selected_fg_color;
+    padding: 2px;
+    border-width: 0;
+    border-style: solid;
+    border-color: shade (@theme_selected_bg_color, 0.85);
+    background-color: @theme_selected_bg_color;
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 1.0),
+                                      shade (@theme_selected_bg_color, 0.85));
+    box-shadow: none;
+    color: @theme_selected_fg_color;
 }
 
 list row:selected:backdrop,
 list row:selected:backdrop:hover,
+list row.activatable:selected:backdrop,
+list row.activatable:selected:backdrop:hover,
 .list-row:selected:backdrop,
 .list-row:selected:backdrop:hover {
-	border-width: 0;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 0.94),
-		shade (@theme_selected_bg_color, 0.94));
-	color: @theme_fg_color;
-	text-shadow: none;
-	box-shadow: none;
+    padding: 2px;
+    border-width: 0;
+    border-style: solid;
+    border-color: shade (@theme_bg_color, 0.85);
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 0.94),
+                                      shade (@theme_selected_bg_color, 0.94));
+    color: @theme_fg_color;
+    text-shadow: none;
+    box-shadow: none;
 }
 
 list row button,
@@ -6040,6 +6107,7 @@ cursor-handle.top,
 .entry.cursor-handle.top,
 .cursor-handle.top {
 	-gtk-icon-source: -gtk-icontheme("selection-start-symbolic");
+    color: @menu_controls_color;
 }
 
 entry cursor-handle.bottom,
@@ -6047,6 +6115,7 @@ cursor-handle.bottom,
 .entry.cursor-handle.bottom,
 .cursor-handle.bottom {
 	-gtk-icon-source: -gtk-icontheme("selection-end-symbolic");
+    color: @menu_controls_color;
 }
 
 /*******
@@ -6182,10 +6251,66 @@ messagedialog.csd decoration,
 }
 
 /* print dialog */
+printdialog.background .vertical.view.dialog-vbox,
 GtkPrintUnixDialog.background .vertical.view.dialog-vbox {
     background-color: shade (@theme_bg_color, 1.1)
 }
 
+/* filechooser dialog */
+filechooser revealer .vertical.view {
+    background-color: @theme_bg_color;
+    border-style: solid;
+    border-width: 1px 1px 0px 1px;
+    border-color: @borders;
+}
+
+filechooser placessidebar.sidebar.frame {
+    border-style: solid;
+}
+
+/* calendar */
+/* this makes no sense for gtk+-3.20 :) */
+calendar.button {
+  background-image: none;
+}
+
+calendar {
+  border-color: @borders;
+}
+
+/*********
+ * Paned *
+ *********/
+
+/* the small line between sidebar and view */
+paned > separator {
+    min-width: 3px;
+    min-height: 3px;
+    -gtk-icon-source: none;
+    border-style: none;
+    background-color: @theme_bg_color;
+    background-size: 1px 1px;
+ }
+
+paned > separator:hover,
+paned > separator:selected {
+    background-color: transparent;
+}
+
+paned > separator:backdrop {
+}
+
+paned > separator.wide {
+    margin: 0;
+    padding: 0;
+    min-width: 5px;
+    min-height: 5px;
+    background-size: 1px 1px, 1px 1px;
+}
+
+paned > separator.wide:backdrop {
+}
+
 /* Various hacks and shit */
 /* FIXME - BELOW: Some stuff that can probably be done better or in another way */
 
@@ -6241,11 +6366,9 @@ GtkPrintUnixDialog.background .vertical.view.dialog-vbox {
 .floating-bar .button {
 	background-color: alpha (@theme_base_color, 0.0);
 	background-image: none;
-
 	border-style: none;
 	border-image: none;
-
-	-GtkButton-image-spacing: 0;
-	-GtkButton-inner-border: 0;
+/*	-GtkButton-image-spacing: 0;
+	-GtkButton-inner-border: 0; deprecated */
 }
 
diff --git a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
index 82bb43c1..126a427b 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
@@ -2,72 +2,15 @@
  * CAJA File manager *
  *********************/
 
-/* for breadcrumbs path bar */
-
-.caja-pathbar-button,
-CajaPathbarButton {
-    background-image: -gtk-gradient(linear, left top, left bottom,
-                                    color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-                                    color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-                                    color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)),
-                                    color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90)));
-    border-color: #979797;
-    color: @theme_fg_color;
-    -CajaPathbarButton-border-radius: 3px;
-}
-
-CajaPathbarButton:active {
-    background-image: -gtk-gradient(linear, left top, left bottom,
-                                    color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)),
-                                    color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)),
-                                    color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0)));
-}
-
-CajaPathbarButton:hover {
-    background-image: -gtk-gradient(linear, left top, left bottom,
-                                    color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-                                    color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-                                    color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)),
-                                    color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85)));
-}
-
-CajaPathbarButton:active:hover {
-    background-image: -gtk-gradient(linear, left top, left bottom,
-                                    color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)),
-                                    color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)),
-                                    color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)));
-}
-
-/* For Places Sidebar diskfull indicators */
-CajaPlacesTreeView {
-    -CajaPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
-    -CajaPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
-    -CajaPlacesTreeView-disk-full-bar-width: 2px;
-    -CajaPlacesTreeView-disk-full-bar-radius: 1px;
-    -CajaPlacesTreeView-disk-full-bottom-padding: 1px;
-    -CajaPlacesTreeView-disk-full-max-length: 70px;
-}
-
-CajaPlacesTreeView:selected {
-    -CajaPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0);
-    -CajaPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0);
-}
-
-CajaPlacesTreeView:hover {
-}
-
-CajaPlacesTreeView:selected:hover {
-}
-
 /* Caja places combobox */
-CajaWindow .button.flat {
+.caja-navigation-window .caja-side-pane button.flat {
     background-color: transparent;
     background-image: linear-gradient(to bottom,
                                       @button_gradient_color_a,
                                       @button_gradient_color_b);
 }
 
-CajaWindow .button.flat:first-child {
+.caja-navigation-window .caja-side-pane button.flat:first-child {
     transition: all 400ms ease-out;
     border-radius: 3px 0 0 3px;
     border-right-width: 0;
@@ -75,7 +18,7 @@ CajaWindow .button.flat:first-child {
     border-image: url("borders/button.png") 3 4 4 3 / 3px 0px 4px 3px stretch;
 }
 
-CajaWindow .button.flat:last-child {
+.caja-navigation-window .caja-side-pane button.flat:last-child {
     transition: all 400ms ease-out;
     border-radius: 0 3px 3px 0;
     border-left-width: 0;
@@ -83,14 +26,14 @@ CajaWindow .button.flat:last-child {
     border-image: url("borders/button.png") 3 3 4 4 / 3px 3px 4px 0px stretch;
 }
 
-CajaWindow .button.flat:hover {
+.caja-navigation-window .caja-side-pane button.flat:hover {
     background-color: transparent;
     background-image: linear-gradient(to bottom,
                                       @button_hover_gradient_color_a,
                                       @button_hover_gradient_color_b);
 }
 
-CajaWindow .button.flat:hover:first-child {
+.caja-navigation-window .caja-side-pane button.flat:hover:first-child {
     border-radius: 6px 0 0 6px;
     border-right-width: 0;
     background-color: transparent;
@@ -100,7 +43,7 @@ CajaWindow .button.flat:hover:first-child {
     border-image: url("borders/button.png") 3 3 4 3 / 3px 0px 4px 3px stretch;
 }
 
-CajaWindow .button.flat:hover:last-child  {
+.caja-navigation-window .caja-side-pane button.flat:hover:last-child  {
     border-radius: 0 6px 6px 0;
     border-left-width: 0;
     background-color: transparent;
@@ -112,9 +55,9 @@ CajaWindow .button.flat:hover:last-child  {
 
 /* 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 {
+.caja-navigation-window toolbar.primary-toolbar button.flat,
+.caja-navigation-window toolbar.primary-toolbar button.flat:first-child,
+.caja-navigation-window toolbar.primary-toolbar button.flat:last-child {
     transition: all 400ms ease-out;
     border-width: 3px;
     background-color: transparent;
@@ -125,7 +68,7 @@ CajaWindow .primary-toolbar .button.flat:last-child {
 }
 
 /* zoom button */
-CajaWindow .primary-toolbar .button.flat:hover {
+.caja-navigation-window toolbar.primary-toolbar button.flat:hover {
     border-width: 3px;
     background-color: transparent;
     background-image: linear-gradient(to bottom,
@@ -135,34 +78,30 @@ CajaWindow .primary-toolbar .button.flat:hover {
 }
 
 /* ComboBox views */
-CajaWindow .toolbar GtkComboBox .button {
-    background-image: linear-gradient(to bottom,
-                                      shade (@theme_bg_color, 1.0),
-                                      shade (@theme_bg_color, 0.96));
-    padding: 4px 4px;
-}
-
-CajaWindow .toolbar GtkComboBox .button:hover {
+.caja-navigation-window toolbar.primary-toolbar combobox button.combo {
     background-image: linear-gradient(to bottom,
                                       @button_gradient_color_a,
                                       @button_gradient_color_b);
     border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-    padding: 4px 4px;
+    padding: 6px 4px;
 }
 
-/* to avoid padding when executing toogle button */
-CajaLocationBar .entry {
-    padding: 4px;
+.caja-navigation-window toolbar.primary-toolbar combobox button.combo:hover {
+    background-image: linear-gradient(to bottom,
+                                      @button_hover_gradient_color_a,
+                                      @button_hover_gradient_color_b);
+    border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+    padding: 6px 4px;
 }
 
-/* the small line between sidebar and view */
-CajaWindow GtkPaned.horizontal {
+/* the small line between sidebar and view , now in gtk-widgets 'paned'*//*
+.caja-navigation-window paned.horizontal {
     -GtkPaned-handle-size: 3px;
     border-color: transparent;
     background-color: @theme_bg_color;
 }
 
-/* caja sidebar */
+*//* caja sidebar *//*
 CajaWindow FMTreeView .view,
 CajaWindow CajaNotesViewer .view,
 CajaWindow CajaPlacesSidebar .view,
@@ -171,8 +110,16 @@ CajaWindow CajaInformationPanel GtkVBox,
 CajaWindow CajaEmblemSidebar GtkViewport {
     background-color: shade (@theme_bg_color, 1.08);
     color: @theme_fg_color;
+}*/
+/* 3.20 emblems are broken */
+/* places, treeview, history, information and notes */
+.caja-side-pane treeview.view,
+.caja-side-pane textview.view text {
+    background-color: shade (@theme_bg_color, 1.08);
+    color: @theme_fg_color;
 }
 
+.caja-side-pane treeview.view:selected:hover,
 CajaWindow CajaPlacesSidebar .view row:active:hover,
 CajaWindow CajaPlacesSidebar .view row:checked:hover,
 CajaWindow CajaPlacesSidebar .view row:selected:hover,
@@ -185,46 +132,29 @@ CajaWindow FMTreeView .view row:selected:hover {
     color: shade (@theme_selected_fg_color, 1.00);
 }
 
+.caja-side-pane treeview.view:hover,
 CajaWindow CajaPlacesSidebar .view row:hover,
 CajaWindow FMTreeView .view row:hover,
 CajaWindow CajaHistorySidebar .view row:hover {
     background-color: shade (@theme_selected_bg_color, 1.15);
-    color: shade (@theme_selected_bg_color, 0.35);
+    color: shade (@theme_selected_fg_color, 1.00);
 }
 
+/* What is that? */
 CajaWindow .rubberband,
 CajaWindow .view.rubberband {
     background-color: alpha (@theme_selected_bg_color, 0.35);
 }
 
-CajaWindow CajaPlacesSidebar .frame {
-    border-right-width: 1px;
-    border-style: solid;
-    border-color: shade (@theme_bg_color, 0.90);
-    border-left: none;
-    border-top: none;
-    border-bottom: none;
-}
-
 /* moved eject button to left better for overlay scrollbars */
+.caja-side-pane treeview.view,
 CajaWindow CajaPlacesSidebar .view row {
-    padding: 0px 4px 0px 0px;
-}
-
-CajaWindow CajaPlacesSidebar row:selected {
-    color: @theme_selected_fg_color;
-}
-
-CajaWindow CajaPlacesSidebar row:backdrop:selected {
-    color: @theme_fg_color;
-    text-shadow: none; 
-}
-
-CajaWindow CajaPlacesSidebar row:hover {
-    background-color: shade (@theme_bg_color, 0.97);
+    padding: 1px 4px 1px 0px;
 }
 
 /* better for overlay scrollbars */
+.caja-side-pane treeview.view .vertical.scrollbar.overlay-indicator,
+.caja-side-pane textview.view text .vertical.scrollbar.overlay-indicator,
 CajaWindow FMTreeView .vertical.scrollbar.overlay-indicator,
 CajaWindow CajaNotesViewer .vertical.scrollbar.overlay-indicator,
 CajaWindow CajaPlacesSidebar .vertical.scrollbar.overlay-indicator,
@@ -233,21 +163,87 @@ CajaWindow CajaHistorySidebar .vertical.scrollbar.overlay-indicator {
 	-GtkRange-slider-width: 11;
 }
 
+.caja-side-pane notebook {
+    border-style: none;
+}
+
+/* view and desktop mode */
 .caja-canvas-item {
     border-radius: 3px;
+    color: @theme_fg_color;
+}
+
+.caja-canvas-item:active,
+.caja-canvas-item:selected {
+    color: @theme_selected_fg_color;
+}
+
+/* view mode */
+
+/* list view 3.20 */
+.caja-notebook treeview.view,
+/* view and compact 3.20 */
+.caja-notebook scrolledwindow.frame {
+    background-color: @theme_base_color;
+}
+
+/* rows in listview */
+.caja-notebook treeview.view:selected,
+.caja-notebook treeview.view:selected:hover {
+    background-color: @theme_selected_bg_color;
+}
+
+.caja-notebook treeview.view:hover {
+    background-color: shade (@theme_selected_bg_color, 1.55);
+    color: shade (@theme_selected_bg_color, 0.35);
 }
 
-/* view */
+.caja-notebook .caja-canvas-item,
 CajaNavigationWindow.background .view.caja-canvas-item {
     color: @theme_fg_color;
 }
 
+.caja-notebook .caja-canvas-item:active,
+.caja-notebook .caja-canvas-item:selected,
 CajaNavigationWindow.background .view.caja-canvas-item:active,
 CajaNavigationWindow.background .view.caja-canvas-item:selected {
     color: @theme_selected_fg_color;
 }
 
+.caja-notebook {
+    border-style: none;
+}
+
+.caja-notebook frame {
+    border-width: 1px 1px 0 1px;
+}
+
 /* desktop mode */
+/* 3.20 */
+/* desktop */
+.caja-desktop.caja-canvas-item {
+    color: @theme_selected_fg_color;
+    text-shadow: 1px 1px alpha (#000000, 0.8);
+}
+
+.caja-desktop.caja-canvas-item:selected {
+    background-color: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
+    text-shadow: none;
+}
+
+.caja-desktop.caja-canvas-item:active,
+.caja-desktop.caja-canvas-item:hover {
+    text-shadow: none;
+}
+
+.caja-desktop EelEditableLabel.entry {
+   border-image: none;
+   border-width: 1px;
+   text-shadow: none;
+}
+
+/*
 CajaDesktopWindow.background FMIconContainer.view EelEditableLabel.entry {
    border-image: none;
    border-width: 1px;
@@ -265,23 +261,25 @@ CajaDesktopWindow.background .caja-canvas-item:selected {
 }
 
 CajaDesktopWindow.background .caja-canvas-item:active,
-CajaDesktopWindow.background .caja-canvas-item:prelight,
+CajaDesktopWindow.background .caja-canvas-item:hover,
 CajaDesktopWindow.background .caja-canvas-item:selected {
     text-shadow: none;
 }
-
+*/
 /* inactive pane */
-
+/* not implemented yet *//*
 .caja-inactive-pane .view {
     background-color: shade(@theme_base_color, 0.9);
 }
+*/
 
 /* Toolbar */
-CajaWindow .toolbar .button {
+.caja-navigation-window toolbar button {
     border-image: none;
 }
 
 /* Misc */
+.caja-navigation-window notebook,
 CajaView.frame,
 CajaNotebook.notebook {
     border-right-width: 0;
@@ -289,41 +287,67 @@ CajaNotebook.notebook {
     border-bottom-width: 0;
 }
 
+.caja-navigation-window notebook tab,
 CajaNotebook.notebook tab.top,
 CajaNotebook.notebook tab.bottom {
     border-right-width: 1px;
     border-left-width: 1px;
 }
 
+.caja-navigation-window notebook,
 CajaNotebook .frame {
     border-width: 1px 0 0 0;
 }
 
 /* close button styling */
 /* surpress styling of close button */
+.caja-navigation-window notebook tab button.flat,
+.caja-navigation-window notebook tab button.flat:hover,
 CajaWindow .notebook tab .button.flat,
 CajaWindow .notebook tab .button.flat:hover {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
     text-shadow: none;
-    icon-shadow: none;
+    -gtk-icon-shadow: none;
     border-image: none;
 }
 
+.caja-navigation-window notebook tab,
 CajaWindow .notebook tab.top {
-    padding: 6px 3px 6px 0px;
+    padding: 4px 3px 4px 0px;
 }
 
+/* do we have this style class? */
 .caja-cluebar-label {
     font: normal;
     text-shadow: 0 1px shade (@cluebar_color, 1.06);
 }
 
-CajaSearchBar .horizontal .entry {
+/* to avoid padding when executing toogle button */
+.caja-search-bar entry,
+.caja-location-entry,
+CajaSearchBar .horizontal .entry,
+CajaLocationBar .entry {
     padding: 4px;
 }
 
+.caja-navigation-window statusbar frame {
+    border-style: none;
+}
+
+#caja-extra-view-widget {
+    background-color: shade (@theme_bg_color, 1.04);
+    background-color: @cluebar_color;
+    border-bottom-color: shade (@cluebar_color, 0.92);
+    border-radius: 0px;
+    border-style: solid;
+    border-width: 0px;
+    border-color: @borders;
+    color: @theme_fg_color;
+}
+
+/*
 CajaTrashBar.info,
 CajaXContentBar.info,
 CajaSearchBar.info,
@@ -342,33 +366,24 @@ CajaSearchBar .button,
 CajaQueryEditor .button {
     border-radius: 0;
 }
+*/
 
 /****************
  * Mate-Panel *
  ****************/
 
 /* first make all transparent */
-PanelToplevel.background.horizontal {
+.mate-panel-menu-bar,
+.mate-panel-menu-bar menubar,
+#PanelApplet-window-menu-applet-button {
     background-color: transparent;
-}
-
-WnckSelector.menubar,
-PanelMenuBar.menubar,
-WnckSelector GtkMenuItem,
-PanelMenuBar GtkMenuItem,
-MatePanelApplet GtkToggleButton.button {
     border-image: none;
     background-image: none;
     background-color: transparent;
     box-shadow: none;
 }
 
-/* let's started */
-/* the panel bar itself */
-PanelToplevel.background.horizontal {
-    background-color: @theme_bg_color;
-}
-
+/* let's start it */
 .mate-panel-menu-bar {
     background-color: @theme_bg_color;
     background-image: none;
@@ -384,18 +399,8 @@ PanelToplevel.background.horizontal {
     box-shadow: none;
 }
 
-/* panel grip */
-PanelToplevel.background {
-    border-radius: 2px;
-/* enable for making borders visible */
-/*    box-shadow: inset  0px  1px shade (@theme_bg_color, 1.0),
-                inset  1px  0px shade (@theme_bg_color, 1.0),
-                inset -1px  0px shade (@theme_bg_color, 1.0),
-                inset  0px -1px shade (@theme_bg_color, 1.0); */
-}
-
 /* hide buttons */
-PanelToplevel.background .button {
+.mate-panel-menu-bar button {
     background: transparent;
     border-image: none;
     border-radius: 2px;
@@ -404,8 +409,8 @@ PanelToplevel.background .button {
     box-shadow: none;
 }
 
-PanelToplevel.background .button:hover,
-PanelToplevel.background .button:hover:active {
+.mate-panel-menu-bar button:hover,
+.mate-panel-menu-bar button:hover:active {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_selected_bg_color, 0.86),
                                       shade (@theme_selected_bg_color, 0.26));
@@ -415,11 +420,10 @@ PanelToplevel.background .button:hover:active {
     border-width: 0px;
 }
 
-MatePanelApplet {
+#PanelApplet {
     border-width: 0;
 }
 
-MatePanelAppletFrameDBus PanelSeparator,
 PanelSeparator {
     border-width: 0;
     background-color: @theme_bg_color;
@@ -427,7 +431,7 @@ PanelSeparator {
     text-shadow: none;
 }
 
-/* the grid left from wnckpager and wncktasklist */
+/* the grid left from na-tray and wncktasklist */
 MatePanelAppletFrameDBus {
     background-image: -gtk-scaled(url("assets/panel-grid.svg"));
     background-color: transparent;
@@ -437,13 +441,13 @@ MatePanelAppletFrameDBus {
 
 /* main menu */
 /* set normal menubar button */
-PanelMenuBar.menubar .menuitem {
+.mate-panel-menu-bar menubar menuitem {
     transition: all 200ms ease-out;
     text-shadow: none;
 }
 
 /* set selected menubar button */
-PanelMenuBar.menubar .menuitem:hover {
+.mate-panel-menu-bar menubar menuitem:hover {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_selected_bg_color, 0.86),
                                       shade (@theme_selected_bg_color, 0.26));
@@ -454,22 +458,22 @@ PanelMenuBar.menubar .menuitem:hover {
     border-radius: 5px;
 }
 
-/* set menubar menuitem separator */
-PanelMenuBar.menubar .menu .menuitem.separator {
+/* set menubar menuitem separator , does not work */
+.mate-panel-menu-bar menubar menu menuitem separator {
     color: @menu_separator;
-    -GtkMenuItem-horizontal-padding: 0;
+/*    -GtkMenuItem-horizontal-padding: 0; deprecated */
 }
 
 /* set normal menubar menuitem */
-PanelMenuBar.menubar .menu .menuitem {
+.mate-panel-menu-bar menubar menu menuitem {
     transition: all 150ms ease-out;
     padding: 6px;
 }
 
 /* set selected menubar menuitem */
-PanelMenuBar.menubar .menu .menuitem:checked:hover,
-PanelMenuBar.menubar .menu .menuitem:active:hover,
-PanelMenuBar.menubar .menu .menuitem:hover {
+.mate-panel-menu-bar menubar menu menuitem:checked:hover,
+.mate-panel-menu-bar menubar menu menuitem:active:hover,
+.mate-panel-menu-bar menubar menu menuitem:hover {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_selected_bg_color, 1.0),
                                       shade (@theme_selected_bg_color, 0.85));
@@ -480,28 +484,11 @@ PanelMenuBar.menubar .menu .menuitem:hover {
     border-radius: 0px;
 }
 
-/* mate menu */
-
-/* Mate menu button hover */
-PanelMenuButton.button:hover {
-    color: shade (@theme_selected_bg_color, 1.00);
-}
-
-/* Mate menu menuitem */
-PanelMenuButton .menu .menuitem {
-    padding: 6px;
-}
-
-/* Mate menu menuitem separator */
-PanelMenuButton .menu .menuitem.separator {
-    color: @menu_separator;
-    -GtkMenuItem-horizontal-padding: 0;
-}
-
-/* desktop-applet, clockapplet, drivemount, character-map,
-dictionary */
-MatePanelApplet .button,
-MatePanelApplet .button.flat {
+/* all applets */
+.mate-panel-menu-bar #PanelApplet button,
+.mate-panel-menu-bar #PanelApplet button.flat,
+.mate-panel-menu-bar #PanelApplet button.toggle,
+.mate-panel-menu-bar #PanelApplet button.flat.toggle {
     transition: all 400ms ease-out;
     background-image: none;
     background-color: transparent;
@@ -515,14 +502,18 @@ MatePanelApplet .button.flat {
     padding: 4px 4px 4px 4px;
 }
 
-MatePanelApplet .button:checked,
-MatePanelApplet .button:active,
-MatePanelApplet .button:checked:hover,
-MatePanelApplet .button:active:hover,
-MatePanelApplet .button.flat:checked,
-MatePanelApplet .button.flat:active,
-MatePanelApplet .button.flat:checked:hover,
-MatePanelApplet .button.flat:active:hover {
+.mate-panel-menu-bar #PanelApplet button:checked,
+.mate-panel-menu-bar #PanelApplet button:checked:hover,
+.mate-panel-menu-bar #PanelApplet button:hover:active,
+.mate-panel-menu-bar #PanelApplet button.flat:checked,
+.mate-panel-menu-bar #PanelApplet button.flat:checked:hover,
+.mate-panel-menu-bar #PanelApplet button.flat:hover:active,
+.mate-panel-menu-bar #PanelApplet button.toggle:checked,
+.mate-panel-menu-bar #PanelApplet button.toggle:checked:hover,
+.mate-panel-menu-bar #PanelApplet button.toggle:hover:active,
+.mate-panel-menu-bar #PanelApplet button.flat.toggle:checked,
+.mate-panel-menu-bar #PanelApplet button.flat.toggle:checked:hover,
+.mate-panel-menu-bar #PanelApplet button.flat.toggle:hover:active {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_selected_bg_color, 0.86),
                                       shade (@theme_selected_bg_color, 0.26));
@@ -537,8 +528,10 @@ MatePanelApplet .button.flat:active:hover {
     padding: 4px 4px 4px 4px;
 }
 
-MatePanelApplet .button:hover,
-MatePanelApplet .button.flat:hover {
+.mate-panel-menu-bar #PanelApplet button:hover,
+.mate-panel-menu-bar #PanelApplet button.flat:hover,
+.mate-panel-menu-bar #PanelApplet button.toggle:hover,
+.mate-panel-menu-bar #PanelApplet button.flat.toggle:hover {
     background-image: linear-gradient(to bottom,
                                       @theme_bg_color,
                                       shade (@theme_selected_bg_color, 0.86));
@@ -553,87 +546,10 @@ MatePanelApplet .button.flat:hover {
     padding: 4px 4px 4px 4px;
 }
 
-/*Wncklist */
-WnckTasklist .button {
-    transition: all 400ms ease-out;
-    background-image: linear-gradient(to bottom,
-                                      shade (@theme_bg_color, 1.0),
-                                      shade (@theme_bg_color, 0.96));
-    background-color: transparent;
-/*    color: @theme_selected_fg_color;*/
-    border-image: none;
-    border-style: solid;
-    border-width: 0px;
-    border-radius: 5px;
-    text-shadow: none;
-    -GtkWidget-window-dragging: true;
-}
-
-WnckTasklist .button:checked:hover,
-WnckTasklist .button:checked,
-WnckTasklist .button:active:hover,
-WnckTasklist .button:active {
-    background-image: linear-gradient(to bottom,
-                                      shade (@theme_selected_bg_color, 0.86),
-                                      shade (@theme_selected_bg_color, 0.26));
-    background-color: transparent;
-    color: shade (@theme_selected_fg_color, 1.00);
-    border-image: none;
-    border-style: solid;
-    border-width: 0px;
-    border-radius: 5px;
-    text-shadow: none;
-    -GtkWidget-window-dragging: true;
-}
-
-WnckTasklist .button:hover,
-WnckTasklist .button.flat:hover {
-    background-image: linear-gradient(to bottom,
-                                      @theme_bg_color,
-                                      shade (@theme_selected_bg_color, 0.86));
-    background-color: transparent;
-    color: shade (@theme_text_color, 1.0);
-    border-image: none;
-    border-style: solid;
-    border-width: 0px;
-    border-radius: 5px;
-    text-shadow: none;
-    -GtkWidget-window-dragging: true;
-}
-
-/* set selected button WnckSelector */
-WnckSelector.menubar .menuitem:hover {
-    background-image: linear-gradient(to bottom,
-                                      shade (@theme_selected_bg_color, 0.86),
-                                      shade (@theme_selected_bg_color, 0.26));
-    background-color: transparent;
-    border-style: solid;
-    border-width: 0px;
-    border-radius: 5px;
-}
-
-/* set WnckSelector normal menuitem */
-WnckSelector.menubar .menu .menuitem {
-    background-color: @menu_bg_color;
-    background-image: none;
-    color: shade (@theme_fg_color, 1.00);
-    text-shadow: none;
-}
-
-/* set WnckSelector selected menuitem */
-WnckSelector.menubar .menu .menuitem:hover {
-    background-color: transparent;
-    background-image: linear-gradient(to bottom,
-                                      shade (@theme_selected_bg_color, 1.0),
-                                      shade (@theme_selected_bg_color, 0.85));
-    color: shade (@theme_selected_fg_color, 1.00);
-    text-shadow: none;
-    border-radius: 0px;
-}
-
-/* set WnckSelector menuitem separator */WnckSelector.menubar .menu .menuitem.separator {
+/* set WnckSelector menuitem separator seperators are broken */
+.mate-panel-menu-bar menubar menu menuitem separator {
     color: @menu_separator;
-    -GtkMenuItem-horizontal-padding: 0;
+/*    -GtkMenuItem-horizontal-padding: 0; */
 }
 
 /* WnckPager */
@@ -657,9 +573,8 @@ WnckPager:hover {
                                       @theme_selected_bg_color);
 }
 
-ClockBox,
-.mate-panel-menu-bar.menubar,
-MatePanelApplet > GtkMenuBar.menubar {
+.mate-panel-menu-bar menubar,
+MatePanelApplet > menubar {
     font: normal;
 }
 
@@ -668,7 +583,8 @@ GtkTrayIcon.background {
     background-color: transparent;
 }
 
-NaTrayApplet {
+/* na-tray-applet */
+.mate-panel-menu-bar #PanelApplet {
     -NaTrayApplet-icon-padding: 3px;
     -NaTrayApplet-icon-size: 16;
 }
@@ -683,7 +599,7 @@ NaTrayApplet {
     background: transparent;
 }
 
-.mate-panel-applet-slider .frame {
+.mate-panel-applet-slider frame {
     background-color: @theme_bg_color;
     border-image: none;
     border-style: solid;
@@ -692,13 +608,13 @@ NaTrayApplet {
     margin: 0px;
 }
 
-.mate-panel-applet-slider .frame .frame{
+.mate-panel-applet-slider frame frame{
     background-color:transparent;
     border-style: none;
     box-shadow: none;
 }
 
-.mate-panel-applet-slider .frame .button {
+.mate-panel-applet-slider frame button {
     color: @theme_fg_color;
 }
 
@@ -724,56 +640,29 @@ TerminalWindow GtkNotebook.notebook tab.top,
  ****************/
 
 /* pluma line numbers */
+.pluma-window textview,
 PlumaView {
     background-color: shade (@theme_bg_color, 1.07);
 }
 
-/*FIXME normaly this isn't the right entry for adjusting
-the sidebar entry hover color*/
-PlumaWindow .view row:hover {
-    background-color: shade (@theme_selected_bg_color, 1.15);
-    color: shade (@theme_selected_bg_color, 0.35);
-}
-
 /* Pluma status bar */
-PlumaStatusbar.horizontal.statusbar .frame.flat .flat.button {
-    border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+.pluma-window statusbar.horizontal frame {
+    border-style: none;
 }
 
-PlumaWindow .button.flat:hover {
-    background-color: transparent;
-    background-image: linear-gradient(to bottom,
-                                      @button_gradient_color_a,
-                                      @button_gradient_color_b);
+.pluma-window statusbar.horizontal frame button.flat.toggle,
+PlumaStatusbar.horizontal.statusbar .frame.flat .flat.button {
     border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-    padding: 2px 5px;
-}
-
-PlumaCloseButton.button.flat,
-PlumaCloseButton.button.flat:hover,
-PlumaCloseButton:prelight.button.flat,
-PlumaCloseButton:prelight.button.flat:hover {
-    padding: 1px;
-}
-
-/* surpress styling of close button */
-PlumaWindow .notebook tab .button.flat,
-PlumaWindow .notebook tab .button.flat:hover {
-    border-color: transparent;
-    background-color: transparent;
-    background-image: none;
-    box-shadow: inset 0 1px rgba(255,255,255,0), 0 1px rgba(255,255,255,0);
-    text-shadow: none;
-    icon-shadow: none;
-    border-image: none;
-    padding: 1px;
+    padding: 0px;
 }
 
-PlumaWindow .notebook tab.top {
-    padding: 6px 0px 6px 6px;
+.pluma-window statusbar.horizontal frame button.flat.toggle GtkArrow {
+    -gtk-icon-source: -gtk-icontheme("pan-down-symbolic");
+    -GtkArrow-arrow-scaling: 1.0; /* deprecated, but ignored */
 }
 
 /* Printpreview */
+.pluma-print-preview toolbar.horizontal,
 PlumaPrintPreview.vertical .toolbar.horizontal {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_bg_color, 1.0),
@@ -787,25 +676,44 @@ PlumaPrintPreview.vertical .toolbar.horizontal {
     padding: 0px;
 }
 
+.pluma-print-preview toolbar.horizontal entry,
 PlumaPrintPreview.vertical .toolbar.horizontal GtkToolItem .horizontal .entry {
     padding: 4px 6px;
 }
 
+.pluma-print-preview toolbar.horizontal button.flat.image-button,
 PlumaPrintPreview.vertical .toolbar.horizontal .button.flat.image-button {
     padding: 0px;
 }
 
+.pluma-print-preview toolbar.horizontal button.flat.text-button,
 PlumaPrintPreview.vertical .toolbar.horizontal .button.flat.text-button {
     padding: 0px 16px;
     border-radius: 2px;
 }
 
+.pluma-print-preview toolbar.horizontal toolbutton button.flat.text-button {
+    color: @theme_fg_color;
+    border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+    background-image: linear-gradient(to bottom,
+                                      @button_gradient_color_a,
+                                      @button_gradient_color_b);
+}
+
+.pluma-print-preview toolbar.horizontal toolbutton button.flat.text-button:hover {
+    color: @internal_element_prelight;
+    background-image: linear-gradient(to bottom,
+                                      @button_hover_gradient_color_a,
+                                      @button_hover_gradient_color_b);
+}
+
+.pluma-print-preview scrolledwindow,
 PlumaPrintPreview.vertical GtkLayout {
     background-color: @theme_base_color;
 }
 
 /* sidebar file-browser */
-PlumaPanel.vertical {
+.pluma-window paned.horizontal box.vertical {
     border-radius: 4px 4px 0px 0px;
     border-width: 1px 0px 0px 0px;
     border-style: solid;
@@ -813,10 +721,16 @@ PlumaPanel.vertical {
     box-shadow: none;
 }
 
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical,
 PlumaFileBrowserWidget.vertical {
     background-color: @theme_bg_color;
 }
 
+.pluma-window paned.horizontal box.vertical box.horizontal button.flat {
+    padding: 0px ;
+}
+
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal,
 PlumaFileBrowserWidget.vertical .toolbar.horizontal {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_bg_color, 1.0),
@@ -830,70 +744,47 @@ PlumaFileBrowserWidget.vertical .toolbar.horizontal {
     padding: 4px 0px;
 }
 
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat,
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat.menu-button,
 PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat,
 PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat.menu-button {
     padding: 4px 2px ;
 }
 
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat.image-button,
 PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat.image-button {
     padding: 4px 3px ;
 }
 
 /* color of of expander arrow */
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical expander:hover,
 PlumaFileBrowserWidget.vertical GtkExpander:hover {
     color: @theme_fg_color;
 }
 
-/***********************
- * Mate-Control-Center *
- ***********************/
-
-/* background */
-ShellWindow AppResizer .view {
-    background-color: @theme_base_color;
-}
-
-/* button of sidebar */
-ShellWindow .button.flat {
-    border-image: none;
-    padding: 4px 1px;
-}
-
-ShellWindow .button.flat:hover {
-    padding: 4px 1px;
-
-}
-
-/* button of applications */
-ShellWindow GtkScrolledWindow .button.flat {
-    padding: 4px 0px;
-    border-image: none;
-}
-
-ShellWindow GtkScrolledWindow .button.flat:hover {
-    background-color: transparent;
-    background-image: linear-gradient(to bottom,
-                                      @button_hover_gradient_color_a,
-                                      @button_hover_gradient_color_b);
-    border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
-    padding: 4px 0px;
-}
-
 /*********
  * Atril *
  *********/
 
 /* size of page entry */
+.atril-window .primary-toolbar toolbar toolitem box.horizontal entry,
 EvPageActionWidget .entry {
     padding: 2px;
 }
 
+.atril-window .primary-toolbar toolbar button,
+.atril-window .primary-toolbar toolbar button.flat,
 EvWindow .toolbar .button,
 EvWindow .toolbar .button.flat {
-    padding: 0px 4px;
+    padding: 5px;
+}
+
+.atril-window .primary-toolbar toolbar button.combo {
+    padding: 6px;
 }
 
 /* atril and eom */
+dialog.background>box.vertical.dialog-vbox>box.vertical>scrolledwindow>viewport.frame,
 EggToolbarEditor.vertical GtkScrolledWindow .frame {
     background-color: shade (@theme_base_color, 1.0);
     border-color: @borders;
@@ -906,27 +797,36 @@ EggToolbarEditor.vertical GtkScrolledWindow .frame {
  * Eom *
  *******/
 
+.eom-window .vertical .vertical .vertical .horizontal button.flat:first-child,
 EomThumbNav .button.flat:first-child {
     border-radius: 4px 0px 0px 4px;
     border-width: 1px 0px 1px 1px;
 }
 
+.eom-window .vertical .vertical .vertical .horizontal button.flat:last-child,
 EomThumbNav .button.flat:last-child {
     border-radius: 0px 4px 4px 0px;
     border-width: 1px 1px 1px 0px;
 }
 
+.eom-window .vertical .vertical .vertical .horizontal button.flat,
 EomThumbNav .button.flat {
     border-image: none;
     border-color: @unfocused_borders;
 }
 
+.eom-window .vertical .vertical .vertical .horizontal button.flat:hover,
 EomThumbNav .button.flat:hover {
     border-image: none;
     border-color: @menu_combobox_border;
 }
 
-EomThumbNav .button.flat:insensitive {
+.eom-window .vertical .vertical .vertical .horizontal button.flatdisabled,
+EomThumbNav .button.flat:disabled {
     border-color: transparent;
 }
 
+.eom-window .vertical statusbar.horizontal frame {
+    border-style: none;
+}
+
diff --git a/desktop-themes/BlueMenta/gtk-3.0/other-applications.css b/desktop-themes/BlueMenta/gtk-3.0/other-applications.css
index 141a07f1..779216b8 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/other-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/other-applications.css
@@ -2,90 +2,45 @@
  * NEMO File manager *
  *********************/
 
-/* for breadcrumbs path bar */
-
-.nemo-pathbar-button,
-NemoPathbarButton {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90)));
-	border-color: #979797;
-	color: @theme_fg_color;
-	-NemoPathbarButton-border-radius: 3px;
-}
-
-NemoPathbarButton:active {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0)));
-}
-
-NemoPathbarButton:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85)));
-}
-
-NemoPathbarButton:active:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)));
-}
-
 /* workaround for broken first/last-child logic with linked buttons
-   in pathbar with gtk+-3.18 */
-NemoPathBar:dir(ltr).raised.linked .button.text-button,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:active,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:active:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:first-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:active:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:last-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:hover:active:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:active:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:only-child,
-NemoPathBar:dir(ltr).raised.linked .button.text-button:checked:hover:active:only-child {
-	border-right-width: 1px;
-	border-left-width: 1px;
-	border-image-width: 3px 3px 4px 3px;
-	border-radius: 4px;
-}
-
-/* New */
-toolbar.primary-toolbar.horizontal NemoPathBar.raised.linked button:first-child GtkArrow {
-      -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
-}
-
-toolbar.primary-toolbar.horizontal NemoPathBar.raised.linked button:last-child GtkArrow {
-      -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+   in pathbar since gtk+-3.18 */
+.nemo-window NemoPathBar.raised.linked button.text-button,
+.nemo-window NemoPathBar.raised.linked button.text-button:hover,
+.nemo-window NemoPathBar.raised.linked button.text-button:hover:active,
+.nemo-window NemoPathBar.raised.linked button.text-button:active,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active,
+.nemo-window NemoPathBar.raised.linked button.text-button:first-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:hover:first-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:hover:active:first-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:active:first-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:first-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:first-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active:first-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:last-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:hover:last-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:hover:active:last-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:active:last-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:last-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:last-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active:last-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:only-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:hover:only-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:hover:active:only-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:active:only-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:only-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:only-child,
+.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active:only-child {
+    border-right-width: 1px;
+    border-left-width: 1px;
+    border-image-width: 3px 3px 4px 3px;
+    border-radius: 4px;
+    border-style: solid;
 }
 
-
 /* For Places Sidebar diskfull indicators */
-
+.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view,
 NemoPlacesTreeView {
 	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
 	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
@@ -95,40 +50,39 @@ NemoPlacesTreeView {
 	-NemoPlacesTreeView-disk-full-max-length: 70px;
 }
 
+.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:selected,
 NemoPlacesTreeView:selected {
 	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0);
 	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0);
 }
 
+.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:hover,
 NemoPlacesTreeView:hover {
 }
 
+.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:selected:hover,
 NemoPlacesTreeView:selected:hover {
 }
 
 @define-color cluebar_color shade (@theme_base_color, 0.9);
 
-NemoWindow * {
-	-GtkPaned-handle-size: 0;
-}
-
-NemoWindow .view {
+/* view */
+.nemo-window-pane notebook scrolledwindow {
 	background-color: @theme_base_color;
 }
 
-NemoWindow .rubberband,
-NemoWindow .view.rubberband {
+.nemo-window .rubberband,
+.nemo-window .view.rubberband {
 	background-color: alpha (@theme_selected_bg_color, 0.35);
 }
 
 /* sidebar */
-
-NemoWindow .sidebar .view {
+.nemo-window .sidebar .view {
 	background-color: shade (@theme_bg_color, 1.08);
 	color: @theme_fg_color;
 }
 
-NemoWindow .sidebar .frame {
+.nemo-window .sidebar scrolledwindow.frame {
 	border-right-width: 1px;
 	border-style: solid;
 	border-color: shade (@theme_bg_color, 0.90);
@@ -137,18 +91,21 @@ NemoWindow .sidebar .frame {
 	border-bottom: none;
 }
 
-NemoWindow .sidebar row:selected {
+.nemo-window .sidebar treeview .cell:selected {
+	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 }
 
-NemoWindow .sidebar row:backdrop:selected {
-	color: @theme_fg_color;
-	text-shadow: none; 
+.nemo-window .sidebar treeview .cell:hover {
+	background-color: shade (@theme_selected_bg_color, 1.15);
+	color: @theme_selected_fg_color;
 }
 
-NemoWindow .sidebar row:hover {
-	background-color: shade (@theme_selected_bg_color, 1.15);
-	color: shade (@theme_selected_bg_color, 0.35);
+.nemo-window .sidebar scrollbar.vertical.left trough {
+	border-width: 0px 0px 0px 1px;
+	border-radius: 0;
+	border-style: solid;
+	border-color: shade (@theme_bg_color, 0.84);
 }
 
 /* desktop mode */
@@ -170,53 +127,41 @@ NemoWindow .sidebar row:hover {
 }
 
 .nemo-desktop.nemo-canvas-item:active,
-.nemo-desktop.nemo-canvas-item:prelight,
+.nemo-desktop.nemo-canvas-item:hover,
 .nemo-desktop.nemo-canvas-item:selected {
 	text-shadow: none;
 }
 
 /* inactive pane */
-
-.nemo-inactive-pane .view {
+/* bug in gtk+, .view writes no bg color in all browsers */
+.nemo-inactive-pane .view,
+.nemo-inactive-pane scrolledwindow,
+.nemo-inactive-pane scrolledwindow treeview {
 	background-color: shade(@theme_base_color, 0.9);
 }
 
-/* Toolbar */
-NemoToolbar .toolbar.primary-toolbar .button.image-button {
+/* Primary Toolbar */
+.nemo-window toolbar.primary-toolbar.horizontal button.image-button {
     padding: 0px 8px;
 }
 
-NemoToolbar .toolbar.primary-toolbar .button.text-button {
+.nemo-window toolbar.primary-toolbar.horizontal button.text-button {
     padding: 0px 10px;
 }
 
-/* Misc */
-NemoView.frame,
-NemoNotebook.notebook {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-bottom-width: 0;
+/* statusbar */
+.nemo-window box.toolbar.horizontal {
+    padding: 0px;
 }
 
-NemoNotebook.notebook tab.top,
-NemoNotebook.notebook tab.bottom {
-	border-right-width: 1px;
-	border-left-width: 1px;
-}
-
-NemoNotebook .frame {
-	border-width: 1px 0 0 0;
-}
+/* Misc */
 
 .nemo-cluebar-label {
 	font: normal;
 	text-shadow: 0 1px shade (@cluebar_color, 1.06);
 }
 
-NemoTrashBar.info,
-NemoXContentBar.info,
-NemoSearchBar.info,
-NemoQueryEditor.info {
+.nemo-window-pane infobar.info {
 	background-color: @cluebar_color;
 	border-bottom-color: shade (@cluebar_color, 0.92);
 	border-radius: 0;
@@ -225,11 +170,9 @@ NemoQueryEditor.info {
 	color: @theme_fg_color;
 }
 
-NemoTrashBar .button,
-NemoXContentBar .button,
-NemoSearchBar .button,
-NemoQueryEditor .button {
-	border-radius: 0;
+.nemo-window-pane box.toolbar.primary-toolbar.vertical revealer button.radio.text-button {
+    padding: 6px;
+    border-style: solid;
 }
 
 /****************
@@ -358,13 +301,6 @@ DConfWindow DConfKeyView.view row:hover {
     color: shade (@theme_selected_bg_color, 0.35);
 }
 
-/* the small line between sidebar and view */
-DConfWindow GtkPaned.horizontal {
-    -GtkPaned-handle-size: 3px;
-    border-color: transparent;
-    background-color: @theme_bg_color;
-}
-
 DConfKeyView.view row:selected,
 DConfKeyView.view row:selected:hover  {
     color:  @theme_selected_fg_color;
@@ -387,6 +323,33 @@ DConfKeyView.view .spinbutton .button:last-child {
     border-radius: 0 2px 2px 0;
 }
 
+/***********
+ * Lightdm *
+ ***********/
+
+#login_window.background.lightdm-gtk-greeter {
+	border-radius: 10px;
+}
+
+#login_window.background.lightdm-gtk-greeter,
+#login_window.background.lightdm-gtk-greeter box.vertical {
+	border-radius: 10px;
+    border-style: solid;
+    border-width: 2px;
+    border-color: black;
+}
+
+#login_window.background.lightdm-gtk-greeter frame {
+	border-style: none;
+}
+
+#login_window.background.lightdm-gtk-greeter #prompt_entry,
+#login_window.background.lightdm-gtk-greeter button.combo,
+#login_window.background.lightdm-gtk-greeter button.text-button,
+#login_window.background.lightdm-gtk-greeter button.text-button.default {
+	padding: 8px 4px;
+}
+
 /*****************
  * Ubuntu styles *
  *****************/