changing metacity buttons

21 files changed, 47 insertions, 31 deletions

diff --git a/Kogaion-nighttime/metacity-1/maximize_focused_normal.png b/Kogaion-nighttime/metacity-1/maximize_focused_normal.png
index eafad00..d97b8da 100755
--- a/Kogaion-nighttime/metacity-1/maximize_focused_normal.png
+++ b/Kogaion-nighttime/metacity-1/maximize_focused_normal.png
diff --git a/Kogaion-nighttime/metacity-1/maximize_focused_prelight.png b/Kogaion-nighttime/metacity-1/maximize_focused_prelight.png
index f47bbd5..d97b8da 100755
--- a/Kogaion-nighttime/metacity-1/maximize_focused_prelight.png
+++ b/Kogaion-nighttime/metacity-1/maximize_focused_prelight.png
diff --git a/Kogaion-nighttime/metacity-1/maximize_focused_pressed.png b/Kogaion-nighttime/metacity-1/maximize_focused_pressed.png
index 5762c8e..1529dcc 100755
--- a/Kogaion-nighttime/metacity-1/maximize_focused_pressed.png
+++ b/Kogaion-nighttime/metacity-1/maximize_focused_pressed.png
diff --git a/Kogaion-nighttime/metacity-1/maximize_unfocused.png b/Kogaion-nighttime/metacity-1/maximize_unfocused.png
index abb363c..fe8e5a3 100755
--- a/Kogaion-nighttime/metacity-1/maximize_unfocused.png
+++ b/Kogaion-nighttime/metacity-1/maximize_unfocused.png
diff --git a/Kogaion-nighttime/metacity-1/maximize_unfocused_prelight.png b/Kogaion-nighttime/metacity-1/maximize_unfocused_prelight.png
index ff57b4f..4beb8b4 100755
--- a/Kogaion-nighttime/metacity-1/maximize_unfocused_prelight.png
+++ b/Kogaion-nighttime/metacity-1/maximize_unfocused_prelight.png
diff --git a/Kogaion-nighttime/metacity-1/menu.png b/Kogaion-nighttime/metacity-1/menu.png
deleted file mode 100755
index 1a08a8a..0000000
--- a/Kogaion-nighttime/metacity-1/menu.png
+++ /dev/null
diff --git a/Kogaion-nighttime/metacity-1/menu_prelight.png b/Kogaion-nighttime/metacity-1/menu_prelight.png
deleted file mode 100755
index 74bb57b..0000000
--- a/Kogaion-nighttime/metacity-1/menu_prelight.png
+++ /dev/null
diff --git a/Kogaion-nighttime/metacity-1/menu_unfocused.png b/Kogaion-nighttime/metacity-1/menu_unfocused.png
index fdf6a76..5432869 100755
--- a/Kogaion-nighttime/metacity-1/menu_unfocused.png
+++ b/Kogaion-nighttime/metacity-1/menu_unfocused.png
diff --git a/Kogaion-nighttime/metacity-1/menu_unfocused_prelight.png b/Kogaion-nighttime/metacity-1/menu_unfocused_prelight.png
index 357f94a..0926030 100755
--- a/Kogaion-nighttime/metacity-1/menu_unfocused_prelight.png
+++ b/Kogaion-nighttime/metacity-1/menu_unfocused_prelight.png
diff --git a/Kogaion-nighttime/metacity-1/metacity-theme-1.xml b/Kogaion-nighttime/metacity-1/metacity-theme-1.xml
index bfb1169..442019e 100755
--- a/Kogaion-nighttime/metacity-1/metacity-theme-1.xml
+++ b/Kogaion-nighttime/metacity-1/metacity-theme-1.xml
@@ -20,7 +20,7 @@
   <aspect_ratio name="button" value="1"/>
   <distance name="title_vertical_pad" value="6"/>
   <border name="title_border" left="4" right="4" top="3" bottom="3"/>
-  <border name="button_border" left="4" right="4" top="3" bottom="3"/>
+  <border name="button_border" left="4" right="4" top="0" bottom="0"/>
 </frame_geometry>
 
 <frame_geometry name="normal_small_borders" parent="normal" rounded_top_left="false" rounded_top_right="false">
@@ -122,115 +122,131 @@
 <!-- BUTTONS -->
 	
 	<draw_ops name="menu_focused_normal">
