diff --git a/xfwm4/close-prelight.png b/xfwm4/close-prelight.png
new file mode 100644
index 0000000..fddcef7
Binary files /dev/null and b/xfwm4/close-prelight.png differ
diff --git a/xfwm4/close-prelight.xpm b/xfwm4/close-prelight.xpm
index 02fde2a..f72e057 100644
--- a/xfwm4/close-prelight.xpm
+++ b/xfwm4/close-prelight.xpm
@@ -9,7 +9,7 @@ static char *close_prelight[] = {
"O c #BEE2455135CC",
"+ c #C23645DE35FF",
"@ c #C60A46813639",
-"# c #D6D649493737",
+"# c #D6D649493737 s active_color_1",
/* pixels */
"oooooooooooooooooooooo",
" ",
@@ -20,14 +20,14 @@ static char *close_prelight[] = {
" ",
" ",
" ",
-" #O. .O# ",
-" +#O..O#+ ",
-" .O#@@#O. ",
-" .@##+. ",
-" X@##@X ",
-" X+#++#+X ",
-" +#@.X@#+ ",
-" #O. .+# ",
+" ##. .## ",
+" ###..### ",
+" .######. ",
+" .####. ",
+" .####. ",
+" .######. ",
+" ###..### ",
+" ##. .## ",
" ",
" ",
" ",
diff --git a/xfwm4/close-pressed.png b/xfwm4/close-pressed.png
new file mode 100644
index 0000000..23f19a8
Binary files /dev/null and b/xfwm4/close-pressed.png differ
diff --git a/xfwm4/close-pressed.xpm b/xfwm4/close-pressed.xpm
index af1d1d1..f72e057 100644
--- a/xfwm4/close-pressed.xpm
+++ b/xfwm4/close-pressed.xpm
@@ -1,17 +1,17 @@
/* XPM */
-static char *close_pressed[] = {
+static char *close_prelight[] = {
/* columns rows colors chars-per-pixel */
"22 25 8 1 ",
" c #2D2D2D2D2D2D",
-". c #3C0F2F9A2E0F",
-"X c #3C972FB02E17",
-"o c #402230442E4C",
-"O c #484848484848",
-"+ c #A1A940293414",
-"@ c #A76B4119346B",
-"# c #B4B443433535",
+". c #4007304C2E4A",
+"X c #452131252E98",
+"o c #484848484848",
+"O c #BEE2455135CC",
+"+ c #C23645DE35FF",
+"@ c #C60A46813639",
+"# c #D6D649493737 s active_color_1",
/* pixels */
-"OOOOOOOOOOOOOOOOOOOOOO",
+"oooooooooooooooooooooo",
" ",
" ",
" ",
@@ -20,14 +20,14 @@ static char *close_pressed[] = {
" ",
" ",
" ",
-" #+. .+# ",
-" @#+.X+#+ ",
-" X+#@@#+X ",
-" .@##@X ",
-" X@##@X ",
-" X@#+@#@o ",
-" +#@oo+#@ ",
-" #+. X+# ",
+" ##. .## ",
+" ###..### ",
+" .######. ",
+" .####. ",
+" .####. ",
+" .######. ",
+" ###..### ",
+" ##. .## ",
" ",
" ",
" ",
diff --git a/xfwm4/hide-prelight.xpm b/xfwm4/hide-prelight.xpm
index 0428040..78e58e7 100644
--- a/xfwm4/hide-prelight.xpm
+++ b/xfwm4/hide-prelight.xpm
@@ -1,12 +1,10 @@
/* XPM */
static char *hide_prelight[] = {
/* columns rows colors chars-per-pixel */
-"22 25 5 1 ",
+"22 25 3 1 ",
" c #2D2D2D2D2D2D",
-". c #32802E0F2D7E",
+". c #32802E0F2D7E s active_color_1",
"X c #484848484848",
-"o c #D22E488336F0",
-"O c #D6D649493737",
/* pixels */
"XXXXXXXXXXXXXXXXXXXXXX",
" ",
@@ -19,9 +17,9 @@ static char *hide_prelight[] = {
" ",
" ",
" ",
+" ",
+" ........ ",
" ........ ",
-" OOOOOOOO ",
-" oooooooo ",
" ",
" ",
" ",
diff --git a/xfwm4/hide-pressed.png b/xfwm4/hide-pressed.png
new file mode 100644
index 0000000..7471b90
Binary files /dev/null and b/xfwm4/hide-pressed.png differ
diff --git a/xfwm4/hide-pressed.xpm b/xfwm4/hide-pressed.xpm
index 8fff897..c165179 100644
--- a/xfwm4/hide-pressed.xpm
+++ b/xfwm4/hide-pressed.xpm
@@ -1,12 +1,12 @@
/* XPM */
-static char *hide_pressed[] = {
+static char *hide_prelight[] = {
/* columns rows colors chars-per-pixel */
"22 25 5 1 ",
" c #2D2D2D2D2D2D",
-". c #316D2DDE2D6E",
+". c #32802E0F2D7E s active_color_1",
"X c #484848484848",
-"o c #B0FC42A834FD",
-"O c #B4B443433535",
+"o c #D22E488336F0",
+"O c #D6D649493737",
/* pixels */
"XXXXXXXXXXXXXXXXXXXXXX",
" ",
@@ -19,9 +19,9 @@ static char *hide_pressed[] = {
" ",
" ",
" ",
+" ",
+" ........ ",
" ........ ",
-" OOOOOOOO ",
-" oooooooo ",
" ",
" ",
" ",
diff --git a/xfwm4/maximize-prelight.xpm b/xfwm4/maximize-prelight.xpm
index cadb8fd..7da22f8 100644
--- a/xfwm4/maximize-prelight.xpm
+++ b/xfwm4/maximize-prelight.xpm
@@ -4,7 +4,7 @@ static char *maximize_prelight[] = {
"22 25 3 1 ",
" c #2D2D2D2D2D2D",
". c #484848484848",
-"X c #D6D649493737",
+"X c #D6D649493737 s active_color_1",
/* pixels */
"......................",
" ",
diff --git a/xfwm4/maximize-pressed.png b/xfwm4/maximize-pressed.png
new file mode 100644
index 0000000..b273c5c
Binary files /dev/null and b/xfwm4/maximize-pressed.png differ
diff --git a/xfwm4/maximize-pressed.xpm b/xfwm4/maximize-pressed.xpm
index 9fc6c6c..7da22f8 100644
--- a/xfwm4/maximize-pressed.xpm
+++ b/xfwm4/maximize-pressed.xpm
@@ -1,10 +1,10 @@
/* XPM */
-static char *maximize_pressed[] = {
+static char *maximize_prelight[] = {
/* columns rows colors chars-per-pixel */
"22 25 3 1 ",
" c #2D2D2D2D2D2D",
". c #484848484848",
-"X c #B4B443433535",
+"X c #D6D649493737 s active_color_1",
/* pixels */
"......................",
" ",
diff --git a/xfwm4/maximize-toggled-prelight.xpm b/xfwm4/maximize-toggled-prelight.xpm
index 619fd35..7da22f8 100644
--- a/xfwm4/maximize-toggled-prelight.xpm
+++ b/xfwm4/maximize-toggled-prelight.xpm
@@ -1,10 +1,10 @@
/* XPM */
-static char *maximize_toggled_prelight[] = {
+static char *maximize_prelight[] = {
/* columns rows colors chars-per-pixel */
"22 25 3 1 ",
" c #2D2D2D2D2D2D",
". c #484848484848",
-"X c #D6D649493737",
+"X c #D6D649493737 s active_color_1",
/* pixels */
"......................",
" ",
diff --git a/xfwm4/maximize-toggled-pressed.png b/xfwm4/maximize-toggled-pressed.png
new file mode 100644
index 0000000..b273c5c
Binary files /dev/null and b/xfwm4/maximize-toggled-pressed.png differ
diff --git a/xfwm4/maximize-toggled-pressed.xpm b/xfwm4/maximize-toggled-pressed.xpm
index 17cc04e..7da22f8 100644
--- a/xfwm4/maximize-toggled-pressed.xpm
+++ b/xfwm4/maximize-toggled-pressed.xpm
@@ -1,10 +1,10 @@
/* XPM */
-static char *maximize_toggled_pressed[] = {
+static char *maximize_prelight[] = {
/* columns rows colors chars-per-pixel */
"22 25 3 1 ",
" c #2D2D2D2D2D2D",
". c #484848484848",
-"X c #B4B443433535",
+"X c #D6D649493737 s active_color_1",
/* pixels */
"......................",
" ",
diff --git a/xfwm4/shade-prelight.png b/xfwm4/shade-prelight.png
new file mode 100644
index 0000000..571c822
Binary files /dev/null and b/xfwm4/shade-prelight.png differ
diff --git a/xfwm4/shade-prelight.xpm b/xfwm4/shade-prelight.xpm
index 6cb7e2f..810b012 100644
--- a/xfwm4/shade-prelight.xpm
+++ b/xfwm4/shade-prelight.xpm
@@ -1,15 +1,11 @@
/* XPM */
static char *shade_prelight[] = {
/* columns rows colors chars-per-pixel */
-"22 25 8 1 ",
+"22 25 4 1 ",
" c #2D2D2D2D2D2D",
". c #43CC30EC2E84",
-"X c #7C5A3A4B31DC",
"o c #484848484848",
-"O c #82573B493237",
-"+ c #C23645DE35FF",
-"@ c #C3E046253618",
-"# c #D6D649493737",
+"# c #D6D649493737 s active_color_1",
/* pixels */
"oooooooooooooooooooooo",
" ",
@@ -20,11 +16,11 @@ static char *shade_prelight[] = {
" ",
" ",
" ",
-" XX ",
-" O##O ",
-" O####O ",
-" X#+##+#X ",
-" #+.##.+# ",
+" ## ",
+" #### ",
+" ###### ",
+" ######## ",
+" ## ## ## ",
" ## ",
" ## ",
" ## ",
diff --git a/xfwm4/shade-pressed.png b/xfwm4/shade-pressed.png
new file mode 100644
index 0000000..1b3441b
Binary files /dev/null and b/xfwm4/shade-pressed.png differ
diff --git a/xfwm4/shade-pressed.xpm b/xfwm4/shade-pressed.xpm
index 26e0984..810b012 100644
--- a/xfwm4/shade-pressed.xpm
+++ b/xfwm4/shade-pressed.xpm
@@ -1,16 +1,13 @@
/* XPM */
-static char *shade_pressed[] = {
+static char *shade_prelight[] = {
/* columns rows colors chars-per-pixel */
-"22 25 7 1 ",
+"22 25 4 1 ",
" c #2D2D2D2D2D2D",
-". c #3F3F301F2E3F",
-"X c #6C6C377C30EC",
-"o c #713538433135",
-"O c #484848484848",
-"+ c #A43A4094343B",
-"@ c #B4B443433535",
+". c #43CC30EC2E84",
+"o c #484848484848",
+"# c #D6D649493737 s active_color_1",
/* pixels */
-"OOOOOOOOOOOOOOOOOOOOOO",
+"oooooooooooooooooooooo",
" ",
" ",
" ",
@@ -19,14 +16,14 @@ static char *shade_pressed[] = {
" ",
" ",
" ",
-" XX ",
-" o@@o ",
-" o@@@@o ",
-" X@+@@+@X ",
-" @+.@@.+@ ",
-" @@ ",
-" @@ ",
-" @@ ",
+" ## ",
+" #### ",
+" ###### ",
+" ######## ",
+" ## ## ## ",
+" ## ",
+" ## ",
+" ## ",
" ",
" ",
" ",
diff --git a/xfwm4/shade-toggled-prelight.png b/xfwm4/shade-toggled-prelight.png
new file mode 100644
index 0000000..c1579cf
Binary files /dev/null and b/xfwm4/shade-toggled-prelight.png differ
diff --git a/xfwm4/shade-toggled-prelight.xpm b/xfwm4/shade-toggled-prelight.xpm
index 2b2e4d6..0bb81f2 100644
--- a/xfwm4/shade-toggled-prelight.xpm
+++ b/xfwm4/shade-toggled-prelight.xpm
@@ -1,15 +1,11 @@
/* XPM */
static char *shade_toggled_prelight[] = {
/* columns rows colors chars-per-pixel */
-"22 25 8 1 ",
+"22 25 4 1 ",
" c #2D2D2D2D2D2D",
". c #4123307C2E5B",
"X c #484848484848",
-"o c #82573B493237",
-"O c #87A93C2B3288",
-"+ c #BF8D456D35D6",
-"@ c #C18C45C235F4",
-"# c #D6D649493737",
+"# c #D6D649493737 s active_color_1",
/* pixels */
"XXXXXXXXXXXXXXXXXXXXXX",
" ",
@@ -23,11 +19,11 @@ static char *shade_toggled_prelight[] = {
" ## ",
" ## ",
" ## ",
-" #+.##.+# ",
-" O#@##@#O ",
-" o####o ",
-" o##o ",
-" oo ",
+" ## ## ## ",
+" ######## ",
+" ###### ",
+" #### ",
+" ## ",
" ",
" ",
" ",
diff --git a/xfwm4/shade-toggled-pressed.png b/xfwm4/shade-toggled-pressed.png
new file mode 100644
index 0000000..bf9eb7e
Binary files /dev/null and b/xfwm4/shade-toggled-pressed.png differ
diff --git a/xfwm4/stick-prelight.png b/xfwm4/stick-prelight.png
new file mode 100644
index 0000000..388bab9
Binary files /dev/null and b/xfwm4/stick-prelight.png differ
diff --git a/xfwm4/stick-prelight.xpm b/xfwm4/stick-prelight.xpm
index 294d3b0..e86a591 100644
--- a/xfwm4/stick-prelight.xpm
+++ b/xfwm4/stick-prelight.xpm
@@ -1,20 +1,10 @@
/* XPM */
static char *stick_prelight[] = {
/* columns rows colors chars-per-pixel */
-"22 25 13 1 ",
+"22 25 3 1 ",
" c #2D2D2D2D2D2D",
-". c #3F2430272E3D",
-"X c #4123307C2E5B",
-"o c #43CC30EC2E84",
+"X c #4123307C2E5B s active_color_1",
"O c #484848484848",
-"+ c #9B9F3F7933B6",
-"@ c #9C9F3FA433C5",
-"# c #9D9E3FCE33D4",
-"$ c #A4F041053443",
-"% c #C23645DE35FF",
-"& c #C4DF464F3627",
-"* c #CB864769368C",
-"= c #D6D649493737",
/* pixels */
"OOOOOOOOOOOOOOOOOOOOOO",
" ",
@@ -25,14 +15,14 @@ static char *stick_prelight[] = {
" ",
" ",
" ",
-" X#%%#X ",
-" X*====*X ",
-" #=$Xo$=+ ",
-" &=X X=& ",
-" &=. X=& ",
-" +=$..$=@ ",
-" .*====*X ",
-" X#**#X ",
+" XXXXXX ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" XXX XXX ",
+" XXX XXX ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" XXXXXX ",
" ",
" ",
" ",
diff --git a/xfwm4/stick-pressed.png b/xfwm4/stick-pressed.png
new file mode 100644
index 0000000..005f4a8
Binary files /dev/null and b/xfwm4/stick-pressed.png differ
diff --git a/xfwm4/stick-pressed.xpm b/xfwm4/stick-pressed.xpm
index ad1a907..e86a591 100644
--- a/xfwm4/stick-pressed.xpm
+++ b/xfwm4/stick-pressed.xpm
@@ -1,21 +1,12 @@
/* XPM */
-static char *stick_pressed[] = {
+static char *stick_prelight[] = {
/* columns rows colors chars-per-pixel */
-"22 25 12 1 ",
+"22 25 3 1 ",
" c #2D2D2D2D2D2D",
-". c #3B872F842E07",
-"X c #3C0F2F9A2E0F",
-"o c #3D412FCC2E21",
-"O c #3F3F301F2E3F",
-"+ c #484848484848",
-"@ c #85943B95326A",
-"# c #86FF3BD03280",
-"$ c #8CD83CC432D8",
-"% c #A43A4094343B",
-"& c #ABAB41CA34AC",
-"* c #B4B443433535",
+"X c #4123307C2E5B s active_color_1",
+"O c #484848484848",
/* pixels */
-"++++++++++++++++++++++",
+"OOOOOOOOOOOOOOOOOOOOOO",
" ",
" ",
" ",
@@ -24,14 +15,14 @@ static char *stick_pressed[] = {
" ",
" ",
" ",
-" o#%%#o ",
-" o&****&o ",
-" @*$oo$*# ",
-" &*. o*% ",
-" %*. o*& ",
-" @*$..$*@ ",
-" .&****&X ",
-" X#&&#X ",
+" XXXXXX ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" XXX XXX ",
+" XXX XXX ",
+" XXXXXXXX ",
+" XXXXXXXX ",
+" XXXXXX ",
" ",
" ",
" ",
diff --git a/xfwm4/stick-toggled-prelight.png b/xfwm4/stick-toggled-prelight.png
new file mode 100644
index 0000000..39e9bda
Binary files /dev/null and b/xfwm4/stick-toggled-prelight.png differ
diff --git a/xfwm4/stick-toggled-prelight.xpm b/xfwm4/stick-toggled-prelight.xpm
index 60d8f59..0dd32ef 100644
--- a/xfwm4/stick-toggled-prelight.xpm
+++ b/xfwm4/stick-toggled-prelight.xpm
@@ -1,19 +1,10 @@
/* XPM */
static char *stick_toggled_prelight[] = {
/* columns rows colors chars-per-pixel */
-"22 25 12 1 ",
+"22 25 3 1 ",
" c #2D2D2D2D2D2D",
-". c #312B2DD62D69",
-"X c #566D34032F9E",
-"o c #591634732FC6",
+"X c #566D34032F9E s active_color_1",
"O c #484848484848",
-"+ c #85AA3BD63269",
-"@ c #87A93C2B3288",
-"# c #88543C473292",
-"$ c #C23645DE35FF",
-"% c #C5DF467A3636",
-"& c #C8DD46F83663",
-"* c #D6D649493737",
/* pixels */
"OOOOOOOOOOOOOOOOOOOOOO",
" ",
@@ -25,12 +16,12 @@ static char *stick_toggled_prelight[] = {
" ",
" ",
" ",
-" .@$$@ ",
-" @****@ ",
-" %*Xo*% ",
-" %*XX*% ",
-" #****@ ",
-" .#%%@. ",
+" XXXX ",
+" XXXXXX ",
+" XXXXXX ",
+" XXXXXX ",
+" XXXXXX ",
+" XXXX ",
" ",
" ",
" ",
diff --git a/xfwm4/stick-toggled-pressed.png b/xfwm4/stick-toggled-pressed.png
new file mode 100644
index 0000000..3d51abe
Binary files /dev/null and b/xfwm4/stick-toggled-pressed.png differ
diff --git a/xfwm4/stick-toggled-pressed.xpm b/xfwm4/stick-toggled-pressed.xpm
index 50a94b5..0dd32ef 100644
--- a/xfwm4/stick-toggled-pressed.xpm
+++ b/xfwm4/stick-toggled-pressed.xpm
@@ -1,20 +1,12 @@
/* XPM */
-static char *stick_toggled_pressed[] = {
+static char *stick_toggled_prelight[] = {
/* columns rows colors chars-per-pixel */
-"22 25 11 1 ",
+"22 25 3 1 ",
" c #2D2D2D2D2D2D",
-". c #305D2DB22D5D",
-"X c #4E6532972F25",
-"o c #504132E42F41",
-"O c #73DD38B2315D",
-"+ c #757538F43176",
-"@ c #484848484848",
-"# c #A43A4094343B",
-"$ c #A76B4119346B",
-"% c #A87B4145347C",
-"& c #B4B443433535",
+"X c #566D34032F9E s active_color_1",
+"O c #484848484848",
/* pixels */
-"@@@@@@@@@@@@@@@@@@@@@@",
+"OOOOOOOOOOOOOOOOOOOOOO",
" ",
" ",
" ",
@@ -24,12 +16,12 @@ static char *stick_toggled_pressed[] = {
" ",
" ",
" ",
-" .+##+ ",
-" +&&&&O ",
-" #&Xo&% ",
-" %&XX&# ",
-" +&&&&+ ",
-" .+%%+. ",
+" XXXX ",
+" XXXXXX ",
+" XXXXXX ",
+" XXXXXX ",
+" XXXXXX ",
+" XXXX ",
" ",
" ",
" ",