put Gorilla back in the build

2002-07-23  Havoc Pennington  <hp@redhat.com>

	* src/themes/Makefile.am (THEMES): put Gorilla back in the build

	* src/themes/Gorilla/metacity-theme-1.xml,
	src/themes/Crux/metacity-theme-1.xml: fixes from
	Sebastien Delestaing so that these themes work properly with
	different font sizes.

	* src/frames.c (get_control): patch from Balamurali Viswanathan
	for #81984 (resize titlebar from the top not the bottom)

60 files changed, 139 insertions, 210 deletions

diff --git a/src/themes/AgingGorilla/active-button.png b/src/themes/AgingGorilla/active-button.png
index a299ddb2..64455b33 100644
--- a/src/themes/AgingGorilla/active-button.png
+++ b/src/themes/AgingGorilla/active-button.png
diff --git a/src/themes/AgingGorilla/active-close-button.png b/src/themes/AgingGorilla/active-close-button.png
index b77f77ae..1d292165 100644
--- a/src/themes/AgingGorilla/active-close-button.png
+++ b/src/themes/AgingGorilla/active-close-button.png
diff --git a/src/themes/AgingGorilla/active-close-menu-icon.png b/src/themes/AgingGorilla/active-close-menu-icon.png
new file mode 100644
index 00000000..b77f77ae
--- /dev/null
+++ b/src/themes/AgingGorilla/active-close-menu-icon.png
diff --git a/src/themes/AgingGorilla/active-maximize-button.png b/src/themes/AgingGorilla/active-maximize-button.png
index 02ccc37a..a982e5cb 100644
--- a/src/themes/AgingGorilla/active-maximize-button.png
+++ b/src/themes/AgingGorilla/active-maximize-button.png
diff --git a/src/themes/AgingGorilla/active-maximize-menu-icon.png b/src/themes/AgingGorilla/active-maximize-menu-icon.png
new file mode 100644
index 00000000..02ccc37a
--- /dev/null
+++ b/src/themes/AgingGorilla/active-maximize-menu-icon.png
diff --git a/src/themes/AgingGorilla/active-menu-button.png b/src/themes/AgingGorilla/active-menu-button.png
index aa12b497..b55d7078 100644
--- a/src/themes/AgingGorilla/active-menu-button.png
+++ b/src/themes/AgingGorilla/active-menu-button.png
diff --git a/src/themes/AgingGorilla/active-minimize-button.png b/src/themes/AgingGorilla/active-minimize-button.png
index 29276929..4205f4e8 100644
--- a/src/themes/AgingGorilla/active-minimize-button.png
+++ b/src/themes/AgingGorilla/active-minimize-button.png
diff --git a/src/themes/AgingGorilla/active-minimize-menu-icon.png b/src/themes/AgingGorilla/active-minimize-menu-icon.png
new file mode 100644
index 00000000..29276929
--- /dev/null
+++ b/src/themes/AgingGorilla/active-minimize-menu-icon.png
diff --git a/src/themes/AgingGorilla/inactive-close-button.png b/src/themes/AgingGorilla/inactive-close-button.png
index 86359921..c566b12f 100644
--- a/src/themes/AgingGorilla/inactive-close-button.png
+++ b/src/themes/AgingGorilla/inactive-close-button.png
diff --git a/src/themes/AgingGorilla/inactive-maximize-button.png b/src/themes/AgingGorilla/inactive-maximize-button.png
index 4e892999..9c838823 100644
--- a/src/themes/AgingGorilla/inactive-maximize-button.png
+++ b/src/themes/AgingGorilla/inactive-maximize-button.png
diff --git a/src/themes/AgingGorilla/inactive-menu-button.png b/src/themes/AgingGorilla/inactive-menu-button.png
index 99476b74..b000a378 100644
--- a/src/themes/AgingGorilla/inactive-menu-button.png
+++ b/src/themes/AgingGorilla/inactive-menu-button.png
diff --git a/src/themes/AgingGorilla/inactive-minimize-button.png b/src/themes/AgingGorilla/inactive-minimize-button.png
index 125aa6f7..4459af4e 100644
--- a/src/themes/AgingGorilla/inactive-minimize-button.png
+++ b/src/themes/AgingGorilla/inactive-minimize-button.png
diff --git a/src/themes/AgingGorilla/metacity-theme-1.xml b/src/themes/AgingGorilla/metacity-theme-1.xml
index fd9290fc..7dde366a 100644
--- a/src/themes/AgingGorilla/metacity-theme-1.xml
+++ b/src/themes/AgingGorilla/metacity-theme-1.xml
@@ -18,32 +18,15 @@
   <distance name="bottom_height" value="6"/>
   <distance name="left_titlebar_edge" value="8"/>
   <distance name="right_titlebar_edge" value="8"/>
-  <distance name="button_width" value="18"/>
-  <distance name="button_height" value="18"/>
+  <aspect_ratio name="button" value="1.0"/>
   <distance name="title_vertical_pad" value="0"/>
-  <border name="title_border" left="0" right="0" top="4" bottom="0"/>
-  <border name="button_border" left="0" right="0" top="8" bottom="0"/>
+  <border name="title_border" left="0" right="0" top="7" bottom="4"/>
+  <border name="button_border" left="0" right="0" top="9" bottom="0"/>
 </frame_geometry>
 
 
 <!-- Buttons -->
 
-<draw_ops name="active_button">
-  <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="active_button_pressed">
-  <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="inactive_button">
-  <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="inactive_button_pressed">
-  <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/>
-</draw_ops>
-
 <draw_ops name="title_tile">
   <line color="#494d59" x1="0" y1="0" x2="width" y2="0"/>
   <line color="#515961" x1="0" y1="1" x2="width" y2="1"/>
