Revert to using circular button states + new metacity themes

16 files changed, 1207 insertions, 330 deletions

diff --git a/Shiki-Colors-Revival/metacity-1/close.png b/Shiki-Colors-Revival/metacity-1/close.png
new file mode 100644
index 0000000..88917a2
--- /dev/null
+++ b/Shiki-Colors-Revival/metacity-1/close.png
diff --git a/Shiki-Colors-Revival/metacity-1/close_unfocused.png b/Shiki-Colors-Revival/metacity-1/close_unfocused.png
new file mode 100644
index 0000000..86aeaf2
--- /dev/null
+++ b/Shiki-Colors-Revival/metacity-1/close_unfocused.png
diff --git a/Shiki-Colors-Revival/metacity-1/maximize.png b/Shiki-Colors-Revival/metacity-1/maximize.png
new file mode 100644
index 0000000..cf8d226
--- /dev/null
+++ b/Shiki-Colors-Revival/metacity-1/maximize.png
diff --git a/Shiki-Colors-Revival/metacity-1/maximize_unfocused.png b/Shiki-Colors-Revival/metacity-1/maximize_unfocused.png
new file mode 100644
index 0000000..d6728ec
--- /dev/null
+++ b/Shiki-Colors-Revival/metacity-1/maximize_unfocused.png
diff --git a/Shiki-Colors-Revival/metacity-1/metacity-theme-1.xml b/Shiki-Colors-Revival/metacity-1/metacity-theme-1.xml
new file mode 100644
index 0000000..26aafdd
--- /dev/null
+++ b/Shiki-Colors-Revival/metacity-1/metacity-theme-1.xml
@@ -0,0 +1,622 @@
+<?xml version="1.0"?>
+<metacity_theme>
+<info>
+	<name>Shiki-Colors-Revival</name>
+	<author>Kylie McClain &lt;somasis@exherbo.org&gt;, Victor C. &lt;perfectska04@gmail.com&gt;</author>
+	<copyright>&#194; 2015 Kylie McClain, &#194; 2009 perfectska04</copyright>
+	<date>Jun, 2015</date>
+	<description>Unity-based Metacity Theme for Shiki-Colors-Revival</description>
+</info>
+
+<!-- ::: GEOMETRY ::: -->
+<frame_geometry name="normal" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">
+	<distance name="left_width" value="1"/>
+	<distance name="right_width" value="1"/>
+	<distance name="bottom_height" value="4"/>
+	<distance name="left_titlebar_edge" value="2"/>
+	<distance name="right_titlebar_edge" value="2"/>
+	<distance name="button_width" value="20"/>
+	<distance name="button_height" value="20"/>
+	<distance name="title_vertical_pad" value="1"/>
+	<border name="title_border" left="12" right="2" top="4" bottom="2"/>
+	<border name="button_border" left="1" right="1" top="3" bottom="2"/>
+</frame_geometry>
+
+<frame_geometry name="shaded" parent="normal" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false"/>
+
+<frame_geometry name="normal_maximized" parent="normal" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_right="false">
+	<!-- strip frame spacing off the normal geometry when maximised -->
+	<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"/>
+</frame_geometry>
+
+<frame_geometry name="utility" title_scale="small" rounded_top_left="false" rounded_top_right="false" rounded_bottom_left="false" rounded_bottom_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="3"/>
+	<distance name="right_titlebar_edge" value="3"/>
+	<distance name="title_vertical_pad" value="0"/>
+	<border name="title_border" left="2" right="2" top="4" bottom="3"/>
+	<border name="button_border" left="0" right="0" top="2" bottom="2"/>
+	<aspect_ratio name="button" value="1"/>
+</frame_geometry>
+
+<frame_geometry name="border" has_title="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="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="4"/>
+	<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>
+
+<!-- button minimum size -->
+<constant name="Bmin" value="7"/>
+<!-- button inside padding -->
+<constant name="Bpad" value="6"/>
+
+<!-- ::: CORNERS ::: -->
+<draw_ops name="corners_outline_selected_top">
+	<!-- top left -->
+	<line color="#212121" x1="0" y1="0" x2="0" y2="0"/>
+	<line color="#212121" x1="0" y1="0" x2="0" y2="0"/>
+	<line color="#212121" x1="0" y1="0" x2="0" y2="0"/>
+	<line color="#212121" x1="0" y1="0" x2="0" y2="0"/>
+	<line color="#212121" x1="0" y1="0" x2="0" y2="0"/>
+
+	<!-- top right -->
+	<line color="#212121" x1="width" y1="0" x2="width" y2="0"/>
+	<line color="#212121" x1="width" y1="0" x2="width" y2="0"/>
+	<line color="#212121" x1="width" y1="0" x2="width" y2="0"/>
+	<line color="#212121" x1="width" y1="0" x2="width" y2="0"/>
+	<line color="#212121" x1="width" y1="0" x2="width" y2="0"/>
+</draw_ops>
+
+<draw_ops name="corners_outline_top">
+	<!-- top left -->
+	<line color="#212121" x1="0" y1="0" x2="0" y2="0"/>
+	<line color="#212121" x1="0" y1="0" x2="0" y2="0"/>
+	<line color="#212121" x1="0" y1="0" x2="0" y2="0"/>
+	<line color="#212121" x1="0" y1="0" x2="0" y2="0"/>
+	<line color="#212121" x1="0" y1="0" x2="0" y2="0"/>
+
+	<!-- top right -->
+	<line color="#212121" x1="width" y1="0" x2="width" y2="0"/>
+	<line color="#212121" x1="width" y1="0" x2="width" y2="0"/>
+	<line color="#212121" x1="width" y1="0" x2="width" y2="0"/>
+	<line color="#212121" x1="width" y1="0" x2="width" y2="0"/>
+	<line color="#212121" x1="width" y1="0" x2="width" y2="0"/>
+</draw_ops>
+
+<draw_ops name="corners_outline_selected_bottom">
+	<!-- bottom left -->
+	<line color="#212121" x1="1" y1="height-4" x2="1" y2="height-5"/>
+	<line color="#212121" x1="2" y1="height-3" x2="2" y2="height-3"/>
+	<line color="#212121" x1="2" y1="height-2" x2="4" y2="height-2"/>
+
+	<!-- bottom right -->
+	<line color="#212121" x1="width-2" y1="height-4" x2="width-2" y2="height-5"/>
+	<line color="#212121" x1="width-3" y1="height-3" x2="width-3" y2="height-3"/>
+	<line color="#212121" x1="width-4" y1="height-2" x2="width-5" y2="height-2"/>
+</draw_ops>
+
+<draw_ops name="corners_outline_bottom">
+	<!-- bottom left -->
+	<line color="#212121" x1="1" y1="height-4" x2="1" y2="height-5"/>
+	<line color="#212121" x1="2" y1="height-3" x2="2" y2="height-3"/>
+	<line color="#212121" x1="2" y1="height-2" x2="4" y2="height-2"/>
+
+	<!-- bottom right -->
+	<line color="#212121" x1="width-2" y1="height-4" x2="width-2" y2="height-5"/>
+	<line color="#212121" x1="width-3" y1="height-3" x2="width-3" y2="height-3"/>
+	<line color="#212121" x1="width-4" y1="height-2" x2="width-5" y2="height-2"/>
+</draw_ops>
+
+<draw_ops name="corners_highlight">
+	
+</draw_ops>
+
+<draw_ops name="corners_highlight_unfocused">
+	
+</draw_ops>
+
+<draw_ops name="corners_highlight_shaded">
+	
+</draw_ops>
+
+<draw_ops name="corners_highlight_shaded_unfocused">
+	
+</draw_ops>
+
+<draw_ops name="window_bg">
+	<rectangle color="#212121" filled="true" x="0" y="0" width="width" height="height"/>
+</draw_ops>
+
+<!-- ::: BEVEL FOCUSED ::: -->
+<draw_ops name="bevel">
+	<include name="window_bg"/>
+	<line color="#212121" x1="1" y1="height - 2" x2="width - 2" y2="height - 2"/>
+	<line color="#212121" x1="width - 2" y1="2" x2="width - 2" y2="height - 2"/>
+	<line color="#212121" x1="1" y1="1" x2="width - 2" y2="1"/>
+	<line color="#212121" x1="1" y1="2" x2="1" y2="height - 2"/>
+
+	<!-- ** fancy gradient ** -->
+	<gradient type="vertical" x="1" y="1" width="width" height="top_height">
+		<color value="#2c2c2c"/>
+		<color value="#212121"/>
+	</gradient>
+	<line color="#3d3d3d" x1="1" y1="1" x2="width - 2" y2="1"/>
+
+	<!-- ** border outline ** -->
+	<rectangle color="#212121" filled="false" x="0" y="0" width="width - 1" height="height - 1"/>
+</draw_ops>
+
+<draw_ops name="bevel_maximized">
+	<include name="window_bg"/>
+	<!-- ** fancy gradient ** -->
+	<gradient type="vertical" x="0" y="1" width="width" height="top_height">
+		<color value="#2c2c2c"/>
+		<color value="#212121"/>
+	</gradient>
+	<line color="#3d3d3d" x1="1" y1="1" x2="width" y2="1"/>
+</draw_ops>
+
+<draw_ops name="round_bevel">
+	<include name="bevel"/>
+	<include name="corners_outline_selected_top"/>
+	<!--<include name="corners_outline_bottom"/>-->
+	<include name="corners_highlight"/>
+</draw_ops>
+
+<draw_ops name="bevel_shaded">
+	<include name="bevel"/>
+	<line color="#212121" x1="0" y1="height-1" x2="width" y2="height-1"/>
+</draw_ops>
+
+<draw_ops name="round_bevel_shaded">
+	<include name="bevel"/>
+	<include name="corners_outline_selected_top"/>
+	<include name="corners_outline_selected_bottom"/>
+	<include name="corners_highlight_shaded"/>
+	<line color="#212121" x1="5" y1="height-1" x2="width-6" y2="height-1"/>
+</draw_ops>
+
+<!-- ::: BEVEL UNFOCUSED ::: -->
+<draw_ops name="bevel_unfocused">
+	<include name="window_bg"/>
+
+	<line color="#212121" x1="1" y1="height - 2" x2="width - 2" y2="height - 2"/>
+	<line color="#212121" x1="width - 2" y1="2" x2="width - 2" y2="height - 2"/>
+	<line color="#212121" x1="1" y1="1" x2="width - 2" y2="1"/>
+	<line color="#212121" x1="1" y1="2" x2="1" y2="height - 2"/>
+
+	<!-- ** fancy gradient ** -->
+	<gradient type="vertical" x="1" y="1" width="width" height="top_height">
+		<color value="#2c2c2c"/>
+		<color value="#212121"/>
+	</gradient>
+	<line color="#3d3d3d" x1="1" y1="1" x2="width" y2="1"/>
+
+	<!-- ** border outline ** -->
+	<rectangle color="#212121" filled="false" x="0" y="0" width="width - 1" height="height - 1"/>
+</draw_ops>
+
+<draw_ops name="bevel_maximized_unfocused">
+	<include name="window_bg"/>
+	<gradient type="vertical" x="0" y="1" width="width" height="top_height">
+		<color value="#2c2c2c"/>
+		<color value="#212121"/>
+	</gradient>
+	<line color="#3d3d3d" x1="1" y1="1" x2="width" y2="1"/>
+</draw_ops>
+
+<draw_ops name="round_bevel_unfocused">
+	<include name="bevel_unfocused"/>
+	<include name="corners_outline_top"/>
+	<!--<include name="corners_outline_bottom"/>-->
+	<include name="corners_highlight_unfocused"/>
+</draw_ops>
+
+<draw_ops name="round_bevel_unfocused_shaded">
+	<include name="bevel_unfocused"/>
+	<include name="corners_outline_top"/>
+	<include name="corners_outline_bottom"/>
+	<include name="corners_highlight_shaded_unfocused"/>
+</draw_ops>
+
+<!-- ::: LIGHT BAR AT THE BOTTOM ::: -->
+<draw_ops name="bottom_edge">
+    <gradient type="vertical" x="1" y="height-4" width="width-2" height="3">
+        <color value="shade/gtk:bg[NORMAL]/0.90"/>
+        <color value="shade/gtk:bg[NORMAL]/0.60"/>
+    </gradient>
+</draw_ops>
+
+<!-- ::: BORDER ::: -->
+<draw_ops name="border">
+	<line color="shade/gtk:bg[NORMAL]/0.88" x1="1" y1="height - 2" x2="width - 2" y2="height - 2"/>
+	<line color="shade/gtk:bg[NORMAL]/0.88" x1="width - 2" y1="1" x2="width - 2" y2="height - 2"/>
+	<line color="shade/gtk:bg[NORMAL]/1.2" x1="1" y1="1" x2="width - 2" y2="1"/>
+	<line color="shade/gtk:bg[NORMAL]/1.2" x1="1" y1="1" x2="1" y2="height - 2"/>
+
+	<rectangle color="shade/gtk:bg[NORMAL]/0.55" filled="false" x="0" y="0" width="width - 1" height="height - 1"/>
+</draw_ops>
+
+<!-- ::: TITLES ::: -->
+<draw_ops name="title_text">
+	<title color="#cacaca" x="(3 `max` (width-title_width)) / 2" y="(((height - title_height) / 2) `max` 0)"/>
+</draw_ops>
+
+<draw_ops name="title_text_unfocused">
+	<title color="#919191" x="(3 `max` (width-title_width)) / 2" y="0 `max` ((height-title_height)/2)"/>
+</draw_ops>
+
+<draw_ops name="title">
+	<include name="title_text"/>
+</draw_ops>
+
+<draw_ops name="title_unfocused">
+	<include name="title_text_unfocused"/>
+</draw_ops>
+
+<!-- ::: BUTTONS ::: -->
+<draw_ops name="button_bg_prelight">
+	<image filename="prelight.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
+</draw_ops>
+
+<draw_ops name="button_bg_pressed">
+	<image filename="pressed.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
+</draw_ops>
+
+<draw_ops name="button_bg_unfocused_prelight">
+	<image filename="prelight_unfocused.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
+</draw_ops>
+
+<draw_ops name="button_bg_unfocused_pressed">
+	<image filename="pressed.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
+</draw_ops>
+
+<!-- menu icon -->
+<draw_ops name="menu_button_icon"> 
+	<!--<icon  x="0" y="0" width="width" height="height"/>-->
+	<icon  x="(width-mini_icon_width)/2" y="(height-mini_icon_height)/2" width="mini_icon_width" height="mini_icon_height"/>
+</draw_ops>
+
+<draw_ops name="menu_button_icon_unfocused"> 
+	<!--<icon  x="0" y="0" width="width" height="height" alpha="0.5"/>-->
+	<icon  x="(width-mini_icon_width)/2" y="(height-mini_icon_height)/2" width="mini_icon_width" height="mini_icon_height"  alpha="0.75"/>
+</draw_ops>
+
+<draw_ops name="menu_button_normal">
+	<include name="menu_button_icon"/>
+</draw_ops>
+<draw_ops name="menu_button_prelight">
+	<include name="menu_button_icon"/>
+</draw_ops>
+<draw_ops name="menu_button_pressed">
+	<include name="menu_button_icon"/>
+</draw_ops>
+<draw_ops name="menu_button_unfocused">
+	<include name="menu_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="menu_button_unfocused_prelight">
+	<include name="menu_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="menu_button_unfocused_pressed">
+	<include name="menu_button_icon_unfocused"/>
+</draw_ops>
+
+<!-- close icon -->
+<draw_ops name="close_button_icon">
+	<image filename="close.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
+</draw_ops>
+
+<draw_ops name="close_button_icon_unfocused">
+	<image filename="close_unfocused.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
+</draw_ops>
+
+<draw_ops name="close_button_normal">
+	<include name="close_button_icon"/>
+</draw_ops>
+<draw_ops name="close_button_prelight">
+	<include name="button_bg_prelight"/>
+	<include name="close_button_icon"/>
+</draw_ops>
+<draw_ops name="close_button_pressed">
+	<include name="button_bg_pressed"/>
+	<include name="close_button_icon"/>
+</draw_ops>
+<draw_ops name="close_button_unfocused">
+	<include name="close_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="close_button_unfocused_prelight">
+	<include name="button_bg_unfocused_prelight"/>
+	<include name="close_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="close_button_unfocused_pressed">
+	<include name="button_bg_unfocused_pressed"/>
+	<include name="close_button_icon"/>
+</draw_ops>
+
+<!-- maximize icon -->
+<draw_ops name="maximize_button_icon">
+	<image filename="maximize.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
+</draw_ops>
+
+<draw_ops name="maximize_button_icon_unfocused">
+	<image filename="maximize_unfocused.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
+</draw_ops>
+
+<draw_ops name="maximize_button_normal">
+	<include name="maximize_button_icon"/>
+</draw_ops>
+<draw_ops name="maximize_button_prelight">
+	<include name="button_bg_prelight"/>
+	<include name="maximize_button_icon"/>
+</draw_ops>
+<draw_ops name="maximize_button_pressed">
+	<include name="button_bg_pressed"/>
+	<include name="maximize_button_icon"/>
+</draw_ops>
+<draw_ops name="maximize_button_unfocused">
+	<include name="maximize_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="maximize_button_unfocused_prelight">
+	<include name="button_bg_unfocused_prelight"/>
+	<include name="maximize_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="maximize_button_unfocused_pressed">
+	<include name="button_bg_unfocused_pressed"/>
+	<include name="maximize_button_icon"/>
+</draw_ops>
+
+<!-- restore icon -->
+<draw_ops name="restore_button_icon">
+	<image filename="maximize.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
+</draw_ops>
+
+<draw_ops name="restore_button_icon_unfocused">
+	<image filename="maximize_unfocused.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
+</draw_ops>
+
+<draw_ops name="restore_button_normal">
+	<include name="restore_button_icon"/>
+</draw_ops>
+<draw_ops name="restore_button_prelight">
+	<include name="button_bg_prelight"/>
+	<include name="restore_button_icon"/>
+</draw_ops>
+<draw_ops name="restore_button_pressed">
+	<include name="button_bg_pressed"/>
+	<include name="restore_button_icon"/>
+</draw_ops>
+<draw_ops name="restore_button_unfocused">
+	<include name="restore_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="restore_button_unfocused_prelight">
+	<include name="button_bg_unfocused_prelight"/>
+	<include name="restore_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="restore_button_unfocused_pressed">
+	<include name="button_bg_unfocused_pressed"/>
+	<include name="restore_button_icon"/>
+</draw_ops>
+
+<!-- minimize icon -->
+<draw_ops name="minimize_button_icon">
+	<image filename="minimize.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
+</draw_ops>
+
+<draw_ops name="minimize_button_icon_unfocused">
+	<image filename="minimize_unfocused.png"
+		x="(width - object_width) / 2"
+		y="(height - object_height) / 2"
+		width="object_width"
+		height="object_height"/>
+</draw_ops>
+
+<draw_ops name="minimize_button_normal">
+	<include name="minimize_button_icon"/>
+</draw_ops>
+<draw_ops name="minimize_button_prelight">
+	<include name="button_bg_prelight"/>
+	<include name="minimize_button_icon"/>
+</draw_ops>
+<draw_ops name="minimize_button_pressed">
+	<include name="button_bg_pressed"/>
+	<include name="minimize_button_icon"/>
+</draw_ops>
+<draw_ops name="minimize_button_unfocused">
+	<include name="minimize_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="minimize_button_unfocused_prelight">
+	<include name="button_bg_unfocused_prelight"/>
+	<include name="minimize_button_icon_unfocused"/>
+</draw_ops>
+<draw_ops name="minimize_button_unfocused_pressed">
+	<include name="button_bg_unfocused_pressed"/>
+	<include name="minimize_button_icon"/>
+</draw_ops>
+
+<draw_ops name="blank">
+<!-- nothing -->
+</draw_ops>
+
+<!-- ::: FRAME STYLES ::: -->
+<frame_style name="normal" geometry="normal">
+	<piece position="entire_background" draw_ops="round_bevel_unfocused"/>
+	<piece position="title" draw_ops="title_unfocused"/>
+	<piece position="bottom_edge" draw_ops="bottom_edge"/>
+	<button function="close" state="normal" draw_ops="close_button_unfocused"/>
+	<button function="close" state="pressed" draw_ops="close_button_unfocused_pressed"/>
+	<button function="close" state="prelight" draw_ops="close_button_unfocused_prelight"/>
+	<button function="maximize" state="normal" draw_ops="maximize_button_unfocused"/>
+	<button function="maximize" state="pressed" draw_ops="maximize_button_unfocused_pressed"/>
+	<button function="maximize" state="prelight" draw_ops="maximize_button_unfocused_prelight"/>
+	<button function="minimize" state="normal" draw_ops="minimize_button_unfocused"/>
+	<button function="minimize" state="pressed" draw_ops="minimize_button_unfocused_pressed"/>
+	<button function="minimize" state="prelight" draw_ops="minimize_button_unfocused_prelight"/>
+	<button function="menu" state="normal" draw_ops="menu_button_unfocused"/>
+	<button function="menu" state="pressed" draw_ops="menu_button_unfocused_pressed"/>
+	<button function="menu" state="prelight" draw_ops="menu_button_unfocused_prelight"/>
+</frame_style>
+
+<frame_style name="normal_shaded" geometry="shaded" parent="normal">
+	<piece position="entire_background" draw_ops="round_bevel_unfocused_shaded"/>
+</frame_style>
+
+<frame_style name="focused" geometry="normal" parent="normal">
+	<piece position="entire_background" draw_ops="round_bevel"/>
+	<piece position="title" draw_ops="title"/>
+	<piece position="bottom_edge" draw_ops="bottom_edge"/>
+	<button function="close" state="normal" draw_ops="close_button_normal"/>
+	<button function="close" state="pressed" draw_ops="close_button_pressed"/>
+	<button function="close" state="prelight" draw_ops="close_button_prelight"/>
+	<button function="maximize" state="normal" draw_ops="maximize_button_normal"/>
+	<button function="maximize" state="pressed" draw_ops="maximize_button_pressed"/>
+	<button function="maximize" state="prelight" draw_ops="maximize_button_prelight"/>
+	<button function="minimize" state="normal" draw_ops="minimize_button_normal"/>
+	<button function="minimize" state="pressed" draw_ops="minimize_button_pressed"/>
+	<button function="minimize" state="prelight" draw_ops="minimize_button_prelight"/>
+	<button function="menu" state="normal" draw_ops="menu_button_normal"/>
+	<button function="menu" state="pressed" draw_ops="menu_button_pressed"/>
+	<button function="menu" state="prelight" draw_ops="menu_button_prelight"/>
+</frame_style>
+
+<frame_style name="focused_shaded" geometry="shaded" parent="focused">
+	<piece position="entire_background" draw_ops="round_bevel_shaded"/>
+</frame_style>
+
+<frame_style name="normal_maximized" geometry="normal_maximized" parent="normal">
+	<piece position="entire_background" draw_ops="bevel_maximized_unfocused"/>
+	<piece position="bottom_edge" draw_ops="bottom_edge"/>
+	<button function="maximize" state="normal" draw_ops="restore_button_unfocused"/>
+	<button function="maximize" state="pressed" draw_ops="restore_button_unfocused_pressed"/>
+	<button function="maximize" state="prelight" draw_ops="restore_button_unfocused_prelight"/>
+</frame_style>
+
+<frame_style name="focused_maximized" geometry="normal_maximized" parent="focused">
+	<piece position="entire_background" draw_ops="bevel_maximized"/>
+	<piece position="bottom_edge" draw_ops="bottom_edge"/>
+	<button function="maximize" state="normal" draw_ops="restore_button_normal"/>
+	<button function="maximize" state="pressed" draw_ops="restore_button_pressed"/>
+	<button function="maximize" state="prelight" draw_ops="restore_button_prelight"/>
+</frame_style>
+
+<frame_style name="border" geometry="border" parent="normal">
+	<piece position="entire_background" draw_ops="border"/>
+	<piece position="title" draw_ops="blank"/>
+</frame_style>
+
+<frame_style name="utility_normal" geometry="utility" parent="normal">
+	<piece position="entire_background" draw_ops="bevel_unfocused"/>
+</frame_style>
+<frame_style name="utility_focused" geometry="utility" parent="focused">
+	<piece position="entire_background" draw_ops="bevel"/>
+</frame_style>
+<frame_style name="utility_focused_shaded" geometry="utility" parent="focused_shaded">
+	<piece position="entire_background" draw_ops="bevel_shaded"/>
+</frame_style>
+
+<frame_style_set name="normal">
+	<frame focus="yes" state="normal" resize="both" style="focused"/>
+	<frame focus="no" state="normal" resize="both" style="normal"/>
+	<frame focus="yes" state="maximized" style="focused_maximized"/>
+	<frame focus="no" state="maximized" style="normal_maximized"/>
+	<frame focus="yes" state="shaded" style="focused_shaded"/>
+	<frame focus="no" state="shaded" style="normal_shaded"/>
+	<frame focus="yes" state="maximized_and_shaded" style="focused_maximized"/>
+	<frame focus="no" state="maximized_and_shaded" style="normal_maximized"/>
+</frame_style_set>
+
+<frame_style_set name="utility" parent="normal">
+	<frame focus="yes" state="normal" resize="both" style="utility_focused"/>
+	<frame focus="no" state="normal" resize="both" style="utility_normal"/>
+	<!-- this is a bunch of crack since utility windows shouldn't be maximized -->
+	<frame focus="yes" state="maximized" style="focused"/>
+	<frame focus="no" state="maximized" style="normal"/>
+	<frame focus="yes" state="shaded" style="utility_focused_shaded"/>
+	<frame focus="no" state="shaded" style="utility_normal"/>
+	<frame focus="yes" state="maximized_and_shaded" style="focused_shaded"/>
+	<frame focus="no" state="maximized_and_shaded" style="normal"/>
+</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_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="utility"/>
+<window type="border" style_set="border"/>
+
+<menu_icon function="close" state="normal" draw_ops="close_button_icon_unfocused"/>
+<menu_icon function="maximize" state="normal" draw_ops="maximize_button_icon_unfocused"/>
+<menu_icon function="unmaximize" state="normal" draw_ops="restore_button_icon_unfocused"/>
+<menu_icon function="minimize" state="normal" draw_ops="minimize_button_icon_unfocused"/>
+
+</metacity_theme>
+
+
+
diff --git a/Shiki-Colors-Revival/metacity-1/minimize.png b/Shiki-Colors-Revival/metacity-1/minimize.png
new file mode 100644
index 0000000..5594d21
--- /dev/null
+++ b/Shiki-Colors-Revival/metacity-1/minimize.png
diff --git a/Shiki-Colors-Revival/metacity-1/minimize_unfocused.png b/Shiki-Colors-Revival/metacity-1/minimize_unfocused.png
new file mode 100644
index 0000000..570d179
--- /dev/null
+++ b/Shiki-Colors-Revival/metacity-1/minimize_unfocused.png
diff --git a/Shiki-Colors-Revival/metacity-1/prelight.png b/Shiki-Colors-Revival/metacity-1/prelight.png
new file mode 100644
index 0000000..f5209c0
--- /dev/null
+++ b/Shiki-Colors-Revival/metacity-1/prelight.png
diff --git a/Shiki-Colors-Revival/metacity-1/prelight_unfocused.png b/Shiki-Colors-Revival/metacity-1/prelight_unfocused.png
new file mode 100644
index 0000000..9f4f6bb
--- /dev/null
+++ b/Shiki-Colors-Revival/metacity-1/prelight_unfocused.png
diff --git a/Shiki-Colors-Revival/metacity-1/pressed.png b/Shiki-Colors-Revival/metacity-1/pressed.png
new file mode 100644
index 0000000..fcb0665
--- /dev/null
+++ b/Shiki-Colors-Revival/metacity-1/pressed.png
diff --git a/Shiki-Colors-Revival/xfwm4/close-prelight.xpm b/Shiki-Colors-Revival/xfwm4/close-prelight.xpm
index 4d4ea86..e121304 100755
--- a/Shiki-Colors-Revival/xfwm4/close-prelight.xpm
+++ b/Shiki-Colors-Revival/xfwm4/close-prelight.xpm
@@ -1,53 +1,103 @@
 /* XPM */
 static char * close_prelight_xpm[] = {
-"20 25 25 1",
+"20 25 75 1",
 " 	c None",
 ".	c #212121",
 "+	c #3D3D3D",
 "@	c #2C2C2C",
 "#	c #2B2B2B",
-"$	c #2A2A2A",
-"%	c #E7E7E7",
-"&	c #E6E6E6",
-"*	c #292929",
-"=	c #363636",
-"-	c #383838",
-";	c #3A3A3A",
-">	c #282828",
-",	c #B8B8B8",
-"'	c #C2C2C2",
-")	c #303030",
-"!	c #2F2F2F",
-"~	c #CBCBCB",
-"{	c #CDCDCD",
-"]	c #272727",
-"^	c #262626",
-"/	c #252525",
-"(	c #242424",
-"_	c #232323",
-":	c #222222",
+"$	c #787878",
+"%	c #AFAFAF",
+"&	c #C7C7C7",
+"*	c #3C3C3C",
+"=	c #2A2A2A",
+"-	c #2E2E2E",
+";	c #8F8F8F",
+">	c #E1E1E1",
+",	c #E6E6E6",
+"'	c #D9D9D9",
+")	c #313131",
+"!	c #B8B8B8",
+"~	c #DCDCDC",
+"{	c #838383",
+"]	c #363636",
+"^	c #373737",
+"/	c #848484",
+"(	c #DDDDDD",
+"_	c #303030",
+":	c #292929",
+"<	c #9B9B9B",
+"[	c #D2D2D2",
+"}	c #575757",
+"|	c #585858",
+"1	c #D3D3D3",
+"2	c #989898",
+"3	c #282828",
+"4	c #4A4A4A",
+"5	c #E4E4E4",
+"6	c #E0E0E0",
+"7	c #5B5B5B",
+"8	c #C2C2C2",
+"9	c #2F2F2F",
+"0	c #494949",
+"a	c #A1A1A1",
+"b	c #9D9D9D",
+"c	c #CBCBCB",
+"d	c #9E9E9E",
+"e	c #A0A0A0",
+"f	c #DADADA",
+"g	c #616161",
+"h	c #CDCDCD",
+"i	c #636363",
+"j	c #272727",
+"k	c #484848",
+"l	c #262626",
+"m	c #606060",
+"n	c #626262",
+"o	c #D8D8D8",
+"p	c #9F9F9F",
+"q	c #252525",
+"r	c #474747",
+"s	c #5E5E5E",
+"t	c #E3E3E3",
+"u	c #464646",
+"v	c #595959",
+"w	c #979797",
+"x	c #B6B6B6",
+"y	c #828282",
+"z	c #333333",
+"A	c #DEDEDE",
+"B	c #242424",
+"C	c #8C8C8C",
+"D	c #DFDFDF",
+"E	c #232323",
+"F	c #343434",
+"G	c #717171",
+"H	c #ABABAB",
+"I	c #C5C5C5",
+"J	c #222222",
 "....................",
 "++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@",
 "####################",
-"####################",
-"$$$%%%%%%%%%%%%%%$$$",
-"$$$&$$$$$$$$$$$$&$$$",
-"***&*=-=****=;=*&***",
-">>>&>;,')>>!',->&>>>",
-">>>&>='&~)!~&'=>&>>>",
-">>>&>>!~&{{&~)>>&>>>",
-"]]]&]]]!{&&{)]]]&]]]",
-"]]]&]]]){&&{!]]]&]]]",
-"^^^&^^)~&{{&~!^^&^^^",
-"^^^&^='&~!)~&'=^&^^^",
-"///&/-,'!//)',;/&///",
-"///&/=;=////=-=/&///",
-"///&////////////&///",
-"(((%%%%%%%%%%%%%%(((",
-"____________________",
-"____________________",
-"::::::::::::::::::::",
-"::::::::::::::::::::",
+"######+$%&&%$*######",
+"====-;>,,'',,>;-====",
+"===)!,~{]==^/(,!_===",
+":::<,[}]::::]|1,2:::",
+"334567!8_3398!7>5033",
+"33a,b]8,c_9c,8]d,e33",
+"33f,g39c,hh,c_3i,'33",
+"jj,,0jj9h,,h_jj0,,jj",
+"jj,,0jj_h,,h9jjk,,jj",
+"ll',ml_c,hh,c9ln,oll",
+"llp,b]8,c9_c,8]b,pll",
+"qqr567!89qq_8!s>tuqq",
+"qqq2,1v]qqqq]|1,wqqq",
+"qqq=x,(yzqqz/A,x:qqq",
+"BBBB3C6,,'',,DC3BBBB",
+"EEEEEEFGHIIHGFEEEEEE",
+"EEEEEEEEEEEEEEEEEEEE",
+"JJJJJJJJJJJJJJJJJJJJ",
+"JJJJJJJJJJJJJJJJJJJJ",
 "...................."};
