diff --git a/Paper/gtk-2.0/gtkrc b/Paper/gtk-2.0/gtkrc
index 3213244..fa6c6b8 100644
--- a/Paper/gtk-2.0/gtkrc
+++ b/Paper/gtk-2.0/gtkrc
@@ -17,7 +17,7 @@
 
 # Paper GTK2 Theme
 
-gtk-color-scheme = "base_color:#FFFFFF\nfg_color:#555555\ntooltip_fg_color:#FFFFFF\nmenubar_color:#636E73\nselected_bg_color:#9FB0B9\nselected_fg_color:#FFFFFF\ntext_color:#555555\nwm_color:#636E73\nunfocused_wm_color:#454D50\nbg_color:#EFEFEF\ninsensitive_bg_color:#efefef\ntooltip_bg_color:#333333\npanel_bg_color:#576165\npanel_fg_color:#efefef\nlink_color:#9FB0B9"
+gtk-color-scheme = "base_color:#FFFFFF\nfg_color:#555555\ntooltip_fg_color:#FFFFFF\nmenubar_color:#636E73\nselected_bg_color:#9FB0B9\nselected_fg_color:#FFFFFF\ntext_color:#555555\nwm_color:#636E73\nunfocused_wm_color:#5A6367\nbg_color:#EFEFEF\ninsensitive_bg_color:#efefef\ntooltip_bg_color:#333333\npanel_bg_color:#576165\npanel_fg_color:#efefef\nlink_color:#9FB0B9"
 
 gtk-auto-mnemonics              = 1
 gtk-primary-button-warps-slider = 1
diff --git a/Paper/gtk-3.0/apps/unity.css b/Paper/gtk-3.0/apps/unity.css
index 3092074..63576b9 100644
--- a/Paper/gtk-3.0/apps/unity.css
+++ b/Paper/gtk-3.0/apps/unity.css
@@ -21,7 +21,7 @@
  ****************/
 
 @define-color unity #636E73; /* Unity window border color */
-@define-color backdrop_unity #454D50; /* Backdrop Unity window border color */
+@define-color backdrop_unity #5A6367; /* Backdrop Unity window border color */
 @define-color unity_text #dbdee0; /* Unity window text color */
 @define-color backdrop_unity_text #909598; /* Backdrop Unity window text color */
 @define-color unity_panel #454D50; /* Unity panel color */
