[gtk-engines/gnome3] Metacity theme fixes.

From: Lapo Calamandrei <lapo src gnome org>
To: commits-list gnome org
Cc:
Subject: [gtk-engines/gnome3] Metacity theme fixes.
Date: Fri, 27 Aug 2010 09:49:44 +0000 (UTC)
commit 7c8b545e367b06fc73d119945aa6d2b35f04f2ff
Author: Lapo Calamandrei <calamandrei gmail com>
Date:   Fri Aug 27 11:49:34 2010 +0200

    Metacity theme fixes.

 themes/GNOME3/metacity-1/metacity-theme-2.xml |  530 +++++++++++++------------
 1 files changed, 270 insertions(+), 260 deletions(-)
---
diff --git a/themes/GNOME3/metacity-1/metacity-theme-2.xml b/themes/GNOME3/metacity-1/metacity-theme-2.xml
index 367000b..19721a2 100644
--- a/themes/GNOME3/metacity-1/metacity-theme-2.xml
+++ b/themes/GNOME3/metacity-1/metacity-theme-2.xml
@@ -9,6 +9,9 @@
   </info>
 
 	<!--
+		2010-08-27. Lapo Calamandrei <calamandrei gmail com>
+			- Fix unfocused state and max'd state.
+			- More constants.
 		2010-08-26. Lapo Calamandrei <calamandrei gmail com>
 			- Initial conversion to format version 2 and rounded corner tweaks.
 			- Fixed a positioning issue with unfocused close button.
@@ -27,35 +30,33 @@
 	-->
 
 <!-- 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]/#000000/0.06" />
-<constant name="CTitleFocused" value="" />
-<constant name="CTitleFocusedHilight" value="" />
-<constant name="CTitleUnfocused" value="" />
-<constant name="CTitleUnfocusedHilight" value="" />
-<constant name="CIconFocused_normal" value="" />
-<constant name="CIconFocused_prelight" value="" />
-<constant name="CIconFocused_pressed" value="" />
-<constant name="CIconUnfocused_normal" value="" />
-<constant name="CIconUnfocused_prelight" value="" />
-<constant name="CIconUnfocused_pressed" value="" />
-<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 -->
+	<!-- 
+		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]/#000000/0.06" />
+	<constant name="CTitleFocused" value="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1" />
+	<constant name="CTitleFocusedHilight" value="blend/#ffffff/gtk:bg[NORMAL]/0.8" />
+	<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.8" />
+	<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"/>
@@ -64,7 +65,7 @@
 		<distance name="right_titlebar_edge" value="0"/>
 		<distance name="title_vertical_pad" value="10"/>
 		<border name="title_border" left="0" right="0" top="0" bottom="3"/>
-		<border name="button_border" left="0" right="0" top="0" bottom="3"/>
+		<border name="button_border" left="0" right="0" top="0" bottom="2"/>
 		<aspect_ratio name="button" value="1"/>
 	</frame_geometry>
 
@@ -74,12 +75,15 @@
 		<distance name="bottom_height" value="0"/>
 		<distance name="title_vertical_pad" value="10"/>
 		<border name="title_border" left="0" right="0" top="0" bottom="3"/>
-		<border name="button_border" left="0" right="0" top="0" bottom="3"/>
+		<border name="button_border" left="0" right="0" top="0" bottom="2"/>
 	</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">
   </frame_geometry>
 
@@ -89,36 +93,27 @@
 
   <!-- Titlebar Background -->
 	<draw_ops name="bg_titlebar_maximized">	
-		<gradient type="vertical" x="1" y="1" width="width-2" height="height"> 
+		<gradient type="vertical" x="1" y="1" width="width-2" height="height-1"> 
 			<color value="blend/gtk:bg[NORMAL]/#ffffff/0.1" />
 			<color value="gtk:bg[NORMAL]"/>
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.03" />
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.06" />
 		</gradient>
 		<!-- top -->
-		<tint color="blend/#ffffff/gtk:bg[NORMAL]/0.8" x="1" y="1" width="width-1" height="1" alpha="0.8" />
+		<!-- <tint color="blend/#ffffff/gtk:bg[NORMAL]/0.8" x="1" y="1" width="width-1" height="1" alpha="0.8" /> -->
 
 	</draw_ops>
 	<draw_ops name="bg_titlebar_unfocused_maximized">
-		<rectangle color="CTitlebarUnfocused" x="1" y="1" width="width-2" height="height" filled="true"/>	
+		<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" />
 		<!-- left upper rounded corner -->
 		<line color="CBorderUnfocused" x1="2" y1="1" x2="3" y2="1" />
 		<line color="CBorderUnfocused" x1="1" y1="2" x2="1" y2="3" />
-		<!-- aa -->
-		<!--
-		<line color="blend/#000000/gtk:bg[NORMAL]/0.8" x1="3" y1="1" x2="4" y2="1" />
-		<line color="blend/#000000/gtk:bg[NORMAL]/0.8" x1="2" y1="2" x2="2" y2="2" />
-		<line color="blend/#000000/gtk:bg[NORMAL]/0.8" x1="1" y1="3" x2="1" y2="4" />
-		-->
 		<!-- right upper rounder corner -->
-		<!--
-		<line color="blend/#000000/gtk:bg[NORMAL]/0.8" x1="width - 5" y1="1" x2="width - 3" y2="1" />
-		<line color="blend/#000000/gtk:bg[NORMAL]/0.8" x1="width - 3" y1="2" x2="width - 2" y2="2" />
-		<line color="blend/#000000/gtk:bg[NORMAL]/0.8" x1="width - 2" y1="3" x2="width - 2" y2="4" />
-		-->
+		<line color="CBorderUnfocused" x1="width-4" y1="1" x2="width-2" y2="1" />
+		<line color="CBorderUnfocused" x1="width-2" y1="2" x2="width-2" y2="3" />
 	</draw_ops>
 
 	<draw_ops name="bg_titlebar">
