diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index b216f5d444fd612775ec963da6aaee7fa7457563..38b7f8a4cda81425d756410084664aeb7c476a12 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * close_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++#+++++++#$++++",
-"++++###+++++###++++",
-"++++@###+++###@++++",
-"++++$@###+###@$++++",
-"+++++$@#####@$+++++",
-"++++++$@###@$++++++",
-"+++++++#####+++++++",
-"++++++###@###++++++",
-"+++++###@$@###+++++",
-"++++###@$+$@###++++",
-"++++@#@$+++$@#@++++",
-"++++$@$+++++$@$++++",
-"+++++$+++++++$+++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #000000",
+"@ c #A4A1A4",
+"# c #D5D2D5",
+".............",
+".............",
+"..++.....++..",
+"..+++...+++..",
+"..@+++.+++@..",
+"..#@+++++@#..",
+"...#@+++@#...",
+"....+++++....",
+"...+++@+++...",
+"..+++@#@+++..",
+"..++@#.#@++..",
+"..@@#...#@@..",
+"..##.....##.."};
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 76c3b8ca755f08318d72095e96024957f0d02a9b..72a4c9f22df215876f1e51866352766543405c01 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * close_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++@+++++++@+++++",
-"++++@@@+++++@@@++++",
-"++++$@@@+++@@@$++++",
-"+++++$@@@+@@@$+++++",
-"++++++$@@@@@$++++++",
-"+++++++$@@@$+++++++",
-"+++++++@@@@@+++++++",
-"++++++@@@$@@@++++++",
-"+++++@@@$+$@@@+++++",
-"++++@@@$+++$@@@++++",
-"++++$@$+++++$@$++++",
-"+++++$+++++++$+++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #A4A1A4",
+"@ c #D5D2D5",
+".............",
+".............",
+"..++.....++..",
+"..+++...+++..",
+"..@+++.+++@..",
+"..@@+++++@@..",
+"...@@+++@@...",
+"....+++++....",
+"...+++@+++...",
+"..+++@@@+++..",
+"..++@@.@@++..",
+"..@@@...@@@..",
+"..@@.....@@.."};
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index 86db5a0efef6ed0c4f2c52b28f8f04b6b556c49c..e1820f8d312e3f85899b77775d23dcd32791287e 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,32 +1,22 @@
/* XPM */
static char * close_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #B4BAB4 s active_mid_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................+",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@.#@@@@@@@#.@@@=",
-".@@@###@@@@@###@@@=",
-".@@@.###@@@###.@@@=",
-".@@@@.###@###.@@@@=",
-".@@@@@.#####.@@@@@=",
-".@@@@@@.###.@@@@@@=",
-".@@@@@@#####@@@@@@=",
-".@@@@@###.###@@@@@=",
-".@@@@###.@.###@@@@=",
-".@@@###.@@@.###@@@=",
-".@@@.#.@@@@@.#.@@@=",
-".@@@@.@@@@@@@.@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-"+==================",
-" ",
-" "};
-
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #E6E6E6",
+"@ c #D5D2D5",
+"# c #FFFFFF",
+"$ c #000000",
+"............+",
+".@@@@@@@@@@@#",
+".@$$@@@@@$$@#",
+".@$$$@@@$$$@#",
+".@.$$$@$$$.@#",
+".@@.$$$$$.@@#",
+".@@@.$$$.@@@#",
+".@@@$$$$$@@@#",
+".@@$$$.$$$@@#",
+".@$$$.@.$$$@#",
+".@$$.@@@.$$@#",
+".@..@@@@@..@#",
+"+############"};
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 34ffbb19dd84f87efc89193848480af3f2840a7d..f3648a88e62886392f5848b657aa0b96141bcdd8 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * hide_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++#####+++++++",
-"+++++++#####+++++++",
-"+++++++##+##+++++++",
-"+++++++#####+++++++",
-"+++++++#####+++++++",
-"+++++++@@@@@+++++++",
-"+++++++$$$$$+++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #000000",
+"@ c #A4A1A4",
+"# c #D5D2D5",
+".............",
+".............",
+".............",
+".............",
+"....+++++....",
+"....+++++....",
+"....++.++....",
+"....+++++....",
+"....+++++....",
+"....@@@@@....",
+"....#####....",
+".............",
+"............."};
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index 0607343123c8dfa324f4df24723a18a92133cd81..48dc7d8819eb0a366f3f535adf5bd6156c50acf2 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * hide_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++@@@@@+++++++",
-"+++++++@@@@@+++++++",
-"+++++++@@+@@+++++++",
-"+++++++@@@@@+++++++",
-"+++++++@@@@@+++++++",
-"+++++++$$$$$+++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #A4A1A4",
+"@ c #D5D2D5",
+".............",
+".............",
+".............",
+".............",
+"....+++++....",
+"....+++++....",
+"....++.++....",
+"....+++++....",
+"....+++++....",
+"....@@@@@....",
+"....@@@@@....",
+".............",
+"............."};
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index 106e4d044d4c58f0f7418e5ed85b447c8960dc61..cb802b5736695aea5a5f3ac5d5aa5d5195541c6f 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,32 +1,22 @@
/* XPM */
static char * hide_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #B4BAB4 s active_mid_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................+",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@#####@@@@@@=",
-".@@@@@@#####@@@@@@=",
-".@@@@@@##@##@@@@@@=",
-".@@@@@@#####@@@@@@=",
-".@@@@@@#####@@@@@@=",
-".@@@@@@.....@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-"+==================",
-" ",
-" "};
-
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #E6E6E6",
+"@ c #D5D2D5",
+"# c #FFFFFF",
+"$ c #000000",
+"............+",
+".@@@@@@@@@@@#",
+".@@@@@@@@@@@#",
+".@@@@@@@@@@@#",
+".@@@$$$$$@@@#",
+".@@@$$$$$@@@#",
+".@@@$$@$$@@@#",
+".@@@$$$$$@@@#",
+".@@@$$$$$@@@#",
+".@@@.....@@@#",
+".@@@@@@@@@@@#",
+".@@@@@@@@@@@#",
+"+############"};
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index 72cc47b2014d1e2b676d45a6f62fe4dc88d88224..89ed5e0c6541995dc52e34f0fba2ee5b3a4581a8 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * maximize_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"++++###########++++",
-"++++###########++++",
-"++++##@@@@@@@##++++",
-"++++##$$$$$$$##++++",
-"++++##+++++++##++++",
-"++++##+++++++##++++",
-"++++##+++++++##++++",
-"++++##+++++++##++++",
-"++++##+++++++##++++",
-"++++###########++++",
-"++++###########++++",
-"++++@@@@@@@@@@@++++",
-"++++$$$$$$$$$$$++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #000000",
+"@ c #A4A1A4",
+"# c #D5D2D5",
+".............",
+".............",
+"..+++++++++..",
+"..+++++++++..",
+"..++@@@@@++..",
+"..++#####++..",
+"..++.....++..",
+"..++.....++..",
+"..++.....++..",
+"..+++++++++..",
+"..+++++++++..",
+"..@@@@@@@@@..",
+"..#########.."};
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index a412fcd2a9c44b27a3e5c500d7752595797e74d6..66c5847e00201cf8ee6671c68ed7d22573dc1e6e 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * maximize_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"++++@@@@@@@@@@@++++",
-"++++@@@@@@@@@@@++++",
-"++++@@$$$$$$$@@++++",
-"++++@@+++++++@@++++",
-"++++@@+++++++@@++++",
-"++++@@+++++++@@++++",
-"++++@@+++++++@@++++",
-"++++@@+++++++@@++++",
-"++++@@+++++++@@++++",
-"++++@@@@@@@@@@@++++",
-"++++@@@@@@@@@@@++++",
-"++++$$$$$$$$$$$++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #A4A1A4",
+"@ c #D5D2D5",
+".............",
+".............",
+"..+++++++++..",
+"..+++++++++..",
+"..++@@@@@++..",
+"..++@@@@@++..",
+"..++.....++..",
+"..++.....++..",
+"..++.....++..",
+"..+++++++++..",
+"..+++++++++..",
+"..@@@@@@@@@..",
+"..@@@@@@@@@.."};
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index cba74a5e099825ce1df59a8ad60564c1c09f7f72..f8bc8dd0c3f6b4c8e42f904052fe678d09286da3 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,32 +1,22 @@
/* XPM */
static char * maximize_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #B4BAB4 s active_mid_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................+",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@###########@@@=",
-".@@@###########@@@=",
-".@@@##.......##@@@=",
-".@@@##@@@@@@@##@@@=",
-".@@@##@@@@@@@##@@@=",
-".@@@##@@@@@@@##@@@=",
-".@@@##@@@@@@@##@@@=",
-".@@@##@@@@@@@##@@@=",
-".@@@##@@@@@@@##@@@=",
-".@@@###########@@@=",
-".@@@###########@@@=",
-".@@@...........@@@=",
-".@@@@@@@@@@@@@@@@@=",
-"+==================",
-" ",
-" "};
-
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #E6E6E6",
+"@ c #D5D2D5",
+"# c #FFFFFF",
+"$ c #000000",
+"............+",
+".@@@@@@@@@@@#",
+".@$$$$$$$$$@#",
+".@$$$$$$$$$@#",
+".@$$.....$$@#",
+".@$$@@@@@$$@#",
+".@$$@@@@@$$@#",
+".@$$@@@@@$$@#",
+".@$$@@@@@$$@#",
+".@$$$$$$$$$@#",
+".@$$$$$$$$$@#",
+".@.........@#",
+"+############"};
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index e9bfb7b651064aedfca5d8a6f178c49cbe54a7f5..918174c0a786fea10ac8eee9c8980905d95ca71c 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * maximize_toggled_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"++++########+++++++",
-"++++########+++++++",
-"++++##@@@@##+++++++",
-"++++##$$$$##@##++++",
-"++++##++++##@##++++",
-"++++##++++##+##++++",
-"++++########+##++++",
-"++++########+##++++",
-"++++@@@@@++++##++++",
-"++++$$$########++++",
-"+++++++########++++",
-"+++++++@@@@@@@@++++",
-"+++++++$$$$$$$$++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #000000",
+"@ c #A4A1A4",
+"# c #D5D2D5",
+".............",
+".............",
+"..++++++.....",
+"..++++++.....",
+"..++@@++.....",
+"..++##++@++..",
+"..++++++@++..",
+"..++++++#++..",
+"..@@@@@##++..",
+"..###++++++..",
+".....++++++..",
+".....@@@@@@..",
+".....######.."};
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index 82b89605b3eaa6b1fb7cf4587d7d3de3ab81daf0..ed5fa8f8ebe0e9d97f2e0a4a98e92cf464337c3b 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * maximize_toggled_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"++++@@@@@@@@+++++++",
-"++++@@@@@@@@+++++++",
-"++++@@$$$$@@+++++++",
-"++++@@++++@@$@@++++",
-"++++@@++++@@$@@++++",
-"++++@@++++@@+@@++++",
-"++++@@@@@@@@+@@++++",
-"++++@@@@@@@@+@@++++",
-"++++$$$$$++++@@++++",
-"+++++++@@@@@@@@++++",
-"+++++++@@@@@@@@++++",
-"+++++++$$$$$$$$++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #A4A1A4",
+"@ c #D5D2D5",
+".............",
+".............",
+"..++++++.....",
+"..++++++.....",
+"..++@@++.....",
+"..++@@++@++..",
+"..++++++@++..",
+"..++++++@++..",
+"..@@@@@@@++..",
+"..@@@++++++..",
+".....++++++..",
+".....@@@@@@..",
+".....@@@@@@.."};
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index 74e0ccdd21c4d954936d687a7f018d5152073265..5d4caa111fb853a8bef831ee1e9113f1fd27d170 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -1,32 +1,22 @@
/* XPM */
static char * maximize_toggled_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #B4BAB4 s active_mid_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................+",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@########@@@@@@=",
-".@@@########@@@@@@=",
-".@@@##....##@@@@@@=",
-".@@@##@@@@##.##@@@=",
-".@@@##@@@@##.##@@@=",
-".@@@##@@@@##@##@@@=",
-".@@@########@##@@@=",
-".@@@########@##@@@=",
-".@@@.....@@@@##@@@=",
-".@@@@@@########@@@=",
-".@@@@@@########@@@=",
-".@@@@@@........@@@=",
-".@@@@@@@@@@@@@@@@@=",
-"+==================",
-" ",
-" "};
-
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #E6E6E6",
+"@ c #D5D2D5",
+"# c #FFFFFF",
+"$ c #000000",
+"............+",
+".@@@@@@@@@@@#",
+".@$$$$$$@@@@#",
+".@$$$$$$@@@@#",
+".@$$..$$@@@@#",
+".@$$@@$$.$$@#",
+".@$$$$$$.$$@#",
+".@$$$$$$@$$@#",
+".@.....@@$$@#",
+".@@@@$$$$$$@#",
+".@@@@$$$$$$@#",
+".@@@@......@#",
+"+############"};
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index e928be9d2b9a10ad77d5564f07200cdfe82553db..9f994a57d06499f7fde4464eb3deeb8a0af5c2a6 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * menu_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"++++###########++++",
-"++++###########++++",
-"++++@@@@@@@@@@@++++",
-"++++$#########$++++",
-"+++++##@@@@@##+++++",
-"+++++@##$$$##@+++++",
-"+++++$@##+##@$+++++",
-"++++++$@###@$++++++",
-"+++++++$@#@$+++++++",
-"++++++++$@$++++++++",
-"+++++++++$+++++++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #A4A1A4",
+"@ c #000000",
+"# c #D5D2D5",
+".............",
+".............",
+".............",
+"..+@.....@+..",
+"..@@+...+@@..",
+"..@@@+.+@@@..",
+"..+@@@+@@@+..",
+"..#+@@@@@+#..",
+"...#+@@@+#...",
+"....#+@+#....",
+".....#+#.....",
+"......#......",
+"............."};
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index e30c06f9032e53a3451eab5592e98b3411320066..c7e5eed7da5163165e3b51493eda1ebee3772f3a 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * menu_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"++++@@@@@@@@@@@++++",
-"++++@@@@@@@@@@@++++",
-"++++$$$$$$$$$$$++++",
-"+++++@@@@@@@@@+++++",
-"+++++@@$$$$$@@+++++",
-"+++++$@@+++@@$+++++",
-"++++++$@@+@@$++++++",
-"+++++++$@@@$+++++++",
-"++++++++$@$++++++++",
-"+++++++++$+++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #D5D2D5",
+"@ c #A4A1A4",
+".............",
+".............",
+".............",
+"..+@.....@+..",
+"..@@+...+@@..",
+"..@@@+.+@@@..",
+"..+@@@+@@@+..",
+"..++@@@@@++..",
+"...++@@@++...",
+"....++@++....",
+".....+++.....",
+"......+......",
+"............."};
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index 749f305139adbd2946791e9046834075325b27d8..e2315446c15747badcea216a4abcc7aae52f540c 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -1,31 +1,22 @@
/* XPM */
static char * menu_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #B4BAB4 s active_mid_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................+",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@###########@@@=",
-".@@@###########@@@=",
-".@@@...........@@@=",
-".@@@@#########@@@@=",
-".@@@@##.....##@@@@=",
-".@@@@.##.@.##.@@@@=",
-".@@@@@.##.##.@@@@@=",
-".@@@@@@.###.@@@@@@=",
-".@@@@@@@.#.@@@@@@@=",
-".@@@@@@@@.@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-"+==================",
-" ",
-" "};
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #E6E6E6",
+"@ c #D5D2D5",
+"# c #FFFFFF",
+"$ c #000000",
+"............+",
+".@@@@@@@@@@@#",
+".@@@@@@@@@@@#",
+".@.$@@@@@$.@#",
+".@$$.@@@.$$@#",
+".@$$$.@.$$$@#",
+".@.$$$.$$$.@#",
+".@@.$$$$$.@@#",
+".@@@.$$$.@@@#",
+".@@@@.$.@@@@#",
+".@@@@@.@@@@@#",
+".@@@@@@@@@@@#",
+"+############"};
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index 6a288087c402d8b3211a43135b6ddb338e005e3a..fa5619adf7977695641a4a083ac0b272a55c37ad 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * shade_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #B4BAB4 s active_mid_2",
-"$ c #000000",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++$+++++++++",
-"++++++++$$$++++++++",
-"+++++++$$@$$+++++++",
-"++++++$$@#@$$++++++",
-"+++++$$@#+#@$$+++++",
-"+++++$$$$$$$$$+++++",
-"+++++@@@@@@@@@+++++",
-"++++$$$$$$$$$$$++++",
-"++++$$$$$$$$$$$++++",
-"++++@@@@@@@@@@@++++",
-"++++###########++++",
-"+++++++++++++++++++",
-"###################",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #000000",
+"@ c #A4A1A4",
+"# c #D5D2D5",
+".............",
+".............",
+"......+......",
+".....+++.....",
+"....++@++....",
+"...++@#@++...",
+"..++@#.#@++..",
+"..+++++++++..",
+"..@@@@@@@@@..",
+"..+++++++++..",
+"..+++++++++..",
+"..@@@@@@@@@..",
+"..#########.."};
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index eac7ada7109e054f8362be8a5a442e12793092ef..a66904389637cc5b83af6b966db6ff8c6242d656 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * shade_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #B4BAB4 s inactive_mid_2",
-"$ c #000000",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++@+++++++++",
-"++++++++@@@++++++++",
-"+++++++@@#@@+++++++",
-"++++++@@#+#@@++++++",
-"+++++@@+++++@@+++++",
-"+++++@@@@@@@@@+++++",
-"+++++#########+++++",
-"++++@@@@@@@@@@@++++",
-"++++@@@@@@@@@@@++++",
-"++++###########++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"###################",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #A4A1A4",
+"@ c #D5D2D5",
+".............",
+".............",
+"......+......",
+".....+++.....",
+"....++@++....",
+"...++@@@++...",
+"..++@@.@@++..",
+"..+++++++++..",
+"..@@@@@@@@@..",
+"..+++++++++..",
+"..+++++++++..",
+"..@@@@@@@@@..",
+"..@@@@@@@@@.."};
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index 2d25f05f1072ed454541419ecd068297287a824b..00bf4edf83f177869977c3a16775353b62946154 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,32 +1,22 @@
/* XPM */
static char * shade_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #B4BAB4 s active_mid_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................+",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@#@@@@@@@@=",
-".@@@@@@@###@@@@@@@=",
-".@@@@@@##.##@@@@@@=",
-".@@@@@##.@.##@@@@@=",
-".@@@@##.@@@.##@@@@=",
-".@@@@#########@@@@=",
-".@@@@.........@@@@=",
-".@@@###########@@@=",
-".@@@###########@@@=",
-".@@@...........@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-"+==================",
-" ",
-" "};
-
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #E6E6E6",
+"@ c #D5D2D5",
+"# c #FFFFFF",
+"$ c #000000",
+"............+",
+".@@@@@@@@@@@#",
+".@@@@@$@@@@@#",
+".@@@@$$$@@@@#",
+".@@@$$.$$@@@#",
+".@@$$.@.$$@@#",
+".@$$.@@@.$$@#",
+".@$$$$$$$$$@#",
+".@.........@#",
+".@$$$$$$$$$@#",
+".@$$$$$$$$$@#",
+".@.........@#",
+"+############"};
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index 36f1e7915411f1b2c35c4bdfc7a14910d4a30b28..dbd9f16230885360fbad442c32238465fd6a59c8 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * shade_toggled_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #B4BAB4 s active_mid_2",
-"$ c #000000",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++$$$$$$$$$+++++",
-"+++++$$@@@@@$$+++++",
-"+++++@$$###$$@+++++",
-"+++++#@$$+$$@#+++++",
-"++++++#@$$$@#++++++",
-"+++++++#@$@#+++++++",
-"++++++++#@#++++++++",
-"++++$$$$$$$$$$$++++",
-"++++$$$$$$$$$$$++++",
-"++++@@@@@@@@@@@++++",
-"++++###########++++",
-"+++++++++++++++++++",
-"###################",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #000000",
+"@ c #A4A1A4",
+"# c #D5D2D5",
+".............",
+".............",
+"..+++++++++..",
+"..+++++++++..",
+"..@@@@@@@@@..",
+"..+++++++++..",
+"..++@@@@@++..",
+"..@++###++@..",
+"..#@++.++@#..",
+"...#@+++@#...",
+"....#@+@#....",
+".....#@#.....",
+"......#......"};
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index a90c745225145e01a33fb64f80a1dbf5a65017bd..773a4f6820679a1c91754ca4df8d4d1c1366c92e 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * shade_toggled_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #B4BAB4 s inactive_mid_2",
-"$ c #000000",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++@@@@@@@@@+++++",
-"+++++@@#####@@+++++",
-"+++++#@@+++@@#+++++",
-"++++++#@@+@@#++++++",
-"+++++++#@@@#+++++++",
-"++++++++#@#++++++++",
-"+++++++++#+++++++++",
-"++++@@@@@@@@@@@++++",
-"++++@@@@@@@@@@@++++",
-"++++###########++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"###################",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #A4A1A4",
+"@ c #D5D2D5",
+".............",
+".............",
+"..+++++++++..",
+"..+++++++++..",
+"..@@@@@@@@@..",
+"..+++++++++..",
+"..++@@@@@++..",
+"..@++@@@++@..",
+"..@@++.++@@..",
+"...@@+++@@...",
+"....@@+@@....",
+".....@@@.....",
+"......@......"};
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index 86db12eccc37eea4f4d1c459bae9857e8a7dfb52..69d2c9b790f750cfa70984f28a609da7e358a2f2 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -1,32 +1,22 @@
/* XPM */
static char * shade_toggled_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #B4BAB4 s active_mid_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................+",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@#########@@@@=",
-".@@@@##.....##@@@@=",
-".@@@@.##@@@##.@@@@=",
-".@@@@@.##@##.@@@@@=",
-".@@@@@@.###.@@@@@@=",
-".@@@@@@@.#.@@@@@@@=",
-".@@@@@@@@.@@@@@@@@=",
-".@@@###########@@@=",
-".@@@###########@@@=",
-".@@@...........@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-"+==================",
-" ",
-" "};
-
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #E6E6E6",
+"@ c #D5D2D5",
+"# c #FFFFFF",
+"$ c #000000",
+"............+",
+".@@@@@@@@@@@#",
+".@$$$$$$$$$@#",
+".@$$$$$$$$$@#",
+".@.........@#",
+".@$$$$$$$$$@#",
+".@$$.....$$@#",
+".@.$$@@@$$.@#",
+".@@.$$@$$.@@#",
+".@@@.$$$.@@@#",
+".@@@@.$.@@@@#",
+".@@@@@.@@@@@#",
+"+############"};
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 67ee34a215bdeac1c7152013b2724b4b7d1d5d84..59d4ff3bb9383dc383eff5a5b9ed8e3c6d27681f 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * stick_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"++++++++++#+++#++++",
-"++++++++++#####++++",
-"++++@######++##++++",
-"++++#$$$$$#$$##++++",
-"++++@######@@##++++",
-"++++$@@@@@#####++++",
-"+++++$$$$$#@@@#++++",
-"++++++++++@$$$@++++",
-"++++++++++$+++$++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #000000",
+"@ c #A4A1A4",
+"# c #D5D2D5",
+".............",
+".............",
+".............",
+".......+...+.",
+".......+++++.",
+".@++++++..++.",
+".+#####+##++.",
+".@++++++@@++.",
+".#@@@@@+++++.",
+"..#####+@@@+.",
+".......@###@.",
+".......#...#.",
+"............."};
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index d971359f3250aa7702041d8e3cea404ed59b44ee..43b706d6db4e7507b33353872fae34753ebbad0b 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * stick_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"++++++++++@+++@++++",
-"++++++++++@@@@@++++",
-"++++$@@@@@@++@@++++",
-"++++@$$$$$@$$@@++++",
-"++++$@@@@@@$$@@++++",
-"+++++$$$$$@@@@@++++",
-"++++++++++@$$$@++++",
-"++++++++++$+++$++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #A4A1A4",
+"@ c #D5D2D5",
+".............",
+".............",
+".............",
+".......+...+.",
+".......+++++.",
+".@++++++..++.",
+".+@@@@@+@@++.",
+".@++++++@@++.",
+".@@@@@@+++++.",
+"..@@@@@+@@@+.",
+".......@@@@@.",
+".......@...@.",
+"............."};
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index 8100d7f1290c028145ff97d996901682a3f4a94e..47a58ec6d59273d846227328cb58162b0175551c 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,32 +1,22 @@
/* XPM */
static char * stick_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #B4BAB4 s active_mid_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................+",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@#@@@#@@@=",
-".@@@@@@@@@#####@@@=",
-".@@@.######@@##@@@=",
-".@@@#.....#..##@@@=",
-".@@@.######..##@@@=",
-".@@@@.....#####@@@=",
-".@@@@@@@@@#...#@@@=",
-".@@@@@@@@@.@@@.@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-"+==================",
-" ",
-" "};
-
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #FFFFFF",
+"@ c #000000",
+"# c #D5D2D5",
+"$ c #E6E6E6",
+".............",
+".+++++++++++.",
+".+++++++++++.",
+".++++++@+++@.",
+".++++++@@@@@.",
+".#@@@@@@$$@@.",
+".@#####@$$@@.",
+".#@@@@@@##@@.",
+".+#####@@@@@.",
+".++++++@###@.",
+".++++++#+++#.",
+".+++++++++++.",
+"............."};
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index 82881035452451c049124ac7999d286490f9e89a..5d66483209a99e757f306b1a786c944886f3f182 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * stick_toggled_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #B4BAB4 s active_mid_2",
-"$ c #000000",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++#$$$#+++++++",
-"++++++#$++@$#++++++",
-"++++++$+++#@$#+++++",
-"++++++$++$#@$@+++++",
-"++++++$@###@$@#++++",
-"++++++#$@@@$@@#++++",
-"+++++++#$$$@@##++++",
-"++++++++#@@@##+++++",
-"++++++++++###++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"###################",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #D5D2D5",
+"@ c #000000",
+"# c #A4A1A4",
+".............",
+".............",
+".............",
+"....+@@@+....",
+"...+@..#@+...",
+"...@...+#@+..",
+"...@..@+#@#..",
+"...@#+++#@#+.",
+"...+@###@##+.",
+"....+@@@##++.",
+".....+###++..",
+".......+++...",
+"............."};
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 9cdbdaedf07cba5e32071c12139dfcff1cbafb8c..9375fbf0831556acfab13a019be07860576ba806 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * stick_toggled_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #B4BAB4 s inactive_mid_2",
-"$ c #000000",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++#@@@#+++++++",
-"++++++#@++#@#++++++",
-"++++++@+++##@#+++++",
-"++++++@++@##@#+++++",
-"++++++@#####@##++++",
-"++++++#@###@###++++",
-"+++++++#@@@####++++",
-"++++++++######+++++",
-"++++++++++###++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"###################",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #D5D2D5",
+"@ c #A4A1A4",
+".............",
+".............",
+".............",
+"....+@@@+....",
+"...+@..+@+...",
+"...@...++@+..",
+"...@..@++@+..",
+"...@+++++@++.",
+"...+@+++@+++.",
+"....+@@@++++.",
+".....++++++..",
+".......+++...",
+"............."};
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index c976b147f59360826de9cd1a153683956325a084..a1f3cf3127562cd06f2a7629b5ed4edfe28e6d17 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -1,32 +1,22 @@
/* XPM */
static char * stick_toggled_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #B4BAB4 s active_mid_2",
-"@ c #D5D6D5 s active_color_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................@",
-".+++++++++++++++++=",
-".+++++++++++++++++=",
-".+++++++++++++++++=",
-".+++++++++++++++++=",
-".++++++.###.++++++=",
-".+++++.#@@.#.+++++=",
-".+++++#@@@+.#.++++=",
-".+++++#@@#+.#.++++=",
-".+++++#.+++.#..+++=",
-".+++++.#...#...+++=",
-".++++++.###....+++=",
-".+++++++......++++=",
-".+++++++++...+++++=",
-".+++++++++++++++++=",
-".+++++++++++++++++=",
-"@==================",
-" ",
-" "};
-
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #E6E6E6",
+"@ c #D5D2D5",
+"# c #FFFFFF",
+"$ c #000000",
+"............+",
+".@@@@@@@@@@@#",
+".@@@@@@@@@@@#",
+".@@@@$$$@@@@#",
+".@@@$++.$@@@#",
+".@@$+++@.$@@#",
+".@@$++$@.$.@#",
+".@@$.@@@.$.@#",
+".@@@$...$..@#",
+".@@@@$$$..@@#",
+".@@@@@...@@@#",
+".@@@@@@@@@@@#",
+"+############"};
diff --git a/themes/default/themerc b/themes/default/themerc
index 78cf2916141c10c3ed59adfd0cd3921fa74b4e2b..92dad386dd36ee0f045d770b62b3f3faf9f9f2ea 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -3,7 +3,7 @@ button_offset=1
button_spacing=0
full_width_title=true
title_horizontal_offset=0
-title_vertical_offset_active=1
-title_vertical_offset_inactive=1
+title_vertical_offset_active=0
+title_vertical_offset_inactive=0
title_shadow_active=false
title_shadow_inactive=false
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index 84102a4a2386d5aa92a5766a62fd4954d8051262..f1bed57f1de766cf84c03fb765d728b4ee00bb0c 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_1_active_xpm[] = {
-"8 22 6 1",
+"8 20 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
@@ -24,8 +24,6 @@ static char * title_1_active_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
"########",
"........",
"$$$$$$$$"};
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index 5606e8bfb87fcef2f100739cc7eadc65cb669080..e8a051ae26806e10c704fd24eac330bfad7ec331 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_1_inactive_xpm[] = {
-"8 22 6 1",
+"8 20 6 1",
" c None",
". c #949594 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
@@ -24,8 +24,6 @@ static char * title_1_inactive_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
"########",
"........",
"$$$$$$$$"};
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index 247e42f66c4768c593a610a27b3d98bea1355f7b..a1128b159dc193e9c56f752422c98bbca4f9041b 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_2_active_xpm[] = {
-"16 22 10 1",
+"16 20 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s active_hilight_2",
@@ -23,8 +23,6 @@ static char * title_2_active_xpm[] = {
"@@@@@#$$$$$$$$$$",
"@@@@@#$$$$$$$$$$",
"@@@@@#$$$$$$$$$$",
-"@@@@@#$$$$$$$$$$",
-"@@@@@#$$$$$$$$$$",
"@@@@@#%$$$$$$$$$",
"@@@@@#%$$$$$$$$$",
"@@@@@&#$$$$$$$$$",
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index 626895bf501030ece874d7c350cecf7254cdf912..550927c839829375e0ca6b11b095cebd07d2d31f 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_2_inactive_xpm[] = {
-"16 22 10 1",
+"16 20 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s inactive_hilight_2",
@@ -23,8 +23,6 @@ static char * title_2_inactive_xpm[] = {
"@@@@@#$$$$$$$$$$",
"@@@@@#$$$$$$$$$$",
"@@@@@#$$$$$$$$$$",
-"@@@@@#$$$$$$$$$$",
-"@@@@@#$$$$$$$$$$",
"@@@@@#%$$$$$$$$$",
"@@@@@#%$$$$$$$$$",
"@@@@@&#$$$$$$$$$",
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index f66b4c837739a78b4c077eca7e265a375a519d8f..74ec28ccb90df494d1c0cc2761131ae147249454 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_3_active_xpm[] = {
-"20 22 10 1",
+"20 20 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s active_hilight_2",
@@ -28,8 +28,6 @@ static char * title_3_active_xpm[] = {
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
"$$$$$$$$$$$$$$$$$$$$",
"####################",
"...................."};
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index 906a5c413c44b2892d3c8925970d4f1448f6eb08..0e80c83a5d9aa903f6b69733d6b918367c05679e 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_3_inactive_xpm[] = {
-"20 22 10 1",
+"20 20 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s inactive_hilight_2",
@@ -28,8 +28,6 @@ static char * title_3_inactive_xpm[] = {
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
"$$$$$$$$$$$$$$$$$$$$",
"####################",
"...................."};
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index 15d9e394f40a8b17eb63685b10c7119e280dbdab..9ee794357180683f5c8a3e4bcfdc303052140971 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_4_active_xpm[] = {
-"16 22 10 1",
+"16 20 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s active_hilight_2",
@@ -23,8 +23,6 @@ static char * title_4_active_xpm[] = {
"&&&&&&&&&&$@@@@@",
"&&&&&&&&&&$@@@@@",
"&&&&&&&&&&$@@@@@",
-"&&&&&&&&&&$@@@@@",
-"&&&&&&&&&&$@@@@@",
"&&&&&&&&&%$@@@@@",
"&&&&&&&&&%$@@@@@",
"&&&&&&&&&$*@@@@@",
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index 92445563a8c4a534435cd107cd8ca4b5076c7a68..84114787bc6106584a82bca35843b07754473b1e 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_4_inactive_xpm[] = {
-"16 22 10 1",
+"16 20 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s inactive_hilight_2",
@@ -23,8 +23,6 @@ static char * title_4_inactive_xpm[] = {
"&&&&&&&&&&$@@@@@",
"&&&&&&&&&&$@@@@@",
"&&&&&&&&&&$@@@@@",
-"&&&&&&&&&&$@@@@@",
-"&&&&&&&&&&$@@@@@",
"&&&&&&&&&%$@@@@@",
"&&&&&&&&&%$@@@@@",
"&&&&&&&&&$*@@@@@",
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index bb000a401972edf3898773acdf4adf20714b3425..15fd9d8bcb326bd6b9f0c02bac302b7471a0e67c 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_5_active_xpm[] = {
-"8 22 6 1",
+"8 20 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
@@ -24,8 +24,6 @@ static char * title_5_active_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
"########",
"........",
"$$$$$$$$"};
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index 974eacf7ce0334d3fbbc19d42c8b571e9ada82ca..813d712619656dc66df698e91d9ef8cc8ae0f9a0 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_5_inactive_xpm[] = {
-"8 22 6 1",
+"8 20 6 1",
" c None",
". c #949594 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
@@ -24,8 +24,6 @@ static char * title_5_inactive_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
"########",
"........",
"$$$$$$$$"};
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index 22620337ccf1bbaff6166599d24f60efb0dd3916..7ed0d7f995156162be5236d9f6475dce999cbac3 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_left_active_xpm[] = {
-"7 22 6 1",
+"7 20 6 1",
" c None",
". c #949595 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
@@ -21,9 +21,7 @@ static char * top_left_active_xpm[] = {
"$.@####",
"$.@####",
"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
+"$.@#@##",
"$.@#@##",
"$.@#@@#",
"$.@#.@@",
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index 85b105c5425ab8e41d10171fc71d49668595d85c..33d042af3a4aa5a73291906c490e380275b38d3e 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_left_inactive_xpm[] = {
-"7 22 6 1",
+"7 20 6 1",
" c None",
". c #949595 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
@@ -21,9 +21,7 @@ static char * top_left_inactive_xpm[] = {
"$.@####",
"$.@####",
"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
+"$.@#@##",
"$.@#@##",
"$.@#@@#",
"$.@#.@@",
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index 2fa8ff98a30fee598713dcc83eff330e05234c3c..4828d1fd1d927346dbed3eb779ebfad2b3254fbb 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_right_active_xpm[] = {
-"7 22 6 1",
+"7 20 6 1",
" c None",
". c #949595 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
@@ -21,9 +21,7 @@ static char * top_right_active_xpm[] = {
"####@.$",
"####@.$",
"####@.$",
-"####@.$",
-"####@.$",
-"####@.$",
+"##@#@.$",
"##@#@.$",
"#@@#@.$",
"@@.#@.$",
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index d57e7b7a9830f5596aa9301369e26409bb994d97..32e0697adb27644a129589b4f8dfb26e2d399da3 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_right_inactive_xpm[] = {
-"7 22 6 1",
+"7 20 6 1",
" c None",
". c #949595 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
@@ -21,9 +21,7 @@ static char * top_right_inactive_xpm[] = {
"####@.$",
"####@.$",
"####@.$",
-"####@.$",
-"####@.$",
-"####@.$",
+"##@#@.$",
"##@#@.$",
"#@@#@.$",
"@@.#@.$",