some code face-lifting

2 files changed, 109 insertions, 116 deletions

diff --git a/Kogaion-daylight/metacity-1/metacity-theme-1.xml b/Kogaion-daylight/metacity-1/metacity-theme-1.xml
index e877528..f1eab5d 100755
--- a/Kogaion-daylight/metacity-1/metacity-theme-1.xml
+++ b/Kogaion-daylight/metacity-1/metacity-theme-1.xml
@@ -2,59 +2,59 @@
 <metacity_theme>
 
 <info>
-  <name>Kogaion-daylight</name>
-  <author>bionel</author>
-  <copyright>Rogentos</copyright>
-  <date>July 2015</date>
-  <description>Kogaion Linux daylight theme</description>
+	<name>Kogaion-daylight</name>
+	<author>bionel</author>
+	<copyright>Rogentos</copyright>
+	<date>July 2015</date>
+	<description>Kogaion Linux daylight theme</description>
 </info>
 
 <!-- TODO -->
-<!-- Thiner borders -->
+<!-- Nothing to see here! -->
 
 <!-- FRAMES GEOMETRY-->
 
 <frame_geometry name="normal" rounded_top_left="false" rounded_top_right="false">
-  <distance name="left_width" value="2"/>
-  <distance name="right_width" value="2"/>
-  <distance name="bottom_height" value="2"/>
-  <distance name="left_titlebar_edge" value="2"/>
-  <distance name="right_titlebar_edge" value="2"/>
-  <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="0" bottom="0"/>
+	<distance name="left_width" value="2"/>
+	<distance name="right_width" value="2"/>
+	<distance name="bottom_height" value="2"/>
+	<distance name="left_titlebar_edge" value="2"/>
+	<distance name="right_titlebar_edge" value="2"/>
+	<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="0" bottom="0"/>
 </frame_geometry>
 
 <frame_geometry name="normal_small_borders" parent="normal" rounded_top_left="false" rounded_top_right="false">
-  <distance name="left_titlebar_edge" value="1" />
-  <distance name="right_titlebar_edge" value="1" />
-  <distance name="left_width" value="0" />
-  <distance name="right_width" value="0" />
-  <distance name="bottom_height" value="0" />
+	<distance name="left_titlebar_edge" value="1" />
+	<distance name="right_titlebar_edge" value="1" />
+	<distance name="left_width" value="0" />
+	<distance name="right_width" value="0" />
+	<distance name="bottom_height" value="0" />
 </frame_geometry>
 
 <frame_geometry name="utility" parent="normal">
 </frame_geometry>
 
 <frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false">
-  <distance name="left_width" value="4"/>
-  <distance name="right_width" value="4"/>
-  <distance name="bottom_height" value="4"/>
-  <distance name="left_titlebar_edge" value="0"/>
-  <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"/>
-  <border name="title_border" left="0" right="0" top="0" bottom="0"/>
-  <border name="button_border" left="0" right="0" top="0" bottom="0"/>
+	<distance name="left_width" value="4"/>
+	<distance name="right_width" value="4"/>
+	<distance name="bottom_height" value="4"/>
+	<distance name="left_titlebar_edge" value="0"/>
+	<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"/>
+	<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>
 
 <!-- ACTUALLY DRAWING FRAMES -->
 
 <draw_ops name="title_background">   
-   <rectangle color="gtk:bg[SELECTED]" x="0" y="0" width="width" height="height" filled="true"/>
-   <rectangle color="gtk:dark[SELECTED]" x="0" y="0" width="width-1" height="height"/>
+	<rectangle color="gtk:bg[SELECTED]" x="0" y="0" width="width" height="height" filled="true"/>
+	<rectangle color="gtk:dark[SELECTED]" x="0" y="0" width="width-1" height="height"/>
 </draw_ops>
 
 <draw_ops name="title_background_maximized">
@@ -107,21 +107,21 @@
 </draw_ops>
 
 <draw_ops name="title_normal">
-  <include name="title_text_with_icon"/>
+	<include name="title_text_with_icon"/>
 </draw_ops>
 
 <draw_ops name="title_focused">
-  <include name="title_text_focused_with_icon"/>
+	<include name="title_text_focused_with_icon"/>
 </draw_ops>
 
 <!-- BUTTONS -->
 	
 	<draw_ops name="menu_focused_normal">
-   	<image filename="menu_focused_normal.png" x="4" y="4" 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="4" y="4" 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">
@@ -159,6 +159,7 @@
 		<rectangle x="1" y="1" width="25" height="25" color="gtk:dark[INSENSITIVE]" 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="4" y="4" width="object_width" height="object_height"/>
 	</draw_ops>
