Menta themes: improve metacity-3.xml version

2 files changed, 182 insertions, 140 deletions

diff --git a/desktop-themes/BlueMenta/metacity-1/metacity-theme-3.xml b/desktop-themes/BlueMenta/metacity-1/metacity-theme-3.xml
index a3b323cb..6d7fc8e5 100644
--- a/desktop-themes/BlueMenta/metacity-1/metacity-theme-3.xml
+++ b/desktop-themes/BlueMenta/metacity-1/metacity-theme-3.xml
@@ -5,59 +5,56 @@
 	<author>Wolfgang Ulbrich</author>
 	<copyright>GPL</copyright>
 	<date>April 2013</date>
-	<description>A GNOME 3 window theme</description>
+	<description>Metacity theme</description>
 </info>
 
 <!-- meaningfull constants -->
 
 <constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
 <constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_border_attached_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
 <constant name="C_titlebar_focused_hilight" value="gtk:custom(wm_highlight,gtk:base[NORMAL])" />
 <constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
 <constant name="C_title_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])" />
 <constant name="C_title_focused_hilight" value="gtk:custom(wm_title_highlight,gtk:base[NORMAL])" />
 <constant name="C_title_focused_hilight_dark" value="gtk:custom(wm_title_highlight_dark,gtk:bg[NORMAL])" />
 <constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,gtk:fg[INSENSITIVE])" />
-
 <!-- color of the button icons -->
 <constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
-
 <!-- geometries -->
 
 <frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
 	<distance name="left_width" value="1" />
 	<distance name="right_width" value="1" />
 	<distance name="bottom_height" value="1" />
-	<distance name="left_titlebar_edge" value="4"/>
-	<distance name="right_titlebar_edge" value="1"/>
-	<distance name="title_vertical_pad" value="8"/>
-	<border name="title_border" left="2" right="2" top="0" bottom="0"/>
-	<border name="button_border" left="0" right="0" top="4" bottom="0"/>
+	<distance name="left_titlebar_edge" value="5"/>
+	<distance name="right_titlebar_edge" value="0"/>
+	<distance name="title_vertical_pad" value="9"/>
+	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
+	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
 	<aspect_ratio name="button" value="1"/>
 </frame_geometry>
 
 <frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="4"/>
-	<distance name="right_titlebar_edge" value="1"/>
+	<distance name="left_titlebar_edge" value="5"/>
+	<distance name="right_titlebar_edge" value="0"/>
 </frame_geometry>
 
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="true" rounded_top_right="true">
+<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
 	<distance name="left_width" value="0" />
 	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="4"/>
-	<distance name="right_titlebar_edge" value="1"/>
+	<distance name="left_titlebar_edge" value="5"/>
+	<distance name="right_titlebar_edge" value="0"/>
 	<distance name="title_vertical_pad" value="8"/> <!-- 
 							This needs to be 1 less then the
 							title_vertical_pad on normal state
 							or you'll have bigger buttons -->
-	<border name="title_border" left="2" right="2" top="4" bottom="0"/>
-	<border name="button_border" left="0" right="0" top="4" bottom="0"/>
+	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
+	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
 	<distance name="bottom_height" value="0" />
 </frame_geometry>
 
 <frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="1" />
+	<distance name="right_width" value="0" />
 </frame_geometry>
 
 <frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
@@ -71,14 +68,14 @@
 </frame_geometry>
 
 <frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="5"/>
+	<distance name="left_titlebar_edge" value="1"/>
+	<distance name="right_titlebar_edge" value="1"/>
 </frame_geometry>
 
 <frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
 </frame_geometry>
 
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
+<frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
 	<distance name="left_width" value="1" />
 	<distance name="right_width" value="1" />
 	<distance name="bottom_height" value="1" />
@@ -87,12 +84,24 @@
 	<distance name="title_vertical_pad" value="1" />
 </frame_geometry>
 
