[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#864065: marked as done (unblock: mate-themes/3.22.11-1)



Your message dated Sun, 04 Jun 2017 08:00:00 +0000
with message-id <fd6c29ac-396b-5111-07e7-7aadaddb89fc@thykier.net>
and subject line Re: Bug#864065: unblock: mate-themes/3.22.11-1
has caused the Debian Bug report #864065,
regarding unblock: mate-themes/3.22.11-1
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact owner@bugs.debian.org
immediately.)


-- 
864065: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=864065
Debian Bug Tracking System
Contact owner@bugs.debian.org with problems
--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please consider unblocking package mate-themes ready for upload.

With upstream I have been discussing the ideal solution for mate-themes
in Debian 9. Upstream highly recommends shipping mate-themes 3.22.11 as
there have been tons of fixes and improvements compared to what we have
in Debian 9 at the moment (mate-themes 3.22.6-1).

However, as the changeset is far from addressing issues atomically, I
have also prepared a mate-themes 3.22.6-2 cherry-picking one fix for an
issues with renaming files in Caja. See #853288 for details.

unblock mate-themes/3.22.11-1

-- System Information:
Debian Release: 9.0
  APT prefers testing
  APT policy: (990, 'testing')
Architecture: amd64
 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.9.0-3-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
diff -Nru mate-themes-3.22.6/debian/changelog mate-themes-3.22.6/debian/changelog
--- mate-themes-3.22.6/debian/changelog	2017-01-17 23:24:21.000000000 +0100
+++ mate-themes-3.22.6/debian/changelog	2017-06-03 23:05:14.000000000 +0200
@@ -1,3 +1,17 @@
+mate-themes (3.22.6-2) unstable; urgency=medium
+
+  * debian/watch:
+    + Allow version micro numbers with more than one digit (e.g. 3.22.10).
+      Only allow even minor version numbers (dropping the 9 from the "list
+      of even numbers").
+  * debian/patches:
+    + Cherry-pick upstream patches
+      0001_blackmate-make-caja-renaming-labels-more-readable.patch and
+      0002_contrasthighinverse-fix-caja-rename-labels-when-theme-actually-
+      applied.patch. (Closes: #853288).
+
+ -- Mike Gabriel <sunweaver@debian.org>  Sat, 03 Jun 2017 23:05:14 +0200
+
 mate-themes (3.22.6-1) unstable; urgency=medium
 
   [ Martin Wimpress ]
diff -Nru mate-themes-3.22.6/debian/patches/0001_blackmate-make-caja-renaming-labels-more-readable.patch mate-themes-3.22.6/debian/patches/0001_blackmate-make-caja-renaming-labels-more-readable.patch
--- mate-themes-3.22.6/debian/patches/0001_blackmate-make-caja-renaming-labels-more-readable.patch	1970-01-01 01:00:00.000000000 +0100
+++ mate-themes-3.22.6/debian/patches/0001_blackmate-make-caja-renaming-labels-more-readable.patch	2017-06-03 23:03:25.000000000 +0200
@@ -0,0 +1,20 @@
+From e74e29105e664c7e204db5d1ba31b08e96b4cdbc Mon Sep 17 00:00:00 2001
+From: lukefromdc <lukefromdc@hushmail.com>
+Date: Sun, 4 Dec 2016 14:35:41 -0500
+Subject: [PATCH] BlackMATE: make caja renaming labels more readable
+
+Suggested by raveit65, makes Caja easier to use
+---
+ desktop-themes/BlackMATE/gtk-3.0/mate-applications.css | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
++++ b/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
+@@ -216,6 +216,7 @@
+ 	                                  shade(@less_dark_color, 0.5) 10%,
+ 	                                  @less_dark_color 50%,
+ 	                                  shade(@less_dark_color, 1.5));
++	color: @theme_fg_color;
+ }
+ 
+ /****************
diff -Nru mate-themes-3.22.6/debian/patches/0002_contrasthighinverse-fix-caja-rename-labels-when-theme-actually-applied.patch mate-themes-3.22.6/debian/patches/0002_contrasthighinverse-fix-caja-rename-labels-when-theme-actually-applied.patch
--- mate-themes-3.22.6/debian/patches/0002_contrasthighinverse-fix-caja-rename-labels-when-theme-actually-applied.patch	1970-01-01 01:00:00.000000000 +0100
+++ mate-themes-3.22.6/debian/patches/0002_contrasthighinverse-fix-caja-rename-labels-when-theme-actually-applied.patch	2017-06-03 22:58:18.000000000 +0200
@@ -0,0 +1,22 @@
+From 5bd6942ad7ed10fda2b4b41b8f0694063dc70afa Mon Sep 17 00:00:00 2001
+From: lukefromdc <lukefromdc@hushmail.com>
+Date: Sat, 3 Dec 2016 00:37:37 -0500
+Subject: [PATCH] ContrastHighInverse: Fix Caja rename labels when theme
+ actually applied
+
+---
+ desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css b/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css
+index 64898aac..7721eda3 100644
+--- a/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css
++++ b/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css
+@@ -56,6 +56,7 @@ CajaNavigationWindow.background .view.caja-canvas-item {
+    border-style: solid;
+    border-width: 1px;
+    border-color: @theme_fg_color;
++   color: @theme_fg_color;
+    box-shadow: none;
+    border-radius: 2px;
+    text-shadow: none;
diff -Nru mate-themes-3.22.6/debian/patches/series mate-themes-3.22.6/debian/patches/series
--- mate-themes-3.22.6/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ mate-themes-3.22.6/debian/patches/series	2017-06-03 22:58:33.000000000 +0200
@@ -0,0 +1,2 @@
+0001_blackmate-make-caja-renaming-labels-more-readable.patch
+0002_contrasthighinverse-fix-caja-rename-labels-when-theme-actually-applied.patch
diff -Nru mate-themes-3.22.6/debian/watch mate-themes-3.22.6/debian/watch
--- mate-themes-3.22.6/debian/watch	2016-05-24 11:36:52.000000000 +0200
+++ mate-themes-3.22.6/debian/watch	2017-06-03 22:56:47.000000000 +0200
@@ -1,3 +1,3 @@
 version=3
 http://git.mate-desktop.org/mate-themes/ \
-    snapshot/mate-themes-(\d\.(?:[0-9]+|)[246890]\.\d)\.tar\.xz
+    snapshot/mate-themes-(\d\.(?:[0-9]+|)[24680]\.\d+)\.tar\.xz
diff -Nru mate-themes-3.22.6/configure.ac mate-themes-3.22.11/configure.ac
--- mate-themes-3.22.6/configure.ac	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/configure.ac	2017-05-11 10:26:34.000000000 +0200
@@ -1,6 +1,6 @@
 AC_PREREQ(2.53)
 
-AC_INIT([mate-themes], [3.22.6], [http://www.mate-desktop.org])
+AC_INIT([mate-themes], [3.22.11], [http://www.mate-desktop.org])
 AC_CONFIG_SRCDIR([icon-themes])
 
 AM_INIT_AUTOMAKE([1.9 tar-ustar dist-xz no-dist-gzip check-news])
@@ -93,6 +93,7 @@
 desktop-themes/ContrastHighInverse/gtk-2.0/Makefile
 desktop-themes/ContrastHighInverse/gtk-2.0/gtkrc
 desktop-themes/ContrastHighInverse/gtk-3.0/Makefile
+desktop-themes/ContrastHighInverse/gtk-3.0/assets/Makefile
 desktop-themes/ContrastHighInverse/metacity-1/Makefile
 desktop-themes/ContrastHighInverse/pixmaps/Makefile
 desktop-themes/GreenLaguna/Makefile
Binary files /tmp/gYCAmB6x9p/mate-themes-3.22.6/cursor-themes/color-picker and /tmp/gxVAZgmenr/mate-themes-3.22.11/cursor-themes/color-picker differ
diff -Nru mate-themes-3.22.6/debian/changelog mate-themes-3.22.11/debian/changelog
--- mate-themes-3.22.6/debian/changelog	2017-01-17 23:24:21.000000000 +0100
+++ mate-themes-3.22.11/debian/changelog	2017-06-03 18:44:35.000000000 +0200
@@ -1,3 +1,16 @@
+mate-themes (3.22.11-1) unstable; urgency=medium
+
+  * New upstream release.
+    - Fix invisible cursor in Caja with dark themes (Closes: #853288).
+    - Various other changes, see upstream's NEWS file.
+  * debian/watch: 
+    + Allow version micro numbers with more than one digit (e.g. 3.22.10,
+      3.22.11, ...).
+    + Only allow even minor version numbers (dropping the 9 from the
+      "list of even numbers").
+
+ -- Mike Gabriel <mike.gabriel@das-netzwerkteam.de>  Sat, 03 Jun 2017 18:44:35 +0200
+
 mate-themes (3.22.6-1) unstable; urgency=medium
 
   [ Martin Wimpress ]
diff -Nru mate-themes-3.22.6/debian/watch mate-themes-3.22.11/debian/watch
--- mate-themes-3.22.6/debian/watch	2016-05-24 11:36:52.000000000 +0200
+++ mate-themes-3.22.11/debian/watch	2017-06-03 18:41:53.000000000 +0200
@@ -1,3 +1,3 @@
 version=3
 http://git.mate-desktop.org/mate-themes/ \
-    snapshot/mate-themes-(\d\.(?:[0-9]+|)[246890]\.\d)\.tar\.xz
+    snapshot/mate-themes-(\d\.(?:[0-9]+|)[24680]\.\d+)\.tar\.xz
diff -Nru mate-themes-3.22.6/desktop-themes/BlackMATE/gtk-3.0/gtk-main.css mate-themes-3.22.11/desktop-themes/BlackMATE/gtk-3.0/gtk-main.css
--- mate-themes-3.22.6/desktop-themes/BlackMATE/gtk-3.0/gtk-main.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/BlackMATE/gtk-3.0/gtk-main.css	2017-05-11 10:26:34.000000000 +0200
@@ -172,6 +172,9 @@
 @define-color overshoot_bg_color alpha (@theme_selected_bg_color, 0.35);
 @define-color overshoot_backdrop_bg_color #F57900;
 
+/* inactive-pane caja */
+@define-color inactive-pane_bg_color #606060;
+
 @import url("gtk-widgets.css");
 @import url("gtk-widgets-assets-dark.css");
 @import url("unity.css");
diff -Nru mate-themes-3.22.6/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css mate-themes-3.22.11/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css
--- mate-themes-3.22.6/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/BlackMATE/gtk-3.0/gtk-widgets.css	2017-05-11 10:26:34.000000000 +0200
@@ -1474,6 +1474,11 @@
 	outline-width: 0px;
 }
 
+/*Borders don't always work here*/
+button.flat:focus{
+	outline-width: 2px;
+}
+
 button.flat:hover {
     border-radius: 3px;
 }
@@ -3851,10 +3856,13 @@
 
 printdialog paper{
     border-style: solid;
-    border-width: 1px;
+    border-width: 0.9px;
     border-radius: 0px;
     border-color: #aaaaaa;
-    background-color: #ffffff;
+    background-color: #888888;
+    background-image: linear-gradient(to top,
+                                      @toolbar_gradient_top,
+                                      @toolbar_gradient_bottom);
 }
 
 /************************
diff -Nru mate-themes-3.22.6/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css mate-themes-3.22.11/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css
--- mate-themes-3.22.6/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/BlackMATE/gtk-3.0/mate-applications.css	2017-05-11 10:26:34.000000000 +0200
@@ -17,6 +17,11 @@
     background-color: @theme_bg_color;
 }
 
+/* ie. inactive-pane caja */
+.caja-notebook .view:disabled {
+    background-color: @inactive-pane_bg_color;
+}
+
 
 .caja-navigation-window paned>box>box>button {
 	border-image: url("assets/button-border-dark1.svg") 3 / 3px stretch;
@@ -24,6 +29,12 @@
 	                                  shade(@less_dark_color, 1.3),
 	                                  shade(@less_dark_color, 0.4));
 }
+/*don't overrride focus borders*/
+.caja-navigation-window paned>box>box>button:focus,
+.caja-navigation-window paned>box>box>button.flat:focus {
+	border-image: url("assets/button-default-border-dark.svg") 3 / 3px stretch;
+	outline-width: 0px; /*works here but NOT in the general case */
+}
 
 .caja-navigation-window paned>box>box>button:hover {
 	background-image: -gtk-gradient (radial,
@@ -216,6 +227,7 @@
 	                                  shade(@less_dark_color, 0.5) 10%,
 	                                  @less_dark_color 50%,
 	                                  shade(@less_dark_color, 1.5));
+   color: @theme_fg_color;
 }
 
 /****************
@@ -569,7 +581,6 @@
 
 na-tray-applet {
     -NaTrayApplet-icon-padding: 1px; /*any more and outlines get cut off*/
-    -NaTrayApplet-icon-size: 16;
 }
 
 /* Classic icon style */
@@ -603,6 +614,14 @@
     margin: 0px;
 }
 
+/* mate-menu, mintmenu fork */
+#mate-menu.background {
+    background-color: @theme_bg_color;
+    border-color: @less_dark_color;
+    border-style: solid;
+    border-width: 1px;
+}
+
 /*********
  * Pluma *
  *********/
@@ -648,15 +667,10 @@
     background-color: @less_dark_color;
 }
 
-#MyControlCenter.background frame scrolledwindow button.flat {
+#MyControlCenter.background frame scrolledwindow button.flat:not(:hover):not(:focus) {
     border-image: none;
 }
 
-/* button hover of applications */
-#MyControlCenter.background frame scrolledwindow button.flat:hover {
-    border-radius: 8px;
-}
-
 /*******
  * Eom *
  *******/
@@ -717,3 +731,38 @@
     background-color: shade (@theme_bg_color, 1.0);
 }
 
+/****************
+ * Mate-settings-daemon *
+ ****************/
+
+/*For mate-settings-daemon noncomposited osd windows*/
+.msd-osd-window-solid,
+.osd.msd-osd-window-solid,
+.background.osd.msd-osd-window-solid {
+	border-radius: 0px;
+	border-width: 2px;
+	border-style:solid;
+	border-color: rgb(64, 64, 67);
+}
+
+.msd-osd-window-solid progressbar{
+	background-image: linear-gradient(to bottom,
+	                                  shade(@theme_bg_color, 0.4),
+	                                  @theme_bg_color 50%,
+	                                  shade(@theme_bg_color, 1.8));
+	border-radius: 11px;
+}
+
+/* mate-keyboard-layout-view, mate-keyboard-layout-chooser */
+/* this way it styles only the border of the keys, the bg of the map itself
+   use the .view class, and use old and new selectors for a while */
+matekbd-keyboard-drawing,
+.gswitchit-layout-view > box.dialog-vbox > box.vertical > widget,
+#xkb-layout-chooser > box.dialog-vbox > box.vertical > box.vertical > frame > widget {
+    background-color: shade (@theme_bg_color, 1.0);
+}
+
+#xkb-layout-chooser > box.dialog-vbox > box.vertical > box.vertical > frame > border {
+    border-radius: 0px;
+}
+
diff -Nru mate-themes-3.22.6/desktop-themes/BlackMATE/README mate-themes-3.22.11/desktop-themes/BlackMATE/README
--- mate-themes-3.22.6/desktop-themes/BlackMATE/README	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/BlackMATE/README	2017-05-11 10:26:34.000000000 +0200
@@ -31,6 +31,16 @@
 }
 /*------------- end -------------*/
 
+Also, create '~/.mozilla/firefox/<YOUR_PROFILE>/chrome/userChrome.css' and paste these lines in it:
+
+/*------------ start ------------*/
+
+.autocomplete-richlistbox richlistitem .ac-url,
+.autocomplete-richlistbox richlistitem .ac-separator {
+	color: #2EB8E6 !important;
+}
+/*------------- end -------------*/
+
 Seamonkey
 ==========
 Do the same thing for Seamonkey. The difference is just your profile folder, which is inside '~/.mozilla/seamonkey/'.
diff -Nru mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-2.0/gtkrc mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-2.0/gtkrc
--- mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-2.0/gtkrc	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-2.0/gtkrc	2017-05-11 10:26:34.000000000 +0200
@@ -10,11 +10,14 @@
 # NOTE: Uncommenting means to delete the "#" at the beginning of a line. Commenting means to add a "#" at the beginning of a line. The "#" tells the theme wether to ignore the specified line or not.
 
 # These are the defined colors for the theme, you can change them in MATE's appearance preferences.
-gtk_color_scheme = "bg_color:#d4d4d4\nselected_bg_color:#6699CC\nbase_color:#F7F7F7" # Background, base.
-gtk_color_scheme = "fg_color:#2c2c2c\nselected_fg_color:#f5f5f5\ntext_color:#2c2c2c" # Foreground, text.
-gtk_color_scheme = "tooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000000" # Tooltips.
-gtk_color_scheme = "link_color:#08c" # Hyperlinks
-gtk_color_scheme = "bg_color_dark:#3f3f3f\ntext_color_dark:#FFF" # Dark colors
+gtk_color_scheme = "bg_color:#d4d4d4\nselected_bg_color:#6699CC\nbase_color:#F7F7F7\nfg_color:#2c2c2c\nselected_fg_color:#f5f5f5\ntext_color:#2c2c2c\ntooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000000\nlink_color:#08c\nbg_color_dark:#3f3f3f\ntext_color_dark:#FFF"
+
+
+#gtk_color_scheme = "bg_color:#d4d4d4\nselected_bg_color:#6699CC\nbase_color:#F7F7F7" # Background, base.
+#gtk_color_scheme = "fg_color:#2c2c2c\nselected_fg_color:#f5f5f5\ntext_color:#2c2c2c" # Foreground, text.
+#gtk_color_scheme = "tooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000000" # Tooltips.
+#gtk_color_scheme = "link_color:#08c" # Hyperlinks
+#gtk_color_scheme = "bg_color_dark:#3f3f3f\ntext_color_dark:#FFF" # Dark colors
 
 ### EXTERNAL FILES ###
 include "widgets/panel.rc"	# This includes the file that handles the panels.
diff -Nru mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css
--- mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-3.0/gnome-applications.css	2017-05-11 10:26:34.000000000 +0200
@@ -16,7 +16,8 @@
 	color: @theme_text_color;
 }
 
-.nautilus-desktop.nautilus-canvas-item:selected {
+.nautilus-desktop.nautilus-canvas-item:selected,
+.nautilus-desktop.nautilus-canvas-item:selected:backdrop {
 	color: @theme_selected_fg_color;
 }
 
@@ -26,9 +27,11 @@
 	text-shadow: none;
 }
 
+/*
 .nautilus-desktop.nautilus-canvas-item:selected:backdrop {
 	color: @theme_unfocused_selected_fg_color;
 }
+*/
 
 /* workaround for jumping buttons in nautilus */
 .nautilus-window headerbar.titlebar .linked.path-bar > button,
diff -Nru mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css
--- mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-3.0/gtk-main.css	2017-05-11 10:26:34.000000000 +0200
@@ -231,6 +231,9 @@
 /* csd border */
 @define-color wm_csd_solid_border_color shade (#3c3c3c, 1.2);
 
+/* inactive-pane caja */
+@define-color inactive-pane_bg_color #DEDEDE;
+
 @import url("gtk-main-common.css");
 @import url("gtk-widgets-backgrounds.css");
 @import url("gtk-widgets-borders.css");
diff -Nru mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css
--- mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets-borders.css	2017-05-11 10:26:34.000000000 +0200
@@ -4,6 +4,7 @@
 entry,combobox entry.combo,
 combobox button.combo:checked,
 button:checked,
+button.flat:checked,
 toolbar.inline-toolbar.vertical button:checked {
 	border-image: url("borders/button-active.png") 3 4 5 4 / 3px 4px 5px 4px stretch;
 	border-radius: 4px;
diff -Nru mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css
--- mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-3.0/gtk-widgets.css	2017-05-11 10:26:34.000000000 +0200
@@ -35,14 +35,17 @@
 }
 
 *:selected,
-*:selected:focus {
+*:selected:focus,
+*:selected:backdrop {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 }
 
+/*
 *:selected:backdrop {
 	color: @theme_fg_color;
 }
+*/
 
 *:disabled {
 	/*background-color: @insensitive_bg_color;*/
@@ -205,6 +208,9 @@
 
 statusbar frame {
 	padding: 1px;
+}
+
+statusbar frame border {
     border-style: none;
 }
 
@@ -251,7 +257,8 @@
  ************************/
 
 /* displays at end of mouse scrolling */
-overshoot.top {
+overshoot.top,
+overshoot.top:backdrop {
     background-image: -gtk-gradient(radial,
                                     center top, 0,
                                     center top, 0.5,
@@ -270,6 +277,7 @@
     box-shadow: none;
 }
 
+/*
 overshoot.top:backdrop {
     background-image: -gtk-gradient(radial,
                                     center top, 0,
@@ -283,8 +291,10 @@
     border: none;
     box-shadow: none;
 }
+*/
 
-overshoot.bottom {
+overshoot.bottom,
+overshoot.bottom:backdrop {
     background-image: -gtk-gradient(radial,
                                     center bottom, 0,
                                     center bottom, 0.5,
@@ -303,6 +313,7 @@
     box-shadow: none;
 }
 
+/*
 overshoot.bottom:backdrop {
     background-image: -gtk-gradient(radial,
                                     center bottom, 0,
@@ -316,8 +327,10 @@
     border: none;
     box-shadow: none;
 }
+*/
 
-overshoot.left {
+overshoot.left,
+overshoot.left:backdrop {
     background-image: -gtk-gradient(radial,
                                     left center, 0,
                                     left center, 0.5,
@@ -336,6 +349,7 @@
     box-shadow: none;
 }
 
+/*
 overshoot.left:backdrop {
     background-image: -gtk-gradient(radial,
                                     left center, 0,
@@ -349,8 +363,10 @@
     border: none;
     box-shadow: none;
 }
+*/
 
-overshoot.right {
+overshoot.right,
+overshoot.right:backdrop {
     background-image: -gtk-gradient(radial,
                                     right center, 0,
                                     right center, 0.5,
@@ -369,6 +385,7 @@
     box-shadow: none;
 }
 
+/*
 overshoot.right:backdrop {
     background-image: -gtk-gradient(radial,
                                     right center, 0,
@@ -382,6 +399,7 @@
     border: none;
     box-shadow: none;
 }
+*/
 
 /* result is disable undershoot */
 undershoot.top {
@@ -884,7 +902,8 @@
 		mix(@trough_bg_color_b, @theme_selected_bg_color, 0.25));
 }
 
-treeview.view.progressbar {
+treeview.view.progressbar,
+treeview.view.progressbar:backdrop {
       color: @theme_selected_fg_color;
       border: 1px solid @progressbar_border;
       border-radius: 4px;
@@ -901,11 +920,13 @@
       border-color: shade(@progressbar_border, 0.85);
 }
 
+/*
 treeview.view.progressbar:backdrop {
       color: @theme_fg_color;
       border-color: shade(@sidebar_bg_unfocused, 0.85);
       background-color: @sidebar_scrollbar_trough_backdrop;
 }
+*/
 
 treeview.view.trough {
     background-color: rgba(102, 153, 204, 0.3);
@@ -1156,40 +1177,33 @@
  * Frames *
  **********/
 
-frame,
-.frame {
+.frame,
+frame > border,  /* firefox location entry */
+filechooser stack > box > scrolledwindow {
 	border-width: 1px;
 	border-color: @borders;
 	border-style: solid;
 	padding: 0;
 }
 
-frame > border,
+.frame.flat,
 frame > border.flat,
-.frame.flat {
-	border-style: none; 
+overlay > frame > border {
+    border-style: none;
 }
 
 scrolledwindow.frame {
     -gtk-icon-style: regular;
-	border-style: solid;
-	border-color: @borders;
-	border-width: 1px;
 	border-radius: 2px;
-	padding: 0;
 }
 
 /* avoid double borders when a viewport is 
  * packed into a GtkScrolledWindow, + avoid double borders in general */
-scrolledwindow viewport.frame,
-frame box stack scrolledwindow {
+scrolledwindow > viewport.frame,
+frame > box > stack > scrolledwindow {
 	border-style: none;
 }
 
-frame box.vertical scrolledwindow.frame {
-    border-width: 1px 0px 1px 0px;
-}
-
 /***********
  * Buttons *
  ***********/
@@ -1877,11 +1891,13 @@
   background-position: right 3px, right 4px;
 }
 
+/*
 stackswitcher > button.needs-attention > label:backdrop,
 stackswitcher > button.needs-attention > image:backdrop,
 stacksidebar row.needs-attention > label:backdrop {
 	background-size: 6px 6px, 0 0; 
 }
+*/
 
 stackswitcher > button.needs-attention > label:dir(rtl),
 stackswitcher > button.needs-attention > image:dir(rtl),
@@ -1975,6 +1991,24 @@
     border-radius: 4px 4px 0px 0px;
 }
 
+window.background > box.vertical > notebook:not(.frame) > stack > box,
+window.background.csd > box.vertical > notebook:not(.frame) > stack > box,
+window.background.ssd > box.vertical > notebook:not(.frame) > stack > box,
+window.background.solid-csd > box.vertical > notebook:not(.frame) > stack > box {
+    border-style: solid;
+    border-width: 0px 1px 1px 1px;
+    border-color: @borders;
+}
+
+window.background > box.vertical > notebook:not(.frame) > header.top,
+window.background.csd > box.vertical > notebook:not(.frame) > header.top,
+window.background.ssd > box.vertical > notebook:not(.frame) > header.top,
+window.background.solid-csd > box.vertical > notebook:not(.frame) > header.top {
+    border-style: solid;
+    border-width: 1px 1px 0px 1px;
+    border-color: @borders;
+}
+
 printdialog > box.view.vertical.dialog-vbox > box.vertical > notebook {
     background-color: shade (@theme_bg_color, 1.1);
     border-radius: 0px;
@@ -2080,12 +2114,7 @@
     border-radius: 4px 4px 0px 0px;
     border-style: solid;
     border-color: @borders;
-    border-width: 1px 1px 1px 1px;
-    box-shadow: none;
-}
-
-paned.horizontal notebook scrolledwindow.frame {
-    border-width: 0px 1px 1px 1px;
+    border-width: 1px 1px 0px 1px;
 }
 
 paned.horizontal notebook header.top tab {
@@ -2097,6 +2126,18 @@
     border-radius: 4px 4px 0px 0px;
 }
 
+/* closable-page */
+paned.horizontal > notebook > header > tabs > tab > label {
+    min-height: 20px;
+}
+
+paned.horizontal > notebook > stack > box {
+    background-color: shade (@theme_bg_color, 1.1);
+    border-style: solid;
+    border-color: @borders;
+    border-width: 0px 1px 1px 1px;
+}
+
 /* tabs ie. preferences windows */
 /* horizontal tabs */
 window.background > box.vertical > notebook > header.top tab, /* pavu-control */
@@ -2248,6 +2289,15 @@
     border-style: none;
 }
 
+notebook.frame > header.top > button.circular.flat.image-button.popup.toggle {
+    padding: 0px;
+}
+
+ /* ie. caja properties-window notes tab */
+dialog notebook.frame > stack > scrolledwindow.frame {
+     border-style: none;
+}
+
 /* outlines */
 notebook header tab:checked {
     outline-color: @button_default_border_color;
@@ -2348,7 +2398,8 @@
     color: @menu_controls_color;
 }
 
-notebook header tabs arrow {
+notebook header tabs arrow,
+notebook header tabs arrow:backdrop {
     color: shade(@theme_fg_color, 2.6);
 }
 
@@ -2364,9 +2415,11 @@
     color: rgba(141, 144, 145, 0.3);
 }
 
+/*
 notebook header tabs arrow:backdrop {
     color: rgba(84, 89, 90, 0.4);
 }
+*/
 
 notebook header tabs arrow:disabled {
     color: #c7c7c7;
@@ -2591,11 +2644,11 @@
 }
 
 scrollbar trough,
-scrollbar trough.vertical,
+scrollbar.vertical trough,
 .sidebar scrollbar trough,
-.sidebar scrollbar trough.vertical,
-placessidebar scrollbar.trough,
-placessidebar scrollbar.trough.vertical {
+.sidebar scrollbar.vertical trough,
+placessidebar scrollbar trough,
+placessidebar scrollbar.vertical trough {
     min-width: 13px;
 	background-image: linear-gradient(to right,
 		@scrollbar_trough,
@@ -2607,9 +2660,9 @@
 	border-image: none;
 }
 
-scrollbar trough.horizontal,
-.sidebar scrollbar trough.horizontal,
-placessidebar scrollbar trough.horizontal {
+scrollbar.horizontal trough,
+.sidebar scrollbar.horizontal trough,
+placessidebar scrollbar.horizontal trough {
     min-width: 13px;
 	background-image: linear-gradient(to bottom,
 		@scrollbar_trough,
@@ -2800,13 +2853,12 @@
 }
 
  /* the small square between scrollbars!!! */
-scrolledwindow junction {
+scrolledwindow junction,
+scrolledwindow.frame junction {
 	background-image: none;
-	background-color: @theme_bg_color;
-	border-width: 0;
+	background-color: inherit;
+	border-style: none;
 	border-radius: 0;
-	border-image: none;
-	box-shadow: none;
 }
 
 /* junction does not work here */
@@ -3354,14 +3406,6 @@
 	padding: 0;
 }
 
-/* ie. mate-keyboard-properties option window */
-dialog scrolledwindow {
-    border-color: @borders;
-    border-style: solid;
-    border-width: 1px;
-    border-radius: 2px;
-}
-
 /* credits in GtkAbout windows */
 dialog .dialog-vbox scrolledwindow.frame > viewport.view.frame {
     background-color: shade (@theme_bg_color, 1.14);
@@ -3515,6 +3559,31 @@
 	box-shadow: none;
 }
 
+/* print dialog */
+printdialog.background > box.view.vertical.dialog-vbox {
+    background-color: shade (@theme_bg_color, 1.0);
+}
+
+printdialog.background paper {
+    border-style: solid;
+    border-width: 0.9px;
+    border-radius: 0px;
+    border-color: @borders;
+    background-color: @theme_base_color;
+}
+
+/* filechooser dialog */
+filechooser revealer .vertical.view {
+    background-color: @theme_bg_color;
+    border-style: solid;
+    border-width: 1px 1px 0px 1px;
+    border-color: @borders;
+}
+
+filechooser actionbar {
+    border-width: 0px 1px 1px 1px;
+}
+
 /***************
  * Search bars *
  ***************/
@@ -3615,6 +3684,7 @@
  * Sidebar *
  ***********/
 
+treeview.view.sidebar, /*shotwell */
 .sidebar .view,
 placessidebar .view,
 .sidebar {
@@ -4264,12 +4334,6 @@
  * GtkAssistant *
  ****************/
 
-assistant .sidebar highlight {
-    background-color: transparent;
-    color: @theme_fg_color;
-    font-weight: bold;
-}
-
 assistant .sidebar {
 	padding: 12px 18px 12px;
 	border-width: 0 1px 0 0;
@@ -4277,10 +4341,16 @@
 	border-style: solid;
 	border-color: @inactive_frame_color;
 	color: mix (@theme_fg_color, @theme_bg_color, 0.40);
-	background-color: shade (@theme_bg_color, 0.97);
+	background-color: @sidebar_bg;
 	/* shall we make it like sidebars in general? */
 }
 
+assistant .sidebar label.highlight { /* ie. caja-actions import dialog */
+    background-color: transparent;
+    color: @theme_fg_color;
+    font-weight: bold;
+}
+
 /*************
  * GtkSwitch *
  *************/
@@ -4422,38 +4492,52 @@
 
 .view text,
 textview,
-.view {
+.view,
+treeview.view,
+treeview.view:backdrop {
 	background-color: @theme_base_color;
 	color: @theme_text_color;
 }
 
 .view text selection:disabled,
-.view:disabled {
+.view:disabled,
+treeview.view:disabled {
 	background-color: @insensitive_bg_color;
 	color: @insensitive_fg_color;
 }
 
 .view text selection,
-.view:selected {
+.view text selection:backdrop,
+.view:selected,
+.view:selected:hover,
+.view:selected:backdrop,
+treeview.view:selected,
+treeview.view:selected:hover {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 }
 
 .view text selection:hover,
-.view:hover {
+.view:hover,
+treeview.view:hover {
 	background-color: shade (@theme_selected_bg_color, 1.55);
 	color: shade (@theme_selected_bg_color, 0.35);
 }
 
+/*
 .view text selection:backdrop,
-.view:selected:backdrop {
+.view:selected:backdrop,
+treeview.view:backdrop {
 	background-color: shade(@theme_unfocused_bg_color, 0.94);
 	color: @theme_fg_color;
 }
+*/
 
 /* color of selected icons if unfocused */
-.view:active {
+.view:active,
+treeview.view:active {
     background-color: shade(@theme_unfocused_bg_color, 0.94);
+	color: @theme_fg_color;
 }
 
 /* ie. filechooser dialog */
@@ -4466,16 +4550,21 @@
 label:selected,
 label selection,
 label selection:focus,
-label selection:hover {
+label selection:hover,
+label:backdrop:selected,
+label selection:backdrop {
   background-color: @theme_selected_bg_color;
   color: @theme_selected_fg_color;
 }
 
 label:disabled:selected,
-label selection:disabled {
+label selection:disabled,
+label:backdrop:disabled:selected,
+label selection:backdrop:disabled {
 	color: @insensitive_fg_color;
 }
 
+/*
 label:backdrop:selected,
 label selection:backdrop {
 	color: @theme_fg_color;
@@ -4485,6 +4574,7 @@
 label selection:backdrop:disabled {
 	color: @insensitive_fg_color;
 }
+*/
 
 .cell {
 	padding: 2px;
@@ -4492,22 +4582,28 @@
 }
 
 .cell:selected,
-.cell:selected:focus {
+.cell:selected:focus,
+.cell:selected:backdrop,
+.cell:selected:focus:backdrop {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 }
 
+/*
 .cell:selected:backdrop,
 .cell:selected:focus:backdrop {
 	color: @theme_fg_color;
 }
+*/
 
 row {
     min-height: 22px;
 }
 
 row:selected,
-row:selected:focus {
+row:selected:focus,
+row:selected:backdrop,
+row:selected:focus:backdrop {
 	border-width: 1px 0 1px 0;
 	border-style: solid;
 	border-color: shade (@theme_selected_bg_color, 0.85);
@@ -4517,10 +4613,12 @@
 	box-shadow: none;
 }
 
+/*
 row:selected:backdrop,
 row:selected:focus:backdrop {
 	color: @theme_fg_color;
 }
+*/
 
 .sidebar treeview.view:hover {
 	background-color: shade (@theme_selected_bg_color, 1.15);
@@ -4588,10 +4686,12 @@
     background-clip: padding-box;
 }
 
+/*
 .app-notification:backdrop,
 .app-notification.frame:backdrop {
     background-image: none;
 }
+*/
 
 .app-notification button,
 .app-notification headerbar button.titlebutton,
@@ -4682,6 +4782,7 @@
     padding: 0px;
 }
 
+/*
 .app-notification button:backdrop,
 .app-notification.frame button:backdrop {
     color: #eeeeec;
@@ -4696,6 +4797,7 @@
     border-radius: 3px;
     padding: 0px;
 }
+*/
 
 /*************
  * Expanders *
@@ -4826,7 +4928,11 @@
 list row:selected,
 list row:selected:hover,
 list row.activatable:selected,
-list row.activatable:selected:hover {
+list row.activatable:selected:hover,
+list row:selected:backdrop,
+list row:selected:backdrop:hover,
+list row.activatable:selected:backdrop,
+list row.activatable:selected:backdrop:hover {
     padding: 2px;
     border-width: 0;
     border-style: solid;
@@ -4839,6 +4945,7 @@
     color: @theme_selected_fg_color;
 }
 
+/*
 list row:selected:backdrop,
 list row:selected:backdrop:hover,
 list row.activatable:selected:backdrop,
@@ -4850,6 +4957,7 @@
     text-shadow: none;
     box-shadow: none;
 }
+*/
 
 list > row > button {
 	border-color: transparent;
@@ -4950,7 +5058,6 @@
     color: alpha(@theme_fg_color, 0.4);
 }
 
-highlight,
 calendar.highlight {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
@@ -5361,18 +5468,23 @@
 	padding: 0px 12px;
 }
 
+/*
 .titlebar:backdrop {
     color: @theme_unfocused_fg_color;
 }
+*/
 
-.titlebar button.titlebutton {
+.titlebar button.titlebutton,
+.titlebar button.titlebutton:backdrop {
     color: @wm_title;
 }
 
+/*
 .titlebar button.titlebutton:backdrop {
     color: @wm_unfocused_title;
     -gtk-icon-shadow: none;
 }
+*/
 
 headerbar button.text-button,
 .titlebar button.text-button {
@@ -5456,31 +5568,6 @@
     box-shadow: 0 1px 5px @wm_shadow;
 }
 
-/* print dialog */
-printdialog.background > box.view.vertical.dialog-vbox {
-    background-color: shade (@theme_bg_color, 1.0);
-}
-
-printdialog.background paper {
-    border-style: solid;
-    border-width: 1px;
-    border-radius: 0px;
-    border-color: @borders;
-    background-color: @theme_base_color;
-}
-
-/* filechooser dialog */
-filechooser revealer .vertical.view {
-    background-color: @theme_bg_color;
-    border-style: solid;
-    border-width: 1px 1px 0px 1px;
-    border-color: @borders;
-}
-
-filechooser placessidebar.sidebar.frame {
-    border-style: solid;
-}
-
 /*********
  * Paned *
  *********/
diff -Nru mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css
--- mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-3.0/mate-applications.css	2017-05-11 10:26:34.000000000 +0200
@@ -156,19 +156,7 @@
     min-width: 8px;
 }
 
-.caja-side-pane notebook {
-    border-color: @borders;
-    border-style: solid;
-    border-radius: 0px;
-    border-width: 1px 0px 0px 0px;
-}
-
-/* views */
-/* scrolledwindow junction and top border for list view */
-.caja-navigation-window .caja-notebook scrolledwindow.frame {
-	background-color: @theme_bg_color;
-}
-
+/* view modes */
 /* icon and compat mode */
 .caja-navigation-window .caja-notebook scrolledwindow.view.frame  {
     background-color: @theme_base_color;
@@ -190,9 +178,14 @@
     border-width: 1px 1px 1px 0px;
 }
 
+/* background-image is needed for inactiv-pane. bg color don't work here */
 .caja-notebook treeview.view:selected,
 .caja-notebook treeview.view:selected:hover {
     background-color: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 1.00),
+                                      shade (@theme_selected_bg_color, 1.00));
 }
 
 .caja-notebook treeview.view:hover {
@@ -200,6 +193,16 @@
     color: shade (@theme_selected_bg_color, 0.35);
 }
 
+/* ie. inactive-pane caja */
+.caja-notebook .view:disabled {
+    background-color: @inactive-pane_bg_color;
+}
+
+/* no double borders if tabs are used */
+.caja-navigation-window .caja-notebook > header.top {
+	border-width: 1px 0px 0px 1px;
+}
+
 /* window and desktop mode */
 .caja-canvas-item {
     border-radius: 3px;
@@ -241,12 +244,13 @@
    text-shadow: none;
 }
 
-/* statusbar */
-.caja-navigation-window statusbar frame {
-    border-style: none;
+/* search, etc */
+/* needed as this is used for firefox locationbar, to avoid double borders */
+.caja-notebook box.vertical > frame > border {
+    border-style: solid;
+    border-width: 1px 1px 0px 1px;
 }
 
-/* search, etc */
 #caja-extra-view-widget {
     background-color: shade (@theme_bg_color, 1.04);
     background-color: @cluebar_color;
@@ -258,6 +262,11 @@
     color: @theme_fg_color;
 }
 
+/* emblems and background dialog */
+.caja-property-browser > box > box > box > scrolledwindow.frame > viewport.frame {
+    background-color: shade (@theme_bg_color, 1.08);
+}
+
 /* misc */
 /* do we have this style class? */
 .caja-cluebar-label {
@@ -303,23 +312,21 @@
 }
 
 /* hide buttons */
-PanelToplevel > widget > button {
+PanelToplevel > grid > button {
     background: transparent;
     border-image: none;
-    border-radius: 2px;
+    border-radius: 0px;
     border-width: 0px;
     padding: 0px;
     box-shadow: none;
 }
 
-PanelToplevel > widget > button:hover,
-PanelToplevel > widget > button:hover:active {
+PanelToplevel > grid > button:hover,
+PanelToplevel > grid > button:hover:active {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_selected_bg_color, 0.86),
                                       shade (@theme_selected_bg_color, 0.26));
     color: shade (@theme_selected_fg_color, 1.00);
-    text-shadow: none;
-    border-style: solid;
     border-width: 0px;
 }
 
@@ -357,7 +364,7 @@
 .mate-panel-menu-bar menubar > menuitem {
     transition: all 200ms ease-out;
     text-shadow: none;
-    font-weight: 600;
+    font-weight: normal;
     padding: 4px;
 }
 
@@ -488,8 +495,8 @@
 	border-radius: 3px;
 }
 
-#MatePanelPopupWindow frame {
-	border-radius: 3px;
+#MatePanelPopupWindow frame border {
+    border-radius: 3px;
     border-style: solid;
     border-width: 1px;
     border-color: shade(@borders, 0.95);
@@ -504,12 +511,11 @@
 
 na-tray-applet {
     -NaTrayApplet-icon-padding: 1px; /*any more and outlines get cut off*/
-    -NaTrayApplet-icon-size: 16;
 }
 
 /* remove right space a bit */
 na-tray-applet > widget > box {
-    margin: 0px 2px 0px 0px;
+    margin: 1px 2px 1px 1px;
 }
 
 /* no background for icon-padding area */
@@ -527,44 +533,62 @@
     background: transparent;
 }
 
-.mate-panel-applet-slider frame {
+.mate-panel-applet-slider > frame {
     background-color: @theme_bg_color;
+    border-radius:3px;
+    padding: 0px;
+    margin: 0px;
+}
+
+.mate-panel-applet-slider > frame > border {
     border-image: none;
     border-style: solid;
     border-radius:3px;
     padding: 2px;
-    margin: 0px;
 }
 
-.mate-panel-applet-slider frame frame{
+.mate-panel-applet-slider > frame > frame > border {
     background-color:transparent;
     border-style: none;
     box-shadow: none;
 }
 
-.mate-panel-applet-slider frame button {
+.mate-panel-applet-slider > frame > button {
     color: @theme_fg_color;
 }
 
-/****************
- * Mate-Terminal *
- ****************/
+/* mate-menu, mintmenu */
+#mintmenu.background,
+#mate-menu.background {
+    border-color: @borders;
+    border-style: solid;
+    border-width: 1px;
+}
 
-/* 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;
+#mintmenu.background button,
+#mintmenu.background button.flat,
+#mate-menu.background button,
+#mate-menu.background button.flat {
+    padding: 3px 1px;
+    border-width: 2px;
 }
 
-/* override settings for pavu-control */
-window.background.mate-terminal > box.vertical > notebook > header.top tab,
-window.background.mate-terminal > box.vertical > notebook > header.top tab:checked,
-window.background.mate-terminal > box.vertical > 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;
+#mintmenu.background scrollbar.vertical button,
+#mate-menu.background scrollbar.vertical button {
+    padding: 1px 0px;
+}
+
+#mintmenu.background scrolledwindow,
+#mate-menu.background scrolledwindow {
     border-color: @borders;
     border-width: 1px;
+    border-style: solid;
+    border-radius: 0px;
+}
+
+#mintmenu.background notebook.frame scrolledwindow,
+#mate-menu.background notebook.frame scrolledwindow {
+    border-style: none;
 }
 
 /****************
@@ -716,14 +740,17 @@
 }
 
 /* atril and eom */
-EggToolbarEditor.vertical scrolledwindow viewport.frame {
-    background-color: shade (@theme_base_color, 1.0);
+EggToolbarEditor.vertical scrolledwindow {
     border-color: @borders;
     border-width: 1px;
     border-radius: 0px;
     border-style: solid;
 }
 
+EggToolbarEditor.vertical scrolledwindow viewport.frame {
+    background-color: shade (@theme_base_color, 1.0);
+}
+
 /*******
  * Eom *
  *******/
@@ -820,7 +847,7 @@
     box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;
 }
 
-.lock-dialog frame {
+.lock-dialog frame border {
     border-radius: 4px;
     border-style: none;
     border-width: 0px;
@@ -892,8 +919,60 @@
  *****************/
 
 /* override for pavu-control */
-window.background.mate-terminal > box.vertical > notebook {
+window.background.mate-terminal > box.vertical > notebook,
+window.background.mate-terminal > box.vertical > notebook > stack > box {
     border-style: none;
     border-width: 0px;
 }
 
+window.background.mate-terminal > box.vertical > notebook > header.top {
+    border-width: 0px 0px 0px 1px;
+    border-color: @theme_bg_color;
+}
+
+/* how strange is that? a bg above the header bg? This solves non colored pixels*/
+window.background.mate-terminal > box.vertical > notebook > header.top tabs {
+    background-color: @theme_bg_color;
+}
+
+/* override settings for pavu-control */
+window.background.mate-terminal > box.vertical > notebook > header.top tab,
+window.background.mate-terminal > box.vertical > notebook > header.top tab:checked,
+window.background.mate-terminal > box.vertical > 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;
+}
+
+/*************************
+ * mate-power-statistics *
+ *************************/
+
+.mpm-statistics notebook.frame > stack > scrolledwindow.frame {
+     border-style: solid;
+}
+
+/************
+ * engrampa *
+ ************/
+
+.engrampa-window > grid > paned > box > frame > border {
+    border-style: none;
+}
+
+/* mate-keyboard-layout-view, mate-keyboard-layout-chooser */
+/* this way it styles only the border of the keys, the bg of the map itself
+   use the .view class, and use old and new selectors for a while */
+matekbd-keyboard-drawing,
+.gswitchit-layout-view > box.dialog-vbox > box.vertical > widget,
+#xkb-layout-chooser > box.dialog-vbox > box.vertical > box.vertical > frame > widget {
+    background-color: shade (@theme_bg_color, 1.0);
+}
+
+#xkb-layout-chooser > box.dialog-vbox > box.vertical > box.vertical > frame > border {
+    border-radius: 0px;
+}
+
diff -Nru mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-3.0/other-applications.css mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-3.0/other-applications.css
--- mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-3.0/other-applications.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-3.0/other-applications.css	2017-05-11 10:26:34.000000000 +0200
@@ -51,6 +51,9 @@
 .nemo-window .nemo-window-pane > notebook box.vertical > overlay > scrolledwindow.view,
 .nemo-window .nemo-window-pane > notebook box.vertical > overlay > scrolledwindow > treeview.view {
     background-color: @theme_base_color;
+	border-width: 1px 1px 0px 1px;
+	border-style: solid;
+	border-color: @borders;
 }
 
 .nemo-window-pane treeview.view {
@@ -62,19 +65,20 @@
 	background-color: alpha (@theme_selected_bg_color, 0.35);
 }
 
+.nemo-window .nemo-window-pane > notebook > header.top {
+	border-width: 1px 0px 0px 1px;
+}
+
 /* sidebar */
 .nemo-window .sidebar .view {
 	background-color: shade (@theme_bg_color, 1.08);
 	color: @theme_fg_color;
 }
 
-.nemo-window .sidebar scrolledwindow.frame {
-	border-right-width: 1px;
+.nemo-window .sidebar scrolledwindow.frame.nemo-places-sidebar {
+	border-width: 1px 1px 0px 1px;
 	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.90);
-	border-left: none;
-	border-top: none;
-	border-bottom: none;
+	border-color: @borders;
 }
 
 .nemo-window .sidebar treeview .cell:selected {
diff -Nru mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-3.0/unity.css mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-3.0/unity.css
--- mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-3.0/unity.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-3.0/unity.css	2017-05-11 10:26:34.000000000 +0200
@@ -43,13 +43,14 @@
 }
 
 /* Top decoration for inactive windows */
+/*
 UnityDecoration.top:backdrop {
 	border: 0px solid @theme_bg_color;
 	border-bottom-width: 0;
 	background-color: @theme_bg_color;
 	color: @theme_unfocused_fg_color;
 }
-
+*/
 /* Left decoration, it themes only the space at the left of the window */
 UnityDecoration.left,
 /* Right decoration, it themes only the space at the right of the window */
@@ -60,8 +61,10 @@
 }
 
 /* Left, right and bottom decorations themes for inactive windows */
+/*
 UnityDecoration.left:backdrop,
 UnityDecoration.right:backdrop,
 UnityDecoration.bottom:backdrop {
 	background-color: @theme_bg_color;
 }
+*/
diff -Nru mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-3.0/window-controls.css mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-3.0/window-controls.css
--- mate-themes-3.22.6/desktop-themes/BlueMenta/gtk-3.0/window-controls.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/BlueMenta/gtk-3.0/window-controls.css	2017-05-11 10:26:34.000000000 +0200
@@ -25,6 +25,10 @@
 
 /* minimize */
 
+headerbar .right button.minimize.titlebutton:backdrop,
+headerbar .right:dir(rtl) button.minimize.titlebutton:backdrop,
+headerbar .left button.minimize.titlebutton:backdrop,
+headerbar .left:dir(rtl) button.minimize.titlebutton:backdrop,
 headerbar .right button.minimize.titlebutton,
 headerbar .right:dir(rtl) button.minimize.titlebutton,
 headerbar .left button.minimize.titlebutton,
@@ -32,6 +36,10 @@
 	background-image: url('window-controls/minimize_focused_normal.png');
 }
 
+headerbar .right button.minimize.titlebutton:backdrop:hover,
+headerbar .right:dir(rtl) button.minimize.titlebutton:backdrop:hover,
+headerbar .left button.minimize.titlebutton:backdrop:hover,
+headerbar .left:dir(rtl) button.minimize.titlebutton:backdrop:hover,
 headerbar .right button.minimize.titlebutton:hover,
 headerbar .right:dir(rtl) button.minimize.titlebutton:hover,
 headerbar .left button.minimize.titlebutton:hover,
@@ -50,6 +58,7 @@
 	background-image: url('window-controls/minimize_focused_pressed.png');
 }
 
+/*
 headerbar .right button.minimize.titlebutton:backdrop,
 headerbar .right:dir(rtl) button.minimize.titlebutton:backdrop,
 headerbar .left button.minimize.titlebutton:backdrop,
@@ -63,8 +72,13 @@
 headerbar .left:dir(rtl) button.minimize.titlebutton:backdrop:hover {
 	background-image: url('window-controls/minimize_unfocused_prelight.png');
 }
+*/
 
 /* maximize */
+headerbar .right button.maximize.titlebutton:backdrop,
+headerbar .right:dir(rtl) button.maximize.titlebutton:backdrop,
+headerbar .left button.maximize.titlebutton:backdrop,
+headerbar .left:dir(rtl) button.maximize.titlebutton:backdrop,
 headerbar .right button.maximize.titlebutton,
 headerbar .right:dir(rtl) button.maximize.titlebutton,
 headerbar .left button.maximize.titlebutton,
@@ -72,6 +86,10 @@
 	background-image: url('window-controls/maximize_focused_normal.png');
 }
 
+headerbar .right button.maximize.titlebutton:backdrop:hover,
+headerbar .right:dir(rtl) button.maximize.titlebutton:backdrop:hover,
+headerbar .left button.maximize.titlebutton:backdrop:hover,
+headerbar .left:dir(rtl) button.maximize.titlebutton:backdrop:hover,
 headerbar .right button.maximize.titlebutton:hover,
 headerbar .right:dir(rtl) button.maximize.titlebutton:hover,
 headerbar .left button.maximize.titlebutton:hover,
@@ -90,6 +108,7 @@
 	background-image: url('window-controls/maximize_focused_pressed.png');
 }
 
+/*
 headerbar .right button.maximize.titlebutton:backdrop,
 headerbar .right:dir(rtl) button.maximize.titlebutton:backdrop,
 headerbar .left button.maximize.titlebutton:backdrop,
@@ -103,8 +122,13 @@
 headerbar .left:dir(rtl) button.maximize.titlebutton:backdrop:hover {
 	background-image: url('window-controls/maximize_unfocused_prelight.png');
 }
+*/
 
 /* close */
+headerbar .right button.close.titlebutton:backdrop,
+headerbar .right:dir(rtl) button.close.titlebutton:backdrop,
+headerbar .left button.close.titlebutton:backdrop,
+headerbar .left:dir(rtl) button.close.titlebutton:backdrop,
 headerbar .right button.close.titlebutton,
 headerbar .right:dir(rtl) button.close.titlebutton,
 headerbar .left button.close.titlebutton,
@@ -113,6 +137,10 @@
 	/*padding: 2px 6px 3px 3px;*/ /* FIXME: Uncomment this shit when using the Faenza icon theme and maybe some other icon themes */
 }
 
+headerbar .right button.close.titlebutton:backdrop:hover,
+headerbar .right:dir(rtl) button.close.titlebutton:backdrop:hover,
+headerbar .left button.close.titlebutton:backdrop:hover,
+headerbar .left:dir(rtl) button.close.titlebutton:backdrop:hover,
 headerbar .right button.close.titlebutton:hover,
 headerbar .right:dir(rtl) button.close.titlebutton:hover,
 headerbar .left button.close.titlebutton:hover,
@@ -131,6 +159,7 @@
 	background-image: url('window-controls/close_focused_pressed.png');
 }
 
+/*
 headerbar .right button.close.titlebutton:backdrop,
 headerbar .right:dir(rtl) button.close.titlebutton:backdrop,
 headerbar .left button.close.titlebutton:backdrop,
@@ -144,6 +173,7 @@
 headerbar .left:dir(rtl) button.close.titlebutton:backdrop:hover {
 	background-image: url('window-controls/close_unfocused_prelight.png');
 }
+*/
 
 .titlebar button.close.titlebutton {
     /* fake request     to avoid usage of regular window-close button*/
diff -Nru mate-themes-3.22.6/desktop-themes/Blue-Submarine/gtk-2.0/gtkrc mate-themes-3.22.11/desktop-themes/Blue-Submarine/gtk-2.0/gtkrc
--- mate-themes-3.22.6/desktop-themes/Blue-Submarine/gtk-2.0/gtkrc	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Blue-Submarine/gtk-2.0/gtkrc	2017-05-11 10:26:34.000000000 +0200
@@ -9,14 +9,16 @@
 
 # NOTE: Uncommenting means to delete the "#" at the beginning of a line. Commenting means to add a "#" at the beginning of a line. The "#" tells the theme wether to ignore the specified line or not.
 
-# These are the defined colors for the theme, you can change them in GNOME's appearance preferences.
-gtk_color_scheme = "bg_color:#CBD5D9\nselected_bg_color:#255880\nbase_color:#FFF" # Background, base.
-gtk_color_scheme = "fg_color:#101010\nselected_fg_color:#FFF\ntext_color:#1A1A1A" # Foreground, text.
-gtk_color_scheme = "tooltip_bg_color:#DBF4FF\ntooltip_fg_color:#000000" # Tooltips.
-gtk_color_scheme = "link_color:#008BCC" # Hyperlinks
-gtk_color_scheme = "menu_color:#1F2427" # Color for menus.
-gtk_color_scheme = "bg_color_dark:#1F2427\nfg_color_dark:#cccccc\ntext_color_dark:#E6E6E6" # Dark colors
-gtk-color-scheme = "sidebar_background:#D2DBDF"
+# These are the defined colors for the theme, you can change them in MATE's appearance preferences.
+gtk-color-scheme = "base_color:#FFF\nfg_color:#101010\ntooltip_fg_color:#000000\nselected_bg_color:#255880\nselected_fg_color:#FFF\ntext_color:#1A1A1A\nbg_color:#CBD5D9\ntooltip_bg_color:#DBF4FF\nlink_color:#008BCC\nmenu_color:#1F2427\nbg_color_dark:#1F2427\nfg_color_dark:#cccccc\ntext_color_dark:#E6E6E6\nsidebar_background:#D2DBDF"
+
+#gtk_color_scheme = "bg_color:#CBD5D9\nselected_bg_color:#255880\nbase_color:#FFF" # Background, base.
+#gtk_color_scheme = "fg_color:#101010\nselected_fg_color:#FFF\ntext_color:#1A1A1A" # Foreground, text.
+#gtk_color_scheme = "tooltip_bg_color:#DBF4FF\ntooltip_fg_color:#000000" # Tooltips.
+#gtk_color_scheme = "link_color:#008BCC" # Hyperlinks
+#gtk_color_scheme = "menu_color:#1F2427" # Color for menus.
+#gtk_color_scheme = "bg_color_dark:#1F2427\nfg_color_dark:#cccccc\ntext_color_dark:#E6E6E6" # Dark colors
+#gtk-color-scheme = "sidebar_background:#D2DBDF"
 
 ### MISC ###
 gtk-icon-sizes		= "gtk-button=16,16" # This makes button icons smaller.
diff -Nru mate-themes-3.22.6/desktop-themes/Blue-Submarine/gtk-3.0/gnome-applications.css mate-themes-3.22.11/desktop-themes/Blue-Submarine/gtk-3.0/gnome-applications.css
--- mate-themes-3.22.6/desktop-themes/Blue-Submarine/gtk-3.0/gnome-applications.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Blue-Submarine/gtk-3.0/gnome-applications.css	2017-05-11 10:26:34.000000000 +0200
@@ -81,3 +81,11 @@
     border-radius: 0px;
 }
 
+/*********
+ * gedit *
+ *********/
+
+.gedit-side-panel-paned.horizontal > box.vertical > statusbar.horizontal {
+    padding: 4px;
+}
+
diff -Nru mate-themes-3.22.6/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css mate-themes-3.22.11/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css
--- mate-themes-3.22.6/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Blue-Submarine/gtk-3.0/gtk.css	2017-05-11 10:26:34.000000000 +0200
@@ -277,6 +277,9 @@
 @define-color overshoot_bg_color alpha (@theme_selected_bg_color, 0.55);
 @define-color overshoot_backdrop_bg_color #96C8FA;
 
+/* inactive-pane caja */
+@define-color inactive-pane_bg_color #E5E5E5;
+
 @import url("gtk-widgets.css");
 @import url("gtk-widgets-assets.css");
 @import url("menu.css");
diff -Nru mate-themes-3.22.6/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css mate-themes-3.22.11/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css
--- mate-themes-3.22.6/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Blue-Submarine/gtk-3.0/gtk-widgets.css	2017-05-11 10:26:34.000000000 +0200
@@ -36,9 +36,15 @@
     color: @theme_fg_color;
 }
 
+/* exclude widget for mate-menu */
 .background:not(widget) {
-    color: @theme_fg_color;
-    background-color: @theme_bg_color;
+	color: @theme_fg_color;
+	background-color: @theme_bg_color;
+}
+
+/* override previous setting for rubberband of mate-screenshot */
+.background.rubberband {
+	background-color: transparent;
 }
 
 .background:backdrop {
@@ -46,13 +52,6 @@
     -gtk-icon-shadow: none;
 }
 
-/* Ugly hack to fix unexpected background colours (e.g. combo box arrow)
- * we should just set it above, but that loses our background on fullscreen)
- */
-/* * {
- background-color: transparent;
-}*/
-
 *:active {
 /*    background-color: alpha(shade(@theme_selected_bg_color, 1.90), 0.015);*/
 }
@@ -70,6 +69,12 @@
 *:hover:disabled {
 }
 
+/* seems like firefox needs this stupid wildcard in several places */
+*:selected:focus {
+        background-color: @theme_selected_bg_color;
+        color: @theme_selected_fg_color;
+}
+
 *:disabled {
     /* inherit the color from parent by default */
     background-color: inherit;
@@ -245,16 +250,12 @@
 }
 
 statusbar {
-    padding: 0px;
+    padding: 2px;
     margin: -2px 0 -2px 0;
     color: @theme_fg_color;
     font-size: smaller;
 }
 
-statusbar frame {
-    border-style: none;
-}
-
 .dnd {
     border-width: 1px;
     border-style: solid;
@@ -904,26 +905,20 @@
  * Frames *
  **********/
 
-frame {
-    padding: 2px;
+.frame,
+frame > border { /* firefox location entry */
+    padding: 0px;
     border-width: 1px;
     border-radius: 4px;
     border-style: solid;
-    border-color: shade (@theme_bg_color, 0.85);
-    border-top-color:    shade(@notebook_border, 1.25);
-    border-left-color:   shade(@notebook_border, 1.25);
-    border-right-color:  shade(@notebook_border, 1.25);
-    border-bottom-color: shade(@notebook_border, 1.25);
+    border-color:  shade (@theme_bg_color, 0.85);
     color: mix(@theme_selected_bg_color, @theme_fg_color, 0.70);
 }
 
-/* only render frames in a GtkScrolledWindow */
-scrolledwindow.frame {
-    border-width:  1px;
-    border-radius: 0;
-    border-style:  solid;
-    border-color:  shade (@theme_bg_color, 0.85);
-    padding: 0px;
+.frame.flat,
+frame > border.flat,
+overlay > frame > border {
+    border-style: none;
 }
 
 /***********
@@ -2770,7 +2765,7 @@
 }
 
 toolbar label {
-    color: shade(@theme_fg_color, 1.10);
+    color: shade(@toolbar_fg_color, 1.00);
     text-shadow: none;
 }
 
@@ -2793,9 +2788,11 @@
     primary toolbar raised buttons
 *************************************/
 
-/* ie. cimnnamon-settings (button.raised) */
+/* ie. cimnnamon-settings (button.raised), mate-font-viewer toolbar info button */
 toolbar .raised button,
-toolbar button.raised {
+toolbar button.raised,
+toolbar button.raised:hover,
+toolbar button.raised:focus {
     padding: 6px;
 }
 
@@ -3028,7 +3025,7 @@
                                      color-stop (0.50, shade(@button_base, 0.96)),
                                      color-stop (0.50, shade(@button_base, 0.95)),
                                      to (shade(@button_base, 0.94))); 
-    border-width: 0 1px 1px 0px;
+    border-width: 0px 1px 1px 1px;
     border-style: solid;
     border-radius: 0px;
     border-top-color:    shade(@button_border, 1.00);
@@ -3471,11 +3468,6 @@
     border-radius: 4px 4px 0px 0px;
 }
 
-notebook.frame frame {
-    border-style: none;
-    border-width: 0px;
-}
-
 /* pavu-control */
 window.background > box.vertical > notebook:not(.frame),
 window.background.csd > box.vertical > notebook:not(.frame),
@@ -3485,6 +3477,24 @@
     border-radius: 4px 4px 0px 0px;
 }
 
+window.background > box.vertical > notebook:not(.frame) > stack > box,
+window.background.csd > box.vertical > notebook:not(.frame) > stack > box,
+window.background.ssd > box.vertical > notebook:not(.frame) > stack > box,
+window.background.solid-csd > box.vertical > notebook:not(.frame) > stack > box {
+    border-style: solid;
+    border-width: 0px 1px 1px 1px;
+    border-color: @notebook_border;
+}
+
+window.background > box.vertical > notebook:not(.frame) > header.top,
+window.background.csd > box.vertical > notebook:not(.frame) > header.top,
+window.background.ssd > box.vertical > notebook:not(.frame) > header.top,
+window.background.solid-csd > box.vertical > notebook:not(.frame) > header.top {
+    border-style: solid;
+    border-width: 1px 1px 0px 1px;
+    border-color: @notebook_border;
+}
+
 printdialog > box.view.vertical.dialog-vbox > box.vertical > notebook {
     background-color: shade (@theme_bg_color, 1.1);
     border-radius: 0px 0px 4px 4px;
@@ -3625,7 +3635,7 @@
     padding: 1px;
 }
 
-/* other notebooks */
+/* closable-page */
 paned.horizontal > notebook {
     border-width: 1px 1px 1px 1px;
     border-style: solid;
@@ -3648,6 +3658,10 @@
     padding: 1px;
 }
 
+paned.horizontal > notebook > stack > box {
+    background-color: shade (@theme_bg_color, 1.1);
+}
+
 /* tabs in dialog windows */
 /* horizontal tabs */
 window.background > box.vertical > notebook > header.top tab, /* pavu-control */
@@ -3967,14 +3981,9 @@
  * GtkAssistant *
  ****************/
 
-assistant .sidebar highlight {
-    color: @theme_text_color;
-    font-weight: bold;
-}
-
 assistant .sidebar {
     padding: 5px;
-    background-color: shade (@theme_bg_color, 0.97);
+    background-color: @sidebar_background;
     border-width: 0px 1px 0px 0px;
     border-radius: 0px;
     border-style: solid;
@@ -3982,6 +3991,12 @@
     color: mix (@theme_fg_color, @theme_bg_color, 0.40);
 }
 
+assistant .sidebar highlight,
+assistant .sidebar label.highlight { /* ie. caja-actions import dialog */
+    color: @theme_text_color;
+    font-weight: bold;
+}
+
 /**********
  * Switch *
  **********/
@@ -4926,20 +4941,9 @@
     padding: 0;
 }
 
-/* ie. mate-keyboard-properties option window or pluma preferences */
-dialog notebook.frame box.vertical > box.vertical > scrolledwindow.frame,
-dialog notebook.frame box.vertical > box.vertical > box.horizontal box.vertical > scrolledwindow.frame {
-    border-color: @notebook_border;
-    border-style: solid;
-    border-width: 1px;
-    border-radius: 2px;
-}
-
 /* ie. caja properties-window notes tab */
-dialog notebook.frame scrolledwindow.frame {
+dialog notebook.frame > stack > scrolledwindow.frame {
     border-style: none;
-    border-width: 0px;
-    border-radius: 0px;
 }
 
 /* credits in GtkAbout windows */
@@ -5018,6 +5022,7 @@
 .dialog-action-area.linked > button.text-button:disabled:last-child {
     border-width: 1px;
     border-image-width: 1px;
+    border-radius: 6px;
 }
 
 .dialog-action-area.linked > button.text-button {
@@ -5082,14 +5087,16 @@
 .view.dim-label,
 .dim-label,
 .dim-label:hover,
-.dim-label:focus {
+.dim-label:focus,
+list row.activatable .dim-label {
     color: mix (@theme_fg_color, @theme_bg_color, 0.27);
     text-shadow: none;
 }
 
 .dim-label:selected,
-.dim-label:selected:focus {
-    color: @theme_selected_fg_color;
+.dim-label:selected:focus,
+list row.activatable:selected .dim-label {
+    color: shade (@theme_selected_fg_color, 0.7);
     text-shadow: none;
 }
 
@@ -5666,6 +5673,18 @@
                 inset  0px -1px @insensitive_border_color;
 }
 
+popover > box > button.text-button,
+popover > box > button.text-button:hover,
+popover > box > button.text-button:focus { /* ie. gedit menu button popover */
+    padding: 6px;
+}
+
+popover > box > button.text-button { /* ie. gedit menu button popover */
+    background-image: none;
+    color: @theme_fg_dark_color;
+    border-radius: 6px;
+}
+
 modelbutton.flat,
 .linked button.image-button.model {
     min-height: 24px;
@@ -5686,7 +5705,7 @@
 modelbutton.flat:only-child {
     background-image: none;
     color: @theme_fg_dark_color;
-    border-radius: 4px;
+    border-radius: 6px;
     padding: 6px 0px 6px 6px;
 }
 
@@ -5714,14 +5733,15 @@
 modelbutton.flat:only-child,
 modelbutton.flat:focus:only-child,
 modelbutton.flat:checked:focus:only-child,
-.linked button.image-button.model {
+.linked button.image-button.model,
+popover > box > button.text-button { /* ie. gedit menu button popover */
     background-color: shade (@theme_bg_dark_color, 1.0);
     background-image: none;
     border-color: transparent;
     border-image: none;
     border-style: none;
     box-shadow: none;
-    border-radius: 3px;
+    border-radius: 6px;
 }
 
 modelbutton.flat:checked:hover:only-child,
@@ -5747,7 +5767,12 @@
 modelbutton.flat:focus:hover:active,
 modelbutton.flat:hover:active,
 modelbutton.flat:hover,
-modelbutton.flat:selected {
+modelbutton.flat:selected,
+popover > box > button.text-button:hover,
+popover > box > button.text-button:checked,
+popover > box > button.text-button:hover:active,
+popover > box > button.text-button:checked:hover,
+popover > box > button.text-button:checked:hover:active {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@menu_bg_dark_color, 2.03)),
@@ -5823,6 +5848,10 @@
     border-radius: 0 6px 6px 0;
 }
 
+popover > box > button.text-button:disabled {
+    color: mix (@menu_fg_dark_color, @menu_bg_dark_color, 0.4);
+}
+
 popover button.default.text-button.suggested-action {
     background-image: none;
     color: @theme_fg_dark_color;
@@ -5881,27 +5910,46 @@
  ***************/
 
 headerbar,
-.titlebar {
-    border-width: 0 0 1px;
-    border-style: solid;
-    border-color: shade(@borders, 0.90);
-    border-radius: 7px 7px 0px 0px;
-    box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
+.background.ssd > paned.horizontal.titlebar,
+.background.csd > paned.horizontal.titlebar,
+.background.solid-csd > paned.horizontal.titlebar {
     background-color: @theme_bg_dark_color;
-    padding: 6px 6px 5px 6px;
-    text-shadow: 0 1px @wm_title_shadow;
     background-image: linear-gradient(to bottom,
                                       @wm_bg_a,
                                       @wm_bg_b);
+    box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
 }
 
-/* fix for gedit, .titlebar does not match headerbar selector */
+headerbar.titlebar,
+.background.ssd > paned.horizontal.titlebar,
 .background.csd > paned.horizontal.titlebar,
 .background.solid-csd > paned.horizontal.titlebar {
-    background-color: transparent;
-    padding: 0px;
-    margin: -2px -2px -2px -2px;
-    border-width: 0px;
+    border-width: 0px 0px 1px 0px;
+    border-style: solid;
+    border-color: shade(@borders, 0.90);
+    border-radius: 7px 7px 0px 0px;
+    padding: 6px 6px 5px 6px;
+}
+
+/* fix for gedit, .titlebar does not match headerbar selector */
+.background.ssd > paned.horizontal.titlebar > headerbar,
+.background.csd > paned.horizontal.titlebar > headerbar,
+.background.solid-csd > paned.horizontal.titlebar > headerbar {
+    box-shadow: none;
+}
+
+.background.ssd > paned.horizontal.titlebar > separator, /* gedit */
+.background.csd > paned.horizontal.titlebar > separator,
+.background.solid-csd > paned.horizontal.titlebar > separator {
+    min-width: 1px;
+    background-color: shade(@menu_fg_dark_color, 0.3);
+    border-image: -gtk-gradient (linear,
+                                 left top, right top,
+                                 from (alpha (#000, 0.00)),
+                                 color-stop (0.25, alpha (#000, 0.03)),
+                                 color-stop (0.85, alpha (#000, 0.03)),
+                                 to (alpha (#000, 0.00))) 1;
+    border-style: solid;
 }
 
 /* ie. meld */
@@ -5911,8 +5959,7 @@
 	padding:  4px 6px 5px 6px;
 }
 
-headerbar:backdrop,
-.titlebar:backdrop {
+headerbar.titlebar:backdrop {
     border-image: linear-gradient(to top,
                                   @unfocused_borders,
                                   @unfocused_borders 1px,
@@ -6020,7 +6067,10 @@
 
 headerbar button:disabled,
 headerbar button:disabled:last-child,
-headerbar button:disabled:first-child {
+headerbar button:disabled:first-child,
+headerbar .linked button:disabled,
+headerbar .linked button:disabled:last-child,
+headerbar .linked button:disabled:first-child {
     color: @theme_text_dark_color;
     background-image: none;
     background-color: @theme_bg_dark_color;
@@ -6036,6 +6086,10 @@
     -gtk-icon-shadow: none;
 }
 
+headerbar.titlebar .linked button.image-button:disabled {
+    box-shadow: none;
+}
+
 headerbar > button.text-button:hover,
 headerbar > button.text-button:focus,
 headerbar > button.text-button,
@@ -6630,10 +6684,16 @@
  * GtkStack *
  ************/
 
-stack .horizontal .vertical frame {
+stack > .horizontal > .vertical > frame > border {
     background-color: shade (@theme_bg_color, 1.1);
-    border-width: 1px;
-    border-color: @notebook_border;
+    border-radius: 4px;
+}
+
+stacksidebar.sidebar,
+stacksidebar.sidebar > scrolledwindow,
+stacksidebar.sidebar > scrolledwindow > viewport.frame,
+stacksidebar.sidebar > scrolledwindow > viewport.frame list {
+    border-radius: 4px 0px 0px 4px;
 }
 
 stacksidebar.sidebar list row.activatable:hover {
@@ -6868,7 +6928,7 @@
 
 printdialog.background paper {
     border-style: solid;
-    border-width: 1px;
+    border-width: 0.9px;
     border-radius: 0px;
     border-color: @notebook_border;
     background-color: @theme_base_color;
diff -Nru mate-themes-3.22.6/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css mate-themes-3.22.11/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css
--- mate-themes-3.22.6/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Blue-Submarine/gtk-3.0/mate-applications.css	2017-05-11 10:26:34.000000000 +0200
@@ -15,6 +15,11 @@
     padding: 0px;
 }
 
+/* inactive-pane caja */
+.caja-notebook .view:disabled {
+    background-color: @inactive-pane_bg_color;
+}
+
 /* to avoid white pixels from base color */
 .caja-notebook {
     background-color: @theme_bg_color;
@@ -183,13 +188,7 @@
 }
 
 /* arrow button */
-.caja-pathbar button.slider-button:focus {
-    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
-                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
-                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
-                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
-}
-
+.caja-pathbar button.slider-button:focus,
 .caja-pathbar button.slider-button:hover {
     box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),
                 inset  1px  0px shade (@theme_selected_bg_color, 1.3),
@@ -210,11 +209,13 @@
 }
 
 /* folder buttons */
+.caja-pathbar button.toggle.text-button:focus,
+.caja-pathbar button.toggle.text-button.image-button:focus,
 .caja-pathbar button.toggle.text-button:hover,
 .caja-pathbar button.toggle.text-button.image-button:hover {
     box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),
-                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
-                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
+                inset  1px  0px shade (@theme_selected_bg_color, 1.3),
+                inset -1px  0px shade (@theme_selected_bg_color, 1.3),
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);
 }
 
@@ -247,6 +248,10 @@
 /* eventbars, ie. search results */
 .caja-notebook box.vertical frame {
     background-color: shade (@theme_bg_color, 1.02);
+}
+
+/* needed as this is used for firefox locationbar */
+.caja-notebook box.vertical > frame > border {
     border-style: none;
     border-radius: 0px;
 }
@@ -256,7 +261,7 @@
     border-color: @notebook_border;
     border-width: 1px;
     border-style: solid;
-    border-radius: 4px;
+    border-radius: 4px 4px 0px 0px;
 }
 
 .caja-notebook #caja-extra-view-widget button.flat {
@@ -393,30 +398,45 @@
 }
 
 /* panel grip */
+/* FIXME, border-radius doesn't work any more */
 PanelToplevel.background {
     border-radius: 3px;
 }
 
 /* hide buttons */
-PanelToplevel > widget > button {
+/* horizontal panel */
+PanelToplevel.horizontal > grid > button:first-child {
+    border-radius: 3px 0px 0px 3px;
+}
+
+PanelToplevel.horizontal > grid > button {
+    border-radius: 0px 3px 3px 0px;
+}
+
+/* vertical panel */
+PanelToplevel.vertical > grid > button:first-child {
+    border-radius: 3px 3px 0px 0px;
+}
+
+PanelToplevel.vertical > grid > button {
+    border-radius: 0px 0px 3px 3px;
+}
+
+PanelToplevel > grid > button {
     color: @menu_fg_dark_color;
     background-image: none;
     background: transparent;
     border-style: none;
     border-radius: 3px;
     padding: 0px;
-    box-shadow: inset  0px  2px alpha(#fff, 0.11),
-                inset  2px  0px alpha(#fff, 0.09),
-                inset -2px  0px alpha(#fff, 0.09),
-                inset  0px -2px alpha(#fff, 0.07),
-                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
-                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
-                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
-                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+    box-shadow: inset  0px  1px alpha(shade(@menu_fg_dark_color, 0.70), 0.80),
+                inset  1px  0px alpha(shade(@menu_fg_dark_color, 0.70), 0.80),
+                inset -1px  0px alpha(shade(@menu_fg_dark_color, 0.70), 0.80),
+                inset  0px -1px alpha(shade(@menu_fg_dark_color, 0.70), 0.80);
 }
 
-PanelToplevel > widget > button:hover,
-PanelToplevel > widget > button:hover:active {
+PanelToplevel > grid > button:hover,
+PanelToplevel > grid > button:hover:active {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@menu_bg_dark_color, 2.03)),
@@ -671,12 +691,11 @@
 
 na-tray-applet {
     -NaTrayApplet-icon-padding: 1px; /*any more and outlines get cut off*/
-    -NaTrayApplet-icon-size: 16;
 }
 
 /* remove right space a bit */
 na-tray-applet > widget > box {
-    margin: 0px 3px 0px 0px;
+    margin: 1px 3px 1px 1px;
 }
 
 /* system-monitor-applet */
@@ -697,17 +716,20 @@
 
 .mate-panel-applet-slider frame {
     background-color: rgba(0,0,0,0.5);
-    border-image: none;
-    border-style: none;
-    border-radius:4px;
     padding: 1px;
     margin: 0px;
+    border-radius:4px;
     box-shadow: inset  0px  1px shade (@theme_selected_bg_color, 1.3),
                 inset  1px  0px shade (@theme_selected_bg_color, 1.3),
                 inset -1px  0px shade (@theme_selected_bg_color, 1.3),
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);
 }
 
+.mate-panel-applet-slider frame border {
+    border-image: none;
+    border-style: none;
+}
+
 .mate-panel-applet-slider frame frame {
     background-color:transparent;
     box-shadow: none;
@@ -736,7 +758,8 @@
                                      to   (alpha(shade(@menu_bg_dark_color, 0.57) ,0.6)));
 }
 
-/* mate-menu */
+/* mate-menu, mintmenu */
+#mintmenu.background,
 #mate-menu.background {
     background-color: @menu_bg_dark_color;
     background-image: -gtk-gradient (linear,
@@ -749,6 +772,8 @@
     border-radius:2px;
 }
 
+#mintmenu.background viewport,
+#mintmenu.background > widget > box > widget > box,
 #mate-menu.background viewport,
 #mate-menu.background > widget > box > widget > box {
     background-color: @menu_bg_dark_color;
@@ -758,6 +783,8 @@
                                      to   (shade(@menu_bg_dark_color, 0.97)));
 }
 
+#mintmenu.background viewport,
+#mintmenu.background notebook,
 #mate-menu.background viewport,
 #mate-menu.background notebook  {
     color: @menu_fg_dark_color;
@@ -766,6 +793,7 @@
     border-style: none;
 }
 
+#mintmenu.background scrolledwindow,
 #mate-menu.background scrolledwindow {
     border-color: shade(@menu_fg_dark_color, 0.3);
     border-width: 1px;
@@ -773,7 +801,13 @@
     border-radius: 0px;
 }
 
-#mate-menu.background label,
+#mintmenu.background label,
+#mate-menu.background label {
+    color: @menu_fg_dark_color;
+}
+
+#mintmenu.background button,
+#mintmenu.background button.flat,
 #mate-menu.background button,
 #mate-menu.background button.flat {
     color: @menu_fg_dark_color;
@@ -782,12 +816,23 @@
     box-shadow: none;
 }
 
+#mintmenu.background viewport button:not(.flat) label,
+#mintmenu.background button:hover label,
+#mintmenu.background viewport button:not(.flat),
+#mintmenu.background button:hover,
+#mintmenu.background button.flat:hover,
+#mate-menu.background viewport button:not(.flat) label,
 #mate-menu.background button:hover label,
+#mate-menu.background viewport button:not(.flat),
 #mate-menu.background button:hover,
 #mate-menu.background button.flat:hover {
     color: shade (@theme_selected_bg_color, 2.0);
 }
 
+#mintmenu.background viewport button:not(.flat),
+#mintmenu.background button:hover,
+#mintmenu.background button.flat:hover,
+#mate-menu.background viewport button:not(.flat),
 #mate-menu.background button:hover,
 #mate-menu.background button.flat:hover {
     background-image: -gtk-gradient (linear,
@@ -800,11 +845,14 @@
                 inset  0px -1px shade (@theme_selected_bg_color, 1.3);
 }
 
+#mintmenu.background button,
+#mintmenu.background button.flat,
 #mate-menu.background button,
 #mate-menu.background button.flat {
     padding: 4px;
 }
 
+#mintmenu.background separator,
 #mate-menu.background separator {
     border-width: 1px 0px 0px 0px;
     min-height: 1px;
@@ -817,16 +865,19 @@
                                  to (alpha (#000, 0.00))) 1;
 }
 
+#mintmenu.background scrollbar,
 #mate-menu.background scrollbar {
     background-image: none;
     border-style: solid;
     border-color: shade(@menu_fg_dark_color, 0.3);
 }
 
+#mintmenu.background scrollbar.vertical trough,
 #mate-menu.background scrollbar.vertical trough {
     background-image: none;
 }
 
+#mintmenu.background scrollbar.vertical slider,
 #mate-menu.background scrollbar.vertical slider {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@menu_bg_dark_color, 1.75)),
@@ -834,6 +885,8 @@
     border-color: shade(@menu_fg_dark_color, 0.3);
 }
 
+#mintmenu.background scrollbar.vertical slider:hover,
+#mintmenu.background scrollbar.vertical slider:hover:active,
 #mate-menu.background scrollbar.vertical slider:hover,
 #mate-menu.background scrollbar.vertical slider:hover:active {
     background-image: -gtk-gradient (linear, left top, left bottom,
@@ -842,6 +895,8 @@
     border-color: shade(@menu_fg_dark_color, 0.3);
 }
 
+#mintmenu.background scrollbar.vertical.fine-tune slider:hover:active,
+#mintmenu.background scrollbar.vertical.fine-tune .slider:hover:active,
 #mate-menu.background scrollbar.vertical.fine-tune slider:hover:active,
 #mate-menu.background scrollbar.vertical.fine-tune .slider:hover:active {
     background-image: url("assets/slider_fine_vertical.svg"),
@@ -854,15 +909,18 @@
     border-color: shade(@menu_fg_dark_color, 0.3);
 }
 
+#mintmenu.background scrollbar.vertical button,
 #mate-menu.background scrollbar.vertical button {
     padding: 0px;
 }
 
+#mintmenu.background scrollbar.vertical button:disabled,
 #mate-menu.background scrollbar.vertical button:disabled {
     background-color: transparent;
     color: shade (@insensitive_fg_color, 0.6);
 }
 
+#mintmenu.background entry,
 #mate-menu.background entry {
     background-color: transparent;
     background-image: -gtk-gradient(linear,
@@ -874,6 +932,8 @@
     color: shade (@menu_fg_dark_color, 1.0);
 }
 
+#mintmenu.background entry,
+#mintmenu.background entry:focus,
 #mate-menu.background entry,
 #mate-menu.background entry:focus {
     box-shadow: inset  0px  1px shade(@menu_fg_dark_color, 0.3),
@@ -884,12 +944,24 @@
 	caret-color: shade (@menu_fg_dark_color, 1.0);
 }
 
+#mintmenu.background entry selection,
+#mintmenu.background entry selection:focus,
 #mate-menu.background entry selection,
 #mate-menu.background entry selection:focus {
     background-color: shade(@menu_fg_dark_color, 0.4);
     color: shade (@menu_fg_dark_color, 1.2);
 }
 
+#mintmenu.background entry menuitem:hover label,
+#mate-menu.background entry menuitem:hover label {
+    color: shade (@theme_selected_bg_color, 2.0);
+}
+
+#mintmenu.background entry menuitem:disabled label,
+#mate-menu.background entry menuitem:disabled label {
+    color: mix (@menu_fg_dark_color, @menu_bg_dark_color, 0.4);
+}
+
 /****************
  * Mate-terminal *
  ****************/
@@ -898,6 +970,22 @@
     border-color: @menu_bg_dark_color;
 }
 
+/* override for pavu-control */
+window.background.mate-terminal > box.vertical > notebook,
+window.background.mate-terminal > box.vertical > notebook > header.top,
+window.background.mate-terminal > box.vertical > notebook > stack > box {
+    border-style: none;
+    border-width: 0px;
+}
+
+window.background.mate-terminal > box.vertical > notebook > header.top tab,
+window.background.mate-terminal > box.vertical > notebook > header.top tab:hover,
+window.background.mate-terminal > box.vertical > notebook > header.top tab:checked,
+window.background.mate-terminal > box.vertical > notebook > header.top tab:checked:hover {
+    margin: 0px -1px 0px -1px;
+    border-width: 1px 1px 0 1px;
+}
+
 vte-terminal {
     -TerminalWindow-background-darkness: 0.95;
     background-color: @terminal_background_color;
@@ -1063,6 +1151,14 @@
     border-image: none;
     border-radius: 6px;
     padding: 4px;
+    outline-style: solid;
+    outline-color: shade (@theme_selected_bg_color, 1.3);
+    -gtk-outline-radius: 5px;
+    outline-offset: -2px;
+}
+
+#MyControlCenter button.flat:focus {
+    box-shadow: none;
 }
 
 /*********
@@ -1185,7 +1281,7 @@
     background-color: @theme_dark_dialog_bg_color;
 }
 
-.lock-dialog frame {
+.lock-dialog frame border {
     border-radius: 10px;
     border-style: none;
     border-width: 0px;
@@ -1215,8 +1311,7 @@
     caret-color: shade (@theme_text_dark_color, 1.0);
 }
 
-.lock-dialog button,
-.lock-dialog button:focus {
+.lock-dialog button {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@bg_dark_color, 2.03)),
@@ -1227,7 +1322,8 @@
 
 .lock-dialog button:hover,
 .lock-dialog button.default,
-.lock-dialog button:hover:active {
+.lock-dialog button:hover:active,
+.lock-dialog button:focus {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@bg_dark_color, 2.03)),
@@ -1310,13 +1406,16 @@
 	border-radius: 3px;
 }
 
-/*****************
- * mate-terminal *
- *****************/
+/* mate-keyboard-layout-view, mate-keyboard-layout-chooser */
+/* this way it styles only the border of the keys, the bg of the map itself
+   use the .view class, and use old and new selectors for a while */
+matekbd-keyboard-drawing,
+.gswitchit-layout-view > box.dialog-vbox > box.vertical > widget,
+#xkb-layout-chooser > box.dialog-vbox > box.vertical > box.vertical > frame > widget {
+    background-color: shade (@theme_bg_color, 1.0);
+}
 
-/* override for pavu-control */
-window.background.mate-terminal > box.vertical > notebook {
-    border-style: none;
-    border-width: 0px;
+#xkb-layout-chooser > box.dialog-vbox > box.vertical > box.vertical > frame > border {
+    border-radius: 0px;
 }
 
diff -Nru mate-themes-3.22.6/desktop-themes/Blue-Submarine/metacity-1/metacity-theme-1.xml mate-themes-3.22.11/desktop-themes/Blue-Submarine/metacity-1/metacity-theme-1.xml
--- mate-themes-3.22.6/desktop-themes/Blue-Submarine/metacity-1/metacity-theme-1.xml	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Blue-Submarine/metacity-1/metacity-theme-1.xml	2017-05-11 10:26:34.000000000 +0200
@@ -11,9 +11,9 @@
 </info>
  
 <frame_geometry name="normal" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="false" rounded_bottom_right="false">
-  <distance name="left_width" value="2"/>
-  <distance name="right_width" value="2"/>
-  <distance name="bottom_height" value="2"/>
+  <distance name="left_width" value="3"/>
+  <distance name="right_width" value="3"/>
+  <distance name="bottom_height" value="3"/>
   <distance name="left_titlebar_edge" value="4"/>
   <distance name="right_titlebar_edge" value="4"/>
   <aspect_ratio name="button" value="1"/>
@@ -35,9 +35,9 @@
 </frame_geometry>
 
 <frame_geometry name="border" has_title="false" rounded_top_left="true" rounded_top_right="true"  rounded_bottom_left="false" rounded_bottom_right="false">
-  <distance name="left_width" value="2"/>
-  <distance name="right_width" value="2"/>
-  <distance name="bottom_height" value="2"/>
+  <distance name="left_width" value="3"/>
+  <distance name="right_width" value="3"/>
+  <distance name="bottom_height" value="3"/>
   <distance name="left_titlebar_edge" value="0"/>
   <distance name="right_titlebar_edge" value="0"/>
   <distance name="button_width" value="0"/>
@@ -51,23 +51,22 @@
 <constant name="ButtonIPad" value="3"/>
 
 <draw_ops name="inner_window_border">
-  <gradient type="vertical" x="left_width-1" y="top_height-1" width="1" height="height-bottom_height-top_height+2">
+  <gradient type="vertical" x="0" y="top_height-1" width="3" height="height-bottom_height-top_height+2">
+    <color value="#303030"/>
+    <color value="#303030"/>
     <color value="#303030"/>
-    <color value="#CBD5D9"/>
-    <color value="#CBD5D9"/>
   </gradient>
-  <gradient type="vertical" x="width-right_width" y="top_height-1" width="1" height="height-bottom_height-top_height+2">
+  <gradient type="vertical" x="width-right_width" y="top_height-1" width="3" height="height-bottom_height-top_height+2">
+    <color value="#303030"/>
+    <color value="#303030"/>
     <color value="#303030"/>
-    <color value="#CBD5D9"/>
-    <color value="#CBD5D9"/>
   </gradient>
 
-	<line color="#303030" 
-	x1="left_width" y1="top_height-1" x2="width-right_width"
-	y2="top_height-1" />
-	<line color="#CBD5D9"
-	x1="left_width" y1="height-bottom_height" x2="width-right_width"
-	y2="height-bottom_height" />
+  <gradient type="horizontal" x="0" y="height-bottom_height" width="width" height="3">
+    <color value="#303030"/>
+    <color value="#303030"/>
+    <color value="#303030"/>
+  </gradient>
 </draw_ops>
 
 <!-- ** stripes ** -->
diff -Nru mate-themes-3.22.6/desktop-themes/ContrastHighInverse/gtk-3.0/assets/bullet-symbolic.svg mate-themes-3.22.11/desktop-themes/ContrastHighInverse/gtk-3.0/assets/bullet-symbolic.svg
--- mate-themes-3.22.6/desktop-themes/ContrastHighInverse/gtk-3.0/assets/bullet-symbolic.svg	1970-01-01 01:00:00.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/ContrastHighInverse/gtk-3.0/assets/bullet-symbolic.svg	2017-05-11 10:26:34.000000000 +0200
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb";
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   sodipodi:docname="bullet-symbolic.svg"
+   inkscape:export-filename="/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   height="14"
+   id="svg7384"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   width="14">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer9"
+     inkscape:cx="9.6493349"
+     inkscape:cy="5.5864571"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:object-nodes="true"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#3a3b39"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="true"
+     showgrid="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="false"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-height="1016"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1920"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:zoom="22.005438"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       dotted="false"
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       originx="-139.99995"
+       originy="120"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386">
+    <linearGradient
+       gradientTransform="matrix(-2.7365795,0.28202934,-0.18908311,-0.99988321,239.54008,-879.45557)"
+       id="linearGradient19282"
+       osb:paint="solid">
+      <stop
+         id="stop19284"
+         offset="0"
+         style="stop-color:#666666;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline"
+     transform="translate(-381.00015,-339)">
+    <path
+       inkscape:connector-curvature="0"
+       d="m 388.00015,343.01754 c -1.64587,0 -2.98246,1.33658 -2.98246,2.98246 0,1.64587 1.33659,2.98246 2.98246,2.98246 1.64587,0 2.98246,-1.33659 2.98246,-2.98246 0,-1.64588 -1.33659,-2.98246 -2.98246,-2.98246 z"
+       id="path9555"
+       sodipodi:nodetypes="csssc"
+       style="color:#bebebe;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:'Andale Mono';text-indent:0pt;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.78125;marker:none" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices"
+     style="display:inline"
+     transform="translate(-381.00015,-339)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps"
+     transform="translate(-381.00015,-339)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places"
+     style="display:inline"
+     transform="translate(-381.00015,-339)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes"
+     transform="translate(-381.00015,-339)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline"
+     transform="translate(-381.00015,-339)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g71291"
+     inkscape:label="emotes"
+     style="display:inline"
+     transform="translate(-381.00015,-339)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline"
+     transform="translate(-381.00015,-339)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-381.00015,-339)" />
+</svg>
Binary files /tmp/gYCAmB6x9p/mate-themes-3.22.6/desktop-themes/ContrastHighInverse/gtk-3.0/assets/bullet-symbolic.symbolic.png and /tmp/gxVAZgmenr/mate-themes-3.22.11/desktop-themes/ContrastHighInverse/gtk-3.0/assets/bullet-symbolic.symbolic.png differ
diff -Nru mate-themes-3.22.6/desktop-themes/ContrastHighInverse/gtk-3.0/assets/check-symbolic.svg mate-themes-3.22.11/desktop-themes/ContrastHighInverse/gtk-3.0/assets/check-symbolic.svg
--- mate-themes-3.22.6/desktop-themes/ContrastHighInverse/gtk-3.0/assets/check-symbolic.svg	1970-01-01 01:00:00.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/ContrastHighInverse/gtk-3.0/assets/check-symbolic.svg	2017-05-11 10:26:34.000000000 +0200
@@ -0,0 +1,154 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb";
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   sodipodi:docname="check-symbolic.svg"
+   inkscape:export-filename="/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   height="14"
+   id="svg7384"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   width="14">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer9"
+     inkscape:cx="-15.966869"
+     inkscape:cy="8.8415069"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:object-nodes="true"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#3a3b39"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="true"
+     showgrid="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="false"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-height="1016"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1920"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:zoom="15.238496"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       dotted="false"
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       originx="-159.99995"
+       originy="120"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386">
+    <linearGradient
+       gradientTransform="matrix(-2.7365795,0.28202934,-0.18908311,-0.99988321,239.54008,-879.45557)"
+       id="linearGradient19282"
+       osb:paint="solid">
+      <stop
+         id="stop19284"
+         offset="0"
+         style="stop-color:#666666;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline;opacity:1"
+     transform="translate(-401.00015,-339)">
+    <path
+       style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:Sans;-inkscape-font-specification:Sans;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;baseline-shift:baseline;text-anchor:start;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:3;marker:none;enable-background:accumulate"
+       d="m 415.00015,339.98047 -6.5,6.39453 -2.9375,-2.9375 -2.125,2.125 5.0625,5.0625 6.5,-6.60547 0,-4.03906 z"
+       id="path8913-6-7-1-5-1"
+       inkscape:connector-curvature="0" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices"
+     style="display:inline"
+     transform="translate(-401.00015,-339)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps"
+     transform="translate(-401.00015,-339)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places"
+     style="display:inline"
+     transform="translate(-401.00015,-339)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes"
+     transform="translate(-401.00015,-339)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline"
+     transform="translate(-401.00015,-339)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g71291"
+     inkscape:label="emotes"
+     style="display:inline"
+     transform="translate(-401.00015,-339)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline"
+     transform="translate(-401.00015,-339)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-401.00015,-339)" />
+</svg>
Binary files /tmp/gYCAmB6x9p/mate-themes-3.22.6/desktop-themes/ContrastHighInverse/gtk-3.0/assets/check-symbolic.symbolic.png and /tmp/gxVAZgmenr/mate-themes-3.22.11/desktop-themes/ContrastHighInverse/gtk-3.0/assets/check-symbolic.symbolic.png differ
diff -Nru mate-themes-3.22.6/desktop-themes/ContrastHighInverse/gtk-3.0/assets/dash-symbolic.svg mate-themes-3.22.11/desktop-themes/ContrastHighInverse/gtk-3.0/assets/dash-symbolic.svg
--- mate-themes-3.22.6/desktop-themes/ContrastHighInverse/gtk-3.0/assets/dash-symbolic.svg	1970-01-01 01:00:00.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/ContrastHighInverse/gtk-3.0/assets/dash-symbolic.svg	2017-05-11 10:26:34.000000000 +0200
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:osb="http://www.openswatchbook.org/uri/2009/osb";
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   sodipodi:docname="dash-symbolic.svg"
+   inkscape:export-filename="/home/sam/dev/RESOURCES/gnome-icon-theme-symbolic/src/gnome-stencils.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"
+   height="14"
+   id="svg7384"
+   version="1.1"
+   inkscape:version="0.91 r13725"
+   width="14">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:bbox-nodes="true"
+     inkscape:bbox-paths="true"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer9"
+     inkscape:cx="6.8118913"
+     inkscape:cy="7.9276321"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:object-nodes="true"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#3a3b39"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="true"
+     showgrid="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="false"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-height="1016"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1920"
+     inkscape:window-x="0"
+     inkscape:window-y="27"
+     inkscape:zoom="25.058754"
+     inkscape:showpageshadow="false">
+    <inkscape:grid
+       dotted="false"
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       originx="-159.99995"
+       originy="140"
+       snapvisiblegridlinesonly="true"
+       spacingx="1px"
+       spacingy="1px"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386">
+    <linearGradient
+       gradientTransform="matrix(-2.7365795,0.28202934,-0.18908311,-0.99988321,239.54008,-879.45557)"
+       id="linearGradient19282"
+       osb:paint="solid">
+      <stop
+         id="stop19284"
+         offset="0"
+         style="stop-color:#666666;stop-opacity:1;" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline"
+     transform="translate(-401.00015,-359)">
+    <path
+       style="color:#000000;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;opacity:1;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:4;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate"
+       d="m 405.00021,364 5.99999,0 c 1.108,0 2,0.892 2,2 0,1.108 -0.892,2 -2,2 l -5.99999,0 c -1.108,0 -2,-0.892 -2,-2 0,-1.108 0.892,-2 2,-2 z"
+       id="rect3346" />
+  </g>
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices"
+     style="display:inline"
+     transform="translate(-401.00015,-359)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps"
+     transform="translate(-401.00015,-359)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places"
+     style="display:inline"
+     transform="translate(-401.00015,-359)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes"
+     transform="translate(-401.00015,-359)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline"
+     transform="translate(-401.00015,-359)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g71291"
+     inkscape:label="emotes"
+     style="display:inline"
+     transform="translate(-401.00015,-359)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline"
+     transform="translate(-401.00015,-359)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-401.00015,-359)" />
+</svg>
Binary files /tmp/gYCAmB6x9p/mate-themes-3.22.6/desktop-themes/ContrastHighInverse/gtk-3.0/assets/dash-symbolic.symbolic.png and /tmp/gxVAZgmenr/mate-themes-3.22.11/desktop-themes/ContrastHighInverse/gtk-3.0/assets/dash-symbolic.symbolic.png differ
diff -Nru mate-themes-3.22.6/desktop-themes/ContrastHighInverse/gtk-3.0/assets/Makefile.am mate-themes-3.22.11/desktop-themes/ContrastHighInverse/gtk-3.0/assets/Makefile.am
--- mate-themes-3.22.6/desktop-themes/ContrastHighInverse/gtk-3.0/assets/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/ContrastHighInverse/gtk-3.0/assets/Makefile.am	2017-05-11 10:26:34.000000000 +0200
@@ -0,0 +1,10 @@
+themedir = $(datadir)/themes/ContrastHighInverse/gtk-3.0/assets
+
+theme_DATA = \
+	bullet-symbolic.svg \
+	check-symbolic.symbolic.png \
+	bullet-symbolic.symbolic.png \
+	dash-symbolic.svg \
+	check-symbolic.svg
+
+EXTRA_DIST = $(theme_DATA)
diff -Nru mate-themes-3.22.6/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css mate-themes-3.22.11/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css
--- mate-themes-3.22.6/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css	2017-05-11 10:26:34.000000000 +0200
@@ -3553,3 +3553,12 @@
 stackswitcher button.circular {
   min-width: 0px; }
 
+/* print dialog */
+
+printdialog.background paper {
+    border-style: solid;
+    border-width: 0.9px;
+    border-radius: 0px;
+    border-color: white;
+    background-color: #737373;
+}
diff -Nru mate-themes-3.22.6/desktop-themes/ContrastHighInverse/gtk-3.0/Makefile.am mate-themes-3.22.11/desktop-themes/ContrastHighInverse/gtk-3.0/Makefile.am
--- mate-themes-3.22.6/desktop-themes/ContrastHighInverse/gtk-3.0/Makefile.am	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/ContrastHighInverse/gtk-3.0/Makefile.am	2017-05-11 10:26:34.000000000 +0200
@@ -10,4 +10,7 @@
 	other-applications.css \
 	settings.ini
 
+SUBDIRS =      \
+	assets
+
 EXTRA_DIST = $(theme_DATA)
diff -Nru mate-themes-3.22.6/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css mate-themes-3.22.11/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css
--- mate-themes-3.22.6/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/ContrastHighInverse/gtk-3.0/mate-applications.css	2017-05-11 10:26:34.000000000 +0200
@@ -56,6 +56,7 @@
    border-style: solid;
    border-width: 1px;
    border-color: @theme_fg_color;
+   color: @theme_fg_color;
    box-shadow: none;
    border-radius: 2px;
    text-shadow: none;
@@ -105,6 +106,11 @@
     box-shadow: none;
 }
 
+/* hide buttons */
+PanelToplevel > grid > button {
+    padding: 0px;
+}
+
 #PanelApplet {
     border-width: 0;
 }
@@ -220,7 +226,6 @@
 
 na-tray-applet {
     -NaTrayApplet-icon-padding: 4;
-    -NaTrayApplet-icon-size: 16;
 }
 
 /* volume applet, brightness applet */
diff -Nru mate-themes-3.22.6/desktop-themes/GreenLaguna/gtk-2.0/gtkrc mate-themes-3.22.11/desktop-themes/GreenLaguna/gtk-2.0/gtkrc
--- mate-themes-3.22.6/desktop-themes/GreenLaguna/gtk-2.0/gtkrc	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/GreenLaguna/gtk-2.0/gtkrc	2017-05-11 10:26:34.000000000 +0200
@@ -8,7 +8,7 @@
 # Based on Murrine			#
 #########################################
 
-gtk_color_scheme = "bg_color:#E9EFE7\nbg_active_color:#70816A" #bg_active_color: #e1d9d1
+#gtk_color_scheme = "bg_color:#E9EFE7\nbg_active_color:#70816A"
 
 gtk-auto-mnemonics = 1 # press alt for underline
 
@@ -70,16 +70,16 @@
 	fg[SELECTED]      = "#ffffff"
 	fg[INSENSITIVE]   = "#ADB3AB"
 
-	bg[NORMAL]        = @bg_color
+	bg[NORMAL]        = "#E9EFE7"
 	bg[PRELIGHT]      = "#F1F5F0"
 	bg[ACTIVE]        = "#D5E1D1"
-	bg[SELECTED]      = @bg_active_color # scaler trough, pressed buttons
+	bg[SELECTED]      = "#70816A" # scaler trough, pressed buttons
 	bg[INSENSITIVE]   = "#E5EBE3"
 
 	base[NORMAL]      = "#ffffff"
 	base[PRELIGHT]    = "#ffffff"
-	base[ACTIVE]      = shade (1.22, @bg_active_color)
-	base[SELECTED]    = @bg_active_color # selected text
+	base[ACTIVE]      = shade (1.22, "#70816A")
+	base[SELECTED]    = "#70816A" # selected text
 	base[INSENSITIVE] = "#E5EBE3"
 
 	text[NORMAL]      = "#000000"
@@ -120,7 +120,7 @@
 
 style "menu"
 {
-	bg[NORMAL]   = shade (0.4, @bg_color)
+	bg[NORMAL]   = shade (0.4, "#E9EFE7")
 	fg[NORMAL]   =  "#ffffff"
 	text[NORMAL] =  "#ffffff"
 
@@ -138,7 +138,7 @@
 style "menuitem"
 {
 	fg[PRELIGHT]   = "#000000"
-	bg[SELECTED]   = shade (1.08, @bg_color)
+	bg[SELECTED]   = shade (1.08, "#E9EFE7")
 
 	xthickness = 2
 	ythickness = 3
@@ -156,7 +156,7 @@
 style "menubar-menuitem"
 {
 	fg[PRELIGHT]   = "#ffffff"
-	bg[SELECTED]   = shade (0.57, @bg_color)
+	bg[SELECTED]   = shade (0.57, "#E9EFE7")
 
 	xthickness = 2
 	ythickness = 3
@@ -188,12 +188,12 @@
 	#xthickness = 3
 	#ythickness = 3
 
-	bg[NORMAL]      = shade (0.9, @bg_color) #1.0
-	bg[PRELIGHT]    = shade (1.0, @bg_color)
-	#bg[SELECTED]    = shade (1.0, @bg_color)
+	bg[NORMAL]      = shade (0.9, "#E9EFE7") #1.0
+	bg[PRELIGHT]    = shade (1.0, "#E9EFE7")
+	#bg[SELECTED]    = shade (1.0, "#E9EFE7")
 	# QT need this
 	bg[ACTIVE]      = "#ADC6A6"
-	bg[INSENSITIVE] = @bg_color
+	bg[INSENSITIVE] = "#E9EFE7"
 	fg[ACTIVE]      = "#000000"
 	fg[PRELIGHT]    = "#000000"
 	text[PRELIGHT]  = "#000000"
@@ -217,7 +217,7 @@
 {
 	#xthickness = 3
 	#ythickness = 0
-	#bg[NORMAL] = @bg_color
+	#bg[NORMAL] = "#E9EFE7"
 	engine "murrine"
 	{
 		#contrast = 0.5
@@ -228,7 +228,7 @@
 {
 	xthickness = 3
 	#ythickness = 0
-	#bg[NORMAL] = @bg_color
+	#bg[NORMAL] = "#E9EFE7"
 	engine "murrine"
 	{
 		gradient_shades = {0.8, 0.9, 1.0, 1.06}
@@ -240,7 +240,7 @@
 {
 	xthickness = 0
 	ythickness = 0
-	bg[SELECTED] = shade (0.75, @bg_color)	# sets the progressbar color
+	bg[SELECTED] = shade (0.75, "#E9EFE7")	# sets the progressbar color
 
 	engine "murrine" 
 	{
@@ -274,9 +274,9 @@
 
 style "murrine-scale"
 {
-	bg[NORMAL]      = shade (0.95, @bg_color)
-	bg[PRELIGHT]    = shade (1.1, @bg_color)
-	bg[INSENSITIVE] = shade (0.99, @bg_color)
+	bg[NORMAL]      = shade (0.95, "#E9EFE7")
+	bg[PRELIGHT]    = shade (1.1, "#E9EFE7")
+	bg[INSENSITIVE] = shade (0.99, "#E9EFE7")
 
 	engine "murrine"
 	{
@@ -295,16 +295,16 @@
 {
 	GtkScrollbar::slider-width = 11
 
-	bg[NORMAL]      = shade (1.0, @bg_color)
-	bg[PRELIGHT]    = shade (1.05, @bg_color)
-	bg[ACTIVE]	= shade (1.05, @bg_color)
-	bg[INSENSITIVE]	= shade (0.99, @bg_color)
+	bg[NORMAL]      = shade (1.0, "#E9EFE7")
+	bg[PRELIGHT]    = shade (1.05, "#E9EFE7")
+	bg[ACTIVE]	= shade (1.05, "#E9EFE7")
+	bg[INSENSITIVE]	= shade (0.99, "#E9EFE7")
 
 	engine "murrine"
 	{
 		#rgba = FALSE
 		border_shades = {0.8, 0.8} # draw a gradient on the border.
-		border_colors = { @bg_color, @bg_color }
+		border_colors = { "#E9EFE7", "#E9EFE7" }
 		#contrast = 1.0
 		glow_shade = 1.14   # sets glow amount for buttons or widgets
 		glowstyle = 0    # 0=top, 1=bottom, 2=top and bottom, 3=center (vertical), 4=center (horizontal) 
@@ -327,9 +327,9 @@
 
 style "murrine-radiocheck"
 {
-	bg[SELECTED] = shade (0.8, @bg_color)
-	bg[PRELIGHT] = shade (0.94, @bg_color)
-	bg[ACTIVE]   = shade (0.7, @bg_color)  # for Synaptic
+	bg[SELECTED] = shade (0.8, "#E9EFE7")
+	bg[PRELIGHT] = shade (0.94, "#E9EFE7")
+	bg[ACTIVE]   = shade (0.7, "#E9EFE7")  # for Synaptic
 	fg[ACTIVE]   = "#000000"  # for Synaptic
 	fg[PRELIGHT] = "#000000"  # for Synaptic
 
@@ -384,8 +384,8 @@
 #	bg[NORMAL]   = "#5A6C5F"  # for the (dark) Ambiance background
 	bg[PRELIGHT] = "#AEC6A6" #for the (light) Ambiance background
 #	bg[PRELIGHT] = "#C7E3BE" #for the (dark) Ambiance background
-	bg[SELECTED] = shade (0.6, @bg_color)  # to be compatible with menus
-#	bg[SELECTED] = shade (1.08, @bg_color)  # to be compatible with menus (dark) Ambiance background
+	bg[SELECTED] = shade (0.6, "#E9EFE7")  # to be compatible with menus
+#	bg[SELECTED] = shade (1.08, "#E9EFE7")  # to be compatible with menus (dark) Ambiance background
 	fg[NORMAL]   = "#000000"  # for light panel
 #	fg[NORMAL]   = "#FFFFFF"  # for dark panel
 #	fg[PRELIGHT] = "#000000"  # for dark panel
@@ -408,7 +408,7 @@
 	engine "murrine"
 	{
 		border_shades = {1.5, 1.2}
-		focus_color = shade (0.48, @bg_color)
+		focus_color = shade (0.48, "#E9EFE7")
 		contrast = 0.8
 	}
 }
@@ -425,7 +425,7 @@
 	{
 		#rgba = FALSE
 		border_shades = {1.5, 1.2}
-		focus_color = shade (0.48, @bg_color)
+		focus_color = shade (0.48, "#E9EFE7")
 		contrast = 0.8
 	}
 }
@@ -444,10 +444,10 @@
 {
 	#bg[ACTIVE]   = "#D0C9C2"
 	#bg[NORMAL]   = "#f5f2ef"
-	#bg[SELECTED] = @bg_color
+	#bg[SELECTED] = "#E9EFE7"
 
-	bg[NORMAL] = shade (1.0, @bg_color)	# selected tab entire
-	bg[ACTIVE] = shade (0.87, @bg_color)	# unselected tab
+	bg[NORMAL] = shade (1.0, "#E9EFE7")	# selected tab entire
+	bg[ACTIVE] = shade (0.87, "#E9EFE7")	# unselected tab
 
 	xthickness = 3
 	ythickness = 3
@@ -484,10 +484,10 @@
 	ChromeGtkFrame::inactive-frame-color = "#A3B39E" #lighter(@fg_color)
 
 	ChromeGtkFrame::frame-gradient-size = 10
-	ChromeGtkFrame::frame-gradient-color = @bg_color
+	ChromeGtkFrame::frame-gradient-color = "#E9EFE7"
 
-	ChromeGtkFrame::scrollbar-trough-color = @bg_color
-	ChromeGtkFrame::scrollbar-slider-prelight-color = "#B8C5B4"  #@bg_active_color
+	ChromeGtkFrame::scrollbar-trough-color = "#E9EFE7"
+	ChromeGtkFrame::scrollbar-slider-prelight-color = "#B8C5B4"  #"#70816A"
 	ChromeGtkFrame::scrollbar-slider-normal-color = "#A3B39E"
 }
 
diff -Nru mate-themes-3.22.6/desktop-themes/GreenLaguna/gtk-3.0/gnome-applications.css mate-themes-3.22.11/desktop-themes/GreenLaguna/gtk-3.0/gnome-applications.css
--- mate-themes-3.22.6/desktop-themes/GreenLaguna/gtk-3.0/gnome-applications.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/GreenLaguna/gtk-3.0/gnome-applications.css	2017-05-11 10:26:34.000000000 +0200
@@ -63,26 +63,45 @@
     text-shadow: none;
 }
 
+/* nautilus view */
+.nautilus-window > grid > paned.horizontal scrolledwindow {
+    background-color: shade(@base_color, 1.04);
+    -gtk-icon-style: regular;
+    border-style: solid;
+    border-color: alpha(@frame_color, 0.6);
+    border-width: 0px 1px 1px 1px;
+    border-radius: 2px;
+    padding: 0;
+}
+
+/* sidebar */
+.nautilus-window placessidebar.sidebar.frame {
+    border-width: 0px 1px 1px 1px;
+}
+
 /*********
  * Gedit *
  *********/
 
-.gedit-side-panel-paned {
-    margin: 0px -2px 0px -2px;
-}
-
-.gedit-side-panel-paned viewport.frame {
+.gedit-side-panel-paned scrolledwindow {
     border-width: 0px 1px 1px 1px;
     border-style: solid;
     border-color: alpha(@frame_color, 0.6);
 }
 
+/* file-browser */
+.gedit-side-panel-paned > box > stack > grid > scrolledwindow {
+    border-width: 1px;
+}
+
 .gedit-bottom-panel-paned > grid > notebook scrolledwindow {
     background-color: shade(@base_color, 1.04);
     border-style: solid;
     border-color: alpha(@frame_color, 0.6);
     border-width: 0px 1px 1px 1px;
     border-radius: 2px;
+    -gtk-icon-style: regular;
+    padding: 0;
 }
 
 /* gnome-weather */
diff -Nru mate-themes-3.22.6/desktop-themes/GreenLaguna/gtk-3.0/gtk-main.css mate-themes-3.22.11/desktop-themes/GreenLaguna/gtk-3.0/gtk-main.css
--- mate-themes-3.22.6/desktop-themes/GreenLaguna/gtk-3.0/gtk-main.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/GreenLaguna/gtk-3.0/gtk-main.css	2017-05-11 10:26:34.000000000 +0200
@@ -31,7 +31,7 @@
 @define-color button_hover_gradient_color_a shade(@theme_bg_color, 1.1);
 @define-color button_hover_gradient_color_b shade(@theme_bg_color, 0.9);
 
-@define-color insensitive_bg_color #E0E6DE;
+@define-color insensitive_bg_color #D7E6CF;
 @define-color insensitive_fg_color #A8ABA8;
 @define-color insensitive_border_color alpha(#ababab, 0.5);
 
@@ -80,8 +80,8 @@
 @define-color expander_row_selected_color #DFF0D9; /*#acccee*/
 
 @define-color link_color #679E36;
-@define-color frame_color #9FA09E;
-@define-color inactive_frame_color #C8CAC8;
+@define-color frame_color #A8BD95;
+@define-color inactive_frame_color #BECAB4;
 @define-color warning_color #f57900;
 @define-color error_color #cc0000;
 @define-color success_color #4e9a06;
@@ -187,6 +187,9 @@
 
 @define-color content_view_bg #EFF1EF;
 
+/* inactive-pane caja */
+@define-color inactive-pane_bg_color #D9DCD8;
+
 @import url("gtk-widgets.css");
 @import url("gtk-widgets-assets.css");
 @import url("gnome-applications.css");
diff -Nru mate-themes-3.22.6/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css mate-themes-3.22.11/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css
--- mate-themes-3.22.6/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/GreenLaguna/gtk-3.0/gtk-widgets.css	2017-05-11 10:26:34.000000000 +0200
@@ -48,9 +48,10 @@
     text-shadow: none;
 }
 
+/* seems like firefox needs this stupid wildcard in several places */
 *:selected:focus {
-/*    background-color: @theme_selected_bg_color;
-    color: @theme_selected_fg_color;*/
+    background-color: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
     text-shadow: none;
 }
 
@@ -101,6 +102,17 @@
   font-family: Monospace;
 }
 
+image,
+image:disabled,
+label,
+label:disabled,
+box,
+box:disabled,
+grid,
+grid:disabled {
+	background-color: transparent;
+}
+
 /************
  * Tooltips *
  ************/
@@ -490,8 +502,8 @@
 treeview separator,
 separator,
 .separator {
-    color: darker (@theme_bg_color);
-	background-color: darker (@theme_bg_color);
+    color: alpha(@frame_color, 0.6);
+	background-color: alpha(@frame_color, 0.6);
 }
 
 paned > separator {
@@ -804,7 +816,9 @@
  * Frames *
  **********/
 
-frame {
+.frame,
+frame > border,  /* firefox location entry */
+filechooser stack > box > scrolledwindow {
     background-color: shade(@base_color, 1.02);
     color: lighter (@theme_fg_color);
     border-style: solid;
@@ -814,39 +828,23 @@
     padding: 0px;
 }
 
-.frame.flat
-frame.flat {
+.frame.flat,
+frame > border.flat,
+overlay > frame > border {
     border-style: none;
 }
 
-/* ie, dconf-editor, nautilus view */
-.background.csd scrolledwindow,
-.gedit-bottom-panel-paned > grid > notebook scrolledwindow,
-.background.solid-csd > grid > paned.horizontal scrolledwindow {
-    background-color: shade(@base_color, 1.04);
-    -gtk-icon-style: regular;
-    border-style: solid;
-    border-color: alpha(@frame_color, 0.6);
-    border-width: 0px 1px 1px 1px;
-    border-radius: 2px;
-    padding: 0;
-}
-
 /*scrolledwindow,*/
-scrolledwindow.frame,
-.background.csd scrolledwindow.frame,
-.background.solid-csd scrolledwindow.frame {
+scrolledwindow.frame {
     -gtk-icon-style: regular;
-    border-style: solid;
-    border-color: alpha(@frame_color, 0.6);
-    border-width: 1px;
     border-radius: 2px;
-    padding: 0;
 }
 
-/* no double frames */
-scrolledwindow viewport.frame {
-    border-style: none;
+/* avoid double borders when a viewport is 
+ * packed into a GtkScrolledWindow, + avoid double borders in general */
+scrolledwindow > viewport.frame,
+scrolledwindow.frame > viewport.frame {
+	border-style: none;
 }
 
 /***************
@@ -942,16 +940,34 @@
     border-style: solid;
     border-width: 1px;
     border-radius: 3px;
-    padding: 0px;
 }
 
-/* pavu-control */
-window.background > box.vertical > notebook:not(.frame),
+window.background > box.vertical > notebook:not(.frame), /* pavu-control */
 window.background.csd > box.vertical > notebook:not(.frame),
 window.background.ssd > box.vertical > notebook:not(.frame),
-window.background.solid-csd > box.vertical > notebook:not(.frame) {
+window.background.solid-csd > box.vertical > notebook:not(.frame),
+dialog.background > box.vertical.dialog-vbox > notebook:not(.frame) { /* e. shotwell, meld  */
     border-radius: 3px;
-    padding: 0px;
+    background-color: shade(@base_color, 1.02);
+}
+
+window.background > box.vertical > notebook:not(.frame) > stack > box,
+window.background.csd > box.vertical > notebook:not(.frame) > stack > box,
+window.background.ssd > box.vertical > notebook:not(.frame) > stack > box,
+window.background.solid-csd > box.vertical > notebook:not(.frame) > stack > box {
+    border-style: solid;
+    border-width: 0px 1px 1px 1px;
+    border-color: @notebook_border;
+}
+
+window.background > box.vertical > notebook:not(.frame) > header.top,
+window.background.csd > box.vertical > notebook:not(.frame) > header.top,
+window.background.ssd > box.vertical > notebook:not(.frame) > header.top,
+window.background.solid-csd > box.vertical > notebook:not(.frame) > header.top,
+dialog.background > box.vertical.dialog-vbox > notebook:not(.frame) > header.top { /* e. shotwell, meld  */
+    border-style: solid;
+    border-width: 1px 1px 0px 1px;
+    border-color: @notebook_border;
 }
 
 printdialog > box.view.vertical.dialog-vbox > box.vertical > notebook {
@@ -967,7 +983,7 @@
     background-image: linear-gradient(to bottom,
                                       shade(@theme_bg_color, 0.86),
                                       shade(@theme_bg_color, 1.00));
-    box-shadow: inset  0px -1px alpha(shade(@button_border, 1.00), 0.90);
+    box-shadow: inset  0px -1px @notebook_border;
 }
 
 dialog.background.csd > box.vertical.dialog-vbox > notebook > header.top,
@@ -983,7 +999,7 @@
     background-image: linear-gradient(to top,
                                       shade(@theme_bg_color, 0.86),
                                       shade(@theme_bg_color, 1.00));
-    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.90);
+    box-shadow: inset  0px  1px @notebook_border;
 }
 
 notebook header.left {
@@ -992,7 +1008,7 @@
     background-image: linear-gradient(to right,
                                       shade(@theme_bg_color, 0.86),
                                       shade(@theme_bg_color, 1.00));
-    box-shadow: inset -1px  0px alpha(shade(@button_border, 1.00), 0.90);
+    box-shadow: inset -1px  0px @notebook_border;
 }
 
 notebook header.right {
@@ -1001,7 +1017,7 @@
     background-image: linear-gradient(to left,
                                       shade(@theme_bg_color, 0.86),
                                       shade(@theme_bg_color, 1.00));
-    box-shadow: inset  1px  0px alpha(shade(@button_border, 1.00), 0.90);
+    box-shadow: inset  1px  0px @notebook_border;
 }
 
 notebook header tab {
@@ -1026,33 +1042,28 @@
     color: @theme_fg_color;
 }
 
-/* tabs and header in view areas, ie. pluma-, caja-tabs */
-.gedit-bottom-panel-paned > grid > notebook > header.top,
-window.background > notebook > header.top, /* nautilus preferences */
-paned.horizontal > box.vertical > notebook > header.top,
-paned.horizontal > paned.vertical > notebook > header.top {
-    border-style: solid;
+/* notebooks, view, header and tabs in caja and pluma view */
+paned.horizontal notebook {
+    border-style: none;
     border-color: @notebook_border;
-    border-width: 1px 0px 0px 1px;
+    border-width: 0px;
     border-radius: 3px 3px 0px 0px;
-    box-shadow: none;
 }
 
-paned.horizontal > box.vertical > notebook scrolledwindow.frame,
-paned.horizontal > paned.vertical > notebook scrolledwindow.frame {
-    border-width: 1px 1px 1px 1px;
+paned.horizontal notebook header.top {
     border-style: solid;
-    border-color: alpha(@frame_color, 0.6);
+    border-color: @notebook_border;
+    border-width: 1px 0px 0px 1px;
+    border-radius: 3px 3px 0px 0px;
+    box-shadow: none;
 }
 
-.gedit-bottom-panel-paned > grid > notebook > header tab,
-window.background > notebook > header tab,
-paned.horizontal > notebook > header tab,
-paned.horizontal > box.vertical > notebook > header tab,
-paned.horizontal > paned.vertical > notebook > header tab {
-    background-image: linear-gradient(to bottom,
-                                      shade(@theme_bg_color, 1.1),
-                                      shade(@theme_bg_color, 0.77));
+paned.horizontal notebook header.top tab {
+    background-image: linear-gradient(to top,
+                                      shade(@theme_bg_color, 0.9),
+                                      shade(@theme_bg_color, 0.98) 40%,
+                                      shade(@theme_bg_color, 1.02) 70%,
+                                      @theme_bg_color);
     padding: 2px 4px;
     margin: 0px -0px 0px -1px;
     border-width: 0px 1px 0 1px;
@@ -1061,16 +1072,8 @@
     border-color: @notebook_border;
 }
 
-.gedit-bottom-panel-paned > grid > notebook > header tab:checked,
-.gedit-bottom-panel-paned > grid > notebook > header tab:checked:hover,
-window.background > notebook > header.top tab:checked,
-window.background > notebook > header.top tab:checked:hover,
-paned.horizontal > notebook > header.top tab:checked,
-paned.horizontal > notebook > header.top tab:checked:hover,
-paned.horizontal > box.vertical > notebook > header.top tab:checked,
-paned.horizontal > box.vertical > notebook > header.top tab:checked:hover,
-paned.horizontal > paned.vertical > notebook > header.top tab:checked,
-paned.horizontal > paned.vertical > notebook > header.top tab:checked:hover {
+paned.horizontal notebook header.top tab:checked,
+paned.horizontal notebook header.top tab:checked:hover {
     background-image: linear-gradient(to bottom,
                                       shade(@theme_bg_color, 0.9),
                                       shade(@theme_bg_color, 0.98) 40%,
@@ -1083,16 +1086,10 @@
     box-shadow: none;
 }
 
-.gedit-bottom-panel-paned > grid > notebook > header tab:hover,
-window.background > notebook > header.top tab:hover,
-paned.horizontal > notebook > header.top tab:hover,
-paned.horizontal > box.vertical > notebook > header.top tab:hover,
-paned.horizontal > paned.vertical > notebook > header.top tab:hover {
-    background-image: linear-gradient(to top,
-                                      shade(@theme_bg_color, 0.9),
-                                      shade(@theme_bg_color, 0.98) 40%,
-                                      shade(@theme_bg_color, 1.02) 70%,
-                                      @theme_bg_color);
+paned.horizontal notebook header.top tab:hover {
+    background-image: linear-gradient(to bottom,
+                                      shade(@theme_bg_color, 1.1),
+                                      shade(@theme_bg_color, 0.77));
     border-radius: 3px 3px 0 0;
     border-width: 0px 1px 0 1px;
     border-style: solid;
@@ -1100,45 +1097,16 @@
     box-shadow: none;
 }
 
-.gedit-bottom-panel-paned > grid > notebook > header button.flat.small-button,
-paned.horizontal > box.vertical > notebook > header button.flat,
-paned.horizontal > paned.vertical > notebook > header button.flat {
-    padding: 1px;
-}
-
-/* other notebooks */
-stack frame > paned.horizontal > notebook {
-    border-width: 0px;
-    border-style: solid;
-    border-color: @notebook_border;
-    border-radius: 3px 3px 0px 0px;
-}
-
-stack frame > paned.horizontal > notebook:first-child {
-    border-width: 0px 1px 0px 0px;
-}
-
-stack frame > paned.horizontal > notebook:last-child {
-    border-width: 0px 0px 0px 1px;
-}
-
-stack frame > paned.horizontal > notebook:only-child {
-    border-width: 0px 1px 0px 1px;
+/* closable-page */
+paned.horizontal > notebook > header > tabs > tab > label {
+    min-height: 20px;
 }
 
-paned.horizontal > notebook > header {
-    border-width: 0px 0px 0px 0px;
+paned.horizontal > notebook > stack > box {
+    background-color: shade(@base_color, 1.02);
     border-style: solid;
     border-color: @notebook_border;
-    border-radius: 3px 3px 0px 0px;
-}
-
-paned.horizontal > notebook > header label {
-    padding: 4px;
-}
-
-paned.horizontal > notebook > header button.flat.small-button {
-    padding: 1px;
+    border-width: 0px 1px 1px 1px;
 }
 
 /* tabs in dialog windows */
@@ -1147,7 +1115,8 @@
 window.background.csd > box.vertical > notebook > header.top tab,
 window.background.ssd > box.vertical > notebook > header.top tab,
 window.background.solid-csd > box.vertical > notebook > header.top tab,
-dialog.background.csd > box.vertical.dialog-vbox > notebook > header.top tab, /* meld preferences */
+dialog.background > box.vertical.dialog-vbox > notebook > header.top tab, /* meld preferences */
+dialog.background.csd > box.vertical.dialog-vbox > notebook > header.top tab,
 dialog.background.ssd > box.vertical.dialog-vbox > notebook > header.top tab,
 dialog.background.solid-csd > box.vertical.dialog-vbox > notebook > header.top tab,
 printdialog notebook > header.top tab,
@@ -1163,6 +1132,7 @@
 window.background.csd > box.vertical > notebook > header.top tab,
 window.background.ssd > box.vertical > notebook > header.top tab,
 window.background.solid-csd > box.vertical > notebook > header.top tab,
+dialog.background > box.vertical.dialog-vbox > notebook > header.top tab, /* meld preferences */
 dialog.background.csd > box.vertical.dialog-vbox > notebook > header.top tab,
 dialog.background.ssd > box.vertical.dialog-vbox > notebook > header.top tab,
 dialog.background.solid-csd > box.vertical.dialog-vbox > notebook > header.top tab,
@@ -1175,9 +1145,11 @@
 window.background.csd > box.vertical > notebook > header.top tab:checked,
 window.background.ssd > box.vertical > notebook > header.top tab:checked,
 window.background.solid-csd > box.vertical > notebook > header.top tab:checked,
+dialog.background > box.vertical.dialog-vbox > notebook > header.top tab:checked, /* meld preferences */
 dialog.background.csd > box.vertical.dialog-vbox > notebook > header.top tab:checked,
 dialog.background.ssd > box.vertical.dialog-vbox > notebook > header.top tab:checked,
 dialog.background.solid-csd > box.vertical.dialog-vbox > notebook > header.top tab:checked,
+dialog.background > box.vertical.dialog-vbox > notebook > header.top tab:checked:hover,
 dialog.background.csd > box.vertical.dialog-vbox > notebook > header.top tab:checked:hover,
 dialog.background.ssd > box.vertical.dialog-vbox > notebook > header.top tab:checked:hover,
 dialog.background.solid-csd > box.vertical.dialog-vbox > notebook > header.top tab:checked:hover,
@@ -1200,6 +1172,7 @@
 window.background.csd > box.vertical > notebook > header.top tab:hover,
 window.background.ssd > box.vertical > notebook > header.top tab:hover,
 window.background.solid-csd > box.vertical > notebook > header.top tab:hover,
+dialog.background > box.vertical.dialog-vbox > notebook > header.top tab:hover, /* meld preferences */
 dialog.background.csd > box.vertical.dialog-vbox > notebook > header.top tab:hover,
 dialog.background.ssd > box.vertical.dialog-vbox > notebook > header.top tab:hover,
 dialog.background.solid-csd > box.vertical.dialog-vbox > notebook > header.top tab:hover,
@@ -1327,6 +1300,11 @@
     border-style: solid;
 }
 
+ /* ie. caja properties-window notes tab */
+dialog notebook.frame > stack > scrolledwindow.frame {
+     border-style: none;
+}
+
 /* outlines */
 notebook header.top tab:checked {
     -gtk-outline-top-left-radius: 3px;
@@ -1362,10 +1340,10 @@
     border-image: none;
 }
 
+/* close button styling */
 notebook button.flat,
-notebook > header button.flat,
-notebook > header button.flat.small-button {
-    padding: 0px;
+notebook button.flat.small-button {
+    padding: 1px;
     border-radius: 3px;
     border-image: none;
     border-style: none;
@@ -1373,8 +1351,8 @@
     background-color: transparent;
 }
 
-notebook > header button.flat:hover,
-notebook > header button.flat.small-button:hover {
+notebook button.flat:hover,
+notebook button.flat.small-button:hover {
     -gtk-icon-effect: highlight;
     border-image: none;
     border-style: none;
@@ -1832,6 +1810,7 @@
 
 button {
     -gtk-icon-style: regular;
+    -gtk-outline-radius: 3px;
     padding: 3px;
     border-radius: 3px;
     border-width: 1px;
@@ -2111,7 +2090,7 @@
     background-color: shade(@theme_bg_color, 0.95);
     background-image: none;
     border-style: solid;
-    border-color: shade(@theme_bg_color, 0.75);
+    border-color: alpha(@frame_color, 0.6);
     border-radius: 0px;
 }
 
@@ -2240,7 +2219,7 @@
     color: @theme_fg_color;
     border-image: none;
     border-style: solid;
-    border-color: shade(@theme_bg_color, 0.75);
+    border-color: alpha(@frame_color, 0.6);
     border-radius: 0px;
     background-image: none;
     background-color: shade(@theme_bg_color, 0.9);
@@ -2312,6 +2291,20 @@
     border-width: 1px 0px 0px 0px;
 }
 
+ /* the small square between scrollbars!!! */
+scrolledwindow junction,
+scrolledwindow.frame junction {
+	background-image: none;
+	background-color: shade(@theme_bg_color, 0.9);
+	border-style: none;
+	border-radius: 0;
+}
+
+/* junction does not work here */
+filechooser paned.horizontal box.vertical box.horizontal .view box.vertical {
+	background-color: shade(@theme_bg_color, 0.9);
+}
+
 
 /*********
  * Menus *
@@ -3585,7 +3578,7 @@
  * GtkAssistant *
  ****************/
 
-assistant .sidebar highlight {
+assistant .sidebar .highlight {
     color: @theme_text_color;
     background-color: shade(@theme_bg_color, 0.9);
     border-style: none;
@@ -3605,7 +3598,7 @@
     border-width: 1px;
     border-radius: 3px;
     color: mix (@theme_fg_color, @theme_bg_color, 0.40);
-    background-color: shade(@theme_bg_color, 0.9);
+    background-color: shade(@theme_bg_color, 1.02);
 }
 
 /*************
@@ -3622,7 +3615,7 @@
     border-width: 1px;
     border-image: none;
     border-style: solid;
-    border-color: shade(@frame_color, 1.22);
+    border-color: shade(@frame_color, 0.9);
     background-image: linear-gradient(to bottom,
                                       @trough_bg_color_a,
                                       @trough_bg_color_b);
@@ -3711,32 +3704,6 @@
     font-size: smaller;
 }
 
-statusbar frame {
-    border-style: none;
-}
-
-scrolledwindow,
-overlay /* for floating bars */ {
-    background-color: transparent;
-}
-
-image,
-image:hover,
-image:checked,
-image:hover:active,
-image:disabled,
-label,
-label:hover,
-label:checked,
-label:hover:active,
-label:disabled,
-box,
-box:disabled,
-grid,
-grid:disabled {
-    background-color: transparent;
-}
-
 /*****************
  * Color Chooser *
  *****************/
@@ -4295,13 +4262,15 @@
 .dim-label,
 .dim-label:hover,
 .dim-label:focus,
-.view.dim-label {
+.view.dim-label,
+list row.activatable .dim-label {
     color: mix (@theme_fg_color, @theme_bg_color, 0.50);
 }
 
 .dim-label:selected,
-.dim-label:selected:focus {
-    color: mix (@theme_selected_fg_color, @theme_base_color, 0.50);
+.dim-label:selected:focus,
+list row.activatable:selected .dim-label {
+    color: mix (@theme_selected_bg_color, @theme_base_color, 0.60);
     text-shadow: none;
 }
 
@@ -4336,16 +4305,6 @@
 }
 
 /* dialog open, nautilus */
-placessidebar.sidebar.frame {
-    border-width: 0px 1px 1px 1px;
-    border-style: solid;
-    border-color: alpha(@frame_color, 0.6);
-}
-
-filechooser placessidebar.sidebar.frame {
-    border-width: 1px 1px 1px 1px;
-}
-
 placessidebar.sidebar.frame > viewport.frame > list > row.activatable.sidebar-row {
     background-color: shade(@theme_bg_color, 1.02);
     border-radius: 0px;
@@ -4388,9 +4347,6 @@
 .sidebar separator,
 .sidebar separator:hover {
     min-height: 1px;
-    background-image: linear-gradient(to bottom,
-                                      alpha(@frame_color, 0.6),
-                                      alpha(@frame_color, 0.6));
 }
 
 /* ie. dconf-editor */
@@ -4441,11 +4397,6 @@
     padding: 4px;
 }
 
-/* avoid double borders */
-filechooser placesview stack frame {
-    border-style: none;
-}
-
 filechooser stack scrolledwindow {
     background-color: shade(@theme_bg_color, 1.02);
     border-color: alpha(@frame_color, 0.6);
@@ -4454,6 +4405,9 @@
     border-radius: 0px;
 }
 
+filechooser actionbar {
+    border-width: 0px 1px 1px 1px;
+}
 
 /****************
  * GtkActionBar *
@@ -4496,14 +4450,6 @@
  * Dialog Windows *
  ******************/
 
-/* ie. mate-keyboard-properties option window */
-dialog scrolledwindow.frame {
-    border-color: alpha(@frame_color, 0.6);
-    border-style: solid;
-    border-width: 1px;
-    border-radius: 2px;
-}
-
 dialog scrolledwindow.frame viewport .vertical {
     background-color: shade (@theme_bg_color, 1.03);
 }
@@ -4523,7 +4469,7 @@
 
 printdialog.background paper {
     border-style: solid;
-    border-width: 1px;
+    border-width: 0.9px;
     border-radius: 0px;
     border-color: @notebook_border;
     background-color: @theme_main_color;
diff -Nru mate-themes-3.22.6/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css mate-themes-3.22.11/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css
--- mate-themes-3.22.6/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/GreenLaguna/gtk-3.0/mate-applications.css	2017-05-11 10:26:34.000000000 +0200
@@ -11,7 +11,6 @@
 
 .caja-side-pane > notebook scrolledwindow.frame {
     background-color: transparent;
-    border-style: none;
 }
 
 .caja-side-pane > notebook scrolledwindow > viewport.frame,
@@ -23,10 +22,6 @@
     background-color: transparent;
 }
 
-.caja-side-pane scrolledwindow {
-        margin: -1px;
-}
-
 /* Caja places bar */
 /* close button */
 .caja-side-pane button.flat {
@@ -48,6 +43,14 @@
     background-color: shade(@theme_bg_color, 1.02);
 }
 
+/* emblem and info sidebar */
+.caja-side-pane > notebook widget.view > box.vertical,
+.caja-side-pane > notebook box.vertical > scrolledwindow {
+    border-style: solid;
+    border-width: 1px;
+    border-color: alpha(@frame_color, 0.6);
+}
+
 /* View toogle button */
 .caja-navigation-window toolbar.horizontal.primary-toolbar combobox button.combo {
         padding: 6px;
@@ -85,17 +88,15 @@
 }
 
 /* eventbars, ie. search results */
-.caja-notebook box.vertical frame {
-    background-color: shade (@theme_bg_color, 1.02);
-    border-style: none;
-    border-radius: 0px;
+/* needed as this is used for firefox locationbar, to avoid double borders */
+.caja-notebook box.vertical > frame > border {
+    border-style: solid;
+    border-width: 1px 1px 0px 1px;
+    border-radius: 3px 3px 0px 0px;
 }
 
 .caja-notebook #caja-extra-view-widget {
     background-color: shade (@theme_bg_color, 1.02);
-    border-color: @notebook_border;
-    border-width: 1px 1px 0px 1px;
-    border-style: solid;
     border-radius: 3px 3px 0px 0px;
 }
 
@@ -160,6 +161,11 @@
     text-shadow: none;
 }
 
+/* inactive-pane caja */
+.caja-notebook .view:disabled {
+    background-color: @inactive-pane_bg_color;
+}
+
 /****************
  * Mate-Panel *
  ****************/
@@ -210,19 +216,19 @@
 }
 
 /* hide buttons */
-PanelToplevel > widget > button {
+PanelToplevel > grid > button {
     color: @theme_fg_color;
     background: transparent;
     border-image: none;
-    border-radius: 3px;
+    border-radius: 0px;
     border-style: solid;
     border-color: transparent;
     padding: 0px;
     box-shadow: none;
 }
 
-PanelToplevel > widget > button:hover {
-    border-radius: 3px;
+PanelToplevel > grid > button:hover {
+    border-radius: 0px;
     border-image: none;
     border-style: solid;
     padding: 0px;
@@ -233,8 +239,8 @@
                                       shade(@button_gradient_color_a, 1.5));
 }
 
-PanelToplevel > widget > button:hover:active {
-    border-radius: 3px;
+PanelToplevel > grid > button:hover:active {
+    border-radius: 0px;
     color: @theme_fg_color;
     border-style: solid;
     background-image: linear-gradient(to bottom,
@@ -405,7 +411,6 @@
 
 na-tray-applet {
     -NaTrayApplet-icon-padding: 1px; /*any more and outlines get cut off*/
-    -NaTrayApplet-icon-size: 16;
 }
 
 /* control icon size as previous setting don't work */
@@ -446,10 +451,45 @@
 
 }
 
+/* mate-menu, mintmenu fork */
+#mate-menu.background {
+    border-color: @borders;
+    border-style: solid;
+    border-width: 1px;
+}
+
+#mate-menu.background button,
+#mate-menu.background button.flat {
+    padding: 3px 1px;
+    border-width: 1px;
+    border-style: solid;
+}
+
 /****************
  * Mate-Terminal *
  ****************/
 
+/* override for pavu-control */
+window.background.mate-terminal > box.vertical > notebook,
+window.background.mate-terminal > box.vertical > notebook > stack > box {
+    border-style: none;
+    border-width: 0px;
+}
+
+window.background.mate-terminal > box.vertical > notebook > header.top {
+    border-width: 1px 1px 0px 1px;
+    border-style: solid;
+    border-color: @notebook_border;
+}
+
+window.background.mate-terminal > box.vertical > notebook > header.top tab,
+window.background.mate-terminal > box.vertical > notebook > header.top tab:hover,
+window.background.mate-terminal > box.vertical > notebook > header.top tab:checked,
+window.background.mate-terminal > box.vertical > notebook > header.top tab:checked:hover {
+    margin: 0px -1px 0px -1px;
+    border-width: 0px 1px 0 1px;
+}
+
 vte-terminal {
     -TerminalWindow-background-darkness: 0.95;
     background-color: @selected_fg_color;
@@ -465,15 +505,6 @@
     background-color: @theme_bg_color;
 }
 
-/* atril and eom */
-EggToolbarEditor.vertical scrolledwindow .frame {
-    background-color: shade(@base_color, 1.04);
-    border-color: @borders;
-    border-width: 1px;
-    border-radius: 0px;
-    border-style: solid;
-}
-
 /*******
  * Eom *
  *******/
@@ -520,6 +551,14 @@
  * Atril *
  *********/
 
+.atril-window .primary-toolbar toolbar entry {
+    padding: 0px;
+}
+
+.atril-window paned.horizontal > box.vertical > scrolledwindow.frame {
+    border-width: 0px 1px 1px 1px;
+}
+
 /* broken text selection */
 .atril-window scrolledwindow.frame > widget:selected {
 	background-color: @theme_selected_bg_color;
@@ -531,7 +570,26 @@
 	color: @theme_fg_color;
 }
 
-/* Mate Font Viewer */
+/* sidebar */
+.atril-window paned.horizontal > box.vertical > box.horizontal button {
+    padding: 3px;
+    border-radius: 3px;
+    -gtk-outline-radius: 3px;
+}
+
+/* atril and eom */
+EggToolbarEditor.vertical scrolledwindow {
+    background-color: shade(@base_color, 1.04);
+    border-color: alpha(@frame_color, 0.6);
+    border-width: 1px;
+    border-radius: 0px;
+    border-style: solid;
+}
+
+
+/********************
+ * Mate Font Viewer *
+ ********************/
 
 .font-viewer notebook.frame {
     border-style: none;
@@ -613,13 +671,31 @@
 	border-radius: 16px;
 }
 
-/*****************
- * mate-terminal *
- *****************/
+/***********************
+ * mate-volume-control *
+ ***********************/
 
-/* override for pavu-control */
-window.background.mate-terminal > box.vertical > notebook {
+GvcMixerDialog > box.vertical.dialog-vbox > box.horizontal > box.horizontal > frame {
+    border-color: alpha(@frame_color, 0.6);
+    border-width: 1px;
+    border-style: solid;
+    border-radius: 4px
+}
+
+GvcMixerDialog > box.vertical.dialog-vbox > notebook.frame scrolledwindow.frame {
     border-style: none;
-    border-width: 0px;
+}
+
+/* mate-keyboard-layout-view, mate-keyboard-layout-chooser */
+/* this way it styles only the border of the keys, the bg of the map itself
+   use the .view class, and use old and new selectors for a while */
+matekbd-keyboard-drawing,
+.gswitchit-layout-view > box.dialog-vbox > box.vertical > widget,
+#xkb-layout-chooser > box.dialog-vbox > box.vertical > box.vertical > frame > widget {
+    background-color: shade (@theme_bg_color, 1.03);
+}
+
+#xkb-layout-chooser > box.dialog-vbox > box.vertical > box.vertical > frame > border {
+    border-radius: 0px;
 }
 
diff -Nru mate-themes-3.22.6/desktop-themes/GreenLaguna/gtk-3.0/other-applications.css mate-themes-3.22.11/desktop-themes/GreenLaguna/gtk-3.0/other-applications.css
--- mate-themes-3.22.6/desktop-themes/GreenLaguna/gtk-3.0/other-applications.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/GreenLaguna/gtk-3.0/other-applications.css	2017-05-11 10:26:34.000000000 +0200
@@ -59,10 +59,9 @@
     font-style: italic;
 }
 
-.nemo-window box.toolbar.horizontal {
-    border-style: solid;
-    border-width: 0 1px 0 0;
-    border-color: shade(@toolbar_gradient_base, 0.98);
+/* weird line between views and statusbar */
+.nemo-window grid.vertical separator {
+    background-color: transparent;
 }
 
 .nemo-window-pane .question,
diff -Nru mate-themes-3.22.6/desktop-themes/GreenLaguna/metacity-1/metacity-theme-1.xml mate-themes-3.22.11/desktop-themes/GreenLaguna/metacity-1/metacity-theme-1.xml
--- mate-themes-3.22.6/desktop-themes/GreenLaguna/metacity-1/metacity-theme-1.xml	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/GreenLaguna/metacity-1/metacity-theme-1.xml	2017-05-11 10:26:34.000000000 +0200
@@ -13,8 +13,8 @@
 <!--================-->
 
 <frame_geometry name="normal" rounded_top_left="true" rounded_bottom_left="true" rounded_top_right="true" rounded_bottom_right="true">
-  <distance name="left_width" value="2"/>
-  <distance name="right_width" value="2"/>
+  <distance name="left_width" value="6"/>
+  <distance name="right_width" value="6"/>
   <distance name="bottom_height" value="6"/>
   <distance name="left_titlebar_edge" value="4"/>
   <distance name="right_titlebar_edge" value="4"/>
@@ -40,9 +40,9 @@
 <frame_geometry name="utility" title_scale="small" parent="normal"/>
 
 <frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false"  rounded_bottom_left="false" rounded_bottom_right="false">
-  <distance name="left_width" value="2"/>
-  <distance name="right_width" value="2"/>
-  <distance name="bottom_height" value="2"/>
+  <distance name="left_width" value="6"/>
+  <distance name="right_width" value="6"/>
+  <distance name="bottom_height" value="6"/>
   <distance name="left_titlebar_edge" value="0"/>
   <distance name="right_titlebar_edge" value="0"/>
   <distance name="button_width" value="0"/>
@@ -293,13 +293,13 @@
  <!--Top curves--> 
     <line color="#ABB5A8" x1="0" y1="5" x2="2" y2="2"/>
     <line color="#ABB5A8" x1="2" y1="2" x2="5" y2="0"/>
-    <line color="#ABB5A8" x1="width-right_width+1" y1="5" x2="width-right_width-2+1" y2="2"/>
-    <line color="#ABB5A8" x1="width-right_width-2+1" y1="2" x2="width-right_width-5+1" y2="0"/>
+    <line color="#ABB5A8" x1="width-right_width+5" y1="5" x2="width-right_width-2+5" y2="2"/>
+    <line color="#ABB5A8" x1="width-right_width-2+5" y1="2" x2="width-right_width-5+5" y2="0"/>
  <!--Bottom curves--> 
     <line color="#ABB5A8" x1="0" y1="height-bottom_height" x2="2" y2="height-bottom_height+3"/>
     <line color="#ABB5A8" x1="2" y1="height-bottom_height+3" x2="5" y2="height-bottom_height+5"/>
-    <line color="#ABB5A8" x1="width-right_width+1" y1="height-bottom_height" x2="width-right_width-2+1" y2="height-bottom_height+3"/>
-    <line color="#ABB5A8" x1="width-right_width-2+1" y1="height-bottom_height+3" x2="width-right_width-5+1" y2="height-bottom_height+5"/>
+    <line color="#ABB5A8" x1="width-right_width+5" y1="height-bottom_height" x2="width-right_width-2+5" y2="height-bottom_height+3"/>
+    <line color="#ABB5A8" x1="width-right_width-2+5" y1="height-bottom_height+3" x2="width-right_width-5+5" y2="height-bottom_height+5"/>
 </draw_ops>
 
 <draw_ops name="max_background">
diff -Nru mate-themes-3.22.6/desktop-themes/GreenLaguna/metacity-1/metacity-theme-2.xml mate-themes-3.22.11/desktop-themes/GreenLaguna/metacity-1/metacity-theme-2.xml
--- mate-themes-3.22.6/desktop-themes/GreenLaguna/metacity-1/metacity-theme-2.xml	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/GreenLaguna/metacity-1/metacity-theme-2.xml	2017-05-11 10:26:34.000000000 +0200
@@ -13,8 +13,8 @@
 <!--================-->
 
 <frame_geometry name="normal" rounded_top_left="true" rounded_bottom_left="true" rounded_top_right="true" rounded_bottom_right="true">
-  <distance name="left_width" value="2"/>
-  <distance name="right_width" value="2"/>
+  <distance name="left_width" value="6"/>
+  <distance name="right_width" value="6"/>
   <distance name="bottom_height" value="6"/>
   <distance name="left_titlebar_edge" value="4"/>
   <distance name="right_titlebar_edge" value="4"/>
@@ -46,9 +46,9 @@
 <frame_geometry name="utility" title_scale="small" parent="normal"/>
 
 <frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false"  rounded_bottom_left="false" rounded_bottom_right="false">
-  <distance name="left_width" value="2"/>
-  <distance name="right_width" value="2"/>
-  <distance name="bottom_height" value="2"/>
+  <distance name="left_width" value="6"/>
+  <distance name="right_width" value="6"/>
+  <distance name="bottom_height" value="6"/>
   <distance name="left_titlebar_edge" value="0"/>
   <distance name="right_titlebar_edge" value="0"/>
   <distance name="button_width" value="0"/>
@@ -299,13 +299,13 @@
  <!--Top curves--> 
     <line color="#ABB5A8" x1="0" y1="5" x2="2" y2="2"/>
     <line color="#ABB5A8" x1="2" y1="2" x2="5" y2="0"/>
-    <line color="#ABB5A8" x1="width-right_width+1" y1="5" x2="width-right_width-2+1" y2="2"/>
-    <line color="#ABB5A8" x1="width-right_width-2+1" y1="2" x2="width-right_width-5+1" y2="0"/>
+    <line color="#ABB5A8" x1="width-right_width+5" y1="5" x2="width-right_width-2+5" y2="2"/>
+    <line color="#ABB5A8" x1="width-right_width-2+5" y1="2" x2="width-right_width-5+5" y2="0"/>
  <!--Bottom curves--> 
     <line color="#ABB5A8" x1="0" y1="height-bottom_height" x2="2" y2="height-bottom_height+3"/>
     <line color="#ABB5A8" x1="2" y1="height-bottom_height+3" x2="5" y2="height-bottom_height+5"/>
-    <line color="#ABB5A8" x1="width-right_width+1" y1="height-bottom_height" x2="width-right_width-2+1" y2="height-bottom_height+3"/>
-    <line color="#ABB5A8" x1="width-right_width-2+1" y1="height-bottom_height+3" x2="width-right_width-5+1" y2="height-bottom_height+5"/>
+    <line color="#ABB5A8" x1="width-right_width+5" y1="height-bottom_height" x2="width-right_width-2+5" y2="height-bottom_height+3"/>
+    <line color="#ABB5A8" x1="width-right_width-2+5" y1="height-bottom_height+3" x2="width-right_width-5+5" y2="height-bottom_height+5"/>
 </draw_ops>
 
 <draw_ops name="max_background">
diff -Nru mate-themes-3.22.6/desktop-themes/Green-Submarine/gtk-2.0/gtkrc mate-themes-3.22.11/desktop-themes/Green-Submarine/gtk-2.0/gtkrc
--- mate-themes-3.22.6/desktop-themes/Green-Submarine/gtk-2.0/gtkrc	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Green-Submarine/gtk-2.0/gtkrc	2017-05-11 10:26:34.000000000 +0200
@@ -9,14 +9,16 @@
 
 # NOTE: Uncommenting means to delete the "#" at the beginning of a line. Commenting means to add a "#" at the beginning of a line. The "#" tells the theme wether to ignore the specified line or not.
 
-# These are the defined colors for the theme, you can change them in GNOME's appearance preferences.
-gtk_color_scheme = "bg_color:#CBD9D4\nselected_bg_color:#72B49D\nbase_color:#FFF" # Background, base.
-gtk_color_scheme = "fg_color:#101010\nselected_fg_color:#FFF\ntext_color:#1A1A1A" # Foreground, text.
-gtk_color_scheme = "tooltip_bg_color:#DBFFF3\ntooltip_fg_color:#000000" # Tooltips.
-gtk_color_scheme = "link_color:#00CC85" # Hyperlinks
-gtk_color_scheme = "menu_color:#1F2724" # Color for menus.
-gtk_color_scheme = "bg_color_dark:#1F2724\nfg_color_dark:#cccccc\ntext_color_dark:#E6E6E6" # Dark colors
-gtk-color-scheme = "sidebar_background:#D2DFDA"
+# These are the defined colors for the theme, you can change them in MATE's appearance preferences.
+gtk-color-scheme = "base_color:#FFF\nfg_color:#101010\ntooltip_fg_color:#000000\nselected_bg_color:#72B49D\nselected_fg_color:#FFF\ntext_color:#1A1A1A\nbg_color:#CBD9D4\ntooltip_bg_color:#DBFFF3\nlink_color:#00CC85\nmenu_color:#1F2724\nbg_color_dark:#1F2724\nfg_color_dark:#cccccc\ntext_color_dark:#E6E6E6\nsidebar_background:#D2DFDA"
+
+#gtk_color_scheme = "bg_color:#CBD9D4\nselected_bg_color:#72B49D\nbase_color:#FFF" # Background, base.
+#gtk_color_scheme = "fg_color:#101010\nselected_fg_color:#FFF\ntext_color:#1A1A1A" # Foreground, text.
+#gtk_color_scheme = "tooltip_bg_color:#DBFFF3\ntooltip_fg_color:#000000" # Tooltips.
+#gtk_color_scheme = "link_color:#00CC85" # Hyperlinks
+#gtk_color_scheme = "menu_color:#1F2724" # Color for menus.
+#gtk_color_scheme = "bg_color_dark:#1F2724\nfg_color_dark:#cccccc\ntext_color_dark:#E6E6E6" # Dark colors
+#gtk-color-scheme = "sidebar_background:#D2DFDA"
 
 ### MISC ###
 gtk-icon-sizes		= "gtk-button=16,16" # This makes button icons smaller.
diff -Nru mate-themes-3.22.6/desktop-themes/Green-Submarine/gtk-3.0/gnome-applications.css mate-themes-3.22.11/desktop-themes/Green-Submarine/gtk-3.0/gnome-applications.css
--- mate-themes-3.22.6/desktop-themes/Green-Submarine/gtk-3.0/gnome-applications.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Green-Submarine/gtk-3.0/gnome-applications.css	2017-05-11 10:26:34.000000000 +0200
@@ -81,3 +81,11 @@
     border-radius: 0px;
 }
 
+/*********
+ * gedit *
+ *********/
+
+.gedit-side-panel-paned.horizontal > box.vertical > statusbar.horizontal {
+    padding: 4px;
+}
+
diff -Nru mate-themes-3.22.6/desktop-themes/Green-Submarine/gtk-3.0/gtk.css mate-themes-3.22.11/desktop-themes/Green-Submarine/gtk-3.0/gtk.css
--- mate-themes-3.22.6/desktop-themes/Green-Submarine/gtk-3.0/gtk.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Green-Submarine/gtk-3.0/gtk.css	2017-05-11 10:26:34.000000000 +0200
@@ -280,6 +280,9 @@
 @define-color overshoot_bg_color alpha (@theme_selected_bg_color, 0.55);
 @define-color overshoot_backdrop_bg_color #C8FA96;
 
+/* inactive-pane caja */
+@define-color inactive-pane_bg_color #E5E5E5;
+
 @import url("gtk-widgets.css");
 @import url("gtk-widgets-assets.css");
 @import url("menu.css");
diff -Nru mate-themes-3.22.6/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css mate-themes-3.22.11/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css
--- mate-themes-3.22.6/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Green-Submarine/gtk-3.0/gtk-widgets.css	2017-05-11 10:26:34.000000000 +0200
@@ -36,9 +36,15 @@
     color: @theme_fg_color;
 }
 
+/* exclude widget for mate-menu */
 .background:not(widget) {
-    color: @theme_fg_color;
-    background-color: @theme_bg_color;
+	color: @theme_fg_color;
+	background-color: @theme_bg_color;
+}
+
+/* override previous setting for rubberband of mate-screenshot */
+.background.rubberband {
+	background-color: transparent;
 }
 
 .background:backdrop {
@@ -46,16 +52,8 @@
     -gtk-icon-shadow: none;
 }
 
-/* Ugly hack to fix unexpected background colours (e.g. combo box arrow)
- * we should just set it above, but that loses our background on fullscreen)
- */
-/* * {
- background-color: transparent;
-}*/
-
 *:active {
 /*    background-color: alpha(shade(@theme_selected_bg_color, 1.90), 0.015);*/
-
 }
 
 *:hover:active:disabled {
@@ -72,6 +70,12 @@
 *:hover:disabled {
 }
 
+/* seems like firefox needs this stupid wildcard in several places */
+*:selected:focus {
+        background-color: @theme_selected_bg_color;
+        color: @theme_selected_fg_color;
+}
+
 *:disabled {
     /* inherit the color from parent by default */
     background-color: inherit;
@@ -247,16 +251,12 @@
 }
 
 statusbar {
-    padding: 0px;
+    padding: 3px;
     margin: -2px 0 -2px 0;
     color: @theme_fg_color;
     font-size: smaller;
 }
 
-statusbar frame {
-    border-style: none;
-}
-
 .dnd {
     border-width: 1px;
     border-style: solid;
@@ -908,26 +908,20 @@
  * Frames *
  **********/
 
-frame {
-    padding: 2px;
+.frame,
+frame > border { /* firefox location entry */
+    padding: 0px;
     border-width: 1px;
     border-radius: 4px;
     border-style: solid;
-    border-color: shade (@theme_bg_color, 0.85);
-    border-top-color:    shade(@notebook_border, 1.25);
-    border-left-color:   shade(@notebook_border, 1.25);
-    border-right-color:  shade(@notebook_border, 1.25);
-    border-bottom-color: shade(@notebook_border, 1.25);
+    border-color:  shade (@theme_bg_color, 0.85);
     color: mix(@theme_selected_bg_color, @theme_fg_color, 0.70);
 }
 
-/* only render frames in a GtkScrolledWindow */
-scrolledwindow.frame {
-    border-width:  1px;
-    border-radius: 0;
-    border-style:  solid;
-    border-color:  shade (@theme_bg_color, 0.85);
-    padding: 0px;
+.frame.flat,
+frame > border.flat,
+overlay > frame > border {
+    border-style: none;
 }
 
 /***********
@@ -2773,7 +2767,7 @@
 }
 
 toolbar label {
-    color: shade(@theme_fg_color, 1.10);
+    color: shade(@toolbar_fg_color, 1.00);
     text-shadow: none;
 }
 
@@ -2796,9 +2790,11 @@
     primary toolbar raised buttons
 *************************************/
 
-/* ie. cimnnamon-settings (button.raised) */
+/* ie. cimnnamon-settings (button.raised), mate-font-viewer toolbar info button */
 toolbar .raised button,
-toolbar button.raised {
+toolbar button.raised,
+toolbar button.raised:hover,
+toolbar button.raised:focus {
     padding: 6px;
 }
 
@@ -3031,7 +3027,7 @@
                                      color-stop (0.50, shade(@button_base, 0.96)),
                                      color-stop (0.50, shade(@button_base, 0.95)),
                                      to (shade(@button_base, 0.94))); 
-    border-width: 0 1px 1px 0px;
+    border-width: 0px 1px 1px 1px;
     border-style: solid;
     border-radius: 0px;
     border-top-color:    shade(@button_border, 1.00);
@@ -3471,11 +3467,6 @@
     border-radius: 4px 4px 0px 0px;
 }
 
-notebook.frame frame {
-     border-style: none;
-     border-width: 0px;
-}
-
 /* pavu-control */
 window.background > box.vertical > notebook:not(.frame),
 window.background.csd > box.vertical > notebook:not(.frame),
@@ -3485,6 +3476,24 @@
     border-radius: 4px 4px 0px 0px;
 }
 
+window.background > box.vertical > notebook:not(.frame) > stack > box,
+window.background.csd > box.vertical > notebook:not(.frame) > stack > box,
+window.background.ssd > box.vertical > notebook:not(.frame) > stack > box,
+window.background.solid-csd > box.vertical > notebook:not(.frame) > stack > box {
+    border-style: solid;
+    border-width: 0px 1px 1px 1px;
+    border-color: @notebook_border;
+}
+
+window.background > box.vertical > notebook:not(.frame) > header.top,
+window.background.csd > box.vertical > notebook:not(.frame) > header.top,
+window.background.ssd > box.vertical > notebook:not(.frame) > header.top,
+window.background.solid-csd > box.vertical > notebook:not(.frame) > header.top {
+    border-style: solid;
+    border-width: 1px 1px 0px 1px;
+    border-color: @notebook_border;
+}
+
 printdialog > box.view.vertical.dialog-vbox > box.vertical > notebook {
     background-color: shade (@theme_bg_color, 1.1);
     border-radius: 0px 0px 4px 4px;
@@ -3626,7 +3635,7 @@
     padding: 1px;
 }
 
-/* other notebooks */
+/* closable-page */
 paned.horizontal > notebook {
     border-width: 1px 1px 1px 1px;
     border-style: solid;
@@ -3649,6 +3658,10 @@
     padding: 1px;
 }
 
+paned.horizontal > notebook > stack > box {
+    background-color: shade (@theme_bg_color, 1.1);
+}
+
 /* tabs in dialog windows */
 /* horizontal tabs */
 window.background > box.vertical > notebook > header.top tab, /* pavu-control */
@@ -3969,17 +3982,12 @@
 }
 
 /****************
- * assistant *
+ * GtkAssistant *
  ****************/
 
-assistant .sidebar highlight {
-    color: @theme_text_color;
-    font-weight: bold;
-}
-
 assistant .sidebar {
     padding: 5px;
-    background-color: shade (@theme_bg_color, 0.97);
+    background-color: @sidebar_background;
     border-width: 0px 1px 0px 0px;
     border-radius: 0px;
     border-style: solid;
@@ -3987,6 +3995,12 @@
     color: mix (@theme_fg_color, @theme_bg_color, 0.40);
 }
 
+assistant .sidebar highlight,
+assistant .sidebar label.highlight { /* ie. caja-actions import dialog */
+    color: @theme_text_color;
+    font-weight: bold;
+}
+
 /**********
  * Switch *
  **********/
@@ -4931,20 +4945,9 @@
     padding: 0;
 }
 
-/* ie. mate-keyboard-properties option window or pluma preferences */
-dialog notebook.frame box.vertical > box.vertical > scrolledwindow.frame,
-dialog notebook.frame box.vertical > box.vertical > box.horizontal box.vertical > scrolledwindow.frame {
-    border-color: @notebook_border;
-    border-style: solid;
-    border-width: 1px;
-    border-radius: 2px;
-}
-
 /* ie. caja properties-window notes tab */
-dialog notebook.frame scrolledwindow.frame {
+dialog notebook.frame > stack > scrolledwindow.frame {
     border-style: none;
-    border-width: 0px;
-    border-radius: 0px;
 }
 
 /* credits in GtkAbout windows */
@@ -5023,6 +5026,7 @@
 .dialog-action-area.linked > button.text-button:disabled:last-child {
     border-width: 1px;
     border-image-width: 1px;
+    border-radius: 6px;
 }
 
 .dialog-action-area.linked > button.text-button {
@@ -5038,10 +5042,10 @@
 }
 
 .dialog-action-area.linked > button.text-button:focus {
-    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
-                inset  1px  0px shade(@selected_bg_color, 0.97),
-                inset -1px  0px shade(@selected_bg_color, 0.93),
-                inset  0px -1px shade(@selected_bg_color, 0.93);
+    box-shadow: inset  0px  1px shade(rgb(0,204,133), 1.00),
+                inset  1px  0px shade(rgb(0,204,133), 1.00),
+                inset -1px  0px shade(rgb(0,204,133), 1.00),
+                inset  0px -1px shade(rgb(0,204,133), 1.00);
 }
 
 .dialog-action-area.linked > button.text-button:hover {
@@ -5087,14 +5091,16 @@
 .view.dim-label,
 .dim-label,
 .dim-label:hover,
-.dim-label:focus {
+.dim-label:focus,
+list row.activatable .dim-label {
     color: mix (@theme_fg_color, @theme_bg_color, 0.27);
     text-shadow: none;
 }
 
 .dim-label:selected,
-.dim-label:selected:focus {
-    color: @theme_selected_fg_color;
+.dim-label:selected:focus,
+list row.activatable:selected .dim-label {
+    color: shade (@theme_selected_fg_color, 0.7);
     text-shadow: none;
 }
 
@@ -5665,6 +5671,18 @@
                 inset  0px -1px @insensitive_border_color;
 }
 
+popover > box > button.text-button,
+popover > box > button.text-button:hover,
+popover > box > button.text-button:focus { /* ie. gedit menu button popover */
+    padding: 6px;
+}
+
+popover > box > button.text-button { /* ie. gedit menu button popover */
+    background-image: none;
+    color: @theme_fg_dark_color;
+    border-radius: 6px;
+}
+
 modelbutton.flat,
 .linked button.image-button.model {
     min-height: 24px;
@@ -5685,7 +5703,7 @@
 modelbutton.flat:only-child {
     background-image: none;
     color: @theme_fg_dark_color;
-    border-radius: 4px;
+    border-radius: 6px;
     padding: 6px 0px 6px 6px;
 }
 
@@ -5713,14 +5731,16 @@
 modelbutton.flat:only-child,
 modelbutton.flat:focus:only-child,
 modelbutton.flat:checked:focus:only-child,
-.linked button.image-button.model {
+.linked button.image-button.model,
+popover > box > button.text-button { /* ie. gedit menu button popover */
+
     background-color: shade (@theme_bg_dark_color, 1.0);
     background-image: none;
     border-color: transparent;
     border-image: none;
     border-style: none;
     box-shadow: none;
-    border-radius: 3px;
+    border-radius: 6px;
 }
 
 modelbutton.flat:checked:hover:only-child,
@@ -5746,7 +5766,12 @@
 modelbutton.flat:focus:hover:active,
 modelbutton.flat:hover:active,
 modelbutton.flat:hover,
-modelbutton.flat:selected {
+modelbutton.flat:selected,
+popover > box > button.text-button:hover,
+popover > box > button.text-button:checked,
+popover > box > button.text-button:hover:active,
+popover > box > button.text-button:checked:hover,
+popover > box > button.text-button:checked:hover:active {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@menu_bg_dark_color, 2.03)),
@@ -5822,6 +5847,10 @@
     border-radius: 0 6px 6px 0;
 }
 
+popover > box > button.text-button:disabled {
+    color: mix (@menu_fg_dark_color, @menu_bg_dark_color, 0.4);
+}
+
 popover button.default.text-button.suggested-action {
     background-image: none;
     color: @theme_fg_dark_color;
@@ -5880,27 +5909,46 @@
  ***************/
 
 headerbar,
-.titlebar {
-    border-width: 0 0 1px;
-    border-style: solid;
-    border-color: shade(@borders, 0.90);
-    border-radius: 7px 7px 0px 0px;
-    box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
+.background.ssd > paned.horizontal.titlebar,
+.background.csd > paned.horizontal.titlebar,
+.background.solid-csd > paned.horizontal.titlebar {
     background-color: @theme_bg_dark_color;
-    padding: 6px 6px 5px 6px;
-    text-shadow: 0 1px @wm_title_shadow;
     background-image: linear-gradient(to bottom,
                                       @wm_bg_a,
                                       @wm_bg_b);
+    box-shadow: inset 0 -1px shade(@wm_bg_b, 0.95);
 }
 
-/* fix for gedit, .titlebar does not match headerbar selector */
+headerbar.titlebar,
+.background.ssd > paned.horizontal.titlebar,
 .background.csd > paned.horizontal.titlebar,
 .background.solid-csd > paned.horizontal.titlebar {
-    background-color: transparent;
-    padding: 0px;
-    margin: -2px -2px -2px -2px;
-    border-width: 0px;
+    border-width: 0px 0px 1px 0px;
+    border-style: solid;
+    border-color: shade(@borders, 0.90);
+    border-radius: 7px 7px 0px 0px;
+    padding: 6px 6px 5px 6px;
+}
+
+/* fix for gedit, .titlebar does not match headerbar selector */
+.background.ssd > paned.horizontal.titlebar > headerbar,
+.background.csd > paned.horizontal.titlebar > headerbar,
+.background.solid-csd > paned.horizontal.titlebar > headerbar {
+    box-shadow: none;
+}
+
+.background.ssd > paned.horizontal.titlebar > separator, /* gedit */
+.background.csd > paned.horizontal.titlebar > separator,
+.background.solid-csd > paned.horizontal.titlebar > separator {
+    min-width: 1px;
+    background-color: shade(@menu_fg_dark_color, 0.3);
+    border-image: -gtk-gradient (linear,
+                                 left top, right top,
+                                 from (alpha (#000, 0.00)),
+                                 color-stop (0.25, alpha (#000, 0.03)),
+                                 color-stop (0.85, alpha (#000, 0.03)),
+                                 to (alpha (#000, 0.00))) 1;
+    border-style: solid;
 }
 
 /* ie. meld */
@@ -5910,8 +5958,8 @@
 	padding:  4px 6px 5px 6px;
 }
 
-headerbar:backdrop,
-.titlebar:backdrop {
+headerbar.titlebar:backdrop {
+
     border-image: linear-gradient(to top,
                                   @unfocused_borders,
                                   @unfocused_borders 1px,
@@ -6019,7 +6067,10 @@
 
 headerbar button:disabled,
 headerbar button:disabled:last-child,
-headerbar button:disabled:first-child {
+headerbar button:disabled:first-child,
+headerbar .linked button:disabled,
+headerbar .linked button:disabled:last-child,
+headerbar .linked button:disabled:first-child {
     color: @theme_text_dark_color;
     background-image: none;
     background-color: @theme_bg_dark_color;
@@ -6035,6 +6086,10 @@
     -gtk-icon-shadow: none;
 }
 
+headerbar.titlebar .linked button.image-button:disabled {
+    box-shadow: none;
+}
+
 headerbar > button.text-button:hover,
 headerbar > button.text-button:focus,
 headerbar > button.text-button,
@@ -6629,10 +6684,16 @@
  * GtkStack *
  ************/
 
-stack .horizontal .vertical frame {
+stack > .horizontal > .vertical > frame > border {
     background-color: shade (@theme_bg_color, 1.1);
-    border-width: 1px;
-    border-color: @notebook_border;
+    border-radius: 4px;
+}
+
+stacksidebar.sidebar,
+stacksidebar.sidebar > scrolledwindow,
+stacksidebar.sidebar > scrolledwindow > viewport.frame,
+stacksidebar.sidebar > scrolledwindow > viewport.frame list {
+    border-radius: 4px 0px 0px 4px;
 }
 
 stacksidebar.sidebar list row.activatable:hover {
@@ -6867,7 +6928,7 @@
 
 printdialog.background paper {
     border-style: solid;
-    border-width: 1px;
+    border-width: 0.9px;
     border-radius: 0px;
     border-color: @notebook_border;
     background-color: @theme_base_color;
diff -Nru mate-themes-3.22.6/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css mate-themes-3.22.11/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css
--- mate-themes-3.22.6/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Green-Submarine/gtk-3.0/mate-applications.css	2017-05-11 10:26:34.000000000 +0200
@@ -15,6 +15,11 @@
     padding: 0px;
 }
 
+/* inactive-pane caja */
+.caja-notebook .view:disabled {
+    background-color: @inactive-pane_bg_color;
+}
+
 /* to avoid white pixels from base color */
 .caja-notebook {
     background-color: @theme_bg_color;
@@ -195,18 +200,12 @@
 }
 
 /* arrow button */
-.caja-pathbar button.slider-button:focus {
-    box-shadow: inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
-                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
-                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
-                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
-}
-
+.caja-pathbar button.slider-button:focus,
 .caja-pathbar button.slider-button:hover {
-    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
-                inset  1px  0px shade(@selected_bg_color, 0.97),
-                inset -1px  0px shade(@selected_bg_color, 0.93),
-                inset  0px -1px shade(@selected_bg_color, 0.93);
+    box-shadow: inset  0px  1px shade(rgb(0,204,133), 1.00),
+                inset  1px  0px shade(rgb(0,204,133), 1.00),
+                inset -1px  0px shade(rgb(0,204,133), 1.00),
+                inset  0px -1px shade(rgb(0,204,133), 1.00);
 }
 
 .caja-pathbar button.slider-button:nth-child(odd) {
@@ -222,12 +221,14 @@
 }
 
 /* folder buttons */
+.caja-pathbar button.toggle.text-button:focus,
+.caja-pathbar button.toggle.text-button.image-button:focus,
 .caja-pathbar button.toggle.text-button:hover,
 .caja-pathbar button.toggle.text-button.image-button:hover {
-    box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
-                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
-                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
-                inset  0px -1px shade(@selected_bg_color, 0.93);
+    box-shadow: inset  0px  1px shade(rgb(0,204,133), 1.00),
+                inset  1px  0px shade(rgb(0,204,133), 1.00),
+                inset -1px  0px shade(rgb(0,204,133), 1.00),
+                inset  0px -1px shade(rgb(0,204,133), 1.00);
 }
 
 .caja-pathbar button.toggle.text-button,
@@ -259,6 +260,10 @@
 /* eventbars, ie. search results */
 .caja-notebook box.vertical frame {
     background-color: shade (@theme_bg_color, 1.02);
+}
+
+/* needed as this is used for firefox locationbar */
+.caja-notebook box.vertical > frame > border {
     border-style: none;
     border-radius: 0px;
 }
@@ -268,7 +273,7 @@
     border-color: @notebook_border;
     border-width: 1px;
     border-style: solid;
-    border-radius: 4px;
+    border-radius: 4px 4px 0px 0px;
 }
 
 .caja-notebook #caja-extra-view-widget button.flat {
@@ -405,36 +410,51 @@
 }
 
 /* panel grip */
+/* FIXME, border-radius doesn't work any more */
 PanelToplevel.background {
     border-radius: 3px;
 }
 
 /* hide buttons */
-PanelToplevel > widget > button {
+/* horizontal panel */
+PanelToplevel.horizontal > grid > button:first-child {
+    border-radius: 3px 0px 0px 3px;
+}
+
+PanelToplevel.horizontal > grid > button {
+    border-radius: 0px 3px 3px 0px;
+}
+
+/* vertical panel */
+PanelToplevel.vertical > grid > button:first-child {
+    border-radius: 3px 3px 0px 0px;
+}
+
+PanelToplevel.vertical > grid > button {
+    border-radius: 0px 0px 3px 3px;
+}
+
+PanelToplevel > grid > button {
     color: @menu_fg_dark_color;
     background-image: none;
     background: transparent;
     border-style: none;
     border-radius: 3px;
     padding: 0px;
-    box-shadow: inset  0px  2px alpha(#fff, 0.11),
-                inset  2px  0px alpha(#fff, 0.09),
-                inset -2px  0px alpha(#fff, 0.09),
-                inset  0px -2px alpha(#fff, 0.07),
-                inset  0px  1px alpha(shade(@button_border, 1.00), 0.70),
-                inset  1px  0px alpha(shade(@button_border, 0.94), 0.80),
-                inset -1px  0px alpha(shade(@button_border, 0.94), 0.80),
-                inset  0px -1px alpha(shade(@button_border, 0.88), 0.90);
+    box-shadow: inset  0px  1px alpha(shade(@menu_fg_dark_color, 0.70), 0.80),
+                inset  1px  0px alpha(shade(@menu_fg_dark_color, 0.70), 0.80),
+                inset -1px  0px alpha(shade(@menu_fg_dark_color, 0.70), 0.80),
+                inset  0px -1px alpha(shade(@menu_fg_dark_color, 0.70), 0.80);
 }
 
-PanelToplevel > widget > button:hover,
-PanelToplevel > widget > button:hover:active {
+PanelToplevel > grid > button:hover,
+PanelToplevel > grid > button:hover:active {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@menu_bg_dark_color, 2.03)),
                                      to   (shade(@menu_bg_dark_color, 1.17)));
     text-shadow: none;
-    color: shade (@theme_selected_bg_color, 1.3);
+    color: shade (@theme_selected_bg_color, 1.6);
     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
                 inset  1px  0px shade(@selected_bg_color, 0.97),
                 inset -1px  0px shade(@selected_bg_color, 0.93),
@@ -683,12 +703,11 @@
 
 na-tray-applet {
     -NaTrayApplet-icon-padding: 1px; /*any more and outlines get cut off*/
-    -NaTrayApplet-icon-size: 16;
 }
 
 /* remove right space a bit */
 na-tray-applet > widget > box {
-    margin: 0px 3px 0px 0px;
+    margin: 1px 3px 1px 1px;
 }
 
 /* system-monitor-applet */
@@ -709,17 +728,20 @@
 
 .mate-panel-applet-slider frame {
     background-color: rgba(0,0,0,0.5);
-    border-image: none;
-    border-style: none;
-    border-radius:4px;
     padding: 1px;
     margin: 0px;
+    border-radius:4px;
     box-shadow: inset  0px  1px shade(@selected_bg_color, 1.05),
                 inset  1px  0px shade(@selected_bg_color, 0.97),
                 inset -1px  0px shade(@selected_bg_color, 0.93),
                 inset  0px -1px shade(@selected_bg_color, 0.93);
 }
 
+.mate-panel-applet-slider frame border {
+    border-image: none;
+    border-style: none;
+}
+
 .mate-panel-applet-slider frame frame {
     background-color:transparent;
     box-shadow: none;
@@ -748,7 +770,8 @@
                                      to   (alpha(shade(@menu_bg_dark_color, 0.57) ,0.6)));
 }
 
-/* mate-menu */
+/* mate-menu, mintmenu */
+#mintmenu.background,
 #mate-menu.background {
     background-color: @menu_bg_dark_color;
     background-image: -gtk-gradient (linear,
@@ -761,6 +784,8 @@
     border-radius:2px;
 }
 
+#mintmenu.background viewport,
+#mintmenu.background > widget > box > widget > box,
 #mate-menu.background viewport,
 #mate-menu.background > widget > box > widget > box {
     background-color: @menu_bg_dark_color;
@@ -770,6 +795,8 @@
                                      to   (shade(@menu_bg_dark_color, 0.97)));
 }
 
+#mintmenu.background viewport,
+#mintmenu.background notebook,
 #mate-menu.background viewport,
 #mate-menu.background notebook  {
     color: @menu_fg_dark_color;
@@ -778,6 +805,7 @@
     border-style: none;
 }
 
+#mintmenu.background scrolledwindow,
 #mate-menu.background scrolledwindow {
     border-color: shade(@menu_fg_dark_color, 0.3);
     border-width: 1px;
@@ -785,7 +813,13 @@
     border-radius: 0px;
 }
 
-#mate-menu.background label,
+#mintmenu.background label,
+#mate-menu.background label {
+    color: @menu_fg_dark_color;
+}
+
+#mintmenu.background button,
+#mintmenu.background button.flat,
 #mate-menu.background button,
 #mate-menu.background button.flat {
     color: @menu_fg_dark_color;
@@ -794,12 +828,23 @@
     box-shadow: none;
 }
 
+#mintmenu.background viewport button:not(.flat) label,
+#mintmenu.background button:hover label,
+#mintmenu.background viewport button:not(.flat),
+#mintmenu.background button:hover,
+#mintmenu.background button.flat:hover,
+#mate-menu.background viewport button:not(.flat) label,
 #mate-menu.background button:hover label,
+#mate-menu.background viewport button:not(.flat),
 #mate-menu.background button:hover,
 #mate-menu.background button.flat:hover {
     color: shade (@theme_selected_bg_color, 2.0);
 }
 
+#mintmenu.background viewport button:not(.flat),
+#mintmenu.background button:hover,
+#mintmenu.background button.flat:hover,
+#mate-menu.background viewport button:not(.flat),
 #mate-menu.background button:hover,
 #mate-menu.background button.flat:hover {
     background-image: -gtk-gradient (linear,
@@ -812,11 +857,14 @@
                 inset  0px -1px shade(@selected_bg_color, 0.93);
 }
 
+#mintmenu.background button,
+#mintmenu.background button.flat,
 #mate-menu.background button,
 #mate-menu.background button.flat {
     padding: 4px;
 }
 
+#mintmenu.background separator,
 #mate-menu.background separator {
     border-width: 1px 0px 0px 0px;
     min-height: 1px;
@@ -829,16 +877,19 @@
                                  to (alpha (#000, 0.00))) 1;
 }
 
+#mintmenu.background scrollbar,
 #mate-menu.background scrollbar {
     background-image: none;
     border-style: solid;
     border-color: shade(@menu_fg_dark_color, 0.3);
 }
 
+#mintmenu.background scrollbar.vertical trough,
 #mate-menu.background scrollbar.vertical trough {
     background-image: none;
 }
 
+#mintmenu.background scrollbar.vertical slider,
 #mate-menu.background scrollbar.vertical slider {
     background-image: -gtk-gradient (linear, left top, left bottom,
                                      from (shade (@menu_bg_dark_color, 1.75)),
@@ -846,6 +897,8 @@
     border-color: shade(@menu_fg_dark_color, 0.3);
 }
 
+#mintmenu.background scrollbar.vertical slider:hover,
+#mintmenu.background scrollbar.vertical slider:hover:active,
 #mate-menu.background scrollbar.vertical slider:hover,
 #mate-menu.background scrollbar.vertical slider:hover:active {
     background-image: -gtk-gradient (linear, left top, left bottom,
@@ -854,6 +907,8 @@
     border-color: shade(@menu_fg_dark_color, 0.3);
 }
 
+#mintmenu.background scrollbar.vertical.fine-tune slider:hover:active,
+#mintmenu.background scrollbar.vertical.fine-tune .slider:hover:active,
 #mate-menu.background scrollbar.vertical.fine-tune slider:hover:active,
 #mate-menu.background scrollbar.vertical.fine-tune .slider:hover:active {
     background-image: url("assets/slider_fine_vertical.svg"),
@@ -866,15 +921,18 @@
     border-color: shade(@menu_fg_dark_color, 0.3);
 }
 
+#mintmenu.background scrollbar.vertical button,
 #mate-menu.background scrollbar.vertical button {
     padding: 0px;
 }
 
+#mintmenu.background scrollbar.vertical button:disabled,
 #mate-menu.background scrollbar.vertical button:disabled {
     background-color: transparent;
     color: shade (@insensitive_fg_color, 0.6);
 }
 
+#mintmenu.background entry,
 #mate-menu.background entry {
     background-color: transparent;
     background-image: -gtk-gradient(linear,
@@ -886,6 +944,8 @@
     color: shade (@menu_fg_dark_color, 1.0);
 }
 
+#mintmenu.background entry,
+#mintmenu.background entry:focus,
 #mate-menu.background entry,
 #mate-menu.background entry:focus {
     box-shadow: inset  0px  1px shade(@menu_fg_dark_color, 0.3),
@@ -896,12 +956,24 @@
 	caret-color: shade (@menu_fg_dark_color, 1.0);
 }
 
+#mintmenu.background entry selection,
+#mintmenu.background entry selection:focus,
 #mate-menu.background entry selection,
 #mate-menu.background entry selection:focus {
     background-color: shade(@menu_fg_dark_color, 0.4);
     color: shade (@menu_fg_dark_color, 1.2);
 }
 
+#mintmenu.background entry menuitem:hover label,
+#mate-menu.background entry menuitem:hover label {
+    color: shade (@theme_selected_bg_color, 2.0);
+}
+
+#mintmenu.background entry menuitem:disabled label,
+#mate-menu.background entry menuitem:disabled label {
+    color: mix (@menu_fg_dark_color, @menu_bg_dark_color, 0.4);
+}
+
 /****************
  * Mate-terminal *
  ****************/
@@ -910,6 +982,22 @@
     border-color: @menu_bg_dark_color;
 }
 
+/* override for pavu-control */
+window.background.mate-terminal > box.vertical > notebook,
+window.background.mate-terminal > box.vertical > notebook > header.top,
+window.background.mate-terminal > box.vertical > notebook > stack > box {
+    border-style: none;
+    border-width: 0px;
+}
+
+window.background.mate-terminal > box.vertical > notebook > header.top tab,
+window.background.mate-terminal > box.vertical > notebook > header.top tab:hover,
+window.background.mate-terminal > box.vertical > notebook > header.top tab:checked,
+window.background.mate-terminal > box.vertical > notebook > header.top tab:checked:hover {
+    margin: 0px -1px 0px -1px;
+    border-width: 1px 1px 0 1px;
+}
+
 vte-terminal {
     -TerminalWindow-background-darkness: 0.95;
     background-color: @terminal_background_color;
@@ -1075,6 +1163,14 @@
     border-image: none;
     border-radius: 6px;
     padding: 4px;
+    outline-style: solid;
+    outline-color: shade(@theme_selected_bg_color, 0.93);
+    -gtk-outline-radius: 5px;
+    outline-offset: -2px;
+}
+
+#MyControlCenter button.flat:focus {
+    box-shadow: none;
 }
 
 /*********
@@ -1201,7 +1297,7 @@
     background-color: @theme_dark_dialog_bg_color;
 }
 
-.lock-dialog frame {
+.lock-dialog frame border {
     border-radius: 10px;
     border-style: none;
     border-width: 0px;
@@ -1231,8 +1327,7 @@
     caret-color: shade (@theme_text_dark_color, 1.0);
 }
 
-.lock-dialog button,
-.lock-dialog button:focus {
+.lock-dialog button {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@bg_dark_color, 2.03)),
@@ -1243,7 +1338,8 @@
 
 .lock-dialog button:hover,
 .lock-dialog button.default,
-.lock-dialog button:hover:active {
+.lock-dialog button:hover:active,
+.lock-dialog button:focus {
     background-image: -gtk-gradient (linear,
                                      left top, left bottom,
                                      from (shade(@bg_dark_color, 2.03)),
@@ -1326,13 +1422,16 @@
 	border-radius: 3px;
 }
 
-/*****************
- * mate-terminal *
- *****************/
+/* mate-keyboard-layout-view, mate-keyboard-layout-chooser */
+/* this way it styles only the border of the keys, the bg of the map itself
+   use the .view class, and use old and new selectors for a while */
+matekbd-keyboard-drawing,
+.gswitchit-layout-view > box.dialog-vbox > box.vertical > widget,
+#xkb-layout-chooser > box.dialog-vbox > box.vertical > box.vertical > frame > widget {
+    background-color: shade (@theme_bg_color, 1.0);
+}
 
-/* override for pavu-control */
-window.background.mate-terminal > box.vertical > notebook {
-    border-style: none;
-    border-width: 0px;
+#xkb-layout-chooser > box.dialog-vbox > box.vertical > box.vertical > frame > border {
+    border-radius: 0px;
 }
 
diff -Nru mate-themes-3.22.6/desktop-themes/Green-Submarine/metacity-1/metacity-theme-1.xml mate-themes-3.22.11/desktop-themes/Green-Submarine/metacity-1/metacity-theme-1.xml
--- mate-themes-3.22.6/desktop-themes/Green-Submarine/metacity-1/metacity-theme-1.xml	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Green-Submarine/metacity-1/metacity-theme-1.xml	2017-05-11 10:26:34.000000000 +0200
@@ -11,9 +11,9 @@
 </info>
  
 <frame_geometry name="normal" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="false" rounded_bottom_right="false">
-  <distance name="left_width" value="2"/>
-  <distance name="right_width" value="2"/>
-  <distance name="bottom_height" value="2"/>
+  <distance name="left_width" value="3"/>
+  <distance name="right_width" value="3"/>
+  <distance name="bottom_height" value="3"/>
   <distance name="left_titlebar_edge" value="4"/>
   <distance name="right_titlebar_edge" value="4"/>
   <aspect_ratio name="button" value="1"/>
@@ -35,9 +35,9 @@
 </frame_geometry>
 
 <frame_geometry name="border" has_title="false" rounded_top_left="true" rounded_top_right="true"  rounded_bottom_left="false" rounded_bottom_right="false">
-  <distance name="left_width" value="2"/>
-  <distance name="right_width" value="2"/>
-  <distance name="bottom_height" value="2"/>
+  <distance name="left_width" value="3"/>
+  <distance name="right_width" value="3"/>
+  <distance name="bottom_height" value="3"/>
   <distance name="left_titlebar_edge" value="0"/>
   <distance name="right_titlebar_edge" value="0"/>
   <distance name="button_width" value="0"/>
@@ -51,23 +51,22 @@
 <constant name="ButtonIPad" value="3"/>
 
 <draw_ops name="inner_window_border">
-  <gradient type="vertical" x="left_width-1" y="top_height-1" width="1" height="height-bottom_height-top_height+2">
+  <gradient type="vertical" x="0" y="top_height-1" width="3" height="height-bottom_height-top_height+2">
+    <color value="#303030"/>
+    <color value="#303030"/>
     <color value="#303030"/>
-    <color value="#CBD9D4"/>
-    <color value="#CBD9D4"/>
   </gradient>
-  <gradient type="vertical" x="width-right_width" y="top_height-1" width="1" height="height-bottom_height-top_height+2">
+  <gradient type="vertical" x="width-right_width" y="top_height-1" width="3" height="height-bottom_height-top_height+2">
+    <color value="#303030"/>
+    <color value="#303030"/>
     <color value="#303030"/>
-    <color value="#CBD9D4"/>
-    <color value="#CBD9D4"/>
   </gradient>
 
-	<line color="#303030" 
-	x1="left_width" y1="top_height-1" x2="width-right_width"
-	y2="top_height-1" />
-	<line color="#CBD9D4"
-	x1="left_width" y1="height-bottom_height" x2="width-right_width"
-	y2="height-bottom_height" />
+  <gradient type="horizontal" x="0" y="height-bottom_height" width="width" height="3">
+    <color value="#303030"/>
+    <color value="#303030"/>
+    <color value="#303030"/>
+  </gradient>
 </draw_ops>
 
 <!-- ** stripes ** -->
diff -Nru mate-themes-3.22.6/desktop-themes/Menta/gtk-2.0/gtkrc mate-themes-3.22.11/desktop-themes/Menta/gtk-2.0/gtkrc
--- mate-themes-3.22.6/desktop-themes/Menta/gtk-2.0/gtkrc	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Menta/gtk-2.0/gtkrc	2017-05-11 10:26:34.000000000 +0200
@@ -10,11 +10,13 @@
 # NOTE: Uncommenting means to delete the "#" at the beginning of a line. Commenting means to add a "#" at the beginning of a line. The "#" tells the theme wether to ignore the specified line or not.
 
 # These are the defined colors for the theme, you can change them in MATE's appearance preferences.
-gtk_color_scheme = "bg_color:#dcdcdc\nselected_bg_color:#accd8a\nbase_color:#f7f7f7" # Background, base.
-gtk_color_scheme = "fg_color:#2c2c2c\nselected_fg_color:#f5f5f5\ntext_color:#2c2c2c" # Foreground, text.
-gtk_color_scheme = "tooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000000" # Tooltips.
-gtk_color_scheme = "link_color:#61bf00" # Hyperlinks
-gtk_color_scheme = "bg_color_dark:#3f3f3f\ntext_color_dark:#FFF" # Dark colors
+gtk_color_scheme = "bg_color:#d4d4d4\nselected_bg_color:#accd8a\nbase_color:#f7f7f7\nfg_color:#2c2c2c\nselected_fg_color:#f5f5f5\ntext_color:#2c2c2c\ntooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000000\nlink_color:#61bf00\nbg_color_dark:#3f3f3f\ntext_color_dark:#FFF"
+
+#gtk_color_scheme = "bg_color:#dcdcdc\nselected_bg_color:#accd8a\nbase_color:#f7f7f7" # Background, base.
+#gtk_color_scheme = "fg_color:#2c2c2c\nselected_fg_color:#f5f5f5\ntext_color:#2c2c2c" # Foreground, text.
+#gtk_color_scheme = "tooltip_bg_color:#F5F5B5\ntooltip_fg_color:#000000" # Tooltips.
+#gtk_color_scheme = "link_color:#61bf00" # Hyperlinks
+#gtk_color_scheme = "bg_color_dark:#3f3f3f\ntext_color_dark:#FFF" # Dark colors
 
 ### EXTERNAL FILES ###
 # This includes the file that handles the panels with a light grey background.
diff -Nru mate-themes-3.22.6/desktop-themes/Menta/gtk-3.0/gnome-applications.css mate-themes-3.22.11/desktop-themes/Menta/gtk-3.0/gnome-applications.css
--- mate-themes-3.22.6/desktop-themes/Menta/gtk-3.0/gnome-applications.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Menta/gtk-3.0/gnome-applications.css	2017-05-11 10:26:34.000000000 +0200
@@ -16,7 +16,8 @@
 	color: @theme_text_color;
 }
 
-.nautilus-desktop.nautilus-canvas-item:selected {
+.nautilus-desktop.nautilus-canvas-item:selected,
+.nautilus-desktop.nautilus-canvas-item:selected:backdrop {
 	color: @theme_selected_fg_color;
 }
 
@@ -26,9 +27,11 @@
 	text-shadow: none;
 }
 
+/*
 .nautilus-desktop.nautilus-canvas-item:selected:backdrop {
 	color: @theme_unfocused_selected_fg_color;
 }
+*/
 
 /* workaround for jumping buttons in nautilus */
 .nautilus-window headerbar.titlebar .linked.path-bar > button,
diff -Nru mate-themes-3.22.6/desktop-themes/Menta/gtk-3.0/gtk-main.css mate-themes-3.22.11/desktop-themes/Menta/gtk-3.0/gtk-main.css
--- mate-themes-3.22.6/desktop-themes/Menta/gtk-3.0/gtk-main.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Menta/gtk-3.0/gtk-main.css	2017-05-11 10:26:34.000000000 +0200
@@ -231,6 +231,9 @@
 /* csd border */
 @define-color wm_csd_solid_border_color shade (#3c3c3c, 1.2);
 
+/* inactive-pane caja */
+@define-color inactive-pane_bg_color #DEDEDE;
+
 @import url("gtk-main-common.css");
 @import url("gtk-widgets-backgrounds.css");
 @import url("gtk-widgets-borders.css");
diff -Nru mate-themes-3.22.6/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css mate-themes-3.22.11/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css
--- mate-themes-3.22.6/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Menta/gtk-3.0/gtk-widgets-borders.css	2017-05-11 10:26:34.000000000 +0200
@@ -4,6 +4,7 @@
 entry,combobox entry.combo,
 combobox button.combo:checked,
 button:checked,
+button.flat:checked,
 toolbar.inline-toolbar.vertical button:checked {
 	border-image: url("borders/button-active.png") 3 4 5 4 / 3px 4px 5px 4px stretch;
 	border-radius: 4px;
diff -Nru mate-themes-3.22.6/desktop-themes/Menta/gtk-3.0/gtk-widgets.css mate-themes-3.22.11/desktop-themes/Menta/gtk-3.0/gtk-widgets.css
--- mate-themes-3.22.6/desktop-themes/Menta/gtk-3.0/gtk-widgets.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Menta/gtk-3.0/gtk-widgets.css	2017-05-11 10:26:34.000000000 +0200
@@ -35,14 +35,17 @@
 }
 
 *:selected,
-*:selected:focus {
+*:selected:focus,
+*:selected:backdrop {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 }
 
+/*
 *:selected:backdrop {
-	color: @theme_unfocused_selected_fg_color;
+	color: @theme_fg_color;
 }
+*/
 
 *:disabled {
 	/*background-color: @insensitive_bg_color;*/
@@ -205,6 +208,9 @@
 
 statusbar frame {
 	padding: 1px;
+}
+
+statusbar frame border {
     border-style: none;
 }
 
@@ -251,7 +257,8 @@
  ************************/
 
 /* displays at end of mouse scrolling */
-overshoot.top {
+overshoot.top,
+overshoot.top:backdrop {
     background-image: -gtk-gradient(radial,
                                     center top, 0,
                                     center top, 0.5,
@@ -270,6 +277,7 @@
     box-shadow: none;
 }
 
+/*
 overshoot.top:backdrop {
     background-image: -gtk-gradient(radial,
                                     center top, 0,
@@ -283,8 +291,10 @@
     border: none;
     box-shadow: none;
 }
+*/
 
-overshoot.bottom {
+overshoot.bottom,
+overshoot.bottom:backdrop {
     background-image: -gtk-gradient(radial,
                                     center bottom, 0,
                                     center bottom, 0.5,
@@ -303,6 +313,7 @@
     box-shadow: none;
 }
 
+/*
 overshoot.bottom:backdrop {
     background-image: -gtk-gradient(radial,
                                     center bottom, 0,
@@ -316,8 +327,10 @@
     border: none;
     box-shadow: none;
 }
+*/
 
-overshoot.left {
+overshoot.left,
+overshoot.left:backdrop {
     background-image: -gtk-gradient(radial,
                                     left center, 0,
                                     left center, 0.5,
@@ -336,6 +349,7 @@
     box-shadow: none;
 }
 
+/*
 overshoot.left:backdrop {
     background-image: -gtk-gradient(radial,
                                     left center, 0,
@@ -349,8 +363,10 @@
     border: none;
     box-shadow: none;
 }
+*/
 
-overshoot.right {
+overshoot.right,
+overshoot.right:backdrop {
     background-image: -gtk-gradient(radial,
                                     right center, 0,
                                     right center, 0.5,
@@ -369,6 +385,7 @@
     box-shadow: none;
 }
 
+/*
 overshoot.right:backdrop {
     background-image: -gtk-gradient(radial,
                                     right center, 0,
@@ -382,6 +399,7 @@
     border: none;
     box-shadow: none;
 }
+*/
 
 /* result is disable undershoot */
 undershoot.top {
@@ -884,7 +902,8 @@
 		mix(@trough_bg_color_b, @theme_selected_bg_color, 0.25));
 }
 
-treeview.view.progressbar {
+treeview.view.progressbar,
+treeview.view.progressbar:backdrop {
       color: @theme_selected_fg_color;
       border: 1px solid @progressbar_border;
       border-radius: 4px;
@@ -902,11 +921,13 @@
       border-color: shade(@progressbar_border, 0.85);
 }
 
- treeview.view.progressbar:backdrop {
+/*
+treeview.view.progressbar:backdrop {
       color: @theme_fg_color;
       border-color: shade(@sidebar_bg_unfocused, 0.85);
       background-color: @sidebar_scrollbar_trough_backdrop;
 }
+*/
 
 treeview.view.trough {
     background-color: rgba(172, 205, 138, 0.3);
@@ -1156,40 +1177,33 @@
  * Frames *
  **********/
 
-frame,
-.frame {
+.frame,
+frame > border,  /* firefox location entry */
+filechooser stack > box > scrolledwindow {
 	border-width: 1px;
 	border-color: @borders;
 	border-style: solid;
 	padding: 0;
 }
 
-frame > border,
+.frame.flat,
 frame > border.flat,
-.frame.flat {
-	border-style: none; 
+overlay > frame > border {
+    border-style: none;
 }
 
 scrolledwindow.frame {
     -gtk-icon-style: regular;
-	border-style: solid;
-	border-color: @borders;
-	border-width: 1px;
 	border-radius: 2px;
-	padding: 0;
 }
 
 /* avoid double borders when a viewport is 
  * packed into a GtkScrolledWindow, + avoid double borders in general */
-scrolledwindow viewport.frame,
-frame box stack scrolledwindow {
+scrolledwindow > viewport.frame,
+frame > box > stack > scrolledwindow {
 	border-style: none;
 }
 
-frame box.vertical scrolledwindow.frame {
-    border-width: 1px 0px 1px 0px;
-}
-
 /***********
  * Buttons *
  ***********/
@@ -1870,10 +1884,13 @@
   background-position: right 3px, right 4px;
 }
 
+/*
 stackswitcher > button.needs-attention > label:backdrop,
-stackswitcher > button.needs-attention > image:backdrop {
+stackswitcher > button.needs-attention > image:backdrop,
+stacksidebar row.needs-attention > label:backdrop {
 	background-size: 6px 6px, 0 0; 
 }
+*/
 
 stackswitcher > button.needs-attention > label:dir(rtl),
 stackswitcher > button.needs-attention > image:dir(rtl) {
@@ -1974,6 +1991,24 @@
     border-radius: 4px 4px 0px 0px;
 }
 
+window.background > box.vertical > notebook:not(.frame) > stack > box,
+window.background.csd > box.vertical > notebook:not(.frame) > stack > box,
+window.background.ssd > box.vertical > notebook:not(.frame) > stack > box,
+window.background.solid-csd > box.vertical > notebook:not(.frame) > stack > box {
+    border-style: solid;
+    border-width: 0px 1px 1px 1px;
+    border-color: @borders;
+}
+
+window.background > box.vertical > notebook:not(.frame) > header.top,
+window.background.csd > box.vertical > notebook:not(.frame) > header.top,
+window.background.ssd > box.vertical > notebook:not(.frame) > header.top,
+window.background.solid-csd > box.vertical > notebook:not(.frame) > header.top {
+    border-style: solid;
+    border-width: 1px 1px 0px 1px;
+    border-color: @borders;
+}
+
 printdialog > box.view.vertical.dialog-vbox > box.vertical > notebook {
     background-color: shade (@theme_bg_color, 1.1);
     border-radius: 0px;
@@ -2079,12 +2114,7 @@
     border-radius: 4px 4px 0px 0px;
     border-style: solid;
     border-color: @borders;
-    border-width: 1px 1px 1px 1px;
-    box-shadow: none;
-}
-
-paned.horizontal notebook scrolledwindow.frame {
-    border-width: 0px 1px 1px 1px;
+    border-width: 1px 1px 0px 1px;
 }
 
 paned.horizontal notebook header.top tab {
@@ -2096,6 +2126,18 @@
     border-radius: 4px 4px 0px 0px;
 }
 
+/* closable-page */
+paned.horizontal > notebook > header > tabs > tab > label {
+    min-height: 20px;
+}
+
+paned.horizontal > notebook > stack > box {
+    background-color: shade (@theme_bg_color, 1.1);
+    border-style: solid;
+    border-color: @borders;
+    border-width: 0px 1px 1px 1px;
+}
+
 /* tabs ie. preferences windows */
 /* horizontal tabs */
 window.background > box.vertical > notebook > header.top tab, /* pavu-control */
@@ -2247,6 +2289,15 @@
     border-style: none;
 }
 
+notebook.frame > header.top > button.circular.flat.image-button.popup.toggle {
+    padding: 0px;
+}
+
+ /* ie. caja properties-window notes tab */
+dialog notebook.frame > stack > scrolledwindow.frame {
+     border-style: none;
+}
+
 /* outlines */
 notebook header tab:checked {
     outline-color: @button_default_border_color;
@@ -2347,7 +2398,8 @@
     color: @menu_controls_color;
 }
 
-notebook header tabs arrow {
+notebook header tabs arrow,
+notebook header tabs arrow:backdrop {
     color: shade(@theme_fg_color, 2.6);
 }
 
@@ -2363,9 +2415,11 @@
     color: rgba(141, 144, 145, 0.3);
 }
 
+/*
 notebook header tabs arrow:backdrop {
     color: rgba(84, 89, 90, 0.4);
 }
+*/
 
 notebook header tabs arrow:disabled {
     color: #c7c7c7;
@@ -2590,11 +2644,11 @@
 }
 
 scrollbar trough,
-scrollbar trough.vertical,
+scrollbar.vertical trough,
 .sidebar scrollbar trough,
-.sidebar scrollbar trough.vertical,
-placessidebar scrollbar.trough,
-placessidebar scrollbar.trough.vertical {
+.sidebar scrollbar.vertical trough,
+placessidebar scrollbar trough,
+placessidebar scrollbar.vertical trough {
     min-width: 13px;
 	background-image: linear-gradient(to right,
 		@scrollbar_trough,
@@ -2606,9 +2660,9 @@
 	border-image: none;
 }
 
-scrollbar trough.horizontal,
-.sidebar scrollbar trough.horizontal,
-placessidebar scrollbar trough.horizontal {
+scrollbar.horizontal trough,
+.sidebar scrollbar.horizontal trough,
+placessidebar scrollbar.horizontal trough {
     min-width: 13px;
 	background-image: linear-gradient(to bottom,
 		@scrollbar_trough,
@@ -2799,13 +2853,12 @@
 }
 
  /* the small square between scrollbars!!! */
-scrolledwindow junction {
+scrolledwindow junction,
+scrolledwindow.frame junction {
 	background-image: none;
-	background-color: @theme_bg_color;
-	border-width: 0;
+	background-color: inherit;
+	border-style: none;
 	border-radius: 0;
-	border-image: none;
-	box-shadow: none;
 }
 
 /* junction does not work here */
@@ -3346,14 +3399,6 @@
 	padding: 0;
 }
 
-/* ie. mate-keyboard-properties option window */
-dialog scrolledwindow {
-    border-color: @borders;
-    border-style: solid;
-    border-width: 1px;
-    border-radius: 2px;
-}
-
 /* credits in GtkAbout windows */
 dialog .dialog-vbox scrolledwindow.frame > viewport.view.frame {
     background-color: shade (@theme_bg_color, 1.14);
@@ -3507,6 +3552,31 @@
 	box-shadow: none;
 }
 
+/* print dialog */
+printdialog.background > box.view.vertical.dialog-vbox {
+    background-color: shade (@theme_bg_color, 1.0);
+}
+
+printdialog.background paper {
+    border-style: solid;
+    border-width: 0.9px;
+    border-radius: 0px;
+    border-color: @borders;
+    background-color: @theme_base_color;
+}
+
+/* filechooser dialog */
+filechooser revealer .vertical.view {
+    background-color: @theme_bg_color;
+    border-style: solid;
+    border-width: 1px 1px 0px 1px;
+    border-color: @borders;
+}
+
+filechooser actionbar {
+    border-width: 0px 1px 1px 1px;
+}
+
 /***************
  * Search bars *
  ***************/
@@ -3607,6 +3677,7 @@
  * Sidebar *
  ***********/
 
+treeview.view.sidebar, /*shotwell */
 .sidebar .view,
 placessidebar .view,
 .sidebar {
@@ -4256,24 +4327,23 @@
  * GtkAssistant *
  ****************/
 
-assistant .sidebar highlight {
-	background-color: transparent;
-	color: @theme_fg_color;
-	font-weight: bold;
-}
-
 assistant .sidebar {
 	padding: 12px 18px 12px;
-
 	border-width: 0 1px 0 0;
 	border-radius: 0px;
 	border-style: solid;
 	border-color: @inactive_frame_color;
 	color: mix (@theme_fg_color, @theme_bg_color, 0.40);
-	background-color: shade (@theme_bg_color, 0.97);
+	background-color: @sidebar_bg;
 	/* shall we make it like sidebars in general? */
 }
 
+assistant .sidebar label.highlight { /* ie. caja-actions import dialog */
+    background-color: transparent;
+    color: @theme_fg_color;
+    font-weight: bold;
+}
+
 /*************
  * GtkSwitch *
  *************/
@@ -4415,37 +4485,50 @@
 
 .view text,
 textview,
-.view {
+.view,
+treeview.view,
+treeview.view:backdrop {
 	background-color: @theme_base_color;
 	color: @theme_text_color;
 }
 
 .view text selection:disabled,
-.view:disabled {
+.view:disabled,
+treeview.view:disabled {
 	background-color: @insensitive_bg_color;
 	color: @insensitive_fg_color;
 }
 
 .view text selection,
-.view:selected {
+.view text selection:backdrop,
+.view:selected,
+.view:selected:hover,
+.view:selected:backdrop,
+treeview.view:selected,
+treeview.view:selected:hover {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 }
 
 .view text selection:hover,
-.view:hover {
+.view:hover,
+treeview.view:hover {
 	background-color: shade (@theme_selected_bg_color, 1.30);
 	color: shade (@theme_selected_bg_color, 0.35);
 }
 
+/*
 .view text selection:backdrop,
-.view:selected:backdrop {
+.view:selected:backdrop,
+treeview.view:backdrop {
 	background-color: shade(@theme_unfocused_bg_color, 0.94);
 	color: @theme_fg_color;
 }
+*/
 
 /* color of selected icons if unfocused */
-.view:active {
+.view:active,
+treeview.view:active {
     background-color: shade(@theme_unfocused_bg_color, 0.94);
 }
 
@@ -4459,16 +4542,21 @@
 label:selected,
 label selection,
 label selection:focus,
-label selection:hover {
+label selection:hover,
+label:backdrop:selected,
+label selection:backdrop {
   background-color: @theme_selected_bg_color;
   color: @theme_selected_fg_color;
 }
 
 label:disabled:selected,
-label selection:disabled {
+label selection:disabled,
+label:backdrop:disabled:selected,
+label selection:backdrop:disabled {
 	color: @insensitive_fg_color;
 }
 
+/*
 label:backdrop:selected,
 label selection:backdrop {
 	color: @theme_fg_color;
@@ -4478,6 +4566,7 @@
 label selection:backdrop:disabled {
 	color: @insensitive_fg_color;
 }
+*/
 
 .cell {
 	padding: 2px;
@@ -4485,22 +4574,28 @@
 }
 
 .cell:selected,
-.cell:selected:focus {
+.cell:selected:focus,
+.cell:selected:backdrop,
+.cell:selected:focus:backdrop {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
 }
 
+/*
 .cell:selected:backdrop,
 .cell:selected:focus:backdrop {
 	color: @theme_fg_color;
 }
+*/
 
 row {
     min-height: 22px;
 }
 
 row:selected,
-row:selected:focus {
+row:selected:focus,
+row:selected:backdrop,
+row:selected:focus:backdrop {
 	border-width: 1px 0 1px 0;
 	border-style: solid;
 	border-color: shade (@theme_selected_bg_color, 0.85);
@@ -4510,10 +4605,12 @@
 	box-shadow: none;
 }
 
+/*
 row:selected:backdrop,
 row:selected:focus:backdrop {
 	color: @theme_fg_color;
 }
+*/
 
 .sidebar treeview.view:hover {
 	background-color: shade (@theme_selected_bg_color, 1.15);
@@ -4581,10 +4678,12 @@
     background-clip: padding-box;
 }
 
+/*
 .app-notification:backdrop,
 .app-notification.frame:backdrop {
     background-image: none;
 }
+*/
 
 .app-notification button,
 .app-notification headerbar button.titlebutton,
@@ -4675,6 +4774,7 @@
     padding: 0px;
 }
 
+/*
 .app-notification button:backdrop,
 .app-notification.frame button:backdrop {
     color: #eeeeec;
@@ -4689,6 +4789,7 @@
     border-radius: 3px;
     padding: 0px;
 }
+*/
 
 /*************
  * Expanders *
@@ -4819,7 +4920,11 @@
 list row:selected,
 list row:selected:hover,
 list row.activatable:selected,
-list row.activatable:selected:hover {
+list row.activatable:selected:hover,
+list row:selected:backdrop,
+list row:selected:backdrop:hover,
+list row.activatable:selected:backdrop,
+list row.activatable:selected:backdrop:hover {
     padding: 2px;
     border-width: 0;
     border-style: solid;
@@ -4832,6 +4937,7 @@
     color: @theme_selected_fg_color;
 }
 
+/*
 list row:selected:backdrop,
 list row:selected:backdrop:hover,
 list row.activatable:selected:backdrop,
@@ -4843,6 +4949,7 @@
     text-shadow: none;
     box-shadow: none;
 }
+*/
 
 list > row > button {
 	border-color: transparent;
@@ -4944,7 +5051,6 @@
     color: alpha(@theme_fg_color, 0.4);
 }
 
-highlight,
 calendar.highlight {
 	background-color: @theme_selected_bg_color;
 	color: @theme_selected_fg_color;
@@ -5355,18 +5461,23 @@
 	padding: 0px 12px;
 }
 
+/*
 .titlebar:backdrop {
     color: @theme_unfocused_fg_color;
 }
+*/
 
-.titlebar button.titlebutton {
+.titlebar button.titlebutton,
+.titlebar button.titlebutton:backdrop {
     color: @wm_title;
 }
 
+/*
 .titlebar button.titlebutton:backdrop {
     color: @wm_unfocused_title;
     -gtk-icon-shadow: none;
 }
+*/
 
 headerbar button.text-button,
 .titlebar button.text-button {
@@ -5450,31 +5561,6 @@
     box-shadow: 0 1px 5px @wm_shadow;
 }
 
-/* print dialog */
-printdialog.background > box.view.vertical.dialog-vbox {
-    background-color: shade (@theme_bg_color, 1.0);
-}
-
-printdialog.background paper {
-    border-style: solid;
-    border-width: 1px;
-    border-radius: 0px;
-    border-color: @borders;
-    background-color: @theme_base_color;
-}
-
-/* filechooser dialog */
-filechooser revealer .vertical.view {
-    background-color: @theme_bg_color;
-    border-style: solid;
-    border-width: 1px 1px 0px 1px;
-    border-color: @borders;
-}
-
-filechooser placessidebar.sidebar.frame {
-    border-style: solid;
-}
-
 /*********
  * Paned *
  *********/
diff -Nru mate-themes-3.22.6/desktop-themes/Menta/gtk-3.0/mate-applications.css mate-themes-3.22.11/desktop-themes/Menta/gtk-3.0/mate-applications.css
--- mate-themes-3.22.6/desktop-themes/Menta/gtk-3.0/mate-applications.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Menta/gtk-3.0/mate-applications.css	2017-05-11 10:26:34.000000000 +0200
@@ -156,19 +156,7 @@
     min-width: 8px;
 }
 
-.caja-side-pane notebook {
-    border-color: @borders;
-    border-style: solid;
-    border-radius: 0px;
-    border-width: 1px 0px 0px 0px;
-}
-
-/* views */
-/* scrolledwindow junction and top border for list view */
-.caja-navigation-window .caja-notebook scrolledwindow.frame {
-	background-color: @theme_bg_color;
-}
-
+/* view modes */
 /* icon and compat mode */
 .caja-navigation-window .caja-notebook scrolledwindow.view.frame  {
     background-color: @theme_base_color;
@@ -190,9 +178,14 @@
     border-width: 1px 1px 1px 0px;
 }
 
+/* background-image is needed for inactiv-pane. bg color don't work here */
 .caja-notebook treeview.view:selected,
 .caja-notebook treeview.view:selected:hover {
     background-color: @theme_selected_bg_color;
+    color: @theme_selected_fg_color;
+    background-image: linear-gradient(to bottom,
+                                      shade (@theme_selected_bg_color, 1.00),
+                                      shade (@theme_selected_bg_color, 1.00));
 }
 
 .caja-notebook treeview.view:hover {
@@ -200,6 +193,16 @@
     color: shade (@theme_selected_bg_color, 0.35);
 }
 
+/* ie. inactive-pane caja */
+.caja-notebook .view:disabled {
+    background-color: @inactive-pane_bg_color;
+}
+
+/* no double borders if tabs are used */
+.caja-navigation-window .caja-notebook > header.top {
+	border-width: 1px 0px 0px 1px;
+}
+
 /* window and desktop mode */
 .caja-canvas-item {
     border-radius: 3px;
@@ -241,12 +244,13 @@
    text-shadow: none;
 }
 
-/* statusbar */
-.caja-navigation-window statusbar frame {
-    border-style: none;
+/* search, etc */
+/* needed as this is used for firefox locationbar, to avoid double borders */
+.caja-notebook box.vertical > frame > border {
+    border-style: solid;
+    border-width: 1px 1px 0px 1px;
 }
 
-/* search, etc */
 #caja-extra-view-widget {
     background-color: shade (@theme_bg_color, 1.04);
     background-color: @cluebar_color;
@@ -258,6 +262,18 @@
     color: @theme_fg_color;
 }
 
+/* emblems and background dialog */
+.caja-property-browser > box > box > box > scrolledwindow.frame > viewport.frame {
+    background-color: shade (@theme_bg_color, 1.08);
+}
+
+/* misc */
+/* do we have this style class? */
+.caja-cluebar-label {
+    font-weight: normal;
+    text-shadow: 0 1px shade (@cluebar_color, 1.06);
+}
+
 /****************
  * Mate-Panel *
  ****************/
@@ -296,23 +312,21 @@
 }
 
 /* hide buttons */
-PanelToplevel > widget > button {
+PanelToplevel > grid > button {
     background: transparent;
     border-image: none;
-    border-radius: 2px;
+    border-radius: 0px;
     border-width: 0px;
     padding: 0px;
     box-shadow: none;
 }
 
-PanelToplevel > widget > button:hover,
-PanelToplevel > widget > button:hover:active {
+PanelToplevel > grid > button:hover,
+PanelToplevel > grid > button:hover:active {
     background-image: linear-gradient(to bottom,
                                       shade (@theme_selected_bg_color, 0.86),
                                       shade (@theme_selected_bg_color, 0.26));
     color: shade (@theme_selected_fg_color, 1.00);
-    text-shadow: none;
-    border-style: solid;
     border-width: 0px;
 }
 
@@ -350,7 +364,7 @@
 .mate-panel-menu-bar menubar menuitem {
     transition: all 200ms ease-out;
     text-shadow: none;
-    font-weight: 600;
+    font-weight: normal;
     padding: 4px;
 }
 
@@ -480,8 +494,8 @@
 	border-radius: 3px;
 }
 
-#MatePanelPopupWindow frame {
-	border-radius: 3px;
+#MatePanelPopupWindow frame border {
+    border-radius: 3px;
     border-style: solid;
     border-width: 1px;
     border-color: shade(@borders, 0.95);
@@ -496,12 +510,11 @@
 
 na-tray-applet {
     -NaTrayApplet-icon-padding: 1px; /*any more and outlines get cut off*/
-    -NaTrayApplet-icon-size: 16;
 }
 
 /* remove right space a bit */
 na-tray-applet > widget > box {
-    margin: 0px 2px 0px 0px;
+    margin: 1px 2px 1px 1px;
 }
 
 /* no background for icon-padding area */
@@ -519,44 +532,62 @@
     background: transparent;
 }
 
-.mate-panel-applet-slider frame {
+.mate-panel-applet-slider > frame {
     background-color: @theme_bg_color;
+    border-radius:3px;
+    padding: 0px;
+    margin: 0px;
+}
+
+.mate-panel-applet-slider > frame > border {
     border-image: none;
     border-style: solid;
     border-radius:3px;
     padding: 2px;
-    margin: 0px;
 }
 
-.mate-panel-applet-slider frame frame{
+.mate-panel-applet-slider > frame > frame > border {
     background-color:transparent;
     border-style: none;
     box-shadow: none;
 }
 
-.mate-panel-applet-slider frame button {
+.mate-panel-applet-slider > frame > button {
     color: @theme_fg_color;
 }
 
-/****************
- * Mate-Terminal *
- ****************/
+/* mate-menu, mintmenu */
+#mintmenu.background,
+#mate-menu.background {
+    border-color: @borders;
+    border-style: solid;
+    border-width: 1px;
+}
 
-/* 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;
+#mintmenu.background button,
+#mintmenu.background button.flat,
+#mate-menu.background button,
+#mate-menu.background button.flat {
+    padding: 3px 1px;
+    border-width: 2px;
 }
 
-/* override settings for pavu-control */
-window.background.mate-terminal > box.vertical > notebook > header.top tab,
-window.background.mate-terminal > box.vertical > notebook > header.top tab:checked,
-window.background.mate-terminal > box.vertical > 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;
+#mintmenu.background scrollbar.vertical button,
+#mate-menu.background scrollbar.vertical button {
+    padding: 1px 0px;
+}
+
+#mintmenu.background scrolledwindow,
+#mate-menu.background scrolledwindow {
     border-color: @borders;
     border-width: 1px;
+    border-style: solid;
+    border-radius: 0px;
+}
+
+#mintmenu.background notebook.frame scrolledwindow,
+#mate-menu.background notebook.frame scrolledwindow {
+    border-style: none;
 }
 
 /****************
@@ -708,14 +739,17 @@
 }
 
 /* atril and eom */
-EggToolbarEditor.vertical scrolledwindow viewport.frame {
-    background-color: shade (@theme_base_color, 1.0);
+EggToolbarEditor.vertical scrolledwindow {
     border-color: @borders;
     border-width: 1px;
     border-radius: 0px;
     border-style: solid;
 }
 
+EggToolbarEditor.vertical scrolledwindow viewport.frame {
+    background-color: shade (@theme_base_color, 1.0);
+}
+
 /*******
  * Eom *
  *******/
@@ -816,7 +850,7 @@
     box-shadow: 0 0 0 1px @wm_border, 0 2px 8px 3px @wm_shadow;
 }
 
-.lock-dialog frame {
+.lock-dialog frame border {
     border-radius: 4px;
     border-style: none;
     border-width: 0px;
@@ -888,8 +922,60 @@
  *****************/
 
 /* override for pavu-control */
-window.background.mate-terminal > box.vertical > notebook {
+window.background.mate-terminal > box.vertical > notebook,
+window.background.mate-terminal > box.vertical > notebook > stack > box {
     border-style: none;
     border-width: 0px;
 }
 
+window.background.mate-terminal > box.vertical > notebook > header.top {
+    border-width: 0px 0px 0px 1px;
+    border-color: @theme_bg_color;
+}
+
+/* how strange is that? a bg above the header bg? This solves non colored pixels*/
+window.background.mate-terminal > box.vertical > notebook > header.top tabs {
+    background-color: @theme_bg_color;
+}
+
+/* override settings for pavu-control */
+window.background.mate-terminal > box.vertical > notebook > header.top tab,
+window.background.mate-terminal > box.vertical > notebook > header.top tab:checked,
+window.background.mate-terminal > box.vertical > 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;
+}
+
+/*************************
+ * mate-power-statistics *
+ *************************/
+
+.mpm-statistics notebook.frame > stack > scrolledwindow.frame {
+     border-style: solid;
+}
+
+/************
+ * engrampa *
+ ************/
+
+.engrampa-window > grid > paned > box > frame > border {
+    border-style: none;
+}
+
+/* mate-keyboard-layout-view, mate-keyboard-layout-chooser */
+/* this way it styles only the border of the keys, the bg of the map itself
+   use the .view class, and use old and new selectors for a while */
+matekbd-keyboard-drawing,
+.gswitchit-layout-view > box.dialog-vbox > box.vertical > widget,
+#xkb-layout-chooser > box.dialog-vbox > box.vertical > box.vertical > frame > widget {
+    background-color: shade (@theme_bg_color, 1.0);
+}
+
+#xkb-layout-chooser > box.dialog-vbox > box.vertical > box.vertical > frame > border {
+    border-radius: 0px;
+}
+
diff -Nru mate-themes-3.22.6/desktop-themes/Menta/gtk-3.0/other-applications.css mate-themes-3.22.11/desktop-themes/Menta/gtk-3.0/other-applications.css
--- mate-themes-3.22.6/desktop-themes/Menta/gtk-3.0/other-applications.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Menta/gtk-3.0/other-applications.css	2017-05-11 10:26:34.000000000 +0200
@@ -51,6 +51,9 @@
 .nemo-window .nemo-window-pane > notebook box.vertical > overlay > scrolledwindow.view,
 .nemo-window .nemo-window-pane > notebook box.vertical > overlay > scrolledwindow > treeview.view {
     background-color: @theme_base_color;
+	border-width: 1px 1px 0px 1px;
+	border-style: solid;
+	border-color: @borders;
 }
 
 .nemo-window-pane treeview.view {
@@ -62,19 +65,20 @@
 	background-color: alpha (@theme_selected_bg_color, 0.35);
 }
 
+.nemo-window .nemo-window-pane > notebook > header.top {
+	border-width: 1px 0px 0px 1px;
+}
+
 /* sidebar */
 .nemo-window .sidebar .view {
 	background-color: shade (@theme_bg_color, 1.08);
 	color: @theme_fg_color;
 }
 
-.nemo-window .sidebar scrolledwindow.frame {
-	border-right-width: 1px;
+.nemo-window .sidebar scrolledwindow.frame.nemo-places-sidebar {
+	border-width: 1px 1px 0px 1px;
 	border-style: solid;
-	border-color: shade (@theme_bg_color, 0.90);
-	border-left: none;
-	border-top: none;
-	border-bottom: none;
+	border-color: @borders;
 }
 
 .nemo-window .sidebar treeview .cell:selected {
diff -Nru mate-themes-3.22.6/desktop-themes/Menta/gtk-3.0/unity.css mate-themes-3.22.11/desktop-themes/Menta/gtk-3.0/unity.css
--- mate-themes-3.22.6/desktop-themes/Menta/gtk-3.0/unity.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Menta/gtk-3.0/unity.css	2017-05-11 10:26:34.000000000 +0200
@@ -43,13 +43,14 @@
 }
 
 /* Top decoration for inactive windows */
+/*
 UnityDecoration.top:backdrop {
 	border: 0px solid @theme_bg_color;
 	border-bottom-width: 0;
 	background-color: @theme_bg_color;
 	color: @theme_unfocused_fg_color;
 }
-
+*/
 /* Left decoration, it themes only the space at the left of the window */
 UnityDecoration.left,
 /* Right decoration, it themes only the space at the right of the window */
@@ -60,8 +61,10 @@
 }
 
 /* Left, right and bottom decorations themes for inactive windows */
+/*
 UnityDecoration.left:backdrop,
 UnityDecoration.right:backdrop,
 UnityDecoration.bottom:backdrop {
 	background-color: @theme_bg_color;
 }
+*/
diff -Nru mate-themes-3.22.6/desktop-themes/Menta/gtk-3.0/window-controls.css mate-themes-3.22.11/desktop-themes/Menta/gtk-3.0/window-controls.css
--- mate-themes-3.22.6/desktop-themes/Menta/gtk-3.0/window-controls.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/Menta/gtk-3.0/window-controls.css	2017-05-11 10:26:34.000000000 +0200
@@ -25,6 +25,10 @@
 
 /* minimize */
 
+headerbar .right button.minimize.titlebutton:backdrop,
+headerbar .right:dir(rtl) button.minimize.titlebutton:backdrop,
+headerbar .left button.minimize.titlebutton:backdrop,
+headerbar .left:dir(rtl) button.minimize.titlebutton:backdrop,
 headerbar .right button.minimize.titlebutton,
 headerbar .right:dir(rtl) button.minimize.titlebutton,
 headerbar .left button.minimize.titlebutton,
@@ -32,6 +36,10 @@
 	background-image: url('window-controls/minimize_focused_normal.png');
 }
 
+headerbar .right button.minimize.titlebutton:backdrop:hover,
+headerbar .right:dir(rtl) button.minimize.titlebutton:backdrop:hover,
+headerbar .left button.minimize.titlebutton:backdrop:hover,
+headerbar .left:dir(rtl) button.minimize.titlebutton:backdrop:hover,
 headerbar .right button.minimize.titlebutton:hover,
 headerbar .right:dir(rtl) button.minimize.titlebutton:hover,
 headerbar .left button.minimize.titlebutton:hover,
@@ -50,6 +58,7 @@
 	background-image: url('window-controls/minimize_focused_pressed.png');
 }
 
+/*
 headerbar .right button.minimize.titlebutton:backdrop,
 headerbar .right:dir(rtl) button.minimize.titlebutton:backdrop,
 headerbar .left button.minimize.titlebutton:backdrop,
@@ -63,8 +72,13 @@
 headerbar .left:dir(rtl) button.minimize.titlebutton:backdrop:hover {
 	background-image: url('window-controls/minimize_unfocused_prelight.png');
 }
+*/
 
 /* maximize */
+headerbar .right button.maximize.titlebutton:backdrop,
+headerbar .right:dir(rtl) button.maximize.titlebutton:backdrop,
+headerbar .left button.maximize.titlebutton:backdrop,
+headerbar .left:dir(rtl) button.maximize.titlebutton:backdrop,
 headerbar .right button.maximize.titlebutton,
 headerbar .right:dir(rtl) button.maximize.titlebutton,
 headerbar .left button.maximize.titlebutton,
@@ -72,6 +86,10 @@
 	background-image: url('window-controls/maximize_focused_normal.png');
 }
 
+headerbar .right button.maximize.titlebutton:backdrop:hover,
+headerbar .right:dir(rtl) button.maximize.titlebutton:backdrop:hover,
+headerbar .left button.maximize.titlebutton:backdrop:hover,
+headerbar .left:dir(rtl) button.maximize.titlebutton:backdrop:hover,
 headerbar .right button.maximize.titlebutton:hover,
 headerbar .right:dir(rtl) button.maximize.titlebutton:hover,
 headerbar .left button.maximize.titlebutton:hover,
@@ -90,6 +108,7 @@
 	background-image: url('window-controls/maximize_focused_pressed.png');
 }
 
+/*
 headerbar .right button.maximize.titlebutton:backdrop,
 headerbar .right:dir(rtl) button.maximize.titlebutton:backdrop,
 headerbar .left button.maximize.titlebutton:backdrop,
@@ -103,8 +122,13 @@
 headerbar .left:dir(rtl) button.maximize.titlebutton:backdrop:hover {
 	background-image: url('window-controls/maximize_unfocused_prelight.png');
 }
+*/
 
 /* close */
+headerbar .right button.close.titlebutton:backdrop,
+headerbar .right:dir(rtl) button.close.titlebutton:backdrop,
+headerbar .left button.close.titlebutton:backdrop,
+headerbar .left:dir(rtl) button.close.titlebutton:backdrop,
 headerbar .right button.close.titlebutton,
 headerbar .right:dir(rtl) button.close.titlebutton,
 headerbar .left button.close.titlebutton,
@@ -113,6 +137,10 @@
 	/*padding: 2px 6px 3px 3px;*/ /* FIXME: Uncomment this shit when using the Faenza icon theme and maybe some other icon themes */
 }
 
+headerbar .right button.close.titlebutton:backdrop:hover,
+headerbar .right:dir(rtl) button.close.titlebutton:backdrop:hover,
+headerbar .left button.close.titlebutton:backdrop:hover,
+headerbar .left:dir(rtl) button.close.titlebutton:backdrop:hover,
 headerbar .right button.close.titlebutton:hover,
 headerbar .right:dir(rtl) button.close.titlebutton:hover,
 headerbar .left button.close.titlebutton:hover,
@@ -131,6 +159,7 @@
 	background-image: url('window-controls/close_focused_pressed.png');
 }
 
+/*
 headerbar .right button.close.titlebutton:backdrop,
 headerbar .right:dir(rtl) button.close.titlebutton:backdrop,
 headerbar .left button.close.titlebutton:backdrop,
@@ -144,6 +173,7 @@
 headerbar .left:dir(rtl) button.close.titlebutton:backdrop:hover {
 	background-image: url('window-controls/close_unfocused_prelight.png');
 }
+*/
 
 .titlebar button.close.titlebutton {
     /* fake request     to avoid usage of regular window-close button*/
diff -Nru mate-themes-3.22.6/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css mate-themes-3.22.11/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css
--- mate-themes-3.22.6/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets.css	2017-05-11 10:26:34.000000000 +0200
@@ -838,6 +838,23 @@
     padding: 0;
 }
 
+/* Style the Search and Location entry boxes for Firefox 49 */
+/* why frame and not entry ? FIXME */
+frame {
+    border-style: solid;
+    border-color: @border_color;
+}
+
+/* Override the Firefox 49 frame styling where is absolutely shouldn't be applied */
+/* maybe we should add more here */
+box > frame, /* mate-tweak */
+statusbar > frame, /* caja, etc. */
+statusbar > widget > frame, /* pluma */
+GvcMixerDialog frame { /* Mate Mixer dialog */
+    border-style: none;
+}
+
+frame.flat,
 .frame.flat {
    border-style:none;
 }
@@ -1104,6 +1121,28 @@
     padding: 4px;
 }
 
+/* Single button */
+.linked entry:only-child,
+.linked button:only-child,
+.linked button:hover:only-child,
+.linked button:focus:only-child,
+.linked button:focus:hover:only-child,
+.linked button:focus:hover:active:only-child,
+.linked button:checked:only-child,
+.linked button:checked:hover:only-child,
+.linked button:checked:hover:active:only-child,
+.linked button:disabled:only-child {
+    border-image: none;
+    border-radius: 3px;
+    border-color: @border_color;
+    border-width: 1px;
+    padding: 4px 3px;
+}
+
+.linked entry:only-child {
+    padding: 4px;
+}
+
 /* vertical */
 
 /* Middle button */
@@ -1228,7 +1267,20 @@
                 inset  0px -1px @button_default_box_shadow_color;
 }
 
-/* single button */
+/* Single button */
+.dialog-action-area.linked button:only-child,
+.dialog-action-area.linked button:hover:only-child,
+.dialog-action-area.linked button:focus:only-child,
+.dialog-action-area.linked button:focus:hover:only-child,
+.dialog-action-area.linked button:focus:hover:active:only-child,
+.dialog-action-area.linked button:checked:only-child,
+.dialog-action-area.linked button:checked:hover:only-child,
+.dialog-action-area.linked button:checked:hover:active:only-child,
+.dialog-action-area.linked button:disabled:only-child {
+    padding: 4px 6px;
+    border-width: 1px;
+}
+
 .dialog-action-area.linked button.default:only-child,
 .dialog-action-area.linked button:focus:only-child {
     border-color: @button_default_border_color;
@@ -1653,17 +1705,43 @@
 window.background.csd > box.vertical > notebook:not(.frame),
 window.background.ssd > box.vertical > notebook:not(.frame),
 window.background.solid-csd > box.vertical > notebook:not(.frame) {
+    margin: 0px;
     background-color: @notebook_bg_color;
     background-clip: border-box;
     border-radius: 3px 3px 0px 0px;
 }
 
+window.background > box.vertical > notebook:not(.frame) > stack > box,
+window.background.csd > box.vertical > notebook:not(.frame) > stack > box,
+window.background.ssd > box.vertical > notebook:not(.frame) > stack > box,
+window.background.solid-csd > box.vertical > notebook:not(.frame) > stack > box {
+    margin: 0px;
+    border-style: solid;
+    border-width: 0px 0.4px 0.4px 0.4px;
+    border-color: @notebook_border;
+}
+
+window.background > box.vertical > notebook:not(.frame) > header.top,
+window.background.csd > box.vertical > notebook:not(.frame) > header.top,
+window.background.ssd > box.vertical > notebook:not(.frame) > header.top,
+window.background.solid-csd > box.vertical > notebook:not(.frame) > header.top {
+    margin: 0px;
+    border-style: solid;
+    border-width: 0px 0px 0px 1px;
+    border-image: linear-gradient(to bottom,
+                  shade(@notebook_tab_gradient_a, 1.05),
+                  shade(@notebook_tab_gradient_b, 1.04) 50%,
+                  shade(@notebook_tab_gradient_c, 1.06) 50%,
+                  shade(@notebook_tab_gradient_d, 1.05)) 0 100%;
+}
+
 printdialog > box.view.vertical.dialog-vbox > box.vertical > notebook {
+    margin: 5px;
     background-color: @notebook_bg_color;
-    border-radius: 0px;
+    border-radius: 3px 0px 0px 0px;
     border-style: solid;
     border-color: @border_color;
-    border-width: 1px 0px 1px 0px;
+    border-width: 0px 1px 1px 1px;
 }
 
 dialog.background.csd > box.vertical.dialog-vbox > notebook, /* meld preferences */
@@ -1682,46 +1760,61 @@
 }
 
 notebook header.top {
+    margin: -1px -1px 0px 0px;
     border-width: 0px 0px 1px 0px;
     border-radius: 3px 3px 0px 0px;
     background-image: linear-gradient(to bottom,
                       shade(@notebook_tab_gradient_a, 1.05),
-                      shade(@notebook_tab_gradient_b, 1.05) 50%,
-                      shade(@notebook_tab_gradient_c, 1.05) 50%,
+                      shade(@notebook_tab_gradient_b, 1.04) 50%,
+                      shade(@notebook_tab_gradient_c, 1.06) 50%,
                       shade(@notebook_tab_gradient_d, 1.05));
     box-shadow: inset  0px -1px 0 0 @border_color;
 }
 
+paned.horizontal notebook header.top {
+    margin: 0px;
+    border-width: 0px 0px 0px 1px;
+    border-style: solid;
+    border-image: linear-gradient(to bottom,
+                  shade(@notebook_tab_gradient_a, 1.05),
+                  shade(@notebook_tab_gradient_b, 1.04) 50%,
+                  shade(@notebook_tab_gradient_c, 1.06) 50%,
+                  shade(@notebook_tab_gradient_d, 1.05)) 0 100%;
+}
+
 printdialog > box.view.vertical.dialog-vbox > box.vertical > notebook > header.top {
     border-radius: 0px;
 }
 
 notebook header.bottom {
+    margin: 0px -1px -1px 0px;
     border-width: 1px 1px 0px 0px;
     background-image: linear-gradient(to top,
                       shade(@notebook_tab_gradient_a, 1.05),
-                      shade(@notebook_tab_gradient_b, 1.05) 50%,
-                      shade(@notebook_tab_gradient_c, 1.05) 50%,
+                      shade(@notebook_tab_gradient_b, 1.04) 50%,
+                      shade(@notebook_tab_gradient_c, 1.06) 50%,
                       shade(@notebook_tab_gradient_d, 1.05));
     box-shadow: inset  0px  1px 0 0 @border_color;
 }
 
 notebook header.left {
+    margin: 0px 0px -1px -1px;
     border-width: 0px 1px 0px 0px;
     background-image: linear-gradient(to right,
                       shade(@notebook_tab_gradient_a, 1.05),
-                      shade(@notebook_tab_gradient_b, 1.05) 50%,
-                      shade(@notebook_tab_gradient_c, 1.05) 50%,
+                      shade(@notebook_tab_gradient_b, 1.04) 50%,
+                      shade(@notebook_tab_gradient_c, 1.06) 50%,
                       shade(@notebook_tab_gradient_d, 1.05));
     box-shadow: inset -1px  0px 0 0 @border_color;
 }
 
 notebook header.right {
+    margin: 0px -1px -1px 0px;
     border-width: 0px 0px 0px 1px;
     background-image: linear-gradient(to left,
                       shade(@notebook_tab_gradient_a, 1.05),
-                      shade(@notebook_tab_gradient_b, 1.05) 50%,
-                      shade(@notebook_tab_gradient_c, 1.05) 50%,
+                      shade(@notebook_tab_gradient_b, 1.04) 50%,
+                      shade(@notebook_tab_gradient_c, 1.06) 50%,
                       shade(@notebook_tab_gradient_d, 1.05));
     box-shadow: inset  1px  0px 0 0 @border_color;
 }
@@ -1729,12 +1822,12 @@
 /* tabs in view areas, ie. pluma-, caja-tabs */
 paned.horizontal notebook header.top tab {
     padding: 4px 2px 4px 2px;
-    border-width: 0px 1px 1px 1px;
+    border-width: 1px 1px 0px 1px;
 }
 
 paned.horizontal notebook header.top tab:checked {
     padding: 4px 2px 4px 2px;
-    border-width: 0px 1px 0px 1px;
+    border-width: 1px 1px 0px 1px;
 }
 
 notebook header tab {
@@ -1746,96 +1839,82 @@
 
 notebook header.top tab {
     margin: 0px 0px 0px -1px;
-	padding: 4px 2px 0 2px;
-    border-width: 0px 1px 1px 1px;
+    padding: 4px 6px 4px 6px;
+    border-width: 1px;
     border-radius: 3px 3px 0px 0px;
     background-image: linear-gradient(to bottom,
                       @notebook_tab_gradient_a,
-                      @notebook_tab_gradient_b 50%,
-                      @notebook_tab_gradient_c 50%,
                       @notebook_tab_gradient_d);
 }
 
 notebook header.top tab:checked {
     border-top-color: @notebook_active_tab_border;
-    border-width: 0px 1px 0px 1px;
+    border-left-color: @notebook_active_tab_border;
+    border-right-color: @notebook_active_tab_border;
+    border-width: 1px 1px 0px 1px;
     background-image: linear-gradient(to bottom,
-                      @notebook_active_tab_strip_gradient_a,
-                      @notebook_active_tab_strip_gradient_b 3px,
-                      @notebook_active_tab_strip_border_bottom_color 4px,
-                      @notebook_active_tab_gradient_a 4px,
-                      @notebook_active_tab_gradient_b);
+                      @notebook_active_tab_strip_gradient_b 1px,
+                      @notebook_active_tab_gradient_b 8px);
 }
 
 notebook header.right tab {
     margin: -1px 0px 0px 0px;
-    padding: 2px 4px 2px 1px;
-    border-width: 1px 0px 1px 1px;
+    padding: 6px 4px 6px 4px;
+    border-width: 1px;
     border-radius: 0px 3px 3px 0px;
     background-image: linear-gradient(to left,
                       @notebook_tab_gradient_a,
-                      @notebook_tab_gradient_b 50%,
-                      @notebook_tab_gradient_c 50%,
                       @notebook_tab_gradient_d);
 }
 
 notebook header.right tab:checked {
-    padding: 2px 4px 2px 2px;
-    border-width: 1px 0px 1px 0px;
+    border-width: 1px 1px 1px 0px;
     border-right-color: @notebook_active_tab_border;
+    border-top-color: @notebook_active_tab_border;
+    border-bottom-color: @notebook_active_tab_border;
     background-image: linear-gradient(to left,
-                      @notebook_active_tab_strip_gradient_a,
-                      @notebook_active_tab_strip_gradient_b 3px,
-                      @notebook_active_tab_strip_border_bottom_color 4px,
-                      @notebook_active_tab_gradient_a 4px,
-                      @notebook_active_tab_gradient_b);
+                      @notebook_active_tab_strip_gradient_b 1px,
+                      @notebook_active_tab_gradient_b 8px);
 }
 
 notebook header.bottom tab {
     margin: 0px 0px 0px -1px;
-    padding: 0px 2px 4px 2px;
-    border-width: 1px 1px 0px 1px;
+    padding: 4px 6px 4px 6px;
+    border-width: 1px;
     border-radius: 0px 0px 3px 3px;
     background-image: linear-gradient(to top,
                       @notebook_tab_gradient_a,
-                      @notebook_tab_gradient_b 50%,
-                      @notebook_tab_gradient_c 50%,
                       @notebook_tab_gradient_d);
 }
 
 notebook header.bottom tab:checked {
-    padding: 1px 2px 4px 2px;
-    border-width: 0px 1px 0px 1px;
+    border-width: 0px 1px 1px 1px;
     border-bottom-color: @notebook_active_tab_border;
+    border-left-color: @notebook_active_tab_border;
+    border-right-color: @notebook_active_tab_border;
     background-image: linear-gradient(to top,
-                      @notebook_active_tab_strip_gradient_a,
-                      @notebook_active_tab_strip_gradient_b 3px,
-                      @notebook_active_tab_strip_border_bottom_color 4px,
-                      @notebook_active_tab_gradient_a 4px,
-                      @notebook_active_tab_gradient_b);
+                      @notebook_active_tab_strip_gradient_b 1px,
+                      @notebook_active_tab_gradient_b 8px);
 }
 
 notebook header.left tab {
     margin: -1px 0px 0px 0px;
-    padding: 2px 1px 2px 4px;
-    border-width: 1px 1px 1px 0px;
+    padding: 6px 4px 6px 4px;
+    border-width: 1px;
     border-radius: 3px 0px 0px 3px;
     background-image: linear-gradient(to right,
                       @notebook_tab_gradient_a,
-                      @notebook_tab_gradient_b 50%,
-                      @notebook_tab_gradient_c 50%,
                       @notebook_tab_gradient_d);
 }
 
 notebook header.left tab:checked {
-    border-width: 1px 0px 1px 0px;
+    border-width: 1px 0px 1px 1px;
     border-left-color: @notebook_active_tab_border;
+    border-top-color: @notebook_active_tab_border;
+    border-bottom-color: @notebook_active_tab_border;
     background-image: linear-gradient(to right,
-                      @notebook_active_tab_strip_gradient_a,
-                      @notebook_active_tab_strip_gradient_b 3px,
-                      @notebook_active_tab_strip_border_bottom_color 4px,
-                      @notebook_active_tab_gradient_a 4px,
-                      @notebook_active_tab_gradient_b);
+                      @notebook_active_tab_strip_gradient_b 1px,
+                      @notebook_active_tab_gradient_b 8px);
 }
 
 /* outlines */
@@ -1860,15 +1939,15 @@
 notebook header.left tab:checked {
     -gtk-outline-top-left-radius: 4px;
     -gtk-outline-top-right-radius: 0px;
-    -gtk-outline-bottom-left-radius: 0px;
-    -gtk-outline-bottom-right-radius: 4px;
+    -gtk-outline-bottom-left-radius: 4px;
+    -gtk-outline-bottom-right-radius: 0px;
 }
 
 notebook header.right tab:checked {
     -gtk-outline-top-left-radius: 0px;
     -gtk-outline-top-right-radius: 4px;
-    -gtk-outline-bottom-left-radius: 4px;
-    -gtk-outline-bottom-right-radius: 0px;
+    -gtk-outline-bottom-left-radius: 0px;
+    -gtk-outline-bottom-right-radius: 4px;
 }
 
 /* close button styling */
@@ -3304,7 +3383,7 @@
  * GtkAssistant *
  ****************/
 
-assistant .sidebar highlight {
+assistant .sidebar .highlight {
     color: @theme_fg_color;
     font-weight: bold;
 }
@@ -3316,8 +3395,7 @@
     border-style: solid;
     border-color: @gtkassistant_sidebar_border_color;
     color: mix (@theme_fg_color, @theme_bg_color, 0.40);
-    background-color: shade (@theme_bg_color, 0.97);
-    /* shall we make it like sidebars in general? */
+    background-color: @sidebar_bg_color;
 }
 
 /*************
@@ -3691,7 +3769,6 @@
     color: alpha(@theme_fg_color, 0.4);
 }
 
-highlight,
 calendar.highlight {
     background-color: @theme_selected_bg_color;
     color: @theme_selected_fg_color;
@@ -3742,17 +3819,19 @@
     border-width: 1px;
 }
 
-infobar:last-child,
-.info:last-child,
-.warning:last-child,
-.question:last-child,
-.error:last-child {
-    /* only apply a border on the last infobar if
-     * there's more than one packed in */
-    border-bottom-width: 1px;
+infobar,
+.info,
+.warning,
+.question,
+.error {
+    border-width: 1px;
     border-style: solid;
 }
 
+infobar {
+    border-color: shade(@border_color, 0.9);
+}
+
 .info,
 .info > * {
     background-color: @info_bg_color;
@@ -4245,13 +4324,18 @@
  ******************/
 
 /* ie. mate-keyboard-properties option window */
-dialog scrolledwindow.frame {
+dialog > .vertical.dialog-vbox > scrolledwindow.frame {
     border-color: @border_color;
     border-style: solid;
     border-width: 1px;
     border-radius: 2px;
 }
 
+dialog > .vertical.dialog-vbox > scrolledwindow.frame > viewport.view > box.vertical > expander {
+    border-style: none;
+    background-color: transparent;
+}
+
 /* credits in GtkAbout windows */
 dialog .dialog-vbox scrolledwindow.frame > viewport.view.frame {
     background-color: shade (@theme_bg_color, 1.04);
@@ -4265,14 +4349,21 @@
     border-width: 1px;
 }
 
+/* ie. caja fm-properties-window notes tab */
+dialog > .vertical.dialog-vbox > notebook.frame > stack > scrolledwindow,
+dialog > .vertical.dialog-vbox > notebook.frame > stack > scrolledwindow.frame {
+    border-style: none;
+}
+
 /* print dialog */
 printdialog.background > box.view.vertical.dialog-vbox {
+    margin: 7px;
     background-color: shade (@theme_bg_color, 1.0);
 }
 
 printdialog.background paper {
     border-style: solid;
-    border-width: 1px;
+    border-width: 0.9px;
     border-radius: 0px;
     border-color: @border_color;
     background-color: @theme_base_color;
diff -Nru mate-themes-3.22.6/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets-img.css mate-themes-3.22.11/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets-img.css
--- mate-themes-3.22.6/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets-img.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/TraditionalGreen/gtk-3.0/gtk-widgets-img.css	2017-05-11 10:26:34.000000000 +0200
@@ -668,7 +668,8 @@
 toolbar.primary-toolbar combobox button:focus,
 toolbar.inline-toolbar.horizontal button.text-button:focus,
 combobox button.combo:focus,
-combobox .linked button.combo:focus {
+combobox .linked button.combo:focus,
+combobox .linked button.combo:focus:only-child {
     border-image: url("img/border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
     border-radius: 3px;
     border-width: 1px 1px 2px 1px;
diff -Nru mate-themes-3.22.6/desktop-themes/TraditionalGreen/gtk-3.0/img/Makefile.am mate-themes-3.22.11/desktop-themes/TraditionalGreen/gtk-3.0/img/Makefile.am
--- mate-themes-3.22.6/desktop-themes/TraditionalGreen/gtk-3.0/img/Makefile.am	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/TraditionalGreen/gtk-3.0/img/Makefile.am	2017-05-11 10:26:34.000000000 +0200
@@ -35,6 +35,7 @@
 	menuitem-radio-hover.png \
 	menuitem-radio-insensitive.png \
 	menuitem-radio.png \
+	panel-grid.svg \
 	pane-separator-grip-horz.png \
 	pane-separator-grip-vert.png \
 	radio-checked-hover.png \
diff -Nru mate-themes-3.22.6/desktop-themes/TraditionalGreen/gtk-3.0/img/panel-grid.svg mate-themes-3.22.11/desktop-themes/TraditionalGreen/gtk-3.0/img/panel-grid.svg
--- mate-themes-3.22.6/desktop-themes/TraditionalGreen/gtk-3.0/img/panel-grid.svg	1970-01-01 01:00:00.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/TraditionalGreen/gtk-3.0/img/panel-grid.svg	2017-05-11 10:26:34.000000000 +0200
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   sodipodi:docname="panel-grid.svg"
+   height="22"
+   id="svg7384"
+   inkscape:version="0.92.1 r15371"
+   version="1.1"
+   width="12">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:bbox-nodes="false"
+     inkscape:bbox-paths="true"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer12"
+     inkscape:cx="6.2320295"
+     inkscape:cy="10.82843"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:object-nodes="false"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#3a3b39"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="true"
+     showgrid="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-height="953"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1280"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:zoom="45.6875">
+    <inkscape:grid
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       originx="119.9998"
+       originy="650"
+       snapvisiblegridlinesonly="true"
+       spacingx="1"
+       spacingy="1"
+       type="xygrid"
+       visible="true" />
+    <inkscape:grid
+       color="#000000"
+       empcolor="#000000"
+       empopacity="0"
+       empspacing="4"
+       enabled="true"
+       id="grid5968"
+       opacity="0.1254902"
+       originx="119.9998"
+       originy="650"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5"
+       spacingy="0.5"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g71291"
+     inkscape:label="emotes"
+     style="display:inline"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-121.0004,-861)">
+    <rect
+       height="4"
+       id="rect20592"
+       rx="0.38461545"
+       ry="0.50229359"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+       width="4"
+       x="125.23243"
+       y="864.17157" />
+    <rect
+       height="4"
+       id="rect16730"
+       rx="0.38461545"
+       ry="0.50229359"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#c2c8b3;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+       width="4"
+       x="125.23243"
+       y="870.17157" />
+    <rect
+       height="4"
+       id="rect16732"
+       rx="0.38461545"
+       ry="0.50229359"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#afb69d;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+       width="4"
+       x="125.23243"
+       y="876.17157" />
+  </g>
+</svg>
diff -Nru mate-themes-3.22.6/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css mate-themes-3.22.11/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css
--- mate-themes-3.22.6/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/TraditionalGreen/gtk-3.0/mate-applications.css	2017-05-11 10:26:34.000000000 +0200
@@ -113,11 +113,24 @@
     text-shadow: none;
 }
 
+MatePanelAppletFrameDBus {
+    background-image: -gtk-scaled(url("img/panel-grid.svg"));
+    background-color: transparent;
+    background-repeat: no-repeat;
+    background-position: left;
+}
+
 /* workaround to avoid unwanted black frames if switching compositor on/off */
 .mate-panel-menu-bar .window-frame.csd.popup {
     box-shadow: none;
 }
 
+/* hide buttons */
+PanelToplevel > grid > button {
+    padding: 0px;
+    border-radius: 0px;
+}
+
 #PanelApplet {
     border-width: 0;
 }
@@ -217,6 +230,15 @@
     border-image: none;
 }
 
+/* 1.18 changings for gtk+-3.22 warning fixes*/
+.mate-panel-menu-bar #PanelApplet #drive-button,
+.mate-panel-menu-bar #PanelApplet #drive-button:hover,
+.mate-panel-menu-bar #PanelApplet #charpick-applet-button,
+.mate-panel-menu-bar #PanelApplet #showdesktop-button:checked {
+    border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
+    border-width: 0px;
+}
+
 #PanelApplet > #clock-applet-button.flat.toggle {
    background-color: transparent;
    background-image: none;
@@ -300,7 +322,6 @@
     padding: 0;
     text-shadow: none;
     -NaTrayApplet-icon-padding: 1px; /*any more and outlines get cut off*/
-    -NaTrayApplet-icon-size: 16;
 }
 
 /* volume applet, brightness applet */
@@ -308,7 +329,7 @@
     background: transparent;
 }
 
-.mate-panel-applet-slider .frame {
+.mate-panel-applet-slider frame {
     background-color: @theme_bg_color;
     border-image: none;
     border-style: solid;
@@ -317,16 +338,30 @@
     margin: 0px;
 }
 
-.mate-panel-applet-slider .frame .frame{
+.mate-panel-applet-slider frame frame{
     background-color:transparent;
     border-style: none;
     box-shadow: none;
 }
 
-.mate-panel-applet-slider .frame .button {
+.mate-panel-applet-slider frame button {
     color: @theme_fg_color;
 }
 
+/* mate-menu, mintmenu fork */
+#mate-menu.background {
+    border-color: @border_color;
+    border-style: solid;
+    border-width: 1px;
+}
+
+/* mate-indicator-applet */
+/* needed for a transparent panel */
+#fast-user-switch-applet > #fast-user-switch-menubar {
+    background-color: transparent;
+    background-image: none;
+}
+
 /****************
  * Pluma *
  ****************/
@@ -503,14 +538,36 @@
  * mate-terminal *
  *****************/
 
-/* override for pavu-control */
-window.background.mate-terminal > box.vertical > notebook {
+/* override settings for pavu-control */
+window.background.mate-terminal > box.vertical > notebook,
+window.background.mate-terminal > box.vertical > notebook > stack > box {
     border-style: none;
-    border-width: 0px;
+    margin: 0px;
 }
 
 /* override settings for pavu-control */
-window.background.mate-terminal > box.vertical > notebook > header.top tab,
+window.background.mate-terminal > box.vertical > notebook > header.top {
+    border-radius: 3px 0px 0px 0px;
+    margin: 0px;
+    border-style: solid;
+    border-image: linear-gradient(to bottom,
+                  shade(@notebook_tab_gradient_a, 1.05),
+                  shade(@notebook_tab_gradient_b, 1.04) 50%,
+                  shade(@notebook_tab_gradient_c, 1.06) 50%,
+                  shade(@notebook_tab_gradient_d, 1.05)) 0 100%;
+    box-shadow: inset  0px -1px 0 0 @border_color;
+    border-width: 0px 0px 0px 1px;
+}
+
+window.background.mate-terminal > box.vertical > notebook > header.top tab {
+    border-radius: 3px 3px 0px 0px;
+    padding: 4px 2px 4px 6px;
+    margin: 0px 0px 0px -1px;
+    border-style: solid;
+    border-color: @border_color;
+    border-width: 1px;
+}
+
 window.background.mate-terminal > box.vertical > notebook > header.top tab:checked,
 window.background.mate-terminal > box.vertical > notebook > header.top tab:checked:hover {
     border-radius: 3px 3px 0px 0px;
@@ -518,6 +575,9 @@
     margin: 0px 0px 0px -1px;
     border-style: solid;
     border-color: @border_color;
+    border-top-color: @notebook_active_tab_border;
+    border-left-color: @notebook_active_tab_border;
+    border-right-color: @notebook_active_tab_border;
     border-width: 1px;
 }
 
@@ -547,3 +607,16 @@
     outline-style: dashed;
 }
 
+/* mate-keyboard-layout-view, mate-keyboard-layout-chooser */
+/* this way it styles only the border of the keys, the bg of the map itself
+   use the .view class, and use old and new selectors for a while */
+matekbd-keyboard-drawing,
+.gswitchit-layout-view > box.dialog-vbox > box.vertical > widget,
+#xkb-layout-chooser > box.dialog-vbox > box.vertical > box.vertical > frame > widget {
+    background-color: shade (@theme_bg_color, 1.0);
+}
+
+#xkb-layout-chooser > box.dialog-vbox > box.vertical > box.vertical > frame > border {
+    border-radius: 0px;
+}
+
diff -Nru mate-themes-3.22.6/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css mate-themes-3.22.11/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css
--- mate-themes-3.22.6/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets.css	2017-05-11 10:26:34.000000000 +0200
@@ -839,6 +839,23 @@
     padding: 0;
 }
 
+/* Style the Search and Location entry boxes for Firefox 49 */
+/* why frame and not entry ? FIXME */
+frame {
+    border-style: solid;
+    border-color: @border_color;
+}
+
+/* Override the Firefox 49 frame styling where is absolutely shouldn't be applied */
+/* maybe we should add more here */
+box > frame, /* mate-tweak */
+statusbar > frame, /* caja, etc. */
+statusbar > widget > frame, /* pluma */
+GvcMixerDialog frame { /* Mate Mixer dialog */
+    border-style: none;
+}
+
+frame.flat,
 .frame.flat {
    border-style:none;
 }
@@ -1105,6 +1122,28 @@
     padding: 4px;
 }
 
+/* Single button */
+.linked entry:only-child,
+.linked button:only-child,
+.linked button:hover:only-child,
+.linked button:focus:only-child,
+.linked button:focus:hover:only-child,
+.linked button:focus:hover:active:only-child,
+.linked button:checked:only-child,
+.linked button:checked:hover:only-child,
+.linked button:checked:hover:active:only-child,
+.linked button:disabled:only-child {
+    border-image: none;
+    border-radius: 3px;
+    border-color: @border_color;
+    border-width: 1px;
+    padding: 4px 3px;
+}
+
+.linked entry:only-child {
+    padding: 4px;
+}
+
 /* vertical */
 
 /* Middle button */
@@ -1229,7 +1268,20 @@
                 inset  0px -1px @button_default_box_shadow_color;
 }
 
-/* single button */
+/* Single button */
+.dialog-action-area.linked button:only-child,
+.dialog-action-area.linked button:hover:only-child,
+.dialog-action-area.linked button:focus:only-child,
+.dialog-action-area.linked button:focus:hover:only-child,
+.dialog-action-area.linked button:focus:hover:active:only-child,
+.dialog-action-area.linked button:checked:only-child,
+.dialog-action-area.linked button:checked:hover:only-child,
+.dialog-action-area.linked button:checked:hover:active:only-child,
+.dialog-action-area.linked button:disabled:only-child {
+    padding: 4px 6px;
+    border-width: 1px;
+}
+
 .dialog-action-area.linked button.default:only-child,
 .dialog-action-area.linked button:focus:only-child {
     border-color: @button_default_border_color;
@@ -1654,17 +1706,43 @@
 window.background.csd > box.vertical > notebook:not(.frame),
 window.background.ssd > box.vertical > notebook:not(.frame),
 window.background.solid-csd > box.vertical > notebook:not(.frame) {
+    margin: 0px;
     background-color: @notebook_bg_color;
     background-clip: border-box;
     border-radius: 3px 3px 0px 0px;
 }
 
+window.background > box.vertical > notebook:not(.frame) > stack > box,
+window.background.csd > box.vertical > notebook:not(.frame) > stack > box,
+window.background.ssd > box.vertical > notebook:not(.frame) > stack > box,
+window.background.solid-csd > box.vertical > notebook:not(.frame) > stack > box {
+    margin: 0px;
+    border-style: solid;
+    border-width: 0px 0.4px 0.4px 0.4px;
+    border-color: @notebook_border;
+}
+
+window.background > box.vertical > notebook:not(.frame) > header.top,
+window.background.csd > box.vertical > notebook:not(.frame) > header.top,
+window.background.ssd > box.vertical > notebook:not(.frame) > header.top,
+window.background.solid-csd > box.vertical > notebook:not(.frame) > header.top {
+    margin: 0px;
+    border-style: solid;
+    border-width: 0px 0px 0px 1px;
+    border-image: linear-gradient(to bottom,
+                  shade(@notebook_tab_gradient_a, 1.05),
+                  shade(@notebook_tab_gradient_b, 1.04) 50%,
+                  shade(@notebook_tab_gradient_c, 1.06) 50%,
+                  shade(@notebook_tab_gradient_d, 1.05)) 0 100%;
+}
+
 printdialog > box.view.vertical.dialog-vbox > box.vertical > notebook {
+    margin: 5px;
     background-color: @notebook_bg_color;
-    border-radius: 0px;
+    border-radius: 3px 0px 0px 0px;
     border-style: solid;
     border-color: @border_color;
-    border-width: 1px 0px 1px 0px;
+    border-width: 0px 1px 1px 1px;
 }
 
 dialog.background.csd > box.vertical.dialog-vbox > notebook, /* meld preferences */
@@ -1683,46 +1761,61 @@
 }
 
 notebook header.top {
+    margin: -1px -1px 0px 0px;
     border-width: 0px 0px 1px 0px;
     border-radius: 3px 3px 0px 0px;
     background-image: linear-gradient(to bottom,
                       shade(@notebook_tab_gradient_a, 1.05),
-                      shade(@notebook_tab_gradient_b, 1.05) 50%,
-                      shade(@notebook_tab_gradient_c, 1.05) 50%,
+                      shade(@notebook_tab_gradient_b, 1.04) 50%,
+                      shade(@notebook_tab_gradient_c, 1.06) 50%,
                       shade(@notebook_tab_gradient_d, 1.05));
     box-shadow: inset  0px -1px 0 0 @border_color;
 }
 
+paned.horizontal notebook header.top {
+    margin: 0px;
+    border-width: 0px 0px 0px 1px;
+    border-style: solid;
+    border-image: linear-gradient(to bottom,
+                  shade(@notebook_tab_gradient_a, 1.05),
+                  shade(@notebook_tab_gradient_b, 1.04) 50%,
+                  shade(@notebook_tab_gradient_c, 1.06) 50%,
+                  shade(@notebook_tab_gradient_d, 1.05)) 0 100%;
+}
+
 printdialog > box.view.vertical.dialog-vbox > box.vertical > notebook > header.top {
     border-radius: 0px;
 }
 
 notebook header.bottom {
+    margin: 0px -1px -1px 0px;
     border-width: 1px 1px 0px 0px;
     background-image: linear-gradient(to top,
                       shade(@notebook_tab_gradient_a, 1.05),
-                      shade(@notebook_tab_gradient_b, 1.05) 50%,
-                      shade(@notebook_tab_gradient_c, 1.05) 50%,
+                      shade(@notebook_tab_gradient_b, 1.04) 50%,
+                      shade(@notebook_tab_gradient_c, 1.06) 50%,
                       shade(@notebook_tab_gradient_d, 1.05));
     box-shadow: inset  0px  1px 0 0 @border_color;
 }
 
 notebook header.left {
+    margin: 0px 0px -1px -1px;
     border-width: 0px 1px 0px 0px;
     background-image: linear-gradient(to right,
                       shade(@notebook_tab_gradient_a, 1.05),
-                      shade(@notebook_tab_gradient_b, 1.05) 50%,
-                      shade(@notebook_tab_gradient_c, 1.05) 50%,
+                      shade(@notebook_tab_gradient_b, 1.04) 50%,
+                      shade(@notebook_tab_gradient_c, 1.06) 50%,
                       shade(@notebook_tab_gradient_d, 1.05));
     box-shadow: inset -1px  0px 0 0 @border_color;
 }
 
 notebook header.right {
+    margin: 0px -1px -1px 0px;
     border-width: 0px 0px 0px 1px;
     background-image: linear-gradient(to left,
                       shade(@notebook_tab_gradient_a, 1.05),
-                      shade(@notebook_tab_gradient_b, 1.05) 50%,
-                      shade(@notebook_tab_gradient_c, 1.05) 50%,
+                      shade(@notebook_tab_gradient_b, 1.04) 50%,
+                      shade(@notebook_tab_gradient_c, 1.06) 50%,
                       shade(@notebook_tab_gradient_d, 1.05));
     box-shadow: inset  1px  0px 0 0 @border_color;
 }
@@ -1730,12 +1823,12 @@
 /* tabs in view areas, ie. pluma-, caja-tabs */
 paned.horizontal notebook header.top tab {
     padding: 4px 2px 4px 2px;
-    border-width: 0px 1px 1px 1px;
+    border-width: 1px 1px 0px 1px;
 }
 
 paned.horizontal notebook header.top tab:checked {
     padding: 4px 2px 4px 2px;
-    border-width: 0px 1px 0px 1px;
+    border-width: 1px 1px 0px 1px;
 }
 
 notebook header tab {
@@ -1747,96 +1840,82 @@
 
 notebook header.top tab {
     margin: 0px 0px 0px -1px;
-	padding: 4px 2px 0 2px;
-    border-width: 0px 1px 1px 1px;
+    padding: 4px 6px 4px 6px;
+    border-width: 1px;
     border-radius: 3px 3px 0px 0px;
     background-image: linear-gradient(to bottom,
                       @notebook_tab_gradient_a,
-                      @notebook_tab_gradient_b 50%,
-                      @notebook_tab_gradient_c 50%,
                       @notebook_tab_gradient_d);
 }
 
 notebook header.top tab:checked {
     border-top-color: @notebook_active_tab_border;
-    border-width: 0px 1px 0px 1px;
+    border-left-color: @notebook_active_tab_border;
+    border-right-color: @notebook_active_tab_border;
+    border-width: 1px 1px 0px 1px;
     background-image: linear-gradient(to bottom,
-                      @notebook_active_tab_strip_gradient_a,
-                      @notebook_active_tab_strip_gradient_b 3px,
-                      @notebook_active_tab_strip_border_bottom_color 4px,
-                      @notebook_active_tab_gradient_a 4px,
-                      @notebook_active_tab_gradient_b);
+                      @notebook_active_tab_strip_gradient_b 1px,
+                      @notebook_active_tab_gradient_b 8px);
 }
 
 notebook header.right tab {
     margin: -1px 0px 0px 0px;
-    padding: 2px 4px 2px 1px;
-    border-width: 1px 0px 1px 1px;
+    padding: 6px 4px 6px 4px;
+    border-width: 1px;
     border-radius: 0px 3px 3px 0px;
     background-image: linear-gradient(to left,
                       @notebook_tab_gradient_a,
-                      @notebook_tab_gradient_b 50%,
-                      @notebook_tab_gradient_c 50%,
                       @notebook_tab_gradient_d);
 }
 
 notebook header.right tab:checked {
-    padding: 2px 4px 2px 2px;
-    border-width: 1px 0px 1px 0px;
+    border-width: 1px 1px 1px 0px;
     border-right-color: @notebook_active_tab_border;
+    border-top-color: @notebook_active_tab_border;
+    border-bottom-color: @notebook_active_tab_border;
     background-image: linear-gradient(to left,
-                      @notebook_active_tab_strip_gradient_a,
-                      @notebook_active_tab_strip_gradient_b 3px,
-                      @notebook_active_tab_strip_border_bottom_color 4px,
-                      @notebook_active_tab_gradient_a 4px,
-                      @notebook_active_tab_gradient_b);
+                      @notebook_active_tab_strip_gradient_b 1px,
+                      @notebook_active_tab_gradient_b 8px);
 }
 
 notebook header.bottom tab {
     margin: 0px 0px 0px -1px;
-    padding: 0px 2px 4px 2px;
-    border-width: 1px 1px 0px 1px;
+    padding: 4px 6px 4px 6px;
+    border-width: 1px;
     border-radius: 0px 0px 3px 3px;
     background-image: linear-gradient(to top,
                       @notebook_tab_gradient_a,
-                      @notebook_tab_gradient_b 50%,
-                      @notebook_tab_gradient_c 50%,
                       @notebook_tab_gradient_d);
 }
 
 notebook header.bottom tab:checked {
-    padding: 1px 2px 4px 2px;
-    border-width: 0px 1px 0px 1px;
+    border-width: 0px 1px 1px 1px;
     border-bottom-color: @notebook_active_tab_border;
+    border-left-color: @notebook_active_tab_border;
+    border-right-color: @notebook_active_tab_border;
     background-image: linear-gradient(to top,
-                      @notebook_active_tab_strip_gradient_a,
-                      @notebook_active_tab_strip_gradient_b 3px,
-                      @notebook_active_tab_strip_border_bottom_color 4px,
-                      @notebook_active_tab_gradient_a 4px,
-                      @notebook_active_tab_gradient_b);
+                      @notebook_active_tab_strip_gradient_b 1px,
+                      @notebook_active_tab_gradient_b 8px);
 }
 
 notebook header.left tab {
     margin: -1px 0px 0px 0px;
-    padding: 2px 1px 2px 4px;
-    border-width: 1px 1px 1px 0px;
+    padding: 6px 4px 6px 4px;
+    border-width: 1px;
     border-radius: 3px 0px 0px 3px;
     background-image: linear-gradient(to right,
                       @notebook_tab_gradient_a,
-                      @notebook_tab_gradient_b 50%,
-                      @notebook_tab_gradient_c 50%,
                       @notebook_tab_gradient_d);
 }
 
 notebook header.left tab:checked {
-    border-width: 1px 0px 1px 0px;
+    border-width: 1px 0px 1px 1px;
     border-left-color: @notebook_active_tab_border;
+    border-top-color: @notebook_active_tab_border;
+    border-bottom-color: @notebook_active_tab_border;
     background-image: linear-gradient(to right,
-                      @notebook_active_tab_strip_gradient_a,
-                      @notebook_active_tab_strip_gradient_b 3px,
-                      @notebook_active_tab_strip_border_bottom_color 4px,
-                      @notebook_active_tab_gradient_a 4px,
-                      @notebook_active_tab_gradient_b);
+                      @notebook_active_tab_strip_gradient_b 1px,
+                      @notebook_active_tab_gradient_b 8px);
 }
 
 /* outlines */
@@ -1861,15 +1940,15 @@
 notebook header.left tab:checked {
     -gtk-outline-top-left-radius: 4px;
     -gtk-outline-top-right-radius: 0px;
-    -gtk-outline-bottom-left-radius: 0px;
-    -gtk-outline-bottom-right-radius: 4px;
+    -gtk-outline-bottom-left-radius: 4px;
+    -gtk-outline-bottom-right-radius: 0px;
 }
 
 notebook header.right tab:checked {
     -gtk-outline-top-left-radius: 0px;
     -gtk-outline-top-right-radius: 4px;
-    -gtk-outline-bottom-left-radius: 4px;
-    -gtk-outline-bottom-right-radius: 0px;
+    -gtk-outline-bottom-left-radius: 0px;
+    -gtk-outline-bottom-right-radius: 4px;
 }
 
 /* close button styling */
@@ -3306,7 +3385,7 @@
  * GtkAssistant *
  ****************/
 
-assistant .sidebar highlight {
+assistant .sidebar .highlight {
     color: @theme_fg_color;
     font-weight: bold;
 }
@@ -3318,8 +3397,7 @@
     border-style: solid;
     border-color: @gtkassistant_sidebar_border_color;
     color: mix (@theme_fg_color, @theme_bg_color, 0.40);
-    background-color: shade (@theme_bg_color, 0.97);
-    /* shall we make it like sidebars in general? */
+    background-color: @sidebar_bg_color;
 }
 
 /*************
@@ -3694,7 +3772,6 @@
     color: alpha(@theme_fg_color, 0.4);
 }
 
-highlight,
 calendar.highlight {
     background-color: @theme_selected_bg_color;
     color: @theme_selected_fg_color;
@@ -3745,17 +3822,19 @@
     border-width: 1px;
 }
 
-infobar:last-child,
-.info:last-child,
-.warning:last-child,
-.question:last-child,
-.error:last-child {
-    /* only apply a border on the last infobar if
-     * there's more than one packed in */
-    border-bottom-width: 1px;
+infobar,
+.info,
+.warning,
+.question,
+.error {
+    border-width: 1px;
     border-style: solid;
 }
 
+infobar {
+    border-color: shade(@border_color, 0.9);
+}
+
 .info,
 .info > * {
     background-color: @info_bg_color;
@@ -4248,13 +4327,18 @@
  ******************/
 
 /* ie. mate-keyboard-properties option window */
-dialog scrolledwindow.frame {
+dialog > .vertical.dialog-vbox > scrolledwindow.frame {
     border-color: @border_color;
     border-style: solid;
     border-width: 1px;
     border-radius: 2px;
 }
 
+dialog > .vertical.dialog-vbox > scrolledwindow.frame > viewport.view > box.vertical > expander {
+    border-style: none;
+    background-color: transparent;
+}
+
 /* credits in GtkAbout windows */
 dialog .dialog-vbox scrolledwindow.frame > viewport.view.frame {
     background-color: shade (@theme_bg_color, 1.04);
@@ -4268,14 +4352,21 @@
     border-width: 1px;
 }
 
+/* ie. caja fm-properties-window notes tab */
+dialog > .vertical.dialog-vbox > notebook.frame > stack > scrolledwindow,
+dialog > .vertical.dialog-vbox > notebook.frame > stack > scrolledwindow.frame {
+    border-style: none;
+}
+
 /* print dialog */
 printdialog.background > box.view.vertical.dialog-vbox {
+    margin: 7px;
     background-color: shade (@theme_bg_color, 1.0);
 }
 
 printdialog.background paper {
     border-style: solid;
-    border-width: 1px;
+    border-width: 0.9px;
     border-radius: 0px;
     border-color: @border_color;
     background-color: @theme_base_color;
diff -Nru mate-themes-3.22.6/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css mate-themes-3.22.11/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css
--- mate-themes-3.22.6/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/TraditionalOk/gtk-3.0/gtk-widgets-img.css	2017-05-11 10:26:34.000000000 +0200
@@ -668,7 +668,8 @@
 toolbar.primary-toolbar combobox button:focus,
 toolbar.inline-toolbar.horizontal button.text-button:focus,
 combobox button.combo:focus,
-combobox .linked button.combo:focus {
+combobox .linked button.combo:focus,
+combobox .linked button.combo:focus:only-child {
     border-image: url("img/border-focused.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
     border-radius: 3px;
     border-width: 1px 1px 2px 1px;
diff -Nru mate-themes-3.22.6/desktop-themes/TraditionalOk/gtk-3.0/img/Makefile.am mate-themes-3.22.11/desktop-themes/TraditionalOk/gtk-3.0/img/Makefile.am
--- mate-themes-3.22.6/desktop-themes/TraditionalOk/gtk-3.0/img/Makefile.am	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/TraditionalOk/gtk-3.0/img/Makefile.am	2017-05-11 10:26:34.000000000 +0200
@@ -35,6 +35,7 @@
 	menuitem-radio-hover.png \
 	menuitem-radio-insensitive.png \
 	menuitem-radio.png \
+	panel-grid.svg \
 	pane-separator-grip-horz.png \
 	pane-separator-grip-vert.png \
 	radio-checked-hover.png \
diff -Nru mate-themes-3.22.6/desktop-themes/TraditionalOk/gtk-3.0/img/panel-grid.svg mate-themes-3.22.11/desktop-themes/TraditionalOk/gtk-3.0/img/panel-grid.svg
--- mate-themes-3.22.6/desktop-themes/TraditionalOk/gtk-3.0/img/panel-grid.svg	1970-01-01 01:00:00.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/TraditionalOk/gtk-3.0/img/panel-grid.svg	2017-05-11 10:26:34.000000000 +0200
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/";
+   xmlns:cc="http://creativecommons.org/ns#";
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+   xmlns:svg="http://www.w3.org/2000/svg";
+   xmlns="http://www.w3.org/2000/svg";
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd";
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+   sodipodi:docname="panel-grid.svg"
+   height="22"
+   id="svg7384"
+   inkscape:version="0.92.1 r15371"
+   version="1.1"
+   width="12">
+  <metadata
+     id="metadata90">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview
+     inkscape:bbox-nodes="false"
+     inkscape:bbox-paths="true"
+     bordercolor="#666666"
+     borderopacity="1"
+     inkscape:current-layer="layer12"
+     inkscape:cx="6.2320295"
+     inkscape:cy="10.82843"
+     gridtolerance="10"
+     inkscape:guide-bbox="true"
+     guidetolerance="10"
+     id="namedview88"
+     inkscape:object-nodes="false"
+     inkscape:object-paths="false"
+     objecttolerance="10"
+     pagecolor="#3a3b39"
+     inkscape:pageopacity="1"
+     inkscape:pageshadow="2"
+     showborder="true"
+     showgrid="false"
+     showguides="true"
+     inkscape:snap-bbox="true"
+     inkscape:snap-bbox-midpoints="false"
+     inkscape:snap-global="true"
+     inkscape:snap-grids="true"
+     inkscape:snap-nodes="true"
+     inkscape:snap-others="false"
+     inkscape:snap-to-guides="true"
+     inkscape:window-height="953"
+     inkscape:window-maximized="1"
+     inkscape:window-width="1280"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:zoom="45.6875">
+    <inkscape:grid
+       empspacing="2"
+       enabled="true"
+       id="grid4866"
+       originx="119.9998"
+       originy="650"
+       snapvisiblegridlinesonly="true"
+       spacingx="1"
+       spacingy="1"
+       type="xygrid"
+       visible="true" />
+    <inkscape:grid
+       color="#000000"
+       empcolor="#000000"
+       empopacity="0"
+       empspacing="4"
+       enabled="true"
+       id="grid5968"
+       opacity="0.1254902"
+       originx="119.9998"
+       originy="650"
+       snapvisiblegridlinesonly="true"
+       spacingx="0.5"
+       spacingy="0.5"
+       type="xygrid"
+       visible="true" />
+  </sodipodi:namedview>
+  <title
+     id="title9167">Gnome Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer9"
+     inkscape:label="status"
+     style="display:inline"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer10"
+     inkscape:label="devices"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer11"
+     inkscape:label="apps"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer13"
+     inkscape:label="places"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer14"
+     inkscape:label="mimetypes"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer15"
+     inkscape:label="emblems"
+     style="display:inline"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g71291"
+     inkscape:label="emotes"
+     style="display:inline"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="g4953"
+     inkscape:label="categories"
+     style="display:inline"
+     transform="translate(-121.0004,-861)" />
+  <g
+     inkscape:groupmode="layer"
+     id="layer12"
+     inkscape:label="actions"
+     style="display:inline"
+     transform="translate(-121.0004,-861)">
+    <rect
+       height="4"
+       id="rect20592"
+       rx="0.38461545"
+       ry="0.50229359"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+       width="4"
+       x="125.23243"
+       y="864.17157" />
+    <rect
+       height="4"
+       id="rect16730"
+       rx="0.38461545"
+       ry="0.50229359"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#b3cdee;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+       width="4"
+       x="125.23243"
+       y="870.17157" />
+    <rect
+       height="4"
+       id="rect16732"
+       rx="0.38461545"
+       ry="0.50229359"
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#94b6e1;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:new"
+       width="4"
+       x="125.23243"
+       y="876.17157" />
+  </g>
+</svg>
diff -Nru mate-themes-3.22.6/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css mate-themes-3.22.11/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css
--- mate-themes-3.22.6/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/desktop-themes/TraditionalOk/gtk-3.0/mate-applications.css	2017-05-11 10:26:34.000000000 +0200
@@ -84,7 +84,7 @@
 }
 
 .caja-navigation-window .view.caja-canvas-item:selected {
-    color: @theme_sectected_fg_color;
+    color: @theme_selected_fg_color;
 }
 
 /***************
@@ -112,11 +112,24 @@
     text-shadow: none;
 }
 
+MatePanelAppletFrameDBus {
+    background-image: -gtk-scaled(url("img/panel-grid.svg"));
+    background-color: transparent;
+    background-repeat: no-repeat;
+    background-position: left;
+}
+
 /* workaround to avoid unwanted black frames if switching compositor on/off */
 .mate-panel-menu-bar .window-frame.csd.popup {
     box-shadow: none;
 }
 
+/* hide buttons */
+PanelToplevel > grid > button {
+    padding: 0px;
+    border-radius: 0px;
+}
+
 #PanelApplet {
     border-width: 0;
 }
@@ -216,6 +229,15 @@
     border-image: none;
 }
 
+/* 1.18 changings for gtk+-3.22 warning fixes*/
+.mate-panel-menu-bar #PanelApplet #drive-button,
+.mate-panel-menu-bar #PanelApplet #drive-button:hover,
+.mate-panel-menu-bar #PanelApplet #charpick-applet-button,
+.mate-panel-menu-bar #PanelApplet #showdesktop-button:checked {
+    border-image: url("img/border.svg") 3 3 4 3 / 3px 3px 4px 3px repeat;
+    border-width: 0px;
+}
+
 #PanelApplet > #clock-applet-button.flat.toggle {
    background-color: transparent;
    background-image: none;
@@ -300,7 +322,6 @@
     padding: 0;
     text-shadow: none;
     -NaTrayApplet-icon-padding: 1px; /*any more and outlines get cut off*/
-    -NaTrayApplet-icon-size: 16;
 }
 
 /* volume applet, brightness applet */
@@ -308,7 +329,7 @@
     background: transparent;
 }
 
-.mate-panel-applet-slider .frame {
+.mate-panel-applet-slider frame {
     background-color: @theme_bg_color;
     border-image: none;
     border-style: solid;
@@ -317,16 +338,30 @@
     margin: 0px;
 }
 
-.mate-panel-applet-slider .frame .frame{
+.mate-panel-applet-slider frame frame {
     background-color:transparent;
     border-style: none;
     box-shadow: none;
 }
 
-.mate-panel-applet-slider .frame .button {
+.mate-panel-applet-slider frame button {
     color: @theme_fg_color;
 }
 
+/* mate-menu, mintmenu fork */
+#mate-menu.background {
+    border-color: @border_color;
+    border-style: solid;
+    border-width: 1px;
+}
+
+/* mate-indicator-applet */
+/* needed for a transparent panel */
+#fast-user-switch-applet > #fast-user-switch-menubar {
+    background-color: transparent;
+    background-image: none;
+}
+
 /****************
  * Pluma *
  ****************/
@@ -503,14 +538,36 @@
  * mate-terminal *
  *****************/
 
-/* override for pavu-control */
-window.background.mate-terminal > box.vertical > notebook {
+/* override settings for pavu-control */
+window.background.mate-terminal > box.vertical > notebook,
+window.background.mate-terminal > box.vertical > notebook > stack > box {
     border-style: none;
-    border-width: 0px;
+    margin: 0px;
 }
 
 /* override settings for pavu-control */
-window.background.mate-terminal > box.vertical > notebook > header.top tab,
+window.background.mate-terminal > box.vertical > notebook > header.top {
+    border-radius: 3px 0px 0px 0px;
+    margin: 0px;
+    border-style: solid;
+    border-image: linear-gradient(to bottom,
+                  shade(@notebook_tab_gradient_a, 1.05),
+                  shade(@notebook_tab_gradient_b, 1.04) 50%,
+                  shade(@notebook_tab_gradient_c, 1.06) 50%,
+                  shade(@notebook_tab_gradient_d, 1.05)) 0 100%;
+    box-shadow: inset  0px -1px 0 0 @border_color;
+    border-width: 0px 0px 0px 1px;
+}
+
+window.background.mate-terminal > box.vertical > notebook > header.top tab {
+    border-radius: 3px 3px 0px 0px;
+    padding: 4px 2px 4px 6px;
+    margin: 0px 0px 0px -1px;
+    border-style: solid;
+    border-color: @border_color;
+    border-width: 1px;
+}
+
 window.background.mate-terminal > box.vertical > notebook > header.top tab:checked,
 window.background.mate-terminal > box.vertical > notebook > header.top tab:checked:hover {
     border-radius: 3px 3px 0px 0px;
@@ -518,6 +575,9 @@
     margin: 0px 0px 0px -1px;
     border-style: solid;
     border-color: @border_color;
+    border-top-color: @notebook_active_tab_border;
+    border-left-color: @notebook_active_tab_border;
+    border-right-color: @notebook_active_tab_border;
     border-width: 1px;
 }
 
@@ -547,3 +607,16 @@
     outline-style: dashed;
 }
 
+/* mate-keyboard-layout-view, mate-keyboard-layout-chooser */
+/* this way it styles only the border of the keys, the bg of the map itself
+   use the .view class, and use old and new selectors for a while */
+matekbd-keyboard-drawing,
+.gswitchit-layout-view > box.dialog-vbox > box.vertical > widget,
+#xkb-layout-chooser > box.dialog-vbox > box.vertical > box.vertical > frame > widget {
+    background-color: shade (@theme_bg_color, 1.0);
+}
+
+#xkb-layout-chooser > box.dialog-vbox > box.vertical > box.vertical > frame > border {
+    border-radius: 0px;
+}
+
diff -Nru mate-themes-3.22.6/NEWS mate-themes-3.22.11/NEWS
--- mate-themes-3.22.6/NEWS	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/NEWS	2017-05-11 10:26:34.000000000 +0200
@@ -1,3 +1,112 @@
+3.22.11 (GTK 3.22)
+
+    sync with transifex
+    BlackMATE: fully style noncomposited m-s-d OSD
+    BlackMATE: support new msd-osd-window-solid style class for non-composited OSD case
+    BlackMATE: make caja renaming labels more readable
+    ContrastHighInverse: Fix Caja rename labels when theme actually applied
+    cursor: add color-picker cursor image
+    GTK+-3.20 submarine themes: improve mate- and mintmenu
+    Gtk+-3.20 menta themes: fixes for mate- and mint-menu
+    Gtk+-3.20 Traditional themes: improve some dialog windows
+    Traditional themes: don't draw a bg for mate-indicator-applet
+    Gtk+-3.20 most themes: fix bg color in list-view of caja inactive-pane
+    Gtk+-3.20 all themes: add new css name matekbd-keyboard-drawing
+    metacity submarine themes: fix innerborder if metacity or compiz WM is used
+    TOK/TG: xfce4-terminal: gradient color to the notebook header border
+    TOK/TG: make padding in notebook tabs 2 pixels bigger
+
+3.22.10 (GTK 3.22)
+
+    menta-fix "{{" typo breaking gtk-widgets.css file
+    All themes: Fix: print dialog paper depictions not appearing correctly
+
+3.22.9 (GTK 3.22)
+
+    Gtk+-3.20 Menta themes: don't make any different between backdrop and normal state
+    Gtk+-3.20 most themes: mate-panel hide button modification
+    TOK/TG: caja: set gradient color to the notebook header border
+    Gtk+-3.20 submarine themes: mate-panel hide button modifications
+    TOK/TG: Fixes borders in xfce4-terminal tabs and probably more applications
+    Gtk+-3.20 all themes: improvements for mate-menu
+    Gtk+-3.20 all themes: better way to style keyboard layouts
+    TOK/TG: mate-terminal: set gradient color to the notebook header border
+    Gtk+-3.20 Traditional: set color to the notebook header border in mate-terminal
+    Gtk+-3.20 Menta themes: sort mate-applications.css
+    Menta themes: set color to the notebook header border
+    TOK/TG: New colors in panel grid
+    Gtk+-3.20 all themes: style mate-keyboard-layout-viewer
+    Traditional themes - use applet handles from Menta
+
+3.22.8 (GTK 3.22)
+
+    TOK/TG: mate-terminal: use border in header tab instead notebook
+    Fix distcheck
+    Gtk+-3.20 ContrastHighInverse: add missing assets to avoid a runtime warning
+    Menta themes: eliminate wrong border-color for lockscreen
+    Gtk+-3.20 submarine: eliminate wrong border-color for lockscreen
+    GreenLaguna: correct notebook tab borders in mate-terminal
+    Submarine themes: correct notebook tab borders in mate-terminal
+    Gtk+-3.20 Menta themes: correct notebook header borders in mate-terminal
+    GreenSubmarine: fix a typo
+    Traditional themes: drop some lines in mate-terminal for a better look
+    Translations update
+    Gtk+-3.20 Most themes: don't use a border for terminal notebook
+    Traditional themes: print dialog improvements
+    Traditional themes: set notebook borders for pavu-control (better fix)
+    Traditional themes: set notebook borders for pavu-control
+    Gtk+-3.20 GreenLaguna: style scrollbar junction
+    Gtk+-3.20: add an annoying wildcard for firefox
+    Gtk+-3.20 GreenLaguna: some border fixes for caja sidebar
+    Gtk+-3.20 GreenLaguna: change border color of GtkSwitch
+    Gtk+-3.20 GreenLaguna: change border-color for scrollbars
+    GTK+-3.20 GreenLaguna: change insensitive_bg_color
+    Gtk+-3.20 GreenLaguna: improve notebooks
+    Traditional themes: drop the two useless lines in the notebooks
+    Gtk+-3.20 GreenLaguna: re-work  borders of frame and other improvements
+    GreenLaguna metacity: increase border size
+    Submarine metacity: increase border size
+    Gtk+-3.20 Submarine: set color for dim-labels at list rows
+    Traditional themes: set more border colors in checked notebook tabs
+    Gtk+-3.20 submarine themes set a padding on statusbars
+    Gtk+-3.20: fix jumping button in mate-font-viewer toolbar
+    Gtk+-3.20 submarine themes: improve headerbars and popover menus
+    Gtk+-3.20 submarine themes: set a padding for gedit statusbar
+    Gtk+-3.20 Menta themes: add missing border-image for button.fat:checked in filezilla and atril
+    Gtk+-3.20 Menta themes: some notebook improvements
+    Fixed URL colors for Firefox search suggestions
+    Gtk+-3.20 Menta themes: re-work borders for frames and other improvements (mega commit)
+    Traditional themes: make padding in notebook tabs smaller
+    Gtk+-3.20 submarine themes: several improvements
+    Gtk+-3.22 Submarine themes: some notebook improvements
+    Gtk+-3.22 Submarine themes: re-work borders for frames
+    Gtk+-3.20 Submarine themes: fix previous commit for rubberband
+    Gtk+-3.20 submarine themes: fix rubberband for mate-screenshot
+    TOK theme: fix a typo
+    Gtk+-3.20 submarine themes: fix toolbar label color
+    Traditional themes: use gradient color on active tabs
+    Gtk+-2.0 Greenlaguna: use hardcoded hex colors in gtkrc
+    Gtk+-2.0 most themes: use a oneliner for color definitions in gtkrc
+    Traditional themes: add a border-image for some applets
+    Gtk+-3.20 Traditional themes: use a border for the whole GtkInfobar
+    Gtk+-3.20 Traditional themes: workaround, fix some borders in firefox
+    Gtk+-3.20 Traditional themes: fix jumping combobox button
+    Gtk+-3.20 most themes: fix sidebar of GtkAssistant
+    Gtk+-3.20 Submarine themes: fix sidebar of GtkAssistant
+    Gtk+-3 all themes: don't set NaTrayApplet-icon-size
+
+3.22.7 (GTK 3.22)
+
+    GTK+-3.20 Submarine themes: increase systray margins by 1 pixel to avoid deformed icons
+    GTK+-3.20 Menta themes: increase systray margins by 1 pixel to avoid deformed icons
+    GTK+-3.20 Menta themes: use normal font weighting for panel main menu labels
+    GTK+-3.22 Traditional themes: fix panel applet slider
+    GTK+-3.20 Traditional themes: rework GtkNotebook
+    GTK+-3.20 Traditional themes: fix border-radius of dialog-action-area linked single button
+    GTK+-3.20 Submarine themes: fix border-radius of dialog-action-area linked single button
+    GTK+-3.20 Submarine themes: more outline fixes
+    BlackMATE: Fix disappearing focus of flat buttons
+
 3.22.6 (GTK 3.22)
 
     Translations update
diff -Nru mate-themes-3.22.6/po/af.po mate-themes-3.22.11/po/af.po
--- mate-themes-3.22.6/po/af.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/af.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Afrikaans (http://www.transifex.com/mate/MATE/language/af/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/am.po mate-themes-3.22.11/po/am.po
--- mate-themes-3.22.6/po/am.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/am.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
-"PO-Revision-Date: 2017-01-13 18:10+0000\n"
+"PO-Revision-Date: 2017-03-09 18:12+0000\n"
 "Last-Translator: samson <sambelet@yahoo.com>\n"
 "Language-Team: Amharic (http://www.transifex.com/mate/MATE/language/am/)\n"
 "MIME-Version: 1.0\n"
@@ -25,11 +25,11 @@
 
 #: ../desktop-themes/BlueMenta/index.theme.in.h:1
 msgid "A clean light theme with blue elements"
-msgstr ""
+msgstr "ንፁህ ቀላል ገጽታ ከ ሰማያዊ አካል ጋር"
 
 #: ../desktop-themes/Blue-Submarine/index.theme.in.h:1
 msgid "A medium blue theme with dark menus and panel"
-msgstr ""
+msgstr "መካከለኛ ሰማያዊ ገጽታ ከ ጥቁር ዝርዝር እና ክፍል ጋር"
 
 #: ../desktop-themes/ContrastHighInverse/index.theme.in.h:1
 msgid "High Contrast Inverse"
@@ -41,20 +41,20 @@
 
 #: ../desktop-themes/GreenLaguna/index.theme.in.h:1
 msgid "A clean light green theme"
-msgstr ""
+msgstr "ንፁህ ነጣ ያለ አረንጓዴ "
 
 #: ../desktop-themes/Green-Submarine/index.theme.in.h:1
 msgid "A medium green theme with dark menus and panel"
-msgstr ""
+msgstr "መካከለኛ አረንጓዴ ገጽታ ከ ጥቁር ዝርዝር እና ክፍል ጋር"
 
 #: ../desktop-themes/Menta/index.theme.in.h:1
 msgid "A clean light theme with green elements"
-msgstr ""
+msgstr "ንፁህ ቀላል ገጽታ ከ አረንጌዴ አካላቶች ጋር"
 
 #: ../desktop-themes/TraditionalGreen/index.theme.in.h:1
 msgid "Green port of Clearlooks-Phenix"
-msgstr ""
+msgstr "አረንጓዴ port ለ ንፁህ መመልከቻ-Phenix"
 
 #: ../desktop-themes/TraditionalOk/index.theme.in.h:1
 msgid "Port of Clearlooks-Phenix"
-msgstr ""
+msgstr "Port of ለ ንፁህ መመልከቻ-Phenix"
diff -Nru mate-themes-3.22.6/po/as.po mate-themes-3.22.11/po/as.po
--- mate-themes-3.22.6/po/as.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/as.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Assamese (http://www.transifex.com/mate/MATE/language/as/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/ast.po mate-themes-3.22.11/po/ast.po
--- mate-themes-3.22.6/po/ast.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/ast.po	2017-05-11 10:26:34.000000000 +0200
@@ -12,7 +12,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Asturian (http://www.transifex.com/mate/MATE/language/ast/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/az.po mate-themes-3.22.11/po/az.po
--- mate-themes-3.22.6/po/az.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/az.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Azerbaijani (http://www.transifex.com/mate/MATE/language/az/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/be.po mate-themes-3.22.11/po/be.po
--- mate-themes-3.22.6/po/be.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/be.po	2017-05-11 10:26:34.000000000 +0200
@@ -12,7 +12,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Belarusian (http://www.transifex.com/mate/MATE/language/be/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/bn_IN.po mate-themes-3.22.11/po/bn_IN.po
--- mate-themes-3.22.6/po/bn_IN.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/bn_IN.po	2017-05-11 10:26:34.000000000 +0200
@@ -12,7 +12,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Bengali (India) (http://www.transifex.com/mate/MATE/language/bn_IN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/bn.po mate-themes-3.22.11/po/bn.po
--- mate-themes-3.22.6/po/bn.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/bn.po	2017-05-11 10:26:34.000000000 +0200
@@ -13,7 +13,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Bengali (http://www.transifex.com/mate/MATE/language/bn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/br.po mate-themes-3.22.11/po/br.po
--- mate-themes-3.22.6/po/br.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/br.po	2017-05-11 10:26:34.000000000 +0200
@@ -11,7 +11,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Breton (http://www.transifex.com/mate/MATE/language/br/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/cmn.po mate-themes-3.22.11/po/cmn.po
--- mate-themes-3.22.6/po/cmn.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/cmn.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Chinese (Mandarin) (http://www.transifex.com/mate/MATE/language/cmn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/crh.po mate-themes-3.22.11/po/crh.po
--- mate-themes-3.22.6/po/crh.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/crh.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Crimean Turkish (http://www.transifex.com/mate/MATE/language/crh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/cy.po mate-themes-3.22.11/po/cy.po
--- mate-themes-3.22.6/po/cy.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/cy.po	2017-05-11 10:26:34.000000000 +0200
@@ -11,7 +11,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Welsh (http://www.transifex.com/mate/MATE/language/cy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/da.po mate-themes-3.22.11/po/da.po
--- mate-themes-3.22.6/po/da.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/da.po	2017-05-11 10:26:34.000000000 +0200
@@ -11,7 +11,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Danish (http://www.transifex.com/mate/MATE/language/da/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/de.po mate-themes-3.22.11/po/de.po
--- mate-themes-3.22.6/po/de.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/de.po	2017-05-11 10:26:34.000000000 +0200
@@ -8,14 +8,14 @@
 # crazyd <lebendig2002@yahoo.de>, 2012
 # Forecast <taisto@web.de>, 2012
 # Tobias Bannert <tobannert@gmail.com>, 2016
-# Wolfgang Ulbrich <chat-to-me@raveit.de>, 2016
+# Wolfgang Ulbrich <mate@raveit.de>, 2016
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: German (http://www.transifex.com/mate/MATE/language/de/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/dz.po mate-themes-3.22.11/po/dz.po
--- mate-themes-3.22.6/po/dz.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/dz.po	2017-05-11 10:26:34.000000000 +0200
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Dzongkha (http://www.transifex.com/mate/MATE/language/dz/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/el.po mate-themes-3.22.11/po/el.po
--- mate-themes-3.22.6/po/el.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/el.po	2017-05-11 10:26:34.000000000 +0200
@@ -9,13 +9,14 @@
 # Jennie Petoumenou <epetoumenou@gmail.com>, 2009
 # Kostas Papadimas <pkst@gmx.net>, 2002, 2003
 # Kostas Papadimas <pkst@gnome.org>, 2004, 2006
+# Γιώργος Μηντζιλώνης, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
-"PO-Revision-Date: 2016-10-16 06:48+0000\n"
-"Last-Translator: Angelos Chraniotis <chraniotis@gmail.com>\n"
+"PO-Revision-Date: 2017-02-07 20:15+0000\n"
+"Last-Translator: Αλέξανδρος Καπετάνιος <alexandros@gnugr.org>\n"
 "Language-Team: Greek (http://www.transifex.com/mate/MATE/language/el/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,8 +58,8 @@
 
 #: ../desktop-themes/TraditionalGreen/index.theme.in.h:1
 msgid "Green port of Clearlooks-Phenix"
-msgstr ""
+msgstr "Πράσινη θύρα του Clearlooks-Phenix"
 
 #: ../desktop-themes/TraditionalOk/index.theme.in.h:1
 msgid "Port of Clearlooks-Phenix"
-msgstr ""
+msgstr "Θύρα του Clearlooks-Phenix"
diff -Nru mate-themes-3.22.6/po/en_AU.po mate-themes-3.22.11/po/en_AU.po
--- mate-themes-3.22.6/po/en_AU.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/en_AU.po	2017-05-11 10:26:34.000000000 +0200
@@ -12,7 +12,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: English (Australia) (http://www.transifex.com/mate/MATE/language/en_AU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/en_CA.po mate-themes-3.22.11/po/en_CA.po
--- mate-themes-3.22.6/po/en_CA.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/en_CA.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: English (Canada) (http://www.transifex.com/mate/MATE/language/en_CA/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/en_GB.po mate-themes-3.22.11/po/en_GB.po
--- mate-themes-3.22.6/po/en_GB.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/en_GB.po	2017-05-11 10:26:34.000000000 +0200
@@ -12,7 +12,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: English (United Kingdom) (http://www.transifex.com/mate/MATE/language/en_GB/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/es_MX.po mate-themes-3.22.11/po/es_MX.po
--- mate-themes-3.22.6/po/es_MX.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/es_MX.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Spanish (Mexico) (http://www.transifex.com/mate/MATE/language/es_MX/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/es.po mate-themes-3.22.11/po/es.po
--- mate-themes-3.22.6/po/es.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/es.po	2017-05-11 10:26:34.000000000 +0200
@@ -18,7 +18,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Spanish (http://www.transifex.com/mate/MATE/language/es/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/et.po mate-themes-3.22.11/po/et.po
--- mate-themes-3.22.6/po/et.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/et.po	2017-05-11 10:26:34.000000000 +0200
@@ -12,7 +12,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Estonian (http://www.transifex.com/mate/MATE/language/et/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/fa.po mate-themes-3.22.11/po/fa.po
--- mate-themes-3.22.6/po/fa.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/fa.po	2017-05-11 10:26:34.000000000 +0200
@@ -12,7 +12,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Persian (http://www.transifex.com/mate/MATE/language/fa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/fi.po mate-themes-3.22.11/po/fi.po
--- mate-themes-3.22.6/po/fi.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/fi.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Finnish (http://www.transifex.com/mate/MATE/language/fi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/fr.po mate-themes-3.22.11/po/fr.po
--- mate-themes-3.22.6/po/fr.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/fr.po	2017-05-11 10:26:34.000000000 +0200
@@ -14,7 +14,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: French (http://www.transifex.com/mate/MATE/language/fr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/fur.po mate-themes-3.22.11/po/fur.po
--- mate-themes-3.22.6/po/fur.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/fur.po	2017-05-11 10:26:34.000000000 +0200
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Friulian (http://www.transifex.com/mate/MATE/language/fur/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/ga.po mate-themes-3.22.11/po/ga.po
--- mate-themes-3.22.6/po/ga.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/ga.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Irish (http://www.transifex.com/mate/MATE/language/ga/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/he.po mate-themes-3.22.11/po/he.po
--- mate-themes-3.22.6/po/he.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/he.po	2017-05-11 10:26:34.000000000 +0200
@@ -12,7 +12,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Hebrew (http://www.transifex.com/mate/MATE/language/he/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/hi.po mate-themes-3.22.11/po/hi.po
--- mate-themes-3.22.6/po/hi.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/hi.po	2017-05-11 10:26:34.000000000 +0200
@@ -12,7 +12,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Hindi (http://www.transifex.com/mate/MATE/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/hr.po mate-themes-3.22.11/po/hr.po
--- mate-themes-3.22.6/po/hr.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/hr.po	2017-05-11 10:26:34.000000000 +0200
@@ -12,7 +12,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Croatian (http://www.transifex.com/mate/MATE/language/hr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/hu.po mate-themes-3.22.11/po/hu.po
--- mate-themes-3.22.6/po/hu.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/hu.po	2017-05-11 10:26:34.000000000 +0200
@@ -13,7 +13,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Hungarian (http://www.transifex.com/mate/MATE/language/hu/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/hy.po mate-themes-3.22.11/po/hy.po
--- mate-themes-3.22.6/po/hy.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/hy.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Armenian (http://www.transifex.com/mate/MATE/language/hy/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/id.po mate-themes-3.22.11/po/id.po
--- mate-themes-3.22.6/po/id.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/id.po	2017-05-11 10:26:34.000000000 +0200
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # hpiece 8 <hpiece8@gmail.com>, 2016
-# Mohamad Hasan Al Banna <se7entime@protonmail.com>, 2012
+# Mohamad Hasan Al Banna <se7entime@openmailbox.org>, 2012
 # Mohammad DAMT <mdamt@bisnisweb.com>, 2003
 # Willy Sudiarto Raharjo <willysr@slackware-id.org>, 2016
 msgid ""
@@ -13,7 +13,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Indonesian (http://www.transifex.com/mate/MATE/language/id/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/is.po mate-themes-3.22.11/po/is.po
--- mate-themes-3.22.6/po/is.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/is.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Icelandic (http://www.transifex.com/mate/MATE/language/is/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/ka.po mate-themes-3.22.11/po/ka.po
--- mate-themes-3.22.6/po/ka.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/ka.po	2017-05-11 10:26:34.000000000 +0200
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Georgian (http://www.transifex.com/mate/MATE/language/ka/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/kk.po mate-themes-3.22.11/po/kk.po
--- mate-themes-3.22.6/po/kk.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/kk.po	2017-05-11 10:26:34.000000000 +0200
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Baurzhan Muftakhidinov <baurthefirst@gmail.com>, 2017
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-11 10:41+0100\n"
-"PO-Revision-Date: 2016-03-11 09:44+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"POT-Creation-Date: 2016-04-10 20:56+0200\n"
+"PO-Revision-Date: 2017-03-18 05:28+0000\n"
+"Last-Translator: Baurzhan Muftakhidinov <baurthefirst@gmail.com>\n"
 "Language-Team: Kazakh (http://www.transifex.com/mate/MATE/language/kk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,48 +20,40 @@
 
 #: ../desktop-themes/BlackMATE/index.theme.in.h:1
 msgid "A clean dark theme"
-msgstr ""
+msgstr "Таза, қараңғы тем"
 
 #: ../desktop-themes/BlueMenta/index.theme.in.h:1
 msgid "A clean light theme with blue elements"
-msgstr ""
+msgstr "Көгілдір элементтері бар таза, ақшыл тема"
 
 #: ../desktop-themes/Blue-Submarine/index.theme.in.h:1
 msgid "A medium blue theme with dark menus and panel"
-msgstr ""
-
-#: ../desktop-themes/ContrastHigh/index.theme.in.h:1
-msgid "High Contrast"
-msgstr "Жоғары контраст"
-
-#: ../desktop-themes/ContrastHigh/index.theme.in.h:2
-msgid "Black-on-white text and icons"
-msgstr ""
+msgstr "Қараңғы мәзірлер және панелі бар орташа көгілдір тема"
 
 #: ../desktop-themes/ContrastHighInverse/index.theme.in.h:1
 msgid "High Contrast Inverse"
-msgstr ""
+msgstr "Жоғары контрастты терістелген"
 
 #: ../desktop-themes/ContrastHighInverse/index.theme.in.h:2
 msgid "White-on-black text and icons"
-msgstr ""
+msgstr "Қара үстіндегі ақ мәтін және таңбашалар"
 
 #: ../desktop-themes/GreenLaguna/index.theme.in.h:1
 msgid "A clean light green theme"
-msgstr ""
+msgstr "Таза, ақшыл жасыл тема"
 
 #: ../desktop-themes/Green-Submarine/index.theme.in.h:1
 msgid "A medium green theme with dark menus and panel"
-msgstr ""
+msgstr "Қараңғы мәзірлер және панелі бар орташа жасыл тема"
 
 #: ../desktop-themes/Menta/index.theme.in.h:1
 msgid "A clean light theme with green elements"
-msgstr ""
+msgstr "Жасыл элементтері бар таза, ақшыл тема"
 
 #: ../desktop-themes/TraditionalGreen/index.theme.in.h:1
 msgid "Green port of Clearlooks-Phenix"
-msgstr ""
+msgstr "Clearlooks-Phenix темасының жасыл нұсқасы"
 
 #: ../desktop-themes/TraditionalOk/index.theme.in.h:1
 msgid "Port of Clearlooks-Phenix"
-msgstr ""
+msgstr "Clearlooks-Phenix темасының нұсқасы"
diff -Nru mate-themes-3.22.6/po/kn.po mate-themes-3.22.11/po/kn.po
--- mate-themes-3.22.6/po/kn.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/kn.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Kannada (http://www.transifex.com/mate/MATE/language/kn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/ky.po mate-themes-3.22.11/po/ky.po
--- mate-themes-3.22.6/po/ky.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/ky.po	2017-05-11 10:26:34.000000000 +0200
@@ -12,7 +12,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Kyrgyz (http://www.transifex.com/mate/MATE/language/ky/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/li.po mate-themes-3.22.11/po/li.po
--- mate-themes-3.22.6/po/li.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/li.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Limburgian (http://www.transifex.com/mate/MATE/language/li/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/lt.po mate-themes-3.22.11/po/lt.po
--- mate-themes-3.22.6/po/lt.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/lt.po	2017-05-11 10:26:34.000000000 +0200
@@ -14,7 +14,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Lithuanian (http://www.transifex.com/mate/MATE/language/lt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/lv.po mate-themes-3.22.11/po/lv.po
--- mate-themes-3.22.6/po/lv.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/lv.po	2017-05-11 10:26:34.000000000 +0200
@@ -13,7 +13,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Latvian (http://www.transifex.com/mate/MATE/language/lv/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/mai.po mate-themes-3.22.11/po/mai.po
--- mate-themes-3.22.6/po/mai.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/mai.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Maithili (http://www.transifex.com/mate/MATE/language/mai/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/mg.po mate-themes-3.22.11/po/mg.po
--- mate-themes-3.22.6/po/mg.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/mg.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Malagasy (http://www.transifex.com/mate/MATE/language/mg/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/mk.po mate-themes-3.22.11/po/mk.po
--- mate-themes-3.22.6/po/mk.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/mk.po	2017-05-11 10:26:34.000000000 +0200
@@ -16,7 +16,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Macedonian (http://www.transifex.com/mate/MATE/language/mk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/ml.po mate-themes-3.22.11/po/ml.po
--- mate-themes-3.22.6/po/ml.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/ml.po	2017-05-11 10:26:34.000000000 +0200
@@ -13,7 +13,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Malayalam (http://www.transifex.com/mate/MATE/language/ml/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/mn.po mate-themes-3.22.11/po/mn.po
--- mate-themes-3.22.6/po/mn.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/mn.po	2017-05-11 10:26:34.000000000 +0200
@@ -11,7 +11,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Mongolian (http://www.transifex.com/mate/MATE/language/mn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/mr.po mate-themes-3.22.11/po/mr.po
--- mate-themes-3.22.6/po/mr.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/mr.po	2017-05-11 10:26:34.000000000 +0200
@@ -13,7 +13,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Marathi (http://www.transifex.com/mate/MATE/language/mr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/nds.po mate-themes-3.22.11/po/nds.po
--- mate-themes-3.22.6/po/nds.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/nds.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Low German (http://www.transifex.com/mate/MATE/language/nds/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/ne.po mate-themes-3.22.11/po/ne.po
--- mate-themes-3.22.6/po/ne.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/ne.po	2017-05-11 10:26:34.000000000 +0200
@@ -11,7 +11,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Nepali (http://www.transifex.com/mate/MATE/language/ne/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/nl.po mate-themes-3.22.11/po/nl.po
--- mate-themes-3.22.6/po/nl.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/nl.po	2017-05-11 10:26:34.000000000 +0200
@@ -16,7 +16,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Dutch (http://www.transifex.com/mate/MATE/language/nl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/nn.po mate-themes-3.22.11/po/nn.po
--- mate-themes-3.22.6/po/nn.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/nn.po	2017-05-11 10:26:34.000000000 +0200
@@ -12,7 +12,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Norwegian Nynorsk (http://www.transifex.com/mate/MATE/language/nn/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/or.po mate-themes-3.22.11/po/or.po
--- mate-themes-3.22.6/po/or.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/or.po	2017-05-11 10:26:34.000000000 +0200
@@ -12,7 +12,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Oriya (http://www.transifex.com/mate/MATE/language/or/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/pa.po mate-themes-3.22.11/po/pa.po
--- mate-themes-3.22.6/po/pa.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/pa.po	2017-05-11 10:26:34.000000000 +0200
@@ -11,7 +11,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Panjabi (Punjabi) (http://www.transifex.com/mate/MATE/language/pa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/pl.po mate-themes-3.22.11/po/pl.po
--- mate-themes-3.22.6/po/pl.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/pl.po	2017-05-11 10:26:34.000000000 +0200
@@ -6,7 +6,7 @@
 # Artur Flinta <aflinta@gmail.com>, 2006
 # Darek Witkowski, 2016
 # Marcin Kralka <marcink96@gmail.com>, 2013
-# Piotr Strębski <strebski@o2.pl>, 2016
+# Piotr Strębski <strebski@gmail.com>, 2016
 # Robert Strojec <ross606@gmail.com>, 2012
 # Tomasz Dominikowski <tdominikowski@aviary.pl>, 2008
 msgid ""
@@ -15,13 +15,13 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 17:04+0000\n"
-"Last-Translator: Piotr Strębski <strebski@o2.pl>\n"
+"Last-Translator: Piotr Strębski <strebski@gmail.com>\n"
 "Language-Team: Polish (http://www.transifex.com/mate/MATE/language/pl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl\n"
-"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>=14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
 
 #: ../desktop-themes/BlackMATE/index.theme.in.h:1
 msgid "A clean dark theme"
diff -Nru mate-themes-3.22.6/po/pt_BR.po mate-themes-3.22.11/po/pt_BR.po
--- mate-themes-3.22.6/po/pt_BR.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/pt_BR.po	2017-05-11 10:26:34.000000000 +0200
@@ -15,7 +15,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/mate/MATE/language/pt_BR/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/pt.po mate-themes-3.22.11/po/pt.po
--- mate-themes-3.22.6/po/pt.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/pt.po	2017-05-11 10:26:34.000000000 +0200
@@ -3,7 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# crolidge, 2014
+# Carlos Moreira, 2014,2017
 # Duarte Loreto <happyguy_pt@hotmail.com>, 2003, 2004, 2005, 2006, 2007, 2008, 2009
 # Pedro Mateus <pedro@linuxgamecast.com>, 2016
 # Sérgio Marques <smarquespt@gmail.com>, 2012
@@ -12,8 +12,8 @@
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
-"PO-Revision-Date: 2016-06-16 15:20+0000\n"
-"Last-Translator: Pedro Mateus <pedro@linuxgamecast.com>\n"
+"PO-Revision-Date: 2017-04-07 12:50+0000\n"
+"Last-Translator: Carlos Moreira\n"
 "Language-Team: Portuguese (http://www.transifex.com/mate/MATE/language/pt/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,4 +59,4 @@
 
 #: ../desktop-themes/TraditionalOk/index.theme.in.h:1
 msgid "Port of Clearlooks-Phenix"
-msgstr "Versão MATE do tema Clearlooks-Phenix"
+msgstr "Tema Clearlooks-Phenix"
diff -Nru mate-themes-3.22.6/po/ru.po mate-themes-3.22.11/po/ru.po
--- mate-themes-3.22.6/po/ru.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/ru.po	2017-05-11 10:26:34.000000000 +0200
@@ -14,7 +14,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Russian (http://www.transifex.com/mate/MATE/language/ru/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/si.po mate-themes-3.22.11/po/si.po
--- mate-themes-3.22.6/po/si.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/si.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Sinhala (http://www.transifex.com/mate/MATE/language/si/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/sk.po mate-themes-3.22.11/po/sk.po
--- mate-themes-3.22.6/po/sk.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/sk.po	2017-05-11 10:26:34.000000000 +0200
@@ -14,7 +14,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Slovak (http://www.transifex.com/mate/MATE/language/sk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/sl.po mate-themes-3.22.11/po/sl.po
--- mate-themes-3.22.6/po/sl.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/sl.po	2017-05-11 10:26:34.000000000 +0200
@@ -12,7 +12,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Slovenian (http://www.transifex.com/mate/MATE/language/sl/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/sq.po mate-themes-3.22.11/po/sq.po
--- mate-themes-3.22.6/po/sq.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/sq.po	2017-05-11 10:26:34.000000000 +0200
@@ -11,7 +11,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Albanian (http://www.transifex.com/mate/MATE/language/sq/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/sr@latin.po mate-themes-3.22.11/po/sr@latin.po
--- mate-themes-3.22.6/po/sr@latin.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/sr@latin.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Serbian (Latin) (http://www.transifex.com/mate/MATE/language/sr@latin/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/sr.po mate-themes-3.22.11/po/sr.po
--- mate-themes-3.22.6/po/sr.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/sr.po	2017-05-11 10:26:34.000000000 +0200
@@ -11,7 +11,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Serbian (http://www.transifex.com/mate/MATE/language/sr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/ta.po mate-themes-3.22.11/po/ta.po
--- mate-themes-3.22.6/po/ta.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/ta.po	2017-05-11 10:26:34.000000000 +0200
@@ -13,7 +13,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Tamil (http://www.transifex.com/mate/MATE/language/ta/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/te.po mate-themes-3.22.11/po/te.po
--- mate-themes-3.22.6/po/te.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/te.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Telugu (http://www.transifex.com/mate/MATE/language/te/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/th.po mate-themes-3.22.11/po/th.po
--- mate-themes-3.22.6/po/th.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/th.po	2017-05-11 10:26:34.000000000 +0200
@@ -11,7 +11,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Thai (http://www.transifex.com/mate/MATE/language/th/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/tr.po mate-themes-3.22.11/po/tr.po
--- mate-themes-3.22.6/po/tr.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/tr.po	2017-05-11 10:26:34.000000000 +0200
@@ -15,7 +15,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Turkish (http://www.transifex.com/mate/MATE/language/tr/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/ug.po mate-themes-3.22.11/po/ug.po
--- mate-themes-3.22.6/po/ug.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/ug.po	2017-05-11 10:26:34.000000000 +0200
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Uighur (http://www.transifex.com/mate/MATE/language/ug/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/uk.po mate-themes-3.22.11/po/uk.po
--- mate-themes-3.22.6/po/uk.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/uk.po	2017-05-11 10:26:34.000000000 +0200
@@ -5,14 +5,14 @@
 # Translators:
 # wanderlust <wanderlust@ukr.net>, 2009
 # zubr139, 2012
-# Микола Ткач <znadobar@gmail.com>, 2014-2016
+# Микола Ткач <znadibnyk@gmail.com>, 2014-2016
 msgid ""
 msgstr ""
 "Project-Id-Version: MATE Desktop Environment\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Ukrainian (http://www.transifex.com/mate/MATE/language/uk/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/vi.po mate-themes-3.22.11/po/vi.po
--- mate-themes-3.22.6/po/vi.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/vi.po	2017-05-11 10:26:34.000000000 +0200
@@ -12,7 +12,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Vietnamese (http://www.transifex.com/mate/MATE/language/vi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/wa.po mate-themes-3.22.11/po/wa.po
--- mate-themes-3.22.6/po/wa.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/wa.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Walloon (http://www.transifex.com/mate/MATE/language/wa/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/xh.po mate-themes-3.22.11/po/xh.po
--- mate-themes-3.22.6/po/xh.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/xh.po	2017-05-11 10:26:34.000000000 +0200
@@ -10,7 +10,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Xhosa (http://www.transifex.com/mate/MATE/language/xh/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/zh_CN.po mate-themes-3.22.11/po/zh_CN.po
--- mate-themes-3.22.6/po/zh_CN.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/zh_CN.po	2017-05-11 10:26:34.000000000 +0200
@@ -13,7 +13,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/mate/MATE/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/zh_HK.po mate-themes-3.22.11/po/zh_HK.po
--- mate-themes-3.22.6/po/zh_HK.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/zh_HK.po	2017-05-11 10:26:34.000000000 +0200
@@ -9,7 +9,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Chinese (Hong Kong) (http://www.transifex.com/mate/MATE/language/zh_HK/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
diff -Nru mate-themes-3.22.6/po/zh_TW.po mate-themes-3.22.11/po/zh_TW.po
--- mate-themes-3.22.6/po/zh_TW.po	2017-01-13 23:23:07.000000000 +0100
+++ mate-themes-3.22.11/po/zh_TW.po	2017-05-11 10:26:34.000000000 +0200
@@ -11,7 +11,7 @@
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2016-04-10 20:56+0200\n"
 "PO-Revision-Date: 2016-03-30 13:29+0000\n"
-"Last-Translator: Wolfgang Ulbrich <chat-to-me@raveit.de>\n"
+"Last-Translator: Wolfgang Ulbrich <mate@raveit.de>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/mate/MATE/language/zh_TW/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"

--- End Message ---
--- Begin Message ---
Mike Gabriel:
> Package: release.debian.org
> Severity: normal
> User: release.debian.org@packages.debian.org
> Usertags: unblock
> 
> Please consider unblocking package mate-themes ready for upload.
> 
> With upstream I have been discussing the ideal solution for mate-themes
> in Debian 9. Upstream highly recommends shipping mate-themes 3.22.11 as
> there have been tons of fixes and improvements compared to what we have
> in Debian 9 at the moment (mate-themes 3.22.6-1).
> 
> However, as the changeset is far from addressing issues atomically, I
> have also prepared a mate-themes 3.22.6-2 cherry-picking one fix for an
> issues with renaming files in Caja. See #853288 for details.
> 
> unblock mate-themes/3.22.11-1
> 
> [...]

I have unblocked it, but if it turns out there any severe issues with
it, please be ready to revert to the original version.

Thanks,
~Niels

--- End Message ---

Reply to: