Menta Gtk3: re-work of theme with gtk-inspector

- add support for app-notification
- fix spin-buttons hover
- fix padding in caja-pathbar
- fix first-child, laste-child, only-child logic for buttons
- fix dialog-action-area buttons
- fix list-views rows
- add hover color in icon-views
- fix popovers menuitems
- add borders to maximize/minimize/close buttons for csd apps
- fix row hover color in caja-sidebars
- fix toolbar buttons in atril
- fix indents in mate-applications.css

3 files changed, 767 insertions, 364 deletions

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 93711d3b..e94ceda5 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
@@ -82,9 +82,29 @@ GtkComboBox.combobox-entry .button:focus,
 }
 
 /* generic button borders */
+.titlebar .titlebutton,
+.titlebar .titlebutton:hover,
+.titlebar .titlebutton:active {
+	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;
+}
+
+.titlebar .button:hover,
+.titlebar .button:checked:checked,
+.titlebar .titlebutton:hover,
+.titlebar .titlebutton: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;
+}
+
 .button
-/*.titlebar .titlebutton:hover
-.spinbutton.vertical .button,
+/*.spinbutton.vertical .button,
 .inline-toolbar.toolbar.vertical .button*/ {
 	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
 	border-radius: 4px;
@@ -112,6 +132,10 @@ GtkComboBox.combobox-entry .button:focus,
 	border-color: transparent;
 }
 
+.button.flat:hover {
+	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
+}
+
 /* primary toolbar button borders */
 .primary-toolbar .button:hover {
 	border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index d61d1367..1354bb42 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -5,29 +5,29 @@
 	-GtkButton-child-displacement-x: 1;
 	-GtkButton-child-displacement-y: 1;
 	-GtkButtonBox-child-min-height: 26;
-	-GtkToolButton-icon-spacing: 4;
-	-GtkTextView-error-underline-color: @error_color;
-	-GtkPaned-handle-size: 1;
 	-GtkCheckButton-indicator-size: 16;
 	-GtkCheckMenuItem-indicator-size: 12;
+	-GtkDialog-button-spacing: 4;
+	-GtkDialog-action-area-border: 10; /* buttons mate-appearance-properties */
+	-GtkExpander-expander-size: 11;
+	-GtkMenu-horizontal-padding: 0;
+	-GtkMenu-vertical-padding: 0;
+	-GtkPaned-handle-size: 1;
 	-GtkScrolledWindow-scrollbar-spacing: 0;
 	-GtkScrolledWindow-scrollbars-within-bevel: 1;
+	-GtkTextView-error-underline-color: @error_color;
+	-GtkToolButton-icon-spacing: 4;
 	-GtkToolItemGroup-expander-size: 11;
-	-GtkExpander-expander-size: 11;
 	-GtkTreeView-expander-size: 11;
 	-GtkTreeView-horizontal-separator: 4;
-	-GtkMenu-horizontal-padding: 0;
-	-GtkMenu-vertical-padding: 0;
 	-GtkWidget-link-color: @link_color;
 	-GtkWidget-visited-link-color: @link_color;
-	-WnckTasklist-fade-overlay-rect: 0;
 	-GtkWidget-focus-padding: 2;
 	-GtkWidget-focus-line-width: 0;
 	-GtkWindow-resize-grip-width: 13;
 	-GtkWindow-resize-grip-height: 13;
-	-GtkDialog-button-spacing: 4;
-	-GtkDialog-action-area-border: 0;
 	-GtkStatusbar-shadow-type: none;
+	-WnckTasklist-fade-overlay-rect: 0;
 	outline-color: alpha(@theme_text_color, 0.3);
 	outline-style: dashed;
 	outline-offset: -3px; /* 2px */
@@ -126,15 +126,6 @@ GtkTextView {
 	background-color: @theme_base_color; 
 }
 
-/* Zuki-theme FIXME: Figure out what this is. */
-.app-notification,
-.app-notification.frame {
-	color: @theme_base_color;
-	outline-color: @theme_bg_color;
-	text-shadow: none;
-	icon-shadow: none; 
-}
-
 /************
  * Tooltips *
  ************/
@@ -409,13 +400,17 @@ GtkTreeView.separator,
 }
 
 /* Add back the glowy effect from the entry covered by the pushed button background*/