+<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
+	<distance name="left_width" value="0" />
+	<distance name="right_width" value="0" />
+	<distance name="bottom_height" value="0" />
+	<distance name="title_vertical_pad" value="0" />
+	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
+	<border name="title_border" left="0" right="0" top="0" bottom="0" />
+</frame_geometry>
+
 <frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small">
 	<distance name="title_vertical_pad" value="5"/>
 </frame_geometry>
 
-<frame_geometry name="attached" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small">
-	<distance name="title_vertical_pad" value="0"/>
+<frame_geometry name="attached" title_scale="medium" hide_buttons="true" rounded_top_left="4" rounded_top_right="4" rounded_bottom_left="4" rounded_bottom_right="4" parent="normal">
+	<distance name="title_vertical_pad" value="9"/>
+	<distance name="bottom_height" value="4"/>
+	<distance name="left_width" value="4"/>
+	<distance name="right_width" value="4"/>
 </frame_geometry>
 
 <!-- drawing operations -->
@@ -136,24 +145,17 @@
 </draw_ops>
 
 <draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="top_height">
-		<color value="#e8e8e8" />
-		<color value="#d2d2d2" />
+	<gradient type="vertical" x="0" y="0" width="width" height="height">
+		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
+		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
 	</gradient>
 </draw_ops>
 
 
-<draw_ops name="titlebar_fill_attached_focused"> <!-- gradient for attached and modal dialogs titlebar-->
-	<gradient type="vertical" x="0" y="0" width="width" height="top_height">
-		<color value="#e8e8e8" />
-		<color value="#d2d2d2" />
-	</gradient>
-</draw_ops>
-
 <draw_ops name="titlebar_fill_unfocused">
-	<gradient type="vertical" x="0" y="0" width="width" height="top_height">
-		<color value="#e8e8e8" />
-		<color value="#d2d2d2" />
+	<gradient type="vertical" x="0" y="0" width="width" height="height">
+		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
+		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
 	</gradient>
 </draw_ops>
 
@@ -161,7 +163,7 @@
 	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
 	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
 		<color value="C_titlebar_focused_hilight" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
 	</gradient>
 </draw_ops>
 
@@ -178,10 +180,6 @@
 	<include name="hilight" />
 </draw_ops>
 
-<draw_ops name="titlebar_attached_focused"> <!-- titlebar for attached and modal dialogs -->
-	<include name="titlebar_fill_attached_focused" />
-</draw_ops>
-
 <draw_ops name="rounded_titlebar_focused">
 	<include name="titlebar_fill_focused" />
 	<include name="rounded_hilight" />
@@ -205,12 +203,6 @@
 	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
 </draw_ops>
 
-<draw_ops name="border_attached_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-	<line x1="0" y1="0" x2="width" y2="0" color="C_border_attached_focused" />
-</draw_ops>
-
-
 <draw_ops name="rounded_border_focused">
 	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
 	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
@@ -230,24 +222,26 @@
 	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
 	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
 	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
+
 	<!-- double arcs for darker borders -->
 	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
 	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
 </draw_ops>
 
-<draw_ops name="border_right_focused">
+
+<!-- <draw_ops name="border_right_focused">
 	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
+		x1="width-1" y1="0"
+		x2="width-1" y2="height"
 		color="C_border_focused" />
 </draw_ops>
 
 <draw_ops name="border_right_unfocused">
 	<line
-		x1="width" y1="0" 
-		x2="width" y2="height" 
+		x1="width-1" y1="0"
+		x2="width-1" y2="height"
 		color="C_border_unfocused" />
-</draw_ops>
+</draw_ops> -->
 
 <draw_ops name="border_left_focused">
 	<line
@@ -265,7 +259,6 @@
 
 <!-- button icons-->
 
-<!-- note: negative values in x or y causes gnome-shell to crash -->
 <draw_ops name="close_glyph_focused">
 	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
@@ -461,6 +454,7 @@
 	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
 	<piece position="title" draw_ops="title_focused" />
 	<piece position="overlay" draw_ops="rounded_border_focused" />
+
 	<button function="close" state="normal" draw_ops="close_focused" />
 	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
 	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
