2 files changed, 40 insertions, 14 deletions
diff --git a/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css b/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css
index 353b5033..1564e40a 100644
--- a/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css
+++ b/desktop-themes/ContrastHighInverse/gtk-3.0/gtk-widgets.css
@@ -1380,13 +1380,12 @@ GtkPopover .separator {
     color: @theme_button_fg;
     background-color: transparent;
     padding: 5px;
-
     border-color: transparent;
 }
 
 .titlebar .titlebutton:hover {
-    background-color: @theme_button_bg;
-    border-color: @theme_button_fg;
+    background-color: @theme_fg_color;
+    border-color: @theme_fg_color;
     color: @theme_button_fg;
 }
 
@@ -1395,28 +1394,52 @@ 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 2px 8px 3px alpha(white, 0.7);*/
+    box-shadow: 0 2px 8px 3px alpha(white, 0.7);
     /* this is used for the resize cursor area */
-/*    margin: 10px;
+    margin: 10px;
 }
 
 .window-frame:backdrop {
     box-shadow: 0 2px 5px 1px alpha(white, 0.7);
 }
-*/
+
+.window-frame.tiled {
+	border-radius: 0;
+	background-color: @theme_bg_color;
+}
+
+.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;
+}
+
+.window-frame.csd.tooltip {
+    border-radius: 5px;
+    box-shadow: 0 1px 5px @wm_shadow;
+}
+
+.window-frame.csd.message-dialog {
+    border-radius: 7px;
+    box-shadow: 0 1px 5px @wm_shadow;
+}
 
 /****************
  * App-specific *
diff --git a/desktop-themes/ContrastHighInverse/gtk-3.0/gtk.css b/desktop-themes/ContrastHighInverse/gtk-3.0/gtk.css
index dd468aa8..bf5989f9 100644
--- a/desktop-themes/ContrastHighInverse/gtk-3.0/gtk.css
+++ b/desktop-themes/ContrastHighInverse/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 *