@@ -135,11 +130,8 @@
 		<line color="CBorderFocused" x1="2" y1="1" x2="3" y2="1" />
 		<line color="CBorderFocused" x1="1" y1="2" x2="1" y2="3" />
 		<!-- right upper rounder corner -->
-		<!--
-		<line color="blend/#000000/gtk:bg[NORMAL]/0.6" x1="width - 5" y1="1" x2="width - 3" y2="1" />
-		<line color="blend/#000000/gtk:bg[NORMAL]/0.6" x1="width - 3" y1="2" x2="width - 2" y2="2" />
-		<line color="blend/#000000/gtk:bg[NORMAL]/0.6" x1="width - 2" y1="3" x2="width - 2" y2="4" />
-		-->
+		<line color="CBorderFocused" x1="width-4" y1="1" x2="width-3" y2="1" />
+		<line color="CBorderFocused" x1="width-2" y1="2" x2="width-2" y2="3" />
 	</draw_ops>
 
 
@@ -157,14 +149,14 @@
   <!-- Title -->
 
 	<draw_ops name="title_all">
-		<title x="11" y="(((height - title_height) / 2) `max` 0)+3" color="blend/#ffffff/gtk:bg[NORMAL]/0.8"/>
-		<title x="11" y="(((height - title_height) / 2) `max` 0)+2" color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.1"/>
+		<title x="11" y="(((height - title_height) / 2) `max` 0)+3" color="CTitleFocusedHilight"/>
+		<title x="11" y="(((height - title_height) / 2) `max` 0)+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="11" y="(((height - title_height) / 2) `max` 0)+3" color="blend/#ffffff/gtk:bg[NORMAL]/0.9"/>
-		<title x="11" y="(((height - title_height) / 2) `max` 0)+2" color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8"/>
+		<title x="11" y="(((height - title_height) / 2) `max` 0)+3" color="CTitleUnfocusedHilight"/>
+		<title x="11" y="(((height - title_height) / 2) `max` 0)+2" color="CTitleUnfocused"/>
 	</draw_ops>
 
   <!-- Normal, focused window -->
@@ -217,39 +209,38 @@
 
 	<draw_ops name="button_bottom_hilight">
 		<!-- horziontal highlight on the bottom -->
-		<tint color="CButtonBorder" x="0" y="height - 2" width="width" height="1" alpha="1"/>
-		<tint color="CButtonHilight" x="0" y="height - 1" width="width" height="1" alpha="0.9"/>
+		<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="0.9"/>
 	</draw_ops>
 
 	<draw_ops name="button_separator">
 		<!-- vertical separator stripes -->
-		<gradient type="vertical" x="0" y="1" width="1" height="height - 2"> 
+		<gradient type="vertical" x="1" y="1" width="1" height="height - 5"> 
 			<color value="blend/gtk:bg[NORMAL]/#ffffff/0.1"/>
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.07"/>
 		</gradient>
-		<gradient type="vertical" x="width - 1" y="1" width="1" height="height - 2"> 
+		<gradient type="vertical" x="0" y="1" width="1" height="height - 5"> 
 			<color value="CBorderFocused"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.05"/>
+			<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="1" width="1" height="height - 2" alpha="0.05"/>
-		<gradient type="vertical" x="width - 1" y="1" width="1" height="height - 2"> 
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.6"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.25"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.05"/>
+		<tint color="blend/#ffffff/gtk:bg[NORMAL]/0.5" x="0" y="1" width="1" height="height - 5" alpha="0.05"/>
+		<gradient type="vertical" x="0" y="1" width="1" height="height - 5"> 
+			<color value="CBorderFocused"/>
+			<color value="blend/gtk:bg[NORMAL]/#000000/0.1"/> 
 		</gradient>
 	</draw_ops>
 
 	<draw_ops name="button_separator_max">
 		<!-- vertical separator stripes -->
-		<gradient type="vertical" x="0" y="0" width="1" height="height - 1"> 
+		<gradient type="vertical" x="1" y="0" width="1" height="height - 4"> 
 			<color value="blend/gtk:bg[NORMAL]/#ffffff/0.1"/>
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.07"/>
 		</gradient>
-		<gradient type="vertical" x="width - 1" y="0" width="1" height="height - 1"> 
+		<gradient type="vertical" x="0" y="0" width="1" height="height - 4"> 
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.5"/>
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.05"/>
 		</gradient>
@@ -257,11 +248,10 @@
 
 	<draw_ops name="button_separator_pressed_max">
 		<!-- vertical separator stripes for pressed state -->
-		<tint color="blend/#ffffff/gtk:bg[NORMAL]/0.5" x="0" y="0" width="1" height="height - 1" alpha="0.05"/>
-		<gradient type="vertical" x="width - 1" y="0" width="1" height="height - 1"> 
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.6"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.25"/>
-			<color value="blend/gtk:bg[NORMAL]/#000000/0.05"/>
+		<tint color="blend/#ffffff/gtk:bg[NORMAL]/0.5" x="0" y="0" width="1" height="height - 4" alpha="0.05"/>
+		<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>
 
@@ -270,7 +260,7 @@
 			<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.07"/>
+			<color value="blend/gtk:bg[NORMAL]/#000000/0.06"/>
 		</gradient>
 		<include name="button_separator" />
 		<include name="button_bottom_hilight" />
@@ -297,18 +287,18 @@
 	</draw_ops>
 	
 	<draw_ops name="button_bg_focused_max">
-		<gradient type="vertical" x="0" y="0" width="width" height="height - 1"> 
+		<gradient type="vertical" x="0" y="0" width="width" height="height - 2"> 
 			<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.07"/>