@@ -58,82 +41,73 @@
       <rectangle color="light gray" x="4" y="4" width="width - 9" height="height - 8" filled="false"/>
       <rectangle color="light gray" x="5" y="5" width="width - 11" height="height - 10" filled="false"/>
       <rectangle color="white" x="6" y="6" width="width - 13" height="height - 12" filled="false"/>
-      <rectangle color="gray" x="6" y="6" width="width - 12" height="height - 12" filled="true"/>
+      <rectangle color="gtk:bg[INSENSITIVE]" x="6" y="6" width="width - 12" height="height - 12" filled="true"/>
 
-      <line color="gray" x1="1" y1="1" x2="2" y2="2"/>
-      <line color="gray" x1="1" y1="height - 2" x2="1" y2="height"/>
-      <line color="gray" x1="width - 2" y1="1" x2="width - 1" y2="2"/>
-      <line color="gray" x1="width - 1" y1="height - 1" x2="width - 2" y2="height - 2"/>
+      <line color="gtk:bg[INSENSITIVE]" x1="1" y1="1" x2="2" y2="2"/>
+      <line color="gtk:bg[INSENSITIVE]" x1="1" y1="height - 2" x2="1" y2="height"/>
+      <line color="gtk:bg[INSENSITIVE]" x1="width - 2" y1="1" x2="width - 1" y2="2"/>
+      <line color="gtk:bg[INSENSITIVE]" x1="width - 1" y1="height - 1" x2="width - 2" y2="height - 2"/>
    </draw_ops>
   </piece>
 
   <piece position="title">
     <draw_ops>
-      <title color="gray" x="IconTitleSpacing" y="((height - title_height - 3) / 2) `max` 0"/>
+      <title color="gray" x="IconTitleSpacing" y="0"/>
     </draw_ops>
   </piece>
 
   <piece position="titlebar">
-
     <draw_ops>
-      <rectangle color="black" x="6" y="6" width="width - 12" height="16" filled="true"/>
-      <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="12"/>
+      <rectangle color="black" x="6" y="6" width="width - 12" height="height - 10" filled="true"/>
+      <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="height - 14"/>
     </draw_ops>
   </piece>
 
   <button function="close" state="normal">
     <draw_ops>
-      <include name="inactive_button"/>
-      <image filename="inactive-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-close-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="close" state="pressed">
     <draw_ops>
-      <include name="inactive_button_pressed"/>
-      <image filename="inactive-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-close-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="normal">
     <draw_ops>
-      <include name="inactive_button"/>
-      <image filename="inactive-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-minimize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="pressed">
     <draw_ops>
-      <include name="inactive_button_pressed"/>
-      <image filename="inactive-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-minimize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="normal">
     <draw_ops>
-      <include name="inactive_button"/>
-      <image filename="inactive-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-maximize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="pressed">
     <draw_ops>
-      <include name="inactive_button_pressed"/>
-      <image filename="inactive-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-maximize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="normal">
     <draw_ops>
-      <include name="inactive_button_pressed"/>
-      <image filename="inactive-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-menu-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="pressed">
     <draw_ops>
-      <include name="inactive_button_pressed"/>
-      <image filename="inactive-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-menu-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
@@ -155,81 +129,73 @@
       <rectangle color="light gray" x="4" y="4" width="width - 9" height="height - 8" filled="false"/>
       <rectangle color="light gray" x="5" y="5" width="width - 11" height="height - 10" filled="false"/>
       <rectangle color="white" x="6" y="6" width="width - 13" height="height - 12" filled="false"/>
-      <rectangle color="gray" x="6" y="6" width="width - 12" height="height - 12" filled="true"/>
+      <rectangle color="gtk:bg[NORMAL]" x="6" y="6" width="width - 12" height="height - 12" filled="true"/>
 
-      <line color="gray" x1="0" y1="0" x2="1" y2="1"/>
-      <line color="gray" x1="0" y1="height - 1" x2="1" y2="height"/>
-      <line color="gray" x1="width - 1" y1="0" x2="width" y2="1"/>
-      <line color="gray" x1="width" y1="height" x2="width - 1" y2="height - 1"/>
+      <line color="gtk:bg[NORMAL]" x1="0" y1="0" x2="1" y2="1"/>
+      <line color="gtk:bg[NORMAL]" x1="0" y1="height - 1" x2="1" y2="height"/>
+      <line color="gtk:bg[NORMAL]" x1="width - 1" y1="0" x2="width" y2="1"/>
+      <line color="gtk:bg[NORMAL]" x1="width" y1="height" x2="width - 1" y2="height - 1"/>
    </draw_ops>
   </piece>
 
   <piece position="title">
     <draw_ops>
-      <title color="white" x="IconTitleSpacing" y="((height - title_height - 3) / 2) `max` 0"/>
+      <title color="white" x="IconTitleSpacing" y="0"/>
     </draw_ops>
   </piece>
 
   <piece position="titlebar">
     <draw_ops>
-      <rectangle color="black" x="6" y="6" width="width - 12" height="16" filled="true"/>
-      <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="12"/>
+      <rectangle color="black" x="6" y="6" width="width - 12" height="height - 10" filled="true"/>
+      <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="height - 14"/>
     </draw_ops>
   </piece>
 
   <button function="close" state="normal">
     <draw_ops>
-      <include name="active_button"/>
-      <image filename="active-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-close-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="close" state="pressed">
     <draw_ops>
-      <include name="active_button_pressed"/>
-      <image filename="active-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-close-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="normal">
     <draw_ops>
-      <include name="active_button"/>
-      <image filename="active-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-minimize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="pressed">
     <draw_ops>
-      <include name="active_button_pressed"/>
-      <image filename="active-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-minimize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="normal">
     <draw_ops>
-      <include name="active_button"/>
-      <image filename="active-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-maximize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="pressed">
     <draw_ops>
-      <include name="active_button_pressed"/>
-      <image filename="active-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-maximize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="normal">
     <draw_ops>
-      <include name="active_button"/>
-      <image filename="active-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-menu-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="pressed">
     <draw_ops>
