[gnome-themes-standard] mutter and metacity theme full rewrite



commit f19d2720c009214269fe68ed7cb45ea4ffc347ab
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Wed Nov 24 15:29:55 2010 +0100

    mutter and metacity theme full rewrite

 themes/Adwaita/metacity-1/metacity-theme-2.xml | 2067 ++++++++++++---------
 themes/Adwaita/metacity-1/metacity-theme-3.xml | 2346 +++++++++++++-----------
 2 files changed, 2535 insertions(+), 1878 deletions(-)
---
diff --git a/themes/Adwaita/metacity-1/metacity-theme-2.xml b/themes/Adwaita/metacity-1/metacity-theme-2.xml
index 8b3b4af..ee315bf 100644
--- a/themes/Adwaita/metacity-1/metacity-theme-2.xml
+++ b/themes/Adwaita/metacity-1/metacity-theme-2.xml
@@ -1,874 +1,1239 @@
 <?xml version="1.0"?>
 <metacity_theme>
-  <info>
-    <name>Adwaita</name>
-    <author>GNOME Art Team &lt;art.gnome.org&gt;</author>
-    <copyright>&#194; Intel, &#194; Red Hat, Lapo Calamandrei</copyright>
-    <date>2010</date>
-    <description>Default GNOME 3 window theme</description>
-  </info>
-	<!-- constants -->
-	<!--
-		nomenclature:
-		C* -> color
-		D* -> distances
-	-->
-	<constant name="CBorderFocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-	<constant name="CBorderUnfocused" value="blend/#000000/gtk:bg[NORMAL]/0.8" />
-	<constant name="CButtonBorder" value="blend/#000000/gtk:bg[NORMAL]/0.8" />
-	<constant name="CButtonHilight" value="blend/#ffffff/gtk:bg[NORMAL]/0.6" />
-	<constant name="CTitlebarUnfocused" value="blend/gtk:bg[NORMAL]/#ffffff/0.7" />
-	<constant name="CTitleFocused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" />
-	<constant name="CTitleFocusedHilight" value="blend/#ffffff/gtk:bg[NORMAL]/0.4" />
-	<constant name="CTitleUnfocused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" />
-	<constant name="CTitleUnfocusedHilight" value="blend/#ffffff/gtk:bg[NORMAL]/0.9" />
-	<constant name="CIconFocused_normal" value="blend/#ffffff/gtk:bg[NORMAL]/0.3" />
-	<constant name="CIconFocused_prelight" value="CIconFocused_normal" />
-	<constant name="CIconFocused_pressed" value="CIconFocused_normal" />
-	<constant name="CIconUnfocused_normal" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" />
-	<constant name="CIconUnfocused_prelight" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.85" />
-	<constant name="CIconUnfocused_pressed" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.75" />
-	<constant name="DIconFocused_h" value="0" />
-	<constant name="DIconFocused_v" value="0" />
-	<constant name="DIconUnfocused_h" value="0" />
-	<constant name="DIconUnfocused_v" value="0" />
-
-
-<!-- Frames Geometries -->
-	<frame_geometry name="normal" rounded_top_left="4" rounded_top_right="4" title_scale="medium">
-		<distance name="left_width" value="1"/>
-		<distance name="right_width" value="1"/>
-		<distance name="bottom_height" value="2"/>
-		<distance name="left_titlebar_edge" value="0"/>
-		<distance name="right_titlebar_edge" value="0"/>
-		<distance name="title_vertical_pad" value="10"/>
-		<border name="title_border" left="10" right="10" top="0" bottom="4"/>
-		<border name="button_border" left="0" right="0" top="1" bottom="4"/>
-		<aspect_ratio name="button" value="1"/>
-	</frame_geometry>
-
-	<frame_geometry name="maximized" 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="bottom_height" value="0"/>
-		<distance name="title_vertical_pad" value="10"/>
-		<border name="title_border" left="0" right="0" top="0" bottom="4"/>
-		<border name="button_border" left="0" right="0" top="0" bottom="5"/>
-	</frame_geometry>
-
-  <frame_geometry name="utility" title_scale="medium" parent="normal">
-  </frame_geometry>
-
-  <frame_geometry name="dialog" title_scale="medium" parent="normal" hide_buttons="true">
-  </frame_geometry>
-
-  <frame_geometry name="border" has_title="false" parent="normal" rounded_top_left="false" rounded_top_right="false">
-  </frame_geometry>
-
-
-
-  <!-- Draw Operations -->
-
-  <!-- Titlebar Background -->
-	<draw_ops name="bg_titlebar_maximized">
-		<gradient type="vertical" x="1" y="1" width="width-2" height="height-1">
-			<color value="blend/gtk:bg[NORMAL]/#ffffff/0.3" />
-			<color value="gtk:bg[NORMAL]"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-		</gradient>
-	</draw_ops>
-	<draw_ops name="bg_titlebar_unfocused_maximized">
-		<rectangle color="CTitlebarUnfocused" x="1" y="1" width="width-2" height="height-1" filled="true"/>
-	</draw_ops>
-	<draw_ops name="bg_titlebar_unfocused">
-		<include name="bg_titlebar_unfocused_maximized" />
-		<arc x="0" y="0" width="10" height="10" start_angle="0" extent_angle="-90" color="CBorderUnfocused" />
-		<arc x="width-11" y="0" width="10" height="10" start_angle="0" extent_angle="90" color="CBorderUnfocused" />
-	</draw_ops>
-
-	<draw_ops name="bg_titlebar">
-		<include name="bg_titlebar_maximized"/>
-		<arc x="0" y="0" width="10" height="10" start_angle="0" extent_angle="-90" color="CBorderFocused" />
-		<arc x="width-11" y="0" width="10" height="10" start_angle="0" extent_angle="90" color="CBorderFocused" />
-		<line color="CTitleFocusedHilight" x1="5" y1="1" x2="width-5" y2="1" />
-		<arc x="1" y="1" width="8" height="8" start_angle="0" extent_angle="-90" color="CTitleFocusedHilight" />
-		<arc x="width-10" y="1" width="8" height="8" start_angle="0" extent_angle="90" color="CTitleFocusedHilight" />
-		<gradient type="vertical" x="1" y="5" width="1" height="height-5">		
-			<color value="CTitleFocusedHilight"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.06"/>
-		</gradient>
-		<gradient type="vertical" x="width-2" y="5" width="1" height="height-5">		
-			<color value="CTitleFocusedHilight"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.06"/>
-		</gradient>
-	</draw_ops>
-
-
-  <!-- Window Borders -->
-
-  <draw_ops name="lines_border_focused">
-	<rectangle color="CBorderFocused" x="0" y="0" width="width-1" height="height-1" filled="false"/>
-  </draw_ops>
-
-  <draw_ops name="lines_border_unfocused">
-    <rectangle color="CBorderUnfocused" x="0" y="0" width="width-1" height="height-1" filled="false"/>
-  </draw_ops>
-
-
-  <!-- Title -->
-
-	<draw_ops name="title_all">
-		<title
-                       x="(0 `max` ((width - title_width) / 2)) + 3"
-                       y="(0 `max` ((height - title_height) / 2)) + 3"
-                       color="CTitleFocusedHilight"/>
-		<title
-                       x="(0 `max` ((width - title_width) / 2)) + 2"
-                       y="(0 `max` ((height - title_height) / 2)) + 2"
-                       color="CTitleFocused"/>
-		<tint color="blend/#ffffff/gtk:bg[NORMAL]/0.9" alpha="0.4" x="width" y="0" width="2" height="height-2" />
-	</draw_ops>
-
-	<draw_ops name="title_all_unfocused">
-		<title
-                       x="(0 `max` ((width - title_width) / 2)) + 2"
-                       y="(0 `max` ((height - title_height) / 2)) + 2"
-                       color="CTitleUnfocused"/>
-	</draw_ops>
-
-  <!-- Normal, focused window -->
-
-  <draw_ops name="titlebar_normal_focused">
-     <include name="bg_titlebar"/>
-  </draw_ops>
-
-  <draw_ops name="normal_focused">
-     <include name="lines_border_focused"/>
-  </draw_ops>
-
-  <!--Normal unfocused window-->
-
-  <draw_ops name="titlebar_normal_unfocused">
-     <include name="bg_titlebar_unfocused"/>
-  </draw_ops>
-
-  <draw_ops name="normal_unfocused">
-     <include name="lines_border_unfocused"/>
-  </draw_ops>
-
-  <!--maximized focused window-->
-  <draw_ops name="titlebar_maximized_focused">
-     <include name="bg_titlebar_maximized"/>
-  </draw_ops>
-
-  <draw_ops name="maximized_focused">
-  </draw_ops>
-
-  <!--maximized unfocused window-->
-  <draw_ops name="titlebar_maximized_unfocused">
-  </draw_ops>
-
-  <draw_ops name="maximized_unfocused">
-  </draw_ops>
-
-
-  <!--border focused window-->
-  <draw_ops name="border_focused">
-     <include name="lines_border_focused"/>
-  </draw_ops>
-
-  <!--border unfocused window-->
-  <draw_ops name="border_unfocused">
-     <include name="lines_border_unfocused"/>
-  </draw_ops>
-
-  <!-- button backgounds -->
-
-	<draw_ops name="button_bottom_hilight">
-		<!-- horziontal highlight on the bottom -->
-		<tint color="CButtonBorder" x="0" y="height - 4" width="width" height="1" alpha="1"/>
-		<tint color="CButtonHilight" x="0" y="height - 3" width="width" height="1" alpha="1"/>
-	</draw_ops>
-
-	<draw_ops name="button_separator">
-		<!-- vertical separator stripes -->
-		<gradient type="vertical" x="0" y="0" width="1" height="height - 4">
-			<color value="blend/gtk:bg[NORMAL]/#ffffff/0.1"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
-		</gradient>
-		<gradient type="vertical" x="width-1" y="0" width="1" height="height - 4">
-			<color value="CBorderFocused"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
-		</gradient>
-	</draw_ops>
-
-	<draw_ops name="button_separator_pressed">
-		<!-- vertical separator stripes for pressed state -->
-		<tint color="blend/#ffffff/gtk:bg[NORMAL]/0.5" x="0" y="0" width="1" height="height - 4" alpha="0.2"/>
-		<gradient type="vertical" x="0" y="0" width="1" height="height - 4">
-			<color value="CBorderFocused"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
-		</gradient>
-	</draw_ops>
-
-	<draw_ops name="button_bg_focused_max">
-		<gradient type="vertical" x="0" y="0" width="width" height="height - 3">
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.14"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.17"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.06"/>
-		</gradient>
-		<include name="button_separator" />
-		<include name="button_bottom_hilight" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_focused">
-		<include name="button_bg_focused_max" />
-		<line x1="0" y1="0" x2="width-2" y2="0" color="blend/gtk:bg[NORMAL]/#ffffff/0.1"/>
-	</draw_ops>
-
-	<draw_ops name="button_bg_prelight_max">
-		<gradient type="vertical" x="0" y="0" width="width" height="height - 3">
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.05"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.10"/>
-			<color value="blend/gtk:bg[SELECTED]/gtk:bg[NORMAL]/0.65"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.03"/>
-		</gradient>
-		<include name="button_separator" />
-		<include name="button_bottom_hilight" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_prelight">
-		<include name="button_bg_prelight_max" />
-		<line x1="0" y1="0" x2="width-2" y2="0" color="blend/gtk:bg[NORMAL]/#ffffff/0.2"/>
-	</draw_ops>
-
-	<draw_ops name="button_bg_pressed">
-		<gradient type="vertical" x="0" y="0" width="width" height="height - 3">
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.4"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.05"/>
-		</gradient>
-		<include name="button_separator_pressed" />
-		<include name="button_bottom_hilight" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_pressed_max">
-		<include name="button_bg_pressed" />
-	</draw_ops>
-
-	<draw_ops name="rounded_outer_border_right">
-		<line color="CBorderFocused" x1="width-4" y1="0" x2="width-3" y2="0"/>
-		<line color="CBorderFocused" x1="width-2" y1="1" x2="width-2" y2="2"/>
-		<line color="CBorderFocused" x1="width-1" y1="3" x2="width-1" y2="height"/>
-	</draw_ops>
-
-	<draw_ops name="button_bg_focused_outer_right">
-		<include name="button_bg_focused" />
-		<include name="rounded_outer_border_right" />
-		<arc x="width-10" y="0" width="8" height="8" start_angle="0" extent_angle="90" color="blend/gtk:bg[NORMAL]/#ffffff/0.1" />
-		<gradient type="vertical" x="width-2" y="4" width="1" height="height-9">		
-			<color value="blend/gtk:bg[NORMAL]/#ffffff/0.1"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.15"/>
-		</gradient>
-		<gradient type="horizontal" x="0" y="height-3" width="width-1" height="1">		
-			<color value="CButtonHilight" />
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.03"/>
-		</gradient>
-	</draw_ops>
-
-	<draw_ops name="button_bg_prelight_outer_right">
-		<include name="button_bg_prelight" />
-		<include name="rounded_outer_border_right" />
-		<arc x="width-10" y="0" width="8" height="8" start_angle="0" extent_angle="90" color="blend/gtk:bg[NORMAL]/#ffffff/0.2" />
-		<gradient type="vertical" x="width-2" y="4" width="1" height="height-9">		
-			<color value="blend/gtk:bg[NORMAL]/#ffffff/0.2"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.15"/>
-		</gradient>
-	</draw_ops>
-
-	<draw_ops name="button_bg_pressed_outer_right">
-		<include name="button_bg_pressed" />
-		<include name="rounded_outer_border_right" />
-	</draw_ops>
-
-
-	<draw_ops name="button_bg_focused_clipped1">
-		<clip x="4" y="height-6" width="width-4" height="6" />
-		<include name="button_bg_focused_max" />	
-	</draw_ops>
-	<draw_ops name="button_bg_focused_clipped2">
-		<clip x="1" y="0" width="width-1" height="height-6" />
-		<include name="button_bg_focused_max" />
-	</draw_ops>
-	<draw_ops name="button_bg_focused_clipped">
-		<include name="button_bg_focused_clipped1" />
-		<include name="button_bg_focused_clipped2" />
-		<clip x="2" y="height-6" width="2" height="2" />
-		<include name="button_bg_focused_max" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_prelight_clipped1">
-		<clip x="4" y="height-6" width="width-4" height="6" />
-		<include name="button_bg_prelight_max" />	
-	</draw_ops>
-	<draw_ops name="button_bg_prelight_clipped2">
-		<clip x="1" y="0" width="width-1" height="height-6" />
-		<include name="button_bg_prelight_max" />
-	</draw_ops>
-	<draw_ops name="button_bg_prelight_clipped">
-		<include name="button_bg_prelight_clipped1" />
-		<include name="button_bg_prelight_clipped2" />
-		<clip x="2" y="height-6" width="2" height="2" />
-		<include name="button_bg_prelight_max" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_pressed_clipped1">
-		<clip x="4" y="height-6" width="width-4" height="6" />
-		<include name="button_bg_pressed" />	
-	</draw_ops>
-	<draw_ops name="button_bg_pressed_clipped2">
-		<clip x="1" y="0" width="width-1" height="height-6" />
-		<include name="button_bg_pressed" />
-	</draw_ops>
-	<draw_ops name="button_bg_pressed_clipped">
-		<include name="button_bg_pressed_clipped1" />
-		<include name="button_bg_pressed_clipped2" />
-		<clip x="2" y="height-6" width="2" height="2" />
-		<include name="button_bg_pressed" />
-	</draw_ops>
-
-	<draw_ops name="right_left_button_rounded_corner">
-		<line x1="0" y1="0" x2="0" y2="height-7" color="CButtonHilight" />
-		<arc x="0" y="height-13" width="10" height="10" start_angle="180" extent_angle="90" color="CButtonHilight"/>
-		<gradient type="vertical" x="1" y="0" width="1" height="height-7">
-			<color value="CBorderFocused"/>
-			<color value="CButtonBorder"/>
-		</gradient>
-		<arc x="1" y="height-12" width="8" height="8" start_angle="180" extent_angle="90" color="CButtonBorder"/>
-	</draw_ops>
-
-	<draw_ops name="button_bg_focused_inner_right_max">
-		<include name="button_bg_focused_clipped" />
-		<include name="right_left_button_rounded_corner" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_focused_inner_right">
-		<include name="button_bg_focused_inner_right_max" />
-		<line x1="2" y1="0" x2="width-3" y2="0" color="blend/gtk:bg[NORMAL]/#ffffff/0.1"/>
-	</draw_ops>
-
-	<draw_ops name="button_bg_prelight_inner_right_max">
-		<include name="button_bg_prelight_clipped" />
-		<include name="right_left_button_rounded_corner" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_prelight_inner_right">
-		<include name="button_bg_prelight_inner_right_max" />
-		<line x1="2" y1="0" x2="width-3" y2="0" color="blend/gtk:bg[NORMAL]/#ffffff/0.2"/>
-	</draw_ops>
-
-
-	<draw_ops name="button_bg_pressed_inner_right_max">
-		<include name="button_bg_pressed_clipped" />
-		<include name="right_left_button_rounded_corner" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_pressed_inner_right">
-		<include name="button_bg_pressed_inner_right_max" />
-	</draw_ops>
-
-
-	<draw_ops name="button_bg_focused_single_right">
-		<include name="button_bg_focused_clipped" />
-		<include name="right_left_button_rounded_corner" />
-		<include name="rounded_outer_border_right" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_prelight_single_right">
-		<include name="button_bg_prelight_clipped" />
-		<include name="right_left_button_rounded_corner" />
-		<include name="rounded_outer_border_right" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_pressed_single_right">
-		<include name="button_bg_pressed_clipped" />
-		<include name="right_left_button_rounded_corner" />
-		<include name="rounded_outer_border_right" />
-	</draw_ops>
-
-
-  <!-- on unfocused window -->
-
-  <!-- Close Buttons -->
-
-	<draw_ops name="icon_close_glyph">
-		<line color="CIconFocused_normal" x1="(width-(width)%3)/3" y1="(height-height%3)/3" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconFocused_normal" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-3" />
-		<line color="CIconFocused_normal" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconFocused_normal" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconFocused_normal" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-3" />
-		<line color="CIconFocused_normal" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-2" />
-	</draw_ops>
-
-	<draw_ops name="icon_close_shadow">
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
-
-	</draw_ops>
-
-
-	<draw_ops name="icon_close">
-		<include name="icon_close_shadow" />
-		<include name="icon_close_glyph" />
-	</draw_ops>
-
-	<draw_ops name="icon_close_prelight">
-		<!-- shadow -->
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
-		<include name="icon_close_glyph" />
-	</draw_ops>
-
-
-	<draw_ops name="icon_close_single">
-		<!-- shadow -->
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-1" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3+2" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-1" y2="height-((height-height%3)/3)-2" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-1" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-2" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-1" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+2" y2="height-((height-height%3)/3)-1" />
-
-		<!-- glyph -->
-		<line color="CIconFocused_normal" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3" x2="width-((width-(width)%3)/3)-1" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconFocused_normal" x1="(width-(width)%3)/3+2" y1="(height-height%3)/3" x2="width-((width-(width)%3)/3)-1" y2="height-((height-height%3)/3)-3" />
-		<line color="CIconFocused_normal" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconFocused_normal" x1="width-((width-(width)%3)/3)-1" y1="(height-height%3)/3" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconFocused_normal" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-3" />
-		<line color="CIconFocused_normal" x1="width-((width-(width)%3)/3)-1" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3+2" y2="height-((height-height%3)/3)-2" />
-	</draw_ops>
-
-
-
-  <draw_ops name="button_close_unfocused">
-		<!-- glyph -->
-		<line color="CIconUnfocused_normal" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_normal" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconUnfocused_normal" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_normal" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_normal" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconUnfocused_normal" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
-  </draw_ops>
-
-  <draw_ops name="button_close_unfocused_prelight">
-		<!-- glyph -->
-		<line color="CIconUnfocused_prelight" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_prelight" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconUnfocused_prelight" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_prelight" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_prelight" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconUnfocused_prelight" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
-  </draw_ops>
-
-  <draw_ops name="button_close_unfocused_pressed">
-		<!-- glyph -->
-		<line color="CIconUnfocused_pressed" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_pressed" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconUnfocused_pressed" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_pressed" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_pressed" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconUnfocused_pressed" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
-  </draw_ops>
-
-
-  <!-- Maximize Buttons -->
-	<!-- !!!metacity actually draws rectagles 1px bigger then what is set!!! (that's the cause of the "-1"s in dimensions) -->
-	<draw_ops name="icon_maximize_shadow">
-		<!--
-			I want my rectangle nicelly centered so I won't let metacity do the roundings
-			hence why I use (width-width%3)/3, it's like doing an integer division.
-		-->
-		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
-		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
-	</draw_ops>
-	
-	<draw_ops name="icon_maximize_glyph">
-		<rectangle color="CIconFocused_normal" x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
-		<rectangle color="CIconFocused_normal" x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
-	</draw_ops>
-
-	<draw_ops name="icon_maximize">
-		<include name="icon_maximize_shadow" />
-		<include name="icon_maximize_glyph" />
-	</draw_ops>
-
-	<draw_ops name="icon_maximize_prelight">
-		<rectangle color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
-		<rectangle color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
-		<include name="icon_maximize_glyph" />
-	</draw_ops>
-
-
-  <draw_ops name="button_maximize_unfocused">
-		<!-- glyph -->
-		<rectangle color="CIconUnfocused_normal" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
-		<rectangle color="CIconUnfocused_normal" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
-  </draw_ops>
-
-  <draw_ops name="button_maximize_unfocused_prelight">
-		<!-- glyph -->
-	<rectangle color="CIconUnfocused_prelight" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
-	<rectangle color="CIconUnfocused_prelight" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
-  </draw_ops>
-
-  <draw_ops name="button_maximize_unfocused_pressed">
-		<!-- glyph -->
-	<rectangle color="CIconUnfocused_pressed" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
-	<rectangle color="CIconUnfocused_pressed" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
-  </draw_ops>
-
-
-  <!-- Minimize Buttons -->
-
-  <draw_ops name="icon_minimize_glyph">
-	<rectangle color="CIconFocused_normal" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)-1" width="width-2*((width-width%3)/3)-5" height="1"/>
-  </draw_ops>
-
-  <draw_ops name="icon_minimize_shadow">
-	<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
-  </draw_ops>
-
-  <draw_ops name="icon_minimize">
-	<include name="icon_minimize_shadow" />
-	<include name="icon_minimize_glyph" />	
-  </draw_ops>
-
-  <draw_ops name="icon_minimize_prelight">
-	<rectangle color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
-	<include name="icon_minimize_glyph" />	
-  </draw_ops>
-
-
-  <draw_ops name="button_minimize_unfocused">
-		<!-- glyph -->
-		<rectangle color="CIconUnfocused_normal" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
-  </draw_ops>
-
-  <draw_ops name="button_minimize_unfocused_prelight">
-		<!-- glyph -->
-		<rectangle color="CIconUnfocused_prelight" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
-  </draw_ops>
-
-  <draw_ops name="button_minimize_unfocused_pressed">
-		<!-- glyph -->
-		<rectangle color="CIconUnfocused_pressed" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
-  </draw_ops>
-
-  <!-- Frame Styles -->
-
-  <frame_style name="normal_focused" geometry="normal">
-     <piece position="entire_background" draw_ops="normal_focused"/>
-     <piece position="titlebar" draw_ops="titlebar_normal_focused"/>
-     <piece position="title" draw_ops="title_all"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button_bg_focused"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_bg_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_bg_pressed"/>
-
-	<button function="right_right_background" state="normal" draw_ops="button_bg_focused_outer_right"/>
-	<button function="right_right_background" state="prelight" draw_ops="button_bg_prelight_outer_right"/>
-	<button function="right_right_background" state="pressed" draw_ops="button_bg_pressed_outer_right"/>
-
-	<button function="right_left_background" state="normal" draw_ops="button_bg_focused_inner_right"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_bg_prelight_inner_right"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_bg_pressed_inner_right"/>
-
-     <button function="close" state="normal" draw_ops="icon_close"/>
-     <button function="close" state="prelight" draw_ops="icon_close_prelight"/>
-     <button function="close" state="pressed" draw_ops="icon_close"/>
-     <button function="maximize" state="normal" draw_ops="icon_maximize"/>
-     <button function="maximize" state="prelight" draw_ops="icon_maximize_prelight"/>
-     <button function="maximize" state="pressed" draw_ops="icon_maximize"/>
-     <button function="minimize" state="normal" draw_ops="icon_minimize"/>
-     <button function="minimize" state="prelight" draw_ops="icon_minimize_prelight"/>
-     <button function="minimize" state="pressed" draw_ops="icon_minimize"/>
-     <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
-     <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
-     <button function="unshade" state="normal"><draw_ops /></button><button function="unshade" state="pressed"><draw_ops /></button>
-     <button function="above" state="normal"><draw_ops /></button><button function="above" state="pressed"><draw_ops /></button>
-     <button function="unabove" state="normal"><draw_ops /></button><button function="unabove" state="pressed"><draw_ops /></button>
-     <button function="stick" state="normal"><draw_ops /></button><button function="stick" state="pressed"><draw_ops /></button>
-     <button function="unstick" state="normal"><draw_ops /></button><button function="unstick" state="pressed"><draw_ops /></button>
-  </frame_style>
-
-  <frame_style name="normal_unfocused" geometry="normal">
-     <piece position="entire_background" draw_ops="normal_unfocused"/>
-     <piece position="titlebar" draw_ops="titlebar_normal_unfocused"/>
-     <piece position="title" draw_ops="title_all_unfocused"/>
-
-     <button function="close" state="normal" draw_ops="button_close_unfocused"/>
-     <button function="close" state="prelight" draw_ops="button_close_unfocused_prelight"/>
-     <button function="close" state="pressed" draw_ops="button_close_unfocused_pressed"/>
-     <button function="maximize" state="normal" draw_ops="button_maximize_unfocused"/>
-     <button function="maximize" state="prelight" draw_ops="button_maximize_unfocused_prelight"/>
-     <button function="maximize" state="pressed" draw_ops="button_maximize_unfocused_pressed"/>
-     <button function="minimize" state="normal" draw_ops="button_minimize_unfocused"/>
-     <button function="minimize" state="prelight" draw_ops="button_minimize_unfocused_prelight"/>
-     <button function="minimize" state="pressed" draw_ops="button_minimize_unfocused_pressed"/>
-     <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
-     <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
-     <button function="unshade" state="normal"><draw_ops /></button><button function="unshade" state="pressed"><draw_ops /></button>
-     <button function="above" state="normal"><draw_ops /></button><button function="above" state="pressed"><draw_ops /></button>
-     <button function="unabove" state="normal"><draw_ops /></button><button function="unabove" state="pressed"><draw_ops /></button>
-     <button function="stick" state="normal"><draw_ops /></button><button function="stick" state="pressed"><draw_ops /></button>
-     <button function="unstick" state="normal"><draw_ops /></button><button function="unstick" state="pressed"><draw_ops /></button>
-  </frame_style>
-
-  <frame_style name="maximized_focused" geometry="maximized">
-     <piece position="entire_background" draw_ops="maximized_focused"/>
-     <piece position="titlebar" draw_ops="titlebar_maximized_focused"/>
-     <piece position="title" draw_ops="title_all"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button_bg_focused_max"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_bg_prelight_max"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_bg_pressed_max"/>
-
-	<button function="right_left_background" state="normal" draw_ops="button_bg_focused_inner_right_max"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_bg_prelight_inner_right_max"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_bg_pressed_inner_right_max"/>
-
-     <button function="close" state="normal" draw_ops="icon_close"/>
-     <button function="close" state="prelight" draw_ops="icon_close_prelight"/>
-     <button function="close" state="pressed" draw_ops="icon_close"/>
-     <button function="maximize" state="normal" draw_ops="icon_maximize"/>
-     <button function="maximize" state="prelight" draw_ops="icon_maximize_prelight"/>
-     <button function="maximize" state="pressed" draw_ops="icon_maximize"/>
-     <button function="minimize" state="normal" draw_ops="icon_minimize"/>
-     <button function="minimize" state="prelight" draw_ops="icon_minimize_prelight"/>
-     <button function="minimize" state="pressed" draw_ops="icon_minimize"/>
-     <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
-     <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
-     <button function="unshade" state="normal"><draw_ops /></button><button function="unshade" state="pressed"><draw_ops /></button>
-     <button function="above" state="normal"><draw_ops /></button><button function="above" state="pressed"><draw_ops /></button>
-     <button function="unabove" state="normal"><draw_ops /></button><button function="unabove" state="pressed"><draw_ops /></button>
-     <button function="stick" state="normal"><draw_ops /></button><button function="stick" state="pressed"><draw_ops /></button>
-     <button function="unstick" state="normal"><draw_ops /></button><button function="unstick" state="pressed"><draw_ops /></button>
-  </frame_style>
-
-  <frame_style name="maximized_unfocused" geometry="maximized">
-     <piece position="entire_background" draw_ops="maximized_unfocused"/>
-     <piece position="titlebar" draw_ops="titlebar_maximized_unfocused"/>
-     <piece position="title" draw_ops="title_all_unfocused"/>
-
-     <button function="close" state="normal" draw_ops="button_close_unfocused"/>
-     <button function="close" state="prelight" draw_ops="button_close_unfocused_prelight"/>
-     <button function="close" state="pressed" draw_ops="button_close_unfocused_pressed"/>
-     <button function="maximize" state="normal" draw_ops="button_maximize_unfocused"/>
-     <button function="maximize" state="prelight" draw_ops="button_maximize_unfocused_prelight"/>
-     <button function="maximize" state="pressed" draw_ops="button_maximize_unfocused_pressed"/>
-     <button function="minimize" state="normal" draw_ops="button_minimize_unfocused"/>
-     <button function="minimize" state="prelight" draw_ops="button_minimize_unfocused_prelight"/>
-     <button function="minimize" state="pressed" draw_ops="button_minimize_unfocused_pressed"/>
-     <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
-     <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
-     <button function="unshade" state="normal"><draw_ops /></button><button function="unshade" state="pressed"><draw_ops /></button>
-     <button function="above" state="normal"><draw_ops /></button><button function="above" state="pressed"><draw_ops /></button>
-     <button function="unabove" state="normal"><draw_ops /></button><button function="unabove" state="pressed"><draw_ops /></button>
-     <button function="stick" state="normal"><draw_ops /></button><button function="stick" state="pressed"><draw_ops /></button>
-     <button function="unstick" state="normal"><draw_ops /></button><button function="unstick" state="pressed"><draw_ops /></button>
-  </frame_style>
-
-  <frame_style name="border_focused" geometry="border">
-     <piece position="entire_background" draw_ops="border_focused"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button_bg_focused"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_bg_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_bg_pressed"/>
-	<button function="right_right_background" state="normal" draw_ops="button_bg_focused_outer_right"/>
-	<button function="right_right_background" state="prelight" draw_ops="button_bg_prelight_outer_right"/>
-	<button function="right_right_background" state="pressed" draw_ops="button_bg_pressed_outer_right"/>
-	<button function="right_left_background" state="normal" draw_ops="button_bg_focused_inner_right"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_bg_prelight_inner_right"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_bg_pressed_inner_right"/>
-
-
-     <button function="close" state="normal" draw_ops="icon_close"/>
-     <button function="close" state="prelight" draw_ops="icon_close"/>
-     <button function="close" state="pressed" draw_ops="icon_close"/>
-     <button function="maximize" state="normal" draw_ops="icon_maximize"/>
-     <button function="maximize" state="prelight" draw_ops="icon_maximize"/>
-     <button function="maximize" state="pressed" draw_ops="icon_maximize"/>
-     <button function="minimize" state="normal" draw_ops="icon_minimize"/>
-     <button function="minimize" state="prelight" draw_ops="icon_minimize"/>
-     <button function="minimize" state="pressed" draw_ops="icon_minimize"/>
-     <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
-     <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
-     <button function="unshade" state="normal"><draw_ops /></button><button function="unshade" state="pressed"><draw_ops /></button>
-     <button function="above" state="normal"><draw_ops /></button><button function="above" state="pressed"><draw_ops /></button>
-     <button function="unabove" state="normal"><draw_ops /></button><button function="unabove" state="pressed"><draw_ops /></button>
-     <button function="stick" state="normal"><draw_ops /></button><button function="stick" state="pressed"><draw_ops /></button>
-     <button function="unstick" state="normal"><draw_ops /></button><button function="unstick" state="pressed"><draw_ops /></button>
-
-  </frame_style>
-
-  <frame_style name="border_unfocused" geometry="border">
-     <piece position="entire_background" draw_ops="border_unfocused"/>
-
-     <button function="close" state="normal" draw_ops="button_close_unfocused"/>
-     <button function="close" state="prelight" draw_ops="button_close_unfocused_prelight"/>
-     <button function="close" state="pressed" draw_ops="button_close_unfocused_pressed"/>
-     <button function="maximize" state="normal" draw_ops="button_maximize_unfocused"/>
-     <button function="maximize" state="prelight" draw_ops="button_maximize_unfocused_prelight"/>
-     <button function="maximize" state="pressed" draw_ops="button_maximize_unfocused_pressed"/>
-     <button function="minimize" state="normal" draw_ops="button_minimize_unfocused"/>
-     <button function="minimize" state="prelight" draw_ops="button_minimize_unfocused_prelight"/>
-     <button function="minimize" state="pressed" draw_ops="button_minimize_unfocused_pressed"/>
-     <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
-     <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
-     <button function="unshade" state="normal"><draw_ops /></button><button function="unshade" state="pressed"><draw_ops /></button>
-     <button function="above" state="normal"><draw_ops /></button><button function="above" state="pressed"><draw_ops /></button>
-     <button function="unabove" state="normal"><draw_ops /></button><button function="unabove" state="pressed"><draw_ops /></button>
-     <button function="stick" state="normal"><draw_ops /></button><button function="stick" state="pressed"><draw_ops /></button>
-     <button function="unstick" state="normal"><draw_ops /></button><button function="unstick" state="pressed"><draw_ops /></button>
+<info>
+	<name>Adwaita</name>
+	<author>GNOME Art Team &lt;art.gnome.org&gt;</author>
+	<copyright>&#194; Intel, &#194; Red Hat, Lapo Calamandrei</copyright>
+	<date>2010</date>
+	<description>Default GNOME 3 window theme</description>
+</info>
+
+<!-- meaningfull constants -->
+
+<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
+<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.8" />
+<constant name="C_titlebar_focused_hilight" value="gtk:text[SELECTED]" />
+<constant name="C_titlebar_unfocused" value="blend/#ffffff/gtk:bg[NORMAL]/0.4" />
+<constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" />
+<constant name="C_title_focused_hilight" value="gtk:text[SELECTED]" />
+<constant name="C_title_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
+<!-- color of the button icons -->
+<constant name="C_icons_focused" value="gtk:text[SELECTED]" />
+<constant name="C_icons_focused_pressed" value="gtk:text[SELECTED]" />
+<constant name="C_icons_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
+<constant name="C_icons_unfocused_prelight" value="gtk:bg[NORMAL]" />
+<constant name="C_icons_unfocused_pressed" value="blend/#000000/gtk:bg[NORMAL]/0.7" />
+<constant name="D_icons_unfocused_offset" value="2" />
+
+<!-- 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="2" />
+	<distance name="left_titlebar_edge" value="0"/>
+	<distance name="right_titlebar_edge" value="0"/>
+	<distance name="title_vertical_pad" value="15"/>
+	<border name="title_border" left="10" right="10" top="1" bottom="1"/>
+	<border name="button_border" left="0" right="0" top="1" bottom="3"/>
+	<aspect_ratio name="button" value="1"/>
+</frame_geometry>
+
+<frame_geometry name="normal_unfocused" title_scale="medium" parent="normal">
+	<distance name="left_titlebar_edge" value="1"/>
+	<distance name="right_titlebar_edge" value="1"/>
+</frame_geometry>
+
+<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="0"/>
+	<distance name="right_titlebar_edge" value="0"/>
+	<distance name="title_vertical_pad" value="14"/>
+	<border name="title_border" left="10" right="10" top="1" bottom="1"/>
+	<border name="button_border" left="0" right="0" top="0" bottom="3"/>
+	<distance name="bottom_height" value="0" />
+</frame_geometry>
+
+<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
+	<distance name="title_vertical_pad" value="10"/>
+	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
+	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
+</frame_geometry>
+
+<frame_geometry name="small_unfocused" parent="small">
+	<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" hide_buttons="true" parent="normal" rounded_top_left="false" rounded_top_right="false">
+	<distance name="left_width" value="1" />
+	<distance name="right_width" value="1" />
+	<distance name="bottom_height" value="1" />
+	<border name="title_border" left="10" right="10" top="0" bottom="0" />
+	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
+	<distance name="title_vertical_pad" value="1" />
+</frame_geometry>
+
+<frame_geometry name="attached" has_title="false" parent="borderless">
+	<distance name="title_vertical_pad" value="10" />
+</frame_geometry>
+
+<!-- drawing operations -->
+
+	<!-- title -->
+
+<draw_ops name="title_focused">
+	<title x="(0 `max` ((width - title_width) / 2)) + 3" y="(0 `max` ((height - title_height) / 2)) + 2"
+		color="C_title_focused_hilight" />
+	<title x="(0 `max` ((width - title_width) / 2)) + 2" y="(0 `max` ((height - title_height) / 2)) + 1"
+		color="C_title_focused" />
+</draw_ops>
+
+<draw_ops name="title_unfocused">
+	<title x="(0 `max` ((width - title_width) / 2)) + 2" y="(0 `max` ((height - title_height) / 2)) + 1"
+		color="C_title_unfocused"/>
+</draw_ops>
+
+	<!-- window decorations -->
+
+<draw_ops name="entire_background_focused">
+	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
+</draw_ops>
+
+<draw_ops name="entire_background_unfocused">
+	<include name="entire_background_focused" />
+</draw_ops>
+
+<draw_ops name="titlebar_fill_focused">
+	<gradient type="vertical" x="0" y="0" width="width" height="height">
+		<color value="blend/gtk:bg[NORMAL]/#ffffff/0.4" />
+		<color value="gtk:bg[NORMAL]"/>
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
+	</gradient>
+</draw_ops>
+
+<draw_ops name="titlebar_fill_focused_alt">
+	<gradient type="vertical" x="0" y="0" width="width" height="height">
+		<color value="blend/gtk:bg[NORMAL]/#ffffff/0.4" />
+		<color value="gtk:bg[NORMAL]"/>
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
+		<color value="gtk:bg[NORMAL]" />
+	</gradient>
+</draw_ops>
+
+<draw_ops name="titlebar_fill_unfocused">
+	<rectangle color="C_titlebar_unfocused" x="0" y="0" width="width" height="height" filled="true" />
+</draw_ops>
+
+<draw_ops name="titlebar_unfocused">
+	<include name="titlebar_fill_unfocused" />
+	<line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_icons_unfocused" />
+</draw_ops>
+
+<draw_ops name="hilight">
+	<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="blend/gtk:bg[NORMAL]/#000000/0.03" />
+	</gradient>
+</draw_ops>
+
+<draw_ops name="rounded_hilight">
+	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
+	<arc color="C_titlebar_focused_hilight" x="1" y="1" width="7" height="7"  start_angle="270" extent_angle="90" />
+	<arc color="C_titlebar_focused_hilight" x="width-10" y="1" width="9" height="7"  start_angle="0" extent_angle="90" />
+	<gradient type="vertical" x="1" y="5" width="1" height="height-9">
+		<color value="C_titlebar_focused_hilight" />
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
+	</gradient>
+</draw_ops>
+
+<draw_ops name="titlebar_focused">
+	<include name="titlebar_fill_focused_alt" />
+	<include name="hilight" />
+</draw_ops>
+
+<draw_ops name="rounded_titlebar_focused">
+	<include name="titlebar_fill_focused" />
+	<include name="rounded_hilight" />
+</draw_ops>
+
+<draw_ops name="rounded_titlebar_focused_alt">
+	<include name="titlebar_fill_focused_alt" />
+	<include name="rounded_hilight" />
+</draw_ops>
+
+<draw_ops name="border_focused">
+	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
+</draw_ops>
+
+<draw_ops name="border_unfocused">
+	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
+</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" />
+	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
+	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
+	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
+	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
+	<!-- double arcs for darker borders -->
+	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
+	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
+</draw_ops>
+
+<draw_ops name="rounded_border_unfocused">
+	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
+	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
+	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
+	<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>
+
+	<!-- button icons-->
+
+<constant name="C_icons_shadow" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
+
+<draw_ops name="close_glyph_focused">
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-1" 
+		color="C_icons_focused" />
+	<line x1="(width-width%3)/3+1" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3+1" x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-1"
+		color="C_icons_focused" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-1"
+		color="C_icons_focused" />
+	<line x1="width-(width-width%3)/3-2" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3+1" x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-1"
+		color="C_icons_focused" />
+</draw_ops>
+
+<draw_ops name="close_shadow_focused">
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-1" 
+		color="C_icons_shadow" />
+	<line x1="(width-width%3)/3+1" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-2"
+		color="C_icons_shadow" />
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3+1" x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-1"
+		color="C_icons_shadow" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-1"
+		color="C_icons_shadow" />
+	<line x1="width-(width-width%3)/3-2" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-2"
+		color="C_icons_shadow" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3+1" x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-1"
+		color="C_icons_shadow" />
+</draw_ops>
+
+<draw_ops name="close_focused">
+	<include name="close_shadow_focused" y="1" />
+	<include name="close_glyph_focused" />
+</draw_ops>
+
+<draw_ops name="close_focused_pressed">
+	<include name="close_glyph_focused" y="1" />
+</draw_ops>
+
+<draw_ops name="close_glyph_unfocused">
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-1" 
+		color="C_icons_unfocused" />
+	<line x1="(width-width%3)/3+1" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3+1" x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused" />
+	<line x1="width-(width-width%3)/3-2" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3+1" x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused" />
+</draw_ops>
+
+<draw_ops name="close_unfocused">
+	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="close_glyph_unfocused_prelight">
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-1" 
+		color="C_icons_unfocused_prelight" />
+	<line x1="(width-width%3)/3+1" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused_prelight" />
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3+1" x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused_prelight" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused_prelight" />
+	<line x1="width-(width-width%3)/3-2" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused_prelight" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3+1" x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused_prelight" />
+</draw_ops>
+
+<draw_ops name="close_unfocused_prelight">
+	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="close_glyph_unfocused_pressed">
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-1" 
+		color="C_icons_unfocused_pressed" />
+	<line x1="(width-width%3)/3+1" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused_pressed" />
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3+1" x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused_pressed" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused_pressed" />
+	<line x1="width-(width-width%3)/3-2" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused_pressed" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3+1" x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused_pressed" />
+</draw_ops>
+
+<draw_ops name="close_unfocused_pressed">
+	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="maximize_glyph_focused">
+	<rectangle x="(width-width%3)/3" y="(height-height%3)/3" width="width-2*(width-width%3)/3-1" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_focused" />
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_focused" />
+</draw_ops>
+
+<draw_ops name="maximize_shadow_focused">
+	<rectangle x="(width-width%3)/3" y="(height-height%3)/3" width="width-2*(width-width%3)/3-1" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_shadow" />
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_shadow" />
+</draw_ops>
+
+<draw_ops name="maximize_focused">
+	<include name="maximize_shadow_focused" y="1" />
+	<include name="maximize_glyph_focused" />
+</draw_ops>
+
+<draw_ops name="maximize_focused_pressed">
+	<include name="maximize_glyph_focused" y="1" />
+</draw_ops>
+
+<draw_ops name="maximize_glyph_unfocused">
+	<rectangle x="(width-width%3)/3" y="(height-height%3)/3" width="width-2*(width-width%3)/3-1" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_unfocused" />
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_unfocused" />
+</draw_ops>
+
+<draw_ops name="maximize_unfocused">
+	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="maximize_glyph_unfocused_prelight">
+	<rectangle x="(width-width%3)/3" y="(height-height%3)/3" width="width-2*(width-width%3)/3-1" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_unfocused_prelight" />
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_unfocused_prelight" />
+</draw_ops>
+
+<draw_ops name="maximize_unfocused_prelight">
+	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="maximize_glyph_unfocused_pressed">
+	<rectangle x="(width-width%3)/3" y="(height-height%3)/3" width="width-2*(width-width%3)/3-1" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_unfocused_pressed" />
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_unfocused_pressed" />
+</draw_ops>
+
+<draw_ops name="maximize_unfocused_pressed">
+	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="minimize_glyph_focused">
+	<rectangle x="(width-width%3)/3+2" y="height-(height-height%3)/3-2" width="width-2*(width-width%3)/3-4" height="2" filled="true"
+		color="C_icons_focused" />
+</draw_ops>
+
+<draw_ops name="minimize_shadow_focused">
+	<rectangle x="(width-width%3)/3+2" y="height-(height-height%3)/3-2" width="width-2*(width-width%3)/3-4" height="2" filled="true"
+		color="C_icons_shadow" />
+</draw_ops>
+
+<draw_ops name="minimize_focused">
+	<include name="minimize_shadow_focused" y="1" />
+	<include name="minimize_glyph_focused" />
+</draw_ops>
+
+<draw_ops name="minimize_focused_pressed">
+	<include name="minimize_glyph_focused" y="1" />
+</draw_ops>
+
+<draw_ops name="minimize_glyph_unfocused">
+	<rectangle x="(width-width%3)/3+2" y="height-(height-height%3)/3-2" width="width-2*(width-width%3)/3-4" height="2" filled="true"
+		color="C_icons_unfocused" />
+</draw_ops>
+
+<draw_ops name="minimize_unfocused">
+	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="minimize_glyph_unfocused_prelight">
+	<rectangle x="(width-width%3)/3+2" y="height-(height-height%3)/3-2" width="width-2*(width-width%3)/3-4" height="2" filled="true"
+		color="C_icons_unfocused_prelight" />
+</draw_ops>
+
+<draw_ops name="minimize_unfocused_prelight">
+	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="minimize_glyph_unfocused_pressed">
+	<rectangle x="(width-width%3)/3+2" y="height-(height-height%3)/3-2" width="width-2*(width-width%3)/3-4" height="2" filled="true"
+		color="C_icons_unfocused_pressed" />
+</draw_ops>
+
+<draw_ops name="minimize_unfocused_pressed">
+	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="menu_glyph_focused">
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_focused" />
+	<rectangle x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_focused" />
+	<rectangle x="(width-width%3)/3+4" y="height/2-1" width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_focused" />
+</draw_ops>
+
+<draw_ops name="menu_shadow_focused">
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_shadow" />
+	<rectangle x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_shadow" />
+	<rectangle x="(width-width%3)/3+4" y="height/2-1" width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_shadow" />
+</draw_ops>
+
+<draw_ops name="menu_focused">
+	<include name="menu_shadow_focused" y="1" />
+	<include name="menu_glyph_focused" />
+</draw_ops>
+
+<draw_ops name="menu_focused_pressed">
+	<include name="menu_glyph_focused" y="1" />
+</draw_ops>
+
+<draw_ops name="menu_glyph_unfocused">
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_unfocused" />
+	<rectangle x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_unfocused" />
+	<rectangle x="(width-width%3)/3+4" y="height/2-1" width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_unfocused" />
+</draw_ops>
+
+<draw_ops name="menu_unfocused">
+	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="menu_glyph_unfocused_prelight">
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_unfocused_prelight" />
+	<rectangle x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_unfocused_prelight" />
+	<rectangle x="(width-width%3)/3+4" y="height/2-1" width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_unfocused_prelight" />
+</draw_ops>
+
+<draw_ops name="menu_unfocused_prelight">
+	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="menu_glyph_unfocused_pressed">
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_unfocused_pressed" />
+	<rectangle x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_unfocused_pressed" />
+	<rectangle x="(width-width%3)/3+4" y="height/2-1" width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_unfocused_pressed" />
+</draw_ops>
+
+<draw_ops name="menu_unfocused_pressed">
+	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+	<!-- button backgrounds -->
+
+<constant name="C_button_border" value="blend/#000000/gtk:bg[NORMAL]/0.8" />
+<constant name="C_button_hilight" value="blend/#ffffff/gtk:bg[NORMAL]/0.6" />
+
+<draw_ops name="button_fill"> <!-- button background gradient -->
+	<gradient type="vertical" x="0" y="0" width="width" height="height-2">
+		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.1" />
+		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.14" />
+		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.17" />
+		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.06" />
+	</gradient>
+</draw_ops>
+
+<draw_ops name="button_bottom">
+	<line x1="0" y1="height-2" x2="width-1" y2="height-2" color="C_button_border" />
+	<line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_button_hilight" />
+</draw_ops>
+
+<draw_ops name="button_bevel">
+	<gradient type="vertical" x="0" y="0" width="1" height="height-2">
+		<color value="blend/gtk:bg[NORMAL]/#ffffff/0.1"/>
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
+	</gradient>
+	<gradient type="vertical" x="width-1" y="0" width="1" height="height-2">
+		<color value="C_border_focused"/>
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
+	</gradient>
+</draw_ops>
+
+<draw_ops name="button_fill_prelight"> <!-- button background gradient for prelight status -->
+	<gradient type="vertical" x="0" y="0" width="width" height="height-2">
+		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.05" />
+		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.07" />
+		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.09" />
+		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.03" />
+	</gradient>
+</draw_ops>
+
+<draw_ops name="button_fill_pressed"> <!-- button background gradient for pressed status -->
+	<gradient type="vertical" x="0" y="0" width="width" height="height-2">
+		<color value="C_border_focused" />
+		<color value="blend/#000000/gtk:bg[NORMAL]/0.75" />
+		<color value="blend/#000000/gtk:bg[NORMAL]/0.8" />
+	</gradient>
+</draw_ops>
+
+<draw_ops name="button">
+	<include name="button_fill" />
+	<include name="button_bevel" />
+	<include name="button_bottom" />
+</draw_ops>
+
+<draw_ops name="button_prelight">
+	<include name="button_fill_prelight" />
+	<include name="button_bevel" />
+	<include name="button_bottom" />
+</draw_ops>
+
+<draw_ops name="button_pressed">
+	<include name="button_fill_pressed" />
+	<include name="button_bottom" />
+</draw_ops>
+
+<!-- things get messy here -->
+
+<draw_ops name="button_inner_right_slice1">
+	<clip x="0" y="0" width="width" height="height-5" />
+	<include name="button" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice2">
+	<clip x="1" y="height-5" width="width-1" height="2" />
+	<include name="button" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice3">
+	<clip x="2" y="height-3" width="width-2" height="1" />
+	<include name="button" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice4">
+	<clip x="4" y="height-2" width="width-4" height="2" />
+	<include name="button" />
+</draw_ops>
+
+<draw_ops name="button_inner_right_fill">
+	<include name="button_inner_right_slice1" />
+	<include name="button_inner_right_slice2" />
+	<include name="button_inner_right_slice3" />
+	<include name="button_inner_right_slice4" />
+</draw_ops>
+
+<draw_ops name="button_inner_right_slice1_prelight">
+	<clip x="0" y="0" width="width" height="height-5" />
+	<include name="button_prelight" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice2_prelight">
+	<clip x="1" y="height-5" width="width-1" height="2" />
+	<include name="button_prelight" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice3_prelight">
+	<clip x="2" y="height-3" width="width-2" height="1" />
+	<include name="button_prelight" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice4_prelight">
+	<clip x="4" y="height-2" width="width-4" height="2" />
+	<include name="button_prelight" />
+</draw_ops>
+
+<draw_ops name="button_inner_right_fill_prelight">
+	<include name="button_inner_right_slice1_prelight" />
+	<include name="button_inner_right_slice2_prelight" />
+	<include name="button_inner_right_slice3_prelight" />
+	<include name="button_inner_right_slice4_prelight" />
+</draw_ops>
+
+<draw_ops name="button_inner_right_slice1_pressed">
+	<clip x="0" y="0" width="width" height="height-5" />
+	<include name="button_pressed" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice2_pressed">
+	<clip x="1" y="height-5" width="width-1" height="2" />
+	<include name="button_pressed" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice3_pressed">
+	<clip x="2" y="height-3" width="width-2" height="1" />
+	<include name="button_pressed" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice4_pressed">
+	<clip x="4" y="height-2" width="width-4" height="2" />
+	<include name="button_pressed" />
+</draw_ops>
+
+<draw_ops name="button_inner_right_fill_pressed">
+	<include name="button_inner_right_slice1_pressed" />
+	<include name="button_inner_right_slice2_pressed" />
+	<include name="button_inner_right_slice3_pressed" />
+	<include name="button_inner_right_slice4_pressed" />
+</draw_ops>
+
+
+<draw_ops name="button_inner_right_border">
+	<gradient type="vertical" x="0" y="0" width="1" height="height-5">
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
+	</gradient>
+	<arc color="C_button_hilight" x="1" y="height-10" width="9" height="9"  start_angle="180" extent_angle="90" />
+	<gradient type="vertical" x="1" y="0" width="1" height="height-5">
+		<color value="C_border_focused" />
+		<color value="C_button_border" />
+	</gradient>
+	<arc color="C_button_border" x="1" y="height-11" width="9" height="9"  start_angle="180" extent_angle="90" />
+</draw_ops>
+
+<draw_ops name="button_inner_right">
+	<include name="button_inner_right_fill" />
+	<include name="button_inner_right_border" />
+</draw_ops>
+
+<draw_ops name="button_inner_right_prelight">
+	<include name="button_inner_right_fill_prelight" />
+	<include name="button_inner_right_border" />
+</draw_ops>
+
+<draw_ops name="button_inner_right_pressed">
+	<include name="button_inner_right_fill_pressed" />
+	<include name="button_inner_right_border" />
+</draw_ops>
+
+<draw_ops name="button_inner_left_slice1">
+	<clip x="0" y="0" width="width-1" height="height-5" />
+	<include name="button" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice2">
+	<clip x="0" y="height-5" width="width-2" height="2" />
+	<include name="button" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice3">
+	<clip x="0" y="height-3" width="width-3" height="1" />
+	<include name="button" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice4">
+	<clip x="0" y="height-2" width="width-5" height="2" />
+	<include name="button" />
+</draw_ops>
+
+<draw_ops name="button_inner_left_fill">
+	<include name="button_inner_left_slice1" />
+	<include name="button_inner_left_slice2" />
+	<include name="button_inner_left_slice3" />
+	<include name="button_inner_left_slice4" />
+</draw_ops>
+
+<draw_ops name="button_inner_left_slice1_prelight">
+	<clip x="0" y="0" width="width-1" height="height-5" />
+	<include name="button_prelight" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice2_prelight">
+	<clip x="0" y="height-5" width="width-2" height="2" />
+	<include name="button_prelight" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice3_prelight">
+	<clip x="0" y="height-3" width="width-3" height="1" />
+	<include name="button_prelight" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice4_prelight">
+	<clip x="0" y="height-2" width="width-5" height="2" />
+	<include name="button_prelight" />
+</draw_ops>
+
+<draw_ops name="button_inner_left_fill_prelight">
+	<include name="button_inner_left_slice1_prelight" />
+	<include name="button_inner_left_slice2_prelight" />
+	<include name="button_inner_left_slice3_prelight" />
+	<include name="button_inner_left_slice4_prelight" />
+</draw_ops>
+
+<draw_ops name="button_inner_left_slice1_pressed">
+	<clip x="0" y="0" width="width-1" height="height-5" />
+	<include name="button_pressed" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice2_pressed">
+	<clip x="0" y="height-5" width="width-2" height="2" />
+	<include name="button_pressed" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice3_pressed">
+	<clip x="0" y="height-3" width="width-3" height="1" />
+	<include name="button_pressed" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice4_pressed">
+	<clip x="0" y="height-2" width="width-5" height="2" />
+	<include name="button_pressed" />
+</draw_ops>
+
+<draw_ops name="button_inner_left_fill_pressed">
+	<include name="button_inner_left_slice1_pressed" />
+	<include name="button_inner_left_slice2_pressed" />
+	<include name="button_inner_left_slice3_pressed" />
+	<include name="button_inner_left_slice4_pressed" />
+</draw_ops>
+
+
+<draw_ops name="button_inner_left_border">
+	<gradient type="vertical" x="width-1" y="0" width="1" height="height-6">
+		<color value="C_titlebar_focused_hilight" />
+		<color value="C_button_hilight" />
+	</gradient>
+	<arc color="C_button_hilight" x="width-11" y="height-11" width="10" height="10"  start_angle="90" extent_angle="90" />
+	<gradient type="vertical" x="width-2" y="0" width="1" height="height-5">
+		<color value="C_border_focused" />
+		<color value="C_button_border" />
+	</gradient>
+	<arc color="C_button_border" x="width-11" y="height-11" width="9" height="9"  start_angle="90" extent_angle="90" />
+</draw_ops>
+
+<draw_ops name="button_inner_left">
+	<include name="button_inner_left_fill" />
+	<include name="button_inner_left_border" />
+</draw_ops>
+
+<draw_ops name="button_inner_left_prelight">
+	<include name="button_inner_left_fill_prelight" />
+	<include name="button_inner_left_border" />
+</draw_ops>
+
+<draw_ops name="button_inner_left_pressed">
+	<include name="button_inner_left_fill_pressed" />
+	<include name="button_inner_left_border" />
+</draw_ops>
+
+<!-- frame styles -->
+
+<frame_style name="normal_focused" geometry="normal">
+	<piece position="entire_background" draw_ops="entire_background_focused" />
+	<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="pressed" draw_ops="close_focused_pressed" />
+	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
+
+	<button function="left_middle_background" state="normal" draw_ops="button"/>
+	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
+	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
+	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
+	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
+	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
+
+	<button function="right_middle_background" state="normal" draw_ops="button"/>
+	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
+	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
+	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
+	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
+	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
+
+	<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="utility_focused" geometry="utility" parent="normal_focused">
-	<button function="right_right_background" state="normal" draw_ops="button_bg_focused_single_right"/>
-	<button function="right_right_background" state="prelight" draw_ops="button_bg_prelight_single_right"/>
-	<button function="right_right_background" state="pressed" draw_ops="button_bg_pressed_single_right"/>
-	<button function="right_middle_background" state="normal" draw_ops="button_bg_focused_single_right"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_bg_prelight_single_right"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_bg_pressed_single_right"/>
-	<button function="close" state="normal" draw_ops="icon_close_single"/>
-	<button function="close" state="prelight" draw_ops="icon_close_single"/>
-	<button function="close" state="pressed" draw_ops="icon_close_single"/>
+<frame_style name="normal_unfocused" geometry="normal_unfocused">
+	<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="rounded_border_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"/>
+	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
+	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
+	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
+	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
+	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
+	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
+	<button function="menu" state="normal" draw_ops="menu_unfocused" />
+	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
+	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
+	<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="utility_unfocused" geometry="utility" parent="normal_unfocused">
-	<button function="close" state="normal" draw_ops="button_close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="button_close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="button_close_unfocused_pressed"/>
+<frame_style name="normal_max_focused" geometry="max">
+	<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="pressed" draw_ops="close_focused_pressed" />
+	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
+
+	<button function="left_middle_background" state="normal" draw_ops="button"/>
+	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
+	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
+	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
+	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
+	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
+
+	<button function="right_middle_background" state="normal" draw_ops="button"/>
+	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
+	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
+	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
+	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
+	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
+
+	<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="dialog_focused" geometry="dialog" parent="normal_focused">
-	<button function="right_right_background" state="normal" draw_ops="button_bg_focused_single_right"/>
-	<button function="right_right_background" state="prelight" draw_ops="button_bg_prelight_single_right"/>
-	<button function="right_right_background" state="pressed" draw_ops="button_bg_pressed_single_right"/>
-	<button function="right_middle_background" state="normal" draw_ops="button_bg_focused_single_right"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_bg_prelight_single_right"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_bg_pressed_single_right"/>
-	<button function="close" state="normal" draw_ops="icon_close_single"/>
-	<button function="close" state="prelight" draw_ops="icon_close_single"/>
-	<button function="close" state="pressed" draw_ops="icon_close_single"/>
+<frame_style name="normal_max_unfocused" geometry="max">
+	<piece position="entire_background" draw_ops="entire_background_unfocused" />
+	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
+	<piece position="title" draw_ops="title_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"/>
+	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
+	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
+	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
+	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
+	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
+	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
+	<button function="menu" state="normal" draw_ops="menu_unfocused" />
+	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
+	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
+	<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="dialog_unfocused" geometry="dialog" parent="normal_unfocused">
-	<button function="right_right_background" state="normal" draw_ops="button_bg_focused_single_right"/>
-	<button function="right_right_background" state="prelight" draw_ops="button_bg_prelight_single_right"/>
-	<button function="right_right_background" state="pressed" draw_ops="button_bg_pressed_single_right"/>
-	<button function="right_middle_background" state="normal" draw_ops="button_bg_focused_single_right"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_bg_prelight_single_right"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_bg_pressed_single_right"/>
-	<button function="close" state="normal" draw_ops="icon_close_single"/>
-	<button function="close" state="prelight" draw_ops="icon_close_single"/>
-	<button function="close" state="pressed" draw_ops="icon_close_single"/>
+<frame_style name="dialog_focused" geometry="nobuttons">
+	<piece position="entire_background" draw_ops="entire_background_focused" />
+	<piece position="titlebar" draw_ops="rounded_titlebar_focused_alt" />
+	<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="pressed" draw_ops="close_focused_pressed" />
+	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
+
+	<button function="left_middle_background" state="normal" draw_ops="button"/>
+	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
+	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
+	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
+	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
+	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
+
+	<button function="right_middle_background" state="normal" draw_ops="button"/>
+	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
+	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
+	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
+	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
+	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
+
+	<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 sets -->
-
-  <frame_style_set name="normal">
-     <frame state="normal" resize="none" focus="no" style="normal_unfocused"/>
-     <frame state="normal" resize="none" focus="yes" style="normal_focused"/>
-     <frame state="normal" resize="both" focus="no" style="normal_unfocused"/>
-     <frame state="normal" resize="both" focus="yes" style="normal_focused"/>
-
-     <frame state="shaded" focus="no" style="normal_unfocused"/>
-     <frame state="shaded" focus="yes" style="normal_focused"/>
-
-     <frame state="maximized" focus="no" style="maximized_unfocused"/>
-     <frame state="maximized" focus="yes" style="maximized_focused"/>
-
-     <frame state="maximized_and_shaded" focus="no" style="maximized_unfocused"/>
-     <frame state="maximized_and_shaded" focus="yes" style="maximized_focused"/>
-
-  </frame_style_set>
-
-  <frame_style_set name="utility">
-     <frame state="normal" resize="none" focus="no" style="utility_unfocused"/>
-     <frame state="normal" resize="none" focus="yes" style="utility_focused"/>
-     <frame state="normal" resize="both" focus="no" style="utility_unfocused"/>
-     <frame state="normal" resize="both" focus="yes" style="utility_focused"/>
-
-     <frame state="shaded" focus="no" style="utility_unfocused"/>
-     <frame state="shaded" focus="yes" style="utility_focused"/>
-
-     <frame state="maximized" focus="no" style="utility_unfocused"/>
-     <frame state="maximized" focus="yes" style="utility_focused"/>
-
-     <frame state="maximized_and_shaded" focus="no" style="utility_unfocused"/>
-     <frame state="maximized_and_shaded" focus="yes" style="utility_focused"/>
-
-  </frame_style_set>
-
-  <frame_style_set name="dialog">
-     <frame state="normal" resize="none" focus="no" style="dialog_unfocused"/>
-     <frame state="normal" resize="none" focus="yes" style="dialog_focused"/>
-     <frame state="normal" resize="both" focus="no" style="dialog_unfocused"/>
-     <frame state="normal" resize="both" focus="yes" style="dialog_focused"/>
-
-     <frame state="shaded" focus="no" style="dialog_unfocused"/>
-     <frame state="shaded" focus="yes" style="dialog_focused"/>
-
-     <frame state="maximized" focus="no" style="dialog_unfocused"/>
-     <frame state="maximized" focus="yes" style="dialog_focused"/>
-
-     <frame state="maximized_and_shaded" focus="no" style="dialog_unfocused"/>
-     <frame state="maximized_and_shaded" focus="yes" style="dialog_focused"/>
-
-  </frame_style_set>
-
+<frame_style name="dialog_unfocused" geometry="nobuttons">
+	<piece position="entire_background" draw_ops="entire_background_unfocused" />
+	<piece position="titlebar" draw_ops="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"/>
+	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
+	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
+	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
+	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
+	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
+	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
+	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
+	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
+	<button function="menu" state="normal" draw_ops="menu_unfocused" />
+	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
+	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
+	<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_set name="border">
-     <frame state="normal" resize="none" focus="no" style="border_unfocused"/>
-     <frame state="normal" resize="none" focus="yes" style="border_focused"/>
-     <frame state="normal" resize="both" focus="no" style="border_unfocused"/>
-     <frame state="normal" resize="both" focus="yes" style="border_focused"/>
+<frame_style name="modal_dialog_focused" geometry="nobuttons">
+	<piece position="entire_background" draw_ops="entire_background_focused" />
+	<piece position="titlebar" draw_ops="rounded_titlebar_focused_alt" />
+	<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="pressed" draw_ops="close_focused_pressed" />
+	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
+
+	<button function="left_middle_background" state="normal" draw_ops="button"/>
+	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
+	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
+	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
+	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
+	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
+
+	<button function="right_middle_background" state="normal" draw_ops="button"/>
+	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
+	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
+	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
+	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
+	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
+
+	<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 state="shaded" focus="no" style="border_unfocused"/>
-     <frame state="shaded" focus="yes" style="border_focused"/>
+<frame_style name="modal_dialog_unfocused" geometry="nobuttons">
+	<piece position="entire_background" draw_ops="entire_background_unfocused" />
+	<piece position="titlebar" draw_ops="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"/>
+	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
+	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
+	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
+	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
+	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
+	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
+	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
+	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
+	<button function="menu" state="normal" draw_ops="menu_unfocused" />
+	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
+	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
+	<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 state="maximized" focus="no" style="border_unfocused"/>
-     <frame state="maximized" focus="yes" style="border_focused"/>
 