+			<color value="blend/gtk:bg[NORMAL]/#000000/0.06"/>
 		</gradient>
 		<include name="button_separator_max"/>
 		<include name="button_bottom_hilight" />
 	</draw_ops>
 
 	<draw_ops name="button_bg_prelight_max">
-		<gradient type="vertical" x="0" y="0" width="width" height="height - 1"> 
+		<gradient type="vertical" x="0" y="0" width="width" height="height - 2"> 
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.05"/>
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.10"/>
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.12"/>
@@ -319,7 +309,7 @@
 	</draw_ops>
 
 	<draw_ops name="button_bg_pressed_max">
-		<gradient type="vertical" x="0" y="0" width="width" height="height - 1"> 
+		<gradient type="vertical" x="0" y="0" width="width" height="height - 2"> 
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.4"/>
 			<color value="blend/gtk:bg[NORMAL]/#000000/0.05"/>
 		</gradient>
@@ -349,109 +339,109 @@
 	</draw_ops>
 
 	<draw_ops name="button_bg_focused_clipped">
-		<clip x="1" y="0" width="width-1" height="height-4" />
+		<clip x="2" y="0" width="width-2" height="height-6" />
 		<include name="button_bg_focused" />
-		<clip x="2" y="height-4" width="width-2" height="1" />
+		<clip x="3" y="height-6" width="width-3" height="1" />
 		<include name="button_bg_focused" />
-		<clip x="3" y="height-3" width="width-3" height="1" />
+		<clip x="4" y="height-5" width="width-4" height="1" />
 		<include name="button_bg_focused" />
-		<clip x="4" y="height-2" width="width-4" height="2" />
+		<clip x="5" y="height-4" width="width-5" height="2" />
 		<include name="button_bg_focused" />
 	</draw_ops>
 
 	<draw_ops name="button_bg_prelight_clipped">
-		<clip x="1" y="0" width="width-1" height="height-4" />
+		<clip x="2" y="0" width="width-2" height="height-6" />
 		<include name="button_bg_prelight" />
-		<clip x="2" y="height-4" width="width-2" height="1" />
+		<clip x="3" y="height-6" width="width-3" height="1" />
 		<include name="button_bg_prelight" />
-		<clip x="3" y="height-3" width="width-3" height="1" />
+		<clip x="4" y="height-5" width="width-4" height="1" />
 		<include name="button_bg_prelight" />
-		<clip x="4" y="height-2" width="width-4" height="2" />
+		<clip x="5" y="height-4" width="width-5" height="2" />
 		<include name="button_bg_prelight" />
 	</draw_ops>
 
 	<draw_ops name="button_bg_pressed_clipped">
-		<clip x="1" y="0" width="width-1" height="height-4" />
+		<clip x="2" y="0" width="width-2" height="height-6" />
 		<include name="button_bg_pressed" />
-		<clip x="2" y="height-4" width="width-2" height="1" />
+		<clip x="3" y="height-6" width="width-3" height="1" />
 		<include name="button_bg_pressed" />
-		<clip x="3" y="height-3" width="width-3" height="1" />
+		<clip x="4" y="height-5" width="width-4" height="1" />
 		<include name="button_bg_pressed" />
-		<clip x="4" y="height-2" width="width-4" height="2" />
+		<clip x="5" y="height-4" width="width-5" height="2" />
 		<include name="button_bg_pressed" />
 	</draw_ops>
 
 	<draw_ops name="button_bg_focused_clipped_max">
-		<clip x="1" y="0" width="width-1" height="height-4" />
+		<clip x="2" y="0" width="width-2" height="height-6" />
 		<include name="button_bg_focused_max" />
-		<clip x="2" y="height-4" width="width-2" height="1" />
+		<clip x="3" y="height-6" width="width-3" height="1" />
 		<include name="button_bg_focused_max" />
-		<clip x="3" y="height-3" width="width-3" height="1" />
+		<clip x="4" y="height-5" width="width-4" height="1" />
 		<include name="button_bg_focused_max" />
-		<clip x="4" y="height-2" width="width-4" height="2" />
+		<clip x="5" y="height-4" width="width-5" height="2" />
 		<include name="button_bg_focused_max" />
 	</draw_ops>
 
 	<draw_ops name="button_bg_prelight_clipped_max">
-		<clip x="1" y="0" width="width-1" height="height-4" />
+		<clip x="2" y="0" width="width-2" height="height-6" />
 		<include name="button_bg_prelight_max" />
-		<clip x="2" y="height-4" width="width-2" height="1" />
+		<clip x="3" y="height-6" width="width-3" height="1" />
 		<include name="button_bg_prelight_max" />
-		<clip x="3" y="height-3" width="width-3" height="1" />
+		<clip x="4" y="height-5" width="width-4" height="1" />
 		<include name="button_bg_prelight_max" />
-		<clip x="4" y="height-2" width="width-4" height="2" />
+		<clip x="5" y="height-4" width="width-5" height="2" />
 		<include name="button_bg_prelight_max" />
 	</draw_ops>
 
 	<draw_ops name="button_bg_pressed_clipped_max">
-		<clip x="1" y="0" width="width-1" height="height-4" />
+		<clip x="2" y="0" width="width-2" height="height-6" />
 		<include name="button_bg_pressed_max" />
-		<clip x="2" y="height-4" width="width-2" height="1" />
+		<clip x="3" y="height-6" width="width-3" height="1" />
 		<include name="button_bg_pressed_max" />
-		<clip x="3" y="height-3" width="width-3" height="1" />
+		<clip x="4" y="height-5" width="width-4" height="1" />
 		<include name="button_bg_pressed_max" />
