GTK+-3.20 Menta themes: fix combobox, spinbutton and switch in list rows

- this make elements in cinnamon-setting visible
- remove more obsoletes settings in Menta theme

8 files changed, 346 insertions, 827 deletions

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 e1fdfbc2..ee1409a2 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-backgrounds.css
@@ -1,5 +1,7 @@
 /* Button background */
 button,
+combobox button.combo,
+combobox button.combo:backdrop,
 toolbar .raised button,
 toolbar combobox button.combo,
 toolbar.primary-toolbar .linked button,
@@ -161,10 +163,9 @@ toolbar combobox button.combo:checked:disabled,
 
 /* Entry background */
 entry,
-combobox entry button,
-combobox entry button:hover,
-toolbar.primary-toolbar combobox entry button,
-toolbar.primary-toolbar combobox entry button:hover,
+combobox button.combo:hover,
+toolbar.primary-toolbar combobox entry.combo,
+toolbar.primary-toolbar combobox button.combo:hover,
 levelbar trough,
 .entry,
 GtkComboBox.combobox-entry .button,
@@ -180,8 +181,8 @@ GtkComboBox.combobox-entry .button:hover,
 }
 
 /* Entry pushed button background */
-toolbar.primary-toolbar combobox entry button:checked,
-combobox entry button:checked,
+toolbar.primary-toolbar combobox button.combo:checked,
+combobox button.combo:checked,
 .primary-toolbar GtkComboBox.combobox-entry .button:active,
 .primary-toolbar GtkComboBox.combobox-entry .button:checked,
 /* .primary-toolbar GtkComboBox.combobox-entry .button:hover:active,*/