-      <include name="active_button_pressed"/>
-      <image filename="active-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-menu-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
@@ -256,10 +222,11 @@
 <window type="modal_dialog" style_set="normal"/>
 <window type="menu" style_set="normal"/>
 <window type="utility" style_set="normal"/>
+<window type="border" style_set="normal"/>
 
 <menu_icon function="maximize" state="normal">
   <draw_ops>
-    <image filename="active-maximize-button.png" 
+    <image filename="active-maximize-menu-icon.png" 
            x="(width - object_width) / 2"
            y="(height - object_height) / 2"
            width="object_width" height="object_height"/>
@@ -269,7 +236,7 @@
 
 <menu_icon function="close" state="normal">
   <draw_ops>
-    <image filename="active-close-button.png" 
+    <image filename="active-close-menu-icon.png" 
            x="(width - object_width) / 2"
            y="(height - object_height) / 2"
            width="object_width" height="object_height"/>
@@ -278,7 +245,7 @@
 
 <menu_icon function="minimize" state="normal">
   <draw_ops>
-    <image filename="active-minimize-button.png" 
+    <image filename="active-minimize-menu-icon.png" 
            x="(width - object_width) / 2"
            y="(height - object_height) / 2"
            width="object_width" height="object_height"/>
diff --git a/src/themes/Crux/active-border-top-left-border.png b/src/themes/Crux/active-border-top-left-border.png
index ea1e6651..2d61acf5 100644
--- a/src/themes/Crux/active-border-top-left-border.png
+++ b/src/themes/Crux/active-border-top-left-border.png
diff --git a/src/themes/Crux/active-border-top-right-border.png b/src/themes/Crux/active-border-top-right-border.png
index 521735b9..9797c0fc 100644
--- a/src/themes/Crux/active-border-top-right-border.png
+++ b/src/themes/Crux/active-border-top-right-border.png
diff --git a/src/themes/Crux/active-bottom-left-border.png b/src/themes/Crux/active-bottom-left-border.png
index c6657c6d..e85c329f 100644
--- a/src/themes/Crux/active-bottom-left-border.png
+++ b/src/themes/Crux/active-bottom-left-border.png
diff --git a/src/themes/Crux/active-bottom-right-border.png b/src/themes/Crux/active-bottom-right-border.png
index ed25d07a..4bcfe8a3 100644
--- a/src/themes/Crux/active-bottom-right-border.png
+++ b/src/themes/Crux/active-bottom-right-border.png
diff --git a/src/themes/Crux/active-button-prelight.png b/src/themes/Crux/active-button-prelight.png
index 7c8aa2fe..6da2ae25 100644
--- a/src/themes/Crux/active-button-prelight.png
+++ b/src/themes/Crux/active-button-prelight.png
diff --git a/src/themes/Crux/active-button-pressed.png b/src/themes/Crux/active-button-pressed.png
index b3c7bcc1..4fb94aa4 100644
--- a/src/themes/Crux/active-button-pressed.png
+++ b/src/themes/Crux/active-button-pressed.png
diff --git a/src/themes/Crux/active-button.png b/src/themes/Crux/active-button.png
index 5269b51a..cd93b8c5 100644
--- a/src/themes/Crux/active-button.png
+++ b/src/themes/Crux/active-button.png
diff --git a/src/themes/Crux/active-left-border.png b/src/themes/Crux/active-left-border.png
index eb74fe87..699a2d27 100644
--- a/src/themes/Crux/active-left-border.png
+++ b/src/themes/Crux/active-left-border.png
diff --git a/src/themes/Crux/active-left-top-border.png b/src/themes/Crux/active-left-top-border.png
index 7268769f..567b4a0f 100644
--- a/src/themes/Crux/active-left-top-border.png
+++ b/src/themes/Crux/active-left-top-border.png
diff --git a/src/themes/Crux/active-menu-button-prelight.png b/src/themes/Crux/active-menu-button-prelight.png
index 794f6db2..db0a88c8 100644
--- a/src/themes/Crux/active-menu-button-prelight.png
+++ b/src/themes/Crux/active-menu-button-prelight.png
diff --git a/src/themes/Crux/active-menu-button-pressed.png b/src/themes/Crux/active-menu-button-pressed.png
index dbdc18ed..8ac8201d 100644
--- a/src/themes/Crux/active-menu-button-pressed.png
+++ b/src/themes/Crux/active-menu-button-pressed.png
diff --git a/src/themes/Crux/active-menu-button.png b/src/themes/Crux/active-menu-button.png
index 8b110f58..de8e1a7b 100644
--- a/src/themes/Crux/active-menu-button.png
+++ b/src/themes/Crux/active-menu-button.png
diff --git a/src/themes/Crux/active-right-border.png b/src/themes/Crux/active-right-border.png
index 61c84b12..bcb54662 100644
--- a/src/themes/Crux/active-right-border.png
+++ b/src/themes/Crux/active-right-border.png
diff --git a/src/themes/Crux/active-right-top-border.png b/src/themes/Crux/active-right-top-border.png
index 4dd314f6..8b50f047 100644
--- a/src/themes/Crux/active-right-top-border.png
+++ b/src/themes/Crux/active-right-top-border.png
diff --git a/src/themes/Crux/active-top-center-left.png b/src/themes/Crux/active-top-center-left.png
index 7275abb0..aee3b766 100644
--- a/src/themes/Crux/active-top-center-left.png
+++ b/src/themes/Crux/active-top-center-left.png
diff --git a/src/themes/Crux/active-top-center-mid-left.png b/src/themes/Crux/active-top-center-mid-left.png
index 56678367..927d50e9 100644
--- a/src/themes/Crux/active-top-center-mid-left.png
+++ b/src/themes/Crux/active-top-center-mid-left.png
diff --git a/src/themes/Crux/inactive-border-top-left-border.png b/src/themes/Crux/inactive-border-top-left-border.png
index 61e7dc96..0f6a1b88 100644
--- a/src/themes/Crux/inactive-border-top-left-border.png
+++ b/src/themes/Crux/inactive-border-top-left-border.png
diff --git a/src/themes/Crux/inactive-border-top-right-border.png b/src/themes/Crux/inactive-border-top-right-border.png
index 819d66c7..0e37f50b 100644
--- a/src/themes/Crux/inactive-border-top-right-border.png
+++ b/src/themes/Crux/inactive-border-top-right-border.png
diff --git a/src/themes/Crux/inactive-bottom-left-border.png b/src/themes/Crux/inactive-bottom-left-border.png
index 3cb1ecc8..6d5e0ec2 100644
--- a/src/themes/Crux/inactive-bottom-left-border.png
+++ b/src/themes/Crux/inactive-bottom-left-border.png
diff --git a/src/themes/Crux/inactive-bottom-right-border.png b/src/themes/Crux/inactive-bottom-right-border.png
index cfd0c6c8..3302e015 100644
--- a/src/themes/Crux/inactive-bottom-right-border.png
+++ b/src/themes/Crux/inactive-bottom-right-border.png
diff --git a/src/themes/Crux/inactive-button-prelight.png b/src/themes/Crux/inactive-button-prelight.png
index 49be9fd0..070a164e 100644
--- a/src/themes/Crux/inactive-button-prelight.png
+++ b/src/themes/Crux/inactive-button-prelight.png
diff --git a/src/themes/Crux/inactive-button-pressed.png b/src/themes/Crux/inactive-button-pressed.png
index d215f9ac..88f3f8a0 100644
--- a/src/themes/Crux/inactive-button-pressed.png
+++ b/src/themes/Crux/inactive-button-pressed.png
diff --git a/src/themes/Crux/inactive-button.png b/src/themes/Crux/inactive-button.png
index a13abffb..e74564d2 100644
--- a/src/themes/Crux/inactive-button.png
+++ b/src/themes/Crux/inactive-button.png
diff --git a/src/themes/Crux/inactive-left-border.png b/src/themes/Crux/inactive-left-border.png
index 681a566d..a98ee930 100644
--- a/src/themes/Crux/inactive-left-border.png
+++ b/src/themes/Crux/inactive-left-border.png
diff --git a/src/themes/Crux/inactive-left-top-border.png b/src/themes/Crux/inactive-left-top-border.png
index 50ed2a8c..12694342 100644
--- a/src/themes/Crux/inactive-left-top-border.png
+++ b/src/themes/Crux/inactive-left-top-border.png
diff --git a/src/themes/Crux/inactive-menu-button-prelight.png b/src/themes/Crux/inactive-menu-button-prelight.png
index ecf6f940..8c45a1bb 100644
--- a/src/themes/Crux/inactive-menu-button-prelight.png
+++ b/src/themes/Crux/inactive-menu-button-prelight.png
diff --git a/src/themes/Crux/inactive-menu-button-pressed.png b/src/themes/Crux/inactive-menu-button-pressed.png
index a3a4ab84..757ff7c2 100644
--- a/src/themes/Crux/inactive-menu-button-pressed.png
+++ b/src/themes/Crux/inactive-menu-button-pressed.png
diff --git a/src/themes/Crux/inactive-menu-button.png b/src/themes/Crux/inactive-menu-button.png
index e6961df2..89b2a442 100644
--- a/src/themes/Crux/inactive-menu-button.png
+++ b/src/themes/Crux/inactive-menu-button.png
diff --git a/src/themes/Crux/inactive-right-border.png b/src/themes/Crux/inactive-right-border.png
index e9a009f1..206375bf 100644
--- a/src/themes/Crux/inactive-right-border.png
+++ b/src/themes/Crux/inactive-right-border.png
diff --git a/src/themes/Crux/inactive-right-top-border.png b/src/themes/Crux/inactive-right-top-border.png
index e8a523be..8b225ae5 100644
--- a/src/themes/Crux/inactive-right-top-border.png
+++ b/src/themes/Crux/inactive-right-top-border.png
diff --git a/src/themes/Crux/inactive-top-center-left.png b/src/themes/Crux/inactive-top-center-left.png
index d281f928..f901f13e 100644
--- a/src/themes/Crux/inactive-top-center-left.png
+++ b/src/themes/Crux/inactive-top-center-left.png
diff --git a/src/themes/Crux/inactive-top-center-right.png b/src/themes/Crux/inactive-top-center-right.png
index 2ea82f32..c4ec5eeb 100644
--- a/src/themes/Crux/inactive-top-center-right.png
+++ b/src/themes/Crux/inactive-top-center-right.png
diff --git a/src/themes/Crux/metacity-theme-1.xml b/src/themes/Crux/metacity-theme-1.xml
index 88da751d..b2219df7 100644
--- a/src/themes/Crux/metacity-theme-1.xml
+++ b/src/themes/Crux/metacity-theme-1.xml
@@ -19,11 +19,10 @@
   <distance name="bottom_height" value="6"/>
   <distance name="left_titlebar_edge" value="5"/>
   <distance name="right_titlebar_edge" value="6"/>