-		<clip x="4" y="height-2" width="width-4" height="2" />
+		<clip x="5" y="height-4" width="width-5" height="2" />
 		<include name="button_bg_pressed_max" />
 	</draw_ops>
 
 	<draw_ops name="right_left_button_rounded_corner">
 		<!--hilight -->
-		<tint color="CButtonHilight" alpha="0.7" x="3" y="height-1" width="1" height="1"/>
-		<tint color="CButtonHilight" alpha="0.25" x="3" y="height-2" width="1" height="1"/>
-		<tint color="CButtonHilight" alpha="0.25" x="2" y="height-1" width="1" height="1"/>
-		<tint color="CButtonHilight" alpha="0.8" x="2" y="height-2" width="1" height="1"/>
-		<tint color="CButtonHilight" alpha="0.5" x="1" y="height-2" width="1" height="1"/>
-		<tint color="CButtonHilight" alpha="0.8" x="1" y="height-3" width="1" height="1"/>
-		<tint color="CButtonHilight" alpha="0.7" x="0" y="height-4" width="1" height="1"/>
-		<tint color="CButtonHilight" alpha="0.25" x="0" y="height-3" width="1" height="1"/>
-		<tint color="CButtonHilight" alpha="0.25" x="1" y="height-4" width="1" height="1"/>
-		<tint color="CButtonHilight" alpha="1" x="0" y="1" width="1" height="height-5"/>
+		<tint color="CButtonHilight" alpha="0.7" x="4" y="height-3" width="1" height="1"/>
+		<tint color="CButtonHilight" alpha="0.25" x="5" y="height-4" width="1" height="1"/>
+		<tint color="CButtonHilight" alpha="0.25" x="3" y="height-3" width="1" height="1"/>
+		<tint color="CButtonHilight" alpha="0.8" x="3" y="height-4" width="1" height="1"/>
+		<tint color="CButtonHilight" alpha="0.5" x="2" y="height-4" width="1" height="1"/>
+		<tint color="CButtonHilight" alpha="0.8" x="2" y="height-5" width="1" height="1"/>
+		<tint color="CButtonHilight" alpha="0.7" x="1" y="height-6" width="1" height="1"/>
+		<tint color="CButtonHilight" alpha="0.25" x="1" y="height-5" width="1" height="1"/>
+		<tint color="CButtonHilight" alpha="0.25" x="2" y="height-6" width="1" height="1"/>
+		<tint color="CButtonHilight" alpha="1" x="1" y="1" width="1" height="height-7"/>
 
 		<!-- shadow -->
-		<tint color="#000000" alpha="0.025" x="4" y="height-3" width="1" height="1"/>
-		<tint color="#000000" alpha="0.08" x="3" y="height-3" width="1" height="1"/>
-		<tint color="#000000" alpha="0.05" x="2" y="height-3" width="1" height="1"/>
-		<tint color="#000000" alpha="0.08" x="2" y="height-4" width="1" height="1"/>
-		<tint color="#000000" alpha="0.07" x="1" y="height-5" width="1" height="1"/>
-		<tint color="#000000" alpha="0.025" x="1" y="height-4" width="1" height="1"/>
-		<tint color="#000000" alpha="0.025" x="2" y="height-5" width="1" height="1"/>
-		<tint color="#000000" alpha="0.08" x="1" y="0" width="1" height="height-5"/>
+		<tint color="#000000" alpha="0.025" x="5" y="height-5" width="1" height="1"/>
+		<tint color="#000000" alpha="0.08" x="4" y="height-5" width="1" height="1"/>
+		<tint color="#000000" alpha="0.05" x="3" y="height-5" width="1" height="1"/>
+		<tint color="#000000" alpha="0.08" x="3" y="height-6" width="1" height="1"/>
+		<tint color="#000000" alpha="0.07" x="2" y="height-7" width="1" height="1"/>
+		<tint color="#000000" alpha="0.025" x="2" y="height-6" width="1" height="1"/>
+		<tint color="#000000" alpha="0.025" x="3" y="height-7" width="1" height="1"/>
+		<tint color="#000000" alpha="0.08" x="2" y="0" width="1" height="height-7"/>
 
 		<!-- corner AA -->
-		<tint color="CButtonBorder" alpha="0.7" x="3" y="height-2" width="1" height="1"/>
-		<tint color="CButtonBorder" alpha="0.25" x="3" y="height-3" width="1" height="1"/>
-		<tint color="CButtonBorder" alpha="0.25" x="2" y="height-2" width="1" height="1"/>
-		<tint color="CButtonBorder" alpha="0.8" x="2" y="height-3" width="1" height="1"/>
-		<tint color="CButtonBorder" alpha="0.5" x="1" y="height-3" width="1" height="1"/>
-		<tint color="CButtonBorder" alpha="0.8" x="1" y="height-4" width="1" height="1"/>
-		<tint color="CButtonBorder" alpha="0.7" x="0" y="height-5" width="1" height="1"/>
-		<tint color="CButtonBorder" alpha="0.25" x="0" y="height-4" width="1" height="1"/>
-		<tint color="CButtonBorder" alpha="0.25" x="1" y="height-5" width="1" height="1"/>
-<!--		<tint color="CButtonBorder" alpha="1" x="0" y="0" width="1" height="height-5"/> -->
-		<gradient type="vertical" x="0" y="0" width="1" height="height-5">
+		<tint color="CButtonBorder" alpha="0.7" x="4" y="height-4" width="1" height="1"/>
+		<tint color="CButtonBorder" alpha="0.25" x="4" y="height-5" width="1" height="1"/>
+		<tint color="CButtonBorder" alpha="0.25" x="3" y="height-4" width="1" height="1"/>
+		<tint color="CButtonBorder" alpha="0.8" x="3" y="height-5" width="1" height="1"/>
+		<tint color="CButtonBorder" alpha="0.5" x="2" y="height-5" width="1" height="1"/>
+		<tint color="CButtonBorder" alpha="0.8" x="2" y="height-6" width="1" height="1"/>
+		<tint color="CButtonBorder" alpha="0.7" x="1" y="height-7" width="1" height="1"/>
+		<tint color="CButtonBorder" alpha="0.25" x="1" y="height-6" width="1" height="1"/>
+		<tint color="CButtonBorder" alpha="0.25" x="2" y="height-7" width="1" height="1"/>
+		<gradient type="vertical" x="1" y="0" width="1" height="height-7">
 			<color value="CBorderFocused" />
 			<color value="CButtonBorder" />
 		</gradient>