diff --git a/Shiki-Colors-Revival/xfwm4/close-pressed.xpm b/Shiki-Colors-Revival/xfwm4/close-pressed.xpm
index 6d0085c..40db500 100755
--- a/Shiki-Colors-Revival/xfwm4/close-pressed.xpm
+++ b/Shiki-Colors-Revival/xfwm4/close-pressed.xpm
@@ -1,81 +1,122 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"20 25 53 1",
-" 	c None",
-".	c #212121",
-"+	c #3D3D3D",
-"@	c #2C2C2C",
-"#	c #2B2B2B",
-"$	c #2A2A2A",
-"%	c #E7E7E7",
-"&	c #E6E6E6",
-"*	c #A5A5A5",
-"=	c #292929",
-"-	c #A3A3A3",
-";	c #5E5E5E",
-">	c #A3A3A4",
-",	c #282828",
-"'	c #A1A1A2",
-")	c #B8B8B8",
-"!	c #C2C2C2",
-"~	c #A1A1A1",
-"{	c #A0A0A0",
-"]	c #CBCBCB",
-"^	c #9E9F9E",
-"/	c #9E9E9E",
-"(	c #CDCDCD",
-"_	c #9E9E9F",
-":	c #272727",
-"<	c #9C9C9D",
-"[	c #9D9D9C",
-"}	c #9C9D9C",
-"|	c #9C9D9D",
-"1	c #9C9B9C",
-"2	c #9C9C9B",
-"3	c #9B9C9B",
-"4	c #9C9C9C",
-"5	c #9B9B9C",
-"6	c #262626",
-"7	c #9A999A",
-"8	c #999A99",
-"9	c #9A9999",
-"0	c #989898",
-"a	c #252525",
-"b	c #969796",
-"c	c #979797",
-"d	c #969696",
-"e	c #959595",
-"f	c #959495",
-"g	c #949494",
-"h	c #939493",
-"i	c #949493",
-"j	c #939494",
-"k	c #939394",
-"l	c #242424",
-"m	c #232323",
-"n	c #222222",
-"....................",
-"++++++++++++++++++++",
-"@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@",
-"####################",
-"####################",
-"$$$%%%%%%%%%%%%%%$$$",
-"$$$&************&$$$",
-"===&-;;;-->-;;;-&===",
-",,,&';)!;~';!);~&,,,",
-",,,&{;!&];;]&!;{&,,,",
-",,,&^/;]&((&];/_&,,,",
-":::&<[};(&&(;|[<&:::",
-":::&123;(&&(;345&:::",
-"666&78;]&((&];79&666",
-"666&0;!&];;]&!;0&666",
-"aaa&b;)!;bc;!);d&aaa",
-"aaa&e;;;feee;;;e&aaa",
-"aaa&ghgigggjgghk&aaa",
-"lll%%%%%%%%%%%%%%lll",
-"mmmmmmmmmmmmmmmmmmmm",
-"mmmmmmmmmmmmmmmmmmmm",
-"nnnnnnnnnnnnnnnnnnnn",
-"nnnnnnnnnnnnnnnnnnnn",
-"...................."};
+"20 25 94 2",
+"  	c None",
+". 	c #212121",
+"+ 	c #3D3D3D",
+"@ 	c #2C2C2C",
+"# 	c #2B2B2B",
+"$ 	c #787878",
+"% 	c #AFAFAF",
+"& 	c #C7C7C7",
+"* 	c #3C3C3C",
+"= 	c #2A2A2A",
+"- 	c #2E2E2E",
+"; 	c #8F8F8F",
+"> 	c #E1E1E1",
+", 	c #E6E6E6",
+"' 	c #DFDFDF",
+") 	c #313131",
+"! 	c #B8B8B8",
+"~ 	c #B3B3B3",
+"{ 	c #8C8C8C",
+"] 	c #858585",
+"^ 	c #303030",
+"/ 	c #292929",
+"( 	c #9B9B9B",
+"_ 	c #DEDEDE",
+": 	c #ABABAA",
+"< 	c #9D9D9D",
+"[ 	c #818180",
+"} 	c #AAAAA9",
+"| 	c #989898",
+"1 	c #282828",
+"2 	c #4A4A4A",
+"3 	c #E4E4E4",
+"4 	c #A9A9A9",
+"5 	c #CCCCCC",
+"6 	c #D1D1D1",
+"7 	c #9A9A9A",
+"8 	c #7C7C7C",
+"9 	c #E3E3E3",
+"0 	c #494949",
+"a 	c #A1A1A1",
+"b 	c #BDBDBD",
+"c 	c #D6D6D6",
+"d 	c #A0A0A0",
+"e 	c #DADADA",
+"f 	c #979797",
+"g 	c #757575",
+"h 	c #969696",
+"i 	c #D7D7D7",
+"j 	c #E7E7E7",
+"k 	c #D8D8D8",
+"l 	c #999999",
+"m 	c #D9D9D9",
+"n 	c #272727",
+"o 	c #868685",
+"p 	c #717170",
+"q 	c #939392",
+"r 	c #D8D8D6",
+"s 	c #E7E7E6",
+"t 	c #828282",
+"u 	c #6C6C6C",
+"v 	c #909090",
+"w 	c #262626",
+"x 	c #8F8F8E",
+"y 	c #686868",
+"z 	c #8D8D8D",
+"A 	c #D5D5D4",
+"B 	c #91918F",
+"C 	c #9F9F9F",
+"D 	c #B5B5B5",
+"E 	c #8B8B8A",
+"F 	c #CFCFCE",
+"G 	c #252525",
+"H 	c #474747",
+"I 	c #CECECE",
+"J 	c #888888",
+"K 	c #606060",
+"L 	c #9C9C9C",
+"M 	c #464646",
+"N 	c #DBDBDB",
+"O 	c #979796",
+"P 	c #858584",
+"Q 	c #5C5C5B",
+"R 	c #B6B6B6",
+"S 	c #626262",
+"T 	c #575757",
+"U 	c #242424",
+"V 	c #E0E0E0",
+"W 	c #DDDDDD",
+"X 	c #232323",
+"Y 	c #343434",
+"Z 	c #717171",
+"` 	c #ABABAB",
+" .	c #C5C5C5",
+"..	c #222222",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# # # # # # # # # # # # # # # # # # # # ",
+"# # # # # # + $ % & & % $ * # # # # # # ",
+"= = = = - ; > , , ' ' , , > ; - = = = = ",
+"= = = ) ! , ' ~ { ] ] { ~ > , ! ^ = = = ",
+"/ / / ( , _ : < [ [ [ [ < } _ , | / / / ",
+"1 1 2 3 3 4 5 6 7 8 8 7 6 5 4 9 3 0 1 1 ",
+"1 1 a , b | 6 , c | | c , 6 | b , d 1 1 ",
+"1 1 e , f g h i j k k j i h g l , m 1 1 ",
+"n n , , o p p q r s s r q p p o , , n n ",
+"n n , , t u u v i j j i v u u t , , n n ",
+"w w m , x y z A s c c s A z y B , k w w ",
+"w w C , D E F s A E E A s F E D , C w w ",
+"G G H 3 9 ( & I J K K J I & L 9 9 M G G ",
+"G G G | , N O P Q Q Q Q P O N , f G G G ",
+"G G G = R , _ L S T T S < ' , R / G G G ",
+"U U U U 1 { V , , W W , , ' { 1 U U U U ",
+"X X X X X X Y Z `  . .` Z Y X X X X X X ",
+"X X X X X X X X X X X X X X X X X X X X ",
+"........................................",
+"........................................",
+". . . . . . . . . . . . . . . . . . . . "};
diff --git a/Shiki-Colors-Revival/xfwm4/hide-prelight.xpm b/Shiki-Colors-Revival/xfwm4/hide-prelight.xpm
index d056848..9a60662 100755
--- a/Shiki-Colors-Revival/xfwm4/hide-prelight.xpm
+++ b/Shiki-Colors-Revival/xfwm4/hide-prelight.xpm
@@ -1,49 +1,100 @@
 /* XPM */
 static char * hide_prelight_xpm[] = {
-"20 25 21 1",
+"20 25 72 1",
 " 	c None",
 ".	c #212121",
 "+	c #3D3D3D",
 "@	c #2C2C2C",
 "#	c #2B2B2B",
-"$	c #2A2A2A",
-"%	c #E7E7E7",
-"&	c #E6E6E6",
-"*	c #292929",
-"=	c #282828",
-"-	c #272727",
-";	c #303030",
-">	c #262626",
-",	c #B7B7B7",
-"'	c #BCBCBC",
-")	c #B6B6B6",
-"!	c #B2B2B2",
-"~	c #252525",
-"{	c #242424",
-"]	c #232323",
-"^	c #222222",
+"$	c #787878",
+"%	c #AFAFAF",
+"&	c #C7C7C7",
+"*	c #3C3C3C",
+"=	c #2A2A2A",
+"-	c #2E2E2E",
+";	c #8F8F8F",
+">	c #E1E1E1",
+",	c #E6E6E6",
+"'	c #D9D9D9",
+")	c #313131",
+"!	c #B8B8B8",
+"~	c #DCDCDC",
+"{	c #838383",
+"]	c #363636",
+"^	c #373737",
+"/	c #848484",
+"(	c #DDDDDD",
+"_	c #303030",
+":	c #292929",
+"<	c #9B9B9B",
+"[	c #D1D1D1",
+"}	c #4A4A4A",
+"|	c #989898",
+"1	c #282828",
+"2	c #E4E4E4",
+"3	c #E0E0E0",
+"4	c #4D4D4D",
+"5	c #4E4E4E",
+"6	c #494949",
+"7	c #A1A1A1",
+"8	c #9D9D9D",
+"9	c #9E9E9E",
+"0	c #A0A0A0",
+"a	c #DADADA",
+"b	c #616161",
+"c	c #636363",
+"d	c #272727",
+"e	c #484848",
+"f	c #262626",
+"g	c #606060",
+"h	c #B7B7B7",
+"i	c #BCBCBC",
+"j	c #626262",
+"k	c #D8D8D8",
+"l	c #9F9F9F",
+"m	c #B6B6B6",
+"n	c #B2B2B2",
+"o	c #252525",
+"p	c #474747",
+"q	c #555555",
+"r	c #565656",
+"s	c #E3E3E3",
+"t	c #464646",
+"u	c #979797",
+"v	c #828282",
+"w	c #333333",
+"x	c #DEDEDE",
+"y	c #242424",
+"z	c #8C8C8C",
+"A	c #DFDFDF",
+"B	c #232323",
+"C	c #343434",
+"D	c #717171",
+"E	c #ABABAB",
+"F	c #C5C5C5",
+"G	c #222222",
 "....................",
 "++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@",
 "####################",
-"####################",
-"$$$%%%%%%%%%%%%%%$$$",
-"$$$&$$$$$$$$$$$$&$$$",
-"***&************&***",
-"===&============&===",
-"===&============&===",
-"===&============&===",
-"---&------------&---",
-"---&-;;;;;;;;;;-&---",
-">>>&>;,&&&&&&';>&>>>",
-">>>&>;)&&&&&&!;>&>>>",
-"~~~&~;;;;;;;;;;~&~~~",
-"~~~&~~~~~~~~~~~~&~~~",
-"~~~&~~~~~~~~~~~~&~~~",
-"{{{%%%%%%%%%%%%%%{{{",
-"]]]]]]]]]]]]]]]]]]]]",
-"]]]]]]]]]]]]]]]]]]]]",
-"^^^^^^^^^^^^^^^^^^^^",
-"^^^^^^^^^^^^^^^^^^^^",
+"######+$%&&%$*######",
+"====-;>,,'',,>;-====",
+"===)!,~{]==^/(,!_===",
+":::<,[}::::::}[,|:::",
+"11}234111111115>2611",
+"117,811111111119,011",
+"11a,b1111111111c,'11",
+"dd,,6dddddddddd6,,dd",
+"dd,,6__________e,,dd",
+"ff',g_h,,,,,,i_j,kff",
+"ffl,8_m,,,,,,n_8,lff",
+"oop23q________r>stoo",
+"ooo|,[eooooooe[,uooo",
+"ooo=m,(vwoow/x,m:ooo",
+"yyyy1z3,,'',,Az1yyyy",
+"BBBBBBCDEFFEDCBBBBBB",
+"BBBBBBBBBBBBBBBBBBBB",
+"GGGGGGGGGGGGGGGGGGGG",
+"GGGGGGGGGGGGGGGGGGGG",
 "...................."};