@@ -249,7 +250,6 @@
     <piece position="entire_background" draw_ops="unfocus_background"/>
     <piece position="titlebar" draw_ops="title_unfocused_background"/>
     <piece position="title" draw_ops="title_normal"/>
-
 	<button function="menu" state="normal" draw_ops="menu_unfocused_normal"/>
 	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight"/>
 	<button function="menu" state="pressed" draw_ops="menu_focused_normal"/>
@@ -268,7 +268,6 @@
     <piece position="entire_background" draw_ops="focus_background"/>
     <piece position="titlebar" draw_ops="title_background"/>  
     <piece position="title" draw_ops="title_focused"/>
-
 	<button function="menu" state="normal" draw_ops="menu_focused_normal"/>
 	<button function="menu" state="prelight" draw_ops="menu_focused_prelight"/>
 	<button function="menu" state="pressed" draw_ops="menu_focused_normal"/> 
@@ -286,7 +285,6 @@
 <frame_style name="maximized_unfocused" geometry="normal_small_borders" parent="normal_unfocused">
     <piece position="entire_background" draw_ops="blank"/>
     <piece position="titlebar" draw_ops="title_unfocused_background_maximized"/>
-
 	<button function="maximize" state="normal" draw_ops="unmaximize_unfocused_normal"/>
 	<button function="maximize" state="prelight" draw_ops="unmaximize_unfocused_prelight"/>
 	<button function="maximize" state="pressed" draw_ops="unmaximize_unfocused_pressed"/>
@@ -295,40 +293,39 @@
 <frame_style name="maximized_focused" geometry="normal_small_borders" parent="normal_focused">
     <piece position="entire_background" draw_ops="focus_outline"/>
     <piece position="titlebar" draw_ops="title_background_maximized"/>
-
 	<button function="maximize" state="normal" draw_ops="unmaximize_focused_normal"/>
 	<button function="maximize" state="prelight" draw_ops="unmaximize_focused_prelight"/>
 	<button function="maximize" state="pressed" draw_ops="unmaximize_focused_pressed"/>
 </frame_style>
 
 <frame_style name="border" geometry="border" parent="normal_unfocused">
-  <piece position="entire_background" draw_ops="unfocus_background"/>
-  <piece position="titlebar" draw_ops="blank"/>
-  <piece position="title" draw_ops="blank"/>
+	<piece position="entire_background" draw_ops="unfocus_background"/>
+	<piece position="titlebar" draw_ops="blank"/>
+	<piece position="title" draw_ops="blank"/>
 </frame_style>
 
 <!-- STYLE SETS -->
 
 <frame_style_set name="normal">
-<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-<frame focus="yes" state="maximized" style="maximized_focused"/>
-<frame focus="no" state="maximized" style="maximized_unfocused"/>
-<frame focus="yes" state="shaded" style="normal_focused"/>
-<frame focus="no" state="shaded" style="normal_unfocused"/>
-<frame focus="yes" state="maximized_and_shaded" style="maximized_focused"/>
-<frame focus="no" state="maximized_and_shaded" style="maximized_unfocused"/>
+	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
+	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
+	<frame focus="yes" state="maximized" style="maximized_focused"/>
+	<frame focus="no" state="maximized" style="maximized_unfocused"/>
+	<frame focus="yes" state="shaded" style="normal_focused"/>
+	<frame focus="no" state="shaded" style="normal_unfocused"/>
+	<frame focus="yes" state="maximized_and_shaded" style="maximized_focused"/>
+	<frame focus="no" state="maximized_and_shaded" style="maximized_unfocused"/>
 </frame_style_set>
 
 <frame_style_set name="border">
-<frame focus="yes" state="normal" resize="both" style="border"/>
-<frame focus="no" state="normal" resize="both" style="border"/>
-<frame focus="yes" state="maximized" style="border"/>
-<frame focus="no" state="maximized" style="border"/>
-<frame focus="yes" state="shaded" style="border"/>
-<frame focus="no" state="shaded" style="border"/>
-<frame focus="yes" state="maximized_and_shaded" style="border"/>
-<frame focus="no" state="maximized_and_shaded" style="border"/>
+	<frame focus="yes" state="normal" resize="both" style="border"/>
+	<frame focus="no" state="normal" resize="both" style="border"/>
+	<frame focus="yes" state="maximized" style="border"/>
+	<frame focus="no" state="maximized" style="border"/>
+	<frame focus="yes" state="shaded" style="border"/>
+	<frame focus="no" state="shaded" style="border"/>
+	<frame focus="yes" state="maximized_and_shaded" style="border"/>
+	<frame focus="no" state="maximized_and_shaded" style="border"/>
 </frame_style_set>
 
 <!-- WINDOWS -->