+<!--		<tint color="CButtonBorder" alpha="1" x="0" y="0" width="1" height="height-5"/> -->
 	</draw_ops>
 
 	<draw_ops name="button_bg_focused_inner_right">
@@ -472,19 +462,19 @@
 	<draw_ops name="button_bg_focused_inner_right_max">
 		<include name="button_bg_focused_clipped_max" />
 		<include name="right_left_button_rounded_corner" />
-		<tint color="blend/#000000/gtk:bg[NORMAL]/0.7" alpha="1" x="0" y="0" width="1" height="1" />
+		<!-- <tint color="blend/#000000/gtk:bg[NORMAL]/0.7" alpha="1" x="0" y="0" width="1" height="1" /> -->
 	</draw_ops>
 
 	<draw_ops name="button_bg_prelight_inner_right_max">
 		<include name="button_bg_prelight_clipped_max" />
 		<include name="right_left_button_rounded_corner" />
-		<tint color="blend/#000000/gtk:bg[NORMAL]/0.7" alpha="1" x="0" y="0" width="1" height="1" />
+		<!-- <tint color="blend/#000000/gtk:bg[NORMAL]/0.7" alpha="1" x="0" y="0" width="1" height="1" /> -->
 	</draw_ops>
 
 	<draw_ops name="button_bg_pressed_inner_right_max">
 		<include name="button_bg_pressed_clipped_max" />
 		<include name="right_left_button_rounded_corner" />
-		<tint color="blend/#000000/gtk:bg[NORMAL]/0.7" alpha="1" x="0" y="0" width="1" height="1" />
+		<!-- <tint color="blend/#000000/gtk:bg[NORMAL]/0.7" alpha="1" x="0" y="0" width="1" height="1" /> -->
 	</draw_ops>
 
 	<draw_ops name="button_bg_focused_single_right">
@@ -511,94 +501,94 @@
   <!-- Close Buttons -->
 	<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+1" x2="width-((width-width%3)/3)-2" y2="height-((height-height%3)/3)-2+1+1" />
-		<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)-2+1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-width%3)/3" y1="(height-height%3)/3+1+1+1" x2="width-((width-width%3)/3)-2-1" y2="height-((height-height%3)/3)-2+1+1" />
-		<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" y2="height-((height-height%3)/3)-2+1+1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-width%3)/3)-2-1" y1="(height-height%3)/3+1+1" x2="(width-width%3)/3" y2="height-((height-height%3)/3)-2+1-1+1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-width%3)/3)-2" y1="(height-height%3)/3+1+1+1" x2="(width-width%3)/3+1" y2="height-((height-height%3)/3)-2+1+1" />
+		<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" />
 
 		<!-- glyph -->
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x1="(width-width%3)/3" y1="(height-height%3)/3+1" x2="width-((width-width%3)/3)-2" y2="height-((height-height%3)/3)-2+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.3" 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/#ffffff/gtk:bg[NORMAL]/0.3" x1="(width-width%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-width%3)/3)-2-1" y2="height-((height-height%3)/3)-2+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x1="width-((width-width%3)/3)-2" y1="(height-height%3)/3+1" x2="(width-width%3)/3" y2="height-((height-height%3)/3)-2+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x1="width-((width-width%3)/3)-2-1" y1="(height-height%3)/3+1" x2="(width-width%3)/3" y2="height-((height-height%3)/3)-2+1-1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.3" 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)-2+1" />
+		<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_single">
 		<!-- shadow -->