-.spinbutton .button:active {
+.spinbutton .button:active,
+.spinbutton .button:active:focus {
+	padding: 2px 4px;
 	box-shadow: inset 1px 0 @inset_dark_color,
 		inset 0 1px alpha(@theme_selected_bg_color, 0.2),
 		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
 }
 
-.spinbutton .button:first-child:active {
+.spinbutton .button:first-child:active,
+.spinbutton .button:first-child:active:focus {
+	padding: 2px 4px;
 	box-shadow: inset 1px 1px alpha(@theme_selected_bg_color, 0.2),
 		inset 0 -1px alpha(@theme_selected_bg_color, 0.2);
 }
@@ -426,7 +421,6 @@ GtkTreeView.separator,
 		inset -1px -1px alpha(@theme_selected_bg_color, 0.2);
 }
 
-
 .spinbutton.vertical .button {
 	padding: 4px;
 	icon-shadow: 0 1px @button_text_shadow;
@@ -434,6 +428,7 @@ GtkTreeView.separator,
 
 .spinbutton.vertical .button,
 .spinbutton.vertical .button:hover {
+	padding: 4px;
 	color: @theme_fg_color;
 }
 
@@ -459,18 +454,22 @@ GtkTreeView.separator,
 	box-shadow: none;
 }
 
-.spinbutton.vertical .button:first-child {
+.spinbutton.vertical .button:first-child,
+.spinbutton.vertical .button:active:first-child {
 	border-image-width: 3px 3px 0 3px;
 	border-width: 2px 1px 0 1px;
 	border-bottom-left-radius: 0; 
 	border-bottom-right-radius: 0;
+	padding: 4px;
 }
 
-.spinbutton.vertical .button:last-child {
+.spinbutton.vertical .button:last-child,
+.spinbutton.vertical .button:active:last-child {
 	border-image-width: 0 3px 4px 3px;
 	border-width: 0 1px 2px 1px;
 	border-top-left-radius: 0; 
 	border-top-right-radius: 0;
+	padding: 4px;
 }
 
 .spinbutton.vertical.entry {
@@ -885,6 +884,10 @@ GtkComboBox.combobox-entry .button {
 	padding: 4px;
 }
 
+GtkToggleButton.button {
+	padding: 3px 4px;
+}
+
 .button.image-button,
 .primary-toolbar.toolbar .button.image-button {
 	padding: 4px;
@@ -919,8 +922,12 @@ GtkComboBox.combobox-entry .button {
 	border-image: none; 
 }
 
-.button.flat.hover {
-	border-radius: 3px;
+.button.flat:hover {
+    background-color: transparent;
+    background-image: linear-gradient(to bottom,
+                                      @button_gradient_color_a,
+                                      @button_gradient_color_b);
+	border-radius: 1px;
 }
 
 /* We may want a background for focused buttons, but in the meantime let's remove it too */
@@ -1102,10 +1109,22 @@ GtkComboBox.combobox-entry .button {
 
 /* Middle button */
 .linked .entry,
+.linked > GtkComboBox > .button:last-child,
+.linked > GtkComboBox > .button:focus:last-child,
+.linked > GtkComboBox > .button:insensitive: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:insensitive {
 	border-right-width: 0;
@@ -1116,6 +1135,16 @@ GtkComboBox.combobox-entry .button {
 
 /* Leftmost button */
 .linked .entry:first-child,
+.linked > GtkComboBox:first-child > .button:last-child,
+.linked > GtkComboBox:first-child > .button:focus:last-child,
+.linked > GtkComboBox:first-child > .button:insensitive: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,
@@ -1131,6 +1160,16 @@ GtkComboBox.combobox-entry .button {
 
 /* Rightmost button */
 .linked .entry:last-child,
+.linked > GtkComboBox:last-child > .button,
+.linked > GtkComboBox:last-child > .button:last-child,
+.linked > GtkComboBox:last-child > .button:insensitive: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,
@@ -1146,6 +1185,16 @@ GtkComboBox.combobox-entry .button {
 
 /* Linked single button */
 .linked .entry:only-child,
+.linked > GtkComboBox:only-child > .button,
+.linked > GtkComboBox:only-child > .button:only-child,
+.linked > GtkComboBox:only-child > .button:insensitive: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,
@@ -2119,9 +2168,10 @@ GtkTreeMenu .menuitem,
 }
 
 .menu .menuitem {
+	background-color: transparent;
 	-GtkMenuItem-arrow-scaling: 0.6;
 	transition: all 150ms ease-out;
-	padding: 4px;
+	padding: 6px 5px;
 }
 
 .menu .menuitem:hover {
@@ -2376,7 +2426,7 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
 }
 
 .header-bar .button.image-button {
-	padding: 5px;
+    padding: 4px 5px;
 }
 
 .titlebar .title, GtkCalendar.header .title,
@@ -2432,88 +2482,132 @@ GtkCheckButton.text-button, GtkRadioButton.text-button {
 .prompt,
 GtkMessageDialog {
 	-GtkDialog-content-area-border: 0;
-	-GtkDialog-action-area-border: 15;
-	-GtkDialog-button-spacing: 10;
+	-GtkDialog-action-area-border: 12;
+	-GtkDialog-button-spacing: 1;
 	margin: 0;
 	padding: 0;
 }
 
+/* middle buttons */
 .dialog-action-area.linked .button,
 .dialog-action-area.linked .button:active,
 .dialog-action-area.linked .button:active:hover,
 .dialog-action-area.linked .button:checked,
 .dialog-action-area.linked .button:checked:hover,
-.dialog-action-area.linked .button:insensitive,
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
+.dialog-action-area.linked .button:insensitive {
+    border-style: solid;
+    border-radius: 0;
+    border-width: 1px;
+/*    border-right-width: 0px;
+    border-left-width:  0px;*/
+    border-color: @borders;
+    border-image: none;
+}
+
+.dialog-action-area.linked .button.default,
+.dialog-action-area.linked .button.default:active,
+.dialog-action-area.linked .button.default:checked,
+.dialog-action-area.linked .button.default:insensitive,
+.dialog-action-area.linked .button:focus {
+    border-style: solid;
+    border-radius: 0;
+    border-width: 1px;
+/*    border-right-width: 0px;
+    border-left-width:  0px;*/
+    border-color: shade(@infobar_bg_color, 1.0);
+    -GtkWidget-focus-line-width: 0;
+}
+
+
+/* left button */
 .dialog-action-area.linked .button:first-child,
 .dialog-action-area.linked .button:active:first-child,
 .dialog-action-area.linked .button:active:hover:first-child,
 .dialog-action-area.linked .button:checked:first-child,
 .dialog-action-area.linked .button:checked:hover:first-child,
-.dialog-action-area.linked .button:insensitive:first-child,
-.dialog-action-area.linked .button:last-child,
-.dialog-action-area.linked .button:active:last-child,
-.dialog-action-area.linked .button:active:hover:last-child,
-.dialog-action-area.linked .button:checked:last-child,
-.dialog-action-area.linked .button:checked:hover:last-child,
-.dialog-action-area.linked .button:insensitive:last-child {
-	border-style: solid;
-	border-radius: 0;
-	border-width: 1px 0 0px 0;
-	border-color: @borders;
-	border-image: none;
+.dialog-action-area.linked .button:insensitive:first-child {
+    border-style: solid;
+    border-width: 1px;
+/*    border-right-width: 0;*/
+    border-radius: 3px 0 0px 3px;
+    border-color: @borders;
+    border-image: none;
 }
 
-.dialog-action-area.linked .button:only-child,
-.dialog-action-area.linked .button:active:only-child,
-.dialog-action-area.linked .button:active:hover:only-child,
-.dialog-action-area.linked .button:checked:only-child,
-.dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
+.dialog-action-area.linked .button.default:first-child,
+.dialog-action-area.linked .button.default:active:first-child,
+.dialog-action-area.linked .button.default:checked:first-child,
+.dialog-action-area.linked .button.default:insensitive:first-child,
+.dialog-action-area.linked .button:focus:first-child {
+    border-style: solid;
+    border-width: 1px;
+/*    border-right-width: 0;*/
+    border-radius: 3px 0 0px 3px;
+    border-color: shade(@infobar_bg_color, 1.0);
+    -GtkWidget-focus-line-width: 0;
+}
+
+/* right button */
 .dialog-action-area.linked .button:last-child,
 .dialog-action-area.linked .button:active:last-child,
 .dialog-action-area.linked .button:active:hover:last-child,
 .dialog-action-area.linked .button:checked:last-child,
 .dialog-action-area.linked .button:checked:hover:last-child,
 .dialog-action-area.linked .button:insensitive:last-child {
-	/*border-right-width: 1px;*/
+    border-style: solid;
+    border-width: 1px;
+/*    border-left-width: 0;*/
+    border-radius: 0 3px 3px 0;
+    border-color: @borders;
+    border-image: none;
 }
 
+.dialog-action-area.linked .button.default:last-child,
+.dialog-action-area.linked .button.default:active:last-child,
+.dialog-action-area.linked .button.default:checked:last-child,
+.dialog-action-area.linked .button.default:insensitive:last-child,
+.dialog-action-area.linked .button:focus:last-child {
+    border-style: solid;
+    border-width: 1px;
+/*    border-left-width: 0;*/
+    border-radius: 0 3px 3px 0;
+    border-color: shade(@infobar_bg_color, 1.0);
+    -GtkWidget-focus-line-width: 0;
+}
+
+/* single button */
 .dialog-action-area.linked .button:only-child,
 .dialog-action-area.linked .button:active:only-child,
 .dialog-action-area.linked .button:active:hover:only-child,
 .dialog-action-area.linked .button:checked:only-child,
 .dialog-action-area.linked .button:checked:hover:only-child,
-.dialog-action-area.linked .button:insensitive:only-child,
-.dialog-action-area.linked .button:first-child,
-.dialog-action-area.linked .button:active:first-child,
-.dialog-action-area.linked .button:active:hover:first-child,
-.dialog-action-area.linked .button:checked:first-child,
-.dialog-action-area.linked .button:checked:hover:first-child,
-.dialog-action-area.linked .button:insensitive:first-child {
-	/*border-left-width: 1px;*/
+.dialog-action-area.linked .button:insensitive:only-child {
+    padding-left:  6px;
+    padding-right: 6px;
+    border-width: 1px;
+    border-radius: 3px;
+    border-color: @borders;
+    border-image: none;
 }
 
-.dialog-action-area.linked .button.default,
-.dialog-action-area.linked .button.default:active,
-.dialog-action-area.linked .button.default:checked,
-.dialog-action-area.linked .button.default:insensitive,
-.dialog-action-area.linked .button:focus {
-	border-color: @theme_selected_bg_color;
-	border-width: 1px;
-	-GtkWidget-focus-line-width: 0;
+.dialog-action-area.linked .button.default:only-child,
+.dialog-action-area.linked .button.default:active:only-child,
+.dialog-action-area.linked .button.default:checked:only-child,
+.dialog-action-area.linked .button.default:insensitive:only-child,
+.dialog-action-area.linked .button:focus:only-child {
+    padding-left:  6px;
+    padding-right: 6px;
+    border-width: 1px;
+    border-radius: 3px;
+    border-color: shade(@infobar_bg_color, 1.0);
+    -GtkWidget-focus-line-width: 0;
 }
 
 .dialog-action-area.linked .button.suggested-action,
 .dialog-action-area.linked .button.suggested-action:active,
 .dialog-action-area.linked .button.suggested-action:checked,
 .dialog-action-area.linked .button.suggested-action:insensitive {
-	box-shadow: none;
+    box-shadow: none;
 }
 
 /***************
@@ -3319,7 +3413,7 @@ GtkAssistant .sidebar {
 
 GtkSwitch {
 	border-radius: 8px;
-	padding: 2px;
+	padding: 8px; /* 8px to avoid padding list-row issue if active */
 	background-color: transparent;
 }
 
@@ -3336,7 +3430,8 @@ GtkSwitch.trough:insensitive {
 	text-shadow: none;
 }
 
-GtkSwitch.slider {
+GtkSwitch.slider,
+GtkSwitch.slider:hover {
 	background-color: transparent;
 	border: none;
 	border-image: none;
@@ -3441,6 +3536,11 @@ GtkIconView.cell:hover:focus {
 	color: @theme_selected_fg_color;
 }
 
+.view:hover {
+	background-color: shade (@theme_selected_bg_color, 1.30);
+	color: shade (@theme_selected_bg_color, 0.35);
+}
+
 .view:selected:backdrop {
 	background-color: shade(@theme_unfocused_bg_color, 0.94);
 	color: @theme_fg_color;
@@ -3448,10 +3548,14 @@ GtkIconView.cell:hover:focus {
 
 /* ie. pluma open dialog */
 .view row:hover {
-	background-color: shade (@theme_selected_bg_color, 1.15);
+	background-color: shade (@theme_selected_bg_color, 1.30);
 	color: shade (@theme_selected_bg_color, 0.35);
 }
 
+.view row:selected:hover {
+	color: shade (@theme_selected_fg_color, 1.00);
+}
+
 .cell {
 	/*color: @theme_text_color;*/ /* Don't use, seems to change hover effect on combobox menuitems */
 	padding: 2px;
@@ -3502,7 +3606,7 @@ GtkTreeView row:nth-child(odd) {
 
 GtkTreeView row:nth-child(odd):hover,
 GtkTreeView row:nth-child(even):hover {
-	background-color: shade (@theme_selected_bg_color, 1.55);
+	background-color: shade (@theme_selected_bg_color, 1.30);
 }
 
 GtkTreeView row:nth-child(odd):backdrop:hover,
@@ -3578,6 +3682,131 @@ column-header .button.dnd {
 	border-image-slice: 0 1;
 }
 
+/*********************
+ * App Notifications *
+ *********************/
+
+.app-notification,
+.app-notification.frame {
+    color: @theme_fg_color;
+    padding: 10px;
+    border: none;
+    border-radius: 0 0 4px 4px;
+    background-color: rgba(172, 205, 138, 0.7);
+    background-image: linear-gradient(to bottom,
+                                      rgba(0, 0, 0, 0.2),
+                                      transparent 2px);
+    background-clip: padding-box;
+}
+
+.app-notification:backdrop,
+.app-notification.frame:backdrop {
+    background-image: none;
+}
+
+.app-notification .button,
+.app-notification .header-bar .button.titlebutton,
+.header-bar .app-notification .button.titlebutton,
+.app-notification .titlebar .button.titlebutton,
+.titlebar .app-notification .button.titlebutton,
+.app-notification GtkCalendar.header .button.titlebutton,
+GtkCalendar.header .app-notification .button.titlebutton,
+.app-notification.frame .button {
+    color: @theme_fg_color;
+    border-color: rgba(89, 112, 75, 0.7);
+    background-image: linear-gradient(to bottom,
+                                      rgba(172, 205, 138, 0.7));
+    background-clip: padding-box;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+    text-shadow: none;
+    icon-shadow: 0 1px black;
+    outline-color: rgba(238, 238, 236, 0.3);
+    border-radius: 3px;
+    padding: 0 0px 2px 0px;
+}
+
+.app-notification .button.flat,
+.app-notification .header-bar .titlebutton.button,
+.header-bar .app-notification .titlebutton.button,
+.app-notification .titlebar .titlebutton.button,
+.titlebar .app-notification .titlebutton.button,
+.app-notification GtkCalendar.header .titlebutton.button,
+GtkCalendar.header .app-notification .titlebutton.button,
+.app-notification.frame .button.flat,
+.app-notification.frame .header-bar .titlebutton.button,
+.header-bar .app-notification.frame .titlebutton.button,
+.app-notification.frame .titlebar .titlebutton.button,
+.titlebar .app-notification.frame .titlebutton.button,
+.app-notification.frame GtkCalendar.header .titlebutton.button,
+GtkCalendar.header .app-notification.frame .titlebutton.button {
+    icon-shadow: 0 1px black;
+    text-shadow: 0 1px black;
+}
+
+.app-notification .button:hover,
+.app-notification.frame .button:hover {
+    color: white;
+    border-color: rgba(0, 0, 0, 0.7);
+    background-image: linear-gradient(to bottom,
+                                      rgba(119, 158, 79, 0.7));
+    background-clip: padding-box;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0.1);
+    text-shadow: none;
+    icon-shadow: 0 1px black;
+    outline-color: rgba(238, 238, 236, 0.3);
+    border-radius: 3px;
+}
+
+.app-notification .button:active,
+.app-notification .button:checked,
+.app-notification .button:backdrop:active,
+.app-notification .button:backdrop:checked,
+.app-notification.frame .button:active,
+.app-notification.frame .button:checked,
+.app-notification.frame .button:backdrop:active,
+.app-notification.frame .button:backdrop:checked {
+    color: white;
+    border-color: rgba(0, 0, 0, 0.7);
+    background-image: linear-gradient(to bottom,
+                                      rgba(105, 175, 65, 0.7));
+    background-clip: padding-box;
+    box-shadow: none;
+    text-shadow: none;
+    icon-shadow: none;
+    outline-color: rgba(238, 238, 236, 0.3);
+    border-radius: 3px;
+}
+
+.app-notification .button:insensitive,
+.app-notification .button:backdrop:insensitive,
+.app-notification.frame .button:insensitive,
+.app-notification.frame .button:backdrop:insensitive {
+    color: #878989;
+    border-color: rgba(0, 0, 0, 0.7);
+    background-image: linear-gradient(to bottom,
+                                      rgba(52, 57, 57, 0.5));
+    background-clip: padding-box;
+    box-shadow: none;
+    text-shadow: none;
+    icon-shadow: none;
+    border-radius: 3px;
+    padding: 0px;
+}
+
+.app-notification .button:backdrop,
+.app-notification.frame .button:backdrop {
+    color: #eeeeec;
+    border-color: rgba(0, 0, 0, 0.7);
+    background-image: linear-gradient(to bottom,
+                                      rgba(172, 205, 138, 0.7));
+    background-clip: padding-box;
+    box-shadow: none;
+    text-shadow: none;
+    icon-shadow: none;
+    border-radius: 3px;
+    padding: 0px;
+}
+
 /*************
  * Expanders *
  *************/
@@ -3654,44 +3883,85 @@ GtkExpander:checked {
 	background-color: @list_box_bg;
 }
 
+.list-row {
+    padding: 2px;
+    transition: all 200ms ease-in;
+    background-image: none;
+    background-color: @theme_base_color;
+}
+
 .list-row:hover {
-	background-color: shade (@content_view_bg, 0.95);
+    background-image: none;
+    background-color: shade (@theme_selected_bg_color, 1.55);
+    color: shade (@theme_selected_bg_color, 0.35);
 }
 
 .list-row:selected,
 .list-row:selected:hover {
-	border-width: 0;
-	border-style: solid;
-	border-color: shade (@theme_selected_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 1.0));
-	box-shadow: none;
-	color: @theme_selected_fg_color;
+    border-width: 0;
+    border-style: solid;
+    border-color: shade (@theme_selected_bg_color, 0.85);
+    background-color: @theme_selected_bg_color;
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 1.0),
+                                      shade (@theme_selected_bg_color, 0.85));
+    box-shadow: none;
+    color: @theme_selected_fg_color;
 }
 
 .list-row:selected:backdrop,
 .list-row:selected:backdrop:hover {
-	border-width: 0;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.85);
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 0.94),
-		shade (@theme_bg_color, 0.94));
-	color: @theme_fg_color;
-	text-shadow: none;
-	box-shadow: none;
+    border-width: 0;
+    border-style: solid;
+    border-color: shade (@theme_bg_color, 0.85);
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 0.94),
+                                      shade (@theme_selected_bg_color, 0.94));
+    color: @theme_fg_color;
+    text-shadow: none;
+    box-shadow: none;
 }
 
 .list-row.button {
-	border-color: transparent;
-	background-image: none;
-	box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
-	text-shadow: none;
-	icon-shadow: none;
-	border-image: none;
-	border-radius: 0;
-	border: none;
+    border-color: transparent;
+    background-color: @theme_base_color;
+    background-image: none;
+    box-shadow: inset 0 1px rgba(255, 255, 255, 0), 0 1px rgba(255, 255, 255, 0);
+    text-shadow: none;
+    icon-shadow: none;
+    border-image: none;
+    border-radius: 0;
+    border: none;
+}
+
+.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 {
+    background-color: @theme_selected_bg_color;
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 1.0),
+                                             shade (@theme_selected_bg_color, 0.85));
+    color:  @theme_selected_fg_color;
+    text-shadow: none;
+    icon-shadow: none;
+    border-radius: 0px;
+    border-image: none;
+    border-style: solid;
+    border-width: 0px;
+}
+
+.list-row.button:hover {
+    background-image: none;
+    background-color: shade (@theme_selected_bg_color, 1.55);
+    color: shade (@theme_selected_bg_color, 0.35);
+    text-shadow: none;
+    icon-shadow: none;
+    border-image: none;
+    border-radius: 0px;
+    border-style: solid;
 }
 
 /**************
@@ -3828,7 +4098,7 @@ GtkInfoBar {
 	border-width: 1px;
 	border-style: solid;
 	border-radius: 3px;
-	background-color: @theme_bg_color;
+	background-color: @menu_bg_color;
 	box-shadow: 0 1px 5px @wm_shadow;
 	text-shadow: none;
 	icon-shadow: none; 
@@ -3908,27 +4178,66 @@ GtkModelButton.button:checked:insensitive,
 GtkModelButton.button,
 GtkModelButton.button:focus,
 GtkModelButton.button:active:focus,
-GtkModelButton.button:checked:focus {
-	background-color: transparent;
+GtkModelButton.button:checked:focus,
+GtkModelButton.button.flat:checked,
+GtkModelButton.button.flat:active,
+GtkModelButton.button.flat:insensitive,
+GtkModelButton.button.flat:active:insensitive,
+GtkModelButton.button.flat:checked:insensitive,
+GtkModelButton.button.flat,
+GtkModelButton.button.flat:focus,
+GtkModelButton.button.flat:active:focus,
+GtkModelButton.button.flat:checked:focus {
+	background-color: @menu_bg_color;
 	background-image: none;
 	border-color: transparent;
 	border-image: none;
 	border-style: none;
 	box-shadow: none;
-	border-radius: 0;
+	border-radius: 2px;
 }
 
 GtkModelButton.button:checked:hover,
 GtkModelButton.button:active:hover,
 GtkModelButton.button:hover,
-GtkModelButton.button:selected {
+GtkModelButton.button:selected,
+GtkModelButton.button.flat:checked:hover,
+GtkModelButton.button.flat:active:hover,
+GtkModelButton.button.flat:hover,
+GtkModelButton.button.flat:selected {
 	background-image: none;
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 	text-shadow: none;
+	border-image: none;
 	border-width: 0;
 	border-color: transparent;
-	border-radius: 0;
+	border-radius: 2px;
+}
+
+/* middle button*/
+.linked GtkModelButton.button:hover,
+.linked GtkModelButton.button:active:hover,
+.linked GtkModelButton.button:checked:hover {
+    border-right-width: 0px;
+    border-left-width:  0px;
+    border-radius: 0;
+}
+
+/* left button*/
+.linked GtkModelButton.button:hover:first-child,
+.linked GtkModelButton.button:active:hover:first-child,
+.linked GtkModelButton.button:checked:hover:first-child {
+    border-right-width: 0px;
+    border-radius: 3px 0 0 3px;
+}
+
+/* right button*/
+.linked GtkModelButton.button:hover:last-child,
+.linked GtkModelButton.button:active:hover:last-child,
+.linked GtkModelButton.button:checked:hover:last-child {
+    border-left-width:  0px;
+    border-radius: 0 3px 3px 0;
 }
 
 .entry.cursor-handle,
@@ -3985,19 +4294,20 @@ GtkModelButton.button:selected {
 
 .titlebar .titlebutton {
     color: @wm_title;
-    padding: 5px 5px 5px 5px;
-    border: none;
-    border-image: none;
+    padding: 4px 5px;
+/*    border: none;
+    border-image: none;*/
 }
 
+/* borders are in gtk-widget-assets */
 .titlebar .titlebutton:hover {
-    border: none;
-    border-image: none;
+/*    border: none;
+    border-image: none;*/
 }
 
 .titlebar .titlebutton:active {
-    border: none;
-    border-image: none;
+/*    border: none;
+    border-image: none;*/
 }
 
 .titlebar .titlebutton:backdrop {
diff --git a/desktop-themes/Menta/gtk-3.0/mate-applications.css b/desktop-themes/Menta/gtk-3.0/mate-applications.css
index 6f59659d..5137d23a 100644
--- a/desktop-themes/Menta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/mate-applications.css
@@ -5,53 +5,53 @@
 
 .caja-pathbar-button,
 CajaPathbarButton {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)),
-		color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90)));
-	border-color: #979797;
-	color: @theme_fg_color;
-	-CajaPathbarButton-border-radius: 3px;
+    background-image: -gtk-gradient(linear, left top, left bottom,
+                                    color-stop (0, shade(alpha(@theme_bg_color, 0.8), 1.1)),
+                                    color-stop (.3, shade(alpha(@theme_bg_color, 0.8), 1.1)),
+                                    color-stop (.7, shade(alpha(@theme_bg_color, 0.8), 0.98)),
+                                    color-stop (1, shade(alpha(@theme_bg_color, 0.8), 0.90)));
+    border-color: #979797;
+    color: @theme_fg_color;
+    -CajaPathbarButton-border-radius: 3px;
 }
 
 CajaPathbarButton:active {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)),
-		color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)),
-		color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0)));
+    background-image: -gtk-gradient(linear, left top, left bottom,
+                                    color-stop (0, shade(alpha(@theme_bg_color, 0.8), .8)),
+                                    color-stop (.3, shade(alpha(@theme_bg_color, 0.8), .9)),
+                                    color-stop (1, shade(alpha(@theme_bg_color, 0.8), 1.0)));
 }
 
 CajaPathbarButton:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
