2 files changed, 19 insertions, 13 deletions
diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css
index 2edb0b13..f0c2850d 100644
--- a/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk-widgets.css
@@ -1536,7 +1536,7 @@ GtkPopover .separator {
 }
 
 .titlebar .titlebutton:hover {
-    background-color: @theme_button_bg;
+    background-color: @theme_fg_color;
     border-color: @theme_button_fg;
     color: @theme_button_fg;
 }
@@ -1547,23 +1547,14 @@ GtkPopover .separator {
     color: @theme_base_color;
 }
 
-/****************************************************************************************
-* Give and take related to recent gtk3.3.14 development,                                *
-* to achieve full size of the icon menu of some of the applications whose notification  *
-* icons appear in the system tray, the "shadow" is disabled.                            *
-* same affect in mate-panel main menu, csd apps, header-bars apps                       *
-* if compositor is disable !!!!!                                                        *
-*****************************************************************************************/
-
 .window-frame {
     border-color: darker(@theme_bg_color);
     border-radius: 7px 7px 0 0;
     border-width: 1px;
     border-style: solid;
-    box-shadow: 0 0 0 @wm_shadow;
-/*    box-shadow: 0 2px 8px 3px alpha(black, 0.7);*/
+    box-shadow: 0 2px 8px 3px alpha(black, 0.7);
     /* this is used for the resize cursor area */
-    margin: 2px;
+    margin: 10px;
     padding: 6px 6px 5px 6px;
 }
 
@@ -1574,10 +1565,22 @@ GtkPopover .separator {
 
 .window-frame:backdrop {
     box-shadow: 0 0 0 @wm_shadow;
-/*    box-shadow: 0 2px 5px 1px alpha(black, 0.7);*/
+    box-shadow: 0 2px 5px 1px alpha(black, 0.7);
     padding: 6px 6px 5px 6px;
 }
 
+.window-frame.ssd {
+    box-shadow: 0 0 0 1px rgba(0, 0, 0, 0.23);
+}
+
+.window-frame.solid-csd {
+    border-radius: 0;
+    margin: 4px;
+    background-color: @wm_bg_a;
+    border: solid 1px @wm_csd_solid_border_color;
+    box-shadow: none;
+}
+
 .window-frame.csd.popup {
     border-radius: 0;
     box-shadow: 0 1px 5px @wm_shadow;
diff --git a/desktop-themes/ContrastHigh/gtk-3.0/gtk.css b/desktop-themes/ContrastHigh/gtk-3.0/gtk.css
index 55c749eb..b0e9dffd 100644
--- a/desktop-themes/ContrastHigh/gtk-3.0/gtk.css
+++ b/desktop-themes/ContrastHigh/gtk-3.0/gtk.css
@@ -74,6 +74,9 @@
 @define-color wm_button_prelight_fg @theme_base_color;
 @define-color wm_button_pressed_fg @theme_base_color;
 @define-color wm_shadow alpha(black, 0.5);
+@define-color wm_bg_a shade (@theme_bg_color, 1.1);
+@define-color wm_bg_b @theme_bg_color;
+@define-color wm_csd_solid_border_color shade (theme_fg_color, 1.0);
 
 /*******
  * OSD *