-     <frame state="maximized_and_shaded" focus="no" style="border_unfocused"/>
-     <frame state="maximized_and_shaded" focus="yes" style="border_focused"/>
+<frame_style name="utility_focused" geometry="small">
+	<piece position="entire_background" draw_ops="entire_background_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" />
+	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
+	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
+
+	<button function="left_middle_background" state="normal" draw_ops="button_inner_left"/>
+	<button function="left_middle_background" state="prelight" draw_ops="button_inner_left_prelight"/>
+	<button function="left_middle_background" state="pressed" draw_ops="button_inner_left_pressed"/>
+
+	<button function="right_middle_background" state="normal" draw_ops="button_inner_right"/>
+	<button function="right_middle_background" state="prelight" draw_ops="button_inner_right_prelight"/>
+	<button function="right_middle_background" state="pressed" draw_ops="button_inner_right_pressed"/>
+
+	<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_set>
+<frame_style name="utility_unfocused" geometry="small_unfocused">
+	<piece position="entire_background" draw_ops="entire_background_unfocused" />
+	<piece position="titlebar" draw_ops="titlebar_unfocused" />
+	<piece position="title" draw_ops="title_unfocused" />
+	<piece position="overlay" draw_ops="border_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"/>
+	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
+	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
+	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
+	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
+	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
+	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
+	<button function="menu" state="normal" draw_ops="menu_unfocused" />
+	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
+	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
+	<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>
 