-  <distance name="button_width" value="16"/>
-  <distance name="button_height" value="16"/>
-  <distance name="title_vertical_pad" value="6"/>
-  <border name="title_border" left="0" right="0" top="0" bottom="0"/>
-  <border name="button_border" left="0" right="0" top="0" bottom="0"/>
+  <aspect_ratio name="button" value="1.0"/>
+  <distance name="title_vertical_pad" value="0"/>
+  <border name="title_border" left="0" right="0" top="3" bottom="3"/>
+  <border name="button_border" left="0" right="0" top="3" bottom="3"/>
 </frame_geometry>
 
 <frame_geometry name="border" has_title="false">
@@ -34,7 +33,7 @@
   <distance name="right_titlebar_edge" value="0"/>
   <distance name="button_width" value="0"/>
   <distance name="button_height" value="0"/>
-  <distance name="title_vertical_pad" value="6"/>
+  <distance name="title_vertical_pad" value="5"/>
   <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>
@@ -42,27 +41,27 @@
 <!-- Buttons -->
 
 <draw_ops name="active_button">
-  <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/>
+  <image filename="active-button.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
 <draw_ops name="active_button_pressed">
-  <image filename="active-button-pressed.png" x="0" y="0" width="object_width" height="object_height"/>
+  <image filename="active-button-pressed.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
 <draw_ops name="active_button_prelight">