-		<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+1" y2="height-((height-height%3)/3)-2+1+1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-width%3)/3+1+1" y1="(height-height%3)/3+1+1" x2="width-((width-width%3)/3)-2+1" y2="height-((height-height%3)/3)-2+1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="(width-width%3)/3+1" y1="(height-height%3)/3+1+1+1" x2="width-((width-width%3)/3)-2-1+1" y2="height-((height-height%3)/3)-2+1+1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-width%3)/3)-2+1" y1="(height-height%3)/3+1+1" x2="(width-width%3)/3+1" y2="height-((height-height%3)/3)-2+1+1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-width%3)/3)-2-1+1" y1="(height-height%3)/3+1+1" x2="(width-width%3)/3+1" y2="height-((height-height%3)/3)-2+1-1+1" />
-		<line color="blend/gtk:bg[NORMAL]/#000000/0.4" x1="width-((width-width%3)/3)-2+1" y1="(height-height%3)/3+1+1+1" x2="(width-width%3)/3+1+1" y2="height-((height-height%3)/3)-2+1+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)-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="blend/#ffffff/gtk:bg[NORMAL]/0.3" x1="(width-width%3)/3+1" y1="(height-height%3)/3+1" x2="width-((width-width%3)/3)-2+1" y2="height-((height-height%3)/3)-2+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x1="(width-width%3)/3+1+1" y1="(height-height%3)/3+1" x2="width-((width-width%3)/3)-2+1" y2="height-((height-height%3)/3)-2" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x1="(width-width%3)/3+1" y1="(height-height%3)/3+1+1" x2="width-((width-width%3)/3)-2-1+1" y2="height-((height-height%3)/3)-2+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x1="width-((width-width%3)/3)-2+1" y1="(height-height%3)/3+1" x2="(width-width%3)/3+1" y2="height-((height-height%3)/3)-2+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x1="width-((width-width%3)/3)-2-1+1" y1="(height-height%3)/3+1" x2="(width-width%3)/3+1" y2="height-((height-height%3)/3)-2+1-1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x1="width-((width-width%3)/3)-2+1" y1="(height-height%3)/3+1+1" x2="(width-width%3)/3+1+1" y2="height-((height-height%3)/3)-2+1" />
+		<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">
 		<!-- hilight -->
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x1="(width-width%3)/3" y1="(height-height%3)/3+1+1+1" x2="width-((width-width%3)/3)-2" y2="height-((height-height%3)/3)-2+1+1+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x1="(width-width%3)/3+1" y1="(height-height%3)/3+1+1+1" x2="width-((width-width%3)/3)-2" y2="height-((height-height%3)/3)-2+1+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x1="(width-width%3)/3" y1="(height-height%3)/3+1+1+1+1" x2="width-((width-width%3)/3)-2-1" y2="height-((height-height%3)/3)-2+1+1+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x1="width-((width-width%3)/3)-2" y1="(height-height%3)/3+1+1+1" x2="(width-width%3)/3" y2="height-((height-height%3)/3)-2+1+1+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x1="width-((width-width%3)/3)-2-1" y1="(height-height%3)/3+1+1+1" x2="(width-width%3)/3" y2="height-((height-height%3)/3)-2+1-1+1+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x1="width-((width-width%3)/3)-2" y1="(height-height%3)/3+1+1+1+1" x2="(width-width%3)/3+1" y2="height-((height-height%3)/3)-2+1+1+1" />
- 
-		<!-- glyph -->
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="(width-width%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-width%3)/3)-2" y2="height-((height-height%3)/3)-2+1+1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" 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)-2+1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="(width-width%3)/3" y1="(height-height%3)/3+1+1+1" x2="width-((width-width%3)/3)-2-1" y2="height-((height-height%3)/3)-2+1+1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="width-((width-width%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-width%3)/3" y2="height-((height-height%3)/3)-2+1+1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="width-((width-width%3)/3)-2-1" y1="(height-height%3)/3+1+1" x2="(width-width%3)/3" y2="height-((height-height%3)/3)-2+1-1+1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x1="width-((width-width%3)/3)-2" y1="(height-height%3)/3+1+1+1" x2="(width-width%3)/3+1" y2="height-((height-height%3)/3)-2+1+1" />
-
+		<line color="CTitleUnfocusedHilight" x1="(width-(width)%3)/3" y1="(height-height%3)/3+2" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)" />
+		<line color="CTitleUnfocusedHilight" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+2" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
+		<line color="CTitleUnfocusedHilight" x1="(width-(width)%3)/3" y1="(height-height%3)/3+3" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)" />
+		<line color="CTitleUnfocusedHilight" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+2" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)" />
+		<line color="CTitleUnfocusedHilight" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+2" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
+		<line color="CTitleUnfocusedHilight" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+3" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)" />
+
+		<!-- 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">
 		<!-- hilight -->
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x1="(width-width%3)/3" y1="(height-height%3)/3+1+1+1" x2="width-((width-width%3)/3)-2" y2="height-((height-height%3)/3)-2+1+1+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x1="(width-width%3)/3+1" y1="(height-height%3)/3+1+1+1" x2="width-((width-width%3)/3)-2" y2="height-((height-height%3)/3)-2+1+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x1="(width-width%3)/3" y1="(height-height%3)/3+1+1+1+1" x2="width-((width-width%3)/3)-2-1" y2="height-((height-height%3)/3)-2+1+1+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x1="width-((width-width%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-width%3)/3" y2="height-((height-height%3)/3)-2+1+1+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x1="width-((width-width%3)/3)-2-1" y1="(height-height%3)/3+1+1+1" x2="(width-width%3)/3" y2="height-((height-height%3)/3)-2+1-1+1+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x1="width-((width-width%3)/3)-2" y1="(height-height%3)/3+1+1+1+1" x2="(width-width%3)/3+1" y2="height-((height-height%3)/3)-2+1+1+1" />
-
-		<!-- glyph -->
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.85" x1="(width-width%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-width%3)/3)-2" y2="height-((height-height%3)/3)-2+1+1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.85" 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)-2+1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.85" x1="(width-width%3)/3" y1="(height-height%3)/3+1+1+1" x2="width-((width-width%3)/3)-2-1" y2="height-((height-height%3)/3)-2+1+1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.85" x1="width-((width-width%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-width%3)/3" y2="height-((height-height%3)/3)-2+1+1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.85" x1="width-((width-width%3)/3)-2-1" y1="(height-height%3)/3+1+1" x2="(width-width%3)/3" y2="height-((height-height%3)/3)-2+1-1+1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.85" x1="width-((width-width%3)/3)-2" y1="(height-height%3)/3+1+1+1" x2="(width-width%3)/3+1" y2="height-((height-height%3)/3)-2+1+1" />
+		<line color="CTitleUnfocusedHilight" x1="(width-(width)%3)/3" y1="(height-height%3)/3+2" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)" />
+		<line color="CTitleUnfocusedHilight" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+2" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
+		<line color="CTitleUnfocusedHilight" x1="(width-(width)%3)/3" y1="(height-height%3)/3+3" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)" />
+		<line color="CTitleUnfocusedHilight" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+2" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)" />
+		<line color="CTitleUnfocusedHilight" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+2" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
+		<line color="CTitleUnfocusedHilight" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+3" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)" />
+
+		<!-- 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">
 		<!-- hilight -->
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x1="(width-width%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-width%3)/3)-2" y2="height-((height-height%3)/3)-2+1+1+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" 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)-2+1+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x1="(width-width%3)/3" y1="(height-height%3)/3+1+1+1" x2="width-((width-width%3)/3)-2-1" y2="height-((height-height%3)/3)-2+1+1+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x1="width-((width-width%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-width%3)/3" y2="height-((height-height%3)/3)-2+1+1+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x1="width-((width-width%3)/3)-2-1" y1="(height-height%3)/3+1+1" x2="(width-width%3)/3" y2="height-((height-height%3)/3)-2+1-1+1+1" />
-		<line color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x1="width-((width-width%3)/3)-2" y1="(height-height%3)/3+1+1+1" x2="(width-width%3)/3+1" y2="height-((height-height%3)/3)-2+1+1+1" />
-
-		<!-- glyph -->
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.7" x1="(width-width%3)/3" y1="(height-height%3)/3+1+1" x2="width-((width-width%3)/3)-2" y2="height-((height-height%3)/3)-2+1+1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.7" 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)-2+1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.7" x1="(width-width%3)/3" y1="(height-height%3)/3+1+1+1" x2="width-((width-width%3)/3)-2-1" y2="height-((height-height%3)/3)-2+1+1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.7" x1="width-((width-width%3)/3)-2" y1="(height-height%3)/3+1+1" x2="(width-width%3)/3" y2="height-((height-height%3)/3)-2+1+1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.7" x1="width-((width-width%3)/3)-2-1" y1="(height-height%3)/3+1+1" x2="(width-width%3)/3" y2="height-((height-height%3)/3)-2+1-1+1" />
-		<line color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.7" x1="width-((width-width%3)/3)-2" y1="(height-height%3)/3+1+1+1" x2="(width-width%3)/3+1" y2="height-((height-height%3)/3)-2+1+1" />
+		<line color="CTitleUnfocusedHilight" x1="(width-(width)%3)/3" y1="(height-height%3)/3+2" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)" />
+		<line color="CTitleUnfocusedHilight" x1="(width-(width)%3)/3+1" y1="(height-height%3)/3+2" x2="width-((width-(width)%3)/3)-2" y2="height-((height-height%3)/3)-1" />
+		<line color="CTitleUnfocusedHilight" x1="(width-(width)%3)/3" y1="(height-height%3)/3+3" x2="width-((width-(width)%3)/3)-3" y2="height-((height-height%3)/3)" />
+		<line color="CTitleUnfocusedHilight" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+2" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)" />
+		<line color="CTitleUnfocusedHilight" x1="width-((width-(width)%3)/3)-3" y1="(height-height%3)/3+2" x2="(width-(width)%3)/3" y2="height-((height-height%3)/3)-1" />
+		<line color="CTitleUnfocusedHilight" x1="width-((width-(width)%3)/3)-2" y1="(height-height%3)/3+3" x2="(width-(width)%3)/3+1" y2="height-((height-height%3)/3)" />
+
+		<!-- 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>
 
 
@@ -611,88 +601,70 @@
 		-->
 	
 		<!-- shadow -->