@@ -525,6 +519,7 @@
 	<piece position="entire_background" draw_ops="entire_background_focused" />
 	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
 	<piece position="title" draw_ops="title_focused" />
+
 	<button function="close" state="normal" draw_ops="close_focused" />
 	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
 	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
@@ -683,7 +678,7 @@
 
 <frame_style name="dialog_unfocused" geometry="nobuttons">
 	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
+	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
 	<piece position="title" draw_ops="title_unfocused" />
 	<piece position="overlay" draw_ops="rounded_border_unfocused" />
 	<button function="close" state="normal" draw_ops="close_unfocused"/>
@@ -714,7 +709,7 @@
 
 <frame_style name="modal_dialog_focused" geometry="modal">
 	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_attached_focused" />
+	<piece position="titlebar" draw_ops="titlebar_focused" />
 	<piece position="title" draw_ops="title_focused" />
 	<piece position="overlay" draw_ops="border_focused" />
 	<button function="close" state="normal" draw_ops="close_focused" />
@@ -841,7 +836,7 @@
 	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
 </frame_style>
 
-<frame_style name="border_focused" geometry="borderless">
+<frame_style name="border_focused" geometry="border">
 	<piece position="entire_background" draw_ops="entire_background_focused" />
 	<piece position="overlay" draw_ops="border_focused" />
 	<button function="close" state="normal"><draw_ops></draw_ops></button>
@@ -866,7 +861,7 @@
 	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
 </frame_style>
 
-<frame_style name="border_unfocused" geometry="borderless">
+<frame_style name="border_unfocused" geometry="border">
 	<piece position="entire_background" draw_ops="entire_background_unfocused" />
 	<piece position="overlay" draw_ops="border_unfocused" />
 	<button function="close" state="normal"><draw_ops></draw_ops></button>
@@ -891,10 +886,34 @@
 	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
 </frame_style>
 
+<frame_style name="borderless" geometry="borderless">
+	<button function="close" state="normal"><draw_ops></draw_ops></button>
+	<button function="close" state="pressed"><draw_ops></draw_ops></button>
+	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
+	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
+	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
+	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
+	<button function="menu" state="normal"><draw_ops></draw_ops></button>
+	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
+	<button function="shade" state="normal"><draw_ops></draw_ops></button>
+	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
+	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
+	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
+	<button function="above" state="normal"><draw_ops></draw_ops></button>
+	<button function="above" state="pressed"><draw_ops></draw_ops></button>
+	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
+	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
+	<button function="stick" state="normal"><draw_ops></draw_ops></button>
+	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
+	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
+	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
+</frame_style>
+
 <frame_style name="attached_focused" geometry="attached">
 	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_attached_focused" />
-	<piece position="overlay" draw_ops="border_attached_focused" />
+	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
+	<piece position="title" draw_ops="title_focused" />
+	<piece position="overlay" draw_ops="border_focused" />
 	<button function="close" state="normal"><draw_ops></draw_ops></button>
 	<button function="close" state="pressed"><draw_ops></draw_ops></button>
 	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
@@ -919,6 +938,8 @@
 
 <frame_style name="attached_unfocused" geometry="attached">
 	<piece position="entire_background" draw_ops="entire_background_unfocused" />
+	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
+	<piece position="title" draw_ops="title_unfocused" />
 	<piece position="overlay" draw_ops="border_unfocused" />
 	<button function="close" state="normal"><draw_ops></draw_ops></button>
 	<button function="close" state="pressed"><draw_ops></draw_ops></button>
@@ -946,7 +967,7 @@
 	<piece position="entire_background" draw_ops="entire_background_focused" />
 	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
 	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_right_focused" />
+	<!-- <piece position="overlay" draw_ops="border_right_focused" /> -->
 	<button function="close" state="normal" draw_ops="close_focused" />
 	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
 	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
@@ -978,7 +999,7 @@
 	<piece position="entire_background" draw_ops="entire_background_unfocused" />
 	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
 	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_right_unfocused" />
+	<!-- <piece position="overlay" draw_ops="border_right_unfocused" /> -->
 	<button function="close" state="normal" draw_ops="close_unfocused"/>
 	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
 	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