-		color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85)));
+    background-image: -gtk-gradient(linear, left top, left bottom,
+                                    color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
+                                    color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)),
+                                    color-stop (.7, shade(alpha(@theme_selected_bg_color, 0.8), 0.95)),
+                                    color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 0.85)));
 }
 
 CajaPathbarButton:active:hover {
-	background-image: -gtk-gradient(linear, left top, left bottom,
-		color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)),
-		color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)),
-		color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)));
+    background-image: -gtk-gradient(linear, left top, left bottom,
+                                    color-stop (0, shade(alpha(@theme_selected_bg_color, 0.8), .80)),
+                                    color-stop (.3, shade(alpha(@theme_selected_bg_color, 0.8), .95)),
+                                    color-stop (1, shade(alpha(@theme_selected_bg_color, 0.8), 1.25)));
 }
 
 
 /* For Places Sidebar diskfull indicators */
 
 CajaPlacesTreeView {
-	-CajaPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
-	-CajaPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
-	-CajaPlacesTreeView-disk-full-bar-width: 2px;
-	-CajaPlacesTreeView-disk-full-bar-radius: 1px;
-	-CajaPlacesTreeView-disk-full-bottom-padding: 1px;
-	-CajaPlacesTreeView-disk-full-max-length: 70px;
+    -CajaPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
+    -CajaPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
+    -CajaPlacesTreeView-disk-full-bar-width: 2px;
+    -CajaPlacesTreeView-disk-full-bar-radius: 1px;
+    -CajaPlacesTreeView-disk-full-bottom-padding: 1px;
+    -CajaPlacesTreeView-disk-full-max-length: 70px;
 }
 
 CajaPlacesTreeView:selected {
-	-CajaPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0);
-	-CajaPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0);
+    -CajaPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0);
+    -CajaPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0);
 }
 
 CajaPlacesTreeView:hover {
@@ -69,7 +69,7 @@ CajaWindow .button.flat {
 }
 
 CajaWindow .button.flat:first-child {
-	transition: all 400ms ease-out;
+    transition: all 400ms ease-out;
     border-radius: 6px 0 0 6px;
     border-right-width: 0;
 /* remove left border */
@@ -77,7 +77,7 @@ CajaWindow .button.flat:first-child {
 }
 
 CajaWindow .button.flat:last-child {
-	transition: all 400ms ease-out;
+    transition: all 400ms ease-out;
     border-radius: 0 6px 6px 0;
     border-left-width: 0;
 /* remove right border */
@@ -116,7 +116,7 @@ CajaWindow .button.flat:hover:last-child  {
 CajaWindow .primary-toolbar .button.flat,
 CajaWindow .primary-toolbar .button.flat:first-child,
 CajaWindow .primary-toolbar .button.flat:last-child {
-	transition: all 400ms ease-out;
+    transition: all 400ms ease-out;
     border-width: 3px;
     background-color: transparent;
     background-image: linear-gradient(to bottom,
@@ -151,8 +151,13 @@ CajaWindow .toolbar GtkComboBox .button:hover {
     padding: 4px 4px;
 }
 
+/* to avoid padding when executing toogle button */
+CajaLocationBar .entry {
+    padding: 4px;
+}
+
 CajaWindow * {
-	-GtkPaned-handle-size: 0;
+    -GtkPaned-handle-size: 0;
 }
 
 /* caja sidebar */
@@ -162,124 +167,131 @@ CajaWindow CajaPlacesSidebar .view,
 CajaWindow CajaHistorySidebar .view,
 CajaWindow CajaInformationPanel GtkVBox,
 CajaWindow CajaEmblemSidebar GtkViewport {
-	background-color: shade (@theme_bg_color, 1.08);
-	color: @theme_fg_color;
+    background-color: shade (@theme_bg_color, 1.08);
+    color: @theme_fg_color;
 }
 
-CajaWindow CajaPlacesSidebar row:active:hover,
-CajaWindow CajaPlacesSidebar row:checked:hover,
-CajaWindow CajaPlacesSidebar row:selected:hover,
-CajaWindow CajaHistorySidebar row:active:hover,
-CajaWindow CajaHistorySidebar row:checked:hover,
-CajaWindow CajaHistorySidebar row:selected:hover,
-CajaWindow FMTreeView row:active:hover,
-CajaWindow FMTreeView row:checked:hover,
-CajaWindow FMTreeView row:selected:hover {
-	color: shade (@theme_selected_fg_color, 1.00);
+CajaWindow CajaPlacesSidebar .view row:active:hover,
+CajaWindow CajaPlacesSidebar .view row:checked:hover,
+CajaWindow CajaPlacesSidebar .view row:selected:hover,
+CajaWindow CajaHistorySidebar .view row:active:hover,
+CajaWindow CajaHistorySidebar .view row:checked:hover,
+CajaWindow CajaHistorySidebar .view row:selected:hover,
+CajaWindow FMTreeView .view row:active:hover,
+CajaWindow FMTreeView .view row:checked:hover,
+CajaWindow FMTreeView .view row:selected:hover {
+    color: shade (@theme_selected_fg_color, 1.00);
+}
+
+CajaWindow CajaPlacesSidebar .view row:hover,
+CajaWindow FMTreeView .view row:hover,
+CajaWindow CajaHistorySidebar .view row:hover {
+    background-color: shade (@theme_selected_bg_color, 1.15);
+    color: shade (@theme_selected_bg_color, 0.35);
 }
 
 CajaWindow .rubberband,
 CajaWindow .view.rubberband {
-	background-color: alpha (@theme_selected_bg_color, 0.35);
+    background-color: alpha (@theme_selected_bg_color, 0.35);
 }
 
 CajaWindow CajaPlacesSidebar .frame {
-	border-right-width: 1px;
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.90);
-	border-left: none;
-	border-top: none;
-	border-bottom: none;
+    border-right-width: 1px;
+    border-style: solid;
+    border-color: shade (@theme_bg_color, 0.90);
+    border-left: none;
+    border-top: none;
+    border-bottom: none;
 }
 
 CajaWindow CajaPlacesSidebar row:selected {
-	color: @theme_selected_fg_color;
+    color: @theme_selected_fg_color;
 }
 
 CajaWindow CajaPlacesSidebar row:backdrop:selected {
-	color: @theme_fg_color;
-	text-shadow: none; 
+    color: @theme_fg_color;
+    text-shadow: none;
 }
 
 CajaWindow CajaPlacesSidebar row:hover {
-	background-color: shade (@theme_bg_color, 0.97);
+    background-color: shade (@theme_bg_color, 0.97);
 }
 
 /* desktop mode */
 .caja-desktop.caja-canvas-item {
-	color: @theme_bg_color;
-	text-shadow: 1px 1px alpha (#000000, 0.8);
+    color: @theme_bg_color;
+    text-shadow: 1px 1px alpha (#000000, 0.8);
 }
 
 .caja-desktop.caja-canvas-item:active {
-	background-image: none;
-	background-color: alpha (@theme_bg_color, 0.84);
-	color: @theme_fg_color;
+    background-image: none;
+    background-color: alpha (@theme_bg_color, 0.84);
+    color: @theme_fg_color;
 }
 
 .caja-desktop.caja-canvas-item:selected {
-	background-image: none;
-	background-color: alpha (@theme_selected_bg_color, 0.84);
-	color: @theme_selected_fg_color;
+    background-image: none;
+    background-color: alpha (@theme_selected_bg_color, 0.84);
+    color: @theme_selected_fg_color;
 }
 
 .caja-desktop.caja-canvas-item:active,
 .caja-desktop.caja-canvas-item:prelight,
 .caja-desktop.caja-canvas-item:selected {
-	text-shadow: none;
+    text-shadow: none;
 }
 
 /* inactive pane */
 
 .caja-inactive-pane .view {
-	background-color: shade(@theme_base_color, 0.9);
+    background-color: shade(@theme_base_color, 0.9);
 }
 
 /* Toolbar */
 CajaWindow .toolbar .button {
-	border-image: none;
+    border-image: none;
 }
 
 /* Misc */
 CajaView.frame,
 CajaNotebook.notebook {
-	border-right-width: 0;
-	border-left-width: 0;
-	border-bottom-width: 0;
+    border-right-width: 0;
+    border-left-width: 0;
+    border-bottom-width: 0;
 }
 
 CajaNotebook.notebook tab.top,
 CajaNotebook.notebook tab.bottom {
-	border-right-width: 1px;
-	border-left-width: 1px;
+    border-right-width: 1px;
+    border-left-width: 1px;
 }
 
 CajaNotebook .frame {
-	border-width: 1px 0 0 0;
+    border-width: 1px 0 0 0;
 }
 
 .caja-cluebar-label {
-	font: normal;
-	text-shadow: 0 1px shade (@cluebar_color, 1.06);
+    font: normal;
+    text-shadow: 0 1px shade (@cluebar_color, 1.06);
 }
 
 CajaTrashBar.info,
 CajaXContentBar.info,
 CajaSearchBar.info,
 CajaQueryEditor.info {
-	background-color: @cluebar_color;
-	border-bottom-color: shade (@cluebar_color, 0.92);
-	border-radius: 0;
-	border-style: solid;
-	border-width: 0px 0px 1px 0px;
-	color: @theme_fg_color;
+    background-color: @cluebar_color;
+    border-bottom-color: shade (@cluebar_color, 0.92);
+    border-radius: 0;
+    border-style: solid;
+    border-width: 0px 0px 1px 0px;
+    color: @theme_fg_color;
 }
 
 CajaTrashBar .button,
 CajaXContentBar .button,
 CajaSearchBar .button,
 CajaQueryEditor .button {
-	border-radius: 0;
+    border-radius: 0;
 }
 
 /****************
@@ -296,230 +308,273 @@ PanelAppletFrame,
 MatePanelAppletFrameDBus,
 MatePanelAppletContainer,
 MatePanelApplet {
-	background-color: @theme_bg_color;
-	background-image: none;
-	color: @theme_fg_color;
-	text-shadow: none;
+    background-color: @theme_bg_color;
+    background-image: none;
+    color: @theme_fg_color;
+    text-shadow: none;
 }
 
 MatePanelApplet {
-	border-width: 0;
+    border-width: 0;
 }
 
 PanelSeparator {
-	border-width: 0;
-	background-image: -gtk-gradient (linear, left top, left bottom,
-		from (shade (@theme_bg_color, 1.03)),
-		to (shade (@theme_bg_color, 0.95)));
-	color: shade (@theme_fg_color, 4.30);
-	text-shadow: none;
+    border-width: 0;
+    background-image: -gtk-gradient (linear, left top, left bottom,
+                                     from (shade (@theme_bg_color, 1.03)),
+                                     to (shade (@theme_bg_color, 0.95)));
+    color: shade (@theme_fg_color, 4.30);
+    text-shadow: none;
 }
 
-/* prelight of WnckPager */
-MatePanelApplet *:hover {
-	background-image: linear-gradient(to bottom,
-		@theme_bg_color,
-		shade (@theme_selected_bg_color, 0.86));
-	background-color: @theme_base_color;
+/* set normal menubar button */
+PanelMenuBar.menubar .menuitem {
+    transition: all 200ms ease-out;
+}
+
+/* set selected menubar button */
+PanelMenuBar.menubar .menuitem:hover {
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 0.86),
+                                      shade (@theme_selected_bg_color, 0.26));
+    background-color: @theme_base_color;
+    color: shade (@theme_selected_fg_color, 1.00);
+    text-shadow: none;
+    border-style: solid;
+    border-width: 0px;
+    border-radius: 5px;
+}
+
+/* set menubar menuitem separator */
+PanelMenuBar.menubar .menu .menuitem.separator {
+    color: @menu_separator;
+    -GtkMenuItem-horizontal-padding: 0;
+}
+
+/* set normal menubar menuitem */
+PanelMenuBar.menubar .menu .menuitem {
+    padding: 6px;
+    transition: all 150ms ease-out;
+}
+
+/* set selected menubar menuitem */
+PanelMenuBar.menubar .menu .menuitem:checked:hover,
+PanelMenuBar.menubar .menu .menuitem:active:hover,
+PanelMenuBar.menubar .menu .menuitem:hover {
+    background-color: @theme_selected_bg_color;
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 1.0),
+                                      shade (@theme_selected_bg_color, 0.85));
+    color: shade (@theme_selected_fg_color, 1.00);
+    text-shadow: none;
+    border-style: none;
+    border-width: 0px;
+    border-radius: 0px;
+}
+
+/* Mate menu button hover */
+PanelMenuButton.button:hover {
+    color: shade (@theme_selected_bg_color, 1.00);
+}
+
+/* Mate menu menuitem */
+PanelMenuButton .menu .menuitem {
+    padding: 6px;
+}
+
+/* Mate menu menuitem separator */
+PanelMenuButton .menu .menuitem.separator {
+    color: @menu_separator;
+    -GtkMenuItem-horizontal-padding: 0;
 }
 
 /* desktop-applet, clockapplet, drivemount, character-map,
 dictionary */
-MatePanelApplet .button {
-	transition: all 400ms ease-out;
-	background-image: none;
-	background-color: @theme_bg_color;
-	color: @theme_text_color;
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 0px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
+MatePanelApplet .button,
+MatePanelApplet .button.flat {
+    transition: all 400ms ease-out;
+    background-image: none;
+    background-color: @theme_bg_color;
+    color: @theme_text_color;
+    border-image: none;
+    border-style: solid;
+    border-width: 0px;
+    border-radius: 0px;
+    text-shadow: none;
+    -GtkWidget-window-dragging: true;
+    padding: 4px 4px 4px 4px;
 }
 
 MatePanelApplet .button:checked:hover,
 MatePanelApplet .button:checked,
 MatePanelApplet .button:active:hover,
-MatePanelApplet .button:active {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 0.86),
-		shade (@theme_selected_bg_color, 0.26));
-	background-color: @theme_base_color;
-	color: shade (@theme_selected_fg_color, 1.00);
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
-
-MatePanelApplet .button:hover {
-	background-image: linear-gradient(to bottom,
-		@theme_bg_color,
-		shade (@theme_selected_bg_color, 0.86));
-	background-color: @theme_base_color;
-	color: shade (@theme_text_color, 1.0);
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
+MatePanelApplet .button:active,
+MatePanelApplet .button.flat:checked:hover,
+MatePanelApplet .button.flat:checked,
+MatePanelApplet .button.flat:active:hover,
+MatePanelApplet .button.flat:active {
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 0.86),
+                                      shade (@theme_selected_bg_color, 0.26));
+    background-color: @theme_base_color;
+    color: shade (@theme_selected_fg_color, 1.00);
+    border-image: none;
+    border-style: solid;
+    border-width: 0px;
+    border-radius: 5px;
+    text-shadow: none;
+    -GtkWidget-window-dragging: true;
+    padding: 4px 4px 4px 4px;
+}
+
+MatePanelApplet .button:hover,
+MatePanelApplet .button.flat:hover {
+    background-image: linear-gradient(to bottom,
+                                      @theme_bg_color,
+                                      shade (@theme_selected_bg_color, 0.86));
+    background-color: @theme_base_color;
+    color: shade (@theme_text_color, 1.0);
+    border-image: none;
+    border-style: solid;
+    border-width: 0px;
+    border-radius: 5px;
+    text-shadow: none;
+    -GtkWidget-window-dragging: true;
+    padding: 4px 4px 4px 4px;
 }
 
 /*Wncklist */
 WnckTasklist .button {
-	transition: all 400ms ease-out;
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.96));
-	background-color: @theme_base_color;
-	color: @theme_text_color;
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
+    transition: all 400ms ease-out;
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_bg_color, 1.0),
+                                      shade (@theme_bg_color, 0.96));
+    background-color: @theme_bg_color;
+    color: @theme_text_color;
+    border-image: none;
+    border-style: solid;
+    border-width: 0px;
+    border-radius: 5px;
+    text-shadow: none;
+    -GtkWidget-window-dragging: true;
 }
 
 WnckTasklist .button:checked:hover,
 WnckTasklist .button:checked,
 WnckTasklist .button:active:hover,
 WnckTasklist .button:active {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 0.86),