diff --git a/Kogaion-nighttime/metacity-1/metacity-theme-1.xml b/Kogaion-nighttime/metacity-1/metacity-theme-1.xml
index 17ee6e5..71b3b9a 100755
--- a/Kogaion-nighttime/metacity-1/metacity-theme-1.xml
+++ b/Kogaion-nighttime/metacity-1/metacity-theme-1.xml
@@ -2,11 +2,11 @@
 <metacity_theme>
 
 <info>
-  <name>Kogaion-nighttime</name>
-  <author>bionel</author>
-  <copyright>Rogentos</copyright>
-  <date>July 2015</date>
-  <description>Kogaion Linux nighttime theme</description>
+	<name>Kogaion-nighttime</name>
+	<author>bionel</author>
+	<copyright>Rogentos</copyright>
+	<date>July 2015</date>
+	<description>Kogaion Linux nighttime theme</description>
 </info>
 
 <!-- TODO -->
@@ -15,39 +15,39 @@
 <!-- FRAMES GEOMETRY-->
 
 <frame_geometry name="normal" rounded_top_left="false" rounded_top_right="false">
-  <distance name="left_width" value="2"/>
-  <distance name="right_width" value="2"/>
-  <distance name="bottom_height" value="2"/>
-  <distance name="left_titlebar_edge" value="2"/>
-  <distance name="right_titlebar_edge" value="2"/>
-  <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="0" bottom="0"/>
+	<distance name="left_width" value="2"/>
+	<distance name="right_width" value="2"/>
+	<distance name="bottom_height" value="2"/>
+	<distance name="left_titlebar_edge" value="2"/>
+	<distance name="right_titlebar_edge" value="2"/>
+	<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="0" bottom="0"/>
 </frame_geometry>
 
 <frame_geometry name="normal_small_borders" parent="normal" rounded_top_left="false" rounded_top_right="false">
-  <distance name="left_titlebar_edge" value="1" />
-  <distance name="right_titlebar_edge" value="1" />
-  <distance name="left_width" value="0" />
-  <distance name="right_width" value="0" />
-  <distance name="bottom_height" value="0" />
+	<distance name="left_titlebar_edge" value="1" />
+	<distance name="right_titlebar_edge" value="1" />
+	<distance name="left_width" value="0" />
+	<distance name="right_width" value="0" />
+	<distance name="bottom_height" value="0" />
 </frame_geometry>
 
 <frame_geometry name="utility" parent="normal">
 </frame_geometry>
 
 <frame_geometry name="border" has_title="false" rounded_top_left="false" rounded_top_right="false">
-  <distance name="left_width" value="4"/>
-  <distance name="right_width" value="4"/>
-  <distance name="bottom_height" value="4"/>
-  <distance name="left_titlebar_edge" value="0"/>
-  <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"/>
-  <border name="title_border" left="0" right="0" top="0" bottom="0"/>
-  <border name="button_border" left="0" right="0" top="0" bottom="0"/>
+	<distance name="left_width" value="4"/>
+	<distance name="right_width" value="4"/>
+	<distance name="bottom_height" value="4"/>
+	<distance name="left_titlebar_edge" value="0"/>
+	<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"/>
+	<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>
 
 <!-- ACTUALLY DRAWING FRAMES -->
@@ -73,7 +73,7 @@
 </draw_ops>
 
 <draw_ops name="blank">
-<!-- nothing -->
+	<!-- nothing -->
 </draw_ops>
 
 <draw_ops name="focus_outline">
@@ -87,11 +87,11 @@
 </draw_ops>
 
 <draw_ops name="focus_background">
-  <include name="focus_outline"/>
+	<include name="focus_outline"/>
 </draw_ops>
 
 <draw_ops name="unfocus_background">
-  <include name="unfocus_outline" />
+	<include name="unfocus_outline" />
 </draw_ops>
 
 <!-- unfocussed -->
@@ -113,13 +113,13 @@
 <!-- unfocussed -->
 
 <draw_ops name="title_normal">
-  <include name="title_text_with_icon"/>
+	<include name="title_text_with_icon"/>
 </draw_ops>
 
 <!-- focused -->
 
 <draw_ops name="title_focused">
-  <include name="title_text_focused_with_icon"/>
+	<include name="title_text_focused_with_icon"/>
 </draw_ops>
 
 <!-- BUTTONS -->
@@ -258,7 +258,6 @@
     <piece position="entire_background" draw_ops="unfocus_background"/>
     <piece position="titlebar" draw_ops="title_unfocused_background"/>
     <piece position="title" draw_ops="title_normal"/>