@@ -1107,13 +1128,13 @@
 	<frame focus="no" state="shaded" style="normal_unfocused"/>
 	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
 	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-	<frame version=">= 3.3"focus="yes" state="tiled_left" style="tiled_left_focused"/>
-	<frame version=">= 3.3"focus="no" state="tiled_left" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3"focus="yes" state="tiled_right" style="tiled_right_focused"/>
-	<frame version=">= 3.3"focus="no" state="tiled_right" style="tiled_right_unfocused"/>
-	<frame version=">= 3.3"focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused"/>
-	<frame version=">= 3.3"focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3"focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused"/>
+	<frame version=">= 3.3" focus="yes" state="tiled_left" style="tiled_left_focused"/>
+	<frame version=">= 3.3" focus="no" state="tiled_left" style="tiled_left_unfocused"/>
+	<frame version=">= 3.3" focus="yes" state="tiled_right" style="tiled_right_focused"/>
+	<frame version=">= 3.3" focus="no" state="tiled_right" style="tiled_right_unfocused"/>
+	<frame version=">= 3.3" focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused"/>
+	<frame version=">= 3.3" focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused"/>
+	<frame version=">= 3.3" focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused"/>
 	<frame version=">= 3.3" focus="no" state="tiled_right_and_shaded" style="tiled_right_unfocused"/>
 </frame_style_set>
 
@@ -1153,8 +1174,8 @@
 <frame_style_set name="border_style_set">
 	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
 	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
+	<frame focus="yes" state="maximized" style="borderless"/>
+	<frame focus="no" state="maximized" style="borderless"/>
 	<frame focus="yes" state="shaded" style="blank"/>
 	<frame focus="no" state="shaded" style="blank"/>
 	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
diff --git a/desktop-themes/Menta/metacity-1/metacity-theme-3.xml b/desktop-themes/Menta/metacity-1/metacity-theme-3.xml
index 4ab663d8..433de291 100644
--- a/desktop-themes/Menta/metacity-1/metacity-theme-3.xml
+++ b/desktop-themes/Menta/metacity-1/metacity-theme-3.xml
@@ -5,59 +5,56 @@
 	<author>Wolfgang Ulbrich</author>
 	<copyright>GPL</copyright>
 	<date>April 2013</date>
-	<description>A GNOME 3 window theme</description>
+	<description>Metacity theme</description>
 </info>
 
 <!-- meaningfull constants -->
 
 <constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
 <constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-<constant name="C_border_attached_focused" value="blend/#000000/gtk:bg[NORMAL]/0.5" />
 <constant name="C_titlebar_focused_hilight" value="gtk:custom(wm_highlight,gtk:base[NORMAL])" />
 <constant name="C_titlebar_unfocused" value="blend/gtk:base[NORMAL]/gtk:bg[NORMAL]/0.4" />
 <constant name="C_title_focused" value="gtk:custom(wm_title,gtk:fg[NORMAL])" />
 <constant name="C_title_focused_hilight" value="gtk:custom(wm_title_highlight,gtk:base[NORMAL])" />
 <constant name="C_title_focused_hilight_dark" value="gtk:custom(wm_title_highlight_dark,gtk:bg[NORMAL])" />
 <constant name="C_title_unfocused" value="gtk:custom(wm_unfocused_title,gtk:fg[INSENSITIVE])" />
-
 <!-- color of the button icons -->
 <constant name="D_icons_unfocused_offset" value="0" /> <!-- offset of the unfocused icons -->
-
 <!-- geometries -->
 
 <frame_geometry name="normal" title_scale="medium" rounded_top_left="4" rounded_top_right="4">
 	<distance name="left_width" value="1" />
 	<distance name="right_width" value="1" />
 	<distance name="bottom_height" value="1" />
