Merge branch 'master' into wip/3.18

42 files changed, 442 insertions, 592 deletions

diff --git a/common/xfwm4-dark/bottom-active.xpm b/common/xfwm4-dark/bottom-active.xpm
index 56a1910..5c35a34 100644
--- a/common/xfwm4-dark/bottom-active.xpm
+++ b/common/xfwm4-dark/bottom-active.xpm
@@ -2,5 +2,5 @@
 static char * bottom_active_xpm[] = {
 "12 1 2 1",
 " 	c None",
-".	c #111215",
+".	c #21252B",
 "............"};
diff --git a/common/xfwm4-dark/bottom-inactive.xpm b/common/xfwm4-dark/bottom-inactive.xpm
index 6a09d71..cb8f901 100644
--- a/common/xfwm4-dark/bottom-inactive.xpm
+++ b/common/xfwm4-dark/bottom-inactive.xpm
@@ -2,5 +2,5 @@
 static char * bottom_inactive_xpm[] = {
 "12 1 2 1",
 " 	c None",
-".	c #111215",
+".	c #21252B",
 "............"};
diff --git a/common/xfwm4-dark/close-active.xpm b/common/xfwm4-dark/close-active.xpm
index 951143b..e977ddd 100644
--- a/common/xfwm4-dark/close-active.xpm
+++ b/common/xfwm4-dark/close-active.xpm
@@ -1,72 +1,64 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"24 24 47 1",
+"24 24 39 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
-"#	c #3F383F",
-"$	c #8D4A50",
-"%	c #C2565D",
-"&	c #DC5C64",
-"*	c #C1565D",
-"=	c #8C4951",
-"-	c #6B4249",
-";	c #DA5C63",
-">	c #E45E65",
-",	c #E35E65",
-"'	c #E6676E",
-")	c #E5676D",
-"!	c #DA5C62",
-"~	c #3E383E",
-"{	c #FEFCFC",
-"]	c #F4C0C3",
-"^	c #E45F66",
-"/	c #F4BDC0",
-"(	c #FFFEFE",
-"_	c #8B4950",
-":	c #C3575D",
-"<	c #F2AFB3",
-"[	c #FFFFFF",
-"}	c #F5C2C5",
-"|	c #F5C2C4",
-"1	c #F3B4B8",
-"2	c #DB5C63",
-"3	c #F2B3B6",
-"4	c #F3B6BA",
-"5	c #E46067",
-"6	c #F5C3C6",
-"7	c #F6C9CB",
-"8	c #E46167",
-"9	c #F5C0C3",
-"0	c #F2AFB2",
-"a	c #F5C1C4",
-"b	c #FDF1F2",
-"c	c #F1AAAE",
-"d	c #8A4A50",
-"e	c #DA5B62",
-"f	c #3D373E",
-"g	c #694148",
-"h	c #C0565D",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
+"#	c #3C3741",
+"$	c #80464E",
+"%	c #AE5056",
+"&	c #C5555B",
+"*	c #AD5057",
+"=	c #7F464E",
+"-	c #633F49",
+";	c #C3555B",
+">	c #CC575D",
+",	c #623F49",
+"'	c #CB565C",
+")	c #C2545C",
+"!	c #3C3641",
+"~	c #32343F",
+"{	c #6C414A",
+"]	c #CA565C",
+"^	c #6F414B",
+"/	c #30343F",
+"(	c #7F454D",
+"_	c #AF5057",
+":	c #7C454D",
+"<	c #6A414A",
+"[	c #6B414A",
+"}	c #77434C",
+"|	c #79444D",
+"1	c #75434C",
+"2	c #69404A",
+"3	c #643F48",
+"4	c #C9565C",
+"5	c #7D464E",
+"6	c #81464E",
+"7	c #7E454E",
+"8	c #3B3641",
+"9	c #613F48",
+"0	c #C4555B",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@#$%&&*=#@@@@@@@@",
-"@@@@@@@-;>>>>>>;-@@@@@@@",
-"@@@@@@-,>>>>>>>>,-@@@@@@",
-"@@@@@#;>>'>>>>)>>!~@@@@@",
-"@@@@@$>>>{]^^/(>>>_@@@@@",
-"@@@@@:>>><[}|[1>>>*@@@@@",
-"@@@@@2>>>>3[[4>>>>;@@@@@",
-"@@@@@;>>>56[[78>>>!@@@@@",
-"@@@@@%>>>9[00[a>>>*@@@@@",
-"@@@@@=>>>bc>>cb>>>d@@@@@",
-"@@@@@#;>>>>>>>>>>ef@@@@@",
-"@@@@@@-,>>>>>>>>,g@@@@@@",
-"@@@@@@@-!>>>>>>eg@@@@@@@",
-"@@@@@@@@~_h22hdf@@@@@@@@",
+"@@@@@@@-;>>>>>>;,@@@@@@@",
+"@@@@@@-'>>>>>>>>',@@@@@@",
+"@@@@@#;>>)>>>>;>>;!@@@@@",
+"@@@@@$>>>~{]]^/>>>(@@@@@",
+"@@@@@_>>>:@<[@}>>>*@@@@@",
+"@@@@@;>>>>|@@1>>>>;@@@@@",
+"@@@@@;>>>]2@@34>>>;@@@@@",
+"@@@@@%>>>[@55@<>>>*@@@@@",
+"@@@@@=>>>#6>>6#>>>7@@@@@",
+"@@@@@#;>>>>>>>>>>)8@@@@@",
+"@@@@@@,'>>>>>>>>'9@@@@@@",
+"@@@@@@@,;>>>>>>)9@@@@@@@",
+"@@@@@@@@!(*00*78@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/close-inactive.xpm b/common/xfwm4-dark/close-inactive.xpm
index e8efc08..c4183eb 100644
--- a/common/xfwm4-dark/close-inactive.xpm
+++ b/common/xfwm4-dark/close-inactive.xpm
@@ -1,67 +1,59 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"24 24 42 1",
+"24 24 34 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
-"#	c #2D3139",
-"$	c #262B31",
-"%	c #22272B",
-"&	c #1F2428",
-"*	c #2A2E34",
-"=	c #20242A",
-"-	c #24282F",
-";	c #282D33",
-">	c #2A2E35",
-",	c #21252B",
-"'	c #292E34",
-")	c #282C33",
-"!	c #21252A",
-"~	c #2D3237",
-"{	c #2D3239",
-"]	c #656C76",
-"^	c #4F545D",
-"/	c #4D535B",
-"(	c #676D76",
-"_	c #22262B",
-":	c #282C32",
-"<	c #494E56",
-"[	c #4F565D",
-"}	c #4F555D",
-"|	c #4A4F57",
-"1	c #282D32",
-"2	c #1F2429",
-"3	c #4B5059",
-"4	c #202429",
-"5	c #51565D",
-"6	c #525860",
-"7	c #282D34",
-"8	c #202529",
-"9	c #484E55",
-"0	c #626770",
-"a	c #454C54",
-"b	c #272B32",
-"c	c #22272C",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
+"#	c #333843",
+"$	c #4B5059",
+"%	c #5B5F69",
+"&	c #646770",
+"*	c #5C6069",
+"=	c #4B505A",
+"-	c #414650",
+";	c #636771",
+">	c #666A73",
+",	c #404650",
+"'	c #636770",
+")	c #303540",
+"!	c #444953",
+"~	c #666A72",
+"{	c #454A54",
+"]	c #2E333F",
+"^	c #4B4F5A",
+"/	c #494E58",
+"(	c #444852",
+"_	c #434953",
+":	c #484D57",
+"<	c #474C56",
+"[	c #656972",
+"}	c #444853",
+"|	c #4A4F59",
+"1	c #4C515A",
+"2	c #4B4F59",
+"3	c #40454F",
+"4	c #5C5F68",
+"5	c #636871",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@#$%&&%$#@@@@@@@@",
-"@@@@@@@*=-;;;;-=>@@@@@@@",
-"@@@@@@*,;'''''')!>@@@@@@",
-"@@@@@#=;'~''''~')={@@@@@",
-"@@@@@$-'']^**/(''-$@@@@@",
-"@@@@@_:''<([}(|''1%@@@@@",
-"@@@@@2;'''|((3''';4@@@@@",
-"@@@@@4;''*5((6*''78@@@@@",
-"@@@@@%:''}(99(}''1%@@@@@",
-"@@@@@$-''0a''a0''-b@@@@@",
-"@@@@@#=)'''''''')8{@@@@@",
-"@@@@@@>,)'''''')!>@@@@@@",
-"@@@@@@@>=-1;;1-8>@@@@@@@",
-"@@@@@@@@{$c22cb{@@@@@@@@",
+"@@@@@@@@#$%&&*=#@@@@@@@@",
+"@@@@@@@-;>>>>>>;,@@@@@@@",
+"@@@@@@->>>>>>>>>>,@@@@@@",
+"@@@@@#;>>'>>>>'>>'#@@@@@",
+"@@@@@$>>>)!~~{]>>>^@@@@@",
+"@@@@@%>>>/@(_@:>>>*@@@@@",
+"@@@@@;>>>>/@@<>>>>;@@@@@",
+"@@@@@;>>>[(@@-[>>>'@@@@@",
+"@@@@@%>>>}@||@_>>>*@@@@@",
+"@@@@@=>>>#1>>1#>>>2@@@@@",
+"@@@@@#;>>>>>>>>>>'#@@@@@",
+"@@@@@@,>>>>>>>>>>3@@@@@@",
+"@@@@@@@,'>>>>>>'3@@@@@@@",
+"@@@@@@@@#^45542#@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/close-prelight.xpm b/common/xfwm4-dark/close-prelight.xpm
index 724bbd1..6e28729 100644
--- a/common/xfwm4-dark/close-prelight.xpm
+++ b/common/xfwm4-dark/close-prelight.xpm
@@ -1,49 +1,46 @@
 /* XPM */
 static char * close_prelight_xpm[] = {
-"24 24 43 1",
+"24 24 40 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
-"#	c #3F3A40",
-"$	c #945B61",
-"%	c #CE7177",
-"&	c #EB7C81",
-"*	c #CE7175",
-"=	c #935B60",
-"-	c #704D53",
-";	c #E97C81",
-">	c #F48085",
-",	c #6F4D53",
-"'	c #F37F84",
-")	c #F5878C",
-"!	c #E97B80",
-"~	c #3F3A41",
-"{	c #FFFDFD",
-"]	c #FBCDCF",
-"^	c #F48186",
-"/	c #FBCBCD",
-"(	c #FFFEFE",
-"_	c #925A60",
-":	c #CF7176",
-"<	c #FAC0C3",
-"[	c #FFFFFF",
-"}	c #FBCFD1",
-"|	c #FAC4C7",
-"1	c #FAC3C5",
-"2	c #FAC6C8",
-"3	c #FBD0D2",
-"4	c #FBD4D6",
-"5	c #F48287",
-"6	c #FBCED0",
-"7	c #FAC0C2",
-"8	c #FEF4F4",
-"9	c #F9BCBF",
-"0	c #925A5F",
-"a	c #E87B80",
-"b	c #3E3940",
-"c	c #6E4C53",
-"d	c #CD7176",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
+"#	c #3D3944",
+"$	c #85575F",
+"%	c #B86A70",
+"&	c #CF757A",
+"*	c #B66A71",
+"=	c #84575E",
+"-	c #674A54",
+";	c #CE7479",
+">	c #D7787D",
+",	c #664A53",
+"'	c #D6777C",
+")	c #CD7479",
+"!	c #3D3943",
+"~	c #32343F",
+"{	c #704E57",
+"]	c #D5777C",
+"^	c #734F58",
+"/	c #30343F",
+"(	c #85565F",
+"_	c #B86B71",
+":	c #82555D",
+"<	c #6E4D56",
+"[	c #6F4E56",
+"}	c #7C535B",
+"|	c #7E545B",
+"1	c #7A525A",
+"2	c #6D4D56",
+"3	c #674A53",
+"4	c #D4767C",
+"5	c #6F4E57",
+"6	c #83565E",
+"7	c #875760",
+"8	c #3C3844",
+"9	c #654A52",
+"0	c #B66970",
+"a	c #CF747A",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
@@ -52,17 +49,17 @@ static char * close_prelight_xpm[] = {
 "@@@@@@@@#$%&&*=#@@@@@@@@",
 "@@@@@@@-;>>>>>>;,@@@@@@@",
 "@@@@@@-'>>>>>>>>',@@@@@@",
-"@@@@@#;>>)>>>>)>>!~@@@@@",
-"@@@@@$>>>{]^^/(>>>_@@@@@",
-"@@@@@:>>><[}}[|>>>*@@@@@",
-"@@@@@&>>>>1[[2>>>>;@@@@@",
-"@@@@@;>>>^3[[45>>>!@@@@@",
-"@@@@@%>>>6[77[6>>>*@@@@@",
-"@@@@@=>>>89>>98>>>0@@@@@",
-"@@@@@#;>>>>>>>>>>ab@@@@@",
-"@@@@@@,'>>>>>>>>'c@@@@@@",
-"@@@@@@@,!>>>>>>ac@@@@@@@",
-"@@@@@@@@~_d&&d0b@@@@@@@@",
+"@@@@@#;>>)>>>>)>>)!@@@@@",
+"@@@@@$>>>~{]]^/>>>(@@@@@",
+"@@@@@_>>>:@<[@}>>>*@@@@@",
+"@@@@@;>>>>|@@1>>>>;@@@@@",
+"@@@@@;>>>]2@@34>>>)@@@@@",
+"@@@@@%>>>5@66@[>>>*@@@@@",
+"@@@@@=>>>#7>>7#>>>6@@@@@",
+"@@@@@#;>>>>>>>>>>)8@@@@@",
+"@@@@@@,'>>>>>>>>'9@@@@@@",
+"@@@@@@@,)>>>>>>)9@@@@@@@",
+"@@@@@@@@!(0aa068@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/close-pressed.xpm b/common/xfwm4-dark/close-pressed.xpm
index ef26fab..984b951 100644
--- a/common/xfwm4-dark/close-pressed.xpm
+++ b/common/xfwm4-dark/close-pressed.xpm
@@ -1,71 +1,65 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"24 24 46 1",
+"24 24 40 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
-"#	c #3E3239",
-"$	c #8D2D34",
-"%	c #C32831",
-"&	c #DE262F",
-"*	c #C22831",
-"=	c #6C2F37",
-"-	c #DC262F",
-";	c #E6262F",
-">	c #6B2F36",
-",	c #E5262F",
-"'	c #E7333B",
-")	c #E7323A",
-"!	c #DB262F",
-"~	c #3E323A",
-"{	c #FFFBFB",
-"]	c #F5AAAD",
-"^	c #E62831",
-"/	c #F5A6AA",
-"(	c #FFFDFD",
-"_	c #8C2C34",
-":	c #C42831",
-"<	c #F39498",
-"[	c #FFFFFF",
-"}	c #F6ADB1",
-"|	c #F5ACB0",
-"1	c #F39B9F",
-"2	c #DD262F",
-"3	c #F3989C",
-"4	c #F49DA1",
-"5	c #E62931",
-"6	c #F6AEB2",
-"7	c #F7B6B9",
-"8	c #E62932",
-"9	c #F5ABAE",
-"0	c #F39397",
-"a	c #F5ACAF",
-"b	c #FDECED",
-"c	c #F28D92",
-"d	c #8B2C34",
-"e	c #3D323A",
-"f	c #692F37",
-"g	c #C22931",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
+"#	c #3A343F",
+"$	c #783640",
+"%	c #A33640",
+"&	c #B73740",
+"*	c #A13741",
+"=	c #78363F",
+"-	c #5E3540",
+";	c #B63740",
+">	c #BE3841",
+",	c #5E343F",
+"'	c #BD3740",
+")	c #B53740",
+"!	c #3B343E",
+"~	c #32333E",
+"{	c #67353F",
+"]	c #BC3740",
+"^	c #683540",
+"/	c #2F333F",
+"(	c #773640",
+"_	c #A33740",
+":	c #75363F",
+"<	c #65353F",
+"[	c #653540",
+"}	c #71353F",
+"|	c #72363F",
+"1	c #6F353F",
+"2	c #64353F",
+"3	c #5F353F",
+"4	c #BB3740",
+"5	c #66353F",
+"6	c #763640",
+"7	c #7A3540",
+"8	c #773540",
+"9	c #3A333F",
+"0	c #5C353F",
+"a	c #A13740",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@#$%&&*$#@@@@@@@@",
-"@@@@@@@=-;;;;;;->@@@@@@@",
-"@@@@@@=,;;;;;;;;,>@@@@@@",
-"@@@@@#-;;';;;;);;!~@@@@@",
-"@@@@@$;;;{]^^/(;;;_@@@@@",
-"@@@@@:;;;<[}|[1;;;*@@@@@",
-"@@@@@2;;;;3[[4;;;;-@@@@@",
-"@@@@@-;;;56[[78;;;!@@@@@",
-"@@@@@%;;;9[00[a;;;*@@@@@",
-"@@@@@$;;;bc;;cb;;;d@@@@@",
-"@@@@@#-;;;;;;;;;;!e@@@@@",
-"@@@@@@>,;;;;;;;;,f@@@@@@",
-"@@@@@@@>!;;;;;;!f@@@@@@@",
-"@@@@@@@@~_g22gde@@@@@@@@",
+"@@@@@@@@#$%&&*=#@@@@@@@@",
+"@@@@@@@-;>>>>>>;,@@@@@@@",
+"@@@@@@-'>>>>>>>>',@@@@@@",
+"@@@@@#;>>)>>>>;>>;!@@@@@",
+"@@@@@$>>>~{]]^/>>>(@@@@@",
+"@@@@@_>>>:@<[@}>>>*@@@@@",
+"@@@@@;>>>>|@@1>>>>;@@@@@",
+"@@@@@;>>>]2@@34>>>;@@@@@",
+"@@@@@%>>>5@66@<>>>*@@@@@",
+"@@@@@=>>>#7>>7#>>>8@@@@@",
+"@@@@@#;>>>>>>>>>>)9@@@@@",
+"@@@@@@,'>>>>>>>>'0@@@@@@",
+"@@@@@@@,;>>>>>>)0@@@@@@@",
+"@@@@@@@@!(a&&a89@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/hide-active.xpm b/common/xfwm4-dark/hide-active.xpm
index 8cddaa7..931ff30 100644
--- a/common/xfwm4-dark/hide-active.xpm
+++ b/common/xfwm4-dark/hide-active.xpm
@@ -1,54 +1,30 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"24 24 29 1",
+"24 24 5 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
-"#	c #2D3239",
-"$	c #23272D",
-"%	c #1D2125",
-"&	c #1A1D22",
-"*	c #1D2126",
-"=	c #23282D",
-"-	c #282C32",
-";	c #1B1E23",
-">	c #21242A",
-",	c #272A30",
-"'	c #272B30",
-")	c #282D32",
-"!	c #1A1E24",
-"~	c #252A30",
-"{	c #272C32",
-"]	c #262A30",
-"^	c #21252A",
-"/	c #1E2125",
-"(	c #1A1E22",
-"_	c #272B31",
-":	c #939CA8",
-"<	c #1B1E22",
-"[	c #23282E",
-"}	c #292D33",
-"|	c #262A2F",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
+"#	c #8F939A",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@#$%&&*=#@@@@@@@@",
-"@@@@@@@-;>,'',>;)@@@@@@@",
-"@@@@@@-!~{{{{{{];)@@@@@@",
-"@@@@@#;~{{{{{{{{];#@@@@@",
-"@@@@@$>{{{{{{{{{{^=@@@@@",
-"@@@@@/]{{{{{{{{{{,*@@@@@",
-"@@@@@(_{{::::::{{_(@@@@@",
-"@@@@@(_{{::::::{{_<@@@@@",
-"@@@@@%]{{{{{{{{{{,*@@@@@",
-"@@@@@=>{{{{{{{{{{^[@@@@@",
-"@@@@@#;]{{{{{{{{]<#@@@@@",
-"@@@@@@)!]{{{{{{];}@@@@@@",
-"@@@@@@@);^,__|^<}@@@@@@@",
-"@@@@@@@@#=*((*[#@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@######@@@@@@@@@",
+"@@@@@@@@@######@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/hide-inactive.xpm b/common/xfwm4-dark/hide-inactive.xpm
index ee41358..94254c2 100644
--- a/common/xfwm4-dark/hide-inactive.xpm
+++ b/common/xfwm4-dark/hide-inactive.xpm
@@ -1,53 +1,30 @@
 /* XPM */
 static char * hide_inactive_xpm[] = {
-"24 24 28 1",
+"24 24 5 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
-"#	c #2D3139",
-"$	c #262B31",
-"%	c #22272B",
-"&	c #1F2428",
-"*	c #2A2E34",
-"=	c #20242A",
-"-	c #24282F",
-";	c #282D33",
-">	c #2A2E35",
-",	c #21252B",
-"'	c #292E34",
-")	c #282C33",
-"!	c #21252A",
-"~	c #2D3239",
-"{	c #22262B",
-"]	c #282C32",
-"^	c #282D32",
-"/	c #1F2429",
-"(	c #676D76",
-"_	c #202429",
-":	c #282D34",
-"<	c #202529",
-"[	c #272B32",
-"}	c #22272C",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
+"#	c #666A73",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@#$%&&%$#@@@@@@@@",
-"@@@@@@@*=-;;;;-=>@@@@@@@",
-"@@@@@@*,;'''''')!>@@@@@@",
-"@@@@@#=;'''''''')=~@@@@@",
-"@@@@@$-''''''''''-$@@@@@",
-"@@@@@{]''''''''''^%@@@@@",
-"@@@@@/;''(((((('';_@@@@@",
-"@@@@@_;''(((((('':<@@@@@",
-"@@@@@%]''''''''''^%@@@@@",
-"@@@@@$-''''''''''-[@@@@@",
-"@@@@@#=)'''''''')<~@@@@@",
-"@@@@@@>,)'''''')!>@@@@@@",
-"@@@@@@@>=-^;;^-<>@@@@@@@",
-"@@@@@@@@~$}//}[~@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@######@@@@@@@@@",
+"@@@@@@@@@######@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/hide-prelight.xpm b/common/xfwm4-dark/hide-prelight.xpm
index f32045d..16f49a6 100644
--- a/common/xfwm4-dark/hide-prelight.xpm
+++ b/common/xfwm4-dark/hide-prelight.xpm
@@ -1,62 +1,47 @@
 /* XPM */
 static char * hide_prelight_xpm[] = {
-"24 24 37 1",
+"24 24 22 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
-"#	c #313C48",
-"$	c #406691",
-"%	c #4C81C1",
-"&	c #508FDA",
-"*	c #4B82C2",
-"=	c #406590",
-"-	c #3A5372",
-";	c #4F8CD4",
-">	c #416898",
-",	c #324459",
-"'	c #282E38",
-")	c #416998",
-"!	c #3A5371",
-"~	c #4D88CF",
-"{	c #2F3E54",
-"]	c #262A31",
-"^	c #2F4054",
-"/	c #323B49",
-"(	c #416999",
-"_	c #406490",
-":	c #4B82C3",
-"<	c #304258",
-"[	c #324359",
-"}	c #282F3A",
-"|	c #AFB8C5",
-"1	c #508FD8",
-"2	c #28313B",
-"3	c #4F8ED8",
-"4	c #40648E",
-"5	c #313B48",
-"6	c #395371",
-"7	c #32445A",
-"8	c #4B81C1",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
+"#	c #2E333E",
+"$	c #2A2E37",
+"%	c #262B34",
+"&	c #252932",
+"*	c #2A2E38",
+"=	c #2C303A",
+"-	c #262A34",
+";	c #2F3641",
+">	c #3D4250",
+",	c #424959",
+"'	c #282B35",
+")	c #3D4353",
+"!	c #444B5B",
+"~	c #3D4252",
+"{	c #262B33",
+"]	c #3B4250",
+"^	c #C4C7CC",
+"/	c #252933",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@#$%&&*=#@@@@@@@@",
-"@@@@@@@-;>,'',);!@@@@@@@",
-"@@@@@@-~{]]]]]]^~!@@@@@@",
-"@@@@@#;{]]]]]]]]^;/@@@@@",
-"@@@@@$>]]]]]]]]]](_@@@@@",
-"@@@@@:<]]]]]]]]]][*@@@@@",
-"@@@@@&}]]||||||]]}1@@@@@",
-"@@@@@1}]]||||||]]23@@@@@",
-"@@@@@%<]]]]]]]]]][*@@@@@",
-"@@@@@=)]]]]]]]]]](4@@@@@",
-"@@@@@#;^]]]]]]]]^;5@@@@@",
-"@@@@@@!~^]]]]]]^~6@@@@@@",
-"@@@@@@@!;([}}7(;6@@@@@@@",
-"@@@@@@@@/_8&&845@@@@@@@@",
+"@@@@@@@@#$%&&%*#@@@@@@@@",
+"@@@@@@@=-;>,,>;-=@@@@@@@",
+"@@@@@@=')!!!!!!~'=@@@@@@",
+"@@@@@#-)!!!!!!!!~-#@@@@@",
+"@@@@@$;!!!!!!!!!!;*@@@@@",
+"@@@@@{]!!!!!!!!!!]%@@@@@",
+"@@@@@&,!!^^^^^^!!,/@@@@@",
+"@@@@@/,!!^^^^^^!!,/@@@@@",
+"@@@@@%]!!!!!!!!!!]%@@@@@",
+"@@@@@*;!!!!!!!!!!;*@@@@@",
+"@@@@@#-~!!!!!!!!~%#@@@@@",
+"@@@@@@='~!!!!!!~'=@@@@@@",
+"@@@@@@@=-;],,];%=@@@@@@@",
+"@@@@@@@@#*%&&%*#@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/left-active.xpm b/common/xfwm4-dark/left-active.xpm
index 7910439..b94d67f 100644
--- a/common/xfwm4-dark/left-active.xpm
+++ b/common/xfwm4-dark/left-active.xpm
@@ -2,7 +2,7 @@
 static char * left_active_xpm[] = {
 "1 12 2 1",
 " 	c None",
-".	c #111215",
+".	c #21252B",
 ".",
 ".",
 ".",
diff --git a/common/xfwm4-dark/left-inactive.xpm b/common/xfwm4-dark/left-inactive.xpm
index 9c1ba36..17f9acf 100644
--- a/common/xfwm4-dark/left-inactive.xpm
+++ b/common/xfwm4-dark/left-inactive.xpm
@@ -2,7 +2,7 @@
 static char * left_inactive_xpm[] = {
 "1 12 2 1",
 " 	c None",
-".	c #111215",
+".	c #21252B",
 ".",
 ".",
 ".",
diff --git a/common/xfwm4-dark/maximize-active.xpm b/common/xfwm4-dark/maximize-active.xpm
index 9c6462a..be458f3 100644
--- a/common/xfwm4-dark/maximize-active.xpm
+++ b/common/xfwm4-dark/maximize-active.xpm
@@ -1,63 +1,37 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"24 24 38 1",
+"24 24 12 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
-"#	c #2D3239",
-"$	c #23272D",
-"%	c #1D2125",
-"&	c #1A1D22",
-"*	c #1D2126",
-"=	c #23282D",
-"-	c #282C32",
-";	c #1B1E23",
-">	c #21242A",
-",	c #272A30",
-"'	c #272B30",
-")	c #282D32",
-"!	c #1A1E24",
-"~	c #252A30",
-"{	c #272C32",
-"]	c #262A30",
-"^	c #282E34",
-"/	c #717882",
-"(	c #939CA8",
-"_	c #7F8690",
-":	c #21252A",
-"<	c #1E2125",
-"[	c #1A1E22",
-"}	c #272B31",
-"|	c #282D34",
-"1	c #747B85",
-"2	c #2A2F35",
-"3	c #292E34",
-"4	c #6E757E",
-"5	c #1B1E22",
-"6	c #7F8892",
-"7	c #23282E",
-"8	c #292D33",
-"9	c #262A2F",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
+"#	c #313641",
+"$	c #70757E",
+"%	c #8F939A",
+"&	c #7D8089",
+"*	c #73777F",
+"=	c #323641",
+"-	c #6E717B",
+";	c #7E818A",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@#$%&&*=#@@@@@@@@",
-"@@@@@@@-;>,'',>;)@@@@@@@",
-"@@@@@@-!~{{{{{{];)@@@@@@",
-"@@@@@#;~{{{{{{{{];#@@@@@",
-"@@@@@$>{{{^/((_{{:=@@@@@",
-"@@@@@<]{{^{^/(({{,*@@@@@",
-"@@@@@[}{|12{34({{}[@@@@@",
-"@@@@@[}{|(12{34{{}5@@@@@",
-"@@@@@%]{|((/^{^{{,*@@@@@",
-"@@@@@=>{{6((/^{{{:7@@@@@",
-"@@@@@#;]{{{{{{{{]5#@@@@@",
-"@@@@@@)!]{{{{{{];8@@@@@@",
-"@@@@@@@);:,}}9:58@@@@@@@",
-"@@@@@@@@#=*[[*7#@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@#$%%&@@@@@@@@@",
+"@@@@@@@@@#@#$%%@@@@@@@@@",
+"@@@@@@@@@*=@@-%@@@@@@@@@",
+"@@@@@@@@@%*=@@-@@@@@@@@@",
+"@@@@@@@@@%%$#@#@@@@@@@@@",
+"@@@@@@@@@;%%$#@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/maximize-inactive.xpm b/common/xfwm4-dark/maximize-inactive.xpm
index 6b08d2f..579b2ff 100644
--- a/common/xfwm4-dark/maximize-inactive.xpm
+++ b/common/xfwm4-dark/maximize-inactive.xpm
@@ -1,59 +1,37 @@
 /* XPM */
 static char * maximize_inactive_xpm[] = {
-"24 24 34 1",
+"24 24 12 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
-"#	c #2D3139",
-"$	c #262B31",
-"%	c #22272B",
-"&	c #1F2428",
-"*	c #2A2E34",
-"=	c #20242A",
-"-	c #24282F",
-";	c #282D33",
-">	c #2A2E35",
-",	c #21252B",
-"'	c #292E34",
-")	c #282C33",
-"!	c #21252A",
-"~	c #2D3239",
-"{	c #2A3035",
-"]	c #525962",
-"^	c #676D76",
-"/	c #5B606A",
-"(	c #22262B",
-"_	c #282C32",
-":	c #282D32",
-"<	c #1F2429",
-"[	c #545B62",
-"}	c #525760",
-"|	c #202429",
-"1	c #282D34",
-"2	c #202529",
-"3	c #5C626B",
-"4	c #272B32",
-"5	c #22272C",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
+"#	c #303540",
+"$	c #545862",
+"%	c #666A73",
+"&	c #5C5F68",
+"*	c #2E333F",
+"=	c #555A64",
+"-	c #525761",
+";	c #5B5F69",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@#$%&&%$#@@@@@@@@",
-"@@@@@@@*=-;;;;-=>@@@@@@@",
-"@@@@@@*,;'''''')!>@@@@@@",
-"@@@@@#=;'''''''')=~@@@@@",
-"@@@@@$-'''{]^^/''-$@@@@@",
-"@@@@@(_''{'{]^^'':%@@@@@",
-"@@@@@<;'*[>'*}^'';|@@@@@",
-"@@@@@|;'*^[>'*}''12@@@@@",
-"@@@@@%_'*^^]{'{'':%@@@@@",
-"@@@@@$-''3^^]{'''-4@@@@@",
-"@@@@@#=)'''''''')2~@@@@@",
-"@@@@@@>,)'''''')!>@@@@@@",
-"@@@@@@@>=-:;;:-2>@@@@@@@",
-"@@@@@@@@~$5<<54~@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@#$%%&@@@@@@@@@",
+"@@@@@@@@@#@#$%%@@@@@@@@@",
+"@@@@@@@@*=#@@-%@@@@@@@@@",
+"@@@@@@@@*%=#@@-@@@@@@@@@",
+"@@@@@@@@*%%$#@#@@@@@@@@@",
+"@@@@@@@@@;%%$#@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/maximize-prelight.xpm b/common/xfwm4-dark/maximize-prelight.xpm
index 1e592a8..840b6c9 100644
--- a/common/xfwm4-dark/maximize-prelight.xpm
+++ b/common/xfwm4-dark/maximize-prelight.xpm
@@ -1,71 +1,56 @@
 /* XPM */
 static char * maximize_prelight_xpm[] = {
-"24 24 46 1",
+"24 24 31 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
-"#	c #313C48",
-"$	c #406691",
-"%	c #4C81C1",
-"&	c #508FDA",
-"*	c #4B82C2",
-"=	c #406590",
-"-	c #3A5372",
-";	c #4F8CD4",
-">	c #416898",
-",	c #324459",
-"'	c #282E38",
-")	c #416998",
-"!	c #3A5371",
-"~	c #4D88CF",
-"{	c #2F3E54",
-"]	c #262A31",
-"^	c #2F4054",
-"/	c #323B49",
-"(	c #282D33",
-"_	c #838A96",
-":	c #AFB8C5",
-"<	c #949BA6",
-"[	c #416999",
-"}	c #406490",
-"|	c #4B82C3",
-"1	c #304258",
-"2	c #324359",
-"3	c #282F3A",
-"4	c #272B32",
-"5	c #878E99",
-"6	c #2A2E34",
-"7	c #282C31",
-"8	c #818691",
-"9	c #508FD8",
-"0	c #28313B",
-"a	c #4F8ED8",
-"b	c #959DA9",
-"c	c #40648E",
-"d	c #313B48",
-"e	c #395371",
-"f	c #32445A",
-"g	c #4B81C1",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
+"#	c #2E333E",
+"$	c #2A2E37",
+"%	c #262B34",
+"&	c #252932",
+"*	c #2A2E38",
+"=	c #2C303A",
+"-	c #262A34",
+";	c #2F3641",
+">	c #3D4250",
+",	c #424959",
+"'	c #282B35",
+")	c #3D4353",
+"!	c #444B5B",
+"~	c #3D4252",
+"{	c #474D5E",
+"]	c #9B9FA6",
+"^	c #C4C7CC",
+"/	c #ABAEB5",
+"(	c #262B33",
+"_	c #3B4250",
+":	c #464D5D",
+"<	c #9EA2AB",
+"[	c #484E5E",
+"}	c #454C5B",
+"|	c #979BA6",
+"1	c #252933",
+"2	c #ACAFB7",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@#$%&&*=#@@@@@@@@",
-"@@@@@@@-;>,'',);!@@@@@@@",
-"@@@@@@-~{]]]]]]^~!@@@@@@",
-"@@@@@#;{]]]]]]]]^;/@@@@@",
-"@@@@@$>]]](_::<]][}@@@@@",
-"@@@@@|1]](](_::]]2*@@@@@",
-"@@@@@&3]456]78:]]39@@@@@",
-"@@@@@93]4:56]78]]0a@@@@@",
-"@@@@@%1]4::_(](]]2*@@@@@",
-"@@@@@=)]]b::_(]]][c@@@@@",
-"@@@@@#;^]]]]]]]]^;d@@@@@",
-"@@@@@@!~^]]]]]]^~e@@@@@@",
-"@@@@@@@!;[233f[;e@@@@@@@",
-"@@@@@@@@/}g&&gcd@@@@@@@@",
+"@@@@@@@@#$%&&%*#@@@@@@@@",
+"@@@@@@@=-;>,,>;-=@@@@@@@",
+"@@@@@@=')!!!!!!~'=@@@@@@",
+"@@@@@#-)!!!!!!!!~-#@@@@@",
+"@@@@@$;!!!{]^^/!!;*@@@@@",
+"@@@@@(_!!{!{]^^!!_%@@@@@",
+"@@@@@&,!:<[!}|^!!,1@@@@@",
+"@@@@@1,!:^<[!}|!!,1@@@@@",
+"@@@@@%_!:^^]{!{!!_%@@@@@",
+"@@@@@*;!!2^^]{!!!;*@@@@@",
+"@@@@@#-~!!!!!!!!~%#@@@@@",
+"@@@@@@='~!!!!!!~'=@@@@@@",
+"@@@@@@@=-;_,,_;%=@@@@@@@",
+"@@@@@@@@#*%&&%*#@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/menu-active.xpm b/common/xfwm4-dark/menu-active.xpm
index 4c79ef4..47d7968 100644
--- a/common/xfwm4-dark/menu-active.xpm
+++ b/common/xfwm4-dark/menu-active.xpm
@@ -2,7 +2,7 @@
 static char * menu_active_xpm[] = {
 "16 22 3 1",
 " 	c None",
-".	c #2F343B",
+".	c #2F343F",
 "+	c #A4AAB7",
 "................",
 "................",
diff --git a/common/xfwm4-dark/menu-inactive.xpm b/common/xfwm4-dark/menu-inactive.xpm
index 419d85a..3a4e8bf 100644
--- a/common/xfwm4-dark/menu-inactive.xpm
+++ b/common/xfwm4-dark/menu-inactive.xpm
@@ -2,7 +2,7 @@
 static char * menu_inactive_xpm[] = {
 "16 22 3 1",
 " 	c None",
-".	c #2F343B",
+".	c #2F343F",
 "+	c #797D87",
 "................",
 "................",
diff --git a/common/xfwm4-dark/menu-pressed.xpm b/common/xfwm4-dark/menu-pressed.xpm
index d676c4b..2a297fb 100644
--- a/common/xfwm4-dark/menu-pressed.xpm
+++ b/common/xfwm4-dark/menu-pressed.xpm
@@ -2,7 +2,7 @@
 static char * menu_pressed_xpm[] = {
 "16 22 3 1",
 " 	c None",
-".	c #2F343B",
+".	c #2F343F",
 "+	c #5294E2",
 "................",
 "................",
diff --git a/common/xfwm4-dark/right-active.xpm b/common/xfwm4-dark/right-active.xpm
index 123b2c5..6f08d57 100644
--- a/common/xfwm4-dark/right-active.xpm
+++ b/common/xfwm4-dark/right-active.xpm
@@ -2,7 +2,7 @@
 static char * right_active_xpm[] = {
 "1 12 2 1",
 " 	c None",
-".	c #111215",
+".	c #21252B",
 ".",
 ".",
 ".",
diff --git a/common/xfwm4-dark/right-inactive.xpm b/common/xfwm4-dark/right-inactive.xpm
index ee0338d..86b8f45 100644
--- a/common/xfwm4-dark/right-inactive.xpm
+++ b/common/xfwm4-dark/right-inactive.xpm
@@ -2,7 +2,7 @@
 static char * right_inactive_xpm[] = {
 "1 12 2 1",
 " 	c None",
-".	c #111215",
+".	c #21252B",
 ".",
 ".",
 ".",
diff --git a/common/xfwm4-dark/shade-active.xpm b/common/xfwm4-dark/shade-active.xpm
index aec634b..35243b3 100644
--- a/common/xfwm4-dark/shade-active.xpm
+++ b/common/xfwm4-dark/shade-active.xpm
@@ -2,7 +2,7 @@
 static char * shade_active_xpm[] = {
 "16 22 3 1",
 " 	c None",
-".	c #2F343B",
+".	c #2F343F",
 "+	c #A4AAB7",
 "................",
 "................",
diff --git a/common/xfwm4-dark/shade-inactive.xpm b/common/xfwm4-dark/shade-inactive.xpm
index c199c04..3e099fd 100644
--- a/common/xfwm4-dark/shade-inactive.xpm
+++ b/common/xfwm4-dark/shade-inactive.xpm
@@ -2,7 +2,7 @@
 static char * shade_inactive_xpm[] = {
 "16 22 3 1",
 " 	c None",
-".	c #2F343B",
+".	c #2F343F",
 "+	c #797D87",
 "................",
 "................",
diff --git a/common/xfwm4-dark/shade-pressed.xpm b/common/xfwm4-dark/shade-pressed.xpm
index 845f56f..56d8e49 100644
--- a/common/xfwm4-dark/shade-pressed.xpm
+++ b/common/xfwm4-dark/shade-pressed.xpm
@@ -2,7 +2,7 @@
 static char * shade_pressed_xpm[] = {
 "16 22 3 1",
 " 	c None",
-".	c #2F343B",
+".	c #2F343F",
 "+	c #5294E2",
 "................",
 "................",
diff --git a/common/xfwm4-dark/stick-active.xpm b/common/xfwm4-dark/stick-active.xpm
index 96d5f02..cdea9f2 100644
--- a/common/xfwm4-dark/stick-active.xpm
+++ b/common/xfwm4-dark/stick-active.xpm
@@ -2,7 +2,7 @@
 static char * stick_active_xpm[] = {
 "16 22 3 1",
 " 	c None",
-".	c #2F343B",
+".	c #2F343F",
 "+	c #A4AAB7",
 "................",
 "................",
diff --git a/common/xfwm4-dark/stick-inactive.xpm b/common/xfwm4-dark/stick-inactive.xpm
index b7e71a9..57fcc10 100644
--- a/common/xfwm4-dark/stick-inactive.xpm
+++ b/common/xfwm4-dark/stick-inactive.xpm
@@ -2,7 +2,7 @@
 static char * stick_inactive_xpm[] = {
 "16 22 3 1",
 " 	c None",
-".	c #2F343B",
+".	c #2F343F",
 "+	c #797D87",
 "................",
 "................",
diff --git a/common/xfwm4-dark/stick-pressed.xpm b/common/xfwm4-dark/stick-pressed.xpm
index 0f311ab..c83dc82 100644
--- a/common/xfwm4-dark/stick-pressed.xpm
+++ b/common/xfwm4-dark/stick-pressed.xpm
@@ -2,7 +2,7 @@
 static char * stick_pressed_xpm[] = {
 "16 22 3 1",
 " 	c None",
-".	c #2F343B",
+".	c #2F343F",
 "+	c #5294E2",
 "................",
 "................",
diff --git a/common/xfwm4-dark/title-1-active-shaded.xpm b/common/xfwm4-dark/title-1-active-shaded.xpm
index 57f3ffe..4285a1f 100644
--- a/common/xfwm4-dark/title-1-active-shaded.xpm
+++ b/common/xfwm4-dark/title-1-active-shaded.xpm
@@ -2,9 +2,9 @@
 static char * title_1_active_shaded_xpm[] = {
 "24 24 4 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/title-1-active.xpm b/common/xfwm4-dark/title-1-active.xpm
index 29a863c..22da8da 100644
--- a/common/xfwm4-dark/title-1-active.xpm
+++ b/common/xfwm4-dark/title-1-active.xpm
@@ -2,9 +2,9 @@
 static char * title_1_active_xpm[] = {
 "24 24 4 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/title-1-inactive.xpm b/common/xfwm4-dark/title-1-inactive.xpm
index c596666..8e30fbf 100644
--- a/common/xfwm4-dark/title-1-inactive.xpm
+++ b/common/xfwm4-dark/title-1-inactive.xpm
@@ -2,9 +2,9 @@
 static char * title_1_inactive_xpm[] = {
 "24 24 4 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/title-2-active.xpm b/common/xfwm4-dark/title-2-active.xpm
index b47656c..11878e7 100644
--- a/common/xfwm4-dark/title-2-active.xpm
+++ b/common/xfwm4-dark/title-2-active.xpm
@@ -2,9 +2,9 @@
 static char * title_2_active_xpm[] = {
 "24 24 4 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/title-2-inactive.xpm b/common/xfwm4-dark/title-2-inactive.xpm
index 994c9df..1d7694a 100644
--- a/common/xfwm4-dark/title-2-inactive.xpm
+++ b/common/xfwm4-dark/title-2-inactive.xpm
@@ -2,9 +2,9 @@
 static char * title_2_inactive_xpm[] = {
 "24 24 4 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/title-3-active.xpm b/common/xfwm4-dark/title-3-active.xpm
index 6636d55..ce86c3b 100644
--- a/common/xfwm4-dark/title-3-active.xpm
+++ b/common/xfwm4-dark/title-3-active.xpm
@@ -2,9 +2,9 @@
 static char * title_3_active_xpm[] = {
 "24 24 4 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/title-3-inactive.xpm b/common/xfwm4-dark/title-3-inactive.xpm
index 2ba62f1..0bb562c 100644
--- a/common/xfwm4-dark/title-3-inactive.xpm
+++ b/common/xfwm4-dark/title-3-inactive.xpm
@@ -2,9 +2,9 @@
 static char * title_3_inactive_xpm[] = {
 "24 24 4 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/title-4-active.xpm b/common/xfwm4-dark/title-4-active.xpm
index f166460..bc56ba8 100644
--- a/common/xfwm4-dark/title-4-active.xpm
+++ b/common/xfwm4-dark/title-4-active.xpm
@@ -2,9 +2,9 @@
 static char * title_4_active_xpm[] = {
 "24 24 4 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/title-4-inactive.xpm b/common/xfwm4-dark/title-4-inactive.xpm
index 4aac53c..499d6f3 100644
--- a/common/xfwm4-dark/title-4-inactive.xpm
+++ b/common/xfwm4-dark/title-4-inactive.xpm
@@ -2,9 +2,9 @@
 static char * title_4_inactive_xpm[] = {
 "24 24 4 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/title-5-active.xpm b/common/xfwm4-dark/title-5-active.xpm
index 6f0d325..210d06c 100644
--- a/common/xfwm4-dark/title-5-active.xpm
+++ b/common/xfwm4-dark/title-5-active.xpm
@@ -2,9 +2,9 @@
 static char * title_5_active_xpm[] = {
 "24 24 4 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/title-5-inactive.xpm b/common/xfwm4-dark/title-5-inactive.xpm
index 8be09f3..ec89d56 100644
--- a/common/xfwm4-dark/title-5-inactive.xpm
+++ b/common/xfwm4-dark/title-5-inactive.xpm
@@ -2,9 +2,9 @@
 static char * title_5_inactive_xpm[] = {
 "24 24 4 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
 "........................",
 "++++++++++++++++++++++++",
 "@@@@@@@@@@@@@@@@@@@@@@@@",
diff --git a/common/xfwm4-dark/top-left-active-shaded.xpm b/common/xfwm4-dark/top-left-active-shaded.xpm
index 0580dcd..2208363 100644
--- a/common/xfwm4-dark/top-left-active-shaded.xpm
+++ b/common/xfwm4-dark/top-left-active-shaded.xpm
@@ -2,9 +2,9 @@
 static char * top_left_active_shaded_xpm[] = {
 "5 24 4 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
 " ....",
 ".++++",
 ".@@@@",
diff --git a/common/xfwm4-dark/top-left-active.xpm b/common/xfwm4-dark/top-left-active.xpm
index c80f1ba..3fd1897 100644
--- a/common/xfwm4-dark/top-left-active.xpm
+++ b/common/xfwm4-dark/top-left-active.xpm
@@ -2,9 +2,9 @@
 static char * top_left_active_xpm[] = {
 "5 24 4 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
 " ....",
 ".++++",
 ".@@@@",
diff --git a/common/xfwm4-dark/top-left-inactive.xpm b/common/xfwm4-dark/top-left-inactive.xpm
index 61397b7..78f4191 100644
--- a/common/xfwm4-dark/top-left-inactive.xpm
+++ b/common/xfwm4-dark/top-left-inactive.xpm
@@ -2,9 +2,9 @@
 static char * top_left_inactive_xpm[] = {
 "5 24 4 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
 " ....",
 ".++++",
 ".@@@@",
diff --git a/common/xfwm4-dark/top-right-active-shaded.xpm b/common/xfwm4-dark/top-right-active-shaded.xpm
index 47c1c24..23b0b0a 100644
--- a/common/xfwm4-dark/top-right-active-shaded.xpm
+++ b/common/xfwm4-dark/top-right-active-shaded.xpm
@@ -2,9 +2,9 @@
 static char * top_right_active_shaded_xpm[] = {
 "5 24 4 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
 ".... ",
 "++++.",
 "@@@@.",
diff --git a/common/xfwm4-dark/top-right-active.xpm b/common/xfwm4-dark/top-right-active.xpm
index 76421cd..0339c30 100644
--- a/common/xfwm4-dark/top-right-active.xpm
+++ b/common/xfwm4-dark/top-right-active.xpm
@@ -2,9 +2,9 @@
 static char * top_right_active_xpm[] = {
 "5 24 4 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
 ".... ",
 "++++.",
 "@@@@.",
diff --git a/common/xfwm4-dark/top-right-inactive.xpm b/common/xfwm4-dark/top-right-inactive.xpm
index d9ff024..abeee0f 100644
--- a/common/xfwm4-dark/top-right-inactive.xpm
+++ b/common/xfwm4-dark/top-right-inactive.xpm
@@ -2,9 +2,9 @@
 static char * top_right_inactive_xpm[] = {
 "5 24 4 1",
 " 	c None",
-".	c #111215",
-"+	c #353B44",
-"@	c #2F343B",
+".	c #21252B",
+"+	c #353B48",
+"@	c #2F343F",
 ".... ",
 "++++.",
 "@@@@.",