Merge lp:~greasedbolt/dusttheme/0.5r10 into lp:dusttheme

[Kido]

A few visual changes; check changelog.

I'm not sure how to get access to the branch so I'm merging this instead.

[James Schriver (dashua)]

Looks good, Kido.

[James Schriver (dashua)]

review: Approve

=== added directory 'Dust Bordered'
=== added directory 'Dust Bordered/metacity-1'
=== added file 'Dust Bordered/metacity-1/button_1_bg.png'
Binary files Dust Bordered/metacity-1/button_1_bg.png	1970-01-01 00:00:00 +0000 and Dust Bordered/metacity-1/button_1_bg.png	2010-06-29 02:48:26 +0000 differ
=== added file 'Dust Bordered/metacity-1/button_2_bg.png'
Binary files Dust Bordered/metacity-1/button_2_bg.png	1970-01-01 00:00:00 +0000 and Dust Bordered/metacity-1/button_2_bg.png	2010-06-29 02:48:26 +0000 differ
=== added file 'Dust Bordered/metacity-1/button_3_bg.png'
Binary files Dust Bordered/metacity-1/button_3_bg.png	1970-01-01 00:00:00 +0000 and Dust Bordered/metacity-1/button_3_bg.png	2010-06-29 02:48:26 +0000 differ
=== added file 'Dust Bordered/metacity-1/button_3_bg_real.png'
Binary files Dust Bordered/metacity-1/button_3_bg_real.png	1970-01-01 00:00:00 +0000 and Dust Bordered/metacity-1/button_3_bg_real.png	2010-06-29 02:48:26 +0000 differ
=== added file 'Dust Bordered/metacity-1/button_close_normal.png'
Binary files Dust Bordered/metacity-1/button_close_normal.png	1970-01-01 00:00:00 +0000 and Dust Bordered/metacity-1/button_close_normal.png	2010-06-29 02:48:26 +0000 differ
=== added file 'Dust Bordered/metacity-1/button_close_prelight.png'
Binary files Dust Bordered/metacity-1/button_close_prelight.png	1970-01-01 00:00:00 +0000 and Dust Bordered/metacity-1/button_close_prelight.png	2010-06-29 02:48:26 +0000 differ
=== added file 'Dust Bordered/metacity-1/button_close_pressed.png'
Binary files Dust Bordered/metacity-1/button_close_pressed.png	1970-01-01 00:00:00 +0000 and Dust Bordered/metacity-1/button_close_pressed.png	2010-06-29 02:48:26 +0000 differ
=== added file 'Dust Bordered/metacity-1/button_max_normal.png'
Binary files Dust Bordered/metacity-1/button_max_normal.png	1970-01-01 00:00:00 +0000 and Dust Bordered/metacity-1/button_max_normal.png	2010-06-29 02:48:26 +0000 differ
=== added file 'Dust Bordered/metacity-1/button_max_prelight.png'
Binary files Dust Bordered/metacity-1/button_max_prelight.png	1970-01-01 00:00:00 +0000 and Dust Bordered/metacity-1/button_max_prelight.png	2010-06-29 02:48:26 +0000 differ
=== added file 'Dust Bordered/metacity-1/button_max_pressed.png'
Binary files Dust Bordered/metacity-1/button_max_pressed.png	1970-01-01 00:00:00 +0000 and Dust Bordered/metacity-1/button_max_pressed.png	2010-06-29 02:48:26 +0000 differ
=== added file 'Dust Bordered/metacity-1/button_min_normal.png'
Binary files Dust Bordered/metacity-1/button_min_normal.png	1970-01-01 00:00:00 +0000 and Dust Bordered/metacity-1/button_min_normal.png	2010-06-29 02:48:26 +0000 differ
=== added file 'Dust Bordered/metacity-1/button_min_prelight.png'
Binary files Dust Bordered/metacity-1/button_min_prelight.png	1970-01-01 00:00:00 +0000 and Dust Bordered/metacity-1/button_min_prelight.png	2010-06-29 02:48:26 +0000 differ
=== added file 'Dust Bordered/metacity-1/button_min_pressed.png'
Binary files Dust Bordered/metacity-1/button_min_pressed.png	1970-01-01 00:00:00 +0000 and Dust Bordered/metacity-1/button_min_pressed.png	2010-06-29 02:48:26 +0000 differ
=== added file 'Dust Bordered/metacity-1/menu.png'
Binary files Dust Bordered/metacity-1/menu.png	1970-01-01 00:00:00 +0000 and Dust Bordered/metacity-1/menu.png	2010-06-29 02:48:26 +0000 differ
=== added file 'Dust Bordered/metacity-1/metacity-theme-1.xml'
--- Dust Bordered/metacity-1/metacity-theme-1.xml	1970-01-01 00:00:00 +0000
+++ Dust Bordered/metacity-1/metacity-theme-1.xml	2010-06-29 02:48:26 +0000
@@ -0,0 +1,558 @@
+<?xml version="1.0"?>
+
+<metacity_theme>
+<info>
+    <name>Dust Earth</name>
+    <author>Kido Mariano, Rico Sta. Cruz, James Schriver</author>
+    <copyright>GPL</copyright>
+    <date>Mar 30, 2010</date>
+    <description>Metacity theme</description>
+</info>
+
+
+<!--
+    General window layout (geometric stuff)
+-->
+<frame_geometry name="frame_geometry_normal" title_scale="medium" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="true" rounded_bottom_right="true">
+    <distance name="left_width" value="6"/>
+    <distance name="right_width" value="6"/>
+    <distance name="bottom_height" value="4"/>
+    <distance name="left_titlebar_edge" value="6"/>
+    <distance name="right_titlebar_edge" value="6"/>
+    <distance name="button_width" value="28"/>
+    <distance name="button_height" value="20"/>
+    <distance name="title_vertical_pad" value="1"/>
+    <border name="title_border" left="2" right="2" top="3" bottom="0"/>
+    <border name="button_border" left="0" right="0" top="2" bottom="1"/>
+</frame_geometry>
+
+<frame_geometry name="frame_geometry_abnormal" title_scale="medium" 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="left_titlebar_edge" value="1"/>
+    <distance name="right_titlebar_edge" value="2"/>
+    <distance name="button_width" value="28"/>
+    <distance name="button_height" value="20"/>
+    <distance name="title_vertical_pad" value="0"/>
+    <border name="title_border" left="0" right="0" top="3" bottom="0"/>
+    <border name="button_border" left="0" right="0" top="2" bottom="1"/>
+</frame_geometry>
+
+
+
+<!--
+    Window Title
+-->
+
+<draw_ops name="draw_title_text_normal">
+    <title x="1" y="(height - title_height) / 2 + 1" color="#2F2E2B"/>
+    <title x="0" y="(height - title_height) / 2" color="#FFFFFF"/>
+</draw_ops>
+
+<draw_ops name="draw_title_text_inactive">
+    <title x="0" y="(height - title_height) / 2" color="#727262"/>
+</draw_ops>
+
+<!--Centered titlebar text--><!--
+<draw_ops name="draw_title_text_normal">
+    <icon x="(width-title_width)/2" y="(height - title_height) / 2" width="mini_icon_width" height="mini_icon_height"/>
+    <title x="(width-title_width)/2 + mini_icon_width + 3" y="(height - title_height) / 2 + 1" color="#2F2E2B"/>
+    <title x="(width-title_width)/2 + mini_icon_width + 2" y="(height - title_height) / 2" color="#FFFFFF"/>
+</draw_ops>
+
+<draw_ops name="draw_title_text_inactive">
+    <icon x="(width-title_width)/2" y="(height - title_height) / 2" width="mini_icon_width" height="mini_icon_height" alpha="0.5"/>
+    <title x="(width-title_width)/2 + mini_icon_width + 2" y="(height - title_height) / 2" color="#727262"/>
+</draw_ops>-->
+
+ 
+
+<!--
+    Construct titlebar from rectangles instead so we can pick up the GTK theme
+-->
+
+<draw_ops name="draw_title">
+    <!-- Background gradient -->
+    <gradient type="vertical" x="0" y="0" width="width+9" height="height">
+        <!--<color value="#80594D"/>-->
+        <color value="shade/gtk:bg[SELECTED]/0.8"/>
+        <!--Static colors to match static menubar and all-->
+        <color value="#3F3E39" />
+        <color value="#3A3936" />
+        <color value="#373633" />
+        <color value="#343330" />
+    </gradient>
+    
+    <!-- Topmost dark line (not static is shade:0.30) -->
+    <line color="#403F3A" x1="0" x2="width" y1="0" y2="0"/>
+    
+    <!-- Darkening of the left arch -->
+    <line color="#403F3A" x1="0" x2="4" y1="1" y2="1"/>
+    <line color="#403F3A" x1="0" x2="2" y1="2" y2="2"/>
+    <line color="#403F3A" x1="0" x2="1" y1="3" y2="3"/>
+    <line color="#403F3A" x1="0" x2="1" y1="4" y2="4"/>
+    <line color="#403F3A" x1="0" x2="0" y1="5" y2="20"/>
+    
+    <!-- Sides -->
+    <gradient type="horizontal" x="0" y="0" width="6" height="height">
+        <color value="shade/gtk:bg[NORMAL]/0.5"/>
+        <color value="shade/gtk:bg[NORMAL]/0.7"/>
+    </gradient> 
+    <gradient type="horizontal" x="width-6" y="0" width="6" height="height">
+        <color value="shade/gtk:bg[NORMAL]/0.7"/>
+        <color value="shade/gtk:bg[NORMAL]/0.5"/>
+    </gradient> 
+    
+    <!-- Top highlight -->
+    <!-- This uses <tint> (which supports alpha) instead of <line> (which doesn't) -->
+    <tint color="#ffffff" alpha="0.35" x="5" y="1" width="width - 10" height="1"/> 
+    
+    <!-- Upper-left highlight -->
+    <!-- Draw each pixel one by one. Again, using <tint> for alpha support. -->
+    <tint color="#ffffff" alpha="0.30" x="3" y="2"  width="2" height="1"/> 
+    <tint color="#ffffff" alpha="0.27" x="2" y="3"  width="1" height="1"/> 
+    <tint color="#ffffff" alpha="0.24" x="2" y="4"  width="1" height="1"/> 
+    <tint color="#ffffff" alpha="0.21" x="1" y="5"  width="1" height="1"/> 
+    <tint color="#ffffff" alpha="0.18" x="1" y="6"  width="1" height="1"/> 
+    <tint color="#ffffff" alpha="0.15" x="1" y="7"  width="1" height="1"/> 
+    <tint color="#ffffff" alpha="0.12" x="1" y="8"  width="1" height="1"/> 
+    <tint color="#ffffff" alpha="0.09" x="1" y="9"  width="1" height="1"/> 
+    <tint color="#ffffff" alpha="0.06" x="1" y="10" width="1" height="1"/> 
+    <tint color="#ffffff" alpha="0.03" x="1" y="11" width="1" height="1"/>
+    
+    <tint color="#ffffff" alpha="0.15" x="4" y="1" width="1" height="height"/>
+    
+    <!-- Upper-right highlight -->
+    <!-- Same as above. -->
+    <tint color="#ffffff" alpha="0.30" x="width-5" y="2"  width="2" height="1"/> 
+    <tint color="#ffffff" alpha="0.27" x="width-3" y="3"  width="1" height="1"/> 
+    <tint color="#ffffff" alpha="0.24" x="width-3" y="4"  width="1" height="1"/> 
+    <tint color="#ffffff" alpha="0.21" x="width-2" y="5"  width="1" height="1"/> 
+    <tint color="#ffffff" alpha="0.18" x="width-2" y="6"  width="1" height="1"/> 
+    <tint color="#ffffff" alpha="0.15" x="width-2" y="7"  width="1" height="1"/> 
+    <tint color="#ffffff" alpha="0.12" x="width-2" y="8"  width="1" height="1"/> 
+    <tint color="#ffffff" alpha="0.09" x="width-2" y="9"  width="1" height="1"/> 
+    <tint color="#ffffff" alpha="0.06" x="width-2" y="10" width="1" height="1"/> 
+    <tint color="#ffffff" alpha="0.03" x="width-2" y="11" width="1" height="1"/> 
+    
+    <tint color="#ffffff" alpha="0.15" x="width-5" y="1" width="1" height="height"/>
+    
+</draw_ops>
+
+<draw_ops name="draw_title_inactive">
+    <!-- Background gradient -->
+    <gradient type="vertical" x="0" y="0" width="width+9" height="height">
+        <color value="#3A3936" />
+        <color value="#343330" />
+    </gradient>
+        
+    <!-- Topmost dark line -->
+    <line color="#343330" x1="1" x2="width-2" y1="0" y2="0"/>
+    <!-- Top highlight -->
+    <tint color="#ffffff" alpha="0.2" x="5" y="1" width="width - 10" height="1"/> 
+    
+     <!-- Sides -->
+    <gradient type="horizontal" x="0" y="0" width="6" height="height">
+        <color value="shade/gtk:bg[NORMAL]/0.5"/>
+        <color value="shade/gtk:bg[NORMAL]/0.7"/>
+    </gradient> 
+    <gradient type="horizontal" x="width-6" y="0" width="6" height="height">
+        <color value="shade/gtk:bg[NORMAL]/0.7"/>
+        <color value="shade/gtk:bg[NORMAL]/0.5"/>
+    </gradient> 
+    
+    <!-- Upper left highlight -->
+    <!--line color="#464542" x1="3" x2 ="4" y1="2" y2="2" />
+    <line color="#444340" x1="2" x2 ="2" y1="3" y2="4" /-->
+    
+    <!-- Upper left higlight fade -->
+    <!--gradient type="vertical" x="1" y="5" width="1" height="title_height - 4">
+        <color value="#403F3A"/>
+        <color value="#343330"/>
+    </gradient--> 
+    
+    <!-- Upper right highlight -->
+    <!--line color="#403F3A" x1="width-5" x2 ="width-4" y1="2" y2="2" />
+    <line color="#403F3A" x1="width-3" x2 ="width-3" y1="3" y2="4" /-->
+    
+    <!-- Upper right higlight fade -->
+    <!--gradient type="vertical" x="width-2" y="5" width="1" height="title_height - 4">
+        <color value="#403F3A"/>
+        <color value="#343330"/>
+    </gradient--> 
+</draw_ops>
+
+<draw_ops name="draw_title_maximized">
+    <!-- Background gradient -->
+    <gradient type="vertical" x="0" y="0" width="width+9" height="height">
+        <!--<color value="#80594D"/>-->
+        <color value="shade/gtk:bg[SELECTED]/0.6"/>
+        <color value="shade/gtk:bg[NORMAL]/0.29" />
+        <color value="shade/gtk:bg[NORMAL]/0.27" />
+        <color value="shade/gtk:bg[NORMAL]/0.25" />
+        <color value="shade/gtk:bg[NORMAL]/0.24" />
+    </gradient>
+    
+    <!-- Topmost dark line -->
+    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="width" y1="0" y2="0"/>
+    
+    <!-- Top highlight -->
+    <!-- This uses <tint> (which supports alpha) instead of <line> (which doesn't) -->
+    <tint color="#ffffff" alpha="0.35" x="1" y="1" width="width - 2" height="1"/> 
+    
+</draw_ops>
+
+<draw_ops name="draw_title_maximized_inactive">
+    <!-- Background gradient -->
+    <gradient type="vertical" x="0" y="0" width="width+9" height="height">
+        <!--<color value="#80594D"/>-->
+        <color value="shade/gtk:bg[NORMAL]/0.27" />
+        <color value="shade/gtk:bg[NORMAL]/0.24" />
+    </gradient>
+    
+    <!-- Topmost dark line -->
+    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="width" y1="0" y2="0"/>
+    
+    <!-- Top highlight -->
+    <!-- This uses <tint> (which supports alpha) instead of <line> (which doesn't) -->
+    <tint color="#ffffff" alpha="0.35" x="1" y="1" width="width - 2" height="1"/> 
+    
+</draw_ops>
+
+<!--
+    The frame around windows
+-->
+
+<draw_ops name="left_edge">
+    <gradient type="horizontal" x="0" y="0" width="width" height="height">
+        <color value="shade/gtk:bg[NORMAL]/0.5"/>
+        <color value="shade/gtk:bg[NORMAL]/0.7"/>
+    </gradient>
+    <tint color="#ffffff" alpha="0.15" x="width-2" y="0" width="1" height="height"/>
+</draw_ops>
+
+<draw_ops name="right_edge">
+    <gradient type="horizontal" x="0" y="0" width="width" height="height">
+        <color value="shade/gtk:bg[NORMAL]/0.7"/>
+        <color value="shade/gtk:bg[NORMAL]/0.5"/>
+    </gradient>
+    <tint color="#ffffff" alpha="0.15" x="1" y="0" width="1" height="height"/>
+</draw_ops>
+
+<draw_ops name="bottom_edge">
+    <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true"/>
+    
+    <!-- Sides -->
+    
+    <gradient type="horizontal" x="0" y="0" width="6" height="height">
+        <color value="shade/gtk:bg[NORMAL]/0.5"/>
+        <color value="shade/gtk:bg[NORMAL]/0.7"/>
+    </gradient> 
+    <gradient type="horizontal" x="width-6" y="0" width="6" height="height">
+        <color value="shade/gtk:bg[NORMAL]/0.7"/>
+        <color value="shade/gtk:bg[NORMAL]/0.5"/>
+    </gradient>
+    
+    <!-- White corner arches -->
+    
+    <tint color="#343330" alpha="0.55" x="0" y="height-1" width="width" height="1"/>
+    
+</draw_ops>
+
+
+<!--
+    Buttons
+-->
+<!-- close button-->
+<draw_ops name="button_close_normal">
+    <image filename="button_close_normal.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="button_close_prelight">
+    <image filename="button_close_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="button_close_inactive_prelight">
+    <image filename="button_close_prelight.png" x="0" y="1" width="object_width" height="object_height" alpha="0.3"/>
+</draw_ops>
+<draw_ops name="button_close_pressed">
+    <image filename="button_close_pressed.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="button_close_inactive">
+    <image filename="button_close_normal.png" x="0" y="1" width="object_width" height="object_height" alpha="0.3"/>
+</draw_ops>
+
+<!-- maximize button-->
+<draw_ops name="button_max_normal">
+    <image filename="button_max_normal.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="button_max_prelight">
+    <image filename="button_max_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="button_max_inactive_prelight">
+    <image filename="button_max_prelight.png" x="0" y="1" width="object_width" height="object_height" alpha="0.3"/>
+</draw_ops>
+<draw_ops name="button_max_pressed">
+    <image filename="button_max_pressed.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="button_max_inactive">
+    <image filename="button_max_normal.png" x="0" y="1" width="object_width" height="object_height" alpha="0.3"/>
+</draw_ops>
+
+<!-- minimize button-->
+<draw_ops name="button_min_normal">
+    <image filename="button_min_normal.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="button_min_prelight">
+    <image filename="button_min_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="button_min_inactive_prelight">
+    <image filename="button_min_prelight.png" x="0" y="1" width="object_width" height="object_height" alpha="0.3"/>
+</draw_ops>
+<draw_ops name="button_min_pressed">
+    <image filename="button_min_pressed.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="button_min_inactive">
+    <image filename="button_min_normal.png" x="0" y="1" width="object_width" height="object_height" alpha="0.3"/>
+</draw_ops>
+
+<!-- menu icon -->
+<draw_ops name="button_menu_normal">
+<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height"/>
+</draw_ops>
+<draw_ops name="button_menu_prelight">
+<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height"/>
+</draw_ops>
+<draw_ops name="button_menu_inactive_prelight">
+<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height" alpha="0.3"/>
+</draw_ops>
+<draw_ops name="button_menu_pressed">
+<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height"/>
+</draw_ops>
+<draw_ops name="button_menu_inactive">
+<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height" alpha="0.3"/>
+</draw_ops>
+
+<!-- Button background -->
+
+<!-- Button Border Left -->
+<draw_ops name="left_left_background_focused_normal">
+	<image filename="button_1_bg.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="left_left_background_focused_pressed">
+	<image filename="button_1_bg.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="left_middle_background_focused_normal">
+	<image filename="button_2_bg.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="left_middle_background_focused_pressed">
+	<image filename="button_2_bg.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="left_right_background_focused_normal">
+	<image filename="button_3_bg_real.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="left_right_background_focused_pressed">
+	<image filename="button_3_bg_real.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="left_left_background_unfocused_normal">
+	<image filename="button_1_bg.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="left_left_background_unfocused_pressed">
+	<image filename="button_1_bg.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="left_middle_background_unfocused_normal">
+	<image filename="button_2_bg.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="left_middle_background_unfocused_pressed">
+	<image filename="button_2_bg.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="left_right_background_unfocused_normal">
+	<image filename="button_3_bg_real.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="left_right_background_unfocused_pressed">
+	<image filename="button_3_bg_real.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+	
+<!-- Button Border Right -->
+<draw_ops name="right_left_background_focused_normal">
+	<image filename="button_1_bg.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="right_left_background_focused_pressed">
+	<image filename="button_1_bg.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="right_middle_background_focused_normal">
+	<image filename="button_2_bg.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="right_middle_background_focused_pressed">
+	<image filename="button_2_bg.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="right_right_background_focused_normal">
+	<image filename="button_3_bg_real.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="right_right_background_focused_pressed">
+	<image filename="button_3_bg_real.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="right_left_background_unfocused_normal">
+	<image filename="button_1_bg.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="right_left_background_unfocused_pressed">
+	<image filename="button_1_bg.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="right_middle_background_unfocused_normal">
+	<image filename="button_2_bg.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="right_middle_background_unfocused_pressed">
+	<image filename="button_2_bg.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="right_right_background_unfocused_normal">
+	<image filename="button_3_bg_real.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+<draw_ops name="right_right_background_unfocused_pressed">
+	<image filename="button_3_bg_real.png" x="0" y="1" width="object_width" height="object_height"/>
+</draw_ops>
+
+<!--
+    Frame styles
+-->
+
+<!-- normal -->
+<frame_style name="frame_style_normal_focused" geometry="frame_geometry_normal">
+   <piece position="title" draw_ops="draw_title_text_normal"/>
+   <piece position="titlebar" draw_ops="draw_title"/>
+   <piece position="left_edge" draw_ops="left_edge"/>
+   <piece position="right_edge" draw_ops="right_edge"/>
+   <piece position="bottom_edge" draw_ops="bottom_edge"/>
+   <button function="left_left_background" state="normal" draw_ops="left_left_background_focused_normal"/>
+   <button function="left_middle_background" state="normal" draw_ops="left_middle_background_focused_normal"/>
+   <button function="left_right_background" state="normal" draw_ops="left_right_background_focused_normal"/>
+   <button function="left_left_background" state="prelight" draw_ops="left_left_background_focused_normal"/>
+   <button function="left_middle_background" state="prelight" draw_ops="left_middle_background_focused_normal"/>
+   <button function="left_right_background" state="prelight" draw_ops="left_right_background_focused_normal"/>
+   <button function="left_left_background" state="pressed" draw_ops="left_left_background_focused_pressed"/>
+   <button function="left_middle_background" state="pressed" draw_ops="left_middle_background_focused_pressed"/>
+   <button function="left_right_background" state="pressed" draw_ops="left_right_background_focused_pressed"/>
+   <button function="right_left_background" state="normal" draw_ops="right_left_background_focused_normal"/>
+   <button function="right_middle_background" state="normal" draw_ops="right_middle_background_focused_normal"/>
+   <button function="right_right_background" state="normal" draw_ops="right_right_background_focused_normal"/>
+   <button function="right_left_background" state="prelight" draw_ops="right_left_background_focused_normal"/>
+   <button function="right_middle_background" state="prelight" draw_ops="right_middle_background_focused_normal"/>
+   <button function="right_right_background" state="prelight" draw_ops="right_right_background_focused_normal"/>
+   <button function="right_left_background" state="pressed" draw_ops="right_left_background_focused_pressed"/>
+   <button function="right_middle_background" state="pressed" draw_ops="right_middle_background_focused_pressed"/>
+   <button function="right_right_background" state="pressed" draw_ops="right_right_background_focused_pressed"/>
+   <button function="close" state="normal" draw_ops="button_close_normal"/>
+   <button function="close" state="prelight" draw_ops="button_close_prelight"/>
+   <button function="close" state="pressed" draw_ops="button_close_pressed"/>
+   <button function="minimize" state="normal" draw_ops="button_min_normal"/>
+   <button function="minimize" state="prelight" draw_ops="button_min_prelight"/>
+   <button function="minimize" state="pressed" draw_ops="button_min_pressed"/>
+   <button function="maximize" state="normal" draw_ops="button_max_normal"/>
+   <button function="maximize" state="prelight" draw_ops="button_max_prelight"/>
+   <button function="maximize" state="pressed" draw_ops="button_max_pressed"/>
+   <button function="menu" state="normal" draw_ops="button_menu_normal"/>
+   <button function="menu" state="prelight" draw_ops="button_menu_prelight"/>
+   <button function="menu" state="pressed" draw_ops="button_menu_pressed"/>
+</frame_style>
+
+<frame_style name="frame_style_normal_unfocused" geometry="frame_geometry_normal">
+   <piece position="title" draw_ops="draw_title_text_inactive"/>
+   <piece position="titlebar" draw_ops="draw_title_inactive"/>
+   <piece position="left_edge" draw_ops="left_edge"/>
+   <piece position="right_edge" draw_ops="right_edge"/>
+   <piece position="bottom_edge" draw_ops="bottom_edge"/>
+   <button function="left_left_background" state="normal" draw_ops="left_left_background_unfocused_normal"/>
+   <button function="left_middle_background" state="normal" draw_ops="left_middle_background_unfocused_normal"/>
+   <button function="left_right_background" state="normal" draw_ops="left_right_background_unfocused_normal"/>
+   <button function="left_left_background" state="prelight" draw_ops="left_left_background_unfocused_normal"/>
+   <button function="left_middle_background" state="prelight" draw_ops="left_middle_background_unfocused_normal"/>
+   <button function="left_right_background" state="prelight" draw_ops="left_right_background_unfocused_normal"/>
+   <button function="left_left_background" state="pressed" draw_ops="left_left_background_unfocused_pressed"/>
+   <button function="left_middle_background" state="pressed" draw_ops="left_middle_background_unfocused_pressed"/>
+   <button function="left_right_background" state="pressed" draw_ops="left_right_background_unfocused_pressed"/>
+   <button function="right_left_background" state="normal" draw_ops="right_left_background_unfocused_normal"/>
+   <button function="right_middle_background" state="normal" draw_ops="right_middle_background_unfocused_normal"/>
+   <button function="right_right_background" state="normal" draw_ops="right_right_background_unfocused_normal"/>
+   <button function="right_left_background" state="prelight" draw_ops="right_left_background_unfocused_normal"/>
+   <button function="right_middle_background" state="prelight" draw_ops="right_middle_background_unfocused_normal"/>
+   <button function="right_right_background" state="prelight" draw_ops="right_right_background_unfocused_normal"/>
+   <button function="right_left_background" state="pressed" draw_ops="right_left_background_unfocused_pressed"/>
+   <button function="right_middle_background" state="pressed" draw_ops="right_middle_background_unfocused_pressed"/>
+   <button function="right_right_background" state="pressed" draw_ops="right_right_background_unfocused_pressed"/>
+   <button function="close" state="normal" draw_ops="button_close_inactive"/>
+   <button function="close" state="prelight" draw_ops="button_close_inactive_prelight"/>
+   <button function="close" state="pressed" draw_ops="button_close_inactive"/>
+   <button function="minimize" state="normal" draw_ops="button_min_inactive"/>
+   <button function="minimize" state="prelight" draw_ops="button_min_inactive_prelight"/>
+   <button function="minimize" state="pressed" draw_ops="button_min_inactive"/>
+   <button function="maximize" state="normal" draw_ops="button_max_inactive"/>
+   <button function="maximize" state="prelight" draw_ops="button_max_inactive_prelight"/>
+   <button function="maximize" state="pressed" draw_ops="button_max_inactive"/>
+   <button function="menu" state="normal" draw_ops="button_menu_inactive"/>
+   <button function="menu" state="prelight" draw_ops="button_menu_inactive_prelight"/>
+   <button function="menu" state="pressed" draw_ops="button_menu_inactive"/>
+</frame_style>
+
+<frame_style name="frame_style_maximized_focused" geometry="frame_geometry_abnormal">
+   <piece position="title" draw_ops="draw_title_text_normal"/>
+   <piece position="titlebar" draw_ops="draw_title_maximized"/>
+   <piece position="left_edge" draw_ops="left_edge"/>
+   <piece position="right_edge" draw_ops="right_edge"/>
+   <piece position="bottom_edge" draw_ops="bottom_edge"/>
+   <button function="close" state="normal" draw_ops="button_close_normal"/>
+   <button function="close" state="prelight" draw_ops="button_close_prelight"/>
+   <button function="close" state="pressed" draw_ops="button_close_pressed"/>
+   <button function="minimize" state="normal" draw_ops="button_min_normal"/>
+   <button function="minimize" state="prelight" draw_ops="button_min_prelight"/>
+   <button function="minimize" state="pressed" draw_ops="button_min_pressed"/>
+   <button function="maximize" state="normal" draw_ops="button_max_normal"/>
+   <button function="maximize" state="prelight" draw_ops="button_max_prelight"/>
+   <button function="maximize" state="pressed" draw_ops="button_max_pressed"/>
+   <button function="menu" state="normal" draw_ops="button_menu_normal"/>
+   <button function="menu" state="prelight" draw_ops="button_menu_prelight"/>
+   <button function="menu" state="pressed" draw_ops="button_menu_normal"/>
+</frame_style>
+
+<frame_style name="frame_style_maximized_unfocused" geometry="frame_geometry_abnormal">
+   <piece position="title" draw_ops="draw_title_text_inactive"/>
+   <piece position="titlebar" draw_ops="draw_title_maximized_inactive"/>
+   <piece position="left_edge" draw_ops="left_edge"/>
+   <piece position="right_edge" draw_ops="right_edge"/>
+   <piece position="bottom_edge" draw_ops="bottom_edge"/>
+   <button function="close" state="normal" draw_ops="button_close_inactive"/>
+   <button function="close" state="prelight" draw_ops="button_close_inactive_prelight"/>
+   <button function="close" state="pressed" draw_ops="button_close_inactive"/>
+   <button function="minimize" state="normal" draw_ops="button_min_inactive"/>
+   <button function="minimize" state="prelight" draw_ops="button_min_inactive_prelight"/>
+   <button function="minimize" state="pressed" draw_ops="button_min_inactive"/>
+   <button function="maximize" state="normal" draw_ops="button_max_inactive"/>
+   <button function="maximize" state="prelight" draw_ops="button_max_inactive_prelight"/>
+   <button function="maximize" state="pressed" draw_ops="button_max_inactive"/>
+   <button function="menu" state="normal" draw_ops="button_menu_inactive"/>
+   <button function="menu" state="prelight" draw_ops="button_menu_inactive"/>
+   <button function="menu" state="pressed" draw_ops="button_menu_inactive"/>
+</frame_style>
+
+<frame_style_set name="frame_style_set_normal">
+  <frame focus="yes" state="normal" resize="both" style="frame_style_normal_focused"/>
+  <frame focus="no" state="normal" resize="both" style="frame_style_normal_unfocused"/>
+  <frame focus="yes" state="maximized" style="frame_style_maximized_focused"/>
+  <frame focus="no" state="maximized" style="frame_style_maximized_unfocused"/>
+  <frame focus="yes" state="shaded" style="frame_style_normal_focused"/>
+  <frame focus="no" state="shaded" style="frame_style_normal_unfocused"/>
+  <frame focus="yes" state="maximized_and_shaded" style="frame_style_maximized_focused"/>
+  <frame focus="no" state="maximized_and_shaded" style="frame_style_maximized_unfocused"/>
+</frame_style_set>
+
+<window type="normal" style_set="frame_style_set_normal"/>
+<window type="dialog" style_set="frame_style_set_normal"/>
+<window type="modal_dialog" style_set="frame_style_set_normal"/>
+<window type="menu" style_set="frame_style_set_normal"/>
+<window type="utility" style_set="frame_style_set_normal"/>
+<window type="border" style_set="frame_style_set_normal"/>
+
+<menu_icon function="close" state="normal" draw_ops="button_close_normal"/>
+<menu_icon function="maximize" state="normal" draw_ops="button_max_normal"/>
+<menu_icon function="unmaximize" state="normal" draw_ops="button_max_normal"/>
+<menu_icon function="minimize" state="normal" draw_ops="button_min_normal"/>
+
+
+</metacity_theme>

=== removed directory 'Dust Borderless'
=== removed directory 'Dust Borderless/metacity-1'
=== removed file 'Dust Borderless/metacity-1/button_1_bg.png'
Binary files Dust Borderless/metacity-1/button_1_bg.png	2010-03-30 15:12:01 +0000 and Dust Borderless/metacity-1/button_1_bg.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust Borderless/metacity-1/button_2_bg.png'
Binary files Dust Borderless/metacity-1/button_2_bg.png	2010-03-30 15:12:01 +0000 and Dust Borderless/metacity-1/button_2_bg.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust Borderless/metacity-1/button_3_bg.png'
Binary files Dust Borderless/metacity-1/button_3_bg.png	2010-03-30 15:12:01 +0000 and Dust Borderless/metacity-1/button_3_bg.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust Borderless/metacity-1/button_3_bg_real.png'
Binary files Dust Borderless/metacity-1/button_3_bg_real.png	2010-03-30 15:12:01 +0000 and Dust Borderless/metacity-1/button_3_bg_real.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust Borderless/metacity-1/button_close_normal.png'
Binary files Dust Borderless/metacity-1/button_close_normal.png	2010-03-30 15:12:01 +0000 and Dust Borderless/metacity-1/button_close_normal.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust Borderless/metacity-1/button_close_prelight.png'
Binary files Dust Borderless/metacity-1/button_close_prelight.png	2010-03-30 15:12:01 +0000 and Dust Borderless/metacity-1/button_close_prelight.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust Borderless/metacity-1/button_close_pressed.png'
Binary files Dust Borderless/metacity-1/button_close_pressed.png	2010-03-30 15:12:01 +0000 and Dust Borderless/metacity-1/button_close_pressed.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust Borderless/metacity-1/button_max_normal.png'
Binary files Dust Borderless/metacity-1/button_max_normal.png	2010-03-30 15:12:01 +0000 and Dust Borderless/metacity-1/button_max_normal.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust Borderless/metacity-1/button_max_prelight.png'
Binary files Dust Borderless/metacity-1/button_max_prelight.png	2010-03-30 15:12:01 +0000 and Dust Borderless/metacity-1/button_max_prelight.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust Borderless/metacity-1/button_max_pressed.png'
Binary files Dust Borderless/metacity-1/button_max_pressed.png	2010-03-30 15:12:01 +0000 and Dust Borderless/metacity-1/button_max_pressed.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust Borderless/metacity-1/button_min_normal.png'
Binary files Dust Borderless/metacity-1/button_min_normal.png	2010-03-30 15:12:01 +0000 and Dust Borderless/metacity-1/button_min_normal.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust Borderless/metacity-1/button_min_prelight.png'
Binary files Dust Borderless/metacity-1/button_min_prelight.png	2010-03-30 15:12:01 +0000 and Dust Borderless/metacity-1/button_min_prelight.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust Borderless/metacity-1/button_min_pressed.png'
Binary files Dust Borderless/metacity-1/button_min_pressed.png	2010-03-30 15:12:01 +0000 and Dust Borderless/metacity-1/button_min_pressed.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust Borderless/metacity-1/menu.png'
Binary files Dust Borderless/metacity-1/menu.png	2010-02-17 00:20:23 +0000 and Dust Borderless/metacity-1/menu.png	1970-01-01 00:00:00 +0000 differ
=== removed file 'Dust Borderless/metacity-1/metacity-theme-1.xml'
--- Dust Borderless/metacity-1/metacity-theme-1.xml	2010-03-30 21:01:08 +0000
+++ Dust Borderless/metacity-1/metacity-theme-1.xml	1970-01-01 00:00:00 +0000
@@ -1,518 +0,0 @@
-<?xml version="1.0"?>
-
-<metacity_theme>
-<info>
-    <name>Dust Borderless</name>
-    <author>Kido Mariano, Rico Sta. Cruz, James Schriver</author>
-    <copyright>GPL</copyright>
-    <date>Mar 30, 2010</date>
-    <description>Metacity theme</description>
-</info>
-
-
-<!--
-    General window layout (geometric stuff)
--->
-<frame_geometry name="frame_geometry_normal" title_scale="medium" rounded_top_left="true" rounded_top_right="true">
-    <distance name="left_width" value="1"/>
-    <distance name="right_width" value="1"/>
-    <distance name="bottom_height" value="4"/>
-    <distance name="left_titlebar_edge" value="2"/>
-    <distance name="right_titlebar_edge" value="1"/>
-    <distance name="button_width" value="28"/>
-    <distance name="button_height" value="20"/>
-    <distance name="title_vertical_pad" value="1"/>
-    <border name="title_border" left="2" right="2" top="3" bottom="3"/>
-    <border name="button_border" left="0" right="0" top="2" bottom="1"/>
-</frame_geometry>
-
-<frame_geometry name="frame_geometry_abnormal" title_scale="medium" 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="left_titlebar_edge" value="1"/>
-    <distance name="right_titlebar_edge" value="2"/>
-    <distance name="button_width" value="28"/>
-    <distance name="button_height" value="20"/>
-    <distance name="title_vertical_pad" value="0"/>
-    <border name="title_border" left="0" right="0" top="3" bottom="0"/>
-    <border name="button_border" left="0" right="0" top="2" bottom="1"/>
-</frame_geometry>
-
-
-
-
-<!--
-    Window Title
--->
-
-<draw_ops name="draw_title_text_normal">
-    <title x="1" y="(height - title_height) / 2 + 1" color="#2F2E2B"/>
-    <title x="0" y="(height - title_height) / 2" color="#FFFFFF"/>
-</draw_ops>
-
-<draw_ops name="draw_title_text_inactive">
-    <title x="0" y="(height - title_height) / 2" color="#727262"/>
-</draw_ops>
-
-<!--Centered titlebar text--><!--
-<draw_ops name="draw_title_text_normal">
-    <icon x="(width-title_width)/2" y="(height - title_height) / 2" width="mini_icon_width" height="mini_icon_height"/>
-    <title x="(width-title_width)/2 + mini_icon_width + 3" y="(height - title_height) / 2 + 1" color="#2F2E2B"/>
-    <title x="(width-title_width)/2 + mini_icon_width + 2" y="(height - title_height) / 2" color="#FFFFFF"/>
-</draw_ops>
-
-<draw_ops name="draw_title_text_inactive">
-    <icon x="(width-title_width)/2" y="(height - title_height) / 2" width="mini_icon_width" height="mini_icon_height" alpha="0.5"/>
-    <title x="(width-title_width)/2 + mini_icon_width + 2" y="(height - title_height) / 2" color="#727262"/>
-</draw_ops>-->
-
- 
-
-<!--
-    Construct titlebar from rectangles instead so we can pick up the GTK theme
--->
-
-<draw_ops name="draw_title">
-    <!-- Background gradient -->
-    <gradient type="diagonal" x="0" y="0" width="width+9" height="height">
-        <!--<color value="#80594D"/>-->
-        <color value="shade/gtk:bg[SELECTED]/0.9"/>
-        <!--Static colors to match static menubar and all-->
-        <!--color value="#3F3E39" /-->
-        <!--color value="#3A3936" /-->
-        <color value="#373633" />
-        <color value="#343330" />
-    </gradient>
-    
-    <!-- Topmost dark line -->
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="width" y1="0" y2="0"/>
-    
-    <!-- Darkening of the left arch -->
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="4" y1="1" y2="1"/>
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="2" y1="2" y2="2"/>
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="1" y1="3" y2="3"/>
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="1" y1="4" y2="4"/>
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="0" y1="5" y2="20"/>
-    
-    <!-- Top highlight -->
-    <!-- This uses <tint> (which supports alpha) instead of <line> (which doesn't) -->
-    <tint color="#ffffff" alpha="0.35" x="5" y="1" width="width - 10" height="1"/> 
-    
-    <!-- Upper-left highlight -->
-    <!-- Draw each pixel one by one. Again, using <tint> for alpha support. -->
-    <tint color="#ffffff" alpha="0.30" x="3" y="2"  width="2" height="1"/> 
-    <tint color="#ffffff" alpha="0.27" x="2" y="3"  width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.24" x="2" y="4"  width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.21" x="1" y="5"  width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.18" x="1" y="6"  width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.15" x="1" y="7"  width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.12" x="1" y="8"  width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.09" x="1" y="9"  width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.06" x="1" y="10" width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.03" x="1" y="11" width="1" height="1"/> 
-    
-    <!-- Upper-right highlight -->
-    <!-- Same as above. -->
-    <tint color="#ffffff" alpha="0.30" x="width-5" y="2"  width="2" height="1"/> 
-    <tint color="#ffffff" alpha="0.27" x="width-3" y="3"  width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.24" x="width-3" y="4"  width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.21" x="width-2" y="5"  width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.18" x="width-2" y="6"  width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.15" x="width-2" y="7"  width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.12" x="width-2" y="8"  width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.09" x="width-2" y="9"  width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.06" x="width-2" y="10" width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.03" x="width-2" y="11" width="1" height="1"/> 
-    
-</draw_ops>
-
-<draw_ops name="draw_title_inactive">
-    <!-- Background gradient -->
-    <gradient type="vertical" x="0" y="0" width="width+9" height="height">
-        <color value="#393835" />
-        <color value="#343330" />
-    </gradient>
-        
-    <!-- Topmost dark line -->
-    <line color="shade/gtk:bg[NORMAL]/0.25" x1="1" x2="width-2" y1="0" y2="0"/>
-    <!-- Top highlight -->
-    <tint color="#ffffff" alpha="0.2" x="5" y="1" width="width - 10" height="1"/> 
-    
-    <!-- Lower-left highlight -->
-    <line color="shade/gtk:bg[NORMAL]/0.33" x1="3" x2 ="4" y1="2" y2="2" />
-    <line color="shade/gtk:bg[NORMAL]/0.32" x1="2" x2 ="2" y1="3" y2="4" />
-    
-    <!-- Lower-left higlight fade -->
-    <gradient type="vertical" x="1" y="5" width="1" height="title_height - 4">
-        <color value="shade/gtk:bg[NORMAL]/0.30"/>
-        <color value="shade/gtk:bg[NORMAL]/0.25"/>
-    </gradient> 
-    
-    <!-- Upper right highlight -->
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="width-5" x2 ="width-4" y1="2" y2="2" />
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="width-3" x2 ="width-3" y1="3" y2="4" />
-    
-    <!-- Lower-left higlight fade -->
-    <gradient type="vertical" x="width-2" y="5" width="1" height="title_height - 4">
-        <color value="shade/gtk:bg[NORMAL]/0.30"/>
-        <color value="shade/gtk:bg[NORMAL]/0.25"/>
-    </gradient> 
-</draw_ops>
-
-<draw_ops name="draw_title_maximized">
-    <!-- Background gradient -->
-    <gradient type="vertical" x="0" y="0" width="width+9" height="height">
-        <!--<color value="#80594D"/>-->
-        <color value="shade/gtk:bg[SELECTED]/0.6"/>
-        <color value="shade/gtk:bg[NORMAL]/0.29" />
-        <color value="shade/gtk:bg[NORMAL]/0.27" />
-        <color value="shade/gtk:bg[NORMAL]/0.25" />
-        <color value="shade/gtk:bg[NORMAL]/0.24" />
-    </gradient>
-    
-    <!-- Topmost dark line -->
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="width" y1="0" y2="0"/>
-    
-    <!-- Top highlight -->
-    <!-- This uses <tint> (which supports alpha) instead of <line> (which doesn't) -->
-    <tint color="#ffffff" alpha="0.35" x="1" y="1" width="width - 2" height="1"/> 
-    
-</draw_ops>
-
-<draw_ops name="draw_title_maximized_inactive">
-    <!-- Background gradient -->
-    <gradient type="vertical" x="0" y="0" width="width+9" height="height">
-        <!--<color value="#80594D"/>-->
-        <color value="shade/gtk:bg[NORMAL]/0.27" />
-        <color value="shade/gtk:bg[NORMAL]/0.24" />
-    </gradient>
-    
-    <!-- Topmost dark line -->
-    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="width" y1="0" y2="0"/>
-    
-    <!-- Top highlight -->
-    <!-- This uses <tint> (which supports alpha) instead of <line> (which doesn't) -->
-    <tint color="#ffffff" alpha="0.35" x="1" y="1" width="width - 2" height="1"/> 
-    
-</draw_ops>
-
-<!--
-    The frame around windows
--->
-
-<draw_ops name="draw_frame">
-	<rectangle color="shade/gtk:bg[NORMAL]/0.25" x="0" y="0" width="width" height="height" filled="true"/>
-	<!-- RSC: Subtle gradient on left/right edges to match the menubar -->
-    <gradient type="vertical" x="0" y="0" width="width" height="100">
-        <color value="shade/gtk:bg[NORMAL]/0.25"/>
-        <color value="shade/gtk:bg[NORMAL]/0.15"/>
-        <color value="shade/gtk:bg[NORMAL]/0.25"/>
-    </gradient> 
-</draw_ops>
-
-<!--Borderless only: make bottom border less apparent. We can do this now since our statusbars are light.-->
-<draw_ops name="bottom_edge">
-    <rectangle color="shade/gtk:bg[NORMAL]/0.25" x="0" y="0" width="width" height="height" filled="true"/>
-    <gradient type="vertical" x="1" y="height-6" width="width-2" height="5">
-        <color value="shade/gtk:bg[NORMAL]/0.85"/>
-        <color value="shade/gtk:bg[NORMAL]/0.5"/>
-    </gradient>
-</draw_ops>
-
-
-<!--
-    Buttons
--->
-<!-- close button-->
-<draw_ops name="button_close_normal">
-    <image filename="button_close_normal.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="button_close_prelight">
-    <image filename="button_close_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="button_close_inactive_prelight">
-    <image filename="button_close_prelight.png" x="0" y="1" width="object_width" height="object_height" alpha="0.3"/>
-</draw_ops>
-<draw_ops name="button_close_pressed">
-    <image filename="button_close_pressed.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="button_close_inactive">
-    <image filename="button_close_normal.png" x="0" y="1" width="object_width" height="object_height" alpha="0.3"/>
-</draw_ops>
-
-<!-- maximize button-->
-<draw_ops name="button_max_normal">
-    <image filename="button_max_normal.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="button_max_prelight">
-    <image filename="button_max_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="button_max_inactive_prelight">
-    <image filename="button_max_prelight.png" x="0" y="1" width="object_width" height="object_height" alpha="0.3"/>
-</draw_ops>
-<draw_ops name="button_max_pressed">
-    <image filename="button_max_pressed.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="button_max_inactive">
-    <image filename="button_max_normal.png" x="0" y="1" width="object_width" height="object_height" alpha="0.3"/>
-</draw_ops>
-
-<!-- minimize button-->
-<draw_ops name="button_min_normal">
-    <image filename="button_min_normal.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="button_min_prelight">
-    <image filename="button_min_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="button_min_inactive_prelight">
-    <image filename="button_min_prelight.png" x="0" y="1" width="object_width" height="object_height" alpha="0.3"/>
-</draw_ops>
-<draw_ops name="button_min_pressed">
-    <image filename="button_min_pressed.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="button_min_inactive">
-    <image filename="button_min_normal.png" x="0" y="1" width="object_width" height="object_height" alpha="0.3"/>
-</draw_ops>
-
-<!-- menu icon -->
-<draw_ops name="button_menu_normal">
-<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height"/>
-</draw_ops>
-<draw_ops name="button_menu_prelight">
-<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height"/>
-</draw_ops>
-<draw_ops name="button_menu_inactive_prelight">
-<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height" alpha="0.3"/>
-</draw_ops>
-<draw_ops name="button_menu_pressed">
-<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height"/>
-</draw_ops>
-<draw_ops name="button_menu_inactive">
-<icon x="6" y="2" width="mini_icon_width" height="mini_icon_height" alpha="0.3"/>
-</draw_ops>
-
-<!-- Button background -->
-
-<!-- Button Border Left -->
-<draw_ops name="left_left_background_focused_normal">
-	<image filename="button_1_bg.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="left_left_background_focused_pressed">
-	<image filename="button_1_bg.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="left_middle_background_focused_normal">
-	<image filename="button_2_bg.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="left_middle_background_focused_pressed">
-	<image filename="button_2_bg.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="left_right_background_focused_normal">
-	<image filename="button_3_bg_real.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="left_right_background_focused_pressed">
-	<image filename="button_3_bg_real.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="left_left_background_unfocused_normal">
-	<image filename="button_1_bg.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="left_left_background_unfocused_pressed">
-	<image filename="button_1_bg.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="left_middle_background_unfocused_normal">
-	<image filename="button_2_bg.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="left_middle_background_unfocused_pressed">
-	<image filename="button_2_bg.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="left_right_background_unfocused_normal">
-	<image filename="button_3_bg_real.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="left_right_background_unfocused_pressed">
-	<image filename="button_3_bg_real.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-	
-<!-- Button Border Right -->
-<draw_ops name="right_left_background_focused_normal">
-	<image filename="button_1_bg.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="right_left_background_focused_pressed">
-	<image filename="button_1_bg.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="right_middle_background_focused_normal">
-	<image filename="button_2_bg.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="right_middle_background_focused_pressed">
-	<image filename="button_2_bg.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="right_right_background_focused_normal">
-	<image filename="button_3_bg_real.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="right_right_background_focused_pressed">
-	<image filename="button_3_bg_real.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="right_left_background_unfocused_normal">
-	<image filename="button_1_bg.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="right_left_background_unfocused_pressed">
-	<image filename="button_1_bg.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="right_middle_background_unfocused_normal">
-	<image filename="button_2_bg.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="right_middle_background_unfocused_pressed">
-	<image filename="button_2_bg.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="right_right_background_unfocused_normal">
-	<image filename="button_3_bg_real.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-<draw_ops name="right_right_background_unfocused_pressed">
-	<image filename="button_3_bg_real.png" x="0" y="1" width="object_width" height="object_height"/>
-</draw_ops>
-
-<!--
-    Frame styles
--->
-
-<!-- normal -->
-<frame_style name="frame_style_normal_focused" geometry="frame_geometry_normal">
-   <piece position="title" draw_ops="draw_title_text_normal"/>
-   <piece position="titlebar" draw_ops="draw_title"/>
-   <piece position="left_edge" draw_ops="draw_frame"/>
-   <piece position="right_edge" draw_ops="draw_frame"/>
-   <piece position="bottom_edge" draw_ops="bottom_edge"/>
-   <button function="left_left_background" state="normal" draw_ops="left_left_background_focused_normal"/>
-   <button function="left_middle_background" state="normal" draw_ops="left_middle_background_focused_normal"/>
-   <button function="left_right_background" state="normal" draw_ops="left_right_background_focused_normal"/>
-   <button function="left_left_background" state="prelight" draw_ops="left_left_background_focused_normal"/>
-   <button function="left_middle_background" state="prelight" draw_ops="left_middle_background_focused_normal"/>
-   <button function="left_right_background" state="prelight" draw_ops="left_right_background_focused_normal"/>
-   <button function="left_left_background" state="pressed" draw_ops="left_left_background_focused_pressed"/>
-   <button function="left_middle_background" state="pressed" draw_ops="left_middle_background_focused_pressed"/>
-   <button function="left_right_background" state="pressed" draw_ops="left_right_background_focused_pressed"/>
-   <button function="right_left_background" state="normal" draw_ops="right_left_background_focused_normal"/>
-   <button function="right_middle_background" state="normal" draw_ops="right_middle_background_focused_normal"/>
-   <button function="right_right_background" state="normal" draw_ops="right_right_background_focused_normal"/>
-   <button function="right_left_background" state="prelight" draw_ops="right_left_background_focused_normal"/>
-   <button function="right_middle_background" state="prelight" draw_ops="right_middle_background_focused_normal"/>
-   <button function="right_right_background" state="prelight" draw_ops="right_right_background_focused_normal"/>
-   <button function="right_left_background" state="pressed" draw_ops="right_left_background_focused_pressed"/>
-   <button function="right_middle_background" state="pressed" draw_ops="right_middle_background_focused_pressed"/>
-   <button function="right_right_background" state="pressed" draw_ops="right_right_background_focused_pressed"/>
-   <button function="close" state="normal" draw_ops="button_close_normal"/>
-   <button function="close" state="prelight" draw_ops="button_close_prelight"/>
-   <button function="close" state="pressed" draw_ops="button_close_pressed"/>
-   <button function="minimize" state="normal" draw_ops="button_min_normal"/>
-   <button function="minimize" state="prelight" draw_ops="button_min_prelight"/>
-   <button function="minimize" state="pressed" draw_ops="button_min_pressed"/>
-   <button function="maximize" state="normal" draw_ops="button_max_normal"/>
-   <button function="maximize" state="prelight" draw_ops="button_max_prelight"/>
-   <button function="maximize" state="pressed" draw_ops="button_max_pressed"/>
-   <button function="menu" state="normal" draw_ops="button_menu_normal"/>
-   <button function="menu" state="prelight" draw_ops="button_menu_prelight"/>
-   <button function="menu" state="pressed" draw_ops="button_menu_pressed"/>
-</frame_style>
-
-<frame_style name="frame_style_normal_unfocused" geometry="frame_geometry_normal">
-   <piece position="title" draw_ops="draw_title_text_inactive"/>
-   <piece position="titlebar" draw_ops="draw_title_inactive"/>
-   <piece position="left_edge" draw_ops="draw_frame"/>
-   <piece position="right_edge" draw_ops="draw_frame"/>
-   <piece position="bottom_edge" draw_ops="bottom_edge"/>
-   <button function="left_left_background" state="normal" draw_ops="left_left_background_unfocused_normal"/>
-   <button function="left_middle_background" state="normal" draw_ops="left_middle_background_unfocused_normal"/>
-   <button function="left_right_background" state="normal" draw_ops="left_right_background_unfocused_normal"/>
-   <button function="left_left_background" state="prelight" draw_ops="left_left_background_unfocused_normal"/>
-   <button function="left_middle_background" state="prelight" draw_ops="left_middle_background_unfocused_normal"/>
-   <button function="left_right_background" state="prelight" draw_ops="left_right_background_unfocused_normal"/>
-   <button function="left_left_background" state="pressed" draw_ops="left_left_background_unfocused_pressed"/>
-   <button function="left_middle_background" state="pressed" draw_ops="left_middle_background_unfocused_pressed"/>
-   <button function="left_right_background" state="pressed" draw_ops="left_right_background_unfocused_pressed"/>
-   <button function="right_left_background" state="normal" draw_ops="right_left_background_unfocused_normal"/>
-   <button function="right_middle_background" state="normal" draw_ops="right_middle_background_unfocused_normal"/>
-   <button function="right_right_background" state="normal" draw_ops="right_right_background_unfocused_normal"/>
-   <button function="right_left_background" state="prelight" draw_ops="right_left_background_unfocused_normal"/>
-   <button function="right_middle_background" state="prelight" draw_ops="right_middle_background_unfocused_normal"/>
-   <button function="right_right_background" state="prelight" draw_ops="right_right_background_unfocused_normal"/>
-   <button function="right_left_background" state="pressed" draw_ops="right_left_background_unfocused_pressed"/>
-   <button function="right_middle_background" state="pressed" draw_ops="right_middle_background_unfocused_pressed"/>
-   <button function="right_right_background" state="pressed" draw_ops="right_right_background_unfocused_pressed"/>
-   <button function="close" state="normal" draw_ops="button_close_inactive"/>
-   <button function="close" state="prelight" draw_ops="button_close_inactive_prelight"/>
-   <button function="close" state="pressed" draw_ops="button_close_inactive"/>
-   <button function="minimize" state="normal" draw_ops="button_min_inactive"/>
-   <button function="minimize" state="prelight" draw_ops="button_min_inactive_prelight"/>
-   <button function="minimize" state="pressed" draw_ops="button_min_inactive"/>
-   <button function="maximize" state="normal" draw_ops="button_max_inactive"/>
-   <button function="maximize" state="prelight" draw_ops="button_max_inactive_prelight"/>
-   <button function="maximize" state="pressed" draw_ops="button_max_inactive"/>
-   <button function="menu" state="normal" draw_ops="button_menu_inactive"/>
-   <button function="menu" state="prelight" draw_ops="button_menu_inactive_prelight"/>
-   <button function="menu" state="pressed" draw_ops="button_menu_inactive"/>
-</frame_style>
-
-<frame_style name="frame_style_maximized_focused" geometry="frame_geometry_abnormal">
-   <piece position="title" draw_ops="draw_title_text_normal"/>
-   <piece position="titlebar" draw_ops="draw_title_maximized"/>
-   <piece position="left_edge" draw_ops="draw_frame"/>
-   <piece position="right_edge" draw_ops="draw_frame"/>
-   <piece position="bottom_edge" draw_ops="bottom_edge"/>
-   <button function="close" state="normal" draw_ops="button_close_normal"/>
-   <button function="close" state="prelight" draw_ops="button_close_prelight"/>
-   <button function="close" state="pressed" draw_ops="button_close_pressed"/>
-   <button function="minimize" state="normal" draw_ops="button_min_normal"/>
-   <button function="minimize" state="prelight" draw_ops="button_min_prelight"/>
-   <button function="minimize" state="pressed" draw_ops="button_min_pressed"/>
-   <button function="maximize" state="normal" draw_ops="button_max_normal"/>
-   <button function="maximize" state="prelight" draw_ops="button_max_prelight"/>
-   <button function="maximize" state="pressed" draw_ops="button_max_pressed"/>
-   <button function="menu" state="normal" draw_ops="button_menu_normal"/>
-   <button function="menu" state="prelight" draw_ops="button_menu_prelight"/>
-   <button function="menu" state="pressed" draw_ops="button_menu_normal"/>
-</frame_style>
-
-<frame_style name="frame_style_maximized_unfocused" geometry="frame_geometry_abnormal">
-   <piece position="title" draw_ops="draw_title_text_inactive"/>
-   <piece position="titlebar" draw_ops="draw_title_maximized_inactive"/>
-   <piece position="left_edge" draw_ops="draw_frame"/>
-   <piece position="right_edge" draw_ops="draw_frame"/>
-   <piece position="bottom_edge" draw_ops="bottom_edge"/>
-   <button function="close" state="normal" draw_ops="button_close_inactive"/>
-   <button function="close" state="prelight" draw_ops="button_close_inactive_prelight"/>
-   <button function="close" state="pressed" draw_ops="button_close_inactive"/>
-   <button function="minimize" state="normal" draw_ops="button_min_inactive"/>
-   <button function="minimize" state="prelight" draw_ops="button_min_inactive_prelight"/>
-   <button function="minimize" state="pressed" draw_ops="button_min_inactive"/>
-   <button function="maximize" state="normal" draw_ops="button_max_inactive"/>
-   <button function="maximize" state="prelight" draw_ops="button_max_inactive_prelight"/>
-   <button function="maximize" state="pressed" draw_ops="button_max_inactive"/>
-   <button function="menu" state="normal" draw_ops="button_menu_inactive"/>
-   <button function="menu" state="prelight" draw_ops="button_menu_inactive"/>
-   <button function="menu" state="pressed" draw_ops="button_menu_inactive"/>
-</frame_style>
-
-<frame_style_set name="frame_style_set_normal">
-  <frame focus="yes" state="normal" resize="both" style="frame_style_normal_focused"/>
-  <frame focus="no" state="normal" resize="both" style="frame_style_normal_unfocused"/>
-  <frame focus="yes" state="maximized" style="frame_style_maximized_focused"/>
-  <frame focus="no" state="maximized" style="frame_style_maximized_unfocused"/>
-  <frame focus="yes" state="shaded" style="frame_style_normal_focused"/>
-  <frame focus="no" state="shaded" style="frame_style_normal_unfocused"/>
-  <frame focus="yes" state="maximized_and_shaded" style="frame_style_maximized_focused"/>
-  <frame focus="no" state="maximized_and_shaded" style="frame_style_maximized_unfocused"/>
-</frame_style_set>
-
-<window type="normal" style_set="frame_style_set_normal"/>
-<window type="dialog" style_set="frame_style_set_normal"/>
-<window type="modal_dialog" style_set="frame_style_set_normal"/>
-<window type="menu" style_set="frame_style_set_normal"/>
-<window type="utility" style_set="frame_style_set_normal"/>
-<window type="border" style_set="frame_style_set_normal"/>
-
-<menu_icon function="close" state="normal" draw_ops="button_close_normal"/>
-<menu_icon function="maximize" state="normal" draw_ops="button_max_normal"/>
-<menu_icon function="unmaximize" state="normal" draw_ops="button_max_normal"/>
-<menu_icon function="minimize" state="normal" draw_ops="button_min_normal"/>
-
-
-</metacity_theme>

=== modified file 'Dust/gtk-2.0/gtkrc'
--- Dust/gtk-2.0/gtkrc	2010-06-24 23:29:13 +0000
+++ Dust/gtk-2.0/gtkrc	2010-06-29 02:48:26 +0000
@@ -3,7 +3,7 @@
 # Licensed under the GPL.
 # Requires Murrine GTK Engine v0.91.0
 
-gtk_color_scheme = "fg_color:#323232\nbg_color:#D9D4CC\nbase_color:#fff\ntext_color:#323232\nselected_bg_color:#75645B\nselected_fg_color:#fff\ntooltip_bg_color:#D5C1B6\ntooltip_fg_color:#000"
+gtk_color_scheme = "fg_color:#323232\nbg_color:#D9D4CC\nbase_color:#fff\ntext_color:#323232\nselected_bg_color:#75645B\nselected_fg_color:#fff\ntooltip_bg_color:#242220\ntooltip_fg_color:#D5C1B6"
 
 gtk-auto-mnemonics = 1 
 
@@ -104,7 +104,7 @@
 		menuitemstyle       = 1     # 0 = flat, 1 = glassy, 2 = striped
 		menustyle           = 0     # 0 = no vertical menu stripe, 1 = display vertical menu stripe
 		prelight_shade      = 1.25 #to select the shade level used in the scrollbar's slider, GtkComboBox with comboboxstyle = 1 and in the prelight state with gradient_colors.
- 		progressbarstyle    = 0     # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes 
+ 		progressbarstyle    = 1     # 0 = no stripes, 1 = diagonal stripes, 2 = vertical stripes 
 		reliefstyle	    = 4     # 0 = flat, 1 = inset, 2 = shadow, = 3 for a gradient on shadow, = 4 for a stronger shadow.
 		rgba		    = FALSE # FALSE = disabled, TRUE = enabled
 		roundness           = 2     # 0 = squared, 1 = old default, more will increase roundness
@@ -308,8 +308,8 @@
 style "terminal" 
 {
 text[NORMAL] = "#ffffff"
-base[NORMAL] = @selected_bg_color
-TerminalScreen::background-darkness=0.75
+base[NORMAL] = "#343330"
+TerminalScreen::background-darkness=0.85
 }
 
 style "murrine-PanelGtkMenubar" 
@@ -392,7 +392,7 @@
 	ythickness = 5
 
 	bg[NORMAL] 	= @tooltip_bg_color
-	bg[SELECTED] 	= @selected_bg_color
+	bg[SELECTED] 	= shade(1.1,@tooltip_bg_color)
 	fg[NORMAL] 	= @tooltip_fg_color
 }
 

=== modified file 'Dust/metacity-1/metacity-theme-1.xml'
--- Dust/metacity-1/metacity-theme-1.xml	2010-03-30 21:01:08 +0000
+++ Dust/metacity-1/metacity-theme-1.xml	2010-06-29 02:48:26 +0000
@@ -2,7 +2,7 @@
 
 <metacity_theme>
 <info>
-    <name>Dust Earth</name>
+    <name>Dust Borderless</name>
     <author>Kido Mariano, Rico Sta. Cruz, James Schriver</author>
     <copyright>GPL</copyright>
     <date>Mar 30, 2010</date>
@@ -13,16 +13,16 @@
 <!--
     General window layout (geometric stuff)
 -->
-<frame_geometry name="frame_geometry_normal" title_scale="medium" rounded_top_left="true" rounded_top_right="true" rounded_bottom_left="true" rounded_bottom_right="true">
-    <distance name="left_width" value="6"/>
-    <distance name="right_width" value="6"/>
+<frame_geometry name="frame_geometry_normal" title_scale="medium" rounded_top_left="true" rounded_top_right="true">
+    <distance name="left_width" value="1"/>
+    <distance name="right_width" value="1"/>
     <distance name="bottom_height" value="4"/>
-    <distance name="left_titlebar_edge" value="6"/>
-    <distance name="right_titlebar_edge" value="6"/>
+    <distance name="left_titlebar_edge" value="2"/>
+    <distance name="right_titlebar_edge" value="1"/>
     <distance name="button_width" value="28"/>
     <distance name="button_height" value="20"/>
     <distance name="title_vertical_pad" value="1"/>
-    <border name="title_border" left="2" right="2" top="3" bottom="0"/>
+    <border name="title_border" left="2" right="2" top="3" bottom="3"/>
     <border name="button_border" left="0" right="0" top="2" bottom="1"/>
 </frame_geometry>
 
@@ -41,6 +41,7 @@
 
 
 
+
 <!--
     Window Title
 -->
@@ -76,33 +77,23 @@
     <!-- Background gradient -->
     <gradient type="vertical" x="0" y="0" width="width+9" height="height">
         <!--<color value="#80594D"/>-->
-        <color value="shade/gtk:bg[SELECTED]/0.8"/>
+        <color value="shade/gtk:bg[SELECTED]/0.9"/>
         <!--Static colors to match static menubar and all-->
-        <color value="#3F3E39" />
+        <!--color value="#3F3E39" /-->
         <color value="#3A3936" />
         <color value="#373633" />
         <color value="#343330" />
     </gradient>
     
-    <!-- Topmost dark line (not static is shade:0.30) -->
-    <line color="#403F3A" x1="0" x2="width" y1="0" y2="0"/>
+    <!-- Topmost dark line -->
+    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="width" y1="0" y2="0"/>
     
     <!-- Darkening of the left arch -->
-    <line color="#403F3A" x1="0" x2="4" y1="1" y2="1"/>
-    <line color="#403F3A" x1="0" x2="2" y1="2" y2="2"/>
-    <line color="#403F3A" x1="0" x2="1" y1="3" y2="3"/>
-    <line color="#403F3A" x1="0" x2="1" y1="4" y2="4"/>
-    <line color="#403F3A" x1="0" x2="0" y1="5" y2="20"/>
-    
-    <!-- Sides -->
-    <gradient type="horizontal" x="0" y="0" width="6" height="height">
-        <color value="shade/gtk:bg[NORMAL]/0.5"/>
-        <color value="shade/gtk:bg[NORMAL]/0.7"/>
-    </gradient> 
-    <gradient type="horizontal" x="width-6" y="0" width="6" height="height">
-        <color value="shade/gtk:bg[NORMAL]/0.7"/>
-        <color value="shade/gtk:bg[NORMAL]/0.5"/>
-    </gradient> 
+    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="4" y1="1" y2="1"/>
+    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="2" y1="2" y2="2"/>
+    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="1" y1="3" y2="3"/>
+    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="1" y1="4" y2="4"/>
+    <line color="shade/gtk:bg[NORMAL]/0.30" x1="0" x2="0" y1="5" y2="20"/>
     
     <!-- Top highlight -->
     <!-- This uses <tint> (which supports alpha) instead of <line> (which doesn't) -->
@@ -119,9 +110,7 @@
     <tint color="#ffffff" alpha="0.12" x="1" y="8"  width="1" height="1"/> 
     <tint color="#ffffff" alpha="0.09" x="1" y="9"  width="1" height="1"/> 
     <tint color="#ffffff" alpha="0.06" x="1" y="10" width="1" height="1"/> 
-    <tint color="#ffffff" alpha="0.03" x="1" y="11" width="1" height="1"/>
-    
-    <tint color="#ffffff" alpha="0.15" x="4" y="1" width="1" height="height"/>
+    <tint color="#ffffff" alpha="0.03" x="1" y="11" width="1" height="1"/> 
     
     <!-- Upper-right highlight -->
     <!-- Same as above. -->
@@ -136,51 +125,62 @@
     <tint color="#ffffff" alpha="0.06" x="width-2" y="10" width="1" height="1"/> 
     <tint color="#ffffff" alpha="0.03" x="width-2" y="11" width="1" height="1"/> 
     
-    <tint color="#ffffff" alpha="0.15" x="width-5" y="1" width="1" height="height"/>
-    
+    <!-- Sidemost blending -->
+	<gradient type="vertical" x="0" y="0" width="1" height="height">
+		<color value="#393835"/>
+		<color value="shade/gtk:bg[NORMAL]/0.6"/>
+	</gradient>
+	
+	<gradient type="vertical" x="width-1" y="0" width="1" height="height">
+		<color value="#393835"/>
+		<color value="shade/gtk:bg[NORMAL]/0.6"/>
+	</gradient>
+
 </draw_ops>
 
 <draw_ops name="draw_title_inactive">
     <!-- Background gradient -->
     <gradient type="vertical" x="0" y="0" width="width+9" height="height">
-        <color value="#3A3936" />
+        <color value="#393835" />
         <color value="#343330" />
     </gradient>
         
     <!-- Topmost dark line -->
-    <line color="#343330" x1="1" x2="width-2" y1="0" y2="0"/>
+    <line color="shade/gtk:bg[NORMAL]/0.25" x1="1" x2="width-2" y1="0" y2="0"/>
     <!-- Top highlight -->
     <tint color="#ffffff" alpha="0.2" x="5" y="1" width="width - 10" height="1"/> 
     
-     <!-- Sides -->
-    <gradient type="horizontal" x="0" y="0" width="6" height="height">
-        <color value="shade/gtk:bg[NORMAL]/0.5"/>
-        <color value="shade/gtk:bg[NORMAL]/0.7"/>
-    </gradient> 
-    <gradient type="horizontal" x="width-6" y="0" width="6" height="height">
-        <color value="shade/gtk:bg[NORMAL]/0.7"/>
-        <color value="shade/gtk:bg[NORMAL]/0.5"/>
-    </gradient> 
-    
-    <!-- Upper left highlight -->
-    <!--line color="#464542" x1="3" x2 ="4" y1="2" y2="2" />
-    <line color="#444340" x1="2" x2 ="2" y1="3" y2="4" /-->
-    
-    <!-- Upper left higlight fade -->
-    <!--gradient type="vertical" x="1" y="5" width="1" height="title_height - 4">
-        <color value="#403F3A"/>
-        <color value="#343330"/>
-    </gradient--> 
+    <!-- Lower-left highlight -->
+    <line color="shade/gtk:bg[NORMAL]/0.33" x1="3" x2 ="4" y1="2" y2="2" />
+    <line color="shade/gtk:bg[NORMAL]/0.32" x1="2" x2 ="2" y1="3" y2="4" />
+    
+    <!-- Lower-left higlight fade -->
+    <gradient type="vertical" x="1" y="5" width="1" height="title_height - 4">
+        <color value="shade/gtk:bg[NORMAL]/0.30"/>
+        <color value="shade/gtk:bg[NORMAL]/0.25"/>
+    </gradient> 
     
     <!-- Upper right highlight -->
-    <!--line color="#403F3A" x1="width-5" x2 ="width-4" y1="2" y2="2" />
-    <line color="#403F3A" x1="width-3" x2 ="width-3" y1="3" y2="4" /-->
-    
-    <!-- Upper right higlight fade -->
-    <!--gradient type="vertical" x="width-2" y="5" width="1" height="title_height - 4">
-        <color value="#403F3A"/>
-        <color value="#343330"/>
-    </gradient--> 
+    <line color="shade/gtk:bg[NORMAL]/0.30" x1="width-5" x2 ="width-4" y1="2" y2="2" />
+    <line color="shade/gtk:bg[NORMAL]/0.30" x1="width-3" x2 ="width-3" y1="3" y2="4" />
+    
+    <!-- Lower-left highlight fade -->
+    <gradient type="vertical" x="width-2" y="5" width="1" height="title_height - 4">
+        <color value="shade/gtk:bg[NORMAL]/0.30"/>
+        <color value="shade/gtk:bg[NORMAL]/0.25"/>
+    </gradient> 
+    
+    <!-- Sidemost blending -->
+	<gradient type="vertical" x="0" y="0" width="1" height="height">
+		<color value="#393835"/>
+		<color value="shade/gtk:bg[NORMAL]/0.6"/>
+	</gradient>
+	
+	<gradient type="vertical" x="width-1" y="0" width="1" height="height">
+		<color value="#393835"/>
+		<color value="shade/gtk:bg[NORMAL]/0.6"/>
+	</gradient>
+	
 </draw_ops>
 
 <draw_ops name="draw_title_maximized">
@@ -224,40 +224,24 @@
     The frame around windows
 -->
 
-<draw_ops name="left_edge">
-    <gradient type="horizontal" x="0" y="0" width="width" height="height">
-        <color value="shade/gtk:bg[NORMAL]/0.5"/>
-        <color value="shade/gtk:bg[NORMAL]/0.7"/>
-    </gradient>
-    <tint color="#ffffff" alpha="0.15" x="width-2" y="0" width="1" height="height"/>
-</draw_ops>
-
-<draw_ops name="right_edge">
-    <gradient type="horizontal" x="0" y="0" width="width" height="height">
-        <color value="shade/gtk:bg[NORMAL]/0.7"/>
-        <color value="shade/gtk:bg[NORMAL]/0.5"/>
-    </gradient>
-    <tint color="#ffffff" alpha="0.15" x="1" y="0" width="1" height="height"/>
-</draw_ops>
-
+<draw_ops name="draw_frame">
+	<!--rectangle color="shade/gtk:bg[NORMAL]/0.25" x="0" y="0" width="width" height="height" filled="true"/-->
+	<!-- RSC: Subtle gradient on left/right edges to match the menubar -->
+    <!--gradient type="vertical" x="0" y="0" width="width" height="100">
+        <color value="shade/gtk:bg[NORMAL]/0.25"/>
+        <color value="shade/gtk:bg[NORMAL]/0.15"/>
+        <color value="shade/gtk:bg[NORMAL]/0.25"/>
+    </gradient--> 
+	<rectangle color="shade/gtk:bg[NORMAL]/0.6" x="0" y="0" width="width" height="height" filled="true"/>
+</draw_ops>
+
+<!--Borderless only: make bottom border less apparent. We can do this now since our statusbars are light.-->
 <draw_ops name="bottom_edge">
-    <rectangle color="gtk:bg[NORMAL]" x="0" y="0" width="width" height="height" filled="true"/>
-    
-    <!-- Sides -->
-    
-    <gradient type="horizontal" x="0" y="0" width="6" height="height">
-        <color value="shade/gtk:bg[NORMAL]/0.5"/>
-        <color value="shade/gtk:bg[NORMAL]/0.7"/>
-    </gradient> 
-    <gradient type="horizontal" x="width-6" y="0" width="6" height="height">
-        <color value="shade/gtk:bg[NORMAL]/0.7"/>
-        <color value="shade/gtk:bg[NORMAL]/0.5"/>
+    <rectangle color="shade/gtk:bg[NORMAL]/0.6" x="0" y="0" width="width" height="height" filled="true"/>
+    <gradient type="vertical" x="1" y="height-6" width="width-2" height="5">
+        <color value="gtk:bg[NORMAL]"/>
+        <color value="shade/gtk:bg[NORMAL]/0.6"/>
     </gradient>
-    
-    <!-- White corner arches -->
-    
-    <tint color="#343330" alpha="0.55" x="0" y="height-1" width="width" height="1"/>
-    
 </draw_ops>
 
 
@@ -418,8 +402,8 @@
 <frame_style name="frame_style_normal_focused" geometry="frame_geometry_normal">
    <piece position="title" draw_ops="draw_title_text_normal"/>
    <piece position="titlebar" draw_ops="draw_title"/>
-   <piece position="left_edge" draw_ops="left_edge"/>
-   <piece position="right_edge" draw_ops="right_edge"/>
+   <piece position="left_edge" draw_ops="draw_frame"/>
+   <piece position="right_edge" draw_ops="draw_frame"/>
    <piece position="bottom_edge" draw_ops="bottom_edge"/>
    <button function="left_left_background" state="normal" draw_ops="left_left_background_focused_normal"/>
    <button function="left_middle_background" state="normal" draw_ops="left_middle_background_focused_normal"/>
@@ -456,8 +440,8 @@
 <frame_style name="frame_style_normal_unfocused" geometry="frame_geometry_normal">
    <piece position="title" draw_ops="draw_title_text_inactive"/>
    <piece position="titlebar" draw_ops="draw_title_inactive"/>
-   <piece position="left_edge" draw_ops="left_edge"/>
-   <piece position="right_edge" draw_ops="right_edge"/>
+   <piece position="left_edge" draw_ops="draw_frame"/>
+   <piece position="right_edge" draw_ops="draw_frame"/>
    <piece position="bottom_edge" draw_ops="bottom_edge"/>
    <button function="left_left_background" state="normal" draw_ops="left_left_background_unfocused_normal"/>
    <button function="left_middle_background" state="normal" draw_ops="left_middle_background_unfocused_normal"/>
@@ -494,9 +478,27 @@
 <frame_style name="frame_style_maximized_focused" geometry="frame_geometry_abnormal">
    <piece position="title" draw_ops="draw_title_text_normal"/>
    <piece position="titlebar" draw_ops="draw_title_maximized"/>
-   <piece position="left_edge" draw_ops="left_edge"/>
-   <piece position="right_edge" draw_ops="right_edge"/>
+   <piece position="left_edge" draw_ops="draw_frame"/>
+   <piece position="right_edge" draw_ops="draw_frame"/>
    <piece position="bottom_edge" draw_ops="bottom_edge"/>
+   <button function="left_left_background" state="normal" draw_ops="left_left_background_focused_normal"/>
+   <button function="left_middle_background" state="normal" draw_ops="left_middle_background_focused_normal"/>
+   <button function="left_right_background" state="normal" draw_ops="left_right_background_focused_normal"/>
+   <button function="left_left_background" state="prelight" draw_ops="left_left_background_focused_normal"/>
+   <button function="left_middle_background" state="prelight" draw_ops="left_middle_background_focused_normal"/>
+   <button function="left_right_background" state="prelight" draw_ops="left_right_background_focused_normal"/>
+   <button function="left_left_background" state="pressed" draw_ops="left_left_background_focused_pressed"/>
+   <button function="left_middle_background" state="pressed" draw_ops="left_middle_background_focused_pressed"/>
+   <button function="left_right_background" state="pressed" draw_ops="left_right_background_focused_pressed"/>
+   <button function="right_left_background" state="normal" draw_ops="right_left_background_focused_normal"/>
+   <button function="right_middle_background" state="normal" draw_ops="right_middle_background_focused_normal"/>
+   <button function="right_right_background" state="normal" draw_ops="right_right_background_focused_normal"/>
+   <button function="right_left_background" state="prelight" draw_ops="right_left_background_focused_normal"/>
+   <button function="right_middle_background" state="prelight" draw_ops="right_middle_background_focused_normal"/>
+   <button function="right_right_background" state="prelight" draw_ops="right_right_background_focused_normal"/>
+   <button function="right_left_background" state="pressed" draw_ops="right_left_background_focused_pressed"/>
+   <button function="right_middle_background" state="pressed" draw_ops="right_middle_background_focused_pressed"/>
+   <button function="right_right_background" state="pressed" draw_ops="right_right_background_focused_pressed"/>
    <button function="close" state="normal" draw_ops="button_close_normal"/>
    <button function="close" state="prelight" draw_ops="button_close_prelight"/>
    <button function="close" state="pressed" draw_ops="button_close_pressed"/>
@@ -508,15 +510,33 @@
    <button function="maximize" state="pressed" draw_ops="button_max_pressed"/>
    <button function="menu" state="normal" draw_ops="button_menu_normal"/>
    <button function="menu" state="prelight" draw_ops="button_menu_prelight"/>
-   <button function="menu" state="pressed" draw_ops="button_menu_normal"/>
+   <button function="menu" state="pressed" draw_ops="button_menu_pressed"/>
 </frame_style>
 
 <frame_style name="frame_style_maximized_unfocused" geometry="frame_geometry_abnormal">
    <piece position="title" draw_ops="draw_title_text_inactive"/>
    <piece position="titlebar" draw_ops="draw_title_maximized_inactive"/>
-   <piece position="left_edge" draw_ops="left_edge"/>
-   <piece position="right_edge" draw_ops="right_edge"/>
+   <piece position="left_edge" draw_ops="draw_frame"/>
+   <piece position="right_edge" draw_ops="draw_frame"/>
    <piece position="bottom_edge" draw_ops="bottom_edge"/>
+   <button function="left_left_background" state="normal" draw_ops="left_left_background_unfocused_normal"/>
+   <button function="left_middle_background" state="normal" draw_ops="left_middle_background_unfocused_normal"/>
+   <button function="left_right_background" state="normal" draw_ops="left_right_background_unfocused_normal"/>
+   <button function="left_left_background" state="prelight" draw_ops="left_left_background_unfocused_normal"/>
+   <button function="left_middle_background" state="prelight" draw_ops="left_middle_background_unfocused_normal"/>
+   <button function="left_right_background" state="prelight" draw_ops="left_right_background_unfocused_normal"/>
+   <button function="left_left_background" state="pressed" draw_ops="left_left_background_unfocused_pressed"/>
+   <button function="left_middle_background" state="pressed" draw_ops="left_middle_background_unfocused_pressed"/>
+   <button function="left_right_background" state="pressed" draw_ops="left_right_background_unfocused_pressed"/>
+   <button function="right_left_background" state="normal" draw_ops="right_left_background_unfocused_normal"/>
+   <button function="right_middle_background" state="normal" draw_ops="right_middle_background_unfocused_normal"/>
+   <button function="right_right_background" state="normal" draw_ops="right_right_background_unfocused_normal"/>
+   <button function="right_left_background" state="prelight" draw_ops="right_left_background_unfocused_normal"/>
+   <button function="right_middle_background" state="prelight" draw_ops="right_middle_background_unfocused_normal"/>
+   <button function="right_right_background" state="prelight" draw_ops="right_right_background_unfocused_normal"/>
+   <button function="right_left_background" state="pressed" draw_ops="right_left_background_unfocused_pressed"/>
+   <button function="right_middle_background" state="pressed" draw_ops="right_middle_background_unfocused_pressed"/>
+   <button function="right_right_background" state="pressed" draw_ops="right_right_background_unfocused_pressed"/>
    <button function="close" state="normal" draw_ops="button_close_inactive"/>
    <button function="close" state="prelight" draw_ops="button_close_inactive_prelight"/>
    <button function="close" state="pressed" draw_ops="button_close_inactive"/>
@@ -527,7 +547,7 @@
    <button function="maximize" state="prelight" draw_ops="button_max_inactive_prelight"/>
    <button function="maximize" state="pressed" draw_ops="button_max_inactive"/>
    <button function="menu" state="normal" draw_ops="button_menu_inactive"/>
-   <button function="menu" state="prelight" draw_ops="button_menu_inactive"/>
+   <button function="menu" state="prelight" draw_ops="button_menu_inactive_prelight"/>
    <button function="menu" state="pressed" draw_ops="button_menu_inactive"/>
 </frame_style>