add a newline to an error message

2002-02-09  Havoc Pennington  <hp@pobox.com>

	* src/theme.c (meta_theme_set_current): add a newline to an error
	message

	* src/themes/Gorilla: add Gorilla theme by Jakub Steiner ported to
	metacity by Kenneth Christiansen

27 files changed, 611 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index aae7c1f9..6b2f15e0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,12 @@
 2002-02-09  Havoc Pennington  <hp@pobox.com>
+
+	* src/theme.c (meta_theme_set_current): add a newline to an error
+	message
+
+	* src/themes/Gorilla: add Gorilla theme by Jakub Steiner ported to
+	metacity by Kenneth Christiansen
+
+2002-02-09  Havoc Pennington  <hp@pobox.com>
 	
 	* src/theme.c (meta_draw_op_draw_with_env): implement wacky "tile"
 	draw op to lose some of the PNG files in Gorilla theme
diff --git a/src/theme.c b/src/theme.c
index a2854926..5e9dd890 100644
--- a/src/theme.c
+++ b/src/theme.c
@@ -3961,7 +3961,7 @@ meta_theme_set_current (const char *name,
 
   if (new_theme == NULL)
     {
-      meta_warning (_("Failed to load theme \"%s\": %s"),
+      meta_warning (_("Failed to load theme \"%s\": %s\n"),
                     name, err->message);
       g_error_free (err);
     }
diff --git a/src/themes/AgingGorilla/README b/src/themes/AgingGorilla/README
new file mode 100644
index 00000000..c275e5ee
--- /dev/null
+++ b/src/themes/AgingGorilla/README
@@ -0,0 +1,7 @@
+* Gorilla *
+
+A metacity theme to accompany Scalable and Unscalable Gorilla nautilus
+themes.
+
+(c) 2001 Jakub 'jimmac' Steiner
+Ported by Kenneth Christiansen
diff --git a/src/themes/AgingGorilla/active-button.png b/src/themes/AgingGorilla/active-button.png
new file mode 100644
index 00000000..a299ddb2
--- /dev/null
+++ 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
new file mode 100644
index 00000000..b77f77ae
--- /dev/null
+++ b/src/themes/AgingGorilla/active-close-button.png
diff --git a/src/themes/AgingGorilla/active-maximize-button.png b/src/themes/AgingGorilla/active-maximize-button.png
new file mode 100644
index 00000000..02ccc37a
--- /dev/null
+++ b/src/themes/AgingGorilla/active-maximize-button.png
diff --git a/src/themes/AgingGorilla/active-menu-button.png b/src/themes/AgingGorilla/active-menu-button.png
new file mode 100644
index 00000000..aa12b497
--- /dev/null
+++ 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
new file mode 100644
index 00000000..29276929
--- /dev/null
+++ b/src/themes/AgingGorilla/active-minimize-button.png
diff --git a/src/themes/AgingGorilla/gorilla.xcf.bz2 b/src/themes/AgingGorilla/gorilla.xcf.bz2
new file mode 100644
index 00000000..89b85651
--- /dev/null
+++ b/src/themes/AgingGorilla/gorilla.xcf.bz2
diff --git a/src/themes/AgingGorilla/inactive-close-button.png b/src/themes/AgingGorilla/inactive-close-button.png
new file mode 100644
index 00000000..86359921
--- /dev/null
+++ 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
new file mode 100644
index 00000000..4e892999
--- /dev/null
+++ 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
new file mode 100644
index 00000000..99476b74
--- /dev/null
+++ 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
new file mode 100644
index 00000000..125aa6f7
--- /dev/null
+++ 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
new file mode 100644
index 00000000..56c8d326
--- /dev/null
+++ b/src/themes/AgingGorilla/metacity-theme-1.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0"?>
+<metacity_theme>
+<info>
+  <name>Gorilla</name>
+  <author>Kenneth Christiansen &lt;kenneth@gnu.org&gt; Anders Carlsom &lt;andersca@gnu.org&gt;</author>
+  <copyright>&#194; Ximian, Inc, 2001</copyright>
+  <date>February 8, 2002</date>
+  <description>A port of the Gorilla theme by Jacub Steiner</description>
+</info>
+
+<!-- define constants -->
+<constant name="IconTitleSpacing" value="2"/> <!-- Space between menu button and title -->
+<constant name="ButtonWidth" value="18"/> <!-- Button width -->
+
+<frame_geometry name="normal">
+  <distance name="left_width" value="6"/>
+  <distance name="right_width" value="6"/>
+  <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"/>
+  <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"/>
+</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"/>
+</draw_ops>
+
+<!-- Inactive style -->
+<frame_style name="normal" geometry="normal">
+  <piece position="entire_background">
+    <draw_ops>
+      <rectangle color="black" x="1" y="1" width="width - 2" height="height - 2" filled="true"/>
+      <rectangle color="dark gray" x="3" y="3" width="width - 8" height="height - 7" filled="false"/>
+      <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"/>
+
+      <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"/>
+   </draw_ops>
+  </piece>
+
+  <piece position="title">
+    <draw_ops>
+      <title color="gray" x="IconTitleSpacing" y="((height - title_height - 3) / 2) `max` 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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </draw_ops>
+  </button>
+
+
+</frame_style>
+
+
+<!-- Active (focused) shaded style -->
+<frame_style name="normal_shaded" geometry="normal" parent="normal">
+
+</frame_style>
+
+<!-- Active (focused) style -->
+<frame_style name="focused" geometry="normal">
+  <piece position="entire_background">
+    <draw_ops>
+      <rectangle color="black" x="0" y="0" width="width" height="height" filled="true"/>
+      <rectangle color="dark gray" x="3" y="3" width="width - 8" height="height - 7" filled="false"/>
+      <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"/>
+
+      <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"/>
+   </draw_ops>
+  </piece>
+
+  <piece position="title">
+    <draw_ops>
+      <title color="white" x="IconTitleSpacing" y="((height - title_height - 3) / 2) `max` 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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </draw_ops>
+  </button>
+
+</frame_style>
+
+<!-- Active (focused) shaded style -->
+<frame_style name="focused_shaded" geometry="normal" parent="focused">
+
+</frame_style>
+
+<frame_style_set name="normal">
+<frame focus="yes" state="shaded" style="focused_shaded"/>
+<frame focus="yes" state="normal" resize="both" style="focused"/>
+<frame focus="yes" state="maximized" style="focused"/>
+<frame focus="yes" state="maximized_and_shaded" style="focused_shaded"/>
+<frame focus="no" state="normal" resize="both" style="normal"/>
+<frame focus="no" state="shaded" style="normal_shaded"/>
+<frame focus="no" state="maximized" style="normal"/>
+<frame focus="no" state="maximized_and_shaded" style="normal_shaded"/>
+</frame_style_set>
+
+<window type="normal" style_set="normal"/>
+<window type="dialog" style_set="normal"/>
+<window type="modal_dialog" style_set="normal"/>
+<window type="menu" style_set="normal"/>
+<window type="utility" style_set="normal"/>
+
+<menu_icon function="maximize" state="normal">
+  <draw_ops>
+    <image filename="active-maximize-button.png" 
+           x="(width - object_width) / 2"
+           y="(height - object_height) / 2"
+           width="object_width" height="object_height"/>
+  </draw_ops>
+</menu_icon>
+
+
+<menu_icon function="close" state="normal">
+  <draw_ops>
+    <image filename="active-close-button.png" 
+           x="(width - object_width) / 2"
+           y="(height - object_height) / 2"
+           width="object_width" height="object_height"/>
+  </draw_ops>
+</menu_icon>
+
+<menu_icon function="minimize" state="normal">
+  <draw_ops>
+    <image filename="active-minimize-button.png" 
+           x="(width - object_width) / 2"
+           y="(height - object_height) / 2"
+           width="object_width" height="object_height"/>
+  </draw_ops>
+</menu_icon>
+
+<menu_icon function="unmaximize" state="normal">
+  <draw_ops>
+  </draw_ops>
+</menu_icon>
+
+</metacity_theme>
diff --git a/src/themes/Gorilla/README b/src/themes/Gorilla/README
new file mode 100644
index 00000000..c275e5ee
--- /dev/null
+++ b/src/themes/Gorilla/README
@@ -0,0 +1,7 @@
+* Gorilla *
+
+A metacity theme to accompany Scalable and Unscalable Gorilla nautilus
+themes.
+
+(c) 2001 Jakub 'jimmac' Steiner
+Ported by Kenneth Christiansen
diff --git a/src/themes/Gorilla/active-button.png b/src/themes/Gorilla/active-button.png
new file mode 100644
index 00000000..a299ddb2
--- /dev/null
+++ 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
new file mode 100644
index 00000000..b77f77ae
--- /dev/null
+++ b/src/themes/Gorilla/active-close-button.png
diff --git a/src/themes/Gorilla/active-maximize-button.png b/src/themes/Gorilla/active-maximize-button.png
new file mode 100644
index 00000000..02ccc37a
--- /dev/null
+++ b/src/themes/Gorilla/active-maximize-button.png
diff --git a/src/themes/Gorilla/active-menu-button.png b/src/themes/Gorilla/active-menu-button.png
new file mode 100644
index 00000000..aa12b497
--- /dev/null
+++ 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
new file mode 100644
index 00000000..29276929
--- /dev/null
+++ b/src/themes/Gorilla/active-minimize-button.png
diff --git a/src/themes/Gorilla/gorilla.xcf.bz2 b/src/themes/Gorilla/gorilla.xcf.bz2
new file mode 100644
index 00000000..89b85651
--- /dev/null
+++ b/src/themes/Gorilla/gorilla.xcf.bz2
diff --git a/src/themes/Gorilla/inactive-close-button.png b/src/themes/Gorilla/inactive-close-button.png
new file mode 100644
index 00000000..86359921
--- /dev/null
+++ 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
new file mode 100644
index 00000000..4e892999
--- /dev/null
+++ 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
new file mode 100644
index 00000000..99476b74
--- /dev/null
+++ 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
new file mode 100644
index 00000000..125aa6f7
--- /dev/null
+++ 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
new file mode 100644
index 00000000..56c8d326
--- /dev/null
+++ b/src/themes/Gorilla/metacity-theme-1.xml
@@ -0,0 +1,293 @@
+<?xml version="1.0"?>
+<metacity_theme>
+<info>
+  <name>Gorilla</name>
+  <author>Kenneth Christiansen &lt;kenneth@gnu.org&gt; Anders Carlsom &lt;andersca@gnu.org&gt;</author>
+  <copyright>&#194; Ximian, Inc, 2001</copyright>
+  <date>February 8, 2002</date>
+  <description>A port of the Gorilla theme by Jacub Steiner</description>
+</info>
+
+<!-- define constants -->
+<constant name="IconTitleSpacing" value="2"/> <!-- Space between menu button and title -->
+<constant name="ButtonWidth" value="18"/> <!-- Button width -->
+
+<frame_geometry name="normal">
+  <distance name="left_width" value="6"/>
+  <distance name="right_width" value="6"/>
+  <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"/>
+  <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"/>
+</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"/>
+</draw_ops>
+
+<!-- Inactive style -->
+<frame_style name="normal" geometry="normal">
+  <piece position="entire_background">
+    <draw_ops>
+      <rectangle color="black" x="1" y="1" width="width - 2" height="height - 2" filled="true"/>
+      <rectangle color="dark gray" x="3" y="3" width="width - 8" height="height - 7" filled="false"/>
+      <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"/>
+
+      <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"/>
+   </draw_ops>
+  </piece>
+
+  <piece position="title">
+    <draw_ops>
+      <title color="gray" x="IconTitleSpacing" y="((height - title_height - 3) / 2) `max` 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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </draw_ops>
+  </button>
+
+
+</frame_style>
+
+
+<!-- Active (focused) shaded style -->
+<frame_style name="normal_shaded" geometry="normal" parent="normal">
+
+</frame_style>
+
+<!-- Active (focused) style -->
+<frame_style name="focused" geometry="normal">
+  <piece position="entire_background">
+    <draw_ops>
+      <rectangle color="black" x="0" y="0" width="width" height="height" filled="true"/>
+      <rectangle color="dark gray" x="3" y="3" width="width - 8" height="height - 7" filled="false"/>
+      <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"/>
+
+      <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"/>
+   </draw_ops>
+  </piece>
+
+  <piece position="title">
+    <draw_ops>
+      <title color="white" x="IconTitleSpacing" y="((height - title_height - 3) / 2) `max` 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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </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"/>
+    </draw_ops>
+  </button>
+
+</frame_style>
+
+<!-- Active (focused) shaded style -->
+<frame_style name="focused_shaded" geometry="normal" parent="focused">
+
+</frame_style>
+
+<frame_style_set name="normal">
+<frame focus="yes" state="shaded" style="focused_shaded"/>
+<frame focus="yes" state="normal" resize="both" style="focused"/>
+<frame focus="yes" state="maximized" style="focused"/>
+<frame focus="yes" state="maximized_and_shaded" style="focused_shaded"/>
+<frame focus="no" state="normal" resize="both" style="normal"/>
+<frame focus="no" state="shaded" style="normal_shaded"/>
+<frame focus="no" state="maximized" style="normal"/>
+<frame focus="no" state="maximized_and_shaded" style="normal_shaded"/>
+</frame_style_set>
+
+<window type="normal" style_set="normal"/>
+<window type="dialog" style_set="normal"/>
+<window type="modal_dialog" style_set="normal"/>
+<window type="menu" style_set="normal"/>
+<window type="utility" style_set="normal"/>
+
+<menu_icon function="maximize" state="normal">
+  <draw_ops>
+    <image filename="active-maximize-button.png" 
+           x="(width - object_width) / 2"
+           y="(height - object_height) / 2"
+           width="object_width" height="object_height"/>
+  </draw_ops>
+</menu_icon>
+
+
+<menu_icon function="close" state="normal">
+  <draw_ops>
+    <image filename="active-close-button.png" 
+           x="(width - object_width) / 2"
+           y="(height - object_height) / 2"
+           width="object_width" height="object_height"/>
+  </draw_ops>
+</menu_icon>
+
+<menu_icon function="minimize" state="normal">
+  <draw_ops>
+    <image filename="active-minimize-button.png" 
+           x="(width - object_width) / 2"
+           y="(height - object_height) / 2"
+           width="object_width" height="object_height"/>
+  </draw_ops>
+</menu_icon>
+
+<menu_icon function="unmaximize" state="normal">
+  <draw_ops>
+  </draw_ops>
+</menu_icon>
+
+</metacity_theme>
diff --git a/src/themes/Makefile.am b/src/themes/Makefile.am
index 9edfd4b5..302b3f39 100644
--- a/src/themes/Makefile.am
+++ b/src/themes/Makefile.am
@@ -1,6 +1,7 @@
 THEMES=			\
 	Atlanta		\
-	Crux
+	Crux		\
+	Gorilla
 
 THEME_DIR=$(pkgdatadir)/themes