-  <image filename="active-button-prelight.png" x="0" y="0" width="object_width" height="object_height"/>
+  <image filename="active-button-prelight.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
 <draw_ops name="inactive_button">
-  <image filename="inactive-button.png" x="0" y="0" width="object_width" height="object_height"/>
+  <image filename="inactive-button.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
 <draw_ops name="inactive_button_pressed">
-  <image filename="inactive-button-pressed.png" x="0" y="0" width="object_width" height="object_height"/>
+  <image filename="inactive-button-pressed.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
 <draw_ops name="inactive_button_prelight">
-  <image filename="inactive-button-prelight.png" x="0" y="0" width="object_width" height="object_height"/>
+  <image filename="inactive-button-prelight.png" x="0" y="0" width="width" height="height"/>
 </draw_ops>
 
 <!-- Inactive style -->
@@ -81,37 +80,34 @@
 
   <piece position="title">
     <draw_ops>
-      <title color="white" x="IconTitleSpacing" y="((height - title_height) / 2) `max` 0"/>
+      <title color="white" x="IconTitleSpacing" y="0"/>
     </draw_ops>
   </piece>
 
   <piece position="titlebar">
     <draw_ops>
-      <image filename="inactive-left-top-border.png" 
-             x="0" y="3" width="object_width" height="height"/>
-      <image filename="inactive-top-left-border.png" 
-             x="0" y="0" width="object_width" height="object_height"/> 
 
-      <image filename="inactive-top-right-border.png" 
-             x="width - object_width" y="0" width="object_width" height="object_height"/>
+      <image filename="inactive-left-top-border.png" 
+             x="0" y="0" width="object_width" height="height"/>
       <image filename="inactive-right-top-border.png" 
-             x="width - object_width" y="3" width="object_width" height="object_height"/>
+             x="width - object_width" y="0" width="object_width" height="height"/>
 
       <image filename="inactive-top-center-left.png" 
              x="4" y="0" 
              width="(left_width + ButtonWidth + IconTitleSpacing + title_width) `min`
                     (width - right_width - 3 * ButtonWidth - CenterTitlePieceWidth - 3)" 
-             height="object_height"/>
+             height="height"/>
 
       <image filename="inactive-top-center-mid.png" 
-             x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width - right_width - 3 * ButtonWidth)) + 1"
-             y="0" width="object_width" height="object_height"/>
+             x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width * height / 22 - right_width - 3 * ButtonWidth)) + 1"
+             y="0" width="object_width * height / 22" height="height"/>
 
       <image filename="inactive-top-center-right.png"
-             x="((left_width + ButtonWidth + IconTitleSpacing + title_width + CenterTitlePieceWidth) `min` (width - 3 * ButtonWidth - right_width)) + 1"
+             x="((left_width + ButtonWidth + IconTitleSpacing + title_width + CenterTitlePieceWidth * height / 22) `min` (width - 3 * ButtonWidth - right_width)) + 1"
              y="0"
-             width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth - right_width) `max` (3 * ButtonWidth)"
-             height="object_height"/>
+             width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth * height / 22 - right_width) `max` (3 * ButtonWidth)"
+             height="height"/>
+
     </draw_ops>
   </piece>
 
@@ -143,80 +139,80 @@
   <button function="close" state="normal">
     <draw_ops>
       <include name="inactive_button"/>
-      <image filename="inactive-close-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-close-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="close" state="pressed">
     <draw_ops>
       <include name="inactive_button_pressed"/>
-      <image filename="inactive-close-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-close-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="close" state="prelight">
     <draw_ops>
       <include name="inactive_button_prelight"/>
-      <image filename="inactive-close-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-close-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="normal">
     <draw_ops>
       <include name="inactive_button"/>
-      <image filename="inactive-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="pressed">
     <draw_ops>
       <include name="inactive_button_pressed"/>
-      <image filename="inactive-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="prelight">
     <draw_ops>
       <include name="inactive_button_prelight"/>
-      <image filename="inactive-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="normal">
     <draw_ops>
       <include name="inactive_button"/>
-      <image filename="inactive-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-maximize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="pressed">
     <draw_ops>
       <include name="inactive_button_pressed"/>
-      <image filename="inactive-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-maximize-button.png" x="2" y="2" width="width - 4" height="height - 4"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="prelight">
     <draw_ops>
       <include name="inactive_button_prelight"/>
-      <image filename="inactive-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="inactive-maximize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="normal">
     <draw_ops>
-      <image filename="inactive-menu-button.png" x="0" y="0" width="object_width" height="object_height"/>
+      <image filename="inactive-menu-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="pressed">
     <draw_ops>
-      <image filename="inactive-menu-button-pressed.png" x="0" y="0" width="object_width" height="object_height"/>
+      <image filename="inactive-menu-button-pressed.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
   <button function="menu" state="prelight">
     <draw_ops>
-      <image filename="inactive-menu-button-prelight.png" x="0" y="0" width="object_width" height="object_height"/>
+      <image filename="inactive-menu-button-prelight.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 </frame_style>
@@ -258,38 +254,36 @@
 
   <piece position="titlebar">
     <draw_ops>
+
       <image filename="active-left-top-border.png" 
              colorize="gtk:bg[SELECTED]"