@@ -245,7 +246,7 @@ column-header .button:active:hover {
 
 /* Insensitive entry background */
 entry:disabled,
-combobox entry button:disabled,
+combobox button.combo:disabled,
 levelbar trough:disabled,
 .entry:disabled,
 GtkComboBox.combobox-entry .button:disabled,
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 887fbe88..c1f5a0a4 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
@@ -3,8 +3,6 @@
 /* generic element borders (checked)*/
 entry,
 button:checked,
-combobox entry entry,
-combobox entry button,
 toolbar.inline-toolbar.vertical button:checked,
 .entry,
 .button:active,
@@ -13,7 +11,7 @@ GtkComboBox.combobox-entry .entry,
 GtkComboBox.combobox-entry .button,
 .inline-toolbar.toolbar.vertical .button:active,
 .inline-toolbar.toolbar.vertical .button:checked {
-	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	border-image: url("borders/button-active.png") 3 4 5 4 / 3px 4px 5px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
 	border-style: solid;
@@ -29,8 +27,8 @@ trough highlight,
 
 entry:disabled,
 button:checked:disabled,
-combobox entry entry:disabled,
-combobox entry button:disabled,
+combobox entry.combo:disabled,
+combobox button.combo:disabled,
 toolbar.inline-toolbar.vertical button:disabled,
 toolbar.inline-toolbar.vertical button.default:disabled,
 .entry:disabled,
@@ -39,7 +37,7 @@ GtkComboBox.combobox-entry .entry:disabled,
 GtkComboBox.combobox-entry .button:disabled,
 .inline-toolbar.toolbar.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-image: url("borders/button-active-ins.png") 3 4 5 4 / 3px 4px 5px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
 	border-style: solid;
@@ -58,7 +56,7 @@ toolbar.inline-toolbar.vertical button.default:disabled,
 .inline-toolbar.toolbar .button.default:disabled,
 .inline-toolbar.toolbar.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-image: url("borders/button-ins.png") 3 4 5 4 / 3px 4px 5px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
 	border-style: solid;
@@ -78,7 +76,7 @@ row trough,
 entry:focus,
 button:checked:focus,
 button.default:checked,
-combobox entry button:focus,
+combobox button.combo:focus,
 toolbar.inline-toolbar.vertical button:focus:checked,
 toolbar.inline-toolbar.vertical button.default:checked,
 .entry:focus,
@@ -91,7 +89,7 @@ GtkComboBox.combobox-entry .button:focus,
 .inline-toolbar.toolbar.vertical .button:checked:focus
 .inline-toolbar.toolbar.vertical .button.default:active,
 .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-image: url("borders/button-active-focus.png") 3 4 5 4 / 3px 4px 5px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
 	border-style: solid;
@@ -106,7 +104,7 @@ GtkComboBox.combobox-entry .button:focus,
 .titlebar .titlebutton:hover,
 .titlebar .titlebutton:active,
 .titlebar .button:checked:checked {
-	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	border-image: url("borders/button-active-focus.png") 3 4 5 4 / 3px 4px 5px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
 	border-style: solid;
@@ -114,6 +112,8 @@ GtkComboBox.combobox-entry .button:focus,
 }
 
 button,
+combobox entry.combo,
+combobox button.combo,
 .button {
 	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
@@ -135,7 +135,7 @@ toolbar.inline-toolbar.vertical button,
 button.default,
 button:focus,
 .button.default,
-.button:focus { 
+.button:focus {
 	border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -227,7 +227,7 @@ toolbar.primary-toolbar .raised button:disabled,
 toolbar.primary-toolbar .raised button.default:disabled,
 toolbar.primary-toolbar switch trough:disabled,
 toolbar.primary-toolbar switch trough:checked:disabled,
-toolbar.primary-toolbar combobox button:disabled,
+toolbar.primary-toolbar combobox button.combo:disabled,
 .primary-toolbar .button.raised:disabled,
 .primary-toolbar .raised .button:disabled,
 .primary-toolbar .button.raised.default:disabled,
@@ -257,7 +257,6 @@ toolbar.inline-toolbar button.default:checked,
 .primary-toolbar .button.raised.default:active,
 .primary-toolbar .raised .button.default:active,
 .inline-toolbar.toolbar .button.default:active {
-	/*border-image: url("borders/primary-toolbar-generic-border-focused.png") 4 / 4px stretch;*/
 	border-image: url("borders/button-active-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 3px;
 	border-width: 2px;
@@ -379,7 +378,7 @@ column-header:last-child .button:checked:hover {
 	border-right-width: 0;
 }
 
-treeview header button:focus
+treeview header button:focus,
 column-header.button:focus,
 column-header .button:focus {
 	border-image: linear-gradient(to top,
@@ -391,7 +390,7 @@ column-header .button:focus {
 
 /* pushed colored buttons borders */
 toolbar.selection-mode button.suggested-action,
-toolbar.selection-mode GtkToolButton.suggested-action button,
+toolbar.selection-mode toolbutton button.suggested-action,
 .selection-mode.toolbar .suggested-action.button,
 .selection-mode.toolbar GtkToolButton.suggested-action .button {
 	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
@@ -405,7 +404,6 @@ toolbar.selection-mode GtkToolButton.suggested-action button,
 /* suggested action buttons borders */
 button.suggested-action,
 button.suggested-action:checked,
-button.suggested-action:active,
 .suggested-action.button,
 .suggested-action.button:checked,
 .suggested-action.button:active {
@@ -420,7 +418,6 @@ button.suggested-action:active,
 /* destructive action buttons borders */
 button.destructive-action,
 button.destructive-action:checked,
-button.destructive-action:active,
 .destructive-action.button,
 .destructive-action.button:checked,
 .destructive-action.button:active {
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
index a2aa7448..45805457 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -137,7 +137,8 @@ tooltip.background {
 }
 
 tooltip decoration {
-    background-color: transparent;
+    background-color: alpha(shade(@theme_selected_bg_color, 1.0), 0.4);
+    border-radius: 4px;
 }
 
 tooltip * {
@@ -549,7 +550,12 @@ spinbutton button,
 spinbutton button:focus,
 spinbutton button:active,
 spinbutton button:focus:active,
-spinbutton button:disabled {
+spinbutton button:disabled,
+row.activatable spinbutton button,
+row.activatable spinbutton button:focus,
+row.activatable spinbutton button:active,
+row.activatable spinbutton button:focus:active,
+row.activatable spinbutton button:disabled {
     border-style: none;
     border-image: none;
     padding: 5px;
@@ -558,7 +564,9 @@ spinbutton button:disabled {
 }
 
 spinbutton button,
-spinbutton button:focus {
+spinbutton button:focus,
+row.activatable spinbutton button,
+row.activatable spinbutton button:focus {
     background-image: linear-gradient(to bottom,
                                       @button_gradient_color_a,
                                       @button_gradient_color_b);
@@ -566,7 +574,8 @@ spinbutton button:focus {
     color: @internal_element_color;
 }
 
-spinbutton button:hover {
+spinbutton button:hover,
+row.activatable spinbutton button:hover {
     background-color: transparent;
     background-image: linear-gradient(to bottom,
                                       @button_hover_gradient_color_a,
@@ -574,8 +583,9 @@ spinbutton button:hover {
     color: @internal_element_prelight;
 }
 
-spinbutton button:active,
-spinbutton button:hover:active {
+spinbutton button:checked,
+spinbutton button:hover:active,
+row.activatable spinbutton button:checked {
     background-image: linear-gradient(to bottom,
                                       @button_active_gradient_color_a,
                                       @button_active_gradient_color_b);
@@ -587,11 +597,13 @@ spinbutton button:disabled {
     color: @internal_element_insensitive;
 }
 
-spinbutton button:first-child {
+spinbutton button:first-child,
+row.activatable spinbutton button {
     border-radius: 0px;
 }
 
-spinbutton button:last-child {
+spinbutton button:last-child,
+row.activatable spinbutton button {
     border-radius: 0 3px 3px 0;
 }
 
@@ -601,6 +613,8 @@ spinbutton button:dir(rtl) {
 
 spinbutton.horizontal entry,
 spinbutton.horizontal entry:focus,
+row.activatable spinbutton.horizontal entry,
+row.activatable spinbutton.horizontal entry:focus,
 stack box.vertical.linked spinbutton.horizontal entry,
 stack box.vertical.linked spinbutton.horizontal entry:focus {
     padding: 5px 10px 5px 4px;
@@ -611,6 +625,8 @@ stack box.vertical.linked spinbutton.horizontal entry:focus {
 
 spinbutton.horizontal button,
 spinbutton.horizontal button:focus,
+row.activatable spinbutton.horizontal button,
+row.activatable spinbutton.horizontal button:focus,
 stack box.vertical.linked spinbutton.horizontal button,
 stack box.vertical.linked spinbutton.horizontal button:focus {
     padding: 0px 6px 0px 6px;
@@ -1340,6 +1356,7 @@ toolbar.inline-toolbar button:disabled,
 
 /* Set up shadows and hilights for button visual separation */
 .linked entry,
+.linked entry:backdrop,
 .linked .entry {
 	box-shadow: inset -1px 0 @inset_dark_color;
 }
@@ -1374,7 +1391,7 @@ toolbar.inline-toolbar button:disabled,
 
 /* Set up shadows and hilights for button visual separation */
 .linked button,
-.linked combobox button.combo,
+.linked > combobox button.combo,
 toolbar .raised.linked button,
 toolbar.inline-toolbar button,
 toolbar.inline-toolbar toolbutton > button,
@@ -1387,7 +1404,7 @@ toolbar.inline-toolbar toolbutton > button,
 }
 
 .linked button:first-child,
-.linked combobox:first-child button.combo:first-child,
+.linked > combobox:first-child button.combo:first-child,
 toolbar .raised.linked button:first-child,
 toolbar.inline-toolbar button:first-child,
 toolbar.inline-toolbar toolbutton > button:first-child,
@@ -1400,7 +1417,7 @@ toolbar.inline-toolbar toolbutton > button:first-child,
 }
 
 .linked button:last-child,
-.linked combobox:last-child button.combo:last-child,
+.linked > combobox:last-child button.combo:last-child,
 toolbar .raised.linked button:last-child,
 toolbar.inline-toolbar button:last-child,
 toolbar.inline-toolbar toolbutton > button:last-child,
@@ -1413,7 +1430,7 @@ toolbar.inline-toolbar toolbutton > button:last-child,
 }
 
 .linked button:checked,
-.linked combobox button.combo:checked,
+.linked > combobox button.combo:checked,
 toolbar .raised.linked button:checked,
 toolbar.inline-toolbar button:checked,
 toolbar.inline-toolbar toolbutton > button:checked,
@@ -1431,7 +1448,7 @@ toolbar.inline-toolbar toolbutton > button:checked,
 }
 
 .linked button:disabled,
-.linked combobox button.combo:disabled,
+.linked > combobox button.combo:disabled,
 toolbar .raised.linked button:disabled,
 toolbar.inline-toolbar button:disabled,
 toolbar.inline-toolbar toolbutton > button:disabled,
@@ -1496,9 +1513,11 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 
 /* Middle button */
 .linked entry,
+.linked entry:backdrop,
 .linked > combobox > button.combo,
 .linked > combobox > button.combo:focus,
 .linked > combobox > button.combo:disabled,
+.linked > combobox > button.combo:backdrop,
 .linked > combobox > button.combo:focus:active,
 .linked > combobox > button.combo:checked,
 .linked > combobox > button.combo:focus:active,
@@ -1539,9 +1558,11 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 
 /* Leftmost button */
 .linked entry:first-child,
+.linked entry:backdrop:first-child,
 .linked > combobox:first-child > button.combo:first-child,
 .linked > combobox:first-child > button.combo:focus:first-child,
 .linked > combobox:first-child > button.combo:disabled:first-child,
+.linked > combobox:first-child > button.combo:backdrop:first-child,
 .linked > combobox:first-child > button.combo:focus:active:first-child,
 .linked > combobox:first-child > button.combo:checked:first-child,
 .linked > combobox:first-child > button.combo:focus:checked:first-child,
@@ -1579,9 +1600,11 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 
 /* Rightmost button */
 .linked entry:last-child,
-.linked > combobox:last-child > button.combo,
+.linked entry:backdrop:last-child,
 .linked > combobox:last-child > button.combo:last-child,
+.linked > combobox:last-child > button.combo:focus:last-child,
 .linked > combobox:last-child > button.combo:disabled:last-child,
+.linked > combobox:last-child > button.combo:backdrop:last-child,
 .linked > combobox:last-child > button.combo:focus:active:last-child,
 .linked > combobox:last-child > button.combo:checked:last-child,
 .linked > combobox:last-child > button.combo:focus:checked:last-child,
@@ -1619,9 +1642,11 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 
 /* Linked single button */
 .linked entry:only-child,
-.linked > combobox:only-child > button.combo,
+.linked entry:backdrop:only-child,
 .linked > combobox:only-child > button.combo:only-child,
+.linked > combobox:only-child > button.combo:focus:only-child,
 .linked > combobox:only-child > button.combo:disabled:only-child,
+.linked > combobox:only-child > button.combo:backdrop:only-child,
 .linked > combobox:only-child > button.combo:hover:only-child,
 .linked > combobox:only-child > button.combo:hover:active:only-child,
 .linked > combobox:only-child > button.combo:focus:active:only-child,
@@ -1660,6 +1685,7 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 .linked.vertical > combobox > button.combo,
 .linked.vertical > combobox > button.combo:focus,
 .linked.vertical > combobox > button.combo:disabled,
+.linked.vertical > combobox > button.combo:backdrop,
 .linked.vertical > combobox > button.combo:focus:active,
 .linked.vertical > combobox > button.combo:checked,
 .linked.vertical > combobox > button.combo:focus:checked,
@@ -1667,6 +1693,7 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 .linked.vertical > combobox > button.combo:hover:active,
 .linked.vertical > combobox > button.combo:checked:hover,
 .linked.vertical entry,
+.linked.vertical entry:backdrop,
 .linked.vertical button,
 .linked.vertical button:hover:active,
 .linked.vertical button:checked,
@@ -1698,6 +1725,7 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 .linked.vertical > combobox:first-child > button.combo:first-child,
 .linked.vertical > combobox:first-child > button.combo:focus:first-child,
 .linked.vertical > combobox:first-child > button.combo:disabled:first-child,
+.linked.vertical > combobox:first-child > button.combo:backdrop:first-child,
 .linked.vertical > combobox:first-child > button.combo:focus:active:first-child,
 .linked.vertical > combobox:first-child > button.combo:checked:first-child,
 .linked.vertical > combobox:first-child > button.combo:focus:checked:first-child,
@@ -1705,6 +1733,7 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 .linked.vertical > combobox:first-child > button.combo:hover:active:first-child,
 .linked.vertical > combobox:first-child > button.combo:checked:hover:first-child,
 .linked.vertical entry:first-child,
+.linked.vertical entry:backdrop:first-child,
 .linked.vertical button:first-child,
 .linked.vertical button:hover:active:first-child,
 .linked.vertical button:checked:first-child,
@@ -1733,9 +1762,10 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 }
 
 /* Bottom button (vertical) */
-.linked.vertical > combobox:last-child > button.combo,
 .linked.vertical > combobox:last-child > button.combo:last-child,
+.linked.vertical > combobox:last-child > button.combo:focus:last-child,
 .linked.vertical > combobox:last-child > button.combo:disabled:last-child,
+.linked.vertical > combobox:last-child > button.combo:backdrop:last-child,
 .linked.vertical > combobox:last-child > button.combo:focus:active:last-child,
 .linked.vertical > combobox:last-child > button.combo:checked:last-child,
 .linked.vertical > combobox:last-child > button.combo:focus:checked:last-child,
@@ -1743,6 +1773,7 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 .linked.vertical > combobox:last-child > button.combo:hover:active:last-child,
 .linked.vertical > combobox:last-child > button.combo:checked:hover:last-child,
 .linked.vertical entry:last-child,
+.linked.vertical entry:backdrop:last-child,
 .linked.vertical button:last-child,
 .linked.vertical button:hover:active:last-child,
 .linked.vertical button:checked:last-child,
@@ -1771,9 +1802,10 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 }
 
 /* Linked single button (vertical) */
-.linked.vertical > combobox:only-child > button.combo,
 .linked.vertical > combobox:only-child > button.combo:only-child,
+.linked.vertical > combobox:only-child > button.combo:focus:only-child,
 .linked.vertical > combobox:only-child > button.combo:disabled:only-child,
+.linked.vertical > combobox:only-child > button.combo:backdrop:only-child,
 .linked.vertical > combobox:only-child > button.combo:hover:only-child,
 .linked.vertical > combobox:only-child > button.combo:hover:active:only-child,
 .linked.vertical > combobox:only-child > button.combo:focus:active:only-child,
@@ -1781,6 +1813,7 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 .linked.vertical > combobox:only-child > button.combo:checked:hover:only-child,
 .linked.vertical > combobox:only-child > button.combo:focus:checked:only-child,
 .linked.vertical entry:only-child,
+.linked.vertical entry:backdrop:only-child,
 .linked.vertical button:only-child,
 .linked.vertical button:hover:active:only-child,
 .linked.vertical button:checked:only-child,
@@ -2670,126 +2703,74 @@ notebook header tabs arrow:disabled {
  * ComboBoxes *
  **************/
 
-combobox,
-GtkComboBox {
+combobox {
 	padding: 0;
-/*	-GtkComboBox-arrow-scaling: 0.5; deprecated */
-/*	-GtkComboBox-shadow-type: none; deprecated */
 	text-shadow: 0 1px @button_text_shadow;
 }
 
-combobox:disabled,
-GtkComboBox:disabled {
+combobox:disabled {
 	text-shadow: none;
 	color: @insensitive_fg_color;
 }
 
-combobox separator,
-GtkComboBox .separator {
-	/* always disable separators */
-/*	-GtkWidget-wide-separators: true; deprecated */
+combobox separator {
 	-GtkWidget-horizontal-separator: 0;
 	-GtkWidget-vertical-separator: 0;
 }
 
-combobox entry entry:first-child,
-combobox entry button:first-child,
-GtkComboBox.combobox-entry .entry:first-child,
-GtkComboBox.combobox-entry .button:first-child {
-	border-image-width: 3px 0 4px 3px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-combobox entry entry:last-child,
-combobox entry button:last-child,
-GtkComboBox.combobox-entry .entry:last-child,
-GtkComboBox.combobox-entry .button:last-child {
-	border-image-width: 3px 3px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
+combobox > entry.combo,
+combobox > button.combo,
+combobox > entry.combo:backdrop,
+combobox > button.combo:backdrop {
+	border-image-width: 3px 3px 4px 3px;
+	border-radius: 3px;
+	border-width: 2px;
 }
 
-toolbar.primary-toolbar combobox entry entry:first-child,
-toolbar.primary-toolbar combobox entry button:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:first-child {
+toolbar.primary-toolbar combobox entry.combo:first-child,
+toolbar.primary-toolbar combobox button.combo:first-child {
 	border-image-width: 4px 0 4px 4px;
 	border-radius: 3px 0 0 3px;
 	border-right-width: 0;
 }
 
-toolbar.primary-toolbar combobox entry entry:last-child,
-toolbar.primary-toolbar combobox entry button:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:last-child {
+toolbar.primary-toolbar combobox entry.combo:last-child,
+toolbar.primary-toolbar combobox button.combo:last-child {
 	border-image-width: 4px 4px 4px 0;
 	border-radius: 0 3px 3px 0;
 	border-left-width: 0;
 }
 
-combobox entry entry:focus:first-child,
-GtkComboBox.combobox-entry .entry:focus:first-child {
+combobox entry.combo:focus {
+	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1);
+}
+
+combobox entry.combo:focus:first-child {
 	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
 		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
 		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
 }
 
-combobox entry entry:focus:last-child,
-GtkComboBox.combobox-entry .entry:focus:last-child {
+combobox entry.combo:focus:last-child {
 	box-shadow: inset -1px 2px alpha(@theme_selected_bg_color, 0.1),
 		inset -1px 1px alpha(@theme_selected_bg_color, 0.1),
 		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
 }
 
-combobox entry button:last-child,
-combobox entry button:hover:last-child,
-combobox entry button:checked:last-child,
-combobox entry button:hover:active:last-child,
-GtkComboBox.combobox-entry .button:last-child,
-GtkComboBox.combobox-entry .button:hover:last-child,
-GtkComboBox.combobox-entry .button:active:last-child,
-GtkComboBox.combobox-entry .button:hover:active:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-combobox entry button:first-child,
-combobox entry button:hover:first-child,
-combobox entry button:checked:first-child,
-combobox entry button:hover:active:first-child,
-GtkComboBox.combobox-entry .button:first-child,
-GtkComboBox.combobox-entry .button:hover:first-child,
-GtkComboBox.combobox-entry .button:active:first-child,
-GtkComboBox.combobox-entry .button:hover:active:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-combobox entry button:disabled:first-child,
-GtkComboBox.combobox-entry .button:disabled:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-combobox entry button:disabled:last-child,
-GtkComboBox.combobox-entry .button:disabled:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color;
+combobox entry.combo:focus:only-child {
+	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
+		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
+		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
 }
 
-combobox entry button:hover,
-combobox entry button:checked,
-combobox entry button:hover:active,
-GtkComboBox.combobox-entry .button:hover,
-GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:active:hover {
+combobox button.combo:hover,
+combobox button.combo:checked,
+combobox button.combo:hover:active {
     color: shade (@theme_selected_bg_color, 0.80);
     transition: all 200ms ease-in;
 }
 
-combobox button.combo,
-GtkComboBox .button {
+combobox button.combo {
     color: @theme_fg_color;
 }
 
@@ -4838,7 +4819,7 @@ GtkSwitch.trough:disabled {
 }
 
 /* don't display on/off */
-switch
+switch,
 switch:hover,
 switch:disabled:hover,
 GtkSwitch.trough:hover,
@@ -5493,7 +5474,7 @@ list row.activatable:selected:backdrop:hover,
     box-shadow: none;
 }
 
-list row button,
+list > row > button,
 .list-row.button {
 	border-color: transparent;
 	background-color: @theme_base_color;
@@ -5506,11 +5487,11 @@ list row button,
 	border: none;
 }
 
-list row button:selected,
-list row button:selected:hover,
-list row button:checked,
-list row button:hover:active,
-list row button:checked:hover,
+list > row > button:selected,
+list > row > button:selected:hover,
+list > row > button:checked,
+list > row > button:hover:active,
+list > row > button:checked:hover,
 .list-row.button:selected,
 .list-row.button:selected:hover,
 .list-row.button:active,
@@ -5530,7 +5511,7 @@ list row button:checked:hover,
     border-width: 0px;
 }
 
-list row button:hover,
+list > row > button:hover,
 .list-row.button:hover {
 	background-image: none;
 	background-color: shade (@theme_selected_bg_color, 1.55);
diff --git a/desktop-themes/BlueMenta/gtk-3.0/other-applications.css b/desktop-themes/BlueMenta/gtk-3.0/other-applications.css
index 292d96d3..76e906b1 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/other-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/other-applications.css
@@ -174,6 +174,30 @@
     border-style: solid;
 }
 
+/* cinnamon-settings */
+
+button.gtkstyle-fallback,
+button.gtkstyle-fallback:focus,
+button.gtkstyle-fallback:backdrop {
+	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;
+}
+
+button.gtkstyle-fallback:hover,
+button.gtkstyle-fallback:hover:active,
+button.gtkstyle-fallback:backdrop:hover,
+button.gtkstyle-fallback:focus:hover,
+button.gtkstyle-fallback:focus:hover:active {
+	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;
+}
+
 /* Parole media player needs more testing!
  hopefully do not set other stuff */
 
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
index e1fdfbc2..1ee48664 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-backgrounds.css
@@ -1,13 +1,11 @@
 /* Button background */
 button,
+combobox button.combo,
+combobox button.combo:backdrop,
 toolbar .raised button,
 toolbar combobox button.combo,
 toolbar.primary-toolbar .linked button,
-toolbar.primary-toolbar .raised button,
-.button,
-.toolbar .button.raised,
-.toolbar .raised .button,
-.toolbar GtkComboBox .button {
+toolbar.primary-toolbar .raised button {
 	background-image: linear-gradient(to bottom, 
 		@button_gradient_color_a,
 		@button_gradient_color_b);
@@ -20,22 +18,7 @@ button:focus:checked,
 toolbar button:checked,
 toolbar button:focus:checked,
 toolbar .raised button:checked,
-toolbar .raised button:focus:checked,
-.button:checked,
-.button:active,
-.button:active:hover,
-.toolbar .button:active,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .button:checked,
-.toolbar .button:checked:hover,
-.toolbar .button.raised:checked,
-.toolbar .raised .button:checked,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:checked:hover {
+toolbar .raised button:focus:checked {
 	background-image: linear-gradient(to bottom,
 		@button_active_gradient_color_a,
 		@button_active_gradient_color_b);
@@ -44,10 +27,7 @@ toolbar .raised button:focus:checked,
 
 trough,
 trough highlight,
-row trough,
-.trough,
-.trough.highlight,
-.trough row {
+row trough {
 	background-image: linear-gradient(to bottom,
 		@trough_bg_color_a,
 		@trough_bg_color_b);
@@ -64,16 +44,7 @@ toolbar button:checked:focus:hover,
 toolbar .raised button:checked:focus:hover,
 toolbar button:checked:focus:hover:active,
 toolbar .raised button:checked:focus:hover:active,
-row trough:hover,
-.button:checked:hover,
-.button:active:hover,
-.toolbar .button:active:hover,
-.toolbar .button.raised:active:hover,
-.toolbar .raised .button:active:hover,
-.toolbar .button:checked:hover,
-.toolbar .button.raised:checked:hover,
-.toolbar .raised .button:checked:hover,
-.trough row:hover {
+row trough:hover {
 	background-image: linear-gradient(to bottom,
 		shade (@button_active_gradient_color_a, 1.05),
 		shade (@button_active_gradient_color_b, 1.05));
@@ -82,11 +53,7 @@ row trough:hover,
 
 /* Primary and inline toolbars pushed button background */
 toolbar.primary-toolbar button:checked,
-toolbar.inline-toolbar button:checked,
-.primary-toolbar .button:checked,
-.inline-toolbar .button:checked,
-.primary-toolbar .button:active,
-.inline-toolbar .button:active {
+toolbar.inline-toolbar button:checked {
 	background-image: linear-gradient(to bottom,
 		@button_active_gradient_color_a,
 		@button_active_gradient_color_b);
@@ -94,11 +61,7 @@ toolbar.inline-toolbar button:checked,
 }
 
 toolbar.primary-toolbar button:checked:hover,
-toolbar.inline-toolbar button:checked:hover,
-.primary-toolbar .button:checked:hover,
-.inline-toolbar .button:checked:hover,
-.primary-toolbar .button:active:hover,
-.inline-toolbar .button:active:hover {
+toolbar.inline-toolbar button:checked:hover {
 	background-image: linear-gradient(to bottom,
 		shade (@button_active_gradient_color_a, 1.05),
 		shade (@button_active_gradient_color_b, 1.05));
@@ -109,12 +72,7 @@ toolbar.inline-toolbar button:checked:hover,
 button:hover,
 toolbar button:hover,
 toolbar .raised button:hover,
-toolbar combobox button.combo:hover,
-.button:hover,
-.toolbar .button:hover,
-.toolbar .button.raised:hover,
-.toolbar .raised .button:hover,
-.toolbar GtkComboBox .button:hover {
+toolbar combobox button.combo:hover {
 	background-color: transparent;
 	background-image: linear-gradient(to bottom,
 		@button_hover_gradient_color_a,
@@ -122,8 +80,7 @@ toolbar combobox button.combo:hover,
 }
 
 /* Prelit button on primary toolbar background */
-toolbar.primary-toolbar button:hover,
-.primary-toolbar .button:hover {
+toolbar.primary-toolbar button:hover {
 	background-color: transparent;
 	background-image: linear-gradient(to bottom,
 		@button_gradient_color_a,
@@ -133,11 +90,7 @@ toolbar.primary-toolbar button:hover,
 /* Insensitive button background */
 button:disabled,
 toolbar combobox button.combo:disabled,
-toolbar .raised button:disabled,
-.button:disabled,
-.toolbar GtkComboBox button:disabled,
-.toolbar .button.raised:disabled,
-.toolbar .raised .button:disabled {
+toolbar .raised button:disabled {
 	background-image: none;
 	background-color: @insensitive_bg_color;
 }
@@ -145,13 +98,7 @@ toolbar .raised button:disabled,
 /* Pushed + Insensitive button background */
 button:checked:disabled,
 toolbar button:checked:disabled,
-toolbar combobox button.combo:checked:disabled,
-.button:active:disabled,
-.button:checked:disabled,
-.toolbar .button:active:disabled,
-.toolbar .button:checked:disabled,
-.toolbar GtkComboBox .button:active:disabled,
-.toolbar GtkComboBox .button:checked:disabled {
+toolbar combobox button.combo:checked:disabled {
 	background-image: linear-gradient(to bottom,
 		shade(@insensitive_bg_color, 0.95),
 		@insensitive_bg_color 40%,
@@ -161,17 +108,10 @@ toolbar combobox button.combo:checked:disabled,
 
 /* Entry background */
 entry,
-combobox entry button,
-combobox entry button:hover,
-toolbar.primary-toolbar combobox entry button,
-toolbar.primary-toolbar combobox entry button:hover,
-levelbar trough,
-.entry,
-GtkComboBox.combobox-entry .button,
-GtkComboBox.combobox-entry .button:hover,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar GtkComboBox.combobox-entry .button:hover,
-.level-bar.trough {
+combobox button.combo:hover,
+toolbar.primary-toolbar combobox entry.combo,
+toolbar.primary-toolbar combobox button.combo:hover,
+levelbar trough {
 	background-image: linear-gradient(to bottom,
 		@entry_background_a,
 		@entry_background_b);
@@ -180,13 +120,8 @@ GtkComboBox.combobox-entry .button:hover,
 }
 
 /* Entry pushed button background */
-toolbar.primary-toolbar combobox entry button:checked,
-combobox entry button:checked,
-.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,
-GtkComboBox.combobox-entry .button:checked {
+toolbar.primary-toolbar combobox button.combo:checked,
+combobox button.combo:checked {
 	background-image: linear-gradient(to bottom,
 		shade(@entry_background_a, 0.9),
 		@entry_background_b);
@@ -205,16 +140,13 @@ column-header .button {
 }
 
 /* ie. yumex-dnf */
-stack treeview header button,
-GtkStack column-header .button {
+stack treeview header button {
     background-image: linear-gradient(to bottom,
                                       shade(@theme_bg_color, 1.18),
                                       shade(@theme_bg_color, 1.1));
 }
 
-treeview header button:hover,
-column-header.button:hover,
-column-header .button:hover {
+treeview header button:hover {
 	background-image: linear-gradient(to bottom,
 		shade(@entry_background_a, 0.96),
 		@entry_background_b);
@@ -224,17 +156,7 @@ column-header .button:hover {
 treeview header button:focus,
 treeview header button:checked,
 treeview header button:checked:hover,
-treeview header button:hover:active,
-column-header.button:focus,
-column-header .button:focus,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover {
+treeview header button:hover:active {
 	background-image: linear-gradient(to bottom,
 		shade(@entry_background_a, 0.92),
 		@entry_background_b);
@@ -245,11 +167,8 @@ column-header .button:active:hover {
 
 /* Insensitive entry background */
 entry:disabled,
-combobox entry button:disabled,
-levelbar trough:disabled,
-.entry:disabled,
-GtkComboBox.combobox-entry .button:disabled,
-.level-bar.trough:disabled {
+combobox button.combo:disabled,
+levelbar trough:disabled {
 	background-color: @insensitive_bg_color;
 	background-image: none;
 	box-shadow: none;
@@ -257,10 +176,7 @@ GtkComboBox.combobox-entry .button:disabled,
 
 /* Primary and inline toolbars background */
 toolbar.primary-toolbar,
-toolbar.inline-toolbar,
-.primary-toolbar .toolbar,
-.primary-toolbar.toolbar,
-.inline-toolbar.toolbar  {
+toolbar.inline-toolbar  {
 	background-image: linear-gradient(to bottom,
 		shade (@theme_bg_color, 1.0),
 		shade (@theme_bg_color, 0.96));
@@ -268,25 +184,20 @@ toolbar.inline-toolbar,
 }
 
 toolbar.primary-toolbar.vertical,
-toolbar.inline-toolbar.vertical,
-.primary-toolbar .toolbar.vertical,
-.primary-toolbar.toolbar.vertical,
-.inline-toolbar.toolbar.vertical {
+toolbar.inline-toolbar.vertical {
 	background-image: linear-gradient(to right,
 		shade (@theme_bg_color, 1.0),
 		shade (@theme_bg_color, 0.96));
 	background-color: transparent;
 }
 
-scale trough,
-.scale.trough {
+scale trough {
 	background-image: linear-gradient(to bottom,
 		@scale_trough_bg_a,
 		@scale_trough_bg_b);
 }
 
-scale.vertical trough,
-.scale.trough.vertical {
+scale.vertical trough {
 	background-image: linear-gradient(to right,
 		@scale_trough_bg_a,
 		@scale_trough_bg_b);
@@ -294,17 +205,14 @@ scale.vertical trough,
 
 /* Active switch background*/
 switch trough:active,
-scale progressbar,
-GtkSwitch.trough:active,
-.scale.progressbar {
+scale progressbar {
 	background-image: linear-gradient(to bottom,
 		@switch_trough_active_bg_a,
 		@switch_trough_active_bg_b);
 	background-color: transparent;
 }
 
-scale.vertical progressbar,
-.scale.progressbar.vertical {
+scale.vertical progressbar {
 	background-image: linear-gradient(to right,
 		@switch_trough_active_bg_a,
 		@switch_trough_active_bg_b);
@@ -317,12 +225,7 @@ progressbar progress,
 row progressbar progress,
 row:hover progressbar progress,
 row:selected progressbar progress,
-row:selected:focus progressbar progress,
-.progressbar,
-.progressbar row,
-.progressbar row:hover,
-.progressbar row:selected,
-.progressbar row:selected:focus {
+row:selected:focus progressbar progress {
 	background-image: linear-gradient(to left top,
 		alpha (@progressbar_pattern, 0.25),
 		alpha (@progressbar_pattern, 0.25) 25%,
@@ -339,8 +242,7 @@ row:selected:focus progressbar progress,
 	box-shadow: inset 1px 1px alpha(white, 0.2), inset -1px -1px alpha(white, 0.1);
 }
 
-progressbar.vertical progress,
-.progressbar.vertical {
+progressbar.vertical progress {
 	background-image: linear-gradient(to right top,
 		alpha (@progressbar_pattern, 0.25),
 		alpha (@progressbar_pattern, 0.25) 25%,
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
index 887fbe88..3b672ba0 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
@@ -3,17 +3,8 @@
 /* generic element borders (checked)*/
 entry,
 button:checked,
-combobox entry entry,
-combobox entry button,
-toolbar.inline-toolbar.vertical button:checked,
-.entry,
-.button:active,
-.button:checked,
-GtkComboBox.combobox-entry .entry,
-GtkComboBox.combobox-entry .button,
-.inline-toolbar.toolbar.vertical .button:active,
-.inline-toolbar.toolbar.vertical .button:checked {
-	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+toolbar.inline-toolbar.vertical button:checked {
+	border-image: url("borders/button-active.png") 3 4 5 4 / 3px 4px 5px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
 	border-style: solid;
@@ -21,25 +12,17 @@ GtkComboBox.combobox-entry .button,
 }
 
 trough,
-trough highlight,
-.trough,
-.trough.highlight {
+trough highlight {
 	border: 1px solid @borders;
 }
 
 entry:disabled,
 button:checked:disabled,
-combobox entry entry:disabled,
-combobox entry button:disabled,
+combobox entry.combo:disabled,
+combobox button.combo:disabled,
 toolbar.inline-toolbar.vertical button:disabled,
-toolbar.inline-toolbar.vertical button.default:disabled,
-.entry:disabled,
-.button:active:disabled,
-GtkComboBox.combobox-entry .entry:disabled,
-GtkComboBox.combobox-entry .button:disabled,
-.inline-toolbar.toolbar.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;
+toolbar.inline-toolbar.vertical button.default:disabled {
+	border-image: url("borders/button-active-ins.png") 3 4 5 4 / 3px 4px 5px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
 	border-style: solid;
@@ -51,22 +34,15 @@ button.default: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,
-.button:disabled,
-.button.default: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 {
-	border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+toolbar.inline-toolbar.vertical button.default:disabled {
+	border-image: url("borders/button-ins.png") 3 4 5 4 / 3px 4px 5px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
 	border-style: solid;
 	border-color: transparent;
 }
 
-row trough,
-.trough row {
+row trough {
 	border-image: url("borders/nohl-generic-border.png") 3 / 3px stretch;
 	border-radius: 4px;
 	border-width: 1px;
@@ -78,20 +54,10 @@ row trough,
 entry:focus,
 button:checked:focus,
 button.default:checked,
-combobox entry button:focus,
+combobox button.combo:focus,
 toolbar.inline-toolbar.vertical button:focus:checked,
-toolbar.inline-toolbar.vertical button.default:checked,
-.entry:focus,
-.button:active:focus,
-.button:checked:focus,
-.button.default:active,
-.button.default:checked,
-GtkComboBox.combobox-entry .button: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 {
-	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+toolbar.inline-toolbar.vertical button.default:checked {
+	border-image: url("borders/button-active-focus.png") 3 4 5 4 / 3px 4px 5px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
 	border-style: solid;
@@ -101,12 +67,8 @@ GtkComboBox.combobox-entry .button:focus,
 .titlebar button:hover,
 .titlebar button:hover:active,
 .titlebar button.titlebutton:hover,
-.titlebar button.titlebutton:hover:active,
-.titlebar .button:hover,
-.titlebar .titlebutton:hover,
-.titlebar .titlebutton:active,
-.titlebar .button:checked:checked {
-	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+.titlebar button.titlebutton:hover:active {
+	border-image: url("borders/button-active-focus.png") 3 4 5 4 / 3px 4px 5px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
 	border-style: solid;
@@ -114,7 +76,8 @@ GtkComboBox.combobox-entry .button:focus,
 }
 
 button,
-.button {
+combobox entry.combo,
+combobox button.combo {
 	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -122,8 +85,7 @@ button,
 	border-color: transparent;
 }
 
-toolbar.inline-toolbar.vertical button,
-.inline-toolbar.toolbar.vertical .button {
+toolbar.inline-toolbar.vertical button {
 	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -133,9 +95,7 @@ toolbar.inline-toolbar.vertical button,
 
 /* focused button borders */
 button.default,
-button:focus,
-.button.default,
-.button:focus { 
+button:focus {
 	border-image: url("borders/button-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -143,42 +103,35 @@ button:focus,
 	border-color: transparent;
 }
 
-button.flat:hover,
-.button.flat:hover {
+button.flat:hover {
 	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 }
 
 /* overrride for osd */
-toolbar.osd button:hover,
-.osd.toolbar .button:hover {
+toolbar.osd button:hover {
 	border-image: none;
 }
 
 /* primary toolbar button borders */
-toolbar.primary-toolbar button:hover,
-.primary-toolbar .button:hover {
+toolbar.primary-toolbar button:hover {
 	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	background-color: transparent;
 }
 
-toolbar.primary-toolbar button:checked,
-.primary-toolbar .button:active,
-.primary-toolbar .button:checked {
+toolbar.primary-toolbar button:checked {
 	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	background-color: transparent;
 }
 
 /* tooltip elements borders */
-tooltip entry,
-.tooltip .entry {
+tooltip entry {
 	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-width: 1px;
 	border-style: solid;
 	border-color: transparent;
 }
 
-tooltip button,
-.tooltip .button {
+tooltip button {
 	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-width: 1px;
 	border-style: solid;
@@ -186,8 +139,7 @@ tooltip button,
 }
 
 /* tooltip focused elements borders */
-tooltip entry:focus,
-.tooltip .entry:focus {
+tooltip entry:focus {
 	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-width: 1px;
 	border-style: solid;
@@ -201,21 +153,7 @@ toolbar.primary-toolbar combobox button.combo:checked,
 toolbar.primary-toolbar button:checked,
 toolbar.primary-toolbar .raised button:checked,
 toolbar.inline-toolbar .button:checked,
-toolbar.primary-toolbar switch trough,
-.primary-toolbar .entry,
-.primary-toolbar GtkComboBox.combobox-entry .entry,
-.primary-toolbar GtkComboBox.combobox-entry .button,
-.primary-toolbar .button:active,
-.primary-toolbar .button.raised:active,
-.primary-toolbar .raised .button:active,
-.inline-toolbar.toolbar .button:active,
-.primary-toolbar .button:checked,
-.primary-toolbar .button.raised:checked,
-.primary-toolbar .raised .button:checked,
-.inline-toolbar.toolbar .button:checked,
-.primary-toolbar GtkSwitch.trough,
-.primary-toolbar GtkComboBox .button:checked,
-.primary-toolbar GtkComboBox .button:active {
+toolbar.primary-toolbar switch trough {
 	border-image: url("borders/button-active.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -227,14 +165,7 @@ toolbar.primary-toolbar .raised button:disabled,
 toolbar.primary-toolbar .raised button.default:disabled,
 toolbar.primary-toolbar switch trough:disabled,
 toolbar.primary-toolbar switch trough:checked:disabled,
-toolbar.primary-toolbar combobox button:disabled,
-.primary-toolbar .button.raised:disabled,
-.primary-toolbar .raised .button:disabled,
-.primary-toolbar .button.raised.default:disabled,
-.primary-toolbar .raised .button.default:disabled,
-.primary-toolbar GtkSwitch.trough:disabled,
-.primary-toolbar GtkSwitch.trough:active:disabled,
-.primary-toolbar GtkComboBox .button:disabled {
+toolbar.primary-toolbar combobox button.combo:disabled {
 	border-image: url("borders/button-active-ins.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -247,17 +178,7 @@ toolbar.primary-toolbar button:focus:checked,
 toolbar.primary-toolbar entry:focus,
 toolbar.primary-toolbar combobox entry.combo:focus,
 toolbar.primary-toolbar .raised button.default:checked,
-toolbar.inline-toolbar button.default:checked,
-.primary-toolbar .button:active:focus,
-.primary-toolbar .entry:focus,
-.primary-toolbar GtkComboBox.combobox-entry .entry:focus,
-.primary-toolbar .button.raised.default:checked,
-.primary-toolbar .raised .button.default:checked,
-.inline-toolbar.toolbar .button.default:checked,
-.primary-toolbar .button.raised.default:active,
-.primary-toolbar .raised .button.default:active,
-.inline-toolbar.toolbar .button.default:active {
-	/*border-image: url("borders/primary-toolbar-generic-border-focused.png") 4 / 4px stretch;*/
+toolbar.inline-toolbar button.default:checked {
 	border-image: url("borders/button-active-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 3px;
 	border-width: 2px;
@@ -268,11 +189,7 @@ toolbar.inline-toolbar button.default:checked,
 /* primary toolbar - generic button borders (normal state)*/
 toolbar.primary-toolbar .raised button,
 toolbar.inline-toolbar button,
-toolbar.primary-toolbar combobox button.combo,
-.primary-toolbar .button.raised,
-.primary-toolbar .raised .button,
-.inline-toolbar.toolbar .button,
-.primary-toolbar GtkComboBox .button {
+toolbar.primary-toolbar combobox button.combo {
 	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -282,10 +199,7 @@ toolbar.primary-toolbar combobox button.combo,
 
 /* primary toolbar - focused button borders */
 toolbar.primary-toolbar .raised button.default,
-toolbar.inline-toolbar button.default,
-.primary-toolbar .button.raised.default,
-.primary-toolbar .raised .button.default,
-.inline-toolbar.toolbar .button.default {
+toolbar.inline-toolbar button.default {
 	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 4px;
 	border-width: 2px;
@@ -299,19 +213,7 @@ treeview header button:active,
 treeview header button:hover:active,
 treeview header button:checked,
 treeview header button:checked:hover,
-treeview header button:disabled,
-column-header.button,
-column-header .button,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header.button:disabled,
-column-header .button:disabled {
+treeview header button:disabled {
 	border-width: 0 1px 1px 0;
 	border-radius: 0;
 	border-style: solid;
@@ -323,18 +225,7 @@ treeview header button:active,
 treeview header button:hover:active,
 treeview header button:checked,
 treeview header button:checked:hover,
-treeview header button.dnd,
-column-header.button,
-column-header .button,
-column-header.button:active,
-column-header .button:active,
-column-header.button:active:hover,
-column-header .button:active:hover,
-column-header.button:checked,
-column-header .button:checked,
-column-header.button:checked:hover,
-column-header .button:checked:hover,
-column-header .button.dnd {
+treeview header button.dnd {
 	border-image: linear-gradient(to top,
 		alpha(@theme_base_color, 0.0),
 		shade(@borders, 1.0)) 0 1 1 0;
@@ -342,8 +233,7 @@ column-header .button.dnd {
 
 /* ie. yumex-dnf */
 stack treeview header button,
-stack treeview header button:focus,
-GtkStack column-header .button {
+stack treeview header button:focus {
     border-width: 0px 1px 1px 0px;
     border-color: transparent;
     border-style: solid;
@@ -353,9 +243,7 @@ GtkStack column-header .button {
                                   shade(@borders, 1.0)) 0 1 1 0;
 }
 
-treeview header button:disabled,
-column-header.button:disabled,
-column-header .button:disabled {
+treeview header button:disabled {
 	border-image: linear-gradient(to top,
 		alpha(@theme_base_color, 0.0),
 		@insensitive_bg_color) 0 1 1 0;
@@ -365,23 +253,11 @@ treeview header button:last-child,
 treeview header button:active:last-child,
 treeview header button:hover:active:last-child,
 treeview header button:checked:last-child,
-treeview header button:checked:hover:last-child,
-column-header.button:last-child,
-column-header:last-child .button,
-column-header.button:last-child:active,
-column-header:last-child .button:active,
-column-header.button:last-child:active:hover,
-column-header:last-child .button:active:hover,
-column-header.button:last-child:checked,
-column-header:last-child .button:checked,
-column-header.button:last-child:checked:hover,
-column-header:last-child .button:checked:hover {
+treeview header button:checked:hover:last-child {
 	border-right-width: 0;
 }
 
-treeview header button:focus
-column-header.button:focus,
-column-header .button:focus {
+treeview header button:focus {
 	border-image: linear-gradient(to top,
 		alpha(@theme_base_color, 0.0),
 		shade(@borders, 1.0)) 0 1 1 0;
@@ -391,9 +267,7 @@ column-header .button:focus {
 
 /* pushed colored buttons borders */
 toolbar.selection-mode button.suggested-action,
-toolbar.selection-mode GtkToolButton.suggested-action button,
-.selection-mode.toolbar .suggested-action.button,
-.selection-mode.toolbar GtkToolButton.suggested-action .button {
+toolbar.selection-mode toolbutton button.suggested-action {
 	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 3px;
 	border-width: 0px 0px 2px 0px;
@@ -404,11 +278,7 @@ toolbar.selection-mode GtkToolButton.suggested-action button,
 
 /* suggested action buttons borders */
 button.suggested-action,
-button.suggested-action:checked,
-button.suggested-action:active,
-.suggested-action.button,
-.suggested-action.button:checked,
-.suggested-action.button:active {
+button.suggested-action:checked {
 	border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 	border-radius: 3px;
 	border-width: 2px;
@@ -419,11 +289,7 @@ button.suggested-action:active,
 
 /* destructive action buttons borders */
 button.destructive-action,
-button.destructive-action:checked,
-button.destructive-action:active,
-.destructive-action.button,
-.destructive-action.button:checked,
-.destructive-action.button:active {
+button.destructive-action:checked {
     border-image: url("borders/button-focus.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
     border-radius: 3px;
     border-width: 2px;
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index 7cf240f5..b47aa74d 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -137,7 +137,8 @@ tooltip.background {
 }
 
 tooltip decoration {
-    background-color: transparent;
+    background-color: alpha(shade(@theme_selected_bg_color, 1.0), 0.4);
+    border-radius: 4px;
 }
 
 tooltip * {
@@ -548,7 +549,12 @@ spinbutton button,
 spinbutton button:focus,
 spinbutton button:active,
 spinbutton button:focus:active,
-spinbutton button:disabled {
+spinbutton button:disabled,
+row.activatable spinbutton button,
+row.activatable spinbutton button:focus,
+row.activatable spinbutton button:active,
+row.activatable spinbutton button:focus:active,
+row.activatable spinbutton button:disabled {
     border-style: none;
     border-image: none;
     padding: 5px;
@@ -557,7 +563,9 @@ spinbutton button:disabled {
 }
 
 spinbutton button,
-spinbutton button:focus {
+spinbutton button:focus,
+row.activatable spinbutton button,
+row.activatable spinbutton button:focus {
     background-image: linear-gradient(to bottom,
                                       @button_gradient_color_a,
                                       @button_gradient_color_b);
@@ -565,7 +573,8 @@ spinbutton button:focus {
     color: @internal_element_color;
 }
 
-spinbutton button:hover {
+spinbutton button:hover,
+row.activatable spinbutton button:hover {
     background-color: transparent;
     background-image: linear-gradient(to bottom,
                                       @button_hover_gradient_color_a,
@@ -573,8 +582,9 @@ spinbutton button:hover {
     color: @internal_element_prelight;
 }
 
-spinbutton button:active,
-spinbutton button:hover:active {
+spinbutton button:checked,
+spinbutton button:hover:active,
+row.activatable spinbutton button:checked {
     background-image: linear-gradient(to bottom,
                                       @button_active_gradient_color_a,
                                       @button_active_gradient_color_b);
@@ -586,11 +596,13 @@ spinbutton button:disabled {
     color: @internal_element_insensitive;
 }
 
-spinbutton button:first-child {
+spinbutton button:first-child,
+row.activatable spinbutton button {
     border-radius: 0px;
 }
 
-spinbutton button:last-child {
+spinbutton button:last-child,
+row.activatable spinbutton button {
     border-radius: 0 3px 3px 0;
 }
 
@@ -600,6 +612,8 @@ spinbutton button:dir(rtl) {
 
 spinbutton.horizontal entry,
 spinbutton.horizontal entry:focus,
+row.activatable spinbutton.horizontal entry,
+row.activatable spinbutton.horizontal entry:focus,
 stack box.vertical.linked spinbutton.horizontal entry,
 stack box.vertical.linked spinbutton.horizontal entry:focus {
     padding: 5px 10px 5px 4px;
@@ -610,6 +624,8 @@ stack box.vertical.linked spinbutton.horizontal entry:focus {
 
 spinbutton.horizontal button,
 spinbutton.horizontal button:focus,
+row.activatable spinbutton.horizontal button,
+row.activatable spinbutton.horizontal button:focus,
 stack box.vertical.linked spinbutton.horizontal button,
 stack box.vertical.linked spinbutton.horizontal button:focus {
     padding: 0px 6px 0px 6px;
@@ -1166,11 +1182,7 @@ button.file,
 button.toggle.popup,
 button.link,
 combobox,
-combobox button.combo,
-.button,
-.button.menuitem.menubar,
-GtkColorButton.button,
-GtkComboBox.combobox-entry .button {
+combobox button.combo {
     -gtk-icon-style: regular;
 	padding: 4px;
     min-height: 20px;
@@ -1181,39 +1193,28 @@ button.image-button.toggle.popup {
 	padding: 6px;
 }
 
-button.text-button.toggle,
-GtkToggleButton.button {
+button.text-button.toggle {
 	padding: 5px 4px;
 }
 
 button.image-button,
-toolbar.primary-toolbar button.image-button,
-.button.image-button,
-.primary-toolbar.toolbar .button.image-button {
+toolbar.primary-toolbar button.image-button {
 	padding: 4px;
 }
 
-button,
-.button {
+button {
 	transition: all 400ms ease-out;
-/*	-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;
 }
 
-button.default,
-.button.default {
+button.default {
 	text-shadow: none;
 	color: @theme_fg_color;
 }
 
-button.flat,
-.button.flat {
+button.flat {
 	border-color: transparent;
 	background-color: transparent;
 	background-image: none;
@@ -1223,8 +1224,7 @@ button.flat,
 	border-image: none; 
 }
 
-button.flat:hover,
-.button.flat:hover {
+button.flat:hover {
     background-color: transparent;
     background-image: linear-gradient(to bottom,
                                       @button_gradient_color_a,
@@ -1232,8 +1232,7 @@ button.flat:hover,
 	border-radius: 1px;
 }
 
-button.image-button.circular-button,
-.button.image-button.circular-button {
+button.image-button.circular-button {
     border-image: none;
     border-width: 1px;
     border-style: solid;
@@ -1256,17 +1255,13 @@ button.toggle.popup image:disabled {
 
 /* 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,
-.primary-toolbar .button,
-.primary-toolbar .button:disabled,
-.primary-toolbar .button *:disabled {
+toolbar.primary-toolbar button:disabled {
 	background-image: none;
 	background-color: transparent;
 }
 
 /* Remove borders from primary toolbar buttons*/
-toolbar.primary-toolbar button,
-.primary-toolbar .button {
+toolbar.primary-toolbar button {
 	border-image: none;
 
 	/* setting border-style: none; here would override the border-width values 
@@ -1280,52 +1275,31 @@ toolbar.primary-toolbar button,
 
 toolbar.primary-toolbar button:checked,
 toolbar.inline-toolbar button:checked,
-button:checked,
-.primary-toolbar .button:active,
-.inline-toolbar .button:active,
-.button:active,
-.primary-toolbar .button:checked,
-.inline-toolbar .button:checked,
-.button:checked {
+button:checked {
 	color: @button_active_text;
 	text-shadow: 0 1px @button_active_text_shadow;
 }
 
 button:disabled,
-button:checked:disabled,
-.button:disabled,
-.button:active *:disabled,
-.button:checked *:disabled {
+button:checked:disabled {
 	color: @insensitive_fg_color;
 	text-shadow: none;
 }
 
 toolbar .raised button,
-toolbar.inline-toolbar button,
-.toolbar .button.raised,
-.toolbar .raised .button,
-.inline-toolbar .button {
+toolbar.inline-toolbar button {
 	-gtk-icon-shadow: 0 1px @button_text_shadow;
 	text-shadow: 0 1px @button_text_shadow;
 }
 
 toolbar .raised button:checked,
-toolbar.inline-toolbar button:checked,
-.toolbar .button.raised:active,
-.toolbar .raised .button:active,
-.inline-toolbar .button:active
-.toolbar .button.raised:checked,
-.toolbar .raised .button:checked,
-.inline-toolbar .button:checked {
+toolbar.inline-toolbar button:checked {
 	-gtk-icon-shadow: 0 1px @button_active_text_shadow;
 	text-shadow: 0 1px @button_active_text_shadow;
 }
 
 toolbar .raised button:disabled,
-toolbar.inline-toolbar button:disabled,
-.toolbar .button.raised:disabled,
-.toolbar .raised .button:disabled,
-.inline-toolbar .button:disabled {
+toolbar.inline-toolbar button:disabled {
 	-gtk-icon-shadow: none;
 	text-shadow: none;
 }
@@ -1334,12 +1308,11 @@ toolbar.inline-toolbar button:disabled,
 
 /* Set up shadows and hilights for button visual separation */
 .linked entry,
-.linked .entry {
+.linked entry:backdrop {
 	box-shadow: inset -1px 0 @inset_dark_color;
 }
 
-.linked entry:focus,
-.linked .entry:focus {
+.linked entry:focus {
 	box-shadow: inset 1px 0 @inset_dark_color,
 		inset -1px 0 @inset_dark_color,
 		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
@@ -1348,8 +1321,7 @@ toolbar.inline-toolbar button:disabled,
 
 }
 
-.linked entry:focus:first-child,
-.linked .entry:focus:first-child {
+.linked entry:focus:first-child {
 	box-shadow: inset -1px 0 @inset_dark_color,
 		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
 		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
@@ -1357,8 +1329,7 @@ toolbar.inline-toolbar button:disabled,
 
 }
 
-.linked entry:focus:last-child,
-.linked .entry:focus:last-child {
+.linked entry:focus:last-child {
 	box-shadow: inset 1px 0 @inset_dark_color,
 		inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
 		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
@@ -1371,12 +1342,7 @@ toolbar.inline-toolbar button:disabled,
 .linked combobox button.combo,
 toolbar .raised.linked button,
 toolbar.inline-toolbar button,
-toolbar.inline-toolbar toolbutton > button,
-.linked .button,
-.toolbar .button.raised.linked,
-.toolbar .raised.linked .button,
-.inline-toolbar.toolbar .button,
-.inline-toolbar.toolbar GtkToolButton > .button {
+toolbar.inline-toolbar toolbutton > button {
 	box-shadow: inset 1px 0 @inset_light_color, inset -1px 0 @inset_dark_color;
 }
 
@@ -1384,12 +1350,7 @@ toolbar.inline-toolbar toolbutton > button,
 .linked combobox:first-child button.combo:first-child,
 toolbar .raised.linked button:first-child,
 toolbar.inline-toolbar button:first-child,
-toolbar.inline-toolbar toolbutton > button:first-child,
-.linked .button:first-child,
-.toolbar .button.raised.linked:first-child,
-.toolbar .raised.linked .button:first-child,
-.inline-toolbar.toolbar .button:first-child,
-.inline-toolbar.toolbar GtkToolButton:first-child > .button {
+toolbar.inline-toolbar toolbutton > button:first-child {
 	box-shadow: inset -1px 0 @inset_dark_color;
 }
 
@@ -1397,12 +1358,7 @@ toolbar.inline-toolbar toolbutton > button:first-child,
 .linked combobox:last-child button.combo:last-child,
 toolbar .raised.linked button:last-child,
 toolbar.inline-toolbar button:last-child,
-toolbar.inline-toolbar toolbutton > button:last-child,
-.linked .button:last-child,
-.toolbar .button.raised.linked:last-child,
-.toolbar .raised.linked .button:last-child,
-.inline-toolbar.toolbar .button:last-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button {
+toolbar.inline-toolbar toolbutton > button:last-child {
 	box-shadow: inset 1px 0 @inset_light_color;
 }
 
@@ -1410,17 +1366,7 @@ toolbar.inline-toolbar toolbutton > button:last-child,
 .linked combobox button.combo:checked,
 toolbar .raised.linked button:checked,
 toolbar.inline-toolbar button:checked,
-toolbar.inline-toolbar toolbutton > button:checked,
-.linked .button:active,
-.toolbar .button.raised.linked:active,
-.toolbar .raised.linked .button:active,
-.inline-toolbar.toolbar .button:active,
-.inline-toolbar.toolbar GtkToolButton > .button:active,
-.linked .button:checked,
-.toolbar .button.raised.linked:checked,
-.toolbar .raised.linked .button:checked,
-.inline-toolbar.toolbar .button:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:checked {
+toolbar.inline-toolbar toolbutton > button:checked {
 	box-shadow: inset 1px 0 @inset_dark_color;
 }
 
@@ -1428,12 +1374,7 @@ toolbar.inline-toolbar toolbutton > button:checked,
 .linked combobox button.combo:disabled,
 toolbar .raised.linked button:disabled,
 toolbar.inline-toolbar button:disabled,
-toolbar.inline-toolbar toolbutton > button:disabled,
-.linked .button:disabled,
-.toolbar .button.raised.linked:disabled,
-.toolbar .raised.linked .button:disabled,
-.inline-toolbar.toolbar .button:disabled,
-.inline-toolbar.toolbar GtkToolButton > .button:disabled {
+toolbar.inline-toolbar toolbutton > button:disabled {
 	box-shadow: inset -1px 0 @inset_dark_color;
 }
 
@@ -1444,15 +1385,7 @@ toolbar .raised.linked button:disabled:last-child,
 toolbar.inline-toolbar button:disabled:last-child,
 toolbar.inline-toolbar button:only-child,
 toolbar.inline-toolbar toolbutton > button:disabled:last-child,
-toolbar.inline-toolbar toolbutton > button:only-child,
-.linked .button:disabled:last-child,
-.linked .button:only-child,
-.toolbar .button.raised.linked:disabled:last-child,
-.toolbar .raised.linked .button:disabled:last-child,
-.inline-toolbar.toolbar .button:disabled:last-child,
-.inline-toolbar.toolbar .button:only-child,
-.inline-toolbar.toolbar GtkToolButton:last-child > .button:disabled,
-.inline-toolbar.toolbar GtkToolButton:only-child > .button {
+toolbar.inline-toolbar toolbutton > button:only-child {
 	box-shadow: none; 
 }
 
@@ -1464,35 +1397,17 @@ toolbar.inline-toolbar toolbutton > button:only-child:checked,
 .linked button:first-child:checked,
 toolbar .raised.linked button:first-child:checked,
 toolbar.inline-toolbar button:first-child:checked,
-toolbar.inline-toolbar toolbutton > button:first-child:checked,
-.linked .button:only-child:active,
-.toolbar .button.raised.linked:only-child:active,
-.toolbar .raised.linked .button:only-child:active,
-.inline-toolbar.toolbar .button:only-child:active,
-.inline-toolbar.toolbar GtkToolButton > .button:only-child:active,
-.linked .button:first-child:active,
-.toolbar .button.raised.linked:first-child:active,
-.toolbar .raised.linked .button:first-child:active,
-.inline-toolbar.toolbar .button:first-child:active,
-.inline-toolbar.toolbar GtkToolButton > .button:first-child:active,
-.linked .button:only-child:checked,
-.toolbar .button.raised.linked:only-child:checked,
-.toolbar .raised.linked .button:only-child:checked,
-.inline-toolbar.toolbar .button:only-child:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:only-child:checked,
-.linked .button:first-child:checked,
-.toolbar .button.raised.linked:first-child:checked,
-.toolbar .raised.linked .button:first-child:checked,
-.inline-toolbar.toolbar .button:first-child:checked,
-.inline-toolbar.toolbar GtkToolButton > .button:first-child:checked {
+toolbar.inline-toolbar toolbutton > button:first-child:checked {
 	box-shadow: inset 0 1px 1px alpha(black, 0.1);
 }
 
 /* Middle button */
 .linked entry,
+.linked entry:backdrop,
 .linked > combobox > button.combo,
 .linked > combobox > button.combo:focus,
 .linked > combobox > button.combo:disabled,
+.linked > combobox > button.combo:backdrop,
 .linked > combobox > button.combo:focus:active,
 .linked > combobox > button.combo:checked,
 .linked > combobox > button.combo:focus:active,
@@ -1505,26 +1420,7 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 .linked button:checked,
 .linked button:checked:active,
 .linked button:checked:hover,
-.linked button:disabled,
-.linked .entry,
-.linked > GtkComboBox > .button:last-child,
-.linked > GtkComboBox > .button:focus:last-child,
-.linked > GtkComboBox > .button:disabled:last-child,
-.linked > GtkComboBox > .button:active:last-child,
-.linked > GtkComboBox > .button:focus:active:last-child,
-.linked > GtkComboBox > .button:checked:last-child,
-.linked > GtkComboBox > .button:focus:checked:last-child,
-.linked > GtkComboBox > .button:hover:last-child,
-.linked > GtkComboBox > .button:active:hover:last-child,
-.linked > GtkComboBox > .button:checked:hover:last-child,
-.linked .button,
-.linked .button:hover, /* gtk-widget-factory middle page button */
-.linked .button:active,
-.linked .button:active:hover,
-.linked .button:checked,
-.linked .button:checked:checked, /* gtk-widget-factory middle page button */
-.linked .button:checked:hover,
-.linked .button:disabled {
+.linked button:disabled {
 	border-right-width: 0;
 	border-left-width: 0;
 	border-image-width: 3px 0 4px 0;
@@ -1533,9 +1429,11 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 
 /* Leftmost button */
 .linked entry:first-child,
+.linked entry:backdrop:first-child,
 .linked > combobox:first-child > button.combo:first-child,
 .linked > combobox:first-child > button.combo:focus:first-child,
 .linked > combobox:first-child > button.combo:disabled:first-child,
+.linked > combobox:first-child > button.combo:backdrop:first-child,
 .linked > combobox:first-child > button.combo:focus:active:first-child,
 .linked > combobox:first-child > button.combo:checked:first-child,
 .linked > combobox:first-child > button.combo:focus:checked:first-child,
@@ -1546,24 +1444,7 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 .linked button:hover:active:first-child,
 .linked button:checked:first-child,
 .linked button:checked:hover:first-child,
-.linked button:disabled:first-child,
-.linked .entry:first-child,
-.linked > GtkComboBox:first-child > .button:last-child,
-.linked > GtkComboBox:first-child > .button:focus:last-child,
-.linked > GtkComboBox:first-child > .button:disabled:last-child,
-.linked > GtkComboBox:first-child > .button:active:last-child,
-.linked > GtkComboBox:first-child > .button:focus:active:last-child,
-.linked > GtkComboBox:first-child > .button:checked:first-child:last-child,
-.linked > GtkComboBox:first-child > .button:focus:checked:first-child:last-child,
-.linked > GtkComboBox:first-child > .button:hover:first-child:last-child,
-.linked > GtkComboBox:first-child > .button:active:hover:last-child,
-.linked > GtkComboBox:first-child > .button:checked:hover:last-child,
-.linked .button:first-child,
-.linked .button:active:first-child,
-.linked .button:active:hover:first-child,
-.linked .button:checked:first-child,
-.linked .button:checked:hover:first-child,
-.linked .button:disabled:first-child {
+.linked button:disabled:first-child {
 	border-right-width: 0;
 	border-left-width: 2px;
 	border-image-width: 3px 0 4px 4px;
@@ -1573,9 +1454,11 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 
 /* Rightmost button */
 .linked entry:last-child,
-.linked > combobox:last-child > button.combo,
+.linked entry:backdrop:last-child,
 .linked > combobox:last-child > button.combo:last-child,
+.linked > combobox:last-child > button.combo:focus:last-child,
 .linked > combobox:last-child > button.combo:disabled:last-child,
+.linked > combobox:last-child > button.combo:backdrop:last-child,
 .linked > combobox:last-child > button.combo:focus:active:last-child,
 .linked > combobox:last-child > button.combo:checked:last-child,
 .linked > combobox:last-child > button.combo:focus:checked:last-child,
@@ -1586,24 +1469,7 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 .linked button:hover:active:last-child,
 .linked button:checked:last-child,
 .linked button:checked:hover:last-child,
-.linked button:disabled:last-child,
-.linked .entry:last-child,
-.linked > GtkComboBox:last-child > .button,
-.linked > GtkComboBox:last-child > .button:last-child,
-.linked > GtkComboBox:last-child > .button:disabled:last-child,
-.linked > GtkComboBox:last-child > .button:active:last-child,
-.linked > GtkComboBox:last-child > .button:focus:active:last-child,
-.linked > GtkComboBox:last-child > .button:checked:last-child,
-.linked > GtkComboBox:last-child > .button:focus:checked:last-child,
-.linked > GtkComboBox:last-child > .button:hover:last-child,
-.linked > GtkComboBox:last-child > .button:active:hover:last-child,
-.linked > GtkComboBox:last-child > .button:checked:hover:last-child,
-.linked .button:last-child,
-.linked .button:active:last-child,
-.linked .button:active:hover:last-child,
-.linked .button:checked:last-child,
-.linked .button:checked:hover:last-child,
-.linked .button:disabled:last-child {
+.linked button:disabled:last-child {
 	border-right-width: 2px;
 	border-left-width: 0;
 	border-image-width: 3px 4px 4px 0;
@@ -1613,9 +1479,11 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 
 /* Linked single button */
 .linked entry:only-child,
-.linked > combobox:only-child > button.combo,
+.linked entry:backdrop:only-child,
 .linked > combobox:only-child > button.combo:only-child,
+.linked > combobox:only-child > button.combo:focus:only-child,
 .linked > combobox:only-child > button.combo:disabled:only-child,
+.linked > combobox:only-child > button.combo:backdrop:only-child,
 .linked > combobox:only-child > button.combo:hover:only-child,
 .linked > combobox:only-child > button.combo:hover:active:only-child,
 .linked > combobox:only-child > button.combo:focus:active:only-child,
@@ -1626,24 +1494,7 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 .linked button:hover:active:only-child,
 .linked button:checked:only-child,
 .linked button:checked:hover:only-child,
-.linked button:disabled:only-child,
-.linked .entry:only-child,
-.linked > GtkComboBox:only-child > .button,
-.linked > GtkComboBox:only-child > .button:only-child,
-.linked > GtkComboBox:only-child > .button:disabled:only-child,
-.linked > GtkComboBox:only-child > .button:hover:only-child,
-.linked > GtkComboBox:only-child > .button:active:only-child,
-.linked > GtkComboBox:only-child > .button:active:hover:only-child,
-.linked > GtkComboBox:only-child > .button:focus:active:only-child,
-.linked > GtkComboBox:only-child > .button:checked:only-child,
-.linked > GtkComboBox:only-child > .button:checked:hover:only-child,
-.linked > GtkComboBox:only-child > .button:focus:checked:only-child,
-.linked .button:only-child,
-.linked .button:active:only-child,
-.linked .button:active:hover:only-child,
-.linked .button:checked:only-child,
-.linked .button:checked:hover:only-child,
-.linked .button:disabled:only-child {
+.linked button:disabled:only-child {
 	border-right-width: 1px;
 	border-left-width: 1px;
 	border-image-width: 3px 4px 4px 4px;
@@ -1654,6 +1505,7 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 .linked.vertical > combobox > button.combo,
 .linked.vertical > combobox > button.combo:focus,
 .linked.vertical > combobox > button.combo:disabled,
+.linked.vertical > combobox > button.combo:backdrop,
 .linked.vertical > combobox > button.combo:focus:active,
 .linked.vertical > combobox > button.combo:checked,
 .linked.vertical > combobox > button.combo:focus:checked,
@@ -1661,28 +1513,12 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 .linked.vertical > combobox > button.combo:hover:active,
 .linked.vertical > combobox > button.combo:checked:hover,
 .linked.vertical entry,
+.linked.vertical entry:backdrop,
 .linked.vertical button,
 .linked.vertical button:hover:active,
 .linked.vertical button:checked,
 .linked.vertical button:checked:hover,
-.linked.vertical button:disabled,
-.linked.vertical > GtkComboBox > .button:last-child,
-.linked.vertical > GtkComboBox > .button:focus:last-child,
-.linked.vertical > GtkComboBox > .button:disabled:last-child,
-.linked.vertical > GtkComboBox > .button:active:last-child,
-.linked.vertical > GtkComboBox > .button:focus:active:last-child,
-.linked.vertical > GtkComboBox > .button:checked:last-child,
-.linked.vertical > GtkComboBox > .button:focus:checked:last-child,
-.linked.vertical > GtkComboBox > .button:hover:last-child,
-.linked.vertical > GtkComboBox > .button:active:hover:last-child,
-.linked.vertical > GtkComboBox > .button:checked:hover:last-child,
-.linked.vertical .entry,
-.linked.vertical .button,
-.linked.vertical .button:active,
-.linked.vertical .button:active:hover,
-.linked.vertical .button:checked,
-.linked.vertical .button:checked:hover,
-.linked.vertical .button:disabled {
+.linked.vertical button:disabled {
 	border-top-width: 0px;
 	border-bottom-width: 0px;
 	border-right-width: 1px;
@@ -1695,35 +1531,20 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 .linked.vertical > combobox:first-child > button.combo:first-child,
 .linked.vertical > combobox:first-child > button.combo:focus:first-child,
 .linked.vertical > combobox:first-child > button.combo:disabled:first-child,
+.linked.vertical > combobox:first-child > button.combo:backdrop:first-child,
 .linked.vertical > combobox:first-child > button.combo:focus:active:first-child,
 .linked.vertical > combobox:first-child > button.combo:checked:first-child,
 .linked.vertical > combobox:first-child > button.combo:focus:checked:first-child,
-.linked.vertical > combobox:first-child > button.combo:hover:first-child:first-child,
+.linked.vertical > combobox:first-child > button.combo:hover:first-child,
 .linked.vertical > combobox:first-child > button.combo:hover:active:first-child,
 .linked.vertical > combobox:first-child > button.combo:checked:hover:first-child,
 .linked.vertical entry:first-child,
+.linked.vertical entry:backdrop:first-child,
 .linked.vertical button:first-child,
 .linked.vertical button:hover:active:first-child,
 .linked.vertical button:checked:first-child,
 .linked.vertical button:checked:hover:first-child,
-.linked.vertical button:disabled:first-child,
-.linked.vertical > GtkComboBox:first-child > .button:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:focus:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:disabled:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:active:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:focus:active:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:checked:first-child:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:focus:checked:first-child:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:hover:first-child:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:active:hover:last-child,
-.linked.vertical > GtkComboBox:first-child > .button:checked:hover:last-child,
-.linked.vertical .entry:first-child,
-.linked.vertical .button:first-child,
-.linked.vertical .button:active:first-child,
-.linked.vertical .button:active:hover:first-child,
-.linked.vertical .button:checked:first-child,
-.linked.vertical .button:checked:hover:first-child,
-.linked.vertical .button:disabled:first-child {
+.linked.vertical button:disabled:first-child {
 	border-bottom-width: 0px;
 	border-top-width: 1px;
 	border-right-width: 1px;
@@ -1733,9 +1554,10 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 }
 
 /* Bottom button (vertical) */
-.linked.vertical > combobox:last-child > button.combo,
 .linked.vertical > combobox:last-child > button.combo:last-child,
+.linked.vertical > combobox:last-child > button.combo:focus:last-child,
 .linked.vertical > combobox:last-child > button.combo:disabled:last-child,
+.linked.vertical > combobox:last-child > button.combo:backdrop:last-child,
 .linked.vertical > combobox:last-child > button.combo:focus:active:last-child,
 .linked.vertical > combobox:last-child > button.combo:checked:last-child,
 .linked.vertical > combobox:last-child > button.combo:focus:checked:last-child,
@@ -1743,28 +1565,12 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 .linked.vertical > combobox:last-child > button.combo:hover:active:last-child,
 .linked.vertical > combobox:last-child > button.combo:checked:hover:last-child,
 .linked.vertical entry:last-child,
+.linked.vertical entry:backdrop:last-child,
 .linked.vertical button:last-child,
 .linked.vertical button:hover:active:last-child,
 .linked.vertical button:checked:last-child,
 .linked.vertical button:checked:hover:last-child,
-.linked.vertical button:disabled:last-child,
-.linked.vertical > GtkComboBox:last-child > .button,
-.linked.vertical > GtkComboBox:last-child > .button:last-child,
-.linked.vertical > GtkComboBox:last-child > .button:disabled:last-child,
-.linked.vertical > GtkComboBox:last-child > .button:active:last-child,
-.linked.vertical > GtkComboBox:last-child > .button:focus:active:last-child,
-.linked.vertical > GtkComboBox:last-child > .button:checked:last-child,
-.linked.vertical > GtkComboBox:last-child > .button:focus:checked:last-child,
-.linked.vertical > GtkComboBox:last-child > .button:hover:last-child,
-.linked.vertical > GtkComboBox:last-child > .button:active:hover:last-child,
-.linked.vertical > GtkComboBox:last-child > .button:checked:hover:last-child,
-.linked.vertical .entry:last-child,
-.linked.vertical .button:last-child,
-.linked.vertical .button:active:last-child,
-.linked.vertical .button:active:hover:last-child,
-.linked.vertical .button:checked:last-child,
-.linked.vertical .button:checked:hover:last-child,
-.linked.vertical .button:disabled:last-child {
+.linked.vertical button:disabled:last-child {
 	border-top-width: 0px;
 	border-bottom-width: 1px;
 	border-right-width: 1px;
@@ -1774,9 +1580,10 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 }
 
 /* Linked single button (vertical) */
-.linked.vertical > combobox:only-child > button.combo,
 .linked.vertical > combobox:only-child > button.combo:only-child,
+.linked.vertical > combobox:only-child > button.combo:focus:only-child,
 .linked.vertical > combobox:only-child > button.combo:disabled:only-child,
+.linked.vertical > combobox:only-child > button.combo:backdrop:only-child,
 .linked.vertical > combobox:only-child > button.combo:hover:only-child,
 .linked.vertical > combobox:only-child > button.combo:hover:active:only-child,
 .linked.vertical > combobox:only-child > button.combo:focus:active:only-child,
@@ -1784,28 +1591,12 @@ toolbar.inline-toolbar toolbutton > button:first-child:checked,
 .linked.vertical > combobox:only-child > button.combo:checked:hover:only-child,
 .linked.vertical > combobox:only-child > button.combo:focus:checked:only-child,
 .linked.vertical entry:only-child,
+.linked.vertical entry:backdrop:only-child,
 .linked.vertical button:only-child,
 .linked.vertical button:hover:active:only-child,
 .linked.vertical button:checked:only-child,
 .linked.vertical button:checked:hover:only-child,
-.linked.vertical button:disabled:only-child,
-.linked.vertical > GtkComboBox:only-child > .button,
-.linked.vertical > GtkComboBox:only-child > .button:only-child,
-.linked.vertical > GtkComboBox:only-child > .button:disabled:only-child,
-.linked.vertical > GtkComboBox:only-child > .button:hover:only-child,
-.linked.vertical > GtkComboBox:only-child > .button:active:only-child,
-.linked.vertical > GtkComboBox:only-child > .button:active:hover:only-child,
-.linked.vertical > GtkComboBox:only-child > .button:focus:active:only-child,
-.linked.vertical > GtkComboBox:only-child > .button:checked:only-child,
-.linked.vertical > GtkComboBox:only-child > .button:checked:hover:only-child,
-.linked.vertical > GtkComboBox:only-child > .button:focus:checked:only-child,
-.linked.vertical .entry:only-child,
-.linked.vertical .button:only-child,
-.linked.vertical .button:active:only-child,
-.linked.vertical .button:active:hover:only-child,
-.linked.vertical .button:checked:only-child,
-.linked.vertical .button:checked:hover:only-child,
-.linked.vertical .button:disabled:only-child {
+.linked.vertical button:disabled:only-child {
 	border-width: 1px;
 	border-image-width: 3px 4px 4px 4px;
 	border-radius: 4px;
@@ -2673,126 +2464,74 @@ notebook header tabs arrow:disabled {
  * ComboBoxes *
  **************/
 
-combobox,
-GtkComboBox {
+combobox {
 	padding: 0;
-/*	-GtkComboBox-arrow-scaling: 0.5; deprecated */
-/*	-GtkComboBox-shadow-type: none; deprecated */
 	text-shadow: 0 1px @button_text_shadow;
 }
 
-combobox:disabled,
-GtkComboBox:disabled {
+combobox:disabled {
 	text-shadow: none;
 	color: @insensitive_fg_color;
 }
 
-combobox separator,
-GtkComboBox .separator {
-	/* always disable separators */
-/*	-GtkWidget-wide-separators: true; deprecated */
+combobox separator {
 	-GtkWidget-horizontal-separator: 0;
 	-GtkWidget-vertical-separator: 0;
 }
 
-combobox entry entry:first-child,
-combobox entry button:first-child,
-GtkComboBox.combobox-entry .entry:first-child,
-GtkComboBox.combobox-entry .button:first-child {
-	border-image-width: 3px 0 4px 3px;
-	border-radius: 3px 0 0 3px;
-	border-right-width: 0;
-}
-
-combobox entry entry:last-child,
-combobox entry button:last-child,
-GtkComboBox.combobox-entry .entry:last-child,
-GtkComboBox.combobox-entry .button:last-child {
-	border-image-width: 3px 3px 4px 0;
-	border-radius: 0 3px 3px 0;
-	border-left-width: 0;
+combobox > entry.combo,
+combobox > button.combo,
+combobox > entry.combo:backdrop,
+combobox > button.combo:backdrop {
+	border-image-width: 3px 3px 4px 3px;
+	border-radius: 3px;
+	border-width: 2px;
 }
 
-toolbar.primary-toolbar combobox entry entry:first-child,
-toolbar.primary-toolbar combobox entry button:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .entry:first-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:first-child {
+toolbar.primary-toolbar combobox entry.combo:first-child,
+toolbar.primary-toolbar combobox button.combo:first-child {
 	border-image-width: 4px 0 4px 4px;
 	border-radius: 3px 0 0 3px;
 	border-right-width: 0;
 }
 
-toolbar.primary-toolbar combobox entry entry:last-child,
-toolbar.primary-toolbar combobox entry button:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .entry:last-child,
-.primary-toolbar GtkComboBox.combobox-entry .button:last-child {
+toolbar.primary-toolbar combobox entry.combo:last-child,
+toolbar.primary-toolbar combobox button.combo:last-child {
 	border-image-width: 4px 4px 4px 0;
 	border-radius: 0 3px 3px 0;
 	border-left-width: 0;
 }
 
-combobox entry entry:focus:first-child,
-GtkComboBox.combobox-entry .entry:focus:first-child {
+combobox entry.combo:focus {
+	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1);
+}
+
+combobox entry.combo:focus:first-child {
 	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
 		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
 		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
 }
 
-combobox entry entry:focus:last-child,
-GtkComboBox.combobox-entry .entry:focus:last-child {
+combobox entry.combo:focus:last-child {
 	box-shadow: inset -1px 2px alpha(@theme_selected_bg_color, 0.1),
 		inset -1px 1px alpha(@theme_selected_bg_color, 0.1),
 		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
 }
 
-combobox entry button:last-child,
-combobox entry button:hover:last-child,
-combobox entry button:checked:last-child,
-combobox entry button:hover:active:last-child,
-GtkComboBox.combobox-entry .button:last-child,
-GtkComboBox.combobox-entry .button:hover:last-child,
-GtkComboBox.combobox-entry .button:active:last-child,
-GtkComboBox.combobox-entry .button:hover:active:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-combobox entry button:first-child,
-combobox entry button:hover:first-child,
-combobox entry button:checked:first-child,
-combobox entry button:hover:active:first-child,
-GtkComboBox.combobox-entry .button:first-child,
-GtkComboBox.combobox-entry .button:hover:first-child,
-GtkComboBox.combobox-entry .button:active:first-child,
-GtkComboBox.combobox-entry .button:hover:active:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color, 
-		inset 0 1px @entry_inset,
-		inset 0 2px alpha(@entry_inset, 0.4);
-}
-
-combobox entry button:disabled:first-child,
-GtkComboBox.combobox-entry .button:disabled:first-child {
-	box-shadow: inset -1px 0 @inset_dark_color;
-}
-
-combobox entry button:disabled:last-child,
-GtkComboBox.combobox-entry .button:disabled:last-child {
-	box-shadow: inset 1px 0 @inset_dark_color;
+combobox entry.combo:focus:only-child {
+	box-shadow: inset 1px 2px alpha(@theme_selected_bg_color, 0.1),
+		inset 1px 1px alpha(@theme_selected_bg_color, 0.1),
+		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
 }
 
-combobox entry button:hover,
-combobox entry button:checked,
-combobox entry button:hover:active,
-GtkComboBox.combobox-entry .button:hover,
-GtkComboBox.combobox-entry .button:active,
-GtkComboBox.combobox-entry .button:active:hover {
+combobox button.combo:hover,
+combobox button.combo:checked,
+combobox button.combo:hover:active {
     color: shade (@theme_selected_bg_color, 0.80);
     transition: all 200ms ease-in;
 }
 
-combobox button.combo,
-GtkComboBox .button {
+combobox button.combo {
     color: @theme_fg_color;
 }
 
@@ -5389,14 +5128,12 @@ expander row:selected:focus:hover,
  * List boxes *
  **************/
 
-list,
-.list {
+list {
 	background-color: @list_box_bg;
 }
 
 list row,
-list row.activatable,
-.list-row {
+list row.activatable {
     padding: 2px;
     transition: all 200ms ease-in;
     background-image: none;
@@ -5404,8 +5141,7 @@ list row.activatable,
 }
 
 list row:hover,
-list row.activatable:hover,
-.list-row:hover {
+list row.activatable:hover {
     padding: 2px;
     background-image: none;
 	background-color: shade (@theme_selected_bg_color, 1.30);
@@ -5415,9 +5151,7 @@ list row.activatable:hover,
 list row:selected,
 list row:selected:hover,
 list row.activatable:selected,
-list row.activatable:selected:hover,
-.list-row:selected,
-.list-row:selected:hover {
+list row.activatable:selected:hover {
     padding: 2px;
     border-width: 0;
     border-style: solid;
@@ -5433,9 +5167,7 @@ list row.activatable:selected:hover,
 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 {
+list row.activatable:selected:backdrop:hover {
     padding: 2px;
     border-width: 0;
     border-style: solid;
@@ -5448,8 +5180,7 @@ list row.activatable:selected:backdrop:hover,
     box-shadow: none;
 }
 
-list row button,
-.list-row.button {
+list > row > button {
 	border-color: transparent;
 	background-color: @theme_base_color;
 	background-image: none;
@@ -5461,17 +5192,11 @@ list row button,
 	border: none;
 }
 
-list row button:selected,
-list row button:selected:hover,
-list row button:checked,
-list row button:hover:active,
-list row button:checked:hover,
-.list-row.button:selected,
-.list-row.button:selected:hover,
-.list-row.button:active,
-.list-row.button:checked,
-.list-row.button:active:hover,
-.list-row.button:checked:hover {
+list > row > button:selected,
+list > row > button:selected:hover,
+list > row > button:checked,
+list > row > button:hover:active,
+list > row > button:checked:hover {
 	background-color: @theme_selected_bg_color;
 	background-image: linear-gradient(to bottom,
 		shade (@theme_selected_bg_color, 1.0),
@@ -5485,8 +5210,7 @@ list row button:checked:hover,
     border-width: 0px;
 }
 
-list row button:hover,
-.list-row.button:hover {
+list > row > button:hover {
 	background-image: none;
 	background-color: shade (@theme_selected_bg_color, 1.55);
 	color: shade (@theme_selected_bg_color, 0.35);
diff --git a/desktop-themes/Menta/gtk-3.0/other-applications.css b/desktop-themes/Menta/gtk-3.0/other-applications.css
index 292d96d3..76e906b1 100644
--- a/desktop-themes/Menta/gtk-3.0/other-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/other-applications.css
@@ -174,6 +174,30 @@
     border-style: solid;
 }
 
+/* cinnamon-settings */
+
+button.gtkstyle-fallback,
+button.gtkstyle-fallback:focus,
+button.gtkstyle-fallback:backdrop {
+	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;
+}
+
+button.gtkstyle-fallback:hover,
+button.gtkstyle-fallback:hover:active,
+button.gtkstyle-fallback:backdrop:hover,
+button.gtkstyle-fallback:focus:hover,
+button.gtkstyle-fallback:focus:hover:active {
+	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;
+}
+
 /* Parole media player needs more testing!
  hopefully do not set other stuff */