diff --git a/Paper/gtk-3.0/gtk.css b/Paper/gtk-3.0/gtk.css
index aba52a1..1624e3d 100644
--- a/Paper/gtk-3.0/gtk.css
+++ b/Paper/gtk-3.0/gtk.css
@@ -33,6 +33,8 @@
 @define-color backdrop_header #454D50; /* Header backdrop color */
 @define-color header_text #fff;/* Header text color */
 @define-color header_text_dark alpha(#000, 0.5);/* Header text color */
+@define-color menu #636E73;/* Menu color */
+@define-color menu_text #dbdee0;/* Menu color */
 @define-color selection #9FB0B9;/* Selection color */
 @define-color view_background #ffffff;/* View background */
 @define-color inactive_frame @border;/* Inactive frame color */
diff --git a/Paper/metacity-1/metacity-theme.xml b/Paper/metacity-1/metacity-theme.xml
index d2340a2..1274380 100644
--- a/Paper/metacity-1/metacity-theme.xml
+++ b/Paper/metacity-1/metacity-theme.xml
@@ -29,9 +29,9 @@
 
 <!-- CONSTANTS -->
 <constant name="C_titlebar" value="#636E73" />
-<constant name="C_titlebar_unfocused" value="#454D50" />
+<constant name="C_titlebar_unfocused" value="#5A6367" />
 <constant name="C_border_focused" value="#636E73" />
-<constant name="C_border_unfocused" value="#454D50" />
+<constant name="C_border_unfocused" value="#5A6367" />
 <constant name="C_title_focused" value="#D3D4D5" />
 <constant name="C_title_unfocused" value="#929A9D" />
 
@@ -42,8 +42,8 @@
 	<distance name="left_width" value="1" />
 	<distance name="right_width" value="1" />
 	<distance name="bottom_height" value="1" />
-	<distance name="left_titlebar_edge" value="1" />
-	<distance name="right_titlebar_edge" value="1" />
+	<distance name="left_titlebar_edge" value="5" />
+	<distance name="right_titlebar_edge" value="5" />
 	<distance name="title_vertical_pad" value="4" />
 	<aspect_ratio name="button" value="1.0" />
 	<border name="title_border" left="4" right="4" top="4" bottom="4" />
@@ -55,9 +55,10 @@
 	<distance name="left_width" value="1" />
 	<distance name="right_width" value="1" />
 	<distance name="bottom_height" value="1" />
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
+	<distance name="left_titlebar_edge" value="5"/>
+	<distance name="right_titlebar_edge" value="5"/>
 	<distance name="title_vertical_pad" value="4" />
+	<border name="title_border" left="4" right="4" top="4" bottom="4" />
 	<border name="button_border" left="0" right="0" top="4" bottom="4" />
 </frame_geometry>
 
@@ -90,8 +91,8 @@
 
 <!-- Small unfocused window -->
 <frame_geometry name="small_unfocused" parent="small">
-	<distance name="left_titlebar_edge" value="1"/>
-	<distance name="right_titlebar_edge" value="1"/>
+	<distance name="left_titlebar_edge" value="5"/>
+	<distance name="right_titlebar_edge" value="5"/>
 </frame_geometry>
 
 <!-- No buttons -->
@@ -113,7 +114,7 @@
 	<distance name="left_width" value="0" />
 	<distance name="right_width" value="0" />
 	<distance name="bottom_height" value="0" />
-	<distance name="title_vertical_pad" value="0" />
+	<distance name="title_vertical_pad" value="8" />
 	<border name="title_border" left="0" right="0" top="0" bottom="0" />
 	<border name="button_border" left="0" right="0" top="0" bottom="0" />
 </frame_geometry>
@@ -156,7 +157,7 @@
 </draw_ops>
 
 <draw_ops name="titlebar_fill_focused">
-	<rectangle color="C_titlebar" x="0" y="0" width="width" height="height" filled="true" />
+	<rectangle color="C_titlebar" x="4" y="0" width="width" height="height" filled="true" />
 </draw_ops>
 
 <draw_ops name="titlebar_fill_attached_focused">
@@ -244,147 +245,147 @@
 
 <!-- Close icon -->
 <draw_ops name="close_focused">
-	<image filename="close_focused_normal.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="close_focused_normal.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="close_focused_prelight">
-	<image filename="close_focused_prelight.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="close_focused_prelight.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="close_focused_pressed">
-	<image filename="close_focused_pressed.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="close_focused_pressed.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="close_unfocused">
-	<image filename="close_unfocused.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="close_unfocused.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="close_unfocused_prelight">
-	<image filename="close_unfocused_prelight.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="close_unfocused_prelight.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="close_unfocused_pressed">
-	<image filename="close_unfocused_pressed.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="close_unfocused_pressed.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 
 
 <!-- Maximize icon -->
 <draw_ops name="maximize_focused">
-	<image filename="maximize_focused_normal.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="maximize_focused_normal.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="maximize_focused_prelight">
-	<image filename="maximize_focused_prelight.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="maximize_focused_prelight.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="maximize_focused_pressed">
-	<image filename="maximize_focused_pressed.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="maximize_focused_pressed.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="maximize_unfocused">
-	<image filename="maximize_unfocused.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="maximize_unfocused.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="maximize_unfocused_prelight">
-	<image filename="maximize_unfocused_prelight.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="maximize_unfocused_prelight.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="maximize_unfocused_pressed">
-	<image filename="maximize_unfocused_pressed.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="maximize_unfocused_pressed.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 
 <!-- Unmaximize icon -->
 <draw_ops name="unmaximize_focused">
-	<image filename="unmaximize_focused_normal.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="unmaximize_focused_normal.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="unmaximize_focused_prelight">
-	<image filename="unmaximize_focused_prelight.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="unmaximize_focused_prelight.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="unmaximize_focused_pressed">
-	<image filename="unmaximize_focused_pressed.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="unmaximize_focused_pressed.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="unmaximize_unfocused">
-	<image filename="unmaximize_unfocused.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="unmaximize_unfocused.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="unmaximize_unfocused_prelight">
-	<image filename="unmaximize_unfocused_prelight.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="unmaximize_unfocused_prelight.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="unmaximize_unfocused_pressed">
-	<image filename="unmaximize_unfocused_prelight.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="unmaximize_unfocused_prelight.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 
 
 <!-- Minimize icon -->
 <draw_ops name="minimize_focused">
-	<image filename="minimize_focused_normal.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="minimize_focused_normal.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="minimize_focused_prelight">
-	<image filename="minimize_focused_prelight.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="minimize_focused_prelight.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="minimize_focused_pressed">
-	<image filename="minimize_focused_pressed.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="minimize_focused_pressed.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="minimize_unfocused">
-	<image filename="minimize_unfocused.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="minimize_unfocused.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="minimize_unfocused_prelight">
-	<image filename="minimize_unfocused_prelight.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="minimize_unfocused_prelight.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="minimize_unfocused_pressed">
-	<image filename="minimize_unfocused_pressed.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="minimize_unfocused_pressed.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 
 
 <!-- Menu icon -->
 <draw_ops name="menu_focused">
-	<image filename="menu_focused_normal.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="menu_focused_normal.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="menu_focused_prelight">
-	<image filename="menu_focused_prelight.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="menu_focused_prelight.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="menu_focused_pressed">
-	<image filename="menu_focused_pressed.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="menu_focused_pressed.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="menu_unfocused">
-	<image filename="menu_unfocused.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="menu_unfocused.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="menu_unfocused_prelight">
-	<image filename="menu_unfocused_prelight.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="menu_unfocused_prelight.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="menu_unfocused_pressed">
-	<image filename="menu_unfocused_pressed.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="menu_unfocused_pressed.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 
 
 <!-- Shade icon -->
 <draw_ops name="shade_focused">
-	<image filename="shade_focused_normal.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="shade_focused_normal.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="shade_focused_prelight">
-	<image filename="shade_focused_prelight.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="shade_focused_prelight.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="shade_focused_pressed">
-	<image filename="shade_focused_pressed.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="shade_focused_pressed.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="shade_unfocused">
-	<image filename="shade_unfocused.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="shade_unfocused.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="shade_unfocused_prelight">
-	<image filename="shade_unfocused_prelight.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="shade_unfocused_prelight.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="shade_unfocused_pressed">
-	<image filename="shade_unfocused_pressed.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="shade_unfocused_pressed.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 
 
 <!-- Unshade icon -->
 <draw_ops name="unshade_focused">
-	<image filename="unshade_focused_normal.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="unshade_focused_normal.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="unshade_focused_prelight">
-	<image filename="unshade_focused_prelight.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="unshade_focused_prelight.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="unshade_focused_pressed">
-	<image filename="unshade_focused_pressed.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="unshade_focused_pressed.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="unshade_unfocused">
-	<image filename="unshade_unfocused.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="unshade_unfocused.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="unshade_unfocused_prelight">
-	<image filename="unshade_unfocused_prelight.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="unshade_unfocused_prelight.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>
 <draw_ops name="unshade_unfocused_pressed">
-	<image filename="unshade_unfocused_pressed.png" x="5" y="2" width="object_width" height="object_height" />
+	<image filename="unshade_unfocused_pressed.png" x="0" y="2" width="object_width" height="object_height" />
 </draw_ops>