-             x="0" y="3" width="object_width" height="height"/>
-      <image filename="active-top-left-border.png" 
-             colorize="gtk:bg[SELECTED]"
-             x="0" y="0" width="object_width" height="object_height"/> 
+             x="0" y="0" width="object_width" height="height"/>
 
-      <image filename="active-top-right-border.png" 
-             x="width - object_width" y="0" width="object_width" height="object_height"/>
       <image filename="active-right-top-border.png" 
-             x="width - object_width" y="3" width="object_width" height="object_height"/>
+             x="width - object_width" y="0" width="object_width" height="height"/>
 
       <image filename="active-top-center-left.png" 
              colorize="gtk:bg[SELECTED]"
              x="4" y="0" 
              width="(left_width + ButtonWidth + IconTitleSpacing + title_width) `min`
                     (width - right_width - 3 * ButtonWidth - CenterTitlePieceWidth - 3)" 
-             height="object_height"/>
+             height="height"/>
 
       <image filename="active-top-center-mid-left.png" 
              colorize="gtk:bg[SELECTED]"
-             x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width - right_width - 3 * ButtonWidth)) + 1"
-             y="0" width="object_width" height="object_height"/>
+             x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width * height / 22 - right_width - 3 * ButtonWidth)) + 1"
+             y="0" width="object_width * height / 22" height="height"/>
+
       <image filename="active-top-center-mid-right.png" 
-             x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width - right_width - 3 * ButtonWidth)) + 1"
-             y="0" width="object_width" height="object_height"/>
+             x="((left_width + ButtonWidth + IconTitleSpacing + title_width) `min` (width - object_width * height / 22 - right_width - 3 * ButtonWidth)) + 1"
+             y="0" width="object_width * height / 22" height="height"/>
 
       <image filename="active-top-center-right.png"
-             x="((left_width + ButtonWidth + IconTitleSpacing + title_width + CenterTitlePieceWidth) `min` (width - 3 * ButtonWidth - right_width)) + 1"
+             x="((left_width + ButtonWidth + IconTitleSpacing + title_width + CenterTitlePieceWidth * height / 22) `min` (width - 3 * ButtonWidth - right_width)) + 1"
              y="0"
-             width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth - right_width) `max` (3 * ButtonWidth)"
-             height="object_height"/>
+             width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth * height / 22 - right_width) `max` (3 * ButtonWidth)"
+             height="height"/>
+
     </draw_ops>
   </piece>
 
@@ -327,80 +321,80 @@
   <button function="close" state="normal">
     <draw_ops>
       <include name="active_button"/>
-      <image filename="active-close-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-close-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="close" state="pressed">
     <draw_ops>
       <include name="active_button_pressed"/>
-      <image filename="active-close-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-close-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="close" state="prelight">
     <draw_ops>
       <include name="active_button_prelight"/>
-      <image filename="active-close-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-close-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="normal">
     <draw_ops>
       <include name="active_button"/>
-      <image filename="active-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="pressed">
     <draw_ops>
       <include name="active_button_pressed"/>
-      <image filename="active-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="prelight">
     <draw_ops>
       <include name="active_button_prelight"/>
-      <image filename="active-minimize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-minimize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="normal">
     <draw_ops>
       <include name="active_button"/>
-      <image filename="active-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-maximize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="pressed">
     <draw_ops>
       <include name="active_button_pressed"/>
-      <image filename="active-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-maximize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="prelight">
     <draw_ops>
       <include name="active_button_prelight"/>
-      <image filename="active-maximize-button.png" x="2" y="2" width="object_width" height="object_height"/>
+      <image filename="active-maximize-button.png" x="2" y="2" width="width-4" height="height-4"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="normal">
     <draw_ops>
-      <image colorize="gtk:bg[SELECTED]" filename="active-menu-button.png" x="0" y="0" width="object_width" height="object_height"/>
+      <image colorize="gtk:bg[SELECTED]" filename="active-menu-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="pressed">
     <draw_ops>
-      <image colorize="gtk:bg[SELECTED]" filename="active-menu-button-pressed.png" x="0" y="0" width="object_width" height="object_height"/>
+      <image colorize="gtk:bg[SELECTED]" filename="active-menu-button-pressed.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
   <button function="menu" state="prelight">
     <draw_ops>