diff --git a/Shiki-Colors-Revival/xfwm4/hide-pressed.xpm b/Shiki-Colors-Revival/xfwm4/hide-pressed.xpm
index f6c95bb..ba2c65d 100755
--- a/Shiki-Colors-Revival/xfwm4/hide-pressed.xpm
+++ b/Shiki-Colors-Revival/xfwm4/hide-pressed.xpm
@@ -1,85 +1,112 @@
 /* XPM */
 static char * hide_pressed_xpm[] = {
-"20 25 57 1",
+"20 25 84 1",
 " 	c None",
 ".	c #212121",
 "+	c #3D3D3D",
 "@	c #2C2C2C",
 "#	c #2B2B2B",
-"$	c #2A2A2A",
-"%	c #E7E7E7",
-"&	c #E6E6E6",
-"*	c #A5A5A5",
-"=	c #292929",
-"-	c #A3A3A3",
-";	c #A3A4A3",
-">	c #A3A3A4",
-",	c #282828",
-"'	c #A1A1A2",
-")	c #A1A1A1",
-"!	c #A1A2A1",
-"~	c #A0A0A0",
-"{	c #9E9F9E",
-"]	c #9E9E9E",
-"^	c #9F9F9F",
-"/	c #9F9E9E",
-"(	c #9E9E9F",
-"_	c #272727",
-":	c #9C9C9D",
-"<	c #9D9D9C",
-"[	c #9C9D9C",
-"}	c #9C9C9C",
-"|	c #9C9D9D",
-"1	c #9D9C9C",
-"2	c #9C9B9C",
-"3	c #5E5E5E",
-"4	c #9B9B9C",
-"5	c #262626",
-"6	c #9A999A",
-"7	c #B7B7B7",
-"8	c #BCBCBC",
-"9	c #9A9999",
-"0	c #989898",
-"a	c #B6B6B6",
-"b	c #B2B2B2",
-"c	c #252525",
-"d	c #969796",
-"e	c #969696",
-"f	c #959595",
-"g	c #959594",
-"h	c #949595",
-"i	c #959495",
-"j	c #949594",
-"k	c #949494",
-"l	c #939493",
-"m	c #949493",
-"n	c #939494",
-"o	c #939394",
-"p	c #242424",
-"q	c #232323",
-"r	c #222222",
+"$	c #787878",
+"%	c #AFAFAF",
+"&	c #C7C7C7",
+"*	c #3C3C3C",
+"=	c #2A2A2A",
+"-	c #2E2E2E",
+";	c #8F8F8F",
+">	c #E1E1E1",
+",	c #E6E6E6",
+"'	c #DFDFDF",
+")	c #313131",
+"!	c #B8B8B8",
+"~	c #B3B3B3",
+"{	c #8C8C8C",
+"]	c #858585",
+"^	c #303030",
+"/	c #292929",
+"(	c #9B9B9B",
+"_	c #DBDBDB",
+":	c #949492",
+"<	c #818180",
+"[	c #939392",
+"}	c #989898",
+"|	c #282828",
+"1	c #4A4A4A",
+"2	c #E4E4E4",
+"3	c #919191",
+"4	c #7C7C7C",
+"5	c #E3E3E3",
+"6	c #494949",
+"7	c #A1A1A1",
+"8	c #BDBDBD",
+"9	c #A0A0A0",
+"0	c #DADADA",
+"a	c #979797",
+"b	c #757575",
+"c	c #999999",
+"d	c #D9D9D9",
+"e	c #272727",
+"f	c #868685",
+"g	c #717170",
+"h	c #828282",
+"i	c #909090",
+"j	c #262626",
+"k	c #8F8F8E",
+"l	c #8D8D8D",
+"m	c #C8C8C7",
+"n	c #E7E7E6",
+"o	c #CBCBCB",
+"p	c #91918F",
+"q	c #D8D8D8",
+"r	c #9F9F9F",
+"s	c #B5B5B5",
+"t	c #8B8B8A",
+"u	c #C7C7C6",
+"v	c #C4C4C3",
+"w	c #252525",
+"x	c #474747",
+"y	c #888888",
+"z	c #9C9C9C",
+"A	c #464646",
+"B	c #D7D7D7",
+"C	c #757574",
+"D	c #5C5C5B",
+"E	c #767675",
+"F	c #B6B6B6",
+"G	c #DEDEDE",
+"H	c #626262",
+"I	c #575757",
+"J	c #9D9D9D",
+"K	c #242424",
+"L	c #E0E0E0",
+"M	c #DDDDDD",
+"N	c #232323",
+"O	c #343434",
+"P	c #717171",
+"Q	c #ABABAB",
+"R	c #C5C5C5",
+"S	c #222222",
 "....................",
 "++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@",
 "####################",
-"####################",
-"$$$%%%%%%%%%%%%%%$$$",
-"$$$&************&$$$",
-"===&-;---->-----&===",
-",,,&''))')'')!))&,,,",
-",,,&~~~~~~~~~~~~&,,,",
-",,,&{]{^/]{](]](&,,,",
-"___&:<[}}[|1}|<:&___",
-"___&233333333334&___",
-"555&637&&&&&&839&555",
-"555&03a&&&&&&b30&555",
-"ccc&d3333333333e&ccc",
-"ccc&fghfifffifjf&ccc",
-"ccc&klkmkkknkklo&ccc",
-"ppp%%%%%%%%%%%%%%ppp",
-"qqqqqqqqqqqqqqqqqqqq",
-"qqqqqqqqqqqqqqqqqqqq",
-"rrrrrrrrrrrrrrrrrrrr",
-"rrrrrrrrrrrrrrrrrrrr",
+"######+$%&&%$*######",
+"====-;>,,'',,>;-====",
+"===)!,'~{]]{~>,!^===",
+"///(,_:<<<<<<[_,}///",
+"||1223444444443526||",
+"||7,8$$$$$$$$$$8,9||",
+"||0,abbbbbbbbbbc,d||",
+"ee,,fggggggggggf,,ee",
+"ee,,hiiiiiiiiiih,,ee",
+"jjd,klmnnnnnnolp,qjj",
+"jjr,stunnnnnnvts,rjj",
+"wwx25(yyyyyyyyz55Aww",
+"www},BCDDDDDDEB,awww",
+"www=F,GzHIIHJ',F/www",
+"KKKK|{L,,MM,,'{|KKKK",
+"NNNNNNOPQRRQPONNNNNN",
+"NNNNNNNNNNNNNNNNNNNN",
+"SSSSSSSSSSSSSSSSSSSS",
+"SSSSSSSSSSSSSSSSSSSS",
 "...................."};