-		shade (@theme_selected_bg_color, 0.26));
-	background-color: @theme_base_color;
-	color: shade (@theme_selected_fg_color, 1.00);
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
-}
-
-WnckTasklist .button:hover {
-	background-image: linear-gradient(to bottom,
-		@theme_bg_color,
-		shade (@theme_selected_bg_color, 0.86));
-	background-color: @theme_base_color;
-	color: shade (@theme_text_color, 1.0);
-	border-image: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
-	text-shadow: none;
-	-GtkWidget-window-dragging: true;
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 0.86),
+                                      shade (@theme_selected_bg_color, 0.26));
+    background-color: @theme_base_color;
+    color: shade (@theme_selected_fg_color, 1.00);
+    border-image: none;
+    border-style: solid;
+    border-width: 0px;
+    border-radius: 5px;
+    text-shadow: none;
+    -GtkWidget-window-dragging: true;
 }
 
-/* set normal menubar button */
-PanelMenuBar.menubar .menuitem {
-	transition: all 200ms ease-out;
+WnckTasklist .button:hover,
+WnckTasklist .button.flat:hover {
+    background-image: linear-gradient(to bottom,
+                                      @theme_bg_color,
+                                      shade (@theme_selected_bg_color, 0.86));
+    background-color: @theme_base_color;
+    color: shade (@theme_text_color, 1.0);
+    border-image: none;
+    border-style: solid;
+    border-width: 0px;
+    border-radius: 5px;
+    text-shadow: none;
+    -GtkWidget-window-dragging: true;
 }
 
-/* set selected menubar button */
-PanelMenuBar.menubar .menuitem:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 0.86),
-		shade (@theme_selected_bg_color, 0.26));
-	background-color: @theme_base_color;
-	color: shade (@theme_selected_fg_color, 1.00);
-	text-shadow: none;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
+/* set normal button WnckSelector */
+/* FIXME , gtk-inspector said it's gnome! */
+.gnome-panel-window-menu-menu-bar .menuitem,
+MatePanelApplet > WnckSelector.menubar .menuitem {
+    background-image: none;
+    background-color: @theme_bg_color;
+    border-style: solid;
+    border-width: 0px;
+    border-radius: 0px;
 }
 