-      <image colorize="gtk:bg[SELECTED]" filename="active-menu-button-prelight.png" x="0" y="0" width="object_width" height="object_height"/>
+      <image colorize="gtk:bg[SELECTED]" filename="active-menu-button-prelight.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 </frame_style>
diff --git a/src/themes/Gorilla/active-button.png b/src/themes/Gorilla/active-button.png
index a299ddb2..64455b33 100644
--- a/src/themes/Gorilla/active-button.png
+++ b/src/themes/Gorilla/active-button.png
diff --git a/src/themes/Gorilla/active-close-button.png b/src/themes/Gorilla/active-close-button.png
index b77f77ae..1d292165 100644
--- a/src/themes/Gorilla/active-close-button.png
+++ b/src/themes/Gorilla/active-close-button.png
diff --git a/src/themes/Gorilla/active-close-menu-icon.png b/src/themes/Gorilla/active-close-menu-icon.png
new file mode 100644
index 00000000..b77f77ae
--- /dev/null
+++ b/src/themes/Gorilla/active-close-menu-icon.png
diff --git a/src/themes/Gorilla/active-maximize-button.png b/src/themes/Gorilla/active-maximize-button.png
index 02ccc37a..a982e5cb 100644
--- a/src/themes/Gorilla/active-maximize-button.png
+++ b/src/themes/Gorilla/active-maximize-button.png
diff --git a/src/themes/Gorilla/active-maximize-menu-icon.png b/src/themes/Gorilla/active-maximize-menu-icon.png
new file mode 100644
index 00000000..02ccc37a
--- /dev/null
+++ b/src/themes/Gorilla/active-maximize-menu-icon.png
diff --git a/src/themes/Gorilla/active-menu-button.png b/src/themes/Gorilla/active-menu-button.png
index aa12b497..b55d7078 100644
--- a/src/themes/Gorilla/active-menu-button.png
+++ b/src/themes/Gorilla/active-menu-button.png
diff --git a/src/themes/Gorilla/active-minimize-button.png b/src/themes/Gorilla/active-minimize-button.png
index 29276929..4205f4e8 100644
--- a/src/themes/Gorilla/active-minimize-button.png
+++ b/src/themes/Gorilla/active-minimize-button.png
diff --git a/src/themes/Gorilla/active-minimize-menu-icon.png b/src/themes/Gorilla/active-minimize-menu-icon.png
new file mode 100644
index 00000000..29276929
--- /dev/null
+++ b/src/themes/Gorilla/active-minimize-menu-icon.png
diff --git a/src/themes/Gorilla/inactive-close-button.png b/src/themes/Gorilla/inactive-close-button.png
index 86359921..c566b12f 100644
--- a/src/themes/Gorilla/inactive-close-button.png
+++ b/src/themes/Gorilla/inactive-close-button.png
diff --git a/src/themes/Gorilla/inactive-maximize-button.png b/src/themes/Gorilla/inactive-maximize-button.png
index 4e892999..9c838823 100644
--- a/src/themes/Gorilla/inactive-maximize-button.png
+++ b/src/themes/Gorilla/inactive-maximize-button.png
diff --git a/src/themes/Gorilla/inactive-menu-button.png b/src/themes/Gorilla/inactive-menu-button.png
index 99476b74..b000a378 100644
--- a/src/themes/Gorilla/inactive-menu-button.png
+++ b/src/themes/Gorilla/inactive-menu-button.png
diff --git a/src/themes/Gorilla/inactive-minimize-button.png b/src/themes/Gorilla/inactive-minimize-button.png
index 125aa6f7..4459af4e 100644
--- a/src/themes/Gorilla/inactive-minimize-button.png
+++ b/src/themes/Gorilla/inactive-minimize-button.png
diff --git a/src/themes/Gorilla/metacity-theme-1.xml b/src/themes/Gorilla/metacity-theme-1.xml
index fd9290fc..7dde366a 100644
--- a/src/themes/Gorilla/metacity-theme-1.xml
+++ b/src/themes/Gorilla/metacity-theme-1.xml
@@ -18,32 +18,15 @@
   <distance name="bottom_height" value="6"/>
   <distance name="left_titlebar_edge" value="8"/>
   <distance name="right_titlebar_edge" value="8"/>
-  <distance name="button_width" value="18"/>
-  <distance name="button_height" value="18"/>
+  <aspect_ratio name="button" value="1.0"/>
   <distance name="title_vertical_pad" value="0"/>
-  <border name="title_border" left="0" right="0" top="4" bottom="0"/>
-  <border name="button_border" left="0" right="0" top="8" bottom="0"/>
+  <border name="title_border" left="0" right="0" top="7" bottom="4"/>
+  <border name="button_border" left="0" right="0" top="9" bottom="0"/>
 </frame_geometry>
 
 
 <!-- Buttons -->
 
-<draw_ops name="active_button">
-  <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="active_button_pressed">
-  <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="inactive_button">
-  <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/>
-</draw_ops>
-
-<draw_ops name="inactive_button_pressed">
-  <image filename="active-button.png" x="0" y="0" width="object_width" height="object_height"/>
-</draw_ops>
-
 <draw_ops name="title_tile">
   <line color="#494d59" x1="0" y1="0" x2="width" y2="0"/>
   <line color="#515961" x1="0" y1="1" x2="width" y2="1"/>
@@ -58,82 +41,73 @@
       <rectangle color="light gray" x="4" y="4" width="width - 9" height="height - 8" filled="false"/>
       <rectangle color="light gray" x="5" y="5" width="width - 11" height="height - 10" filled="false"/>
       <rectangle color="white" x="6" y="6" width="width - 13" height="height - 12" filled="false"/>
-      <rectangle color="gray" x="6" y="6" width="width - 12" height="height - 12" filled="true"/>
+      <rectangle color="gtk:bg[INSENSITIVE]" x="6" y="6" width="width - 12" height="height - 12" filled="true"/>
 
-      <line color="gray" x1="1" y1="1" x2="2" y2="2"/>
-      <line color="gray" x1="1" y1="height - 2" x2="1" y2="height"/>
-      <line color="gray" x1="width - 2" y1="1" x2="width - 1" y2="2"/>
-      <line color="gray" x1="width - 1" y1="height - 1" x2="width - 2" y2="height - 2"/>
+      <line color="gtk:bg[INSENSITIVE]" x1="1" y1="1" x2="2" y2="2"/>
+      <line color="gtk:bg[INSENSITIVE]" x1="1" y1="height - 2" x2="1" y2="height"/>
+      <line color="gtk:bg[INSENSITIVE]" x1="width - 2" y1="1" x2="width - 1" y2="2"/>
+      <line color="gtk:bg[INSENSITIVE]" x1="width - 1" y1="height - 1" x2="width - 2" y2="height - 2"/>
    </draw_ops>
   </piece>
 
   <piece position="title">
     <draw_ops>
-      <title color="gray" x="IconTitleSpacing" y="((height - title_height - 3) / 2) `max` 0"/>
+      <title color="gray" x="IconTitleSpacing" y="0"/>
     </draw_ops>
   </piece>
 
   <piece position="titlebar">
-
     <draw_ops>
-      <rectangle color="black" x="6" y="6" width="width - 12" height="16" filled="true"/>
-      <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="12"/>
+      <rectangle color="black" x="6" y="6" width="width - 12" height="height - 10" filled="true"/>
+      <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="height - 14"/>
     </draw_ops>
   </piece>
 
   <button function="close" state="normal">
     <draw_ops>