-		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+1" y="(height-height%3)/3+1+1" width="width-2*((width-width%3)/3)-1-2" height="height-2*((height-height%3)/3)-1-2"/>
-		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+2" y="(height-height%3)/3+2+1" width="width-2*((width-width%3)/3)-1-4" height="height-2*((height-height%3)/3)-1-4"/>
+		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+2" 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+3" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
 		<!-- glyph -->
-		<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x="(width-width%3)/3+1" y="(height-height%3)/3+1" width="width-2*((width-width%3)/3)-1-2" height="height-2*((height-height%3)/3)-1-2"/>
-		<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x="(width-width%3)/3+2" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-1-4" height="height-2*((height-height%3)/3)-1-4"/>
+		<rectangle color="CIconFocused_normal" x="(width-width%3)/3+2" 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+3" 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="button_maximize_unfocused">
-		<!-- hiligth -->
-		<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x="(width-width%3)/3+1" y="(height-height%3)/3+1+1+1" width="width-2*((width-width%3)/3)-1-2" height="height-2*((height-height%3)/3)-1-2"/>
-		<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x="(width-width%3)/3+2" y="(height-height%3)/3+2+1+1" width="width-2*((width-width%3)/3)-1-4" height="height-2*((height-height%3)/3)-1-4"/>
+		<!-- hilight -->
+		<rectangle color="CTitleUnfocusedHilight" x="(width-width%3)/3+1+1" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
+		<rectangle color="CTitleUnfocusedHilight" x="(width-width%3)/3+2+1" y="(height-height%3)/3+3" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
 		<!-- glyph -->
-		<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x="(width-width%3)/3+1" y="(height-height%3)/3+1+1" width="width-2*((width-width%3)/3)-1-2" height="height-2*((height-height%3)/3)-1-2"/>
-		<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x="(width-width%3)/3+2" y="(height-height%3)/3+2+1" width="width-2*((width-width%3)/3)-1-4" height="height-2*((height-height%3)/3)-1-4"/>
+		<rectangle color="CIconUnfocused_normal" x="(width-width%3)/3+1+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+1" 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">
-		<!-- hiligth -->
-		<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x="(width-width%3)/3+1" y="(height-height%3)/3+1+1+1" width="width-2*((width-width%3)/3)-1-2" height="height-2*((height-height%3)/3)-1-2"/>
-		<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x="(width-width%3)/3+2" y="(height-height%3)/3+2+1+1" width="width-2*((width-width%3)/3)-1-4" height="height-2*((height-height%3)/3)-1-4"/>
+		<!-- hilight -->
+		<rectangle color="CTitleUnfocusedHilight" x="(width-width%3)/3+1+1" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
+		<rectangle color="CTitleUnfocusedHilight" x="(width-width%3)/3+2+1" y="(height-height%3)/3+3" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
 		<!-- glyph -->