-/* set menubar menuitem separator */
-PanelMenuBar.menubar .menu .menuitem.separator {
-	color: @menu_separator;
-	-GtkMenuItem-horizontal-padding: 0;
+/* set selected button WnckSelector */
+.gnome-panel-window-menu-menu-bar .menuitem:hover,
+MatePanelApplet > WnckSelector.menubar .menuitem:hover {
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 0.86),
+                                      shade (@theme_selected_bg_color, 0.26));
+    background-color: @theme_base_color;
+    border-style: solid;
+    border-width: 0px;
+    border-radius: 5px;
 }
 
-/* set normal menubar menuitem */
-PanelMenuBar.menubar .menu .menuitem {
-    padding: 6px;
-    transition: all 150ms ease-out;
+/* set WnckSelector normal menuitem */
+.gnome-panel-window-menu-menu-bar .menu .menuitem,
+MatePanelApplet > WnckSelector.menubar .menu .menuitem {
+    background-color: @menu_bg_color;
+    background-image: none;
+    color: shade (@theme_fg_color, 1.00);
+    text-shadow: none;
 }
 
-/* set selected menubar menuitem */
-PanelMenuBar.menubar .menu .menuitem:checked:hover,
-PanelMenuBar.menubar .menu .menuitem:active:hover,
-PanelMenuBar.menubar .menu .menuitem:hover {
-	background-color: @theme_selected_bg_color;
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	color: shade (@theme_selected_fg_color, 1.00);
-	text-shadow: none;
-	border-style: none;
-	border-width: 0px;
-	border-radius: 0px;
+/* set WnckSelector selected menuitem */
+.gnome-panel-window-menu-menu-bar .menu .menuitem:hover,
+MatePanelApplet > WnckSelector.menubar .menu .menuitem:hover {
+    background-color: @theme_selected_bg_color;
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 1.0),
+                                      shade (@theme_selected_bg_color, 0.85));
+    color: shade (@theme_selected_fg_color, 1.00);
+    text-shadow: none;
 }
 