-  <!-- window types -->
+<frame_style name="border_focused" geometry="borderless">
+	<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>
+	<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>
 
-  <window type="normal" style_set="normal"/>
-  <window type="dialog" style_set="dialog"/>
-  <window type="modal_dialog" style_set="dialog"/>
-  <window type="menu" style_set="utility"/>
-  <window type="utility" style_set="utility"/>
-  <window type="border" style_set="border"/>
+<frame_style name="border_unfocused" geometry="borderless">
+	<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>
+	<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>
 
-  <!-- menu icons -->
+<!-- placeholder for unimplementated styles-->
+<frame_style name="blank" geometry="normal">
+	<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>
 
-  <menu_icon function="close" state="normal" draw_ops="menu_button_close"/>
-  <menu_icon function="maximize" state="normal" draw_ops="menu_button_maximize"/>
-  <menu_icon function="unmaximize" state="normal" draw_ops="menu_button_maximize"/>
-  <menu_icon function="minimize" state="normal" draw_ops="menu_button_minimize"/>
+<!-- frame style sets -->
+
+<frame_style_set name="normal_style_set">
+	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
+	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
+	<frame focus="yes" state="maximized" style="normal_max_focused"/>
+	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
+	<frame focus="yes" state="shaded" style="blank"/>
+	<frame focus="no" state="shaded" style="blank"/>
+	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
+	<frame focus="no" state="maximized_and_shaded" style="blank"/>
+</frame_style_set>
+
+<frame_style_set name="dialog_style_set">
+	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
+	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
+	<frame focus="yes" state="maximized" style="normal_max_focused"/>
+	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
+	<frame focus="yes" state="shaded" style="blank"/>
+	<frame focus="no" state="shaded" style="blank"/>
+	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
+	<frame focus="no" state="maximized_and_shaded" style="blank"/>
+</frame_style_set>
+
+<frame_style_set name="modal_dialog_style_set">
+	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
+	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
+	<frame focus="yes" state="maximized" style="normal_max_focused"/>
+	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
+	<frame focus="yes" state="shaded" style="blank"/>
+	<frame focus="no" state="shaded" style="blank"/>
+	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
+	<frame focus="no" state="maximized_and_shaded" style="blank"/>
+</frame_style_set>
+
+<frame_style_set name="utility_style_set">
+	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
+	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
+	<frame focus="yes" state="maximized" style="normal_max_focused"/>
+	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
+	<frame focus="yes" state="shaded" style="blank"/>
+	<frame focus="no" state="shaded" style="blank"/>
+	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
+	<frame focus="no" state="maximized_and_shaded" style="blank"/>
+</frame_style_set>
+
+<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="normal_max_focused"/>
+	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
+	<frame focus="yes" state="shaded" style="blank"/>
+	<frame focus="no" state="shaded" style="blank"/>
+	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
+	<frame focus="no" state="maximized_and_shaded" style="blank"/>
+</frame_style_set>
+
+<!-- windows -->
+
+<window type="normal" style_set="normal_style_set"/>
+<window type="dialog" style_set="dialog_style_set"/>
+<window type="modal_dialog" style_set="modal_dialog_style_set"/>
+<window type="menu" style_set="utility_style_set"/>
+<window type="utility" style_set="utility_style_set"/>
+<window type="border" style_set="border_style_set"/>
 
 </metacity_theme>