-      <include name="inactive_button"/>
-      <image filename="inactive-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-close-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="close" state="pressed">
     <draw_ops>
-      <include name="inactive_button_pressed"/>
-      <image filename="inactive-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-close-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="normal">
     <draw_ops>
-      <include name="inactive_button"/>
-      <image filename="inactive-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-minimize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="pressed">
     <draw_ops>
-      <include name="inactive_button_pressed"/>
-      <image filename="inactive-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-minimize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="normal">
     <draw_ops>
-      <include name="inactive_button"/>
-      <image filename="inactive-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-maximize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="pressed">
     <draw_ops>
-      <include name="inactive_button_pressed"/>
-      <image filename="inactive-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-maximize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="normal">
     <draw_ops>
-      <include name="inactive_button_pressed"/>
-      <image filename="inactive-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-menu-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="pressed">
     <draw_ops>
-      <include name="inactive_button_pressed"/>
-      <image filename="inactive-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="inactive-menu-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
@@ -155,81 +129,73 @@
       <rectangle color="light gray" x="4" y="4" width="width - 9" height="height - 8" filled="false"/>
       <rectangle color="light gray" x="5" y="5" width="width - 11" height="height - 10" filled="false"/>
       <rectangle color="white" x="6" y="6" width="width - 13" height="height - 12" filled="false"/>
-      <rectangle color="gray" x="6" y="6" width="width - 12" height="height - 12" filled="true"/>
+      <rectangle color="gtk:bg[NORMAL]" x="6" y="6" width="width - 12" height="height - 12" filled="true"/>
 
-      <line color="gray" x1="0" y1="0" x2="1" y2="1"/>
-      <line color="gray" x1="0" y1="height - 1" x2="1" y2="height"/>
-      <line color="gray" x1="width - 1" y1="0" x2="width" y2="1"/>
-      <line color="gray" x1="width" y1="height" x2="width - 1" y2="height - 1"/>
+      <line color="gtk:bg[NORMAL]" x1="0" y1="0" x2="1" y2="1"/>
+      <line color="gtk:bg[NORMAL]" x1="0" y1="height - 1" x2="1" y2="height"/>
+      <line color="gtk:bg[NORMAL]" x1="width - 1" y1="0" x2="width" y2="1"/>
+      <line color="gtk:bg[NORMAL]" x1="width" y1="height" x2="width - 1" y2="height - 1"/>
    </draw_ops>
   </piece>
 
   <piece position="title">
     <draw_ops>
-      <title color="white" x="IconTitleSpacing" y="((height - title_height - 3) / 2) `max` 0"/>
+      <title color="white" x="IconTitleSpacing" y="0"/>
     </draw_ops>
   </piece>
 
   <piece position="titlebar">
     <draw_ops>
-      <rectangle color="black" x="6" y="6" width="width - 12" height="16" filled="true"/>
-      <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="12"/>
+      <rectangle color="black" x="6" y="6" width="width - 12" height="height - 10" filled="true"/>
+      <tile name="title_tile" tile_width="width" tile_height="2" x="8" y="8" width="width - 16" height="height - 14"/>
     </draw_ops>
   </piece>
 
   <button function="close" state="normal">
     <draw_ops>
-      <include name="active_button"/>
-      <image filename="active-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-close-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="close" state="pressed">
     <draw_ops>
-      <include name="active_button_pressed"/>
-      <image filename="active-close-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-close-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="normal">
     <draw_ops>
-      <include name="active_button"/>
-      <image filename="active-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-minimize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="minimize" state="pressed">
     <draw_ops>
-      <include name="active_button_pressed"/>
-      <image filename="active-minimize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-minimize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="normal">
     <draw_ops>
-      <include name="active_button"/>
-      <image filename="active-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-maximize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="maximize" state="pressed">
     <draw_ops>
-      <include name="active_button_pressed"/>
-      <image filename="active-maximize-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-maximize-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="normal">
     <draw_ops>
-      <include name="active_button"/>
-      <image filename="active-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-menu-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
   <button function="menu" state="pressed">
     <draw_ops>
-      <include name="active_button_pressed"/>
-      <image filename="active-menu-button.png" x="4.5" y="3.5" width="object_width" height="object_height"/>
+      <image filename="active-menu-button.png" x="0" y="0" width="width" height="height"/>
     </draw_ops>
   </button>
 
@@ -256,10 +222,11 @@
 <window type="modal_dialog" style_set="normal"/>
 <window type="menu" style_set="normal"/>
 <window type="utility" style_set="normal"/>
+<window type="border" style_set="normal"/>
 
 <menu_icon function="maximize" state="normal">
   <draw_ops>
-    <image filename="active-maximize-button.png" 
+    <image filename="active-maximize-menu-icon.png" 
            x="(width - object_width) / 2"
            y="(height - object_height) / 2"
            width="object_width" height="object_height"/>
@@ -269,7 +236,7 @@
 
 <menu_icon function="close" state="normal">
   <draw_ops>
-    <image filename="active-close-button.png" 
+    <image filename="active-close-menu-icon.png" 
            x="(width - object_width) / 2"
            y="(height - object_height) / 2"
            width="object_width" height="object_height"/>
@@ -278,7 +245,7 @@
 
 <menu_icon function="minimize" state="normal">
   <draw_ops>
-    <image filename="active-minimize-button.png" 
+    <image filename="active-minimize-menu-icon.png" 
            x="(width - object_width) / 2"
            y="(height - object_height) / 2"
            width="object_width" height="object_height"/>
diff --git a/src/themes/Makefile.am b/src/themes/Makefile.am
index 73791322..6e5845fd 100644
--- a/src/themes/Makefile.am
+++ b/src/themes/Makefile.am
@@ -2,7 +2,8 @@ THEMES=			\
 	Atlanta		\
 	Bright		\
 	Crux		\
-	Esco
+	Esco		\
+	Gorilla
 
 THEME_DIR=$(pkgdatadir)/themes