-	<distance name="left_titlebar_edge" value="4"/>
-	<distance name="right_titlebar_edge" value="1"/>
-	<distance name="title_vertical_pad" value="8"/>
-	<border name="title_border" left="2" right="2" top="0" bottom="0"/>
-	<border name="button_border" left="0" right="0" top="4" bottom="0"/>
+	<distance name="left_titlebar_edge" value="5"/>
+	<distance name="right_titlebar_edge" value="0"/>
+	<distance name="title_vertical_pad" value="9"/>
+	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
+	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
 	<aspect_ratio name="button" value="1"/>
 </frame_geometry>
 
 <frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="4" rounded_top_right="4" parent="normal">
-	<distance name="left_titlebar_edge" value="4"/>
-	<distance name="right_titlebar_edge" value="1"/>
+	<distance name="left_titlebar_edge" value="5"/>
+	<distance name="right_titlebar_edge" value="0"/>
 </frame_geometry>
 
-<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="true" rounded_top_right="true">
+<frame_geometry name="max" title_scale="medium" parent="normal" rounded_top_left="false" rounded_top_right="false">
 	<distance name="left_width" value="0" />
 	<distance name="right_width" value="0" />
-	<distance name="left_titlebar_edge" value="4"/>
-	<distance name="right_titlebar_edge" value="1"/>
+	<distance name="left_titlebar_edge" value="5"/>
+	<distance name="right_titlebar_edge" value="0"/>
 	<distance name="title_vertical_pad" value="8"/> <!-- 
 							This needs to be 1 less then the
 							title_vertical_pad on normal state
 							or you'll have bigger buttons -->
-	<border name="title_border" left="2" right="2" top="4" bottom="0"/>
-	<border name="button_border" left="0" right="0" top="4" bottom="0"/>
+	<border name="title_border" left="10" right="10" top="2" bottom="2"/>
+	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
 	<distance name="bottom_height" value="0" />
 </frame_geometry>
 
 <frame_geometry name="tiled_left" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
-	<distance name="right_width" value="1" />
+	<distance name="right_width" value="0" />
 </frame_geometry>
 
 <frame_geometry name="tiled_right" title_scale="medium" rounded_top_left="false" rounded_top_right="false" parent="max">
@@ -71,14 +68,14 @@
 </frame_geometry>
 
 <frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="5"/>
-	<distance name="right_titlebar_edge" value="5"/>
+	<distance name="left_titlebar_edge" value="1"/>
+	<distance name="right_titlebar_edge" value="1"/>
 </frame_geometry>
 
 <frame_geometry name="nobuttons" hide_buttons="true" parent="normal">
 </frame_geometry>
 
-<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
+<frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
 	<distance name="left_width" value="1" />
 	<distance name="right_width" value="1" />
 	<distance name="bottom_height" value="1" />
@@ -87,12 +84,24 @@
 	<distance name="title_vertical_pad" value="1" />
 </frame_geometry>
 
+<frame_geometry name="borderless" has_title="false" rounded_top_left="false" rounded_top_right="false" parent="normal" >
+	<distance name="left_width" value="0" />
+	<distance name="right_width" value="0" />
+	<distance name="bottom_height" value="0" />
+	<distance name="title_vertical_pad" value="0" />
+	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
+	<border name="title_border" left="0" right="0" top="0" bottom="0" />
+</frame_geometry>
+
 <frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small">
 	<distance name="title_vertical_pad" value="5"/>
 </frame_geometry>
 
-<frame_geometry name="attached" title_scale="small" hide_buttons="true" rounded_top_left="false" rounded_top_right="false" parent="small">
-	<distance name="title_vertical_pad" value="0"/>
+<frame_geometry name="attached" title_scale="medium" hide_buttons="true" rounded_top_left="4" rounded_top_right="4" rounded_bottom_left="4" rounded_bottom_right="4" parent="normal">
+	<distance name="title_vertical_pad" value="9"/>
+	<distance name="bottom_height" value="4"/>
+	<distance name="left_width" value="4"/>
+	<distance name="right_width" value="4"/>
 </frame_geometry>
 
 <!-- drawing operations -->
@@ -136,24 +145,17 @@
 </draw_ops>
 
 <draw_ops name="titlebar_fill_focused">