-/* set normal button WnckSelector */
-.mate-panel-window-menu-menu-bar .menuitem,
-MatePanelApplet > WnckSelector.menubar .menuitem {
-	background-image: none;
-	background-color: @theme_bg_color;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 0px;
+/* set WnckSelector menuitem separator */
+.gnome-panel-window-menu-menu-bar .menu .menuitem.separator,
+MatePanelApplet > WnckSelector.menubar .menu .menuitem.separator {
+    color: @menu_separator;
+    -GtkMenuItem-horizontal-padding: 0;
 }
 
-/* set selected button WnckSelector */
-.mate-panel-window-menu-menu-bar .menuitem:hover,
-MatePanelApplet > WnckSelector.menubar .menuitem:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 0.86),
-		shade (@theme_selected_bg_color, 0.26));
-	background-color: @theme_base_color;
-	border-style: solid;
-	border-width: 0px;
-	border-radius: 5px;
+/* prelight of WnckPager */
+WnckPager:hover {
+    background-image: linear-gradient(to bottom,
+                                      @theme_bg_color,
+                                      shade (@theme_selected_bg_color, 0.86));
+    background-color: @theme_base_color;
 }
 
-/* set WnckSelector selected menuitem */
-.mate-panel-window-menu-menu-bar .menu .menuitem:hover,
-MatePanelApplet > WnckSelector.menubar .menu .menuitem:hover {
-	background-color: @theme_selected_bg_color;
-	background-image: linear-gradient(to bottom,
-		shade (@theme_selected_bg_color, 1.0),
-		shade (@theme_selected_bg_color, 0.85));
-	color: shade (@theme_selected_fg_color, 1.00);
-	text-shadow: none;
+WnckPager {
+    background-image: none;
+    border-color: @transparent;
+    background-color: @theme_bg_color;
 }
 
 ClockBox,
 .mate-panel-menu-bar.menubar,
 MatePanelApplet > GtkMenuBar.menubar {
-	font: normal;
-}
-
-WnckPager {
-	background-image: none;
-	border-color: @transparent;
-	background-color: @theme_bg_color;
+    font: normal;
 }
 
 NaTrayApplet {
-	-NaTrayApplet-icon-padding: 12px;
-	-NaTrayApplet-icon-size: 16;
+    -NaTrayApplet-icon-padding: 12px;
+    -NaTrayApplet-icon-size: 16;
 }
 
 /* Classic icon style */
 .mate-panel-menu-bar {
-	-PanelMenuBar-icon-visible: true;
+    -PanelMenuBar-icon-visible: true;
 }
 
 /* Makes the text color on the light panel black */
 .mate-panel-menu-bar .menuitem {
-	color: @theme_fg_color;
-	text-shadow: none;
+    color: @theme_fg_color;
+    text-shadow: none;
 }
 
 /****************
@@ -604,3 +659,17 @@ ShellWindow .button.flat:hover {
     border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
 }
 
+/*********
+ * Atril *
+ *********/
+
+/* size of page entry */
+EvPageActionWidget .entry {
+    padding: 2px;
+}
+
+EvWindow .toolbar .button,
+EvWindow .toolbar .button.flat {
+    padding: 0px 4px;
+}
+