-   	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
+   		<image filename="menu_focused_normal.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="menu_focused_prelight">
-  	 <image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+  	 	<image filename="menu_focused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="menu_unfocused_normal">
-  	 	<image filename="menu_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
+  	 	<image filename="menu_unfocused.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="menu_unfocused_prelight">
-   		<image filename="menu_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+   		<image filename="menu_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="minimize_focused_normal">
-		<image filename="minimize_focused_normal.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="minimize_focused_normal.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="minimize_focused_prelight">
-		<image filename="minimize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<image filename="minimize_focused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="minimize_focused_pressed">
-		<image filename="minimize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height"/>
+		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<image filename="minimize_focused_pressed.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="minimize_unfocused_normal">
-		<image filename="minimize_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="minimize_unfocused.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="minimize_unfocused_prelight">
-		<image filename="minimize_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<rectangle x="1" y="1" width="25" height="25" color="#969696" filled="true"/>
+		<image filename="minimize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="minimize_unfocused_pressed">
-		<image filename="minimize_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<rectangle x="1" y="1" width="25" height="25" color="#969696" filled="true"/>
+		<image filename="minimize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="maximize_focused_normal">
-		<image filename="maximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="maximize_focused_normal.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="maximize_focused_prelight">
-		<image filename="maximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<image filename="maximize_focused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="maximize_focused_pressed">
-		<image filename="maximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height"/>
+		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<image filename="maximize_focused_pressed.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="maximize_unfocused_normal">
-		<image filename="maximize_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="maximize_unfocused.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="maximize_unfocused_prelight">
-		<image filename="maximize_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<rectangle x="1" y="1" width="25" height="25" color="#969696" filled="true"/>
+		<image filename="maximize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="maximize_unfocused_pressed">
-		<image filename="maximize_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<rectangle x="1" y="1" width="25" height="25" color="#969696" filled="true"/>
+		<image filename="maximize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="unmaximize_focused_normal">
-		<image filename="unmaximize_focused_normal.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="unmaximize_focused_normal.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="unmaximize_focused_prelight">
-		<image filename="unmaximize_focused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<image filename="unmaximize_focused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="unmaximize_focused_pressed">
-		<image filename="unmaximize_focused_pressed.png" x="0" y="1" width="object_width" height="object_height"/>
+		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<image filename="unmaximize_focused_pressed.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="unmaximize_unfocused_normal">
-		<image filename="unmaximize_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="unmaximize_unfocused.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="unmaximize_unfocused_prelight">
-		<image filename="unmaximize_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<rectangle x="1" y="1" width="25" height="25" color="#969696" filled="true"/>
+		<image filename="unmaximize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="unmaximize_unfocused_pressed">
-		<image filename="unmaximize_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<rectangle x="1" y="1" width="25" height="25" color="#969696" filled="true"/>
+		<image filename="unmaximize_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="close_focused_normal">
-		<image filename="close_focused_normal.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="close_focused_normal.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="close_focused_prelight">
-		<image filename="close_focused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<image filename="close_focused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="close_focused_pressed">
-		<image filename="close_focused_pressed.png" x="0" y="1" width="object_width" height="object_height"/>
+		<rectangle x="1" y="1" width="25" height="25" color="#6c99c0" filled="true"/>
+		<image filename="close_focused_pressed.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="close_unfocused_normal">
-		<image filename="close_unfocused.png" x="0" y="1" width="object_width" height="object_height"/>
+		<image filename="close_unfocused.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="close_unfocused_prelight">
-		<image filename="close_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<rectangle x="1" y="1" width="25" height="25" color="#969696" filled="true"/>
+		<image filename="close_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="close_unfocused_pressed">
-		<image filename="close_unfocused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+		<rectangle x="1" y="1" width="25" height="25" color="#969696" filled="true"/>
+		<image filename="close_unfocused_prelight.png" x="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
 
 <!-- FRAME STYLES -->
diff --git a/Kogaion-nighttime/metacity-1/metacity-theme-3.xml b/Kogaion-nighttime/metacity-1/metacity-theme-3.xml
index 1f27029..b2831ee 100755
--- a/Kogaion-nighttime/metacity-1/metacity-theme-3.xml
+++ b/Kogaion-nighttime/metacity-1/metacity-theme-3.xml
@@ -280,13 +280,13 @@
 	</draw_ops>
 
 	<draw_ops name="menu_focused">