-	<gradient type="vertical" x="0" y="0" width="width" height="top_height">
-		<color value="#e8e8e8" />
-		<color value="#d2d2d2" />
+	<gradient type="vertical" x="0" y="0" width="width" height="height">
+		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
+		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
 	</gradient>
 </draw_ops>
 
 
-<draw_ops name="titlebar_fill_attached_focused"> <!-- gradient for attached and modal dialogs titlebar-->
-	<gradient type="vertical" x="0" y="0" width="width" height="top_height">
-		<color value="#e8e8e8" />
-		<color value="#d2d2d2" />
-	</gradient>
-</draw_ops>
-
 <draw_ops name="titlebar_fill_unfocused">
-	<gradient type="vertical" x="0" y="0" width="width" height="top_height">
-		<color value="#e8e8e8" />
-		<color value="#d2d2d2" />
+	<gradient type="vertical" x="0" y="0" width="width" height="height">
+		<color value="gtk:custom(wm_bg_a,blend/gtk:bg[NORMAL]/gtk:base[NORMAL]/0.4)" />
+		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
 	</gradient>
 </draw_ops>
 
@@ -161,7 +163,7 @@
 	<line x1="0" y1="1" x2="width-1" y2="1" color="C_titlebar_focused_hilight" />
 	<gradient type="vertical" x="1" y="1" width="1" height="height-4">
 		<color value="C_titlebar_focused_hilight" />
-		<color value="gtk:custom(wm_bg_b,gtk:bg[NORMAL])" />
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
 	</gradient>
 </draw_ops>
 
@@ -178,10 +180,6 @@
 	<include name="hilight" />
 </draw_ops>
 
-<draw_ops name="titlebar_attached_focused"> <!-- titlebar for attached and modal dialogs -->
-	<include name="titlebar_fill_attached_focused" />
-</draw_ops>
-
 <draw_ops name="rounded_titlebar_focused">
 	<include name="titlebar_fill_focused" />
 	<include name="rounded_hilight" />
@@ -205,12 +203,6 @@
 	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
 </draw_ops>
 
-<draw_ops name="border_attached_focused">
-	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
-	<line x1="0" y1="0" x2="width" y2="0" color="C_border_attached_focused" />
-</draw_ops>
-
-
 <draw_ops name="rounded_border_focused">
 	<line color="C_border_focused" x1="4" y1="0" x2="width-5" y2="0" />
 	<line color="C_border_focused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
@@ -230,24 +222,26 @@
 	<line color="C_border_unfocused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
 	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
 	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
+
 	<!-- double arcs for darker borders -->
 	<arc color="C_border_unfocused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
 	<arc color="C_border_unfocused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
 </draw_ops>
 
-<draw_ops name="border_right_focused">
+
+<!-- <draw_ops name="border_right_focused">
 	<line
-		x1="width-1" y1="0" 
-		x2="width-1" y2="height" 
+		x1="width-1" y1="0"
+		x2="width-1" y2="height"
 		color="C_border_focused" />
 </draw_ops>
 
 <draw_ops name="border_right_unfocused">
 	<line
-		x1="width" y1="0" 
-		x2="width" y2="height" 
+		x1="width-1" y1="0"
+		x2="width-1" y2="height"
 		color="C_border_unfocused" />
-</draw_ops>
+</draw_ops> -->
 
 <draw_ops name="border_left_focused">
 	<line
@@ -265,7 +259,6 @@
 
 <!-- button icons-->
 
-<!-- note: negative values in x or y causes gnome-shell to crash -->
 <draw_ops name="close_glyph_focused">
 	<image filename="close_focused_normal.svg" x="0" y="(0 `max` ((height - title_height) / 7)) + 3" width="object_width" height="object_height"/>
 </draw_ops>
@@ -461,6 +454,7 @@
 	<piece position="titlebar" draw_ops="rounded_titlebar_focused" />
 	<piece position="title" draw_ops="title_focused" />
 	<piece position="overlay" draw_ops="rounded_border_focused" />
+
 	<button function="close" state="normal" draw_ops="close_focused" />
 	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
 	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
