Revert to using circular button states + new metacity themes

5 files changed, 129 insertions, 144 deletions

diff --git a/Shiki-Colors-Classic/xfwm4/themerc b/Shiki-Colors-Classic/xfwm4/themerc
index eda0ff9..8aec42a 100644
--- a/Shiki-Colors-Classic/xfwm4/themerc
+++ b/Shiki-Colors-Classic/xfwm4/themerc
@@ -5,10 +5,8 @@ title_horizontal_offset=0
 title_vertical_offset_active=1
 title_vertical_offset_inactive=1
 title_shadow_active=false
-title_alignment=center
-button_layout=O|HMC
-active_text_color=#E6E6E6
-inactive_text_color=#9B9B9B
+active_text_color=#e6e6e6
+inactive_text_color=#9b9b9b
 
 show_app_icon=true
 
@@ -17,8 +15,3 @@ shadow_delta_width=0
 shadow_delta_x=0
 shadow_delta_y=0
 
-resize_opacity=100
-move_opacity=80
-popup_opacity=100
-show_frame_shadow=true
-show_popup_shadow=true
diff --git a/Shiki-Colors-Classic/xfwm4/top-left-active.xpm b/Shiki-Colors-Classic/xfwm4/top-left-active.xpm
index f082c0f..71dcb71 100644
--- a/Shiki-Colors-Classic/xfwm4/top-left-active.xpm
+++ b/Shiki-Colors-Classic/xfwm4/top-left-active.xpm
@@ -1,54 +1,52 @@
 /* XPM */
 static char * top_left_active_xpm[] = {
-"6 25 26 1",
+"6 25 24 1",
 " 	c None",
 ".	c #3C3C3C",
-"+	c #707070",
-"@	c #666666",
-"#	c #515151",
-"$	c #5C5C5C",
-"%	c #505050",
-"&	c #4F4F4F",
-"*	c #4E4E4E",
-"=	c #4D4D4D",
-"-	c #4C4C4C",
-";	c #4B4B4B",
-">	c #4A4A4A",
-",	c #494949",
-"'	c #484848",
-")	c #474747",
-"!	c #464646",
-"~	c #454545",
-"{	c #444444",
-"]	c #434343",
-"^	c #424242",
-"/	c #414141",
-"(	c #404040",
-"_	c #3F3F3F",
-":	c #3E3E3E",
-"<	c #3D3D3D",
-"     .",
-"   ..+",
-"  .@@#",
-" .$%%%",
-" .$&&&",
+"+	c #666666",
+"@	c #515151",
+"#	c #505050",
+"$	c #4F4F4F",
+"%	c #4E4E4E",
+"&	c #4D4D4D",
+"*	c #4C4C4C",
+"=	c #4B4B4B",
+"-	c #4A4A4A",
+";	c #494949",
+">	c #484848",
+",	c #474747",
+"'	c #464646",
+")	c #454545",
+"!	c #444444",
+"~	c #434343",
+"{	c #424242",
+"]	c #414141",
+"^	c #404040",
+"/	c #3F3F3F",
+"(	c #3E3E3E",
+"_	c #3D3D3D",
+"......",
+".+++++",
+".@@@@@",
+".#####",
+".$$$$$",
+".%%%%%",
+".&&&&&",
 ".*****",
 ".=====",
 ".-----",
+".-----",
 ".;;;;;",
 ".>>>>>",
-".>>>>>",
 ".,,,,,",
 ".'''''",
 ".)))))",
 ".!!!!!",
 ".~~~~~",
+".~~~~~",
 ".{{{{{",
 ".]]]]]",
-".]]]]]",
 ".^^^^^",
 "./////",
 ".(((((",
-"._____",
-".:::::",
-".<<<<<"};
+"._____"};
diff --git a/Shiki-Colors-Classic/xfwm4/top-left-inactive.xpm b/Shiki-Colors-Classic/xfwm4/top-left-inactive.xpm
index f8c426e..90cb523 100644
--- a/Shiki-Colors-Classic/xfwm4/top-left-inactive.xpm
+++ b/Shiki-Colors-Classic/xfwm4/top-left-inactive.xpm
@@ -1,54 +1,52 @@
 /* XPM */
 static char * top_left_inactive_xpm[] = {
-"6 25 26 1",
+"6 25 24 1",
 " 	c None",
 ".	c #3C3C3C",
 "+	c #666666",
-"@	c #616161",
-"#	c #515151",
-"$	c #575757",
-"%	c #505050",
-"&	c #4F4F4F",
-"*	c #4E4E4E",
-"=	c #4D4D4D",
-"-	c #4C4C4C",
-";	c #4B4B4B",
-">	c #4A4A4A",
-",	c #494949",
-"'	c #484848",
-")	c #474747",
-"!	c #464646",
-"~	c #454545",
-"{	c #444444",
-"]	c #434343",
-"^	c #424242",
-"/	c #414141",
-"(	c #404040",
-"_	c #3F3F3F",
-":	c #3E3E3E",
-"<	c #3D3D3D",
-"     .",
-"   ..+",
-"  .@@#",
-" .$%%%",
-" .$&&&",
+"@	c #515151",
+"#	c #505050",
+"$	c #4F4F4F",
+"%	c #4E4E4E",
+"&	c #4D4D4D",
+"*	c #4C4C4C",
+"=	c #4B4B4B",
+"-	c #4A4A4A",
+";	c #494949",
+">	c #484848",
+",	c #474747",
+"'	c #464646",
+")	c #454545",
+"!	c #444444",
+"~	c #434343",
+"{	c #424242",
+"]	c #414141",
+"^	c #404040",
+"/	c #3F3F3F",
+"(	c #3E3E3E",
+"_	c #3D3D3D",
+"......",
+".+++++",
+".@@@@@",
+".#####",
+".$$$$$",
+".%%%%%",
+".&&&&&",
 ".*****",
 ".=====",
 ".-----",
+".-----",
 ".;;;;;",
 ".>>>>>",
-".>>>>>",
 ".,,,,,",
 ".'''''",
 ".)))))",
 ".!!!!!",
 ".~~~~~",
+".~~~~~",
 ".{{{{{",
 ".]]]]]",
-".]]]]]",
 ".^^^^^",
 "./////",
 ".(((((",
-"._____",
-".:::::",
-".<<<<<"};
+"._____"};
diff --git a/Shiki-Colors-Classic/xfwm4/top-right-active.xpm b/Shiki-Colors-Classic/xfwm4/top-right-active.xpm
index 577b810..da4dfec 100644
--- a/Shiki-Colors-Classic/xfwm4/top-right-active.xpm
+++ b/Shiki-Colors-Classic/xfwm4/top-right-active.xpm
@@ -1,54 +1,52 @@
 /* XPM */
 static char * top_right_active_xpm[] = {
-"6 25 26 1",
+"6 25 24 1",
 " 	c None",
 ".	c #3C3C3C",
 "+	c #707070",
 "@	c #515151",
-"#	c #666666",
-"$	c #505050",
-"%	c #5C5C5C",
-"&	c #4F4F4F",
-"*	c #4E4E4E",
-"=	c #4D4D4D",
-"-	c #4C4C4C",
-";	c #4B4B4B",
-">	c #4A4A4A",
-",	c #494949",
-"'	c #484848",
-")	c #474747",
-"!	c #464646",
-"~	c #454545",
-"{	c #444444",
-"]	c #434343",
-"^	c #424242",
-"/	c #414141",
-"(	c #404040",
-"_	c #3F3F3F",
-":	c #3E3E3E",
-"<	c #3D3D3D",
-".     ",
-"+..   ",
-"@##.  ",
-"$$$%. ",
-"&&&%. ",
+"#	c #505050",
+"$	c #4F4F4F",
+"%	c #4E4E4E",
+"&	c #4D4D4D",
+"*	c #4C4C4C",
+"=	c #4B4B4B",
+"-	c #4A4A4A",
+";	c #494949",
+">	c #484848",
+",	c #474747",
+"'	c #464646",
+")	c #454545",
+"!	c #444444",
+"~	c #434343",
+"{	c #424242",
+"]	c #414141",
+"^	c #404040",
+"/	c #3F3F3F",
+"(	c #3E3E3E",
+"_	c #3D3D3D",
+"......",
+"+++++.",
+"@@@@@.",
+"#####.",
+"$$$$$.",
+"%%%%%.",
+"&&&&&.",
 "*****.",
 "=====.",
 "-----.",
+"-----.",
 ";;;;;.",
 ">>>>>.",
-">>>>>.",
 ",,,,,.",
 "'''''.",
 "))))).",
 "!!!!!.",
 "~~~~~.",
+"~~~~~.",
 "{{{{{.",
 "]]]]].",
-"]]]]].",
 "^^^^^.",
 "/////.",
 "(((((.",
-"_____.",
-":::::.",
-"<<<<<."};
+"_____."};
diff --git a/Shiki-Colors-Classic/xfwm4/top-right-inactive.xpm b/Shiki-Colors-Classic/xfwm4/top-right-inactive.xpm
index b4df0f9..fb6cb6e 100644
--- a/Shiki-Colors-Classic/xfwm4/top-right-inactive.xpm
+++ b/Shiki-Colors-Classic/xfwm4/top-right-inactive.xpm
@@ -1,54 +1,52 @@
 /* XPM */
 static char * top_right_inactive_xpm[] = {
-"6 25 26 1",
+"6 25 24 1",
 " 	c None",
 ".	c #3C3C3C",
 "+	c #666666",
 "@	c #515151",
-"#	c #616161",
-"$	c #505050",
-"%	c #575757",
-"&	c #4F4F4F",
-"*	c #4E4E4E",
-"=	c #4D4D4D",
-"-	c #4C4C4C",
-";	c #4B4B4B",
-">	c #4A4A4A",
-",	c #494949",
-"'	c #484848",
-")	c #474747",
-"!	c #464646",
-"~	c #454545",
-"{	c #444444",
-"]	c #434343",
-"^	c #424242",
-"/	c #414141",
-"(	c #404040",
-"_	c #3F3F3F",
-":	c #3E3E3E",
-"<	c #3D3D3D",
-".     ",
-"+..   ",
-"@##.  ",
-"$$$%. ",
-"&&&%. ",
+"#	c #505050",
+"$	c #4F4F4F",
+"%	c #4E4E4E",
+"&	c #4D4D4D",
+"*	c #4C4C4C",
+"=	c #4B4B4B",
+"-	c #4A4A4A",
+";	c #494949",
+">	c #484848",
+",	c #474747",
+"'	c #464646",
+")	c #454545",
+"!	c #444444",
+"~	c #434343",
+"{	c #424242",
+"]	c #414141",
+"^	c #404040",
+"/	c #3F3F3F",
+"(	c #3E3E3E",
+"_	c #3D3D3D",
+"......",
+"+++++.",
+"@@@@@.",
+"#####.",
+"$$$$$.",
+"%%%%%.",
+"&&&&&.",
 "*****.",
 "=====.",
 "-----.",
+"-----.",
 ";;;;;.",
 ">>>>>.",
-">>>>>.",
 ",,,,,.",
 "'''''.",
 "))))).",
 "!!!!!.",
 "~~~~~.",
+"~~~~~.",
 "{{{{{.",
 "]]]]].",
-"]]]]].",
 "^^^^^.",
 "/////.",
 "(((((.",
-"_____.",
-":::::.",
-"<<<<<."};
+"_____."};