fixing light metacity highlights

2 files changed, 48 insertions, 32 deletions

diff --git a/Kogaion-daylight/metacity-1/metacity-theme-1.xml b/Kogaion-daylight/metacity-1/metacity-theme-1.xml
index 2d3f88e..925d628 100755
--- a/Kogaion-daylight/metacity-1/metacity-theme-1.xml
+++ b/Kogaion-daylight/metacity-1/metacity-theme-1.xml
@@ -4,8 +4,8 @@
 <info>
   <name>Kogaion-daylight</name>
   <author>bionel</author>
-  <copyright>2015</copyright>
-  <date>March 2015</date>
+  <copyright>Rogentos</copyright>
+  <date>July 2015</date>
   <description>Kogaion Linux daylight theme</description>
 </info>
 
@@ -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">
@@ -114,114 +114,130 @@
 <!-- BUTTONS -->
 	
 	<draw_ops name="menu_focused_normal">
-   	<image filename="menu_focused_normal.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_focused_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="#cbcbcb" 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="#cbcbcb" 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="#cbcbcb" 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="#cbcbcb" 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="#cbcbcb" 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="#cbcbcb" 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="#cbcbcb" 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="#cbcbcb" 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-1.xml b/Kogaion-nighttime/metacity-1/metacity-theme-1.xml
index 442019e..43604b5 100755
--- a/Kogaion-nighttime/metacity-1/metacity-theme-1.xml
+++ b/Kogaion-nighttime/metacity-1/metacity-theme-1.xml
@@ -5,7 +5,7 @@
   <name>Kogaion-nighttime</name>
   <author>bionel</author>
   <copyright>Rogentos</copyright>
-  <date>March 2015</date>
+  <date>July 2015</date>
   <description>Kogaion Linux nighttime theme</description>
 </info>