@@ -525,6 +519,7 @@
 	<piece position="entire_background" draw_ops="entire_background_focused" />
 	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
 	<piece position="title" draw_ops="title_focused" />
+
 	<button function="close" state="normal" draw_ops="close_focused" />
 	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
 	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
@@ -683,7 +678,7 @@
 
 <frame_style name="dialog_unfocused" geometry="nobuttons">
 	<piece position="entire_background" draw_ops="entire_background_unfocused" />
-	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
+	<piece position="titlebar" draw_ops="rounded_titlebar_unfocused" />
 	<piece position="title" draw_ops="title_unfocused" />
 	<piece position="overlay" draw_ops="rounded_border_unfocused" />
 	<button function="close" state="normal" draw_ops="close_unfocused"/>
@@ -714,7 +709,7 @@
 
 <frame_style name="modal_dialog_focused" geometry="modal">
 	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_attached_focused" />
+	<piece position="titlebar" draw_ops="titlebar_focused" />
 	<piece position="title" draw_ops="title_focused" />
 	<piece position="overlay" draw_ops="border_focused" />
 	<button function="close" state="normal" draw_ops="close_focused" />
@@ -841,7 +836,7 @@
 	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
 </frame_style>
 
-<frame_style name="border_focused" geometry="borderless">
+<frame_style name="border_focused" geometry="border">
 	<piece position="entire_background" draw_ops="entire_background_focused" />
 	<piece position="overlay" draw_ops="border_focused" />
 	<button function="close" state="normal"><draw_ops></draw_ops></button>
@@ -866,7 +861,7 @@
 	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
 </frame_style>
 
-<frame_style name="border_unfocused" geometry="borderless">
+<frame_style name="border_unfocused" geometry="border">
 	<piece position="entire_background" draw_ops="entire_background_unfocused" />
 	<piece position="overlay" draw_ops="border_unfocused" />
 	<button function="close" state="normal"><draw_ops></draw_ops></button>
@@ -891,10 +886,34 @@
 	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
 </frame_style>
 
+<frame_style name="borderless" geometry="borderless">
+	<button function="close" state="normal"><draw_ops></draw_ops></button>
+	<button function="close" state="pressed"><draw_ops></draw_ops></button>
+	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
+	<button function="maximize" state="pressed"><draw_ops></draw_ops></button>
+	<button function="minimize" state="normal"><draw_ops></draw_ops></button>
+	<button function="minimize" state="pressed"><draw_ops></draw_ops></button>
+	<button function="menu" state="normal"><draw_ops></draw_ops></button>
+	<button function="menu" state="pressed"><draw_ops></draw_ops></button>
+	<button function="shade" state="normal"><draw_ops></draw_ops></button>
+	<button function="shade" state="pressed"><draw_ops></draw_ops></button>
+	<button function="unshade" state="normal"><draw_ops></draw_ops></button>
+	<button function="unshade" state="pressed"><draw_ops></draw_ops></button>
+	<button function="above" state="normal"><draw_ops></draw_ops></button>
+	<button function="above" state="pressed"><draw_ops></draw_ops></button>
+	<button function="unabove" state="normal"><draw_ops></draw_ops></button>
+	<button function="unabove" state="pressed"><draw_ops></draw_ops></button>
+	<button function="stick" state="normal"><draw_ops></draw_ops></button>
+	<button function="stick" state="pressed"><draw_ops></draw_ops></button>
+	<button function="unstick" state="normal"><draw_ops></draw_ops></button>
+	<button function="unstick" state="pressed"><draw_ops></draw_ops></button>
+</frame_style>
+
 <frame_style name="attached_focused" geometry="attached">
 	<piece position="entire_background" draw_ops="entire_background_focused" />
-	<piece position="titlebar" draw_ops="titlebar_attached_focused" />
-	<piece position="overlay" draw_ops="border_attached_focused" />
+	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
+	<piece position="title" draw_ops="title_focused" />
+	<piece position="overlay" draw_ops="border_focused" />
 	<button function="close" state="normal"><draw_ops></draw_ops></button>
 	<button function="close" state="pressed"><draw_ops></draw_ops></button>
 	<button function="maximize" state="normal"><draw_ops></draw_ops></button>
