diff --git a/common/metacity-1/metacity-theme-1-dark.xml b/common/metacity-1/metacity-theme-1-dark.xml
index 221dd05..56abe4d 100644
--- a/common/metacity-1/metacity-theme-1-dark.xml
+++ b/common/metacity-1/metacity-theme-1-dark.xml
@@ -149,95 +149,95 @@
 
 <!--close-->
 <draw_ops name="close_focused">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused">
-	<image filename="button-bg.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <!--maximize-->
 <draw_ops name="maximize_focused">
-	<image filename="max-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused">
-	<image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <!--minimize-->
 <draw_ops name="minimize_focused">
-	<image filename="min-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused">
-	<image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 
diff --git a/common/metacity-1/metacity-theme-1.xml b/common/metacity-1/metacity-theme-1.xml
index 1556013..8c56f3e 100644
--- a/common/metacity-1/metacity-theme-1.xml
+++ b/common/metacity-1/metacity-theme-1.xml
@@ -149,95 +149,95 @@
 
 <!--close-->
 <draw_ops name="close_focused">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused">
-	<image filename="button-bg.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <!--maximize-->
 <draw_ops name="maximize_focused">
-	<image filename="max-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused">
-	<image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <!--minimize-->
 <draw_ops name="minimize_focused">
-	<image filename="min-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused">
-	<image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 
diff --git a/common/metacity-1/metacity-theme-2-dark.xml b/common/metacity-1/metacity-theme-2-dark.xml
index 221dd05..56abe4d 100644
--- a/common/metacity-1/metacity-theme-2-dark.xml
+++ b/common/metacity-1/metacity-theme-2-dark.xml
@@ -149,95 +149,95 @@
 
 <!--close-->
 <draw_ops name="close_focused">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused">
-	<image filename="button-bg.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <!--maximize-->
 <draw_ops name="maximize_focused">
-	<image filename="max-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused">
-	<image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <!--minimize-->
 <draw_ops name="minimize_focused">
-	<image filename="min-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused">
-	<image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 
diff --git a/common/metacity-1/metacity-theme-2.xml b/common/metacity-1/metacity-theme-2.xml
index 1556013..8c56f3e 100644
--- a/common/metacity-1/metacity-theme-2.xml
+++ b/common/metacity-1/metacity-theme-2.xml
@@ -149,95 +149,95 @@
 
 <!--close-->
 <draw_ops name="close_focused">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused">
-	<image filename="button-bg.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <!--maximize-->
 <draw_ops name="maximize_focused">
-	<image filename="max-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused">
-	<image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <!--minimize-->
 <draw_ops name="minimize_focused">
-	<image filename="min-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused">
-	<image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 
diff --git a/common/metacity-1/metacity-theme-3.xml b/common/metacity-1/metacity-theme-3.xml
index 49b5dd7..c4ed2c4 100644
--- a/common/metacity-1/metacity-theme-3.xml
+++ b/common/metacity-1/metacity-theme-3.xml
@@ -188,95 +188,95 @@
 
 <!--close-->
 <draw_ops name="close_focused">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused">
-	<image filename="button-bg.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="close_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_close_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="close-icon.svg" colorize="C_icon_close_bg" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <!--maximize-->
 <draw_ops name="maximize_focused">
-	<image filename="max-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused">
-	<image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="maximize_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="max-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <!--minimize-->
 <draw_ops name="minimize_focused">
-	<image filename="min-icon.svg" colorize="C_icon_bg_focused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_focused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_focused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused">
-	<image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_unfocused" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_prelight">
-	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="button-border.svg" colorize="C_button_border_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="button-border.svg" colorize="C_button_border_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_hover" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>
 
 <draw_ops name="minimize_unfocused_pressed">
-	<image filename="button-bg.svg" colorize="C_button_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
-	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="width/2-8" y="height/2-8" width="16" height="16"/>
+	<image filename="button-bg.svg" colorize="C_button_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
+	<image filename="min-icon.svg" colorize="C_icon_bg_active" x="(width-object_width)/2" y="(height-object_height)/2" width="object_width" height="object_height"/>
 </draw_ops>