diff --git a/themes/Wintergreen/metacity-1/metacity-theme-1.xml b/themes/Wintergreen/metacity-1/metacity-theme-1.xml
index 6a43bf9..a3e7f6d 100644
--- a/themes/Wintergreen/metacity-1/metacity-theme-1.xml
+++ b/themes/Wintergreen/metacity-1/metacity-theme-1.xml
@@ -55,8 +55,7 @@
 	<constant name="MinArrowSize" value="7"/>
 	<constant name="ButtonIPad" value="6"/>
 	<constant name="ThickLineWidth" value="3"/>
-	<constant name="IconTitleSpacing" value="2"/>
-	<constant name="SpacerWidth" value="6"/>
+	<constant name="IconTitleSpacing" value="6"/>
 	<constant name="SpacerHeight" value="9"/>
 	<constant name="SpacerOffset" value="4"/>
 	<!-- Buttons -->
@@ -125,48 +124,38 @@
 		<include name="focus_outline"/>
 	</draw_ops>
 	<draw_ops name="title_gradient">
-		<gradient type="diagonal" x="0" y="0" width="width-SpacerWidth" height="height">
-			<color value="#3D808F"/>
-			<color value="#3D808F"/>
-		</gradient>
-	</draw_ops>
-	<draw_ops name="title_spacer">
-		<gtk_vline state="normal" x="width+1-SpacerWidth/2" y1="SpacerOffset" y2="height - SpacerOffset"/>
+		<rectangle color="#3D808F" filled="true" x="mini_icon_width + IconTitleSpacing" y="0" width="width" height="height" />
 	</draw_ops>
 	<draw_ops name="title_text_focused_with_icon">
-		<clip x="0" y="0" width="width-SpacerWidth" height="height"/>
-		<title color="#FFFFFF" x="(0 `max` (width-title_width-mini_icon_width-IconTitleSpacing)) / 2 + mini_icon_width + IconTitleSpacing" y="((height - title_height) / 2) `max` 0"/>
-		<icon x="(0 `max` (width-title_width-mini_icon_width-IconTitleSpacing)) / 2" y="(height-mini_icon_height) / 2" width="mini_icon_width" height="mini_icon_height"/>
+		<clip x="0" y="0" width="width" height="height"/>
+		<title color="#FFFFFF" x="(4 `max` (width-title_width-mini_icon_width-IconTitleSpacing)) / 2 + mini_icon_width + IconTitleSpacing" y="((height - title_height) / 2) `max` 0"/>
+		<icon x="0" y="(height-mini_icon_height) / 2" width="mini_icon_width" height="mini_icon_height"/>
 	</draw_ops>
 	<draw_ops name="title_text_focused_no_icon">
-		<clip x="0" y="0" width="width-SpacerWidth" height="height"/>
-		<title color="gtk:fg[SELECTED]" x="(0 `max` (width-title_width)) / 2" y="((height - title_height) / 2) `max` 0"/>
+		<clip x="0" y="0" width="width" height="height"/>
+		<title color="gtk:fg[SELECTED]" x="(4 `max` (width-title_width)) / 2" y="((height - title_height) / 2) `max` 0"/>
 	</draw_ops>
 	<draw_ops name="title_text_with_icon">
-		<clip x="0" y="0" width="width-SpacerWidth" height="height"/>
-		<title color="gtk:fg[NORMAL]" x="(0 `max` (width-title_width-mini_icon_width-IconTitleSpacing)) / 2 + mini_icon_width + IconTitleSpacing" y="((height - title_height) / 2) `max` 0"/>
-		<icon x="(0 `max` (width-title_width-mini_icon_width-IconTitleSpacing)) / 2" y="(height-mini_icon_height) / 2" width="mini_icon_width" height="mini_icon_height"/>
+		<clip x="0" y="0" width="width" height="height"/>
+		<title color="gtk:fg[NORMAL]" x="(4 `max` (width-title_width-mini_icon_width-IconTitleSpacing)) / 2 + mini_icon_width + IconTitleSpacing" y="((height - title_height) / 2) `max` 0"/>
+		<icon x="0" y="(height-mini_icon_height) / 2" width="mini_icon_width" height="mini_icon_height"/>
 	</draw_ops>
 	<draw_ops name="title_text_no_icon">
-		<clip x="0" y="0" width="width-SpacerWidth" height="height"/>
-		<title color="gtk:fg[NORMAL]" x="(0 `max` (width-title_width)) / 2" y="((height - title_height) / 2) `max` 0"/>
+		<clip x="0" y="0" width="width" height="height"/>
+		<title color="gtk:fg[NORMAL]" x="(4 `max` (width-title_width)) / 2" y="((height - title_height) / 2) `max` 0"/>
 	</draw_ops>
 	<draw_ops name="title_normal">
-		<include name="title_spacer"/>
 		<include name="title_text_with_icon"/>
 	</draw_ops>
 	<draw_ops name="title_focused">
 		<include name="title_gradient"/>
-		<include name="title_spacer"/>
 		<include name="title_text_focused_with_icon"/>
 	</draw_ops>
 	<draw_ops name="title_utility">
-		<include name="title_spacer"/>
 		<include name="title_text_no_icon"/>
 	</draw_ops>
 	<draw_ops name="title_utility_focused">
 		<include name="title_gradient"/>
-		<include name="title_spacer"/>
 		<include name="title_text_focused_no_icon"/>
 	</draw_ops>
 	<frame_style name="normal_unfocused" geometry="normal">