@@ -919,6 +938,8 @@
 
 <frame_style name="attached_unfocused" geometry="attached">
 	<piece position="entire_background" draw_ops="entire_background_unfocused" />
+	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
+	<piece position="title" draw_ops="title_unfocused" />
 	<piece position="overlay" draw_ops="border_unfocused" />
 	<button function="close" state="normal"><draw_ops></draw_ops></button>
 	<button function="close" state="pressed"><draw_ops></draw_ops></button>
@@ -946,7 +967,7 @@
 	<piece position="entire_background" draw_ops="entire_background_focused" />
 	<piece position="titlebar" draw_ops="titlebar_fill_focused" />
 	<piece position="title" draw_ops="title_focused" />
-	<piece position="overlay" draw_ops="border_right_focused" />
+	<!-- <piece position="overlay" draw_ops="border_right_focused" /> -->
 	<button function="close" state="normal" draw_ops="close_focused" />
 	<button function="close" state="prelight" draw_ops="close_focused_prelight" />
 	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
@@ -978,7 +999,7 @@
 	<piece position="entire_background" draw_ops="entire_background_unfocused" />
 	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
 	<piece position="title" draw_ops="title_unfocused" />
-	<piece position="overlay" draw_ops="border_right_unfocused" />
+	<!-- <piece position="overlay" draw_ops="border_right_unfocused" /> -->
 	<button function="close" state="normal" draw_ops="close_unfocused"/>
 	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
 	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
@@ -1107,13 +1128,13 @@
 	<frame focus="no" state="shaded" style="normal_unfocused"/>
 	<frame focus="yes" state="maximized_and_shaded" style="normal_max_shaded_focused"/>
 	<frame focus="no" state="maximized_and_shaded" style="normal_max_shaded_unfocused"/>
-	<frame version=">= 3.3"focus="yes" state="tiled_left" style="tiled_left_focused"/>
-	<frame version=">= 3.3"focus="no" state="tiled_left" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3"focus="yes" state="tiled_right" style="tiled_right_focused"/>
-	<frame version=">= 3.3"focus="no" state="tiled_right" style="tiled_right_unfocused"/>
-	<frame version=">= 3.3"focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused"/>
-	<frame version=">= 3.3"focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused"/>
-	<frame version=">= 3.3"focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused"/>
+	<frame version=">= 3.3" focus="yes" state="tiled_left" style="tiled_left_focused"/>
+	<frame version=">= 3.3" focus="no" state="tiled_left" style="tiled_left_unfocused"/>
+	<frame version=">= 3.3" focus="yes" state="tiled_right" style="tiled_right_focused"/>
+	<frame version=">= 3.3" focus="no" state="tiled_right" style="tiled_right_unfocused"/>
+	<frame version=">= 3.3" focus="yes" state="tiled_left_and_shaded" style="tiled_left_focused"/>
+	<frame version=">= 3.3" focus="no" state="tiled_left_and_shaded" style="tiled_left_unfocused"/>
+	<frame version=">= 3.3" focus="yes" state="tiled_right_and_shaded" style="tiled_right_focused"/>
 	<frame version=">= 3.3" focus="no" state="tiled_right_and_shaded" style="tiled_right_unfocused"/>
 </frame_style_set>
 
@@ -1153,8 +1174,8 @@
 <frame_style_set name="border_style_set">
 	<frame focus="yes" state="normal" resize="both" style="border_focused"/>
 	<frame focus="no" state="normal" resize="both" style="border_unfocused"/>
-	<frame focus="yes" state="maximized" style="blank"/>
-	<frame focus="no" state="maximized" style="blank"/>
+	<frame focus="yes" state="maximized" style="borderless"/>
+	<frame focus="no" state="maximized" style="borderless"/>
 	<frame focus="yes" state="shaded" style="blank"/>
 	<frame focus="no" state="shaded" style="blank"/>
 	<frame focus="yes" state="maximized_and_shaded" style="blank"/>