diff --git a/themes/Adwaita/metacity-1/metacity-theme-3.xml b/themes/Adwaita/metacity-1/metacity-theme-3.xml
index ded4166..ffc2691 100644
--- a/themes/Adwaita/metacity-1/metacity-theme-3.xml
+++ b/themes/Adwaita/metacity-1/metacity-theme-3.xml
@@ -1,1052 +1,1344 @@
 <?xml version="1.0"?>
 <metacity_theme>
-  <info>
-    <name>Adwaita</name>
-    <author>GNOME Art Team &lt;art.gnome.org&gt;</author>
-    <copyright>&#194; Intel, &#194; Red Hat, Lapo Calamandrei</copyright>
-    <date>2010</date>
-    <description>Default GNOME 3 window theme</description>
-  </info>
-	<!-- constants -->
-	<!--
-
-		nomenclature:
-		C* -> color
-		D* -> distances
-
-	-->
-	<constant name="CBorderFocused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
-	<constant name="CBorderUnfocused" value="blend/#000000/gtk:bg[NORMAL]/0.8" />
-	<constant name="CButtonBorder" value="blend/#000000/gtk:bg[NORMAL]/0.8" />
-	<constant name="CButtonHilight" value="blend/#ffffff/gtk:bg[NORMAL]/0.6" />
-	<constant name="CTitlebarUnfocused" value="blend/gtk:bg[NORMAL]/#ffffff/0.7" />
-	<constant name="CTitleFocused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" />
-	<constant name="CTitleFocusedHilight" value="blend/#ffffff/gtk:bg[NORMAL]/0.4" />
-	<constant name="CTitleUnfocused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" />
-	<constant name="CTitleUnfocusedHilight" value="blend/#ffffff/gtk:bg[NORMAL]/0.9" />
-	<constant name="CIconFocused_normal" value="blend/#ffffff/gtk:bg[NORMAL]/0.3" />
-	<constant name="CIconFocused_prelight" value="CIconFocused_normal" />
-	<constant name="CIconFocused_pressed" value="CIconFocused_normal" />
-	<constant name="CIconUnfocused_normal" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.9" />
-	<constant name="CIconUnfocused_prelight" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.85" />
-	<constant name="CIconUnfocused_pressed" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.75" />
-	<constant name="DIconFocused_h" value="0" />
-	<constant name="DIconFocused_v" value="0" />
-	<constant name="DIconUnfocused_h" value="0" />
-	<constant name="DIconUnfocused_v" value="0" />
-
-
-<!-- Frames Geometries -->
-	<frame_geometry name="normal" rounded_top_left="4" rounded_top_right="4" title_scale="medium">
-		<distance name="left_width" value="1"/>
-		<distance name="right_width" value="1"/>
-		<distance name="bottom_height" value="2"/>
-		<distance name="left_titlebar_edge" value="0"/>
-		<distance name="right_titlebar_edge" value="0"/>
-		<distance name="title_vertical_pad" value="10"/>
-		<border name="title_border" left="10" right="10" top="0" bottom="4"/>
-		<border name="button_border" left="0" right="0" top="1" bottom="1"/>
-		<aspect_ratio name="button" value="1"/>
-	</frame_geometry>
-
-	<frame_geometry name="maximized" 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="bottom_height" value="0"/>
-		<distance name="title_vertical_pad" value="10"/>
-		<border name="title_border" left="0" right="0" top="0" bottom="4"/>
-		<border name="button_border" left="0" right="0" top="0" bottom="2"/>
-	</frame_geometry>
-
-  <frame_geometry name="utility" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
-		<border name="title_border" left="10" right="10" top="0" bottom="4"/>
-		<border name="button_border" left="0" right="0" top="1" bottom="0"/>
-  </frame_geometry>
-
-  <frame_geometry name="dialog" title_scale="medium" parent="normal" hide_buttons="true">
-  </frame_geometry>
-
-  <frame_geometry name="border" has_title="false" parent="normal" rounded_top_left="false" rounded_top_right="false">
-  </frame_geometry>
-
-  <frame_geometry name="attached" has_title="false" parent="normal" rounded_top_left="false" rounded_top_right="false">
-  </frame_geometry>
-
-
-
-  <!-- Draw Operations -->
-
-  <!-- Titlebar Background -->
-	<draw_ops name="bg_titlebar_maximized">
-		<gradient type="vertical" x="1" y="1" width="width-2" height="height-1">
-			<color value="blend/gtk:bg[NORMAL]/#ffffff/0.3" />
-			<color value="gtk:bg[NORMAL]"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
-		</gradient>
-	</draw_ops>
-	<draw_ops name="bg_titlebar_unfocused_maximized">
-		<rectangle color="CTitlebarUnfocused" x="1" y="1" width="width-2" height="height-1" filled="true"/>
-	</draw_ops>
-	<draw_ops name="bg_titlebar_unfocused">
-		<include name="bg_titlebar_unfocused_maximized" />
-		<arc x="0" y="0" width="10" height="10" start_angle="0" extent_angle="-90" color="CBorderUnfocused" />
-		<arc x="width-11" y="0" width="10" height="10" start_angle="0" extent_angle="90" color="CBorderUnfocused" />
-	</draw_ops>
-
-	<draw_ops name="bg_titlebar">
-		<include name="bg_titlebar_maximized"/>
-		<arc x="0" y="0" width="10" height="10" start_angle="0" extent_angle="-90" color="CBorderFocused" />
-		<arc x="width-11" y="0" width="10" height="10" start_angle="0" extent_angle="90" color="CBorderFocused" />
-		<line color="CTitleFocusedHilight" x1="5" y1="1" x2="width-5" y2="1" />
-		<arc x="1" y="1" width="8" height="8" start_angle="0" extent_angle="-90" color="CTitleFocusedHilight" />
-		<arc x="width-10" y="1" width="8" height="8" start_angle="0" extent_angle="90" color="CTitleFocusedHilight" />
-		<gradient type="vertical" x="1" y="5" width="1" height="height-5">		
-			<color value="CTitleFocusedHilight"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.06"/>
-		</gradient>
-		<gradient type="vertical" x="width-2" y="5" width="1" height="height-5">		
-			<color value="CTitleFocusedHilight"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.06"/>
-		</gradient>
-	</draw_ops>
-
-	<draw_ops name="bg_titlebar_utility_focused">
-		<include name="bg_titlebar_maximized"/>
-		<line color="CTitleFocusedHilight" x1="1" y1="1" x2="width-2" y2="1" />
-		<gradient type="vertical" x="1" y="1" width="1" height="height-1">		
-			<color value="CTitleFocusedHilight"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.06"/>
-		</gradient>
-		<gradient type="vertical" x="width-2" y="1" width="1" height="height-1">		
-			<color value="CTitleFocusedHilight"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.06"/>
-		</gradient>
-	</draw_ops>
-
-  <!-- Window Borders -->
-
-  <draw_ops name="lines_border_focused">
-	<rectangle color="CBorderFocused" x="0" y="0" width="width-1" height="height-1" filled="false"/>
-  </draw_ops>
-
-  <draw_ops name="lines_border_unfocused">
-    <rectangle color="CBorderUnfocused" x="0" y="0" width="width-1" height="height-1" filled="false"/>
-  </draw_ops>
-
-  <!-- Title -->
-
-	<draw_ops name="title_all">
-		<title version="< 3.1"
-                       x="(0 `max` ((width - title_width) / 2)) + 3"
-                       y="(0 `max` ((height - title_height) / 2)) + 3"
-                       color="CTitleFocusedHilight"/>
-		<title version="< 3.1"
-                       x="(0 `max` ((width - title_width) / 2)) + 2"
-                       y="(0 `max` ((height - title_height) / 2)) + 2"
-                       color="CTitleFocused"/>
-		<title version=">= 3.1"
-                       x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 3"
-                       y="(0 `max` ((height - title_height) / 2)) + 3"
-                       ellipsize_width="width"
-                       color="CTitleFocusedHilight"/>
-		<title version=">= 3.1"
-                       x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
-                       y="(0 `max` ((height - title_height) / 2)) + 2"
-                       ellipsize_width="width"
-                       color="CTitleFocused"/>
-		<tint color="blend/#ffffff/gtk:bg[NORMAL]/0.9" alpha="0.4" x="width" y="0" width="2" height="height-2" />
-	</draw_ops>
-
-	<draw_ops name="title_all_unfocused">
-		<title version="< 3.1"
-                       x="(0 `max` ((width - title_width) / 2)) + 2"
-                       y="(0 `max` ((height - title_height) / 2)) + 2"
-                       color="CTitleUnfocused"/>
-		<title version=">= 3.1"
-                       x="(0 `max` ((frame_x_center - title_width/2) `min` (width - title_width))) + 2"
-                       y="(0 `max` ((height - title_height) / 2)) + 2"
-                       ellipsize_width="width"
-                       color="CTitleUnfocused"/>
-	</draw_ops>
-
-  <!-- Normal, focused window -->
-
-  <draw_ops name="titlebar_normal_focused">
-     <include name="bg_titlebar"/>
-  </draw_ops>
-
-  <draw_ops name="normal_focused">
-     <include name="lines_border_focused"/>
-  </draw_ops>
-
-  <!--Normal unfocused window-->
-
-  <draw_ops name="titlebar_normal_unfocused">
-     <include name="bg_titlebar_unfocused"/>
-  </draw_ops>
-
-  <draw_ops name="normal_unfocused">
-     <include name="lines_border_unfocused"/>
-  </draw_ops>
-
-  <!--maximized focused window-->
-  <draw_ops name="titlebar_maximized_focused">
-     <include name="bg_titlebar_maximized"/>
-  </draw_ops>
-
-  <draw_ops name="maximized_focused">
-  </draw_ops>
-
-  <!--maximized unfocused window-->
-  <draw_ops name="titlebar_maximized_unfocused">
-  </draw_ops>
-
-  <draw_ops name="maximized_unfocused">
-  </draw_ops>
-
-
-  <!--border focused window-->
-  <draw_ops name="border_focused">
-     <include name="lines_border_focused"/>
-  </draw_ops>
-
-
-  <!--border unfocused window-->
-  <draw_ops name="border_unfocused">
-     <include name="lines_border_unfocused"/>
-  </draw_ops>
-
-  <!--utility focused windows-->
-  <draw_ops name="titlebar_utility_focused">
-     <include name="bg_titlebar_utility_focused"/>
-  </draw_ops>
-
-  <!--utility unfocused windows-->
-  <draw_ops name="titlebar_utility_unfocused">
-     <include name="bg_titlebar_unfocused_maximized"/>
-     <include name="lines_border_unfocused"/>
-  </draw_ops>
-
-  <!--attached modal dialog focused window-->
-  <draw_ops name="attached_focused">
-     <rectangle color="blend/gtk:bg[NORMAL]/#ffffff/0.5" x="0" y="0" width="width" height="height" filled="true"/>
-     <gradient type="vertical" x="0" y="0" width="width" height="14">
-	<color value="blend/gtk:bg[NORMAL]/#ffffff/0.8"/>
-	<color value="blend/gtk:bg[NORMAL]/#ffffff/0.5" />
-     </gradient>
-     <rectangle color="CBorderFocused" x="0" y="0" width="width-1" height="height-1" filled="false"/>
-  </draw_ops>
-
-
-  <!--attached modal dialog unfocused window-->
-  <draw_ops name="attached_unfocused">
-    <rectangle color="blend/gtk:bg[NORMAL]/#ffffff/0.5" x="0" y="0" width="width" height="height" filled="true"/>
-    <rectangle color="CBorderUnfocused" x="0" y="0" width="width-1" height="height-1" filled="false"/>
-  </draw_ops>
-
-
-
-  <!-- button backgounds -->
-
-	<draw_ops name="button_bottom_hilight">
-		<!-- horziontal highlight on the bottom -->
-		<tint color="CButtonBorder" x="0" y="height - 4" width="width" height="1" alpha="1"/>
-		<tint color="CButtonHilight" x="0" y="height - 3" width="width" height="1" alpha="1"/>
-	</draw_ops>
-
-	<draw_ops name="button_separator">
-		<!-- vertical separator stripes -->
-		<gradient type="vertical" x="0" y="0" width="1" height="height - 4">
-			<color value="blend/gtk:bg[NORMAL]/#ffffff/0.1"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
-		</gradient>
-		<gradient type="vertical" x="width-1" y="0" width="1" height="height - 4">
-			<color value="CBorderFocused"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
-		</gradient>
-	</draw_ops>
-
-	<draw_ops name="button_separator_pressed">
-		<!-- vertical separator stripes for pressed state -->
-		<tint color="blend/#ffffff/gtk:bg[NORMAL]/0.5" x="0" y="0" width="1" height="height - 4" alpha="0.2"/>
-		<gradient type="vertical" x="0" y="0" width="1" height="height - 4">
-			<color value="CBorderFocused"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
-		</gradient>
-	</draw_ops>
-
-	<draw_ops name="button_bg_focused_max">
-		<gradient type="vertical" x="0" y="0" width="width" height="height - 3">
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.14"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.17"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.06"/>
-		</gradient>
-		<include name="button_separator" />
-		<include name="button_bottom_hilight" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_focused">
-		<include name="button_bg_focused_max" />
-		<line x1="0" y1="0" x2="width-2" y2="0" color="blend/gtk:bg[NORMAL]/#ffffff/0.1"/>
-	</draw_ops>
-
-	<draw_ops name="button_bg_prelight_max">
-		<gradient type="vertical" x="0" y="0" width="width" height="height - 3">
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.05"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.10"/>
-			<color value="blend/gtk:bg[SELECTED]/gtk:bg[NORMAL]/0.65"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.03"/>
-		</gradient>
-		<include name="button_separator" />
-		<include name="button_bottom_hilight" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_prelight">
-		<include name="button_bg_prelight_max" />
-		<line x1="0" y1="0" x2="width-2" y2="0" color="blend/gtk:bg[NORMAL]/#ffffff/0.2"/>
-	</draw_ops>
-
-	<draw_ops name="button_bg_pressed">
-		<gradient type="vertical" x="0" y="0" width="width" height="height - 3">
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.4"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.05"/>
-		</gradient>
-		<include name="button_separator_pressed" />
-		<include name="button_bottom_hilight" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_pressed_max">
-		<include name="button_bg_pressed" />
-	</draw_ops>
-
-	<draw_ops name="rounded_outer_border_right">
-		<line color="CBorderFocused" x1="width-4" y1="0" x2="width-3" y2="0"/>
-		<line color="CBorderFocused" x1="width-2" y1="1" x2="width-2" y2="2"/>
-		<line color="CBorderFocused" x1="width-1" y1="3" x2="width-1" y2="height"/>
-	</draw_ops>
-
-	<draw_ops name="button_bg_focused_outer_right">
-		<include name="button_bg_focused" />
-		<include name="rounded_outer_border_right" />
-		<arc x="width-10" y="0" width="8" height="8" start_angle="0" extent_angle="90" color="blend/gtk:bg[NORMAL]/#ffffff/0.1" />
-		<gradient type="vertical" x="width-2" y="4" width="1" height="height-9">		
-			<color value="blend/gtk:bg[NORMAL]/#ffffff/0.1"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.15"/>
-		</gradient>
-		<gradient type="horizontal" x="0" y="height-3" width="width-1" height="1">		
-			<color value="CButtonHilight" />
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.03"/>
-		</gradient>
-	</draw_ops>
-
-	<draw_ops name="button_bg_prelight_outer_right">
-		<include name="button_bg_prelight" />
-		<include name="rounded_outer_border_right" />
-		<arc x="width-10" y="0" width="8" height="8" start_angle="0" extent_angle="90" color="blend/gtk:bg[NORMAL]/#ffffff/0.2" />
-		<gradient type="vertical" x="width-2" y="4" width="1" height="height-9">		
-			<color value="blend/gtk:bg[NORMAL]/#ffffff/0.2"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.15"/>
-		</gradient>
-	</draw_ops>
-
-	<draw_ops name="button_bg_pressed_outer_right">
-		<include name="button_bg_pressed" />
-		<include name="rounded_outer_border_right" />
-	</draw_ops>
-
-
-	<draw_ops name="button_bg_focused_clipped1">
-		<clip x="4" y="height-6" width="width-4" height="6" />
-		<include name="button_bg_focused_max" />	
-	</draw_ops>
-	<draw_ops name="button_bg_focused_clipped2">
-		<clip x="1" y="0" width="width-1" height="height-6" />
-		<include name="button_bg_focused_max" />
-	</draw_ops>
-	<draw_ops name="button_bg_focused_clipped">
-		<include name="button_bg_focused_clipped1" />
-		<include name="button_bg_focused_clipped2" />
-		<clip x="2" y="height-6" width="2" height="2" />
-		<include name="button_bg_focused_max" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_prelight_clipped1">
-		<clip x="4" y="height-6" width="width-4" height="6" />
-		<include name="button_bg_prelight_max" />	
-	</draw_ops>
-	<draw_ops name="button_bg_prelight_clipped2">
-		<clip x="1" y="0" width="width-1" height="height-6" />
-		<include name="button_bg_prelight_max" />
-	</draw_ops>
-	<draw_ops name="button_bg_prelight_clipped">
-		<include name="button_bg_prelight_clipped1" />
-		<include name="button_bg_prelight_clipped2" />
-		<clip x="2" y="height-6" width="2" height="2" />
-		<include name="button_bg_prelight_max" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_pressed_clipped1">
-		<clip x="4" y="height-6" width="width-4" height="6" />
-		<include name="button_bg_pressed" />	
-	</draw_ops>
-	<draw_ops name="button_bg_pressed_clipped2">
-		<clip x="1" y="0" width="width-1" height="height-6" />
-		<include name="button_bg_pressed" />
-	</draw_ops>
-	<draw_ops name="button_bg_pressed_clipped">
-		<include name="button_bg_pressed_clipped1" />
-		<include name="button_bg_pressed_clipped2" />
-		<clip x="2" y="height-6" width="2" height="2" />
-		<include name="button_bg_pressed" />
-	</draw_ops>
-
-	<draw_ops name="right_left_button_rounded_corner">
-		<line x1="0" y1="0" x2="0" y2="height-7" color="CButtonHilight" />
-		<arc x="0" y="height-13" width="10" height="10" start_angle="180" extent_angle="90" color="CButtonHilight"/>
-		<gradient type="vertical" x="1" y="0" width="1" height="height-7">
-			<color value="CBorderFocused"/>
-			<color value="CButtonBorder"/>
-		</gradient>
-		<arc x="1" y="height-12" width="8" height="8" start_angle="180" extent_angle="90" color="CButtonBorder"/>
-	</draw_ops>
-
-	<draw_ops name="button_bg_focused_inner_right_max">
-		<include name="button_bg_focused_clipped" />
-		<include name="right_left_button_rounded_corner" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_focused_inner_right">
-		<include name="button_bg_focused_inner_right_max" />
-		<line x1="2" y1="0" x2="width-3" y2="0" color="blend/gtk:bg[NORMAL]/#ffffff/0.1"/>
-	</draw_ops>
-
-	<draw_ops name="button_bg_prelight_inner_right_max">
-		<include name="button_bg_prelight_clipped" />
-		<include name="right_left_button_rounded_corner" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_prelight_inner_right">
-		<include name="button_bg_prelight_inner_right_max" />
-		<line x1="2" y1="0" x2="width-3" y2="0" color="blend/gtk:bg[NORMAL]/#ffffff/0.2"/>
-	</draw_ops>
-
-
-	<draw_ops name="button_bg_pressed_inner_right_max">
-		<include name="button_bg_pressed_clipped" />
-		<include name="right_left_button_rounded_corner" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_pressed_inner_right">
-		<include name="button_bg_pressed_inner_right_max" />
-	</draw_ops>
-
-
-	<draw_ops name="button_bg_focused_single_right">
-		<include name="button_bg_focused_clipped" />
-		<include name="right_left_button_rounded_corner" />
-		<include name="rounded_outer_border_right" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_prelight_single_right">
-		<include name="button_bg_prelight_clipped" />
-		<include name="right_left_button_rounded_corner" />
-		<include name="rounded_outer_border_right" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_pressed_single_right">
-		<include name="button_bg_pressed_clipped" />
-		<include name="right_left_button_rounded_corner" />
-		<include name="rounded_outer_border_right" />
-	</draw_ops>
-
-	<draw_ops name="button_bg_focused_single_right_utility">
-		<include name="button_bg_focused_clipped" />
-		<include name="right_left_button_rounded_corner" />
-		<line x1="width-1" y1="0" x2="width-1" y2="height" color="CBorderFocused" />
-		<line x1="2" y1="0" x2="width-3" y2="0" color="blend/gtk:bg[NORMAL]/#ffffff/0.1"/>
-		<gradient type="vertical" x="width-2" y="1" width="1" height="height-6">		
-			<color value="blend/gtk:bg[NORMAL]/#ffffff/0.1"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.15"/>
-		</gradient>
-		<gradient type="horizontal" x="4" y="height-3" width="width-5" height="1">		
-			<color value="CButtonHilight" />
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.03"/>
-		</gradient>
-	</draw_ops>
-
-	<draw_ops name="button_bg_prelight_single_right_utility">
-		<include name="button_bg_prelight_clipped" />
-		<include name="right_left_button_rounded_corner" />
-		<line x1="width-1" y1="0" x2="width-1" y2="height" color="CBorderFocused" />
-		<line x1="2" y1="0" x2="width-3" y2="0" color="blend/gtk:bg[NORMAL]/#ffffff/0.2"/>
-		<gradient type="vertical" x="width-2" y="1" width="1" height="height-6">		
-			<color value="blend/gtk:bg[NORMAL]/#ffffff/0.2"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.15"/>
-		</gradient>
-		<gradient type="horizontal" x="4" y="height-3" width="width-5" height="1">		
-			<color value="CButtonHilight" />
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.03"/>
-		</gradient>
-	</draw_ops>
-
-	<draw_ops name="button_bg_pressed_single_right_utility">
-		<include name="button_bg_pressed_clipped" />
-		<include name="right_left_button_rounded_corner" />
-		<line x1="width-1" y1="0" x2="width-1" y2="height" color="CBorderFocused" />
-		<gradient type="horizontal" x="4" y="height-3" width="width-5" height="1">		
-			<color value="CButtonHilight" />
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.03"/>
-		</gradient>
-	</draw_ops>
-
-  <!-- on unfocused window -->
-
-  <!-- Close Buttons -->
-
-	<draw_ops name="icon_close_glyph">
-		<line color="CIconFocused_normal" x1="(width-(width)%3)/3" y1="(height-height%3)/3" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconFocused_normal" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-3" />
-		<line color="CIconFocused_normal" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconFocused_normal" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconFocused_normal" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-3" />
-		<line color="CIconFocused_normal" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-2" />
-	</draw_ops>
-
-	<draw_ops name="icon_close_shadow">
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
-
-	</draw_ops>
-
-
-	<draw_ops name="icon_close">
-		<include name="icon_close_shadow" />
-		<include name="icon_close_glyph" />
-	</draw_ops>
-
-	<draw_ops name="icon_close_prelight">
-		<!-- shadow -->
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
-		<line color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
-		<include name="icon_close_glyph" />
-	</draw_ops>
-
-
-	<draw_ops name="icon_close_single">
-		<!-- shadow -->
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-1" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3+2" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-1" y2="height-((height-height%3)/3)-2" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-1" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-2" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-(width)%3)/3)-1" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+2" y2="height-((height-height%3)/3)-1" />
-
-		<!-- glyph -->
-		<line color="CIconFocused_normal" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3" x2="width-((width-(width)%3)/3)-1" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconFocused_normal" x1="(width-(width)%3)/3+2" y1="(height-height%3)/3" x2="width-((width-(width)%3)/3)-1" y2="height-((height-height%3)/3)-3" />
-		<line color="CIconFocused_normal" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconFocused_normal" x1="width-((width-(width)%3)/3)-1" y1="(height-height%3)/3" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconFocused_normal" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-3" />
-		<line color="CIconFocused_normal" x1="width-((width-(width)%3)/3)-1" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3+2" y2="height-((height-height%3)/3)-2" />
-	</draw_ops>
-
-
-
-  <draw_ops name="button_close_unfocused">
-		<!-- glyph -->
-		<line color="CIconUnfocused_normal" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_normal" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconUnfocused_normal" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_normal" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_normal" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconUnfocused_normal" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
-  </draw_ops>
-
-  <draw_ops name="button_close_unfocused_prelight">
-		<!-- glyph -->
-		<line color="CIconUnfocused_prelight" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_prelight" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconUnfocused_prelight" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_prelight" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_prelight" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconUnfocused_prelight" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
-  </draw_ops>
-
-  <draw_ops name="button_close_unfocused_pressed">
-		<!-- glyph -->
-		<line color="CIconUnfocused_pressed" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_pressed" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconUnfocused_pressed" x1="(width-(width)%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_pressed" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
-		<line color="CIconUnfocused_pressed" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+1" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-2" />
-		<line color="CIconUnfocused_pressed" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)-1" />
-  </draw_ops>
-
-
-  <!-- Maximize Buttons -->
-	<!-- !!!metacity actually draws rectagles 1px bigger then what is set!!! (that's the cause of the "-1"s in dimensions) -->
-	<draw_ops name="icon_maximize_shadow">
-		<!--
-			I want my rectangle nicelly centered so I won't let metacity do the roundings
-			hence why I use (width-width%3)/3, it's like doing an integer division.
-		-->
-		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
-		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
-	</draw_ops>
-	
-	<draw_ops name="icon_maximize_glyph">
-		<rectangle color="CIconFocused_normal" x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
-		<rectangle color="CIconFocused_normal" x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
-	</draw_ops>
-
-	<draw_ops name="icon_maximize">
-		<include name="icon_maximize_shadow" />
-		<include name="icon_maximize_glyph" />
-	</draw_ops>
-
-	<draw_ops name="icon_maximize_prelight">
-		<rectangle color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
-		<rectangle color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
-		<include name="icon_maximize_glyph" />
-	</draw_ops>
-
-
-  <draw_ops name="button_maximize_unfocused">
-		<!-- glyph -->
-		<rectangle color="CIconUnfocused_normal" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
-		<rectangle color="CIconUnfocused_normal" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
-  </draw_ops>
-
-  <draw_ops name="button_maximize_unfocused_prelight">
-		<!-- glyph -->
-	<rectangle color="CIconUnfocused_prelight" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
-	<rectangle color="CIconUnfocused_prelight" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
-  </draw_ops>
-
-  <draw_ops name="button_maximize_unfocused_pressed">
-		<!-- glyph -->
-	<rectangle color="CIconUnfocused_pressed" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
-	<rectangle color="CIconUnfocused_pressed" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
-  </draw_ops>
-
-
-  <!-- Minimize Buttons -->
-
-  <draw_ops name="icon_minimize_glyph">
-	<rectangle color="CIconFocused_normal" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)-1" width="width-2*((width-width%3)/3)-5" height="1"/>
-  </draw_ops>
-
-  <draw_ops name="icon_minimize_shadow">
-	<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
-  </draw_ops>
-
-  <draw_ops name="icon_minimize">
-	<include name="icon_minimize_shadow" />
-	<include name="icon_minimize_glyph" />	
-  </draw_ops>
-
-  <draw_ops name="icon_minimize_prelight">
-	<rectangle color="blend/gtk:bg[SELECTED]/gtk:fg[SELECTED]/0.2" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
-	<include name="icon_minimize_glyph" />	
-  </draw_ops>
-
-
-  <draw_ops name="button_minimize_unfocused">
-		<!-- glyph -->
-		<rectangle color="CIconUnfocused_normal" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
-  </draw_ops>
-
-  <draw_ops name="button_minimize_unfocused_prelight">
-		<!-- glyph -->
-		<rectangle color="CIconUnfocused_prelight" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
-  </draw_ops>
-
-  <draw_ops name="button_minimize_unfocused_pressed">
-		<!-- glyph -->
-		<rectangle color="CIconUnfocused_pressed" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)" width="width-2*((width-width%3)/3)-5" height="1"/>
-  </draw_ops>
-
-  <!-- Frame Styles -->
-
-  <frame_style name="normal_focused" geometry="normal">
-     <piece position="entire_background" draw_ops="normal_focused"/>
-     <piece position="titlebar" draw_ops="titlebar_normal_focused"/>
-     <piece position="title" draw_ops="title_all"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button_bg_focused"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_bg_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_bg_pressed"/>
-
-	<button function="right_right_background" state="normal" draw_ops="button_bg_focused_outer_right"/>
-	<button function="right_right_background" state="prelight" draw_ops="button_bg_prelight_outer_right"/>
-	<button function="right_right_background" state="pressed" draw_ops="button_bg_pressed_outer_right"/>
-
-	<button function="right_left_background" state="normal" draw_ops="button_bg_focused_inner_right"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_bg_prelight_inner_right"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_bg_pressed_inner_right"/>
-
-     <button function="close" state="normal" draw_ops="icon_close"/>
-     <button function="close" state="prelight" draw_ops="icon_close_prelight"/>
-     <button function="close" state="pressed" draw_ops="icon_close"/>
-     <button function="maximize" state="normal" draw_ops="icon_maximize"/>
-     <button function="maximize" state="prelight" draw_ops="icon_maximize_prelight"/>
-     <button function="maximize" state="pressed" draw_ops="icon_maximize"/>
-     <button function="minimize" state="normal" draw_ops="icon_minimize"/>
-     <button function="minimize" state="prelight" draw_ops="icon_minimize_prelight"/>
-     <button function="minimize" state="pressed" draw_ops="icon_minimize"/>
-     <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
-     <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
-     <button function="unshade" state="normal"><draw_ops /></button><button function="unshade" state="pressed"><draw_ops /></button>
-     <button function="above" state="normal"><draw_ops /></button><button function="above" state="pressed"><draw_ops /></button>
-     <button function="unabove" state="normal"><draw_ops /></button><button function="unabove" state="pressed"><draw_ops /></button>
-     <button function="stick" state="normal"><draw_ops /></button><button function="stick" state="pressed"><draw_ops /></button>
-     <button function="unstick" state="normal"><draw_ops /></button><button function="unstick" state="pressed"><draw_ops /></button>
-  </frame_style>
-
-  <frame_style name="normal_unfocused" geometry="normal">
-     <piece position="entire_background" draw_ops="normal_unfocused"/>
-     <piece position="titlebar" draw_ops="titlebar_normal_unfocused"/>
-     <piece position="title" draw_ops="title_all_unfocused"/>
-
-     <button function="close" state="normal" draw_ops="button_close_unfocused"/>
-     <button function="close" state="prelight" draw_ops="button_close_unfocused_prelight"/>
-     <button function="close" state="pressed" draw_ops="button_close_unfocused_pressed"/>
-     <button function="maximize" state="normal" draw_ops="button_maximize_unfocused"/>
-     <button function="maximize" state="prelight" draw_ops="button_maximize_unfocused_prelight"/>
-     <button function="maximize" state="pressed" draw_ops="button_maximize_unfocused_pressed"/>
-     <button function="minimize" state="normal" draw_ops="button_minimize_unfocused"/>
-     <button function="minimize" state="prelight" draw_ops="button_minimize_unfocused_prelight"/>
-     <button function="minimize" state="pressed" draw_ops="button_minimize_unfocused_pressed"/>
-     <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
-     <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
-     <button function="unshade" state="normal"><draw_ops /></button><button function="unshade" state="pressed"><draw_ops /></button>
-     <button function="above" state="normal"><draw_ops /></button><button function="above" state="pressed"><draw_ops /></button>
-     <button function="unabove" state="normal"><draw_ops /></button><button function="unabove" state="pressed"><draw_ops /></button>
-     <button function="stick" state="normal"><draw_ops /></button><button function="stick" state="pressed"><draw_ops /></button>
-     <button function="unstick" state="normal"><draw_ops /></button><button function="unstick" state="pressed"><draw_ops /></button>
-  </frame_style>
-
-  <frame_style name="maximized_focused" geometry="maximized">
-     <piece position="entire_background" draw_ops="maximized_focused"/>
-     <piece position="titlebar" draw_ops="titlebar_maximized_focused"/>
-     <piece position="title" draw_ops="title_all"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button_bg_focused_max"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_bg_prelight_max"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_bg_pressed_max"/>
-
-	<button function="right_left_background" state="normal" draw_ops="button_bg_focused_inner_right_max"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_bg_prelight_inner_right_max"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_bg_pressed_inner_right_max"/>
-
-     <button function="close" state="normal" draw_ops="icon_close"/>
-     <button function="close" state="prelight" draw_ops="icon_close_prelight"/>
-     <button function="close" state="pressed" draw_ops="icon_close"/>
-     <button function="maximize" state="normal" draw_ops="icon_maximize"/>
-     <button function="maximize" state="prelight" draw_ops="icon_maximize_prelight"/>
-     <button function="maximize" state="pressed" draw_ops="icon_maximize"/>
-																																																																																																																																																			     <button function="minimize" state="normal" draw_ops="icon_minimize"/>
-     <button function="minimize" state="prelight" draw_ops="icon_minimize_prelight"/>
-     <button function="minimize" state="pressed" draw_ops="icon_minimize"/>
-     <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
-     <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
-     <button function="unshade" state="normal"><draw_ops /></button><button function="unshade" state="pressed"><draw_ops /></button>
-     <button function="above" state="normal"><draw_ops /></button><button function="above" state="pressed"><draw_ops /></button>
-     <button function="unabove" state="normal"><draw_ops /></button><button function="unabove" state="pressed"><draw_ops /></button>
-     <button function="stick" state="normal"><draw_ops /></button><button function="stick" state="pressed"><draw_ops /></button>
-     <button function="unstick" state="normal"><draw_ops /></button><button function="unstick" state="pressed"><draw_ops /></button>
-  </frame_style>
-
-  <frame_style name="maximized_unfocused" geometry="maximized">
-     <piece position="entire_background" draw_ops="maximized_unfocused"/>
-     <piece position="titlebar" draw_ops="titlebar_maximized_unfocused"/>
-     <piece position="title" draw_ops="title_all_unfocused"/>
-
-     <button function="close" state="normal" draw_ops="button_close_unfocused"/>
-     <button function="close" state="prelight" draw_ops="button_close_unfocused_prelight"/>
-     <button function="close" state="pressed" draw_ops="button_close_unfocused_pressed"/>
-     <button function="maximize" state="normal" draw_ops="button_maximize_unfocused"/>
-     <button function="maximize" state="prelight" draw_ops="button_maximize_unfocused_prelight"/>
-     <button function="maximize" state="pressed" draw_ops="button_maximize_unfocused_pressed"/>
-     <button function="minimize" state="normal" draw_ops="button_minimize_unfocused"/>
-     <button function="minimize" state="prelight" draw_ops="button_minimize_unfocused_prelight"/>
-     <button function="minimize" state="pressed" draw_ops="button_minimize_unfocused_pressed"/>
-     <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
-     <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
-     <button function="unshade" state="normal"><draw_ops /></button><button function="unshade" state="pressed"><draw_ops /></button>
-     <button function="above" state="normal"><draw_ops /></button><button function="above" state="pressed"><draw_ops /></button>
-     <button function="unabove" state="normal"><draw_ops /></button><button function="unabove" state="pressed"><draw_ops /></button>
-     <button function="stick" state="normal"><draw_ops /></button><button function="stick" state="pressed"><draw_ops /></button>
-     <button function="unstick" state="normal"><draw_ops /></button><button function="unstick" state="pressed"><draw_ops /></button>
-  </frame_style>
-
-  <frame_style name="border_focused" geometry="border">
-     <piece position="entire_background" draw_ops="border_focused"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button_bg_focused"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_bg_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_bg_pressed"/>
-	<button function="right_right_background" state="normal" draw_ops="button_bg_focused_outer_right"/>
-	<button function="right_right_background" state="prelight" draw_ops="button_bg_prelight_outer_right"/>
-	<button function="right_right_background" state="pressed" draw_ops="button_bg_pressed_outer_right"/>
-	<button function="right_left_background" state="normal" draw_ops="button_bg_focused_inner_right"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_bg_prelight_inner_right"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_bg_pressed_inner_right"/>
-
-
-     <button function="close" state="normal" draw_ops="icon_close"/>
-     <button function="close" state="prelight" draw_ops="icon_close"/>
-     <button function="close" state="pressed" draw_ops="icon_close"/>
-     <button function="maximize" state="normal" draw_ops="icon_maximize"/>
-     <button function="maximize" state="prelight" draw_ops="icon_maximize"/>
-     <button function="maximize" state="pressed" draw_ops="icon_maximize"/>
-     <button function="minimize" state="normal" draw_ops="icon_minimize"/>
-     <button function="minimize" state="prelight" draw_ops="icon_minimize"/>
-     <button function="minimize" state="pressed" draw_ops="icon_minimize"/>
-     <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
-     <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
-     <button function="unshade" state="normal"><draw_ops /></button><button function="unshade" state="pressed"><draw_ops /></button>
-     <button function="above" state="normal"><draw_ops /></button><button function="above" state="pressed"><draw_ops /></button>
-     <button function="unabove" state="normal"><draw_ops /></button><button function="unabove" state="pressed"><draw_ops /></button>
-     <button function="stick" state="normal"><draw_ops /></button><button function="stick" state="pressed"><draw_ops /></button>
-     <button function="unstick" state="normal"><draw_ops /></button><button function="unstick" state="pressed"><draw_ops /></button>
-
-  </frame_style>
-
-  <frame_style name="border_unfocused" geometry="border">
-     <piece position="entire_background" draw_ops="border_unfocused"/>
-
-     <button function="close" state="normal" draw_ops="button_close_unfocused"/>
-     <button function="close" state="prelight" draw_ops="button_close_unfocused_prelight"/>
-     <button function="close" state="pressed" draw_ops="button_close_unfocused_pressed"/>
-     <button function="maximize" state="normal" draw_ops="button_maximize_unfocused"/>
-     <button function="maximize" state="prelight" draw_ops="button_maximize_unfocused_prelight"/>
-     <button function="maximize" state="pressed" draw_ops="button_maximize_unfocused_pressed"/>
-     <button function="minimize" state="normal" draw_ops="button_minimize_unfocused"/>
-     <button function="minimize" state="prelight" draw_ops="button_minimize_unfocused_prelight"/>
-     <button function="minimize" state="pressed" draw_ops="button_minimize_unfocused_pressed"/>
-     <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
-     <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
-     <button function="unshade" state="normal"><draw_ops /></button><button function="unshade" state="pressed"><draw_ops /></button>
-     <button function="above" state="normal"><draw_ops /></button><button function="above" state="pressed"><draw_ops /></button>
-     <button function="unabove" state="normal"><draw_ops /></button><button function="unabove" state="pressed"><draw_ops /></button>
-     <button function="stick" state="normal"><draw_ops /></button><button function="stick" state="pressed"><draw_ops /></button>
-     <button function="unstick" state="normal"><draw_ops /></button><button function="unstick" state="pressed"><draw_ops /></button>
+<info>
+	<name>Adwaita</name>
+	<author>GNOME Art Team &lt;art.gnome.org&gt;</author>
+	<copyright>&#194; Intel, &#194; Red Hat, Lapo Calamandrei</copyright>
+	<date>2010</date>
+	<description>Default GNOME 3 window theme</description>
+</info>
+
+<!-- meaningfull constants -->
+
+<constant name="C_border_focused" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
+<constant name="C_border_unfocused" value="blend/#000000/gtk:bg[NORMAL]/0.8" />
+<constant name="C_titlebar_focused_hilight" value="gtk:text[SELECTED]" />
+<constant name="C_titlebar_unfocused" value="blend/#ffffff/gtk:bg[NORMAL]/0.4" />
+<constant name="C_title_focused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" />
+<constant name="C_title_focused_hilight" value="gtk:text[SELECTED]" />
+<constant name="C_title_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
+<!-- color of the button icons -->
+<constant name="C_icons_focused" value="gtk:text[SELECTED]" />
+<constant name="C_icons_focused_pressed" value="gtk:text[SELECTED]" />
+<constant name="C_icons_unfocused" value="blend/gtk:text[NORMAL]/gtk:bg[NORMAL]/0.9" />
+<constant name="C_icons_unfocused_prelight" value="gtk:bg[NORMAL]" />
+<constant name="C_icons_unfocused_pressed" value="blend/#000000/gtk:bg[NORMAL]/0.7" />
+<constant name="D_icons_unfocused_offset" value="2" />
+
+<!-- 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="2" />
+	<distance name="left_titlebar_edge" value="0"/>
+	<distance name="right_titlebar_edge" value="0"/>
+	<distance name="title_vertical_pad" value="15"/>
+	<border name="title_border" left="10" right="10" top="1" bottom="1"/>
+	<border name="button_border" left="0" right="0" top="1" bottom="3"/>
+	<aspect_ratio name="button" value="1"/>
+</frame_geometry>
+
+<frame_geometry name="normal_unfocused" title_scale="medium" parent="normal">
+	<distance name="left_titlebar_edge" value="1"/>
+	<distance name="right_titlebar_edge" value="1"/>
+</frame_geometry>
+
+<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="0"/>
+	<distance name="right_titlebar_edge" value="0"/>
+	<distance name="title_vertical_pad" value="14"/>
+	<border name="title_border" left="10" right="10" top="1" bottom="1"/>
+	<border name="button_border" left="0" right="0" top="0" bottom="3"/>
+	<distance name="bottom_height" value="0" />
+</frame_geometry>
+
+<frame_geometry name="small" title_scale="small" parent="normal" rounded_top_left="false" rounded_top_right="false">
+	<distance name="title_vertical_pad" value="10"/>
+	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
+	<border name="button_border" left="0" right="0" top="0" bottom="2"/>
+</frame_geometry>
+
+<frame_geometry name="small_unfocused" parent="small">
+	<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" parent="normal" rounded_top_left="false" rounded_top_right="false">
+	<distance name="left_width" value="1" />
+	<distance name="right_width" value="1" />
+	<distance name="bottom_height" value="1" />
+	<border name="title_border" left="10" right="10" top="0" bottom="0" />
+	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
+	<distance name="title_vertical_pad" value="1" />
+</frame_geometry>
+
+<frame_geometry name="attached" has_title="false" parent="borderless">
+	<distance name="title_vertical_pad" value="10" />
+</frame_geometry>
+
+<!-- drawing operations -->
+
+	<!-- title -->
+
+<draw_ops name="title_focused">
+	<title version="< 3.1"
+               x="(0 `max` ((width - title_width) / 2)) + 3"
+               y="(0 `max` ((height - title_height) / 2)) + 2"
+               color="C_title_focused_hilight" />
+	<title version="< 3.1"
+               x="(0 `max` ((width - title_width) / 2)) + 2"
+               y="(0 `max` ((height - title_height) / 2)) + 1"
+               color="C_title_focused" />
+	<title version=">= 3.1"
+               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 3"
+               y="(0 `max` ((height - title_height) / 2)) + 2"
+               ellipsize_width="width"
+               color="C_title_focused_hilight" />
+	<title version=">= 3.1"
+               x="(0 `max` ((frame_x_center - title_width / 2) `min` (width - title_width))) + 2"
+               y="(0 `max` ((height - title_height) / 2)) + 1"
+               ellipsize_width="width"
+               color="C_title_focused" />
+</draw_ops>
+
+<draw_ops name="title_unfocused">
+	<title version="< 3.1"
+               x="(0 `max` ((width - title_width) / 2)) + 2"
+               y="(0 `max` ((height - title_height) / 2)) + 1"
+               color="C_title_unfocused"/>
+	<title version=">= 3.1"
+               x="(0 `max` ((frame_x_center - title_width/2) `min` (width - title_width))) + 2"
+               y="(0 `max` ((height - title_height) / 2)) + 1"
+               ellipsize_width="width"
+               color="C_title_unfocused"/>
+</draw_ops>
+
+<!--
+<draw_ops name="title_focused">
+	<title color="C_title_focused" x="0" y="(((height - title_height) / 2) `max` 0) +1" />
+</draw_ops>
+
+<draw_ops name="title_unfocused">
+	<title color="C_title_unfocused" x="0" y="(((height - title_height) / 2) `max` 0)" />
+</draw_ops>
+-->
+
+	<!-- window decorations -->
+
+<draw_ops name="entire_background_focused">
+	<rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true" />
+</draw_ops>
+
+<draw_ops name="entire_background_unfocused">
+	<include name="entire_background_focused" />
+</draw_ops>
+
+<draw_ops name="titlebar_fill_focused">
+	<gradient type="vertical" x="0" y="0" width="width" height="height">
+		<color value="blend/gtk:bg[NORMAL]/#ffffff/0.4" />
+		<color value="gtk:bg[NORMAL]"/>
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
+	</gradient>
+</draw_ops>
+
+<draw_ops name="titlebar_fill_focused_alt">
+	<gradient type="vertical" x="0" y="0" width="width" height="height">
+		<color value="blend/gtk:bg[NORMAL]/#ffffff/0.4" />
+		<color value="gtk:bg[NORMAL]"/>
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
+		<color value="gtk:bg[NORMAL]" />
+	</gradient>
+</draw_ops>
+
+<draw_ops name="titlebar_fill_focused_alt2"> <!-- gradient for attached modal dialogs titlebar-->
+	<gradient type="vertical" x="0" y="0" width="width" height="height">
+		<color value="blend/gtk:bg[NORMAL]/#ffffff/0.4" />
+		<color value="gtk:bg[NORMAL]"/>
+	</gradient>
+</draw_ops>
+
+<draw_ops name="titlebar_fill_unfocused">
+	<rectangle color="C_titlebar_unfocused" x="0" y="0" width="width" height="height" filled="true" />
+</draw_ops>
+
+<draw_ops name="titlebar_unfocused">
+	<include name="titlebar_fill_unfocused" />
+	<line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_icons_unfocused" />
+</draw_ops>
+
+<draw_ops name="hilight">
+	<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="blend/gtk:bg[NORMAL]/#000000/0.03" />
+	</gradient>
+</draw_ops>
+
+<draw_ops name="rounded_hilight">
+	<line x1="5" y1="1" x2="width-6" y2="1" color="C_titlebar_focused_hilight" />
+	<arc color="C_titlebar_focused_hilight" x="1" y="1" width="7" height="7"  start_angle="270" extent_angle="90" />
+	<arc color="C_titlebar_focused_hilight" x="width-10" y="1" width="9" height="7"  start_angle="0" extent_angle="90" />
+	<gradient type="vertical" x="1" y="5" width="1" height="height-9">
+		<color value="C_titlebar_focused_hilight" />
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
+	</gradient>
+</draw_ops>
+
+<draw_ops name="titlebar_focused">
+	<include name="titlebar_fill_focused_alt" />
+	<include name="hilight" />
+</draw_ops>
+
+<draw_ops name="titlebar_focused_alt"> <!-- titlebar for attached modal dialogs -->
+	<include name="titlebar_fill_focused_alt2" />
+	<include name="hilight" />
+</draw_ops>
+
+<draw_ops name="rounded_titlebar_focused">
+	<include name="titlebar_fill_focused" />
+	<include name="rounded_hilight" />
+</draw_ops>
+
+<draw_ops name="rounded_titlebar_focused_alt">
+	<include name="titlebar_fill_focused_alt" />
+	<include name="rounded_hilight" />
+</draw_ops>
+
+<draw_ops name="border_focused">
+	<rectangle color="C_border_focused" x="0" y="0" width="width-1" height="height-1" filled="false" />
+</draw_ops>
+
+<draw_ops name="border_unfocused">
+	<rectangle color="C_border_unfocused" x="0" y="0" width="width-1" height="height-1" filled="false" />
+</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" />
+	<line color="C_border_focused" x1="0" y1="4" x2="0" y2="height-2" />
+	<line color="C_border_focused" x1="width-1" y1="4" x2="width-1" y2="height-2" />
+	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
+	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
+	<!-- double arcs for darker borders -->
+	<arc color="C_border_focused" x="0" y="0" width="9" height="9"  start_angle="270" extent_angle="90" />
+	<arc color="C_border_focused" x="width-10" y="0" width="9" height="9"  start_angle="0" extent_angle="90" />
+</draw_ops>
+
+<draw_ops name="rounded_border_unfocused">
+	<line color="C_border_unfocused" x1="4" y1="0" x2="width-5" y2="0" />
+	<line color="C_border_unfocused" x1="0" y1="height-1" x2="width-1" y2="height-1" />
+	<line color="C_border_unfocused" x1="0" y1="4" x2="0" y2="height-2" />
+	<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>
+
+	<!-- button icons-->
+
+<constant name="C_icons_shadow" value="blend/#000000/gtk:bg[NORMAL]/0.6" />
+
+<draw_ops name="close_glyph_focused">
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-1" 
+		color="C_icons_focused" />
+	<line x1="(width-width%3)/3+1" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3+1" x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-1"
+		color="C_icons_focused" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-1"
+		color="C_icons_focused" />
+	<line x1="width-(width-width%3)/3-2" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-2"
+		color="C_icons_focused" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3+1" x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-1"
+		color="C_icons_focused" />
+</draw_ops>
+
+<draw_ops name="close_shadow_focused">
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-1" 
+		color="C_icons_shadow" />
+	<line x1="(width-width%3)/3+1" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-2"
+		color="C_icons_shadow" />
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3+1" x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-1"
+		color="C_icons_shadow" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-1"
+		color="C_icons_shadow" />
+	<line x1="width-(width-width%3)/3-2" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-2"
+		color="C_icons_shadow" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3+1" x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-1"
+		color="C_icons_shadow" />
+</draw_ops>
+
+<draw_ops name="close_focused">
+	<include name="close_shadow_focused" y="1" />
+	<include name="close_glyph_focused" />
+</draw_ops>
+
+<draw_ops name="close_focused_pressed">
+	<include name="close_glyph_focused" y="1" />
+</draw_ops>
+
+<draw_ops name="close_glyph_unfocused">
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-1" 
+		color="C_icons_unfocused" />
+	<line x1="(width-width%3)/3+1" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3+1" x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused" />
+	<line x1="width-(width-width%3)/3-2" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3+1" x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused" />
+</draw_ops>
+
+<draw_ops name="close_unfocused">
+	<include name="close_glyph_unfocused" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="close_glyph_unfocused_prelight">
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-1" 
+		color="C_icons_unfocused_prelight" />
+	<line x1="(width-width%3)/3+1" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused_prelight" />
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3+1" x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused_prelight" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused_prelight" />
+	<line x1="width-(width-width%3)/3-2" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused_prelight" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3+1" x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused_prelight" />
+</draw_ops>
+
+<draw_ops name="close_unfocused_prelight">
+	<include name="close_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="close_glyph_unfocused_pressed">
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-1" 
+		color="C_icons_unfocused_pressed" />
+	<line x1="(width-width%3)/3+1" y1="(height-height%3)/3" x2="width-(width-width%3)/3-1" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused_pressed" />
+	<line x1="(width-width%3)/3" y1="(height-height%3)/3+1" x2="width-(width-width%3)/3-2" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused_pressed" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused_pressed" />
+	<line x1="width-(width-width%3)/3-2" y1="(height-height%3)/3" x2="(width-width%3)/3" y2="height-(height-height%3)/3-2"
+		color="C_icons_unfocused_pressed" />
+	<line x1="width-(width-width%3)/3-1" y1="(height-height%3)/3+1" x2="(width-width%3)/3+1" y2="height-(height-height%3)/3-1"
+		color="C_icons_unfocused_pressed" />
+</draw_ops>
+
+<draw_ops name="close_unfocused_pressed">
+	<include name="close_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="maximize_glyph_focused">
+	<rectangle x="(width-width%3)/3" y="(height-height%3)/3" width="width-2*(width-width%3)/3-1" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_focused" />
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_focused" />
+</draw_ops>
+
+<draw_ops name="maximize_shadow_focused">
+	<rectangle x="(width-width%3)/3" y="(height-height%3)/3" width="width-2*(width-width%3)/3-1" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_shadow" />
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_shadow" />
+</draw_ops>
+
+<draw_ops name="maximize_focused">
+	<include name="maximize_shadow_focused" y="1" />
+	<include name="maximize_glyph_focused" />
+</draw_ops>
+
+<draw_ops name="maximize_focused_pressed">
+	<include name="maximize_glyph_focused" y="1" />
+</draw_ops>
+
+<draw_ops name="maximize_glyph_unfocused">
+	<rectangle x="(width-width%3)/3" y="(height-height%3)/3" width="width-2*(width-width%3)/3-1" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_unfocused" />
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_unfocused" />
+</draw_ops>
+
+<draw_ops name="maximize_unfocused">
+	<include name="maximize_glyph_unfocused" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="maximize_glyph_unfocused_prelight">
+	<rectangle x="(width-width%3)/3" y="(height-height%3)/3" width="width-2*(width-width%3)/3-1" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_unfocused_prelight" />
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_unfocused_prelight" />
+</draw_ops>
+
+<draw_ops name="maximize_unfocused_prelight">
+	<include name="maximize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="maximize_glyph_unfocused_pressed">
+	<rectangle x="(width-width%3)/3" y="(height-height%3)/3" width="width-2*(width-width%3)/3-1" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_unfocused_pressed" />
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_unfocused_pressed" />
+</draw_ops>
+
+<draw_ops name="maximize_unfocused_pressed">
+	<include name="maximize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="minimize_glyph_focused">
+	<rectangle x="(width-width%3)/3+2" y="height-(height-height%3)/3-2" width="width-2*(width-width%3)/3-4" height="2" filled="true"
+		color="C_icons_focused" />
+</draw_ops>
+
+<draw_ops name="minimize_shadow_focused">
+	<rectangle x="(width-width%3)/3+2" y="height-(height-height%3)/3-2" width="width-2*(width-width%3)/3-4" height="2" filled="true"
+		color="C_icons_shadow" />
+</draw_ops>
+
+<draw_ops name="minimize_focused">
+	<include name="minimize_shadow_focused" y="1" />
+	<include name="minimize_glyph_focused" />
+</draw_ops>
+
+<draw_ops name="minimize_focused_pressed">
+	<include name="minimize_glyph_focused" y="1" />
+</draw_ops>
+
+<draw_ops name="minimize_glyph_unfocused">
+	<rectangle x="(width-width%3)/3+2" y="height-(height-height%3)/3-2" width="width-2*(width-width%3)/3-4" height="2" filled="true"
+		color="C_icons_unfocused" />
+</draw_ops>
+
+<draw_ops name="minimize_unfocused">
+	<include name="minimize_glyph_unfocused" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="minimize_glyph_unfocused_prelight">
+	<rectangle x="(width-width%3)/3+2" y="height-(height-height%3)/3-2" width="width-2*(width-width%3)/3-4" height="2" filled="true"
+		color="C_icons_unfocused_prelight" />
+</draw_ops>
+
+<draw_ops name="minimize_unfocused_prelight">
+	<include name="minimize_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="minimize_glyph_unfocused_pressed">
+	<rectangle x="(width-width%3)/3+2" y="height-(height-height%3)/3-2" width="width-2*(width-width%3)/3-4" height="2" filled="true"
+		color="C_icons_unfocused_pressed" />
+</draw_ops>
+
+<draw_ops name="minimize_unfocused_pressed">
+	<include name="minimize_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="menu_glyph_focused">
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_focused" />
+	<rectangle x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_focused" />
+	<rectangle x="(width-width%3)/3+4" y="height/2-1" width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_focused" />
+</draw_ops>
+
+<draw_ops name="menu_shadow_focused">
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_shadow" />
+	<rectangle x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_shadow" />
+	<rectangle x="(width-width%3)/3+4" y="height/2-1" width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_shadow" />
+</draw_ops>
+
+<draw_ops name="menu_focused">
+	<include name="menu_shadow_focused" y="1" />
+	<include name="menu_glyph_focused" />
+</draw_ops>
+
+<draw_ops name="menu_focused_pressed">
+	<include name="menu_glyph_focused" y="1" />
+</draw_ops>
+
+<draw_ops name="menu_glyph_unfocused">
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_unfocused" />
+	<rectangle x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_unfocused" />
+	<rectangle x="(width-width%3)/3+4" y="height/2-1" width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_unfocused" />
+</draw_ops>
+
+<draw_ops name="menu_unfocused">
+	<include name="menu_glyph_unfocused" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="menu_glyph_unfocused_prelight">
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_unfocused_prelight" />
+	<rectangle x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_unfocused_prelight" />
+	<rectangle x="(width-width%3)/3+4" y="height/2-1" width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_unfocused_prelight" />
+</draw_ops>
+
+<draw_ops name="menu_unfocused_prelight">
+	<include name="menu_glyph_unfocused_prelight" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+<draw_ops name="menu_glyph_unfocused_pressed">
+	<rectangle x="(width-width%3)/3+1" y="(height-height%3)/3" width="width-2*(width-width%3)/3-3" height="height-2*(height-height%3)/3-1" 
+		color="C_icons_unfocused_pressed" />
+	<rectangle x="(width-width%3)/3+2" y="(height-height%3)/3+1" width="width-2*(width-width%3)/3-5" height="height-2*(height-height%3)/3-3" 
+		color="C_icons_unfocused_pressed" />
+	<rectangle x="(width-width%3)/3+4" y="height/2-1" width="width-2*(width-width%3)/3-8" height="2" filled="true"
+		color="C_icons_unfocused_pressed" />
+</draw_ops>
+
+<draw_ops name="menu_unfocused_pressed">
+	<include name="menu_glyph_unfocused_pressed" y="D_icons_unfocused_offset" />
+</draw_ops>
+
+	<!-- button backgrounds -->
+
+<constant name="C_button_border" value="blend/#000000/gtk:bg[NORMAL]/0.8" />
+<constant name="C_button_hilight" value="blend/#ffffff/gtk:bg[NORMAL]/0.6" />
+
+<draw_ops name="button_fill"> <!-- button background gradient -->
+	<gradient type="vertical" x="0" y="0" width="width" height="height-2">
+		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.1" />
+		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.14" />
+		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.17" />
+		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.06" />
+	</gradient>
+</draw_ops>
+
+<draw_ops name="button_bottom">
+	<line x1="0" y1="height-2" x2="width-1" y2="height-2" color="C_button_border" />
+	<line x1="0" y1="height-1" x2="width-1" y2="height-1" color="C_button_hilight" />
+</draw_ops>
+
+<draw_ops name="button_bevel">
+	<gradient type="vertical" x="0" y="0" width="1" height="height-2">
+		<color value="blend/gtk:bg[NORMAL]/#ffffff/0.1"/>
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
+	</gradient>
+	<gradient type="vertical" x="width-1" y="0" width="1" height="height-2">
+		<color value="C_border_focused"/>
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/>
+	</gradient>
+</draw_ops>
+
+<draw_ops name="button_fill_prelight"> <!-- button background gradient for prelight status -->
+	<gradient type="vertical" x="0" y="0" width="width" height="height-2">
+		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.05" />
+		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.07" />
+		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.09" />
+		<color value="blend/gtk:bg[NORMAL]/gtk:fg[NORMAL]/0.03" />
+	</gradient>
+</draw_ops>
+
+<draw_ops name="button_fill_pressed"> <!-- button background gradient for pressed status -->
+	<gradient type="vertical" x="0" y="0" width="width" height="height-2">
+		<color value="C_border_focused" />
+		<color value="blend/#000000/gtk:bg[NORMAL]/0.75" />
+		<color value="blend/#000000/gtk:bg[NORMAL]/0.8" />
+	</gradient>
+</draw_ops>
+
+<draw_ops name="button">
+	<include name="button_fill" />
+	<include name="button_bevel" />
+	<include name="button_bottom" />
+</draw_ops>
+
+<draw_ops name="button_prelight">
+	<include name="button_fill_prelight" />
+	<include name="button_bevel" />
+	<include name="button_bottom" />
+</draw_ops>
+
+<draw_ops name="button_pressed">
+	<include name="button_fill_pressed" />
+	<include name="button_bottom" />
+</draw_ops>
+
+<!-- things get messy here -->
+
+<draw_ops name="button_inner_right_slice1">
+	<clip x="0" y="0" width="width" height="height-5" />
+	<include name="button" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice2">
+	<clip x="1" y="height-5" width="width-1" height="2" />
+	<include name="button" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice3">
+	<clip x="2" y="height-3" width="width-2" height="1" />
+	<include name="button" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice4">
+	<clip x="4" y="height-2" width="width-4" height="2" />
+	<include name="button" />
+</draw_ops>
+
+<draw_ops name="button_inner_right_fill">
+	<include name="button_inner_right_slice1" />
+	<include name="button_inner_right_slice2" />
+	<include name="button_inner_right_slice3" />
+	<include name="button_inner_right_slice4" />
+</draw_ops>
+
+<draw_ops name="button_inner_right_slice1_prelight">
+	<clip x="0" y="0" width="width" height="height-5" />
+	<include name="button_prelight" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice2_prelight">
+	<clip x="1" y="height-5" width="width-1" height="2" />
+	<include name="button_prelight" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice3_prelight">
+	<clip x="2" y="height-3" width="width-2" height="1" />
+	<include name="button_prelight" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice4_prelight">
+	<clip x="4" y="height-2" width="width-4" height="2" />
+	<include name="button_prelight" />
+</draw_ops>
+
+<draw_ops name="button_inner_right_fill_prelight">
+	<include name="button_inner_right_slice1_prelight" />
+	<include name="button_inner_right_slice2_prelight" />
+	<include name="button_inner_right_slice3_prelight" />
+	<include name="button_inner_right_slice4_prelight" />
+</draw_ops>
+
+<draw_ops name="button_inner_right_slice1_pressed">
+	<clip x="0" y="0" width="width" height="height-5" />
+	<include name="button_pressed" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice2_pressed">
+	<clip x="1" y="height-5" width="width-1" height="2" />
+	<include name="button_pressed" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice3_pressed">
+	<clip x="2" y="height-3" width="width-2" height="1" />
+	<include name="button_pressed" />
+</draw_ops>
+<draw_ops name="button_inner_right_slice4_pressed">
+	<clip x="4" y="height-2" width="width-4" height="2" />
+	<include name="button_pressed" />
+</draw_ops>
+
+<draw_ops name="button_inner_right_fill_pressed">
+	<include name="button_inner_right_slice1_pressed" />
+	<include name="button_inner_right_slice2_pressed" />
+	<include name="button_inner_right_slice3_pressed" />
+	<include name="button_inner_right_slice4_pressed" />
+</draw_ops>
+
+
+<draw_ops name="button_inner_right_border">
+	<gradient type="vertical" x="0" y="0" width="1" height="height-5">
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
+		<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
+	</gradient>
+	<arc color="C_button_hilight" x="1" y="height-10" width="9" height="9"  start_angle="180" extent_angle="90" />
+	<gradient type="vertical" x="1" y="0" width="1" height="height-5">
+		<color value="C_border_focused" />
+		<color value="C_button_border" />
+	</gradient>
+	<arc color="C_button_border" x="1" y="height-11" width="9" height="9"  start_angle="180" extent_angle="90" />
+</draw_ops>
+
+<draw_ops name="button_inner_right">
+	<include name="button_inner_right_fill" />
+	<include name="button_inner_right_border" />
+</draw_ops>
+
+<draw_ops name="button_inner_right_prelight">
+	<include name="button_inner_right_fill_prelight" />
+	<include name="button_inner_right_border" />
+</draw_ops>
+
+<draw_ops name="button_inner_right_pressed">
+	<include name="button_inner_right_fill_pressed" />
+	<include name="button_inner_right_border" />
+</draw_ops>
+
+<draw_ops name="button_inner_left_slice1">
+	<clip x="0" y="0" width="width-1" height="height-5" />
+	<include name="button" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice2">
+	<clip x="0" y="height-5" width="width-2" height="2" />
+	<include name="button" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice3">
+	<clip x="0" y="height-3" width="width-3" height="1" />
+	<include name="button" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice4">
+	<clip x="0" y="height-2" width="width-5" height="2" />
+	<include name="button" />
+</draw_ops>
+
+<draw_ops name="button_inner_left_fill">
+	<include name="button_inner_left_slice1" />
+	<include name="button_inner_left_slice2" />
+	<include name="button_inner_left_slice3" />
+	<include name="button_inner_left_slice4" />
+</draw_ops>
+
+<draw_ops name="button_inner_left_slice1_prelight">
+	<clip x="0" y="0" width="width-1" height="height-5" />
+	<include name="button_prelight" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice2_prelight">
+	<clip x="0" y="height-5" width="width-2" height="2" />
+	<include name="button_prelight" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice3_prelight">
+	<clip x="0" y="height-3" width="width-3" height="1" />
+	<include name="button_prelight" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice4_prelight">
+	<clip x="0" y="height-2" width="width-5" height="2" />
+	<include name="button_prelight" />
+</draw_ops>
+
+<draw_ops name="button_inner_left_fill_prelight">
+	<include name="button_inner_left_slice1_prelight" />
+	<include name="button_inner_left_slice2_prelight" />
+	<include name="button_inner_left_slice3_prelight" />
+	<include name="button_inner_left_slice4_prelight" />
+</draw_ops>
+
+<draw_ops name="button_inner_left_slice1_pressed">
+	<clip x="0" y="0" width="width-1" height="height-5" />
+	<include name="button_pressed" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice2_pressed">
+	<clip x="0" y="height-5" width="width-2" height="2" />
+	<include name="button_pressed" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice3_pressed">
+	<clip x="0" y="height-3" width="width-3" height="1" />
+	<include name="button_pressed" />
+</draw_ops>
+<draw_ops name="button_inner_left_slice4_pressed">
+	<clip x="0" y="height-2" width="width-5" height="2" />
+	<include name="button_pressed" />
+</draw_ops>
+
+<draw_ops name="button_inner_left_fill_pressed">
+	<include name="button_inner_left_slice1_pressed" />
+	<include name="button_inner_left_slice2_pressed" />
+	<include name="button_inner_left_slice3_pressed" />
+	<include name="button_inner_left_slice4_pressed" />
+</draw_ops>
+
+
+<draw_ops name="button_inner_left_border">
+	<gradient type="vertical" x="width-1" y="0" width="1" height="height-6">
+		<color value="C_titlebar_focused_hilight" />
+		<color value="C_button_hilight" />
+	</gradient>
+	<arc color="C_button_hilight" x="width-11" y="height-11" width="10" height="10"  start_angle="90" extent_angle="90" />
+	<gradient type="vertical" x="width-2" y="0" width="1" height="height-5">
+		<color value="C_border_focused" />
+		<color value="C_button_border" />
+	</gradient>
+	<arc color="C_button_border" x="width-11" y="height-11" width="9" height="9"  start_angle="90" extent_angle="90" />
+</draw_ops>
+
+<draw_ops name="button_inner_left">
+	<include name="button_inner_left_fill" />
+	<include name="button_inner_left_border" />
+</draw_ops>
+
+<draw_ops name="button_inner_left_prelight">
+	<include name="button_inner_left_fill_prelight" />
+	<include name="button_inner_left_border" />
+</draw_ops>
+
+<draw_ops name="button_inner_left_pressed">
+	<include name="button_inner_left_fill_pressed" />
+	<include name="button_inner_left_border" />
+</draw_ops>
+
+<!-- frame styles -->
+
+<frame_style name="normal_focused" geometry="normal">
+	<piece position="entire_background" draw_ops="entire_background_focused" />
+	<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="pressed" draw_ops="close_focused_pressed" />
+	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
+
+	<button function="left_middle_background" state="normal" draw_ops="button"/>
+	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
+	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
+	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
+	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
+	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
+
+	<button function="right_middle_background" state="normal" draw_ops="button"/>
+	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
+	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
+	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
+	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
+	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
+
+	<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="attached_focused"/>
-
-	<button function="right_middle_background" state="normal" draw_ops="button_bg_focused"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_bg_prelight"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_bg_pressed"/>
-	<button function="right_right_background" state="normal" draw_ops="button_bg_focused_outer_right"/>
-	<button function="right_right_background" state="prelight" draw_ops="button_bg_prelight_outer_right"/>
-	<button function="right_right_background" state="pressed" draw_ops="button_bg_pressed_outer_right"/>
-	<button function="right_left_background" state="normal" draw_ops="button_bg_focused_inner_right"/>
-	<button function="right_left_background" state="prelight" draw_ops="button_bg_prelight_inner_right"/>
-	<button function="right_left_background" state="pressed" draw_ops="button_bg_pressed_inner_right"/>
-
-     <button function="close" state="normal" draw_ops="icon_close"/>
-     <button function="close" state="prelight" draw_ops="icon_close"/>
-     <button function="close" state="pressed" draw_ops="icon_close"/>
-     <button function="maximize" state="normal" draw_ops="icon_maximize"/>
-     <button function="maximize" state="prelight" draw_ops="icon_maximize"/>
-     <button function="maximize" state="pressed" draw_ops="icon_maximize"/>
-     <button function="minimize" state="normal" draw_ops="icon_minimize"/>
-     <button function="minimize" state="prelight" draw_ops="icon_minimize"/>
-     <button function="minimize" state="pressed" draw_ops="icon_minimize"/>
-     <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
-     <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
-     <button function="unshade" state="normal"><draw_ops /></button><button function="unshade" state="pressed"><draw_ops /></button>
-     <button function="above" state="normal"><draw_ops /></button><button function="above" state="pressed"><draw_ops /></button>
-     <button function="unabove" state="normal"><draw_ops /></button><button function="unabove" state="pressed"><draw_ops /></button>
-     <button function="stick" state="normal"><draw_ops /></button><button function="stick" state="pressed"><draw_ops /></button>
-     <button function="unstick" state="normal"><draw_ops /></button><button function="unstick" state="pressed"><draw_ops /></button>
-
-  </frame_style>
-
-  <frame_style name="attached_unfocused" geometry="attached">
-     <piece position="entire_background" draw_ops="attached_unfocused"/>
-
-     <button function="close" state="normal" draw_ops="button_close_unfocused"/>
-     <button function="close" state="prelight" draw_ops="button_close_unfocused_prelight"/>
-     <button function="close" state="pressed" draw_ops="button_close_unfocused_pressed"/>
-     <button function="maximize" state="normal" draw_ops="button_maximize_unfocused"/>
-     <button function="maximize" state="prelight" draw_ops="button_maximize_unfocused_prelight"/>
-     <button function="maximize" state="pressed" draw_ops="button_maximize_unfocused_pressed"/>
-     <button function="minimize" state="normal" draw_ops="button_minimize_unfocused"/>
-     <button function="minimize" state="prelight" draw_ops="button_minimize_unfocused_prelight"/>
-     <button function="minimize" state="pressed" draw_ops="button_minimize_unfocused_pressed"/>
-     <button function="menu" state="normal"><draw_ops /></button><button function="menu" state="pressed"><draw_ops /></button>
-     <button function="shade" state="normal"><draw_ops /></button><button function="shade" state="pressed"><draw_ops /></button>
-     <button function="unshade" state="normal"><draw_ops /></button><button function="unshade" state="pressed"><draw_ops /></button>
-     <button function="above" state="normal"><draw_ops /></button><button function="above" state="pressed"><draw_ops /></button>
-     <button function="unabove" state="normal"><draw_ops /></button><button function="unabove" state="pressed"><draw_ops /></button>
-     <button function="stick" state="normal"><draw_ops /></button><button function="stick" state="pressed"><draw_ops /></button>
-     <button function="unstick" state="normal"><draw_ops /></button><button function="unstick" state="pressed"><draw_ops /></button>
+<frame_style name="normal_unfocused" geometry="normal_unfocused">
+	<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="rounded_border_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"/>
+	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
+	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
+	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
+	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
+	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
+	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
+	<button function="menu" state="normal" draw_ops="menu_unfocused" />
+	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
+	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
+	<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="utility_focused" geometry="utility" parent="normal_focused">
-     <piece position="titlebar" draw_ops="titlebar_utility_focused"/>
-	<button function="right_right_background" state="normal" draw_ops="button_bg_focused_single_right_utility"/>
-	<button function="right_right_background" state="prelight" draw_ops="button_bg_prelight_single_right_utility"/>
-	<button function="right_right_background" state="pressed" draw_ops="button_bg_pressed_single_right_utility"/>
-	<button function="right_middle_background" state="normal" draw_ops="button_bg_focused_single_right_utility"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_bg_prelight_single_right_utility"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_bg_pressed_single_right_utility"/>
-	<button function="close" state="normal" draw_ops="icon_close_single"/>
-	<button function="close" state="prelight" draw_ops="icon_close_single"/>
-	<button function="close" state="pressed" draw_ops="icon_close_single"/>
+<frame_style name="normal_max_focused" geometry="max">
+	<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="pressed" draw_ops="close_focused_pressed" />
+	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
+
+	<button function="left_middle_background" state="normal" draw_ops="button"/>
+	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
+	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
+	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
+	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
+	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
+
+	<button function="right_middle_background" state="normal" draw_ops="button"/>
+	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
+	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
+	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
+	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
+	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
+
+	<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="utility_unfocused" geometry="utility" parent="normal_unfocused">
-     <piece position="titlebar" draw_ops="titlebar_utility_unfocused"/>
-	<button function="close" state="normal" draw_ops="button_close_unfocused"/>
-	<button function="close" state="prelight" draw_ops="button_close_unfocused_prelight"/>
-	<button function="close" state="pressed" draw_ops="button_close_unfocused_pressed"/>
+<frame_style name="normal_max_unfocused" geometry="max">
+	<piece position="entire_background" draw_ops="entire_background_unfocused" />
+	<piece position="titlebar" draw_ops="titlebar_fill_unfocused" />
+	<piece position="title" draw_ops="title_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"/>
+	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
+	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
+	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
+	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
+	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
+	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
+	<button function="menu" state="normal" draw_ops="menu_unfocused" />
+	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
+	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
+	<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="dialog_focused" geometry="dialog" parent="normal_focused">
-	<button function="right_right_background" state="normal" draw_ops="button_bg_focused_single_right"/>
-	<button function="right_right_background" state="prelight" draw_ops="button_bg_prelight_single_right"/>
-	<button function="right_right_background" state="pressed" draw_ops="button_bg_pressed_single_right"/>
-	<button function="right_middle_background" state="normal" draw_ops="button_bg_focused_single_right"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_bg_prelight_single_right"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_bg_pressed_single_right"/>
-	<button function="close" state="normal" draw_ops="icon_close_single"/>
-	<button function="close" state="prelight" draw_ops="icon_close_single"/>
-	<button function="close" state="pressed" draw_ops="icon_close_single"/>
+<frame_style name="dialog_focused" geometry="nobuttons">
+	<piece position="entire_background" draw_ops="entire_background_focused" />
+	<piece position="titlebar" draw_ops="rounded_titlebar_focused_alt" />
+	<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="pressed" draw_ops="close_focused_pressed" />
+	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
+
+	<button function="left_middle_background" state="normal" draw_ops="button"/>
+	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
+	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
+	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
+	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
+	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
+
+	<button function="right_middle_background" state="normal" draw_ops="button"/>
+	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
+	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
+	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
+	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
+	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
+
+	<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="dialog_unfocused" geometry="dialog" parent="normal_unfocused">
-	<button function="right_right_background" state="normal" draw_ops="button_bg_focused_single_right"/>
-	<button function="right_right_background" state="prelight" draw_ops="button_bg_prelight_single_right"/>
-	<button function="right_right_background" state="pressed" draw_ops="button_bg_pressed_single_right"/>
-	<button function="right_middle_background" state="normal" draw_ops="button_bg_focused_single_right"/>
-	<button function="right_middle_background" state="prelight" draw_ops="button_bg_prelight_single_right"/>
-	<button function="right_middle_background" state="pressed" draw_ops="button_bg_pressed_single_right"/>
-	<button function="close" state="normal" draw_ops="icon_close_single"/>
-	<button function="close" state="prelight" draw_ops="icon_close_single"/>
-	<button function="close" state="pressed" draw_ops="icon_close_single"/>
+<frame_style name="dialog_unfocused" geometry="nobuttons">
+	<piece position="entire_background" draw_ops="entire_background_unfocused" />
+	<piece position="titlebar" draw_ops="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"/>
+	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
+	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
+	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
+	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
+	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
+	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
+	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
+	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
+	<button function="menu" state="normal" draw_ops="menu_unfocused" />
+	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
+	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
+	<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 sets -->
-
-  <frame_style_set name="normal">
-     <frame state="normal" resize="none" focus="no" style="normal_unfocused"/>
-     <frame state="normal" resize="none" focus="yes" style="normal_focused"/>
-     <frame state="normal" resize="both" focus="no" style="normal_unfocused"/>
-     <frame state="normal" resize="both" focus="yes" style="normal_focused"/>
-
-     <frame state="shaded" focus="no" style="normal_unfocused"/>
-     <frame state="shaded" focus="yes" style="normal_focused"/>
-
-     <frame state="maximized" focus="no" style="maximized_unfocused"/>
-     <frame state="maximized" focus="yes" style="maximized_focused"/>
-
-     <frame state="maximized_and_shaded" focus="no" style="maximized_unfocused"/>
-     <frame state="maximized_and_shaded" focus="yes" style="maximized_focused"/>
-
-  </frame_style_set>
-
-  <frame_style_set name="utility">
-     <frame state="normal" resize="none" focus="no" style="utility_unfocused"/>
-     <frame state="normal" resize="none" focus="yes" style="utility_focused"/>
-     <frame state="normal" resize="both" focus="no" style="utility_unfocused"/>
-     <frame state="normal" resize="both" focus="yes" style="utility_focused"/>
-
-     <frame state="shaded" focus="no" style="utility_unfocused"/>
-     <frame state="shaded" focus="yes" style="utility_focused"/>
-
-     <frame state="maximized" focus="no" style="utility_unfocused"/>
-     <frame state="maximized" focus="yes" style="utility_focused"/>
-
-     <frame state="maximized_and_shaded" focus="no" style="utility_unfocused"/>
-     <frame state="maximized_and_shaded" focus="yes" style="utility_focused"/>
-
-  </frame_style_set>
-
-  <frame_style_set name="dialog">
-     <frame state="normal" resize="none" focus="no" style="dialog_unfocused"/>
-     <frame state="normal" resize="none" focus="yes" style="dialog_focused"/>
-     <frame state="normal" resize="both" focus="no" style="dialog_unfocused"/>
-     <frame state="normal" resize="both" focus="yes" style="dialog_focused"/>
-
-     <frame state="shaded" focus="no" style="dialog_unfocused"/>
-     <frame state="shaded" focus="yes" style="dialog_focused"/>
-
-     <frame state="maximized" focus="no" style="dialog_unfocused"/>
-     <frame state="maximized" focus="yes" style="dialog_focused"/>
-
-     <frame state="maximized_and_shaded" focus="no" style="dialog_unfocused"/>
-     <frame state="maximized_and_shaded" focus="yes" style="dialog_focused"/>
-
-  </frame_style_set>
-
-
-  <frame_style_set name="border">
-     <frame state="normal" resize="none" focus="no" style="border_unfocused"/>
-     <frame state="normal" resize="none" focus="yes" style="border_focused"/>
-     <frame state="normal" resize="both" focus="no" style="border_unfocused"/>
-     <frame state="normal" resize="both" focus="yes" style="border_focused"/>
-
-     <frame state="shaded" focus="no" style="border_unfocused"/>
-     <frame state="shaded" focus="yes" style="border_focused"/>
-
-     <frame state="maximized" focus="no" style="border_unfocused"/>
-     <frame state="maximized" focus="yes" style="border_focused"/>
-
-     <frame state="maximized_and_shaded" focus="no" style="border_unfocused"/>
-     <frame state="maximized_and_shaded" focus="yes" style="border_focused"/>
-
-  </frame_style_set>
-
-  <frame_style_set name="attached">
-     <frame state="normal" resize="none" focus="no" style="attached_unfocused"/>
-     <frame state="normal" resize="none" focus="yes" style="attached_focused"/>
-     <frame state="normal" resize="both" focus="no" style="attached_unfocused"/>
-     <frame state="normal" resize="both" focus="yes" style="attached_focused"/>
-
-     <frame state="shaded" focus="no" style="attached_unfocused"/>
-     <frame state="shaded" focus="yes" style="attached_focused"/>
+<frame_style name="modal_dialog_focused" geometry="nobuttons">
+	<piece position="entire_background" draw_ops="entire_background_focused" />
+	<piece position="titlebar" draw_ops="rounded_titlebar_focused_alt" />
+	<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="pressed" draw_ops="close_focused_pressed" />
+	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
+
+	<button function="left_middle_background" state="normal" draw_ops="button"/>
+	<button function="left_middle_background" state="prelight" draw_ops="button_prelight"/>
+	<button function="left_middle_background" state="pressed" draw_ops="button_pressed"/>
+	<button function="left_right_background" state="normal" draw_ops="button_inner_left"/>
+	<button function="left_right_background" state="prelight" draw_ops="button_inner_left_prelight"/>
+	<button function="left_right_background" state="pressed" draw_ops="button_inner_left_pressed"/>
+
+	<button function="right_middle_background" state="normal" draw_ops="button"/>
+	<button function="right_middle_background" state="prelight" draw_ops="button_prelight"/>
+	<button function="right_middle_background" state="pressed" draw_ops="button_pressed"/>
+	<button function="right_left_background" state="normal" draw_ops="button_inner_right"/>
+	<button function="right_left_background" state="prelight" draw_ops="button_inner_right_prelight"/>
+	<button function="right_left_background" state="pressed" draw_ops="button_inner_right_pressed"/>
+
+	<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 state="maximized" focus="no" style="attached_unfocused"/>
-     <frame state="maximized" focus="yes" style="attached_focused"/>
+<frame_style name="modal_dialog_unfocused" geometry="nobuttons">
+	<piece position="entire_background" draw_ops="entire_background_unfocused" />
+	<piece position="titlebar" draw_ops="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"/>
+	<button function="close" state="prelight" draw_ops="close_unfocused_prelight"/>
+	<button function="close" state="pressed" draw_ops="close_unfocused_pressed"/>
+	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
+	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
+	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
+	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
+	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
+	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
+	<button function="menu" state="normal" draw_ops="menu_unfocused" />
+	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
+	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
+	<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 state="maximized_and_shaded" focus="no" style="attached_unfocused"/>
-     <frame state="maximized_and_shaded" focus="yes" style="attached_focused"/>
+<frame_style name="utility_focused" geometry="small">
+	<piece position="entire_background" draw_ops="entire_background_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" />
+	<button function="close" state="pressed" draw_ops="close_focused_pressed" />
+	<button function="maximize" state="normal" draw_ops="maximize_focused" />
+	<button function="maximize" state="pressed" draw_ops="maximize_focused_pressed" />
+	<button function="minimize" state="normal" draw_ops="minimize_focused" />
+	<button function="minimize" state="pressed" draw_ops="minimize_focused_pressed" />
+	<button function="menu" state="normal" draw_ops="menu_focused" />
+	<button function="menu" state="pressed" draw_ops="menu_focused_pressed" />
+
+	<button function="left_middle_background" state="normal" draw_ops="button_inner_left"/>
+	<button function="left_middle_background" state="prelight" draw_ops="button_inner_left_prelight"/>
+	<button function="left_middle_background" state="pressed" draw_ops="button_inner_left_pressed"/>
+
+	<button function="right_middle_background" state="normal" draw_ops="button_inner_right"/>
+	<button function="right_middle_background" state="prelight" draw_ops="button_inner_right_prelight"/>
+	<button function="right_middle_background" state="pressed" draw_ops="button_inner_right_pressed"/>
+
+	<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_set>
+<frame_style name="utility_unfocused" geometry="small_unfocused">
+	<piece position="entire_background" draw_ops="entire_background_unfocused" />
+	<piece position="titlebar" draw_ops="titlebar_unfocused" />
+	<piece position="title" draw_ops="title_unfocused" />
+	<piece position="overlay" draw_ops="border_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"/>
+	<button function="maximize" state="normal" draw_ops="maximize_unfocused"/>
+	<button function="maximize" state="prelight" draw_ops="maximize_unfocused_prelight"/>
+	<button function="maximize" state="pressed" draw_ops="maximize_unfocused_pressed"/>
+	<button function="minimize" state="normal" draw_ops="minimize_unfocused"/>
+	<button function="minimize" state="prelight" draw_ops="minimize_unfocused_prelight"/>
+	<button function="minimize" state="pressed" draw_ops="minimize_unfocused_pressed"/>
+	<button function="menu" state="normal" draw_ops="menu_unfocused" />
+	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight" />
+	<button function="menu" state="pressed" draw_ops="menu_unfocused_pressed" />
+	<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="border_focused" geometry="borderless">
+	<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>
+	<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="border_unfocused" geometry="borderless">
+	<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>
+	<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>
 
