diff --git a/gtk-3.0/gtk-contained.css b/gtk-3.0/gtk-contained.css
index 991667f..36a406c 100644
--- a/gtk-3.0/gtk-contained.css
+++ b/gtk-3.0/gtk-contained.css
@@ -3131,7 +3131,7 @@ GtkFileChooserDialog .action-bar.frame {
 @define-color wm_title rgba(82, 93, 118, 0.8);
 @define-color wm_unfocused_title alpha(rgba(82, 93, 118, 0.8), 0.7);
 @define-color wm_bg #e7e8eb;
-@define-color wm_bg_unfocused #e7e8eb;
+@define-color wm_bg_unfocused #eff0f2;
 @define-color wm_highlight #f2f3f4;
 @define-color wm_shadow alpha(black, 0.35);
 @define-color content_view_bg #ffffff;
diff --git a/metacity-1/metacity-theme-1.xml b/metacity-1/metacity-theme-1.xml
index fb1c86e..ba83938 100644
--- a/metacity-1/metacity-theme-1.xml
+++ b/metacity-1/metacity-theme-1.xml
@@ -24,12 +24,13 @@
 	<distance name="left_width" value="0" />
 	<distance name="right_width" value="0" />
 	<distance name="bottom_height" value="0" />
-	<distance name="left_titlebar_edge" value="0"/>
-	<distance name="right_titlebar_edge" value="0"/>
+	<distance name="left_titlebar_edge" value="5"/>
+	<distance name="right_titlebar_edge" value="5"/>
 	<distance name="title_vertical_pad" value="3"/>
 	<border name="title_border" left="10" right="10" top="3" bottom="3"/>
-	<border name="button_border" left="4" right="4" top="0" bottom="0"/>
-	<aspect_ratio name="button" value="1.0"/>
+	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
+  <distance name="button_width" value="30"/>
+  <distance name="button_height" value="16"/>
 </frame_geometry>
 
 <frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="1" rounded_top_right="1" parent="normal">
@@ -50,7 +51,6 @@
 <frame_geometry name="small" title_scale="small" parent="normal" hide_buttons="true" rounded_top_left="1" rounded_top_right="1">
 	<distance name="title_vertical_pad" value="7"/>
 	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="3" right="3" top="0" bottom="2"/>
 </frame_geometry>
 
 <frame_geometry name="small_unfocused" parent="small">
@@ -64,7 +64,6 @@
 	<distance name="bottom_height" value="0" />
 	<distance name="title_vertical_pad" value="0" />
 	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="3" right="3" top="0" bottom="0"/>
 </frame_geometry>
 
 <frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" parent="small">
diff --git a/metacity-1/metacity-theme-2.xml b/metacity-1/metacity-theme-2.xml
index fb1c86e..ba83938 100644
--- a/metacity-1/metacity-theme-2.xml
+++ b/metacity-1/metacity-theme-2.xml
@@ -24,12 +24,13 @@
 	<distance name="left_width" value="0" />
 	<distance name="right_width" value="0" />
 	<distance name="bottom_height" value="0" />
-	<distance name="left_titlebar_edge" value="0"/>
-	<distance name="right_titlebar_edge" value="0"/>
+	<distance name="left_titlebar_edge" value="5"/>
+	<distance name="right_titlebar_edge" value="5"/>
 	<distance name="title_vertical_pad" value="3"/>
 	<border name="title_border" left="10" right="10" top="3" bottom="3"/>
-	<border name="button_border" left="4" right="4" top="0" bottom="0"/>
-	<aspect_ratio name="button" value="1.0"/>
+	<border name="button_border" left="0" right="0" top="0" bottom="0"/>
+  <distance name="button_width" value="30"/>
+  <distance name="button_height" value="16"/>
 </frame_geometry>
 
 <frame_geometry name="normal_unfocused" title_scale="medium" rounded_top_left="1" rounded_top_right="1" parent="normal">
@@ -50,7 +51,6 @@
 <frame_geometry name="small" title_scale="small" parent="normal" hide_buttons="true" rounded_top_left="1" rounded_top_right="1">
 	<distance name="title_vertical_pad" value="7"/>
 	<border name="title_border" left="10" right="10" top="0" bottom="1"/>
-	<border name="button_border" left="3" right="3" top="0" bottom="2"/>
 </frame_geometry>
 
 <frame_geometry name="small_unfocused" parent="small">
@@ -64,7 +64,6 @@
 	<distance name="bottom_height" value="0" />
 	<distance name="title_vertical_pad" value="0" />
 	<border name="title_border" left="10" right="10" top="0" bottom="0" />
-	<border name="button_border" left="3" right="3" top="0" bottom="0"/>
 </frame_geometry>
 
 <frame_geometry name="modal" title_scale="small" hide_buttons="true" rounded_top_left="1" rounded_top_right="1" parent="small">