diff --git a/ChangeLog b/ChangeLog
index d5916186d..fa667221b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2002-02-07  Anders Carlsson  <andersca@gnu.org>
+
+	* src/themes/Crux/metacity-theme-1.xml: 
+	Simplify things so we can remove some
+	now unnecessary .png files.
+	* src/themes/Crux/*.png: Remove some files.
+
+2002-02-07  Anders Carlsson  <andersca@gnu.org>
+
+	* src/themes/Crux/metacity-theme-1.xml
+	* src/themes/Crux/*.png: 
+	Add Crux theme
+
 2002-02-07  Kenneth Rohde Christiansen  <kenneth@gnu.org>
 
 	* configure.in: add da to ALL_LINGUAS
diff --git a/src/themes/Crux/active-top-center-left-border.png b/src/themes/Crux/active-top-center-left-border.png
deleted file mode 100644
index 05f678153..000000000
Binary files a/src/themes/Crux/active-top-center-left-border.png and /dev/null differ
diff --git a/src/themes/Crux/active-top-center-left.png b/src/themes/Crux/active-top-center-left.png
index 9da5dd556..2c6e7edbb 100644
Binary files a/src/themes/Crux/active-top-center-left.png and b/src/themes/Crux/active-top-center-left.png differ
diff --git a/src/themes/Crux/active-top-center-mid-left-border.png b/src/themes/Crux/active-top-center-mid-left-border.png
deleted file mode 100644
index 7d8fc7df9..000000000
Binary files a/src/themes/Crux/active-top-center-mid-left-border.png and /dev/null differ
diff --git a/src/themes/Crux/active-top-center-mid-left.png b/src/themes/Crux/active-top-center-mid-left.png
index a7969b594..7a3904a06 100644
Binary files a/src/themes/Crux/active-top-center-mid-left.png and b/src/themes/Crux/active-top-center-mid-left.png differ
diff --git a/src/themes/Crux/active-top-center-mid-right-border.png b/src/themes/Crux/active-top-center-mid-right-border.png
deleted file mode 100644
index 01d9efa9b..000000000
Binary files a/src/themes/Crux/active-top-center-mid-right-border.png and /dev/null differ
diff --git a/src/themes/Crux/active-top-center-mid-right.png b/src/themes/Crux/active-top-center-mid-right.png
index 6d2b358ef..8cea6f6fe 100644
Binary files a/src/themes/Crux/active-top-center-mid-right.png and b/src/themes/Crux/active-top-center-mid-right.png differ
diff --git a/src/themes/Crux/active-top-center-right-border.png b/src/themes/Crux/active-top-center-right-border.png
deleted file mode 100644
index fd42aa832..000000000
Binary files a/src/themes/Crux/active-top-center-right-border.png and /dev/null differ
diff --git a/src/themes/Crux/active-top-center-right.png b/src/themes/Crux/active-top-center-right.png
index 78339e9e1..84e6857a8 100644
Binary files a/src/themes/Crux/active-top-center-right.png and b/src/themes/Crux/active-top-center-right.png differ
diff --git a/src/themes/Crux/inactive-top-center-left-border.png b/src/themes/Crux/inactive-top-center-left-border.png
deleted file mode 100644
index 0a4c8b861..000000000
Binary files a/src/themes/Crux/inactive-top-center-left-border.png and /dev/null differ
diff --git a/src/themes/Crux/inactive-top-center-left.png b/src/themes/Crux/inactive-top-center-left.png
index 64218d5a0..d281f9289 100644
Binary files a/src/themes/Crux/inactive-top-center-left.png and b/src/themes/Crux/inactive-top-center-left.png differ
diff --git a/src/themes/Crux/inactive-top-center-mid-border.png b/src/themes/Crux/inactive-top-center-mid-border.png
deleted file mode 100644
index dfa8827dd..000000000
Binary files a/src/themes/Crux/inactive-top-center-mid-border.png and /dev/null differ
diff --git a/src/themes/Crux/inactive-top-center-mid.png b/src/themes/Crux/inactive-top-center-mid.png
index 719aa36ee..8fcf6e1ec 100644
Binary files a/src/themes/Crux/inactive-top-center-mid.png and b/src/themes/Crux/inactive-top-center-mid.png differ
diff --git a/src/themes/Crux/inactive-top-center-right-border.png b/src/themes/Crux/inactive-top-center-right-border.png
deleted file mode 100644
index c2d01e585..000000000
Binary files a/src/themes/Crux/inactive-top-center-right-border.png and /dev/null differ
diff --git a/src/themes/Crux/inactive-top-center-right.png b/src/themes/Crux/inactive-top-center-right.png
index c558c635e..2ea82f32f 100644
Binary files a/src/themes/Crux/inactive-top-center-right.png and b/src/themes/Crux/inactive-top-center-right.png differ
diff --git a/src/themes/Crux/metacity-theme-1.xml b/src/themes/Crux/metacity-theme-1.xml
index dbb8c7a99..b394b61e1 100644
--- a/src/themes/Crux/metacity-theme-1.xml
+++ b/src/themes/Crux/metacity-theme-1.xml
@@ -86,32 +86,18 @@
              x="width - object_width" y="3" width="object_width" height="object_height"/>
 
       <image filename="inactive-top-center-left.png" 
-             x="4" y="3" 
+             x="4" y="0" 
              width="(left_width + ButtonWidth + IconTitleSpacing + title_width) `min`
                     (width - right_width - 3 * ButtonWidth - CenterTitlePieceWidth - 3)" 
              height="object_height"/>
-      <image filename="inactive-top-center-left-border.png"
-             x="left_width + 11" y="0"
-             width="(title_width + 8) `min` 
-                    (width - right_width - 3 * ButtonWidth - CenterTitlePieceWidth - 3)" 
-             height="object_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="3" width="object_width" height="object_height"/>
+             y="0" width="object_width" height="object_height"/>
 
-      <image filename="inactive-top-center-mid-border.png"
-             x="((left_width + 16 + title_width + IconTitleSpacing) `min` (width - CenterTitlePieceWidth - right_width - 3 * ButtonWidth)) + 1" y="0"
-             width="object_width" height="object_height"/>
-
-      <image filename="inactive-top-center-right-border.png"
-            x="((left_width + ButtonWidth + IconTitleSpacing + title_width + 16) `min` (width - 3 * ButtonWidth - right_width - 32)) + 1"
-            y="0"
-            width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - 33) `max` (3 * ButtonWidth + 21)"
-            height="object_height"/>
       <image filename="inactive-top-center-right.png"
              x="((left_width + ButtonWidth + IconTitleSpacing + title_width + CenterTitlePieceWidth) `min` (width - 3 * ButtonWidth - right_width)) + 1"
-             y="3"
+             y="0"
              width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth - right_width) `max` (3 * ButtonWidth)"
              height="object_height"/>
     </draw_ops>
@@ -267,42 +253,22 @@
 
       <image filename="active-top-center-left.png" 
              colorize="gtk:bg[SELECTED]"
-             x="4" y="3" 
+             x="4" y="0" 
              width="(left_width + ButtonWidth + IconTitleSpacing + title_width) `min`
                     (width - right_width - 3 * ButtonWidth - CenterTitlePieceWidth - 3)" 
              height="object_height"/>
-      <image filename="active-top-center-left-border.png"
-             colorize="gtk:bg[SELECTED]"
-             x="left_width + 11" y="0"
-             width="(title_width + 8) `min` 
-                    (width - right_width - 3 * ButtonWidth - CenterTitlePieceWidth - 3)" 
-             height="object_height"/>
-
-      <image filename="active-top-center-mid-left-border.png"
-             colorize="gtk:bg[SELECTED]"
-             x="((left_width + 16 + title_width + IconTitleSpacing) `min` (width - CenterTitlePieceWidth - right_width - 3 * ButtonWidth)) + 1" y="0"
-             width="object_width" height="object_height"/>
-
-      <image filename="active-top-center-mid-right-border.png"
-             x="((left_width + 16 + title_width + IconTitleSpacing) `min` (width - CenterTitlePieceWidth - right_width - 3 * ButtonWidth)) + 1" y="0"
-             width="object_width" height="object_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="3" width="object_width" height="object_height"/>
+             y="0" width="object_width" height="object_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="3" width="object_width" height="object_height"/>
+             y="0" width="object_width" height="object_height"/>
 
-      <image filename="active-top-center-right-border.png"
-            x="((left_width + ButtonWidth + IconTitleSpacing + title_width + 16) `min` (width - 3 * ButtonWidth - right_width - 32)) + 1"
-            y="0"
-            width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - 33) `max` (3 * ButtonWidth + 21)"
-            height="object_height"/>
       <image filename="active-top-center-right.png"
              x="((left_width + ButtonWidth + IconTitleSpacing + title_width + CenterTitlePieceWidth) `min` (width - 3 * ButtonWidth - right_width)) + 1"
-             y="3"
+             y="0"
              width="(width - title_width - left_width - ButtonWidth - IconTitleSpacing - CenterTitlePieceWidth - right_width) `max` (3 * ButtonWidth)"
              height="object_height"/>
     </draw_ops>