diff --git a/gtk-3.0/apps/unity.css b/gtk-3.0/apps/unity.css
index 71c7364..9ba7f4a 100644
--- a/gtk-3.0/apps/unity.css
+++ b/gtk-3.0/apps/unity.css
@@ -1,3 +1,51 @@
+UnityDecoration {
+    -UnityDecoration-extents: 28px 1px 1px 1px;
+    -UnityDecoration-input-extents: 10px;
+
+    -UnityDecoration-shadow-offset-x: 1px;
+    -UnityDecoration-shadow-offset-y: 1px;
+    -UnityDecoration-active-shadow-color: rgba(0,0,0,0.7);
+    -UnityDecoration-active-shadow-radius: 8px;
+    -UnityDecoration-inactive-shadow-color: rgba(0,0,0,0.5);
+    -UnityDecoration-inactive-shadow-radius: 5px;
+
+    -UnityDecoration-glow-size: 10px;
+    -UnityDecoration-glow-color: @theme_selected_bg_color;
+
+    -UnityDecoration-title-indent: 10px;
+    -UnityDecoration-title-fade: 35px;
+    -UnityDecoration-title-alignment: 0.0;
+}
+
+UnityDecoration.top {
+    border: 1px solid mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.21);
+    border-bottom-width: 0;
+    border-radius: 2px 2px 0 0;
+    padding: 1px 8px 0 8px;
+    background-color: @titlebar_bg_color;
+    color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.1);
+    text-shadow: none;
+}
+
+UnityDecoration.top:backdrop {
+    border: 1px solid mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.12);
+    border-bottom-width: 0;
+    background-color: @titlebar_bg_color;
+    color: mix(@titlebar_fg_color, @titlebar_bg_color, 0.4);
+}
+
+UnityDecoration.left,
+UnityDecoration.right,
+UnityDecoration.bottom {
+    background-color: mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.21);
+}
+
+UnityDecoration.left:backdrop,
+UnityDecoration.right:backdrop,
+UnityDecoration.bottom:backdrop {
+    background-color: mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.12);
+}
+
 UnityPanelWidget,
 .unity-panel {
     border-width: 0 0 1px 0;
diff --git a/gtk-3.0/gtk-dark.css b/gtk-3.0/gtk-dark.css
index 148c3a8..15211df 100644
--- a/gtk-3.0/gtk-dark.css
+++ b/gtk-3.0/gtk-dark.css
@@ -58,15 +58,15 @@
 @define-color osd_bg alpha(@osd_base, 0.8);
 
 /* window manager colors */
-@define-color wm_bg #2d2d2d;
-@define-color wm_border_focused #484848;
-@define-color wm_border_unfocused #393939;
-@define-color wm_title_focused #dcdcdc;
-@define-color wm_title_unfocused #888888;
-@define-color wm_icons_focused #dcdcdc;
+@define-color wm_bg @titlebar_bg_color;
+@define-color wm_border_focused mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.21);
+@define-color wm_border_unfocused mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.12);
+@define-color wm_title_focused mix(@titlebar_fg_color, @titlebar_bg_color, 0.1);
+@define-color wm_title_unfocused mix(@titlebar_fg_color, @titlebar_bg_color, 0.4);
+@define-color wm_icons_focused mix(@titlebar_fg_color, @titlebar_bg_color, 0.1);
 @define-color wm_icons_focused_prelight @selected_bg_color;
 @define-color wm_icons_focused_pressed shade(@selected_bg_color, 0.8);
-@define-color wm_icons_unfocused #888888;
+@define-color wm_icons_unfocused mix(@titlebar_fg_color, @titlebar_bg_color, 0.4);
 @define-color wm_icons_unfocused_prelight @selected_bg_color;
 @define-color wm_icons_unfocused_pressed shade(@selected_bg_color, 0.8);
 
diff --git a/gtk-3.0/gtk.css b/gtk-3.0/gtk.css
index 12d19e5..a9567bf 100644
--- a/gtk-3.0/gtk.css
+++ b/gtk-3.0/gtk.css
@@ -58,15 +58,15 @@
 @define-color osd_bg alpha(@osd_base, 0.8);
 
 /* window manager colors */
-@define-color wm_bg #2d2d2d;
-@define-color wm_border_focused #484848;
-@define-color wm_border_unfocused #393939;
-@define-color wm_title_focused #dcdcdc;
-@define-color wm_title_unfocused #888888;
-@define-color wm_icons_focused #dcdcdc;
+@define-color wm_bg @titlebar_bg_color;
+@define-color wm_border_focused mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.21);
+@define-color wm_border_unfocused mix(shade(@titlebar_bg_color, 0.7), @titlebar_fg_color, 0.12);
+@define-color wm_title_focused mix(@titlebar_fg_color, @titlebar_bg_color, 0.1);
+@define-color wm_title_unfocused mix(@titlebar_fg_color, @titlebar_bg_color, 0.4);
+@define-color wm_icons_focused mix(@titlebar_fg_color, @titlebar_bg_color, 0.1);
 @define-color wm_icons_focused_prelight @selected_bg_color;
 @define-color wm_icons_focused_pressed shade(@selected_bg_color, 0.8);
-@define-color wm_icons_unfocused #888888;
+@define-color wm_icons_unfocused mix(@titlebar_fg_color, @titlebar_bg_color, 0.4);
 @define-color wm_icons_unfocused_prelight @selected_bg_color;
 @define-color wm_icons_unfocused_pressed shade(@selected_bg_color, 0.8);