-   	<image filename="menu.png" x="0" y="1" width="object_width" height="object_height"/>
+   	<image filename="menu_focused_normal.png" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 
 <!-- No prelight for menu focussed?? -->
 
 	<draw_ops name="menu_focused_pressed">
-  	 <image filename="menu_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
+  	 <image filename="menu_focused_prelight.png" x="0" y="1" width="object_width" height="object_height"/>
 	</draw_ops>
 
 	<draw_ops name="menu_unfocused">
diff --git a/Kogaion-nighttime/metacity-1/minimize_focused_normal.png b/Kogaion-nighttime/metacity-1/minimize_focused_normal.png
index 1cbff4a..ab1add8 100755
--- a/Kogaion-nighttime/metacity-1/minimize_focused_normal.png
+++ b/Kogaion-nighttime/metacity-1/minimize_focused_normal.png
diff --git a/Kogaion-nighttime/metacity-1/minimize_focused_prelight.png b/Kogaion-nighttime/metacity-1/minimize_focused_prelight.png
index 9ae6dcf..ab1add8 100755
--- a/Kogaion-nighttime/metacity-1/minimize_focused_prelight.png
+++ b/Kogaion-nighttime/metacity-1/minimize_focused_prelight.png
diff --git a/Kogaion-nighttime/metacity-1/minimize_focused_pressed.png b/Kogaion-nighttime/metacity-1/minimize_focused_pressed.png
index 0817a34..981d2c6 100755
--- a/Kogaion-nighttime/metacity-1/minimize_focused_pressed.png
+++ b/Kogaion-nighttime/metacity-1/minimize_focused_pressed.png
diff --git a/Kogaion-nighttime/metacity-1/minimize_unfocused.png b/Kogaion-nighttime/metacity-1/minimize_unfocused.png
index 7e84d0d..7b61ae5 100755
--- a/Kogaion-nighttime/metacity-1/minimize_unfocused.png
+++ b/Kogaion-nighttime/metacity-1/minimize_unfocused.png
diff --git a/Kogaion-nighttime/metacity-1/minimize_unfocused_prelight.png b/Kogaion-nighttime/metacity-1/minimize_unfocused_prelight.png
index 6d45f7b..c5238ae 100755
--- a/Kogaion-nighttime/metacity-1/minimize_unfocused_prelight.png
+++ b/Kogaion-nighttime/metacity-1/minimize_unfocused_prelight.png
diff --git a/Kogaion-nighttime/metacity-1/unmaximize_focused_normal.png b/Kogaion-nighttime/metacity-1/unmaximize_focused_normal.png
index 6366568..ffd00a4 100755
--- a/Kogaion-nighttime/metacity-1/unmaximize_focused_normal.png
+++ b/Kogaion-nighttime/metacity-1/unmaximize_focused_normal.png
diff --git a/Kogaion-nighttime/metacity-1/unmaximize_focused_prelight.png b/Kogaion-nighttime/metacity-1/unmaximize_focused_prelight.png
index aeb3e03..ffd00a4 100755
--- a/Kogaion-nighttime/metacity-1/unmaximize_focused_prelight.png
+++ b/Kogaion-nighttime/metacity-1/unmaximize_focused_prelight.png
diff --git a/Kogaion-nighttime/metacity-1/unmaximize_focused_pressed.png b/Kogaion-nighttime/metacity-1/unmaximize_focused_pressed.png
index c0d859e..0dcc019 100755
--- a/Kogaion-nighttime/metacity-1/unmaximize_focused_pressed.png
+++ b/Kogaion-nighttime/metacity-1/unmaximize_focused_pressed.png
diff --git a/Kogaion-nighttime/metacity-1/unmaximize_unfocused.png b/Kogaion-nighttime/metacity-1/unmaximize_unfocused.png
index 3ce899f..f13f781 100755
--- a/Kogaion-nighttime/metacity-1/unmaximize_unfocused.png
+++ b/Kogaion-nighttime/metacity-1/unmaximize_unfocused.png
diff --git a/Kogaion-nighttime/metacity-1/unmaximize_unfocused_prelight.png b/Kogaion-nighttime/metacity-1/unmaximize_unfocused_prelight.png
index ae6a02d..3159e24 100755
--- a/Kogaion-nighttime/metacity-1/unmaximize_unfocused_prelight.png
+++ b/Kogaion-nighttime/metacity-1/unmaximize_unfocused_prelight.png