diff --git a/Shiki-Colors-Revival/xfwm4/maximize-prelight.xpm b/Shiki-Colors-Revival/xfwm4/maximize-prelight.xpm
index bdb050b..1382f0f 100755
--- a/Shiki-Colors-Revival/xfwm4/maximize-prelight.xpm
+++ b/Shiki-Colors-Revival/xfwm4/maximize-prelight.xpm
@@ -1,49 +1,99 @@
 /* XPM */
 static char * maximize_prelight_xpm[] = {
-"20 25 21 1",
+"20 25 71 1",
 " 	c None",
 ".	c #212121",
 "+	c #3D3D3D",
 "@	c #2C2C2C",
 "#	c #2B2B2B",
-"$	c #2A2A2A",
-"%	c #E7E7E7",
-"&	c #E6E6E6",
-"*	c #292929",
-"=	c #303030",
-"-	c #282828",
-";	c #CDCDCD",
-">	c #272727",
-",	c #C2C2C2",
-"'	c #B8B8B8",
-")	c #262626",
-"!	c #E2E2E2",
-"~	c #252525",
-"{	c #242424",
-"]	c #232323",
-"^	c #222222",
+"$	c #787878",
+"%	c #AFAFAF",
+"&	c #C7C7C7",
+"*	c #3C3C3C",
+"=	c #2A2A2A",
+"-	c #2E2E2E",
+";	c #8F8F8F",
+">	c #E1E1E1",
+",	c #E6E6E6",
+"'	c #D9D9D9",
+")	c #313131",
+"!	c #B8B8B8",
+"~	c #DCDCDC",
+"{	c #838383",
+"]	c #363636",
+"^	c #373737",
+"/	c #848484",
+"(	c #DDDDDD",
+"_	c #303030",
+":	c #292929",
+"<	c #9B9B9B",
+"[	c #D1D1D1",
+"}	c #4A4A4A",
+"|	c #989898",
+"1	c #282828",
+"2	c #E4E4E4",
+"3	c #E0E0E0",
+"4	c #4D4D4D",
+"5	c #CDCDCD",
+"6	c #4E4E4E",
+"7	c #494949",
+"8	c #A1A1A1",
+"9	c #9D9D9D",
+"0	c #9E9E9E",
+"a	c #A0A0A0",
+"b	c #DADADA",
+"c	c #616161",
+"d	c #636363",
+"e	c #272727",
+"f	c #C2C2C2",
+"g	c #484848",
+"h	c #262626",
+"i	c #606060",
+"j	c #626262",
+"k	c #D8D8D8",
+"l	c #9F9F9F",
+"m	c #E2E2E2",
+"n	c #252525",
+"o	c #474747",
+"p	c #4C4C4C",
+"q	c #E3E3E3",
+"r	c #464646",
+"s	c #979797",
+"t	c #B6B6B6",
+"u	c #828282",
+"v	c #333333",
+"w	c #DEDEDE",
+"x	c #242424",
+"y	c #8C8C8C",
+"z	c #DFDFDF",
+"A	c #232323",
+"B	c #343434",
+"C	c #717171",
+"D	c #ABABAB",
+"E	c #C5C5C5",
+"F	c #222222",
 "....................",
 "++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@",
 "####################",
-"####################",
-"$$$%%%%%%%%%%%%%%$$$",
-"$$$&$$$$$$$$$$$$&$$$",
-"***&****====****&***",
-"---&----=;;=----&---",
-"---&----=&&=----&---",
-"---&-====&&====-&---",
-">>>&>=,&&&&&&,=>&>>>",
-">>>&>='&&&&&&'=>&>>>",
-")))&)====&&====)&)))",
-")))&))))=!&=))))&)))",
-"~~~&~~~~=''=~~~~&~~~",
-"~~~&~~~~====~~~~&~~~",
-"~~~&~~~~~~~~~~~~&~~~",
-"{{{%%%%%%%%%%%%%%{{{",
-"]]]]]]]]]]]]]]]]]]]]",
-"]]]]]]]]]]]]]]]]]]]]",
-"^^^^^^^^^^^^^^^^^^^^",
-"^^^^^^^^^^^^^^^^^^^^",
+"######+$%&&%$*######",
+"====-;>,,'',,>;-====",
+"===)!,~{]==^/(,!_===",
+":::<,[}:____:}[,|:::",
+"11}23411_55_116>2711",
+"118,9111_,,_1110,a11",
+"11b,c____,,____d,'11",
+"ee,,7_f,,,,,,f_7,,ee",
+"ee,,7_!,,,,,,!_g,,ee",
+"hh',i____,,____j,khh",
+"hhl,9hhh_m,_hhh9,lhh",
+"nno23pnn_!!_nn6>qrnn",
+"nnn|,[gn____ng[,snnn",
+"nnn=t,(uvnnv/w,t:nnn",
+"xxxx1y3,,'',,zy1xxxx",
+"AAAAAABCDEEDCBAAAAAA",
+"AAAAAAAAAAAAAAAAAAAA",
+"FFFFFFFFFFFFFFFFFFFF",
+"FFFFFFFFFFFFFFFFFFFF",
 "...................."};