-  <!-- window types -->
+<frame_style name="attached_focused" geometry="attached">
+	<piece position="entire_background" draw_ops="entire_background_focused" />
+	<piece position="titlebar" draw_ops="titlebar_focused_alt" />
+	<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>
+	<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>
 
-  <window type="normal" style_set="normal"/>
-  <window type="dialog" style_set="dialog"/>
-  <window type="modal_dialog" style_set="dialog"/>
-  <window type="menu" style_set="utility"/>
-  <window type="utility" style_set="utility"/>
-  <window type="border" style_set="border"/>
-  <window version=">= 3.2" type="attached" style_set="attached"/>
+<frame_style name="attached_unfocused" geometry="attached">
+	<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>
+	<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>
 
-  <!-- menu icons -->
+<!-- placeholder for unimplementated styles-->
+<frame_style name="blank" geometry="normal">
+	<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>
 
-  <menu_icon function="close" state="normal" draw_ops="menu_button_close"/>
-  <menu_icon function="maximize" state="normal" draw_ops="menu_button_maximize"/>
-  <menu_icon function="unmaximize" state="normal" draw_ops="menu_button_maximize"/>
-  <menu_icon function="minimize" state="normal" draw_ops="menu_button_minimize"/>
+<!-- frame style sets -->
+
+<frame_style_set name="normal_style_set">
+	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
+	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
+	<frame focus="yes" state="maximized" style="normal_max_focused"/>
+	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
+	<frame focus="yes" state="shaded" style="blank"/>
+	<frame focus="no" state="shaded" style="blank"/>
+	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
+	<frame focus="no" state="maximized_and_shaded" style="blank"/>
+</frame_style_set>
+
+<frame_style_set name="dialog_style_set">
+	<frame focus="yes" state="normal" resize="both" style="dialog_focused"/>
+	<frame focus="no" state="normal" resize="both" style="dialog_unfocused"/>
+	<frame focus="yes" state="maximized" style="normal_max_focused"/>
+	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
+	<frame focus="yes" state="shaded" style="blank"/>
+	<frame focus="no" state="shaded" style="blank"/>
+	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
+	<frame focus="no" state="maximized_and_shaded" style="blank"/>
+</frame_style_set>
+
+<frame_style_set name="modal_dialog_style_set">
+	<frame focus="yes" state="normal" resize="both" style="modal_dialog_focused"/>
+	<frame focus="no" state="normal" resize="both" style="modal_dialog_unfocused"/>
+	<frame focus="yes" state="maximized" style="normal_max_focused"/>
+	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
+	<frame focus="yes" state="shaded" style="blank"/>
+	<frame focus="no" state="shaded" style="blank"/>
+	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
+	<frame focus="no" state="maximized_and_shaded" style="blank"/>
+</frame_style_set>
+
+<frame_style_set name="utility_style_set">
+	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
+	<frame focus="no" state="normal" resize="both" style="utility_unfocused"/>
+	<frame focus="yes" state="maximized" style="normal_max_focused"/>
+	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
+	<frame focus="yes" state="shaded" style="blank"/>
+	<frame focus="no" state="shaded" style="blank"/>
+	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
+	<frame focus="no" state="maximized_and_shaded" style="blank"/>
+</frame_style_set>
+
+<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="normal_max_focused"/>
+	<frame focus="no" state="maximized" style="normal_max_unfocused"/>
+	<frame focus="yes" state="shaded" style="blank"/>
+	<frame focus="no" state="shaded" style="blank"/>
+	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
+	<frame focus="no" state="maximized_and_shaded" style="blank"/>
+</frame_style_set>
+
+<frame_style_set name="attached_style_set">
+	<frame focus="yes" state="normal" resize="both" style="attached_focused"/>
+	<frame focus="no" state="normal" resize="both" style="attached_unfocused"/>
+	<frame focus="yes" state="maximized" style="blank"/>
+	<frame focus="no" state="maximized" style="blank"/>
+	<frame focus="yes" state="shaded" style="blank"/>
+	<frame focus="no" state="shaded" style="blank"/>
+	<frame focus="yes" state="maximized_and_shaded" style="blank"/>
+	<frame focus="no" state="maximized_and_shaded" style="blank"/>
+</frame_style_set>
+
+<!-- windows -->
+
+<window type="normal" style_set="normal_style_set"/>
+<window type="dialog" style_set="dialog_style_set"/>
+<window type="modal_dialog" style_set="modal_dialog_style_set"/>
+<window type="menu" style_set="utility_style_set"/>
+<window type="utility" style_set="utility_style_set"/>
+<window type="border" style_set="border_style_set"/>
+<window version=">= 3.2" type="attached" style_set="attached_style_set"/>
 
 </metacity_theme>



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