-		<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.85" x="(width-width%3)/3+1" y="(height-height%3)/3+1+1" width="width-2*((width-width%3)/3)-1-2" height="height-2*((height-height%3)/3)-1-2"/>
-		<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.85" x="(width-width%3)/3+2" y="(height-height%3)/3+2+1" width="width-2*((width-width%3)/3)-1-4" height="height-2*((height-height%3)/3)-1-4"/>
+		<rectangle color="CIconUnfocused_prelight" x="(width-width%3)/3+1+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+1" 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">
-		<!-- hiligth -->
-		<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x="(width-width%3)/3+1" y="(height-height%3)/3+1+1+1" width="width-2*((width-width%3)/3)-1-2" height="height-2*((height-height%3)/3)-1-2"/>
-		<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x="(width-width%3)/3+2" y="(height-height%3)/3+2+1+1" width="width-2*((width-width%3)/3)-1-4" height="height-2*((height-height%3)/3)-1-4"/>
+		<!-- hilight -->
+		<rectangle color="CTitleUnfocusedHilight" x="(width-width%3)/3+1+1" y="(height-height%3)/3+2" width="width-2*((width-width%3)/3)-3" height="height-2*((height-height%3)/3)-3"/>
+		<rectangle color="CTitleUnfocusedHilight" x="(width-width%3)/3+2+1" y="(height-height%3)/3+3" width="width-2*((width-width%3)/3)-5" height="height-2*((height-height%3)/3)-5"/>
 		<!-- glyph -->
-		<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.7" x="(width-width%3)/3+1" y="(height-height%3)/3+1+1" width="width-2*((width-width%3)/3)-1-2" height="height-2*((height-height%3)/3)-1-2"/>
-		<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.7" x="(width-width%3)/3+2" y="(height-height%3)/3+2+1" width="width-2*((width-width%3)/3)-1-4" height="height-2*((height-height%3)/3)-1-4"/>
+		<rectangle color="CIconUnfocused_pressed" x="(width-width%3)/3+1+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+1" 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">
 		<!-- shadow -->
-		<rectangle color="blend/gtk:bg[NORMAL]/#000000/0.4" x="(width-width%3)/3+2" y="height-((height-height%3)/3+1+1)+1" width="width-2*((width-width%3)/3)-1-4" height="1"/>
+		<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"/>
 		<!-- glyph -->
-		<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.3" x="(width-width%3)/3+2" y="height-((height-height%3)/3+1+1)" width="width-2*((width-width%3)/3)-1-4" height="1"/>
+		<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="button_minimize_unfocused">
-	<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x="(width/2.7)" y="height - (width/2.7) + 1+1" width="width - (width/2.7) * 2" height="2" filled="true"/>
-	<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.8" x="(width/2.7)" y="height - (width/2.7)+1" width="width - (width/2.7) * 2" height="2" filled="true"/>
+		<!-- hilight -->
+		<rectangle color="CTitleUnfocusedHilight" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)+1" width="width-2*((width-width%3)/3)-5" height="1"/>
+		<!-- 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">
-	<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x="(width/2.7)" y="height - (width/2.7) + 1+1" width="width - (width/2.7) * 2" height="2" filled="true"/>
-	<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.85" x="(width/2.7)" y="height - (width/2.7)+1" width="width - (width/2.7) * 2" height="2" filled="true"/>
+		<!-- hilight -->
+		<rectangle color="CTitleUnfocusedHilight" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)+1" width="width-2*((width-width%3)/3)-5" height="1"/>
+		<!-- 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">
-	<rectangle color="blend/#ffffff/gtk:bg[NORMAL]/0.9" x="(width/2.7)" y="height - (width/2.7) + 1+1" width="width - (width/2.7) * 2" height="2" filled="true"/>
-	<rectangle color="blend/gtk:fg[NORMAL]/gtk:bg[NORMAL]/0.7" x="(width/2.7)" y="height - (width/2.7)+1" width="width - (width/2.7) * 2" height="2" filled="true"/>
-  </draw_ops>
-
-  <draw_ops name="button_menu_normal">
-
-  </draw_ops>
-
-  <draw_ops name="button_menu_prelight">
-  </draw_ops>
-
-  <draw_ops name="button_menu_pressed">
-  </draw_ops>
-
-  <draw_ops name="button_menu_unfocused">
-  </draw_ops>
-
-  <draw_ops name="button_menu_unfocused_prelight">
-  </draw_ops>
-
-  <draw_ops name="button_menu_unfocused_pressed">
-  </draw_ops>
-
-  <draw_ops name="left_button_edge">
-
+		<!-- hilight -->
+		<rectangle color="CTitleUnfocusedHilight" x="(width-width%3)/3+3" y="height-((height-height%3)/3+2)+1" width="width-2*((width-width%3)/3)-5" height="1"/>
+		<!-- 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"> 
@@ -874,16 +846,36 @@
 	<button function="close" state="pressed" draw_ops="icon_close_single"/>
 </frame_style>
 
-  <frame_style name="utility_unfocused" geometry="utility" parent="normal_unfocused"> 
+<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>
 
-     <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="menu" state="normal" draw_ops="button_menu_unfocused"/>
-     <button function="menu" state="prelight" draw_ops="button_menu_unfocused_prelight"/>
-     <button function="menu" state="pressed" draw_ops="button_menu_unfocused_pressed"/>
 
-  </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>
+
+<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>
 
   <!-- frame style sets -->
 
@@ -921,6 +913,24 @@
 
   </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"/>
@@ -941,8 +951,8 @@
   <!-- window types -->
 
   <window type="normal" style_set="normal"/>
-  <window type="dialog" style_set="utility"/>
-  <window type="modal_dialog" style_set="utility"/>
+  <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"/>
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]