BlueMenta GTK3: merge some changes from Menta theme

- fix menu borders
- fix GtkSwitch hover color in gtk-inspector
- adjust app-notification
- fix popovers background
- fix button hover in mate-panel
- fix indents in mate-applications.css

2 files changed, 304 insertions, 262 deletions

diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
index 2502881c..afba0f31 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -2123,7 +2123,6 @@ GtkTreeMenu .menuitem,
 	background-image: none;
 	background-color: @theme_base_color;
 	color: @internal_element_color;
-
 	border-image: none;
 	border-style: none;
 }
@@ -2132,7 +2131,6 @@ GtkTreeMenu .menuitem,
 	background-image: none;
 	background-color: @theme_base_color;
 	color: @theme_text_color;
-
 	border-image: none;
 	border-style: none;
 }
@@ -2140,18 +2138,17 @@ GtkTreeMenu .menuitem,
 .menu.button:insensitive {
 	background-color: @theme_base_color;
 	color: lighter(@internal_element_color);
-
 	border-image: none;
 	border-style: none;
 }
 
 /* this controls the general appearance of the menubar */
 .menubar {
-	background-image: linear-gradient(to bottom,
-		@theme_bg_color,
-		shade (@theme_bg_color, 0.96));
-	border-width: 0;
-	-GtkWidget-window-dragging: true;
+    background-image: linear-gradient(to bottom,
+                                      @theme_bg_color,
+                                      shade (@theme_bg_color, 0.96));
+    border-width: 0;
+    -GtkWidget-window-dragging: true;
 }
 
 .menubar .menuitem {
@@ -2162,9 +2159,9 @@ GtkTreeMenu .menuitem,
 }
 
 .menubar .menuitem:hover {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_bg_color, 1.0),
-		shade (@theme_bg_color, 0.82));
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_bg_color, 1.0),
+                                      shade (@theme_bg_color, 0.82));
 }
 
 .menubar .menuitem:hover {
@@ -2172,9 +2169,10 @@ GtkTreeMenu .menuitem,
 }
 
 .menu .menuitem {
-	-GtkMenuItem-arrow-scaling: 0.6;
-	transition: all 150ms ease-out;
-	padding: 4px;
+    background-color: transparent;
+    -GtkMenuItem-arrow-scaling: 0.6;
+    transition: all 150ms ease-out;
+    padding: 6px 5px;
 }
 
 .menu .menuitem:hover {
@@ -3429,7 +3427,8 @@ GtkSwitch.trough:insensitive {
 	text-shadow: none;
 }
 
-GtkSwitch.slider {
+GtkSwitch.slider,
+GtkSwitch.slider:hover {
 	background-color: transparent;
 	border: none;
 	border-image: none;
@@ -3682,7 +3681,7 @@ column-header .button.dnd {
 
 .app-notification,
 .app-notification.frame {
-    color: @theme_selected_fg_color;
+    color: @theme_fg_color;
     padding: 10px;
     border: none;
     border-radius: 0 0 4px 4px;
@@ -3706,7 +3705,7 @@ column-header .button.dnd {
 .app-notification GtkCalendar.header .button.titlebutton,
 GtkCalendar.header .app-notification .button.titlebutton,
 .app-notification.frame .button {
-    color: #eeeeec;
+    color: @theme_fg_color;
     border-color: rgba(75, 89, 112, 0.7);
     background-image: linear-gradient(to bottom,
                                       rgba(102, 153, 204, 0.7));
@@ -4092,7 +4091,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; 
@@ -4182,7 +4181,7 @@ GtkModelButton.button.flat,
 GtkModelButton.button.flat:focus,
 GtkModelButton.button.flat:active:focus,
 GtkModelButton.button.flat:checked:focus {
-	background-color: @theme_bg_color;
+	background-color: @menu_bg_color;
 	background-image: none;
 	border-color: transparent;
 	border-image: none;
diff --git a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
index ac003bc0..76758802 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
@@ -5,51 +5,51 @@
 
 .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 {
@@ -67,7 +67,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 */
@@ -75,7 +75,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 */
@@ -114,7 +114,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,11 +151,11 @@ CajaWindow .toolbar GtkComboBox .button:hover {
 
 /* to avoid padding when executing toogle button */
 CajaLocationBar .entry {
-      padding: 4px;
+    padding: 4px;
 }
 
 CajaWindow * {
-	-GtkPaned-handle-size: 0;
+    -GtkPaned-handle-size: 0;
 }
 
 /* caja sidebar */
@@ -165,8 +165,8 @@ 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 .view row:active:hover,
@@ -178,118 +178,118 @@ 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);
+    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);
+    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;
 }
 
 /****************
@@ -306,230 +306,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 {
+    transition: all 150ms ease-out;
+    padding: 6px;
+}
+
+/* set selected menubar menuitem */
+PanelMenuBar.menubar .menu .menuitem:checked:hover,
+PanelMenuBar.menubar .menu .menuitem:active:hover,
+PanelMenuBar.menubar .menu .menuitem:hover {
+    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_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;
 }
 
 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 {
-    transition: all 150ms ease-out;
-    padding: 6px;
+/* 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;
+WnckPager {
+    background-image: none;
+    border-color: @transparent;
+    background-color: @theme_bg_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;
+/* 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;
 }
 
 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;
 }
 
 /****************
@@ -561,8 +604,8 @@ PlumaView {
 /*FIXME normaly this isn't the right entry for adjusting
 the sidebar entry hover color*/
 PlumaWindow .view row:hover {
-	background-color: shade (@theme_selected_bg_color, 1.15);
-	color: shade (@theme_selected_bg_color, 0.35);
+    background-color: shade (@theme_selected_bg_color, 1.15);
+    color: shade (@theme_selected_bg_color, 0.35);
 }
 
 /* Pluma status bar */