GTK+-3.20 Menta themes: file-browser pathbar adjustments + increase size of rows + clean up

8 files changed, 417 insertions, 935 deletions

diff --git a/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css b/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css
index 95bd1c28..ff728394 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css
@@ -30,6 +30,68 @@
 	color: @theme_unfocused_selected_fg_color;
 }
 
+/* workaround for jumping buttons in nautilus */
+.nautilus-window headerbar.titlebar .linked.path-bar > button,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle {
+    border: 1px;
+    border-radius: 4px;
+    margin: 0px -4px 0px 0px;
+    padding: 4px;
+	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	border-width: 2px;
+	border-style: solid;
+	border-color: transparent;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button:checked:hover,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle:checked:hover,
+.nautilus-window headerbar.titlebar .linked.path-bar > button:checked,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle:checked {
+	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button:hover,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle:hover,
+.nautilus-window headerbar.titlebar .linked.path-bar > button:hover:active,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle:hover:active {
+	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button:disabled,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle:disabled {
+	border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar> button:first-child widget {
+    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button:first-child {
+   margin: 0px -4px 0px 0px;
+   padding: 0px;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button:last-child widget {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar> button:last-child {
+   margin: 0px 0px 0px -4px;
+  padding: 0px;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle {
+    margin: 0px -8px 0px 0px;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle.toggle image {
+   padding: 0px 2px;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle.toggle label {
+   padding: 0px 8px 0px 4px;
+}
+
 /* gedit */
 .gedit-headerbar-paned:backdrop {
 	background-image: url("assets/null.png");
diff --git a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
index e28ef4ec..ee5c8995 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
@@ -1,28 +1,14 @@
 * {
-/*	engine: none; */
 	padding: 0;
 	background-clip: padding-box;
-/*	-GtkButton-child-displacement-x: 1; deprecated */
-/*	-GtkButton-child-displacement-y: 1; deprecated */
-/*	-GtkButtonBox-child-min-height: 26; deprecated */
-/*	-GtkCheckButton-indicator-size: 16; deprecated */
-/*	-GtkCheckMenuItem-indicator-size: 12; deprecated */
 	-GtkDialog-button-spacing: 4;
 	-GtkDialog-action-area-border: 10; /* buttons mate-appearance-properties */
-/*	-GtkExpander-expander-size: 11; deprecated */
-/*	-GtkMenu-horizontal-padding: 0; */
-/*	-GtkMenu-vertical-padding: 0; */
-/*	-GtkPaned-handle-size: 1; deprecated */
 	-GtkScrolledWindow-scrollbar-spacing: 0;
-/*	-GtkScrolledWindow-scrollbars-within-bevel: 1; deprecated */
 	-GtkTextView-error-underline-color: @error_color;
 	-GtkToolButton-icon-spacing: 4;
 	-GtkToolItemGroup-expander-size: 11;
 	-GtkTreeView-expander-size: 11;
 	-GtkTreeView-horizontal-separator: 4;
-/*	-GtkWidget-focus-padding: 2;  deprecated */
-/*	-GtkWidget-focus-line-width: 0; */
-/*	-GtkStatusbar-shadow-type: none;  deprecated */
 	-GtkIMHtml-hyperlink-color: @link_color;
 	-GtkHTML-link-color: @link_color;
 	-WnckTasklist-fade-overlay-rect: 0;
@@ -31,7 +17,7 @@
 	outline-offset: -3px; /* 2px */
 	outline-width: 0px; /* disable ugly focus-line */
 	-gtk-outline-radius: 2px;
-/*	-gtk-icon-style: regular;*/ /* disable symbolic icons */
+/*	-gtk-icon-style: regular;*//* disable symbolic icons */
 }
 
 /***************
@@ -2424,7 +2410,7 @@ paned.horizontal notebook {
 
 paned.horizontal notebook box.vertical {
     border-radius: 0px;
-    border-width: 0px
+    border-width: 0px;
     border-style: none;
 }
 
@@ -2858,14 +2844,8 @@ scrollbar,
 	background-image: none;
 	border-style: solid;
 	border-color: shade (@theme_bg_color, 0.94);
-/*	-GtkRange-trough-border: 0; */
 	-GtkScrollbar-has-backward-stepper: true;
 	-GtkScrollbar-has-forward-stepper: true;
-/*	-GtkRange-stepper-size: 16;
-	-GtkRange-slider-width: 13;
-	-GtkScrollbar-min-slider-length: 42; *//* minimum size for the slider. sadly can't be in '.slider' where it belongs *//*
-	-GtkRange-stepper-spacing: 0;
-	-GtkRange-trough-under-steppers: 1;*/
 }
 
 scrollbar.vertical {
@@ -4944,150 +4924,6 @@ GtkCalendar.header .path-bar .button.titlebutton GtkImage {
 	padding-top: 1px;
 }
 
-.linked.path-bar > button,
-.linked.path-bar > button:hover,
-.linked.path-bar > button:hover:active,
-.linked.path-bar > button:focus,
-.linked.path-bar > button:focus:hover,
-.linked.path-bar > button:focus:hover:active,
-.linked.path-bar > button:checked,
-.linked.path-bar > button:checked:hover,
-.linked.path-bar > button:checked:hover:active,
-.linked.path-bar > button:focus:checked,
-.linked.path-bar > button:focus:checked:hover,
-.linked.path-bar > button:focus:checked:hover:active,
-.linked.path-bar > button:disabled,
-.linked.path-bar > button:focus:disabled,
-.linked.path-bar > button.text-button.toggle,
-.linked.path-bar > button.text-button.toggle:hover,
-.linked.path-bar > button.text-button.toggle:hover:active,
-.linked.path-bar > button.text-button.toggle:focus,
-.linked.path-bar > button.text-button.toggle:focus:hover,
-.linked.path-bar > button.text-button.toggle:focus:hover:active,
-.linked.path-bar > button.text-button.toggle:checked,
-.linked.path-bar > button.text-button.toggle:checked:hover,
-.linked.path-bar > button.text-button.toggle:checked:hover:active,
-.linked.path-bar > button.text-button.toggle:focus:checked,
-.linked.path-bar > button.text-button.toggle:focus:checked:hover,
-.linked.path-bar > button.text-button.toggle:focus:checked:hover:active,
-.linked.path-bar > button.text-button.toggle:disabled,
-.linked.path-bar > button.text-button.toggle:focus:disabled {
-    border-width: 1px 0px 1px 0px;
-    border-radius: 0px;
-    border-style: solid;
-    border-color: @borders;
-    border-image: none;
-    padding: 4px;
-}
-
-.linked.path-bar > button:first-child,
-.linked.path-bar > button:hover:first-child,
-.linked.path-bar > button:hover:active:first-child,
-.linked.path-bar > button:focus:first-child,
-.linked.path-bar > button:focus:hover:first-child,
-.linked.path-bar > button:focus:hover:active:first-child,
-.linked.path-bar > button:checked:first-child,
-.linked.path-bar > button:checked:hover:first-child,
-.linked.path-bar > button:checked:hover:active:first-child,
-.linked.path-bar > button:focus:checked:first-child,
-.linked.path-bar > button:focus:checked:hover:first-child,
-.linked.path-bar > button:focus:checked:hover:active:first-child,
-.linked.path-bar > button:disabled:first-child,
-.linked.path-bar > button:focus:disabled:first-child,
-.linked.path-bar > button.text-button.toggle:first-child,
-.linked.path-bar > button.text-button.toggle:hover:first-child,
-.linked.path-bar > button.text-button.toggle:hover:active:first-child,
-.linked.path-bar > button.text-button.toggle:focus:first-child,
-.linked.path-bar > button.text-button.toggle:focus:hover:first-child,
-.linked.path-bar > button.text-button.toggle:focus:hover:active:first-child,
-.linked.path-bar > button.text-button.toggle:checked:first-child,
-.linked.path-bar > button.text-button.toggle:checked:hover:first-child,
-.linked.path-bar > button.text-button.toggle:checked:hover:active:first-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:first-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:hover:first-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:hover:active:first-child,
-.linked.path-bar > button.text-button.toggle:disabled:first-child,
-.linked.path-bar > button.text-button.toggle:focus:disabled:first-child  {
-    border-width: 1px 0px 1px 1px;
-    border-radius: 3px 0px 0px 3px;
-    border-style: solid;
-    border-color: @borders;
-    border-image: none;
-    padding: 4px;
-}
-
-.linked.path-bar > button:last-child,
-.linked.path-bar > button:hover:last-child,
-.linked.path-bar > button:hover:active:last-child,
-.linked.path-bar > button:focus:last-child,
-.linked.path-bar > button:focus:hover:last-child,
-.linked.path-bar > button:focus:hover:active:last-child,
-.linked.path-bar > button:checked:last-child,
-.linked.path-bar > button:checked:hover:last-child,
-.linked.path-bar > button:checked:hover:active:last-child,
-.linked.path-bar > button:focus:checked:last-child,
-.linked.path-bar > button:focus:checked:hover:last-child,
-.linked.path-bar > button:focus:checked:hover:active:last-child,
-.linked.path-bar > button:disabled:last-child,
-.linked.path-bar > button:focus:disabled:last-child,
-.linked.path-bar > button.text-button.toggle:last-child,
-.linked.path-bar > button.text-button.toggle:hover:last-child,
-.linked.path-bar > button.text-button.toggle:hover:active:last-child,
-.linked.path-bar > button.text-button.toggle:focus:last-child,
-.linked.path-bar > button.text-button.toggle:focus:hover:last-child,
-.linked.path-bar > button.text-button.toggle:focus:hover:active:last-child,
-.linked.path-bar > button.text-button.toggle:checked:last-child,
-.linked.path-bar > button.text-button.toggle:checked:hover:last-child,
-.linked.path-bar > button.text-button.toggle:checked:hover:active:last-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:last-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:hover:last-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:hover:active:last-child,
-.linked.path-bar > button.text-button.toggle:disabled:last-child,
-.linked.path-bar > button.text-button.toggle:focus:disabled:last-child  {
-    border-width: 1px 1px 1px 0px;
-    border-radius: 0px 3px 3px 0px;
-    border-style: solid;
-    border-color: @borders;
-    border-image: none;
-    padding: 4px;
-}
-
-.linked.path-bar > button:only-child,
-.linked.path-bar > button:hover:only-child,
-.linked.path-bar > button:hover:active:only-child,
-.linked.path-bar > button:focus:only-child,
-.linked.path-bar > button:focus:hover:only-child,
-.linked.path-bar > button:focus:hover:active:only-child,
-.linked.path-bar > button:checked:only-child,
-.linked.path-bar > button:checked:hover:only-child,
-.linked.path-bar > button:checked:hover:active:only-child,
-.linked.path-bar > button:focus:checked:only-child,
-.linked.path-bar > button:focus:checked:hover:only-child,
-.linked.path-bar > button:focus:checked:hover:active:only-child,
-.linked.path-bar > button:disabled:only-child,
-.linked.path-bar > button:focus:disabled:only-child,
-.linked.path-bar > button.text-button.toggle:only-child,
-.linked.path-bar > button.text-button.toggle:hover:only-child,
-.linked.path-bar > button.text-button.toggle:hover:active:only-child,
-.linked.path-bar > button.text-button.toggle:focus:only-child,
-.linked.path-bar > button.text-button.toggle:focus:hover:only-child,
-.linked.path-bar > button.text-button.toggle:focus:hover:active:only-child,
-.linked.path-bar > button.text-button.toggle:checked:only-child,
-.linked.path-bar > button.text-button.toggle:checked:hover:only-child,
-.linked.path-bar > button.text-button.toggle:checked:hover:active:only-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:only-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:hover:only-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:hover:active:only-child,
-.linked.path-bar > button.text-button.toggle:disabled:only-child,
-.linked.path-bar > button.text-button.toggle:focus:disabled:only-child  {
-    border-width: 1px;
-    border-radius: 3px;
-    border-style: solid;
-    border-color: @borders;
-    border-image: none;
-    padding: 4px;
-}
-
 /***********************
  * Tree and Icon views *
  ***********************/
@@ -5100,6 +4936,10 @@ treeview {
 	outline-color: alpha(@theme_text_color, 0.6);
 }
 
+treeview {
+    padding: 5px 0px;
+}
+
 GtkTreeView.dnd,
 treeview dnd {
 	border-color: @internal_element_color;
@@ -5193,6 +5033,10 @@ textview,
 	color: @theme_fg_color;
 }
 
+row {
+    min-height: 22px;
+}
+
 row:selected,
 row:selected:focus {
 	border-width: 1px 0 1px 0;
@@ -6431,7 +6275,5 @@ paned > separator.wide:backdrop {
 	background-image: none;
 	border-style: none;
 	border-image: none;
-/*	-GtkButton-image-spacing: 0;
-	-GtkButton-inner-border: 0; deprecated */
 }
 
diff --git a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
index 0527d1d1..eead872c 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
@@ -94,62 +94,59 @@
     padding: 6px 4px;
 }
 
-/* the small line between sidebar and view , now in gtk-widgets 'paned'*//*
-.caja-navigation-window paned.horizontal {
-    -GtkPaned-handle-size: 3px;
-    border-color: transparent;
-    background-color: @theme_bg_color;
+/* arrow button */
+.caja-pathbar button:nth-child(odd) widget {
+    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
 }
 
-*//* caja sidebar *//*
-CajaWindow FMTreeView .view,
-CajaWindow CajaNotesViewer .view,
-CajaWindow CajaPlacesSidebar .view,
-CajaWindow CajaHistorySidebar .view,
-CajaWindow CajaInformationPanel GtkVBox,
-CajaWindow CajaEmblemSidebar GtkViewport {
-    background-color: shade (@theme_bg_color, 1.08);
-    color: @theme_fg_color;
-}*/
-/* 3.20 emblems are broken */
-/* places, treeview, history, information and notes */
-.caja-side-pane treeview.view,
-.caja-side-pane textview.view text {
+.caja-pathbar button:nth-child(odd) {
+   margin: 0px -7px 0px 0px;
+   padding: 0px;
+}
+
+.caja-pathbar button:nth-child(even) widget {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+}
+
+.caja-pathbar button:nth-child(even) {
+   margin: 0px 0px 0px -7px;
+  padding: 0px;
+}
+
+/* folder buttons */
+.caja-pathbar button.toggle {
+   margin: 0px -8px 0px 0px;
+}
+
+.caja-pathbar button.toggle image {
+   padding: 0px 4px 0px 5px;
+}
+
+.caja-pathbar button.toggle label {
+   padding: 0px 5px;
+}
+
+/* places, treeview, history, information, emblems and notes */
+.caja-side-pane notebook treeview.view,
+.caja-side-pane notebook textview.view text,
+.caja-side-pane notebook viewport.frame,
+.caja-side-pane notebook widget .vertical {
     background-color: shade (@theme_bg_color, 1.08);
     color: @theme_fg_color;
 }
 
-.caja-side-pane treeview.view:selected:hover,
-CajaWindow CajaPlacesSidebar .view row:active:hover,
-CajaWindow CajaPlacesSidebar .view row:checked:hover,
-CajaWindow CajaPlacesSidebar .view row:selected:hover,
-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 {
+.caja-side-pane treeview.view:selected:hover {
     color: shade (@theme_selected_fg_color, 1.00);
 }
 
-.caja-side-pane treeview.view:hover,
-CajaWindow CajaPlacesSidebar .view row:hover,
-CajaWindow FMTreeView .view row:hover,
-CajaWindow CajaHistorySidebar .view row:hover {
+.caja-side-pane treeview.view:hover {
     background-color: shade (@theme_selected_bg_color, 1.15);
     color: shade (@theme_selected_fg_color, 1.00);
 }
 
-/* What is that? */
-CajaWindow .rubberband,
-CajaWindow .view.rubberband {
-    background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-
-/* moved eject button to left better for overlay scrollbars */
-.caja-side-pane treeview.view,
-CajaWindow CajaPlacesSidebar .view row {
-    padding: 1px 4px 1px 0px;
+/* treeview rows */
+.caja-side-pane treeview.view {
+    padding: 2px 0px 2px 0px;
 }
 
 /* to avoid overlap with eject buttons */
@@ -195,15 +192,12 @@ CajaWindow CajaPlacesSidebar .view row {
     color: shade (@theme_selected_bg_color, 0.35);
 }
 
-.caja-notebook .caja-canvas-item,
-CajaNavigationWindow.background .view.caja-canvas-item {
+.caja-notebook .caja-canvas-item {
     color: @theme_fg_color;
 }
 
 .caja-notebook .caja-canvas-item:active,
-.caja-notebook .caja-canvas-item:selected,
-CajaNavigationWindow.background .view.caja-canvas-item:active,
-CajaNavigationWindow.background .view.caja-canvas-item:selected {
+.caja-notebook .caja-canvas-item:selected {
     color: @theme_selected_fg_color;
 }
 
@@ -217,7 +211,6 @@ CajaNavigationWindow.background .view.caja-canvas-item:selected {
 
 /* desktop mode */
 /* 3.20 */
-/* desktop */
 .caja-desktop.caja-canvas-item {
     color: @theme_selected_fg_color;
     text-shadow: 1px 1px alpha (#000000, 0.8);
@@ -240,68 +233,32 @@ CajaNavigationWindow.background .view.caja-canvas-item:selected {
    text-shadow: none;
 }
 
-/*
-CajaDesktopWindow.background FMIconContainer.view EelEditableLabel.entry {
-   border-image: none;
-   border-width: 1px;
-   text-shadow: none;
-}
-
-CajaDesktopWindow.background .caja-canvas-item {
-    color: @theme_selected_fg_color;
-    text-shadow: 1px 1px alpha (#000000, 0.8);
-}
-
-CajaDesktopWindow.background .caja-canvas-item:selected {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
-CajaDesktopWindow.background .caja-canvas-item:active,
-CajaDesktopWindow.background .caja-canvas-item:hover,
-CajaDesktopWindow.background .caja-canvas-item:selected {
-    text-shadow: none;
-}
-*/
-/* inactive pane */
-/* not implemented yet *//*
-.caja-inactive-pane .view {
-    background-color: shade(@theme_base_color, 0.9);
-}
-*/
-
 /* Toolbar */
 .caja-navigation-window toolbar button {
     border-image: none;
 }
 
 /* Misc */
-.caja-navigation-window notebook,
-CajaView.frame,
-CajaNotebook.notebook {
+.caja-navigation-window notebook {
     border-right-width: 0;
     border-left-width: 0;
     border-bottom-width: 0;
 }
 
-.caja-navigation-window notebook tab,
-CajaNotebook.notebook tab.top,
-CajaNotebook.notebook tab.bottom {
+.caja-navigation-window notebook tab {
     border-right-width: 1px;
     border-left-width: 1px;
+    padding: 4px 3px 4px 0px;
 }
 
-.caja-navigation-window notebook,
-CajaNotebook .frame {
+.caja-navigation-window notebook {
     border-width: 1px 0 0 0;
 }
 
 /* close button styling */
 /* surpress styling of close button */
 .caja-navigation-window notebook tab button.flat,
-.caja-navigation-window notebook tab button.flat:hover,
-CajaWindow .notebook tab .button.flat,
-CajaWindow .notebook tab .button.flat:hover {
+.caja-navigation-window notebook tab button.flat:hover {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
@@ -310,11 +267,6 @@ CajaWindow .notebook tab .button.flat:hover {
     border-image: none;
 }
 
-.caja-navigation-window notebook tab,
-CajaWindow .notebook tab.top {
-    padding: 4px 3px 4px 0px;
-}
-
 /* do we have this style class? */
 .caja-cluebar-label {
     font: normal;
@@ -323,9 +275,7 @@ CajaWindow .notebook tab.top {
 
 /* to avoid padding when executing toogle button */
 .caja-search-bar entry,
-.caja-location-entry,
-CajaSearchBar .horizontal .entry,
-CajaLocationBar .entry {
+.caja-location-entry {
     padding: 4px;
 }
 
@@ -344,27 +294,6 @@ CajaLocationBar .entry {
     color: @theme_fg_color;
 }
 
-/*
-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;
-}
-
-CajaTrashBar .button,
-CajaXContentBar .button,
-CajaSearchBar .button,
-CajaQueryEditor .button {
-    border-radius: 0;
-}
-*/
-
 /****************
  * Mate-Panel *
  ****************/
@@ -619,17 +548,19 @@ GtkTrayIcon.background {
  * Mate-Terminal *
  ****************/
 
-TerminalWindow GtkNotebook.notebook tab {
-    padding: 2px;
-    border-color: transparent;
-    border-width: 0px;
-    background-image: none;
-    background-color: transparent;
+/* how strange is that? a bg above the header bg? This solves non colored pixels*/
+.mate-terminal notebook header.top tabs {
+    background-color: @theme_bg_color;
 }
 
-TerminalWindow GtkNotebook.notebook tab.top,
-.notebook tab.bottom {
-    padding: 2px;
+.mate-terminal notebook header.top tab,
+.mate-terminal notebook header.top tab:checked:hover {
+    border-radius: 4px 4px 0px 0px;
+    padding: 2px 2px 2px 6px;
+    margin: 0px 0px 0px -1px;
+    border-style: solid;
+    border-color: @borders;
+    border-width: 1px;
 }
 
 /****************
@@ -637,8 +568,7 @@ TerminalWindow GtkNotebook.notebook tab.top,
  ****************/
 
 /* pluma line numbers */
-.pluma-window textview,
-PlumaView {
+.pluma-window textview {
     background-color: shade (@theme_bg_color, 1.07);
 }
 
@@ -653,8 +583,7 @@ PlumaView {
     border-style: none;
 }
 
-.pluma-window statusbar.horizontal frame button.flat.toggle,
-PlumaStatusbar.horizontal.statusbar .frame.flat .flat.button {
+.pluma-window statusbar.horizontal frame button.flat.toggle {
     border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
     padding: 0px;
 }
@@ -665,8 +594,7 @@ PlumaStatusbar.horizontal.statusbar .frame.flat .flat.button {
 }
 
 /* Printpreview */
-.pluma-print-preview toolbar.horizontal,
-PlumaPrintPreview.vertical .toolbar.horizontal {
+.pluma-print-preview toolbar.horizontal {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_bg_color, 1.0),
                                       shade (@theme_bg_color, 0.96));
@@ -679,18 +607,15 @@ PlumaPrintPreview.vertical .toolbar.horizontal {
     padding: 0px;
 }
 
-.pluma-print-preview toolbar.horizontal entry,
-PlumaPrintPreview.vertical .toolbar.horizontal GtkToolItem .horizontal .entry {
+.pluma-print-preview toolbar.horizontal entry {
     padding: 4px 6px;
 }
 
-.pluma-print-preview toolbar.horizontal button.flat.image-button,
-PlumaPrintPreview.vertical .toolbar.horizontal .button.flat.image-button {
+.pluma-print-preview toolbar.horizontal button.flat.image-button {
     padding: 0px;
 }
 
-.pluma-print-preview toolbar.horizontal button.flat.text-button,
-PlumaPrintPreview.vertical .toolbar.horizontal .button.flat.text-button {
+.pluma-print-preview toolbar.horizontal button.flat.text-button {
     padding: 0px 16px;
     border-radius: 2px;
 }
@@ -710,8 +635,7 @@ PlumaPrintPreview.vertical .toolbar.horizontal .button.flat.text-button {
                                       @button_hover_gradient_color_b);
 }
 
-.pluma-print-preview scrolledwindow,
-PlumaPrintPreview.vertical GtkLayout {
+.pluma-print-preview scrolledwindow {
     background-color: @theme_base_color;
 }
 
@@ -724,8 +648,7 @@ PlumaPrintPreview.vertical GtkLayout {
     box-shadow: none;
 }
 
-.pluma-window paned.horizontal box.vertical notebook.frame box.vertical,
-PlumaFileBrowserWidget.vertical {
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical {
     background-color: @theme_bg_color;
 }
 
@@ -733,8 +656,7 @@ PlumaFileBrowserWidget.vertical {
     padding: 0px ;
 }
 
-.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal,
-PlumaFileBrowserWidget.vertical .toolbar.horizontal {
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_bg_color, 1.0),
                                       shade (@theme_bg_color, 0.96));
@@ -748,20 +670,16 @@ PlumaFileBrowserWidget.vertical .toolbar.horizontal {
 }
 
 .pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat,
-.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat.menu-button,
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat,
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat.menu-button {
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat.menu-button {
     padding: 4px 2px ;
 }
 
-.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat.image-button,
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat.image-button {
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat.image-button {
     padding: 4px 3px ;
 }
 
 /* color of of expander arrow */
-.pluma-window paned.horizontal box.vertical notebook.frame box.vertical expander:hover,
-PlumaFileBrowserWidget.vertical GtkExpander:hover {
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical expander:hover {
     color: @theme_fg_color;
 }
 
@@ -770,15 +688,12 @@ PlumaFileBrowserWidget.vertical GtkExpander:hover {
  *********/
 
 /* size of page entry */
-.atril-window .primary-toolbar toolbar toolitem box.horizontal entry,
-EvPageActionWidget .entry {
+.atril-window .primary-toolbar toolbar toolitem box.horizontal entry {
     padding: 2px;
 }
 
 .atril-window .primary-toolbar toolbar button,
-.atril-window .primary-toolbar toolbar button.flat,
-EvWindow .toolbar .button,
-EvWindow .toolbar .button.flat {
+.atril-window .primary-toolbar toolbar button.flat {
     padding: 5px;
 }
 
@@ -787,8 +702,7 @@ EvWindow .toolbar .button.flat {
 }
 
 /* atril and eom */
-EggToolbarEditor.vertical scrolledwindow viewport.frame,
-EggToolbarEditor.vertical GtkScrolledWindow .frame {
+EggToolbarEditor.vertical scrolledwindow viewport.frame {
     background-color: shade (@theme_base_color, 1.0);
     border-color: @borders;
     border-width: 1px;
@@ -800,32 +714,27 @@ EggToolbarEditor.vertical GtkScrolledWindow .frame {
  * Eom *
  *******/
 
-.eom-window .vertical .vertical .vertical .horizontal button.flat:first-child,
-EomThumbNav .button.flat:first-child {
+.eom-window .vertical .vertical .vertical .horizontal button.flat:first-child {
     border-radius: 4px 0px 0px 4px;
     border-width: 1px 0px 1px 1px;
 }
 
-.eom-window .vertical .vertical .vertical .horizontal button.flat:last-child,
-EomThumbNav .button.flat:last-child {
+.eom-window .vertical .vertical .vertical .horizontal button.flat:last-child {
     border-radius: 0px 4px 4px 0px;
     border-width: 1px 1px 1px 0px;
 }
 
-.eom-window .vertical .vertical .vertical .horizontal button.flat,
-EomThumbNav .button.flat {
+.eom-window .vertical .vertical .vertical .horizontal button.flat {
     border-image: none;
     border-color: @unfocused_borders;
 }
 
-.eom-window .vertical .vertical .vertical .horizontal button.flat:hover,
-EomThumbNav .button.flat:hover {
+.eom-window .vertical .vertical .vertical .horizontal button.flat:hover {
     border-image: none;
     border-color: @menu_combobox_border;
 }
 
-.eom-window .vertical .vertical .vertical .horizontal button.flatdisabled,
-EomThumbNav .button.flat:disabled {
+.eom-window .vertical .vertical .vertical .horizontal button.flat:disabled {
     border-color: transparent;
 }
 
diff --git a/desktop-themes/BlueMenta/gtk-3.0/other-applications.css b/desktop-themes/BlueMenta/gtk-3.0/other-applications.css
index 779216b8..292d96d3 100644
--- a/desktop-themes/BlueMenta/gtk-3.0/other-applications.css
+++ b/desktop-themes/BlueMenta/gtk-3.0/other-applications.css
@@ -4,44 +4,48 @@
 
 /* workaround for broken first/last-child logic with linked buttons
    in pathbar since gtk+-3.18 */
-.nemo-window NemoPathBar.raised.linked button.text-button,
-.nemo-window NemoPathBar.raised.linked button.text-button:hover,
-.nemo-window NemoPathBar.raised.linked button.text-button:hover:active,
-.nemo-window NemoPathBar.raised.linked button.text-button:active,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active,
-.nemo-window NemoPathBar.raised.linked button.text-button:first-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:hover:first-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:hover:active:first-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:active:first-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:first-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:first-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active:first-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:last-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:hover:last-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:hover:active:last-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:active:last-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:last-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:last-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active:last-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:only-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:hover:only-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:hover:active:only-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:active:only-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:only-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:only-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active:only-child {
-    border-right-width: 1px;
-    border-left-width: 1px;
+
+.nemo-window widget.raised.linked > button:nth-child(first) widget {
+    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+}
+
+.nemo-window widget.raised.linked > button:nth-child(last) widget {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+}
+
+.nemo-window widget.raised.linked > button:nth-child(first) {
+   margin: 0px -5px 0px -1px;
+   padding: 0px;
+}
+
+.nemo-window widget.raised.linked > button:nth-child(last) {
+   margin: 0px -1px 0px -5px;
+   padding: 0px;
+}
+
+.nemo-window widget.raised.linked > button.text-button.toggle {
+    border-width: 1px;
     border-image-width: 3px 3px 4px 3px;
     border-radius: 4px;
     border-style: solid;
+    margin: 0px -8px 0px 0px;
+}
+
+.nemo-window widget.raised.linked > button.text-button.toggle:nth-child(first) {
+    margin: 0px -1px 0px 0px;
+}
+
+.nemo-window widget.raised.linked > button.text-button.toggle:nth-child(last) {
+    margin: 0px 0px 0px -1px;
+}
+
+.nemo-window widget.raised.linked > button.text-button.toggle label,
+.nemo-window widget.raised.linked > button.text-button.toggle image {
+   padding: 0px 4px;
 }
 
 /* For Places Sidebar diskfull indicators */
-.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view,
-NemoPlacesTreeView {
+.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view {
 	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
 	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
 	-NemoPlacesTreeView-disk-full-bar-width: 2px;
@@ -50,22 +54,17 @@ NemoPlacesTreeView {
 	-NemoPlacesTreeView-disk-full-max-length: 70px;
 }
 
-.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:selected,
-NemoPlacesTreeView:selected {
+.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:selected {
 	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0);
 	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0);
 }
 
-.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:hover,
-NemoPlacesTreeView:hover {
+.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:hover {
 }
 
-.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:selected:hover,
-NemoPlacesTreeView:selected:hover {
+.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:selected:hover {
 }
 
-@define-color cluebar_color shade (@theme_base_color, 0.9);
-
 /* view */
 .nemo-window-pane notebook scrolledwindow {
 	background-color: @theme_base_color;
@@ -175,80 +174,28 @@ NemoPlacesTreeView:selected:hover {
     border-style: solid;
 }
 
-/****************
- * PopOver menu *
- ****************/
-GraniteWidgetsPopOver {
-	-GraniteWidgetsPopOver-arrow-width: 24;
-	-GraniteWidgetsPopOver-arrow-height: 12;
-	-GraniteWidgetsPopOver-border-radius: 6;
-	-GraniteWidgetsPopOver-border-width: 1;
-	-GraniteWidgetsPopOver-shadow-size: 18;
-	
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.50);
-	background-color: @theme_bg_color;
-	margin: 0;
-}
-
-GraniteWidgetsPopOver * {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .sidebar.view {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .button {
-	background-image: none;
-	background-color: alpha (#fff, 0.0);
-}
-
-GraniteWidgetsPopOver .button:active,
-GraniteWidgetsPopOver .button:hover:active {
-	background-image: none;
-	background-color: alpha (#000, 0.05);
-}
-
-GraniteWidgetsPopOver .entry {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_base_color, 0.88),
-		shade (@theme_base_color, 0.94) 20px,
-		shade (@theme_base_color, 0.96));
-}
-
-.button.app {
-	border-width: 0;
-	border-radius: 5px;
-}
-
-.app:hover,
-.app:focus {
-	background-color: alpha (#000, 0.15);
-}
-
 /* Parole media player needs more testing!
  hopefully do not set other stuff */
 
-GtkPaned.horizontal .vertical GtkOverlay GtkRevealer.bottom .background.horizontal.osd {
+paned.horizontal .vertical overlay revealer.bottom .background.horizontal.osd {
     background-color: @theme_bg_color;
     color: @theme_fg_color;
 }
 
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:active,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:checked,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:active:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:checked:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:hover ,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:active,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:checked,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:active:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:checked:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:checked,
-GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:active:hover {
+paned overlay revealer.bottom button.flat,
+paned overlay revealer.bottom button.flat:hover,
+paned overlay revealer.bottom button.flat:active,
+paned overlay revealer.bottom button.flat:checked,
+paned overlay revealer.bottom button.flat:active:hover,
+paned overlay revealer.bottom button.flat:checked:hover,
+paned overlay revealer.bottom button.flat.image-button,
+paned overlay revealer.bottom button.flat.image-button:hover ,
+paned overlay revealer.bottom button.flat.image-button:active,
+paned overlay revealer.bottom button.flat.image-button:checked,
+paned overlay revealer.bottom button.flat.image-button:active:hover,
+paned overlay revealer.bottom button.flat.image-button:checked:hover,
+paned overlay revealer.bottom .background.horizontal.osd button.flat.image-button:checked,
+paned overlay revealer.bottom .background.horizontal.osd button.flat.image-button:active:hover {
     border-style: none;
     border-radius: 4px;
     background-color: transparent;
@@ -258,8 +205,8 @@ GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.i
     color: @button_active_text;
 }
 
-GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:checked,
-GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:active:hover {
+paned overlay revealer.bottom .background.horizontal.osd button.flat.image-button:checked,
+paned overlay revealer.bottom .background.horizontal.osd button.flat.image-button:active:hover {
 	background-image: linear-gradient(to bottom,
 		@button_active_gradient_color_a,
 		@button_active_gradient_color_b);
@@ -272,57 +219,6 @@ GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.i
     border-radius: 3px;
 }
 
-/****************
- * Dconf-editor *
- ****************/
-
-DConfWindow GtkTreeView.view {
-    background-color: @sidebar_bg;
-    color: @theme_text_color;
-}
-
-DConfWindow GtkTreeView.view row:selected,
-DConfWindow GtkTreeView.view row:selected:hover  {
-    color: @theme_selected_fg_color;
-}
-
-DConfWindow GtkTreeView.view row:hover {
-    background-color: shade (@theme_selected_bg_color, 1.15);
-    color: shade (@theme_selected_bg_color, 0.35);
-}
-
-DConfWindow DConfKeyView.view {
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-}
-
-DConfWindow DConfKeyView.view row:hover {
-    background-color: shade (@theme_selected_bg_color, 1.55);
-    color: shade (@theme_selected_bg_color, 0.35);
-}
-
-DConfKeyView.view row:selected,
-DConfKeyView.view row:selected:hover  {
-    color:  @theme_selected_fg_color;
-}
-
-DConfKeyView.view .entry.spinbutton {
-    padding: 1px 0px 1px 4px;
-}
-
-DConfKeyView.view .spinbutton .button {
-    border-image: none;
-    border-style: solid;
-    border-width: 0px 0px 0px 1px;
-    border-color: @theme_selected_bg_color;
-    border-radius: 0px;
-    box-shadow: none;
-}
-
-DConfKeyView.view .spinbutton .button:last-child {
-    border-radius: 0 2px 2px 0;
-}
-
 /***********
  * Lightdm *
  ***********/
@@ -385,3 +281,4 @@ OsScrollbar:disabled {
 .ubuntu-online-accounts.frame {
 	border-top-width: 0;
 }
+
diff --git a/desktop-themes/Menta/gtk-3.0/gnome-applications.css b/desktop-themes/Menta/gtk-3.0/gnome-applications.css
index 95bd1c28..ff728394 100644
--- a/desktop-themes/Menta/gtk-3.0/gnome-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/gnome-applications.css
@@ -30,6 +30,68 @@
 	color: @theme_unfocused_selected_fg_color;
 }
 
+/* workaround for jumping buttons in nautilus */
+.nautilus-window headerbar.titlebar .linked.path-bar > button,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle {
+    border: 1px;
+    border-radius: 4px;
+    margin: 0px -4px 0px 0px;
+    padding: 4px;
+	border-image: url("borders/button.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+	border-width: 2px;
+	border-style: solid;
+	border-color: transparent;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button:checked:hover,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle:checked:hover,
+.nautilus-window headerbar.titlebar .linked.path-bar > button:checked,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle:checked {
+	border-image: url("borders/button-active.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button:hover,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle:hover,
+.nautilus-window headerbar.titlebar .linked.path-bar > button:hover:active,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle:hover:active {
+	border-image: url("borders/button-active-focus.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button:disabled,
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle:disabled {
+	border-image: url("borders/button-ins.png") 3 4 4 4 / 3px 4px 4px 4px stretch;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar> button:first-child widget {
+    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button:first-child {
+   margin: 0px -4px 0px 0px;
+   padding: 0px;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button:last-child widget {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar> button:last-child {
+   margin: 0px 0px 0px -4px;
+  padding: 0px;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle {
+    margin: 0px -8px 0px 0px;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle.toggle image {
+   padding: 0px 2px;
+}
+
+.nautilus-window headerbar.titlebar .linked.path-bar > button.text-button.toggle.toggle label {
+   padding: 0px 8px 0px 4px;
+}
+
 /* gedit */
 .gedit-headerbar-paned:backdrop {
 	background-image: url("assets/null.png");
diff --git a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
index 52f64e45..097a9d8c 100644
--- a/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
@@ -17,6 +17,7 @@
 	outline-offset: -3px; /* 2px */
 	outline-width: 0px; /* disable ugly focus-line */
 	-gtk-outline-radius: 2px;
+/*	-gtk-icon-style: regular;*//* disable symbolic icons */
 }
 
 /***************
@@ -2412,7 +2413,7 @@ paned.horizontal notebook {
 
 paned.horizontal notebook box.vertical {
     border-radius: 0px;
-    border-width: 0px
+    border-width: 0px;
     border-style: none;
 }
 
@@ -4880,150 +4881,6 @@ GtkCalendar.header .path-bar .button.titlebutton GtkImage {
 	padding-top: 1px;
 }
 
-.linked.path-bar > button,
-.linked.path-bar > button:hover,
-.linked.path-bar > button:hover:active,
-.linked.path-bar > button:focus,
-.linked.path-bar > button:focus:hover,
-.linked.path-bar > button:focus:hover:active,
-.linked.path-bar > button:checked,
-.linked.path-bar > button:checked:hover,
-.linked.path-bar > button:checked:hover:active,
-.linked.path-bar > button:focus:checked,
-.linked.path-bar > button:focus:checked:hover,
-.linked.path-bar > button:focus:checked:hover:active,
-.linked.path-bar > button:disabled,
-.linked.path-bar > button:focus:disabled,
-.linked.path-bar > button.text-button.toggle,
-.linked.path-bar > button.text-button.toggle:hover,
-.linked.path-bar > button.text-button.toggle:hover:active,
-.linked.path-bar > button.text-button.toggle:focus,
-.linked.path-bar > button.text-button.toggle:focus:hover,
-.linked.path-bar > button.text-button.toggle:focus:hover:active,
-.linked.path-bar > button.text-button.toggle:checked,
-.linked.path-bar > button.text-button.toggle:checked:hover,
-.linked.path-bar > button.text-button.toggle:checked:hover:active,
-.linked.path-bar > button.text-button.toggle:focus:checked,
-.linked.path-bar > button.text-button.toggle:focus:checked:hover,
-.linked.path-bar > button.text-button.toggle:focus:checked:hover:active,
-.linked.path-bar > button.text-button.toggle:disabled,
-.linked.path-bar > button.text-button.toggle:focus:disabled {
-    border-width: 1px 0px 1px 0px;
-    border-radius: 0px;
-    border-style: solid;
-    border-color: @borders;
-    border-image: none;
-    padding: 4px;
-}
-
-.linked.path-bar > button:first-child,
-.linked.path-bar > button:hover:first-child,
-.linked.path-bar > button:hover:active:first-child,
-.linked.path-bar > button:focus:first-child,
-.linked.path-bar > button:focus:hover:first-child,
-.linked.path-bar > button:focus:hover:active:first-child,
-.linked.path-bar > button:checked:first-child,
-.linked.path-bar > button:checked:hover:first-child,
-.linked.path-bar > button:checked:hover:active:first-child,
-.linked.path-bar > button:focus:checked:first-child,
-.linked.path-bar > button:focus:checked:hover:first-child,
-.linked.path-bar > button:focus:checked:hover:active:first-child,
-.linked.path-bar > button:disabled:first-child,
-.linked.path-bar > button:focus:disabled:first-child,
-.linked.path-bar > button.text-button.toggle:first-child,
-.linked.path-bar > button.text-button.toggle:hover:first-child,
-.linked.path-bar > button.text-button.toggle:hover:active:first-child,
-.linked.path-bar > button.text-button.toggle:focus:first-child,
-.linked.path-bar > button.text-button.toggle:focus:hover:first-child,
-.linked.path-bar > button.text-button.toggle:focus:hover:active:first-child,
-.linked.path-bar > button.text-button.toggle:checked:first-child,
-.linked.path-bar > button.text-button.toggle:checked:hover:first-child,
-.linked.path-bar > button.text-button.toggle:checked:hover:active:first-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:first-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:hover:first-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:hover:active:first-child,
-.linked.path-bar > button.text-button.toggle:disabled:first-child,
-.linked.path-bar > button.text-button.toggle:focus:disabled:first-child  {
-    border-width: 1px 0px 1px 1px;
-    border-radius: 3px 0px 0px 3px;
-    border-style: solid;
-    border-color: @borders;
-    border-image: none;
-    padding: 4px;
-}
-
-.linked.path-bar > button:last-child,
-.linked.path-bar > button:hover:last-child,
-.linked.path-bar > button:hover:active:last-child,
-.linked.path-bar > button:focus:last-child,
-.linked.path-bar > button:focus:hover:last-child,
-.linked.path-bar > button:focus:hover:active:last-child,
-.linked.path-bar > button:checked:last-child,
-.linked.path-bar > button:checked:hover:last-child,
-.linked.path-bar > button:checked:hover:active:last-child,
-.linked.path-bar > button:focus:checked:last-child,
-.linked.path-bar > button:focus:checked:hover:last-child,
-.linked.path-bar > button:focus:checked:hover:active:last-child,
-.linked.path-bar > button:disabled:last-child,
-.linked.path-bar > button:focus:disabled:last-child,
-.linked.path-bar > button.text-button.toggle:last-child,
-.linked.path-bar > button.text-button.toggle:hover:last-child,
-.linked.path-bar > button.text-button.toggle:hover:active:last-child,
-.linked.path-bar > button.text-button.toggle:focus:last-child,
-.linked.path-bar > button.text-button.toggle:focus:hover:last-child,
-.linked.path-bar > button.text-button.toggle:focus:hover:active:last-child,
-.linked.path-bar > button.text-button.toggle:checked:last-child,
-.linked.path-bar > button.text-button.toggle:checked:hover:last-child,
-.linked.path-bar > button.text-button.toggle:checked:hover:active:last-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:last-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:hover:last-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:hover:active:last-child,
-.linked.path-bar > button.text-button.toggle:disabled:last-child,
-.linked.path-bar > button.text-button.toggle:focus:disabled:last-child  {
-    border-width: 1px 1px 1px 0px;
-    border-radius: 0px 3px 3px 0px;
-    border-style: solid;
-    border-color: @borders;
-    border-image: none;
-    padding: 4px;
-}
-
-.linked.path-bar > button:only-child,
-.linked.path-bar > button:hover:only-child,
-.linked.path-bar > button:hover:active:only-child,
-.linked.path-bar > button:focus:only-child,
-.linked.path-bar > button:focus:hover:only-child,
-.linked.path-bar > button:focus:hover:active:only-child,
-.linked.path-bar > button:checked:only-child,
-.linked.path-bar > button:checked:hover:only-child,
-.linked.path-bar > button:checked:hover:active:only-child,
-.linked.path-bar > button:focus:checked:only-child,
-.linked.path-bar > button:focus:checked:hover:only-child,
-.linked.path-bar > button:focus:checked:hover:active:only-child,
-.linked.path-bar > button:disabled:only-child,
-.linked.path-bar > button:focus:disabled:only-child,
-.linked.path-bar > button.text-button.toggle:only-child,
-.linked.path-bar > button.text-button.toggle:hover:only-child,
-.linked.path-bar > button.text-button.toggle:hover:active:only-child,
-.linked.path-bar > button.text-button.toggle:focus:only-child,
-.linked.path-bar > button.text-button.toggle:focus:hover:only-child,
-.linked.path-bar > button.text-button.toggle:focus:hover:active:only-child,
-.linked.path-bar > button.text-button.toggle:checked:only-child,
-.linked.path-bar > button.text-button.toggle:checked:hover:only-child,
-.linked.path-bar > button.text-button.toggle:checked:hover:active:only-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:only-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:hover:only-child,
-.linked.path-bar > button.text-button.toggle:focus:checked:hover:active:only-child,
-.linked.path-bar > button.text-button.toggle:disabled:only-child,
-.linked.path-bar > button.text-button.toggle:focus:disabled:only-child  {
-    border-width: 1px;
-    border-radius: 3px;
-    border-style: solid;
-    border-color: @borders;
-    border-image: none;
-    padding: 4px;
-}
-
 /***********************
  * Tree and Icon views *
  ***********************/
@@ -5034,6 +4891,10 @@ treeview {
 	outline-color: alpha(@theme_text_color, 0.6);
 }
 
+treeview {
+    padding: 5px 0px;
+}
+
 GtkTreeView.dnd,
 treeview dnd {
 	border-color: @internal_element_color;
@@ -5127,6 +4988,10 @@ textview,
 	color: @theme_fg_color;
 }
 
+row {
+    min-height: 22px;
+}
+
 row:selected,
 row:selected:focus {
 	border-width: 1px 0 1px 0;
diff --git a/desktop-themes/Menta/gtk-3.0/mate-applications.css b/desktop-themes/Menta/gtk-3.0/mate-applications.css
index 9d3be9e6..adfdcf1b 100644
--- a/desktop-themes/Menta/gtk-3.0/mate-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/mate-applications.css
@@ -94,45 +94,59 @@
     padding: 6px 4px;
 }
 
-/* 3.20 emblems are broken */
-/* places, treeview, history, information and notes */
-.caja-side-pane treeview.view,
-.caja-side-pane textview.view text {
+/* arrow button */
+.caja-pathbar button:nth-child(odd) widget {
+    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+}
+
+.caja-pathbar button:nth-child(odd) {
+   margin: 0px -7px 0px 0px;
+   padding: 0px;
+}
+
+.caja-pathbar button:nth-child(even) widget {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+}
+
+.caja-pathbar button:nth-child(even) {
+   margin: 0px 0px 0px -7px;
+  padding: 0px;
+}
+
+/* folder buttons */
+.caja-pathbar button.toggle {
+   margin: 0px -8px 0px 0px;
+}
+
+.caja-pathbar button.toggle image {
+   padding: 0px 4px 0px 5px;
+}
+
+.caja-pathbar button.toggle label {
+   padding: 0px 5px;
+}
+
+/* places, treeview, history, information, emblems and notes */
+.caja-side-pane notebook treeview.view,
+.caja-side-pane notebook textview.view text,
+.caja-side-pane notebook viewport.frame,
+.caja-side-pane notebook widget .vertical {
     background-color: shade (@theme_bg_color, 1.08);
     color: @theme_fg_color;
 }
 
-.caja-side-pane treeview.view:selected:hover,
-CajaWindow CajaPlacesSidebar .view row:active:hover,
-CajaWindow CajaPlacesSidebar .view row:checked:hover,
-CajaWindow CajaPlacesSidebar .view row:selected:hover,
-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 {
+.caja-side-pane treeview.view:selected:hover {
     color: shade (@theme_selected_fg_color, 1.00);
 }
 
-.caja-side-pane treeview.view:hover,
-CajaWindow CajaPlacesSidebar .view row:hover,
-CajaWindow FMTreeView .view row:hover,
-CajaWindow CajaHistorySidebar .view row:hover {
+.caja-side-pane treeview.view:hover {
     background-color: shade (@theme_selected_bg_color, 1.15);
     color: shade (@theme_selected_fg_color, 1.00);
 }
 
-/* What is that? */
-CajaWindow .rubberband,
-CajaWindow .view.rubberband {
-    background-color: alpha (@theme_selected_bg_color, 0.35);
-}
-
-/* moved eject button to left better for overlay scrollbars */
-.caja-side-pane treeview.view,
-CajaWindow CajaPlacesSidebar .view row {
-    padding: 1px 4px 1px 0px;
+/* treeview rows */
+.caja-side-pane treeview.view {
+    padding: 2px 0px 2px 0px;
 }
 
 /* to avoid overlap with eject buttons */
@@ -178,15 +192,12 @@ CajaWindow CajaPlacesSidebar .view row {
     color: shade (@theme_selected_bg_color, 0.35);
 }
 
-.caja-notebook .caja-canvas-item,
-CajaNavigationWindow.background .view.caja-canvas-item {
+.caja-notebook .caja-canvas-item {
     color: @theme_fg_color;
 }
 
 .caja-notebook .caja-canvas-item:active,
-.caja-notebook .caja-canvas-item:selected,
-CajaNavigationWindow.background .view.caja-canvas-item:active,
-CajaNavigationWindow.background .view.caja-canvas-item:selected {
+.caja-notebook .caja-canvas-item:selected {
     color: @theme_selected_fg_color;
 }
 
@@ -200,7 +211,6 @@ CajaNavigationWindow.background .view.caja-canvas-item:selected {
 
 /* desktop mode */
 /* 3.20 */
-/* desktop */
 .caja-desktop.caja-canvas-item {
     color: @theme_selected_fg_color;
     text-shadow: 1px 1px alpha (#000000, 0.8);
@@ -223,68 +233,32 @@ CajaNavigationWindow.background .view.caja-canvas-item:selected {
    text-shadow: none;
 }
 
-/*
-CajaDesktopWindow.background FMIconContainer.view EelEditableLabel.entry {
-   border-image: none;
-   border-width: 1px;
-   text-shadow: none;
-}
-
-CajaDesktopWindow.background .caja-canvas-item {
-    color: @theme_selected_fg_color;
-    text-shadow: 1px 1px alpha (#000000, 0.8);
-}
-
-CajaDesktopWindow.background .caja-canvas-item:selected {
-    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;
-}
-
-CajaDesktopWindow.background .caja-canvas-item:active,
-CajaDesktopWindow.background .caja-canvas-item:hover,
-CajaDesktopWindow.background .caja-canvas-item:selected {
-    text-shadow: none;
-}
-*/
-/* inactive pane */
-/* not implemented yet *//*
-.caja-inactive-pane .view {
-    background-color: shade(@theme_base_color, 0.9);
-}
-*/
-
 /* Toolbar */
 .caja-navigation-window toolbar button {
     border-image: none;
 }
 
 /* Misc */
-.caja-navigation-window notebook,
-CajaView.frame,
-CajaNotebook.notebook {
+.caja-navigation-window notebook {
     border-right-width: 0;
     border-left-width: 0;
     border-bottom-width: 0;
 }
 
-.caja-navigation-window notebook tab,
-CajaNotebook.notebook tab.top,
-CajaNotebook.notebook tab.bottom {
+.caja-navigation-window notebook tab {
     border-right-width: 1px;
     border-left-width: 1px;
+    padding: 4px 3px 4px 0px;
 }
 
-.caja-navigation-window notebook,
-CajaNotebook .frame {
+.caja-navigation-window notebook {
     border-width: 1px 0 0 0;
 }
 
 /* close button styling */
 /* surpress styling of close button */
 .caja-navigation-window notebook tab button.flat,
-.caja-navigation-window notebook tab button.flat:hover,
-CajaWindow .notebook tab .button.flat,
-CajaWindow .notebook tab .button.flat:hover {
+.caja-navigation-window notebook tab button.flat:hover {
     border-color: transparent;
     background-color: transparent;
     background-image: none;
@@ -293,11 +267,6 @@ CajaWindow .notebook tab .button.flat:hover {
     border-image: none;
 }
 
-.caja-navigation-window notebook tab,
-CajaWindow .notebook tab.top {
-    padding: 4px 3px 4px 0px;
-}
-
 /* do we have this style class? */
 .caja-cluebar-label {
     font: normal;
@@ -306,9 +275,7 @@ CajaWindow .notebook tab.top {
 
 /* to avoid padding when executing toogle button */
 .caja-search-bar entry,
-.caja-location-entry,
-CajaSearchBar .horizontal .entry,
-CajaLocationBar .entry {
+.caja-location-entry {
     padding: 4px;
 }
 
@@ -580,17 +547,19 @@ GtkTrayIcon.background {
  * Mate-Terminal *
  ****************/
 
-TerminalWindow GtkNotebook.notebook tab {
-    padding: 2px;
-    border-color: transparent;
-    border-width: 0px;
-    background-image: none;
-    background-color: transparent;
+/* how strange is that? a bg above the header bg? This solves non colored pixels*/
+.mate-terminal notebook header.top tabs {
+    background-color: @theme_bg_color;
 }
 
-TerminalWindow GtkNotebook.notebook tab.top,
-.notebook tab.bottom {
-    padding: 2px;
+.mate-terminal notebook header.top tab,
+.mate-terminal notebook header.top tab:checked:hover {
+    border-radius: 4px 4px 0px 0px;
+    padding: 2px 2px 2px 6px;
+    margin: 0px 0px 0px -1px;
+    border-style: solid;
+    border-color: @borders;
+    border-width: 1px;
 }
 
 /****************
@@ -598,8 +567,7 @@ TerminalWindow GtkNotebook.notebook tab.top,
  ****************/
 
 /* pluma line numbers */
-.pluma-window textview,
-PlumaView {
+.pluma-window textview {
     background-color: shade (@theme_bg_color, 1.07);
 }
 
@@ -614,8 +582,7 @@ PlumaView {
     border-style: none;
 }
 
-.pluma-window statusbar.horizontal frame button.flat.toggle,
-PlumaStatusbar.horizontal.statusbar .frame.flat .flat.button {
+.pluma-window statusbar.horizontal frame button.flat.toggle {
     border-image: url("borders/button.png") 3 3 4 3 / 3px 3px 4px 3px stretch;
     padding: 0px;
 }
@@ -626,8 +593,7 @@ PlumaStatusbar.horizontal.statusbar .frame.flat .flat.button {
 }
 
 /* Printpreview */
-.pluma-print-preview toolbar.horizontal,
-PlumaPrintPreview.vertical .toolbar.horizontal {
+.pluma-print-preview toolbar.horizontal {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_bg_color, 1.0),
                                       shade (@theme_bg_color, 0.96));
@@ -640,18 +606,15 @@ PlumaPrintPreview.vertical .toolbar.horizontal {
     padding: 0px;
 }
 
-.pluma-print-preview toolbar.horizontal entry,
-PlumaPrintPreview.vertical .toolbar.horizontal GtkToolItem .horizontal .entry {
+.pluma-print-preview toolbar.horizontal entry {
     padding: 4px 6px;
 }
 
-.pluma-print-preview toolbar.horizontal button.flat.image-button,
-PlumaPrintPreview.vertical .toolbar.horizontal .button.flat.image-button {
+.pluma-print-preview toolbar.horizontal button.flat.image-button {
     padding: 0px;
 }
 
-.pluma-print-preview toolbar.horizontal button.flat.text-button,
-PlumaPrintPreview.vertical .toolbar.horizontal .button.flat.text-button {
+.pluma-print-preview toolbar.horizontal button.flat.text-button {
     padding: 0px 16px;
     border-radius: 2px;
 }
@@ -671,8 +634,7 @@ PlumaPrintPreview.vertical .toolbar.horizontal .button.flat.text-button {
                                       @button_hover_gradient_color_b);
 }
 
-.pluma-print-preview scrolledwindow,
-PlumaPrintPreview.vertical GtkLayout {
+.pluma-print-preview scrolledwindow {
     background-color: @theme_base_color;
 }
 
@@ -685,8 +647,7 @@ PlumaPrintPreview.vertical GtkLayout {
     box-shadow: none;
 }
 
-.pluma-window paned.horizontal box.vertical notebook.frame box.vertical,
-PlumaFileBrowserWidget.vertical {
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical {
     background-color: @theme_bg_color;
 }
 
@@ -694,8 +655,7 @@ PlumaFileBrowserWidget.vertical {
     padding: 0px ;
 }
 
-.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal,
-PlumaFileBrowserWidget.vertical .toolbar.horizontal {
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_bg_color, 1.0),
                                       shade (@theme_bg_color, 0.96));
@@ -709,20 +669,16 @@ PlumaFileBrowserWidget.vertical .toolbar.horizontal {
 }
 
 .pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat,
-.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat.menu-button,
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat,
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat.menu-button {
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat.menu-button {
     padding: 4px 2px ;
 }
 
-.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat.image-button,
-PlumaFileBrowserWidget.vertical .toolbar.horizontal .button.flat.image-button {
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical toolbar.horizontal button.flat.image-button {
     padding: 4px 3px ;
 }
 
 /* color of of expander arrow */
-.pluma-window paned.horizontal box.vertical notebook.frame box.vertical expander:hover,
-PlumaFileBrowserWidget.vertical GtkExpander:hover {
+.pluma-window paned.horizontal box.vertical notebook.frame box.vertical expander:hover {
     color: @theme_fg_color;
 }
 
@@ -731,15 +687,12 @@ PlumaFileBrowserWidget.vertical GtkExpander:hover {
  *********/
 
 /* size of page entry */
-.atril-window .primary-toolbar toolbar toolitem box.horizontal entry,
-EvPageActionWidget .entry {
+.atril-window .primary-toolbar toolbar toolitem box.horizontal entry {
     padding: 2px;
 }
 
 .atril-window .primary-toolbar toolbar button,
-.atril-window .primary-toolbar toolbar button.flat,
-EvWindow .toolbar .button,
-EvWindow .toolbar .button.flat {
+.atril-window .primary-toolbar toolbar button.flat {
     padding: 5px;
 }
 
@@ -760,32 +713,27 @@ EggToolbarEditor.vertical scrolledwindow viewport.frame {
  * Eom *
  *******/
 
-.eom-window .vertical .vertical .vertical .horizontal button.flat:first-child,
-EomThumbNav .button.flat:first-child {
+.eom-window .vertical .vertical .vertical .horizontal button.flat:first-child {
     border-radius: 4px 0px 0px 4px;
     border-width: 1px 0px 1px 1px;
 }
 
-.eom-window .vertical .vertical .vertical .horizontal button.flat:last-child,
-EomThumbNav .button.flat:last-child {
+.eom-window .vertical .vertical .vertical .horizontal button.flat:last-child {
     border-radius: 0px 4px 4px 0px;
     border-width: 1px 1px 1px 0px;
 }
 
-.eom-window .vertical .vertical .vertical .horizontal button.flat,
-EomThumbNav .button.flat {
+.eom-window .vertical .vertical .vertical .horizontal button.flat {
     border-image: none;
     border-color: @unfocused_borders;
 }
 
-.eom-window .vertical .vertical .vertical .horizontal button.flat:hover,
-EomThumbNav .button.flat:hover {
+.eom-window .vertical .vertical .vertical .horizontal button.flat:hover {
     border-image: none;
     border-color: @menu_combobox_border;
 }
 
-.eom-window .vertical .vertical .vertical .horizontal button.flatdisabled,
-EomThumbNav .button.flat:disabled {
+.eom-window .vertical .vertical .vertical .horizontal button.flat:disabled {
     border-color: transparent;
 }
 
diff --git a/desktop-themes/Menta/gtk-3.0/other-applications.css b/desktop-themes/Menta/gtk-3.0/other-applications.css
index 779216b8..292d96d3 100644
--- a/desktop-themes/Menta/gtk-3.0/other-applications.css
+++ b/desktop-themes/Menta/gtk-3.0/other-applications.css
@@ -4,44 +4,48 @@
 
 /* workaround for broken first/last-child logic with linked buttons
    in pathbar since gtk+-3.18 */
-.nemo-window NemoPathBar.raised.linked button.text-button,
-.nemo-window NemoPathBar.raised.linked button.text-button:hover,
-.nemo-window NemoPathBar.raised.linked button.text-button:hover:active,
-.nemo-window NemoPathBar.raised.linked button.text-button:active,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active,
-.nemo-window NemoPathBar.raised.linked button.text-button:first-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:hover:first-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:hover:active:first-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:active:first-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:first-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:first-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active:first-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:last-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:hover:last-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:hover:active:last-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:active:last-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:last-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:last-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active:last-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:only-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:hover:only-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:hover:active:only-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:active:only-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:only-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:only-child,
-.nemo-window NemoPathBar.raised.linked button.text-button:checked:hover:active:only-child {
-    border-right-width: 1px;
-    border-left-width: 1px;
+
+.nemo-window widget.raised.linked > button:nth-child(first) widget {
+    -gtk-icon-source: -gtk-icontheme("pan-start-symbolic");
+}
+
+.nemo-window widget.raised.linked > button:nth-child(last) widget {
+    -gtk-icon-source: -gtk-icontheme("pan-end-symbolic");
+}
+
+.nemo-window widget.raised.linked > button:nth-child(first) {
+   margin: 0px -5px 0px -1px;
+   padding: 0px;
+}
+
+.nemo-window widget.raised.linked > button:nth-child(last) {
+   margin: 0px -1px 0px -5px;
+   padding: 0px;
+}
+
+.nemo-window widget.raised.linked > button.text-button.toggle {
+    border-width: 1px;
     border-image-width: 3px 3px 4px 3px;
     border-radius: 4px;
     border-style: solid;
+    margin: 0px -8px 0px 0px;
+}
+
+.nemo-window widget.raised.linked > button.text-button.toggle:nth-child(first) {
+    margin: 0px -1px 0px 0px;
+}
+
+.nemo-window widget.raised.linked > button.text-button.toggle:nth-child(last) {
+    margin: 0px 0px 0px -1px;
+}
+
+.nemo-window widget.raised.linked > button.text-button.toggle label,
+.nemo-window widget.raised.linked > button.text-button.toggle image {
+   padding: 0px 4px;
 }
 
 /* For Places Sidebar diskfull indicators */
-.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view,
-NemoPlacesTreeView {
+.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view {
 	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, .65);
 	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_selected_bg_color, 1.0);
 	-NemoPlacesTreeView-disk-full-bar-width: 2px;
@@ -50,22 +54,17 @@ NemoPlacesTreeView {
 	-NemoPlacesTreeView-disk-full-max-length: 70px;
 }
 
-.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:selected,
-NemoPlacesTreeView:selected {
+.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:selected {
 	-NemoPlacesTreeView-disk-full-bg-color: shade(@theme_bg_color, 2.0);
 	-NemoPlacesTreeView-disk-full-fg-color: shade(@theme_fg_color, 2.0);
 }
 
-.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:hover,
-NemoPlacesTreeView:hover {
+.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:hover {
 }
 
-.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:selected:hover,
-NemoPlacesTreeView:selected:hover {
+.nemo-window .vertical.sidebar>scrolledwindow.frame>viewport.frame>box.vertical>treeview.view:selected:hover {
 }
 
-@define-color cluebar_color shade (@theme_base_color, 0.9);
-
 /* view */
 .nemo-window-pane notebook scrolledwindow {
 	background-color: @theme_base_color;
@@ -175,80 +174,28 @@ NemoPlacesTreeView:selected:hover {
     border-style: solid;
 }
 
-/****************
- * PopOver menu *
- ****************/
-GraniteWidgetsPopOver {
-	-GraniteWidgetsPopOver-arrow-width: 24;
-	-GraniteWidgetsPopOver-arrow-height: 12;
-	-GraniteWidgetsPopOver-border-radius: 6;
-	-GraniteWidgetsPopOver-border-width: 1;
-	-GraniteWidgetsPopOver-shadow-size: 18;
-	
-	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.50);
-	background-color: @theme_bg_color;
-	margin: 0;
-}
-
-GraniteWidgetsPopOver * {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .sidebar.view {
-	background-color: @theme_bg_color;
-}
-
-GraniteWidgetsPopOver .button {
-	background-image: none;
-	background-color: alpha (#fff, 0.0);
-}
-
-GraniteWidgetsPopOver .button:active,
-GraniteWidgetsPopOver .button:hover:active {
-	background-image: none;
-	background-color: alpha (#000, 0.05);
-}
-
-GraniteWidgetsPopOver .entry {
-	background-image: linear-gradient(to bottom,
-		shade (@theme_base_color, 0.88),
-		shade (@theme_base_color, 0.94) 20px,
-		shade (@theme_base_color, 0.96));
-}
-
-.button.app {
-	border-width: 0;
-	border-radius: 5px;
-}
-
-.app:hover,
-.app:focus {
-	background-color: alpha (#000, 0.15);
-}
-
 /* Parole media player needs more testing!
  hopefully do not set other stuff */
 
-GtkPaned.horizontal .vertical GtkOverlay GtkRevealer.bottom .background.horizontal.osd {
+paned.horizontal .vertical overlay revealer.bottom .background.horizontal.osd {
     background-color: @theme_bg_color;
     color: @theme_fg_color;
 }
 
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:active,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:checked,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:active:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat:checked:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:hover ,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:active,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:checked,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:active:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .button.flat.image-button:checked:hover,
-GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:checked,
-GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:active:hover {
+paned overlay revealer.bottom button.flat,
+paned overlay revealer.bottom button.flat:hover,
+paned overlay revealer.bottom button.flat:active,
+paned overlay revealer.bottom button.flat:checked,
+paned overlay revealer.bottom button.flat:active:hover,
+paned overlay revealer.bottom button.flat:checked:hover,
+paned overlay revealer.bottom button.flat.image-button,
+paned overlay revealer.bottom button.flat.image-button:hover ,
+paned overlay revealer.bottom button.flat.image-button:active,
+paned overlay revealer.bottom button.flat.image-button:checked,
+paned overlay revealer.bottom button.flat.image-button:active:hover,
+paned overlay revealer.bottom button.flat.image-button:checked:hover,
+paned overlay revealer.bottom .background.horizontal.osd button.flat.image-button:checked,
+paned overlay revealer.bottom .background.horizontal.osd button.flat.image-button:active:hover {
     border-style: none;
     border-radius: 4px;
     background-color: transparent;
@@ -258,8 +205,8 @@ GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.i
     color: @button_active_text;
 }
 
-GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:checked,
-GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.image-button:active:hover {
+paned overlay revealer.bottom .background.horizontal.osd button.flat.image-button:checked,
+paned overlay revealer.bottom .background.horizontal.osd button.flat.image-button:active:hover {
 	background-image: linear-gradient(to bottom,
 		@button_active_gradient_color_a,
 		@button_active_gradient_color_b);
@@ -272,57 +219,6 @@ GtkPaned GtkOverlay GtkRevealer.bottom .background.horizontal.osd .button.flat.i
     border-radius: 3px;
 }
 
-/****************
- * Dconf-editor *
- ****************/
-
-DConfWindow GtkTreeView.view {
-    background-color: @sidebar_bg;
-    color: @theme_text_color;
-}
-
-DConfWindow GtkTreeView.view row:selected,
-DConfWindow GtkTreeView.view row:selected:hover  {
-    color: @theme_selected_fg_color;
-}
-
-DConfWindow GtkTreeView.view row:hover {
-    background-color: shade (@theme_selected_bg_color, 1.15);
-    color: shade (@theme_selected_bg_color, 0.35);
-}
-
-DConfWindow DConfKeyView.view {
-    background-color: @theme_base_color;
-    color: @theme_text_color;
-}
-
-DConfWindow DConfKeyView.view row:hover {
-    background-color: shade (@theme_selected_bg_color, 1.55);
-    color: shade (@theme_selected_bg_color, 0.35);
-}
-
-DConfKeyView.view row:selected,
-DConfKeyView.view row:selected:hover  {
-    color:  @theme_selected_fg_color;
-}
-
-DConfKeyView.view .entry.spinbutton {
-    padding: 1px 0px 1px 4px;
-}
-
-DConfKeyView.view .spinbutton .button {
-    border-image: none;
-    border-style: solid;
-    border-width: 0px 0px 0px 1px;
-    border-color: @theme_selected_bg_color;
-    border-radius: 0px;
-    box-shadow: none;
-}
-
-DConfKeyView.view .spinbutton .button:last-child {
-    border-radius: 0 2px 2px 0;
-}
-
 /***********
  * Lightdm *
  ***********/
@@ -385,3 +281,4 @@ OsScrollbar:disabled {
 .ubuntu-online-accounts.frame {
 	border-top-width: 0;
 }
+