-
 	<button function="menu" state="normal" draw_ops="menu_unfocused_normal"/>
 	<button function="menu" state="prelight" draw_ops="menu_unfocused_prelight"/>
 	<button function="menu" state="pressed" draw_ops="menu_focused_normal"/>
@@ -277,7 +276,6 @@
     <piece position="entire_background" draw_ops="focus_background"/>
     <piece position="titlebar" draw_ops="title_background"/>  
     <piece position="title" draw_ops="title_focused"/>
-
 	<button function="menu" state="normal" draw_ops="menu_focused_normal"/>
 	<button function="menu" state="prelight" draw_ops="menu_focused_prelight"/>
 	<button function="menu" state="pressed" draw_ops="menu_focused_normal"/> 
@@ -295,7 +293,6 @@
 <frame_style name="maximized_unfocused" geometry="normal_small_borders" parent="normal_unfocused">
     <piece position="entire_background" draw_ops="blank"/>
     <piece position="titlebar" draw_ops="title_unfocused_background_maximized"/>
-
 	<button function="maximize" state="normal" draw_ops="unmaximize_unfocused_normal"/>
 	<button function="maximize" state="prelight" draw_ops="unmaximize_unfocused_prelight"/>
 	<button function="maximize" state="pressed" draw_ops="unmaximize_unfocused_pressed"/>
@@ -304,40 +301,39 @@
 <frame_style name="maximized_focused" geometry="normal_small_borders" parent="normal_focused">
     <piece position="entire_background" draw_ops="focus_outline"/>
     <piece position="titlebar" draw_ops="title_background_maximized"/>
-
 	<button function="maximize" state="normal" draw_ops="unmaximize_focused_normal"/>
 	<button function="maximize" state="prelight" draw_ops="unmaximize_focused_prelight"/>
 	<button function="maximize" state="pressed" draw_ops="unmaximize_focused_pressed"/>
 </frame_style>
 
 <frame_style name="border" geometry="border" parent="normal_unfocused">
-  <piece position="entire_background" draw_ops="unfocus_background"/>
-  <piece position="titlebar" draw_ops="blank"/>
-  <piece position="title" draw_ops="blank"/>
+	<piece position="entire_background" draw_ops="unfocus_background"/>
+	<piece position="titlebar" draw_ops="blank"/>
+	<piece position="title" draw_ops="blank"/>
 </frame_style>
 
 <!-- STYLE SETS -->
 
 <frame_style_set name="normal">
-<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
-<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
-<frame focus="yes" state="maximized" style="maximized_focused"/>
-<frame focus="no" state="maximized" style="maximized_unfocused"/>
-<frame focus="yes" state="shaded" style="normal_focused"/>
-<frame focus="no" state="shaded" style="normal_unfocused"/>
-<frame focus="yes" state="maximized_and_shaded" style="maximized_focused"/>
-<frame focus="no" state="maximized_and_shaded" style="maximized_unfocused"/>
+	<frame focus="yes" state="normal" resize="both" style="normal_focused"/>
+	<frame focus="no" state="normal" resize="both" style="normal_unfocused"/>
+	<frame focus="yes" state="maximized" style="maximized_focused"/>
+	<frame focus="no" state="maximized" style="maximized_unfocused"/>
+	<frame focus="yes" state="shaded" style="normal_focused"/>
+	<frame focus="no" state="shaded" style="normal_unfocused"/>
+	<frame focus="yes" state="maximized_and_shaded" style="maximized_focused"/>
+	<frame focus="no" state="maximized_and_shaded" style="maximized_unfocused"/>
 </frame_style_set>
 
 <frame_style_set name="border">
-<frame focus="yes" state="normal" resize="both" style="border"/>
-<frame focus="no" state="normal" resize="both" style="border"/>
-<frame focus="yes" state="maximized" style="border"/>
-<frame focus="no" state="maximized" style="border"/>
-<frame focus="yes" state="shaded" style="border"/>
-<frame focus="no" state="shaded" style="border"/>
-<frame focus="yes" state="maximized_and_shaded" style="border"/>
-<frame focus="no" state="maximized_and_shaded" style="border"/>
+	<frame focus="yes" state="normal" resize="both" style="border"/>
+	<frame focus="no" state="normal" resize="both" style="border"/>
+	<frame focus="yes" state="maximized" style="border"/>
+	<frame focus="no" state="maximized" style="border"/>
+	<frame focus="yes" state="shaded" style="border"/>
+	<frame focus="no" state="shaded" style="border"/>
+	<frame focus="yes" state="maximized_and_shaded" style="border"/>
+	<frame focus="no" state="maximized_and_shaded" style="border"/>
 </frame_style_set>
 
 <!-- WINDOWS -->