diff --git a/Shiki-Colors-Revival/xfwm4/maximize-pressed.xpm b/Shiki-Colors-Revival/xfwm4/maximize-pressed.xpm
index d033d86..d258bd7 100755
--- a/Shiki-Colors-Revival/xfwm4/maximize-pressed.xpm
+++ b/Shiki-Colors-Revival/xfwm4/maximize-pressed.xpm
@@ -1,80 +1,116 @@
 /* XPM */
 static char * maximize_pressed_xpm[] = {
-"20 25 52 1",
+"20 25 88 1",
 " 	c None",
 ".	c #212121",
 "+	c #3D3D3D",
 "@	c #2C2C2C",
 "#	c #2B2B2B",
-"$	c #2A2A2A",
-"%	c #E7E7E7",
-"&	c #E6E6E6",
-"*	c #A5A5A5",
-"=	c #292929",
-"-	c #A3A3A3",
-";	c #A3A4A3",
-">	c #5E5E5E",
-",	c #282828",
-"'	c #A1A1A2",
-")	c #A1A1A1",
-"!	c #CDCDCD",
-"~	c #A1A2A1",
-"{	c #A0A0A0",
-"]	c #9E9F9E",
-"^	c #9E9E9F",
-"/	c #272727",
-"(	c #9C9C9D",
-"_	c #C2C2C2",
-":	c #9C9B9C",
-"<	c #B8B8B8",
-"[	c #9B9B9C",
-"}	c #262626",
-"|	c #9A999A",
-"1	c #9A9999",
-"2	c #989898",
-"3	c #E2E2E2",
-"4	c #252525",
-"5	c #969796",
-"6	c #979697",
-"7	c #979797",
-"8	c #969697",
-"9	c #979696",
-"0	c #969696",
-"a	c #959595",
-"b	c #959594",
-"c	c #949595",
-"d	c #959495",
-"e	c #949594",
-"f	c #949494",
-"g	c #939493",
-"h	c #949493",
-"i	c #939494",
-"j	c #939394",
-"k	c #242424",
-"l	c #232323",
-"m	c #222222",
+"$	c #787878",
+"%	c #AFAFAF",
+"&	c #C7C7C7",
+"*	c #3C3C3C",
+"=	c #2A2A2A",
+"-	c #2E2E2E",
+";	c #8F8F8F",
+">	c #E1E1E1",
+",	c #E6E6E6",
+"'	c #DFDFDF",
+")	c #313131",
+"!	c #B8B8B8",
+"~	c #B3B3B3",
+"{	c #8C8C8C",
+"]	c #858585",
+"^	c #303030",
+"/	c #292929",
+"(	c #9B9B9B",
+"_	c #DBDBDB",
+":	c #949492",
+"<	c #818180",
+"[	c #9D9D9D",
+"}	c #939392",
+"|	c #989898",
+"1	c #282828",
+"2	c #4A4A4A",
+"3	c #E4E4E4",
+"4	c #919191",
+"5	c #7C7C7C",
+"6	c #9A9A9A",
+"7	c #D8D8D8",
+"8	c #E3E3E3",
+"9	c #494949",
+"0	c #A1A1A1",
+"a	c #BDBDBD",
+"b	c #A0A0A0",
+"c	c #DADADA",
+"d	c #979797",
+"e	c #969696",
+"f	c #E7E7E7",
+"g	c #999999",
+"h	c #D9D9D9",
+"i	c #272727",
+"j	c #868685",
+"k	c #D1D1D0",
+"l	c #E7E7E6",
+"m	c #828282",
+"n	c #909090",
+"o	c #C9C9C9",
+"p	c #262626",
+"q	c #8F8F8E",
+"r	c #8D8D8D",
+"s	c #91918F",
+"t	c #9F9F9F",
+"u	c #B5B5B5",
+"v	c #646463",
+"w	c #8B8B8A",
+"x	c #E5E5E4",
+"y	c #252525",
+"z	c #474747",
+"A	c #7B7B7B",
+"B	c #606060",
+"C	c #888888",
+"D	c #464646",
+"E	c #D7D7D7",
+"F	c #757574",
+"G	c #5C5C5B",
+"H	c #858584",
+"I	c #767675",
+"J	c #B6B6B6",
+"K	c #DEDEDE",
+"L	c #9C9C9C",
+"M	c #626262",
+"N	c #575757",
+"O	c #242424",
+"P	c #E0E0E0",
+"Q	c #DDDDDD",
+"R	c #232323",
+"S	c #343434",
+"T	c #717171",
+"U	c #ABABAB",
+"V	c #C5C5C5",
+"W	c #222222",
 "....................",
 "++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@",
 "####################",
-"####################",
-"$$$%%%%%%%%%%%%%%$$$",
-"$$$&************&$$$",
-"===&-;-->>>>----&===",
-",,,&''))>!!>)~))&,,,",
-",,,&{{{{>&&>{{{{&,,,",
-",,,&]>>>>&&>>>>^&,,,",
-"///&(>_&&&&&&_>(&///",
-"///&:><&&&&&&<>[&///",
-"}}}&|>>>>&&>>>>1&}}}",
-"}}}&2222>3&>2222&}}}",
-"444&5657><<>8970&444",
-"444&abca>>>>daea&444",
-"444&fgfhfffiffgj&444",
-"kkk%%%%%%%%%%%%%%kkk",
-"llllllllllllllllllll",
-"llllllllllllllllllll",
-"mmmmmmmmmmmmmmmmmmmm",
-"mmmmmmmmmmmmmmmmmmmm",
+"######+$%&&%$*######",
+"====-;>,,'',,>;-====",
+"===)!,'~{]]{~>,!^===",
+"///(,_:<[[[[<}_,|///",
+"11233455677655483911",
+"110,a$$$|,,|$$$a,b11",
+"11c,deeeeffeeeeg,h11",
+"ii,,j}kllllllk}j,,ii",
+"ii,,mnoffffffonm,,ii",
+"pph,qrrrrllrrrrs,7pp",
+"ppt,uvvvwxlwvvvu,tpp",
+"yyz38ABBC&&CBB588Dyy",
+"yyy|,EFGHHHHGIE,dyyy",
+"yyy=J,KLMNNM[',J/yyy",
+"OOOO1{P,,QQ,,'{1OOOO",
+"RRRRRRSTUVVUTSRRRRRR",
+"RRRRRRRRRRRRRRRRRRRR",
+"WWWWWWWWWWWWWWWWWWWW",
+"WWWWWWWWWWWWWWWWWWWW",
 "...................."};