diff --git a/src/misc.c b/src/misc.c
index cc49fc15b85c88c02d8053fc88ce6ee8e69d4170..9bdff84edbde09a0077943f0171d0b51ef0459ed 100644
--- a/src/misc.c
+++ b/src/misc.c
@@ -150,21 +150,28 @@ MyXUngrabServer (void)
DBG ("grabs : %i", xgrabcount);
}
+/*
+ * it's safer to grab the display before calling this routine
+ * Returns true if the given window is present and mapped on root
+ */
gboolean
MyCheckWindow(Window w)
{
- Window dummy_root;
- unsigned int dummy_width, dummy_height, dummy_depth, dummy_bw;
+ Window dummy_root, parent;
+ Window *wins = NULL;
+ unsigned int count;
int dummy_x, dummy_y;
Status test;
g_return_val_if_fail (w != None, FALSE);
gdk_error_trap_push ();
- test = XGetGeometry (dpy, w, &dummy_root, &dummy_x, &dummy_y,
- &dummy_width, &dummy_height, &dummy_bw, &dummy_depth);
-
- return (!gdk_error_trap_pop () && (test != 0));
+ test = XQueryTree(dpy, w, &dummy_root, &parent, &wins, &count);
+ if (wins)
+ {
+ XFree (wins);
+ }
+ return (!gdk_error_trap_pop () && (test != 0) && (dummy_root == parent));
}
Window
diff --git a/themes/default-4.0/bottom-active.xpm b/themes/default-4.0/bottom-active.xpm
index 93561c94da351a71003cdd66e7093d7022827532..fdcc9b8dbe9b03963893437bd1a8b14aef736dc2 100644
--- a/themes/default-4.0/bottom-active.xpm
+++ b/themes/default-4.0/bottom-active.xpm
@@ -7,8 +7,8 @@ static char * bottom_active_xpm[] = {
"@ c #D5D6D5 s active_color_2",
"# c #B4BAB4 s active_mid_2",
"$ c #000000",
-"................................",
-"++++++++++++++++++++++++++++++++",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
"################################",
"................................",
diff --git a/themes/default-4.0/bottom-inactive.xpm b/themes/default-4.0/bottom-inactive.xpm
index 2e491a07e89c92e11e8cc002f2360b9fddae7c69..5541a0fdb93fc083b9d6726102254419c6c10261 100644
--- a/themes/default-4.0/bottom-inactive.xpm
+++ b/themes/default-4.0/bottom-inactive.xpm
@@ -7,8 +7,8 @@ static char * bottom_inactive_xpm[] = {
"@ c #D5D6D5 s inactive_color_2",
"# c #B4BAB4 s inactive_mid_2",
"$ c #000000",
-"................................",
-"++++++++++++++++++++++++++++++++",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
"################################",
"................................",
diff --git a/themes/default-4.0/bottom-left-active.xpm b/themes/default-4.0/bottom-left-active.xpm
index 4641a202dea61f130e49ea069a2ff0767c9ff616..6bc3b9895845503f05f7e41a7ff31eedf33daddb 100644
--- a/themes/default-4.0/bottom-left-active.xpm
+++ b/themes/default-4.0/bottom-left-active.xpm
@@ -7,18 +7,18 @@ static char * bottom_left_active_xpm[] = {
"# c #FFFFFF s active_hilight_1",
"$ c #848FD6 s active_mid_1",
"@ c #000000",
-"@.$++. ",
-"@.$++. ",
-"@.$++. ",
-"@.$++. ",
-"@.$++. ",
-"@.$++. ",
-"@.$++. ",
-"@.$++. ",
-"@.$++. ",
-"@.$++. ",
-"@.$++...........",
-" @.$++##########",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++++++++++++",
+" @.$++++++++++++",
" @.$$+++++++++++",
" @..$$$$$$$$$$$",
" @@...........",
diff --git a/themes/default-4.0/bottom-left-inactive.xpm b/themes/default-4.0/bottom-left-inactive.xpm
index 5f1fa10b1a944b25b2205640079eb54b1816bbd4..f0c93c2b5e857fb92c5d8b9c7451a3d2ef37275e 100644
--- a/themes/default-4.0/bottom-left-inactive.xpm
+++ b/themes/default-4.0/bottom-left-inactive.xpm
@@ -7,18 +7,18 @@ static char * bottom_left_inactive_xpm[] = {
"# c #FFFFFF s inactive_hilight_1",
"$ c #848FD6 s inactive_mid_1",
"@ c #000000",
-"@.$++. ",
-"@.$++. ",
-"@.$++. ",
-"@.$++. ",
-"@.$++. ",
-"@.$++. ",
-"@.$++. ",
-"@.$++. ",
-"@.$++. ",
-"@.$++. ",
-"@.$++...........",
-" @.$++##########",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++ ",
+"@.$+++++++++++++",
+" @.$++++++++++++",
" @.$$+++++++++++",
" @..$$$$$$$$$$$",
" @@...........",
diff --git a/themes/default-4.0/bottom-right-active.xpm b/themes/default-4.0/bottom-right-active.xpm
index 407faee64d9c2fc8eac53c88e62ae54bee1e53ff..d04b3933bda21430d92a889692332736ea0e7bf6 100644
--- a/themes/default-4.0/bottom-right-active.xpm
+++ b/themes/default-4.0/bottom-right-active.xpm
@@ -7,18 +7,18 @@ static char * bottom_right_active_xpm[] = {
"# c #FFFFFF s active_hilight_1",
"$ c #848FD6 s active_mid_1",
"@ c #000000",
-" .++$.@",
-" .++$.@",
-" .++$.@",
-" .++$.@",
-" .++$.@",
-" .++$.@",
-" .++$.@",
-" .++$.@",
-" .++$.@",
-" .++$.@",
-"...........++$.@",
-"##########++$.@ ",
+" +++$.@",
+" +++$.@",
+" +++$.@",
+" +++$.@",
+" +++$.@",
+" +++$.@",
+" +++$.@",
+" +++$.@",
+" +++$.@",
+" +++$.@",
+"+++++++++++++$.@",
+"++++++++++++$.@ ",
"+++++++++++$$.@ ",
"$$$$$$$$$$$..@ ",
"...........@@ ",
diff --git a/themes/default-4.0/bottom-right-inactive.xpm b/themes/default-4.0/bottom-right-inactive.xpm
index 486a7f2ccc6dab932de96ce92be74f2d8d2e99c7..8e929bd73a2351b68c74dd00e69e5fa974812796 100644
--- a/themes/default-4.0/bottom-right-inactive.xpm
+++ b/themes/default-4.0/bottom-right-inactive.xpm
@@ -7,18 +7,18 @@ static char * bottom_right_inactive_xpm[] = {
"# c #FFFFFF s inactive_hilight_1",
"$ c #848FD6 s inactive_mid_1",
"@ c #000000",
-" .++$.@",
-" .++$.@",
-" .++$.@",
-" .++$.@",
-" .++$.@",
-" .++$.@",
-" .++$.@",
-" .++$.@",
-" .++$.@",
-" .++$.@",
-"...........++$.@",
-"##########++$.@ ",
+" +++$.@",
+" +++$.@",
+" +++$.@",
+" +++$.@",
+" +++$.@",
+" +++$.@",
+" +++$.@",
+" +++$.@",
+" +++$.@",
+" +++$.@",
+"+++++++++++++$.@",
+"++++++++++++$.@ ",
"+++++++++++$$.@ ",
"$$$$$$$$$$$..@ ",
"...........@@ ",
diff --git a/themes/default-4.0/close-active.xpm b/themes/default-4.0/close-active.xpm
index 95e96d0f6761428f117a4ba09119e9f804c1d07f..cb3bdd7727b987e72571b0b134697fabdaa28df9 100644
--- a/themes/default-4.0/close-active.xpm
+++ b/themes/default-4.0/close-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * close_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -23,7 +23,6 @@ static char * close_active_xpm[] = {
"++++##@$+$@##++++",
"++++@@$+++$@@++++",
"++++$$+++++$$++++",
-"$$$$$$$$$$$$$$$$$",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"+++++++++++++++++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/close-inactive.xpm b/themes/default-4.0/close-inactive.xpm
index 30e91c16150a1abe57a79a7a3a4e20c8b11f45d5..78bb106d2b52a59dd2d28e305163c540921efa7b 100644
--- a/themes/default-4.0/close-inactive.xpm
+++ b/themes/default-4.0/close-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * close_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -23,7 +23,6 @@ static char * close_inactive_xpm[] = {
"++++@@$+++$@@++++",
"++++$$+++++$$++++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"+++++++++++++++++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/close-pressed.xpm b/themes/default-4.0/close-pressed.xpm
index fcdfe1a0c70bc559149f9ef36eb81c1f8e3e3be1..a6c4a82b66594938984f7381361a3a5d01754847 100644
--- a/themes/default-4.0/close-pressed.xpm
+++ b/themes/default-4.0/close-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * close_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * close_pressed_xpm[] = {
".@@@..@@@@@..@@@=",
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
-"+================",
-" "};
+"+================"};
diff --git a/themes/default-4.0/hide-active.xpm b/themes/default-4.0/hide-active.xpm
index 24a9ca5032eb79d41247e3a205526de933036c4e..ac61bd12a9f2610387d0127e85ea82df076a516a 100644
--- a/themes/default-4.0/hide-active.xpm
+++ b/themes/default-4.0/hide-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * hide_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -23,7 +23,6 @@ static char * hide_active_xpm[] = {
"++++++$$$$$++++++",
"+++++++++++++++++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"+++++++++++++++++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/hide-inactive.xpm b/themes/default-4.0/hide-inactive.xpm
index 3c792a8ac7dda597e3fce996ac41c74a9bc1d263..65ef8890b89bb136c1e9ca5465c8b43638efbb5b 100644
--- a/themes/default-4.0/hide-inactive.xpm
+++ b/themes/default-4.0/hide-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * hide_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -23,7 +23,6 @@ static char * hide_inactive_xpm[] = {
"+++++++++++++++++",
"+++++++++++++++++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"+++++++++++++++++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/hide-pressed.xpm b/themes/default-4.0/hide-pressed.xpm
index a14193af9fe316ccca89d8ba66f4656285598d56..efc7eb1b8d39502bc6b135a3cb100f36af7d0b4c 100644
--- a/themes/default-4.0/hide-pressed.xpm
+++ b/themes/default-4.0/hide-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * hide_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * hide_pressed_xpm[] = {
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
-"+================",
-" "};
+"+================"};
diff --git a/themes/default-4.0/left-active.xpm b/themes/default-4.0/left-active.xpm
index b90ab152b382961e5729b4538972f60082fa3e31..9ec0d6b7c3cd881bfdfd1725004a29b9f26681a0 100644
--- a/themes/default-4.0/left-active.xpm
+++ b/themes/default-4.0/left-active.xpm
@@ -7,35 +7,35 @@ static char * left_active_xpm[] = {
"# c #D5D6D5 s active_color_2",
"* c #B4BAB4 s active_mid_2",
"@ c #000000",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##. "};
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*### "};
diff --git a/themes/default-4.0/left-inactive.xpm b/themes/default-4.0/left-inactive.xpm
index 0e89589195bdab5a6a750e176bdec83054eea52a..ff0710a87b4ab185ab1417d3b94d89e4e8000ab1 100644
--- a/themes/default-4.0/left-inactive.xpm
+++ b/themes/default-4.0/left-inactive.xpm
@@ -7,35 +7,35 @@ static char * left_inactive_xpm[] = {
"# c #D5D6D5 s inactive_color_2",
"* c #B4BAB4 s inactive_mid_2",
"@ c #000000",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##.",
-"@.*##. "};
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*###",
+"@.*### "};
diff --git a/themes/default-4.0/maximize-active.xpm b/themes/default-4.0/maximize-active.xpm
index 2cf4b17f6ffbc61a4fcb4df4a77c33a1d022e0ac..eb40ed9de6eb37b4eeb133a808582b2cd87852ad 100644
--- a/themes/default-4.0/maximize-active.xpm
+++ b/themes/default-4.0/maximize-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * maximize_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -23,7 +23,6 @@ static char * maximize_active_xpm[] = {
"++++#########++++",
"++++@@@@@@@@@++++",
"++++$$$$$$$$$++++",
-"$$$$$$$$$$$$$$$$$",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"+++++++++++++++++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/maximize-inactive.xpm b/themes/default-4.0/maximize-inactive.xpm
index 808feebbe633e4200e27192c9960efef42256e05..e7bf09709bea4efed93d6401a92c6c71be4736da 100644
--- a/themes/default-4.0/maximize-inactive.xpm
+++ b/themes/default-4.0/maximize-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * maximize_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -23,7 +23,6 @@ static char * maximize_inactive_xpm[] = {
"++++@@@@@@@@@++++",
"++++$$$$$$$$$++++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"+++++++++++++++++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/maximize-pressed.xpm b/themes/default-4.0/maximize-pressed.xpm
index d7069027606f0c944255be8d93f3ce0cf7265539..d80c65eafa8b94a85eb21542445c952859c278e2 100644
--- a/themes/default-4.0/maximize-pressed.xpm
+++ b/themes/default-4.0/maximize-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * maximize_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * maximize_pressed_xpm[] = {
".@@@.........@@@=",
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
-"+================",
-" "};
+"+================"};
diff --git a/themes/default-4.0/maximize-toggled-active.xpm b/themes/default-4.0/maximize-toggled-active.xpm
index 68a3e242c14c24316078dfa83cadc28526ef1f21..19ab7be9428e6e2b3fd8dc29944859668c929fa1 100644
--- a/themes/default-4.0/maximize-toggled-active.xpm
+++ b/themes/default-4.0/maximize-toggled-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * maximize_toggled_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -23,7 +23,6 @@ static char * maximize_toggled_active_xpm[] = {
"+++$$$########+++",
"++++++########+++",
"++++++@@@@@@@@+++",
-"$$$$$$$$$$$$$$$$$",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"++++++$$$$$$$$+++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/maximize-toggled-inactive.xpm b/themes/default-4.0/maximize-toggled-inactive.xpm
index 98cc0a9a1bd2916cd95cd3ac91a47acdf0fd9fc4..447c3568f97e34bfdac0b4e7f5e6e24e491bca2c 100644
--- a/themes/default-4.0/maximize-toggled-inactive.xpm
+++ b/themes/default-4.0/maximize-toggled-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * maximize_toggled_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -23,7 +23,6 @@ static char * maximize_toggled_inactive_xpm[] = {
"++++++@@@@@@@@+++",
"++++++@@@@@@@@+++",
"++++++$$$$$$$$+++",
-"$$$$$$$$$$$$$$$$$",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"+++++++++++++++++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/maximize-toggled-pressed.xpm b/themes/default-4.0/maximize-toggled-pressed.xpm
index b8fcee94348fbcb2c24a8270d5b39045f4bcf603..a3e7d1e57363fece18a9d0ae6781db64b76a5a08 100644
--- a/themes/default-4.0/maximize-toggled-pressed.xpm
+++ b/themes/default-4.0/maximize-toggled-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * maximize_toggled_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * maximize_toggled_pressed_xpm[] = {
".@@@@@########@@=",
".@@@@@........@@=",
".@@@@@@@@@@@@@@@=",
-"+================",
-" "};
+"+================"};
diff --git a/themes/default-4.0/menu-active.xpm b/themes/default-4.0/menu-active.xpm
index 3642e9425f3fb1315214f5d75c4820d3d963dc35..736cc32fe7ffee9de8c347ce35b433ce80be6ed9 100644
--- a/themes/default-4.0/menu-active.xpm
+++ b/themes/default-4.0/menu-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * menu_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -23,7 +23,6 @@ static char * menu_active_xpm[] = {
"++++++$@#@$++++++",
"+++++++$@$+++++++",
"++++++++$++++++++",
-"$$$$$$$$$$$$$$$$$",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"+++++++++++++++++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/menu-inactive.xpm b/themes/default-4.0/menu-inactive.xpm
index 5351e0f798b18f010936a05b4a3b48a42460a97f..85fd35009f736116246cf65412202bec6ed97243 100644
--- a/themes/default-4.0/menu-inactive.xpm
+++ b/themes/default-4.0/menu-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * menu_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -23,7 +23,6 @@ static char * menu_inactive_xpm[] = {
"+++++++$@$+++++++",
"++++++++$++++++++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"+++++++++++++++++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/menu-pressed.xpm b/themes/default-4.0/menu-pressed.xpm
index 151f26e9c7697e2a4369b11379dc0b7783f3051d..9c59c954c33eaca2e1c3e2c993cbfe5d04905ca5 100644
--- a/themes/default-4.0/menu-pressed.xpm
+++ b/themes/default-4.0/menu-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * menu_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,5 +24,5 @@ static char * menu_pressed_xpm[] = {
".@@@@@@@.@@@@@@@=",
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
-"+================",
-" "};
+"+================"};
+
diff --git a/themes/default-4.0/right-active.xpm b/themes/default-4.0/right-active.xpm
index 00949a67a9b4a51a1d065636f5e07653e5caf48c..f0989ffb9c2c5d183f5d4034f7922f188647d867 100644
--- a/themes/default-4.0/right-active.xpm
+++ b/themes/default-4.0/right-active.xpm
@@ -7,35 +7,35 @@ static char * right_active_xpm[] = {
"# c #D5D6D5 s active_color_2",
"* c #B4BAB4 s active_mid_2",
"@ c #000000",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@"};
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@"};
diff --git a/themes/default-4.0/right-inactive.xpm b/themes/default-4.0/right-inactive.xpm
index b9f80e45db4bbb48e2d1e2015294b51823772c08..48a10d25a7fd0a3778c5c83fbc523de7a4e18194 100644
--- a/themes/default-4.0/right-inactive.xpm
+++ b/themes/default-4.0/right-inactive.xpm
@@ -7,35 +7,35 @@ static char * right_inactive_xpm[] = {
"# c #D5D6D5 s inactive_color_2",
"* c #B4BAB4 s inactive_mid_2",
"@ c #000000",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@",
-".##*.@"};
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@",
+"###*.@"};
diff --git a/themes/default-4.0/shade-active.xpm b/themes/default-4.0/shade-active.xpm
index 59ef22f7adc08544da42f839183191524d49df27..61502a82d8e273cd201a9fabb004662fb5d82484 100644
--- a/themes/default-4.0/shade-active.xpm
+++ b/themes/default-4.0/shade-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * shade_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -23,7 +23,6 @@ static char * shade_active_xpm[] = {
"+++$$$$$$$$$$$+++",
"+++@@@@@@@@@@@+++",
"+++###########+++",
-"#################",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"+++++++++++++++++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/shade-inactive.xpm b/themes/default-4.0/shade-inactive.xpm
index 553eb3e24bc276c69b42b3a5be96999784e1ad73..f549c142b3ce3761bb558dbca217f8f0f6e7670d 100644
--- a/themes/default-4.0/shade-inactive.xpm
+++ b/themes/default-4.0/shade-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * shade_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -23,7 +23,6 @@ static char * shade_inactive_xpm[] = {
"+++@@@@@@@@@@@+++",
"+++###########+++",
"+++++++++++++++++",
-"#################",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"+++++++++++++++++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/shade-pressed.xpm b/themes/default-4.0/shade-pressed.xpm
index 20be91624ff9d5e2e4c784d8c1b8a3270fe101fb..35d609b99def6be1b697dd7e5375fe7e9dccc89a 100644
--- a/themes/default-4.0/shade-pressed.xpm
+++ b/themes/default-4.0/shade-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * shade_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * shade_pressed_xpm[] = {
".@@...........@@=",
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
-"+================",
-" "};
+"+================"};
diff --git a/themes/default-4.0/shade-toggled-active.xpm b/themes/default-4.0/shade-toggled-active.xpm
index adc0e08e3f3889e00f5a27e3a51beabf2edf4863..6bcdbaaf24d8309f7482d253c1162b6691836989 100644
--- a/themes/default-4.0/shade-toggled-active.xpm
+++ b/themes/default-4.0/shade-toggled-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * shade_toggled_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -23,7 +23,6 @@ static char * shade_toggled_active_xpm[] = {
"+++$$$$$$$$$$$+++",
"+++@@@@@@@@@@@+++",
"+++###########+++",
-"#################",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"+++++++++++++++++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/shade-toggled-inactive.xpm b/themes/default-4.0/shade-toggled-inactive.xpm
index d78883a35a7aa866f4ee4a00f82075f4fdc7bde2..7bc8af11fc62b9bb558cfa97a42afcbb1b69cf0d 100644
--- a/themes/default-4.0/shade-toggled-inactive.xpm
+++ b/themes/default-4.0/shade-toggled-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * shade_toggled_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -23,7 +23,6 @@ static char * shade_toggled_inactive_xpm[] = {
"+++@@@@@@@@@@@+++",
"+++###########+++",
"+++++++++++++++++",
-"#################",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"+++++++++++++++++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/shade-toggled-pressed.xpm b/themes/default-4.0/shade-toggled-pressed.xpm
index b75dcc8884d403f2690159db1d56f68115d426b2..2f2b30570ed1c384fe50fd10cd6a8ebf9b2151ef 100644
--- a/themes/default-4.0/shade-toggled-pressed.xpm
+++ b/themes/default-4.0/shade-toggled-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * shade_toggled_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * shade_toggled_pressed_xpm[] = {
".@@...........@@=",
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
-"+================",
-" "};
+"+================"};
diff --git a/themes/default-4.0/stick-active.xpm b/themes/default-4.0/stick-active.xpm
index 60f357fe43a161e3af2a197c6ed76e4c5cb69cf5..659abf79a6ccb76cdde0223c489aa90ca5459891 100644
--- a/themes/default-4.0/stick-active.xpm
+++ b/themes/default-4.0/stick-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * stick_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -23,7 +23,6 @@ static char * stick_active_xpm[] = {
"+++++++++@$$$@+++",
"+++++++++$+++$+++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"+++++++++++++++++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/stick-inactive.xpm b/themes/default-4.0/stick-inactive.xpm
index 840a6329a3e302423a7c7f8935a5b0f42598c388..16a9a6ec6723861aa322f4dce37555bd829d60df 100644
--- a/themes/default-4.0/stick-inactive.xpm
+++ b/themes/default-4.0/stick-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * stick_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -23,7 +23,6 @@ static char * stick_inactive_xpm[] = {
"+++++++++$+++$+++",
"+++++++++++++++++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"+++++++++++++++++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/stick-pressed.xpm b/themes/default-4.0/stick-pressed.xpm
index 482f970dc2216dfdf48e39fb4430e90cdca1d010..657a35795ae37ad88339b8b6ba31779de8500ee2 100644
--- a/themes/default-4.0/stick-pressed.xpm
+++ b/themes/default-4.0/stick-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * stick_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * stick_pressed_xpm[] = {
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
-"+================",
-" "};
+"+================"};
diff --git a/themes/default-4.0/stick-toggled-active.xpm b/themes/default-4.0/stick-toggled-active.xpm
index cdaf1de70919ee478033e1fb2a20c3467dc1dd54..864307503c4be06dac4ea30ba6f201adc6616ac0 100644
--- a/themes/default-4.0/stick-toggled-active.xpm
+++ b/themes/default-4.0/stick-toggled-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * stick_toggled_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -23,7 +23,6 @@ static char * stick_toggled_active_xpm[] = {
"+++++++#@@@##++++",
"+++++++++###+++++",
"+++++++++++++++++",
-"#################",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"+++++++++++++++++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/stick-toggled-inactive.xpm b/themes/default-4.0/stick-toggled-inactive.xpm
index dd0b16bcf33f9af9a8de20f9133fac1476baec61..4766b1021c80fc2987af5fc4a44fdb6fcfe81990 100644
--- a/themes/default-4.0/stick-toggled-inactive.xpm
+++ b/themes/default-4.0/stick-toggled-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * stick_toggled_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -23,7 +23,6 @@ static char * stick_toggled_inactive_xpm[] = {
"+++++++######++++",
"+++++++++###+++++",
"+++++++++++++++++",
-"#################",
-"@@@@@@@@@@@@@@@@@",
-" "};
+"+++++++++++++++++",
+"+++++++++++++++++"};
diff --git a/themes/default-4.0/stick-toggled-pressed.xpm b/themes/default-4.0/stick-toggled-pressed.xpm
index 805ab1e29291b08178e802a070d85c6a577c90b8..57ce7280f39fd7be099abd7d8376d2443374e7cf 100644
--- a/themes/default-4.0/stick-toggled-pressed.xpm
+++ b/themes/default-4.0/stick-toggled-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * stick_toggled_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #B4BAB4 s active_mid_2",
@@ -24,6 +24,5 @@ static char * stick_toggled_pressed_xpm[] = {
".++++++++...++++=",
".+++++++++++++++=",
".+++++++++++++++=",
-"@================",
-" "};
+"@================"};
diff --git a/themes/default-4.0/themerc b/themes/default-4.0/themerc
index 326bf862800f073b8752f3573d5322a2e26aa0dc..b39f2670f63e5674f5a87960b3023ab2d95da507 100644
--- a/themes/default-4.0/themerc
+++ b/themes/default-4.0/themerc
@@ -1,8 +1,8 @@
-button_offset=0
-button_spacing=2
+button_offset=1
+button_spacing=1
full_width_title=true
title_horizontal_offset=0
-title_vertical_offset_active=0
-title_vertical_offset_inactive=0
+title_vertical_offset_active=1
+title_vertical_offset_inactive=1
title_shadow_active=false
title_shadow_inactive=false
diff --git a/themes/default-4.0/title-1-active.xpm b/themes/default-4.0/title-1-active.xpm
index bbf592a612c298e3beff843ed644a3fde5867a49..6e35b0c57f57a5213439a5e8cb9349427bd3ca7f 100644
--- a/themes/default-4.0/title-1-active.xpm
+++ b/themes/default-4.0/title-1-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_1_active_xpm[] = {
-"8 19 6 1",
+"8 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
@@ -23,6 +23,5 @@ static char * title_1_active_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
-"########",
-"........",
-"$$$$$$$$"};
+"@@@@@@@@",
+"@@@@@@@@"};
diff --git a/themes/default-4.0/title-1-inactive.xpm b/themes/default-4.0/title-1-inactive.xpm
index 0c755cba074e205a9633b0e36dfc91961ff79b3f..14e72e85dbace6c58f9cd4963f7589db9df1d501 100644
--- a/themes/default-4.0/title-1-inactive.xpm
+++ b/themes/default-4.0/title-1-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_1_inactive_xpm[] = {
-"8 19 6 1",
+"8 18 6 1",
" c None",
". c #949594 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
@@ -23,6 +23,5 @@ static char * title_1_inactive_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
-"########",
-"........",
-"$$$$$$$$"};
+"@@@@@@@@",
+"@@@@@@@@"};
diff --git a/themes/default-4.0/title-2-active.xpm b/themes/default-4.0/title-2-active.xpm
index d4178eef09008d5086683e8fcaf1207794cf0d12..50f5587b185c0009548170a75a192ef1baec0c05 100644
--- a/themes/default-4.0/title-2-active.xpm
+++ b/themes/default-4.0/title-2-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_2_active_xpm[] = {
-"16 19 10 1",
+"16 18 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s active_hilight_2",
@@ -24,9 +24,8 @@ static char * title_2_active_xpm[] = {
"@@@@@$$$$$$$$$$$",
"@@@@@$$$$$$$$$$$",
"@@@@@$$$$$$$$$$$",
-"@@@@@&$$$$$$$$$$",
"@@@@@@$$$$$$$$$$",
-"@@@@@@&$$$$$$$$$",
-"&&&&&&&&%%%%%%%%",
-"**********######",
-"................"};
+"@@@@@@$$$$$$$$$$",
+"@@@@@@@$$$$$$$$$",
+"@@@@@@@@$$$$$$$$",
+"@@@@@@@@@@$$$$$$"};
diff --git a/themes/default-4.0/title-2-inactive.xpm b/themes/default-4.0/title-2-inactive.xpm
index 01f3e2fb22e87fc2178489bf5547efb77925b971..f9d31752bda420041b9725160cdc7d70a1493271 100644
--- a/themes/default-4.0/title-2-inactive.xpm
+++ b/themes/default-4.0/title-2-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_2_inactive_xpm[] = {
-"16 19 10 1",
+"16 18 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s inactive_hilight_2",
@@ -24,9 +24,8 @@ static char * title_2_inactive_xpm[] = {
"@@@@@$$$$$$$$$$$",
"@@@@@$$$$$$$$$$$",
"@@@@@$$$$$$$$$$$",
-"@@@@@&$$$$$$$$$$",
"@@@@@@$$$$$$$$$$",
-"@@@@@@&$$$$$$$$$",
-"&&&&&&&&%%%%%%%%",
-"**********######",
-"................"};
+"@@@@@@$$$$$$$$$$",
+"@@@@@@@$$$$$$$$$",
+"@@@@@@@@$$$$$$$$",
+"@@@@@@@@@@$$$$$$"};
diff --git a/themes/default-4.0/title-3-active.xpm b/themes/default-4.0/title-3-active.xpm
index a50a2174b39620a07b035ab301f8916e6701cf6f..2ad2dd2a24b60ba32028efa321d9bf1c6b121c79 100644
--- a/themes/default-4.0/title-3-active.xpm
+++ b/themes/default-4.0/title-3-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_3_active_xpm[] = {
-"20 19 10 1",
+"20 18 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s active_hilight_2",
@@ -27,6 +27,5 @@ static char * title_3_active_xpm[] = {
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
-"$$$$$$$$$$$$$$$$$$$$",
-"####################",
-"...................."};
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%"};
diff --git a/themes/default-4.0/title-3-inactive.xpm b/themes/default-4.0/title-3-inactive.xpm
index 94f486f466ab02cc2b2c2872da9db9b33e9dbf52..4d4633a3787a06351c8f472ee2f2eeaca9c2dc2a 100644
--- a/themes/default-4.0/title-3-inactive.xpm
+++ b/themes/default-4.0/title-3-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_3_inactive_xpm[] = {
-"20 19 10 1",
+"20 18 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s inactive_hilight_2",
@@ -27,6 +27,5 @@ static char * title_3_inactive_xpm[] = {
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
-"$$$$$$$$$$$$$$$$$$$$",
-"####################",
-"...................."};
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%"};
diff --git a/themes/default-4.0/title-4-active.xpm b/themes/default-4.0/title-4-active.xpm
index 47dcde8df2ae2c08b2e577479fed6ec5f04c7005..f0bcbc328521c316f32491264658fb9a27fc9193 100644
--- a/themes/default-4.0/title-4-active.xpm
+++ b/themes/default-4.0/title-4-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_4_active_xpm[] = {
-"16 19 10 1",
+"16 18 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s active_hilight_2",
@@ -24,9 +24,8 @@ static char * title_4_active_xpm[] = {
"&&&&&&&&&&&@@@@@",
"&&&&&&&&&&&@@@@@",
"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&*@@@@@",
"&&&&&&&&&&@@@@@@",
-"&&&&&&&&&*@@@@@@",
-"%%%%%%%%********",
-"$$$$$$##########",
-"................"};
+"&&&&&&&&&&@@@@@@",
+"&&&&&&&&&@@@@@@@",
+"&&&&&&&&@@@@@@@@",
+"&&&&&&@@@@@@@@@@"};
diff --git a/themes/default-4.0/title-4-inactive.xpm b/themes/default-4.0/title-4-inactive.xpm
index dc133b240e848c08e006efcb3ef36ca824532a3c..d9002ed59f2b3d0decb0bbcdc6a5388ec840f107 100644
--- a/themes/default-4.0/title-4-inactive.xpm
+++ b/themes/default-4.0/title-4-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_4_inactive_xpm[] = {
-"16 19 10 1",
+"16 18 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s inactive_hilight_2",
@@ -24,9 +24,8 @@ static char * title_4_inactive_xpm[] = {
"&&&&&&&&&&&@@@@@",
"&&&&&&&&&&&@@@@@",
"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&*@@@@@",
"&&&&&&&&&&@@@@@@",
-"&&&&&&&&&*@@@@@@",
-"%%%%%%%%********",
-"$$$$$$##########",
-"................"};
+"&&&&&&&&&&@@@@@@",
+"&&&&&&&&&@@@@@@@",
+"&&&&&&&&@@@@@@@@",
+"&&&&&&@@@@@@@@@@"};
diff --git a/themes/default-4.0/title-5-active.xpm b/themes/default-4.0/title-5-active.xpm
index 527bde6ce9f869b7e2961a8cd084b7e257ccb098..af62128a3ee1bad73cd1421d53686bd63e4a191d 100644
--- a/themes/default-4.0/title-5-active.xpm
+++ b/themes/default-4.0/title-5-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_5_active_xpm[] = {
-"8 19 6 1",
+"8 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
@@ -23,6 +23,5 @@ static char * title_5_active_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
-"########",
-"........",
-"$$$$$$$$"};
+"@@@@@@@@",
+"@@@@@@@@"};
diff --git a/themes/default-4.0/title-5-inactive.xpm b/themes/default-4.0/title-5-inactive.xpm
index 0da189c859a40828bf89e308a12d6b762896892e..ea45ab05a14b139478a724b02d94fd07a4f6e3f8 100644
--- a/themes/default-4.0/title-5-inactive.xpm
+++ b/themes/default-4.0/title-5-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_5_inactive_xpm[] = {
-"8 19 6 1",
+"8 18 6 1",
" c None",
". c #949594 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
@@ -23,6 +23,5 @@ static char * title_5_inactive_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
-"########",
-"........",
-"$$$$$$$$"};
+"@@@@@@@@",
+"@@@@@@@@"};
diff --git a/themes/default-4.0/top-left-active.xpm b/themes/default-4.0/top-left-active.xpm
index b00297b44b1b5aefad1b273ef0f86ad976c66c69..67ebc959e0437aa6fc4d20128fdcd75d58f7a664 100644
--- a/themes/default-4.0/top-left-active.xpm
+++ b/themes/default-4.0/top-left-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_left_active_xpm[] = {
-"7 19 6 1",
+"7 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
@@ -23,6 +23,5 @@ static char * top_left_active_xpm[] = {
"$.@####",
"$.@####",
"$.@####",
-"$.@###@",
-"$.@##..",
-"$.@##.$"};
+"$.@####",
+"$.@####""};
diff --git a/themes/default-4.0/top-left-inactive.xpm b/themes/default-4.0/top-left-inactive.xpm
index a904eba4b19031d5d80aebde74907976756db559..8353adcf78206b6dacdc2aa8acec030a529cce26 100644
--- a/themes/default-4.0/top-left-inactive.xpm
+++ b/themes/default-4.0/top-left-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_left_inactive_xpm[] = {
-"7 19 6 1",
+"7 18 6 1",
" c None",
". c #949594 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
@@ -23,6 +23,5 @@ static char * top_left_inactive_xpm[] = {
"$.@####",
"$.@####",
"$.@####",
-"$.@###@",
-"$.@##..",
-"$.@##.$"};
+"$.@####",
+"$.@####""};
diff --git a/themes/default-4.0/top-right-active.xpm b/themes/default-4.0/top-right-active.xpm
index 486aaec58cdd80b0b511df5f58e53d7846b9915c..47e087ff3ae31128dd52ba25072255bc8854b950 100644
--- a/themes/default-4.0/top-right-active.xpm
+++ b/themes/default-4.0/top-right-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_right_active_xpm[] = {
-"7 19 6 1",
+"7 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
@@ -23,6 +23,6 @@ static char * top_right_active_xpm[] = {
"####@.$",
"####@.$",
"####@.$",
-"@###@.$",
-"..##@.$",
-"$.##@.$"};
+"####@.$",
+"####@.$",
+"####@.$"};
diff --git a/themes/default-4.0/top-right-inactive.xpm b/themes/default-4.0/top-right-inactive.xpm
index bf733ec005c2d76fe49b59c2c12c2edf55258700..8a60fc0ad99d6af4700c2ed1dbee5a0cd4a00840 100644
--- a/themes/default-4.0/top-right-inactive.xpm
+++ b/themes/default-4.0/top-right-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_right_inactive_xpm[] = {
-"7 19 6 1",
+"7 18 6 1",
" c None",
". c #949594 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
@@ -23,6 +23,5 @@ static char * top_right_inactive_xpm[] = {
"####@.$",
"####@.$",
"####@.$",
-"@###@.$",
-"..##@.$",
-"$.##@.$"};
+"####@.$",
+"####@.$"};
diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm
index f7d205dbc6f2b47f7137df553e18ffc9b06ba4d2..8503d821b8e251fb618a7dc41175e40497a5ed15 100644
--- a/themes/default/bottom-active.xpm
+++ b/themes/default/bottom-active.xpm
@@ -7,7 +7,7 @@ static char * bottom_active_xpm[] = {
"@ c #D5D6D5 s active_color_2",
"# c #B4BAB4 s active_mid_2",
"$ c #000000",
-"................................",
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
"################################",
-"................................"};
+"................................",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"};
diff --git a/themes/default/bottom-inactive.xpm b/themes/default/bottom-inactive.xpm
index 4deb1181afa954469772792288fac9c7b150a84d..4c92c8f37a3b4d6e53a14fe224ad8c76cc71c9fb 100644
--- a/themes/default/bottom-inactive.xpm
+++ b/themes/default/bottom-inactive.xpm
@@ -7,7 +7,7 @@ static char * bottom_inactive_xpm[] = {
"@ c #D5D6D5 s inactive_color_2",
"# c #B4BAB4 s inactive_mid_2",
"$ c #000000",
-"................................",
"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
"################################",
-"................................"};
+"................................",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"};
diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm
index 43ea7b70242c86c256f0243fdfce299057cf7410..d72e0d4916d7e042fe59b0a289425226359feb87 100644
--- a/themes/default/bottom-left-active.xpm
+++ b/themes/default/bottom-left-active.xpm
@@ -7,19 +7,19 @@ static char * bottom_left_active_xpm[] = {
"+ c #525FAB s active_color_2",
"# c #FFFFFF s active_hilight_2",
"$ c #848FD6 s active_mid_2",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-" .+$............",
-" .++++++++++++++",
-" ..$$$$$$$$$$$$",
-" ............"};
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+" @.$++++++++++++",
+" @..$$$$$$$$$$$$",
+" @@............",
+" @@@@@@@@@@@@"};
diff --git a/themes/default/bottom-left-inactive.xpm b/themes/default/bottom-left-inactive.xpm
index 664538f275a3087ba11054d083687702bc2f5a37..247dc251c255956740ab8ee9ed813aad3037590e 100644
--- a/themes/default/bottom-left-inactive.xpm
+++ b/themes/default/bottom-left-inactive.xpm
@@ -7,19 +7,19 @@ static char * bottom_left_inactive_xpm[] = {
"+ c #525FAB s inactive_color_2",
"# c #FFFFFF s inactive_hilight_2",
"$ c #848FD6 s inactive_mid_2",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-".$+. ",
-" .+$............",
-" .++++++++++++++",
-" ..$$$$$$$$$$$$",
-" ............"};
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+"@.$+ ",
+" @.$++++++++++++",
+" @..$$$$$$$$$$$$",
+" @@............",
+" @@@@@@@@@@@@"};
diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm
index d3e3382b13a470dc77314af8c7b959c8f0b5516e..9fea6bb8ee9ce4a62f5cb999f316afd9e6fafda8 100644
--- a/themes/default/bottom-right-active.xpm
+++ b/themes/default/bottom-right-active.xpm
@@ -7,19 +7,19 @@ static char * bottom_right_active_xpm[] = {
"+ c #525FAB s active_color_2",
"# c #FFFFFF s active_hilight_2",
"$ c #848FD6 s active_mid_2",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-"............$+. ",
-"++++++++++++++. ",
-"$$$$$$$$$$$$.. ",
-"............ "};
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+"++++++++++++$.@ ",
+"$$$$$$$$$$$$..@ ",
+"............@@ ",
+"@@@@@@@@@@@@ "};
diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm
index 807dd277c7bfbc0951246b440c8aba3a100a8877..004c666996a75a5542572119d73a452d0ffc428d 100644
--- a/themes/default/bottom-right-inactive.xpm
+++ b/themes/default/bottom-right-inactive.xpm
@@ -7,19 +7,19 @@ static char * bottom_right_inactive_xpm[] = {
"+ c #525FAB s inactive_color_2",
"# c #FFFFFF s inactive_hilight_2",
"$ c #848FD6 s inactive_mid_2",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-" .+$.",
-"............$+. ",
-"++++++++++++++. ",
-"$$$$$$$$$$$$.. ",
-"............ "};
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+" +$.@",
+"++++++++++++$.@ ",
+"$$$$$$$$$$$$..@ ",
+"............@@ ",
+"@@@@@@@@@@@@ "};
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index bc9387077f424c4230a18eb7be213a7655c85cab..cb3bdd7727b987e72571b0b134697fabdaa28df9 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * close_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * close_active_xpm[] = {
"++++@@$+++$@@++++",
"++++$$+++++$$++++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 0d31ca8068669ed69af1bc233eb464edd41f3adf..78bb106d2b52a59dd2d28e305163c540921efa7b 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * close_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -24,6 +24,5 @@ static char * close_inactive_xpm[] = {
"++++$$+++++$$++++",
"+++++++++++++++++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index fcdfe1a0c70bc559149f9ef36eb81c1f8e3e3be1..a6c4a82b66594938984f7381361a3a5d01754847 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * close_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * close_pressed_xpm[] = {
".@@@..@@@@@..@@@=",
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
-"+================",
-" "};
+"+================"};
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 12aa8e4ee5dfa4128ded62615dd2467651e6d53d..ac61bd12a9f2610387d0127e85ea82df076a516a 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * hide_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * hide_active_xpm[] = {
"+++++++++++++++++",
"+++++++++++++++++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index ec254c2bf223c1d7511406f071e1833e1c3bf911..65ef8890b89bb136c1e9ca5465c8b43638efbb5b 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * hide_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -24,6 +24,5 @@ static char * hide_inactive_xpm[] = {
"+++++++++++++++++",
"+++++++++++++++++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index a14193af9fe316ccca89d8ba66f4656285598d56..efc7eb1b8d39502bc6b135a3cb100f36af7d0b4c 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * hide_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * hide_pressed_xpm[] = {
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
-"+================",
-" "};
+"+================"};
diff --git a/themes/default/left-active.xpm b/themes/default/left-active.xpm
index 8c4ed0c3f05e0a25348782d581542cd55175624f..694b0282ff476152bb3daebaae4b4fbe07a2b937 100644
--- a/themes/default/left-active.xpm
+++ b/themes/default/left-active.xpm
@@ -7,35 +7,35 @@ static char * left_active_xpm[] = {
"# c #D5D6D5 s active_color_2",
"* c #B4BAB4 s active_mid_2",
"@ c #000000",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#."};
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#"};
diff --git a/themes/default/left-inactive.xpm b/themes/default/left-inactive.xpm
index cc2a14cce47292b2225b96675cc334c984ee234a..97d2d612d5194eec66dcd21a1d5097db58de31a2 100644
--- a/themes/default/left-inactive.xpm
+++ b/themes/default/left-inactive.xpm
@@ -7,35 +7,35 @@ static char * left_inactive_xpm[] = {
"# c #D5D6D5 s inactive_color_2",
"* c #B4BAB4 s inactive_mid_2",
"@ c #000000",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#.",
-".*#."};
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#",
+"@.*#"};
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index 5f5dad64c7813247a79f50c28e5c15379ae5afd8..eb40ed9de6eb37b4eeb133a808582b2cd87852ad 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * maximize_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * maximize_active_xpm[] = {
"++++@@@@@@@@@++++",
"++++$$$$$$$$$++++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index 400688749e3851d489c671ec64ccf04846dcba51..e7bf09709bea4efed93d6401a92c6c71be4736da 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * maximize_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -24,6 +24,5 @@ static char * maximize_inactive_xpm[] = {
"++++$$$$$$$$$++++",
"+++++++++++++++++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index d7069027606f0c944255be8d93f3ce0cf7265539..d80c65eafa8b94a85eb21542445c952859c278e2 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * maximize_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * maximize_pressed_xpm[] = {
".@@@.........@@@=",
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
-"+================",
-" "};
+"+================"};
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index eb7e48515e1eedb35df670451b06e57f06b76665..19ab7be9428e6e2b3fd8dc29944859668c929fa1 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * maximize_toggled_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * maximize_toggled_active_xpm[] = {
"++++++########+++",
"++++++@@@@@@@@+++",
"++++++$$$$$$$$+++",
-"$$$$$$$$$$$$$$$$$",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index d8e7668d543648be4771b18b60223ee9e1d17544..447c3568f97e34bfdac0b4e7f5e6e24e491bca2c 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * maximize_toggled_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -24,6 +24,5 @@ static char * maximize_toggled_inactive_xpm[] = {
"++++++@@@@@@@@+++",
"++++++$$$$$$$$+++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index b8fcee94348fbcb2c24a8270d5b39045f4bcf603..a3e7d1e57363fece18a9d0ae6781db64b76a5a08 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * maximize_toggled_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * maximize_toggled_pressed_xpm[] = {
".@@@@@########@@=",
".@@@@@........@@=",
".@@@@@@@@@@@@@@@=",
-"+================",
-" "};
+"+================"};
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index 60be608181a4863561e5148d09b5cc59ecd42199..736cc32fe7ffee9de8c347ce35b433ce80be6ed9 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * menu_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * menu_active_xpm[] = {
"+++++++$@$+++++++",
"++++++++$++++++++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index b09a82de37df6cbec3a3086c310ee53f085a7460..85fd35009f736116246cf65412202bec6ed97243 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * menu_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -24,6 +24,5 @@ static char * menu_inactive_xpm[] = {
"++++++++$++++++++",
"+++++++++++++++++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index 151f26e9c7697e2a4369b11379dc0b7783f3051d..9c59c954c33eaca2e1c3e2c993cbfe5d04905ca5 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * menu_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,5 +24,5 @@ static char * menu_pressed_xpm[] = {
".@@@@@@@.@@@@@@@=",
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
-"+================",
-" "};
+"+================"};
+
diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm
index 7d4c1464ba04290f12dd9dd00524b5090b1d9259..94fdff063108da3b874e3a22fad443f1c718c09a 100644
--- a/themes/default/right-active.xpm
+++ b/themes/default/right-active.xpm
@@ -7,35 +7,35 @@ static char * right_active_xpm[] = {
"# c #D5D6D5 s active_color_2",
"* c #B4BAB4 s active_mid_2",
"@ c #000000",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*."};
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@"};
diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm
index ab8e3b501d41044eae5feb3f03220e5ad774d4f1..4d4271c2a5cb83efd57eed63a67d1bb0b1b6ca84 100644
--- a/themes/default/right-inactive.xpm
+++ b/themes/default/right-inactive.xpm
@@ -7,35 +7,35 @@ static char * right_inactive_xpm[] = {
"# c #D5D6D5 s inactive_color_2",
"* c #B4BAB4 s inactive_mid_2",
"@ c #000000",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*.",
-".#*."};
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@",
+"#*.@"};
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index 4e7eff5105c9c0637c776e9eab71b65f78282c1a..61502a82d8e273cd201a9fabb004662fb5d82484 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * shade_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * shade_active_xpm[] = {
"+++@@@@@@@@@@@+++",
"+++###########+++",
"+++++++++++++++++",
-"#################",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index 6d777299b6b3eb126395a27491e6f933a0cb11b7..f549c142b3ce3761bb558dbca217f8f0f6e7670d 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * shade_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -24,6 +24,5 @@ static char * shade_inactive_xpm[] = {
"+++###########+++",
"+++++++++++++++++",
"+++++++++++++++++",
-"#################",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index 20be91624ff9d5e2e4c784d8c1b8a3270fe101fb..35d609b99def6be1b697dd7e5375fe7e9dccc89a 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * shade_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * shade_pressed_xpm[] = {
".@@...........@@=",
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
-"+================",
-" "};
+"+================"};
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index 42a8e45f5a880351ea1ef460582009699d14cb71..6bcdbaaf24d8309f7482d253c1162b6691836989 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * shade_toggled_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * shade_toggled_active_xpm[] = {
"+++@@@@@@@@@@@+++",
"+++###########+++",
"+++++++++++++++++",
-"#################",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index df0096dbfb65a1ff7c3a6ecdbe5ffb4e1162eae0..7bc8af11fc62b9bb558cfa97a42afcbb1b69cf0d 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * shade_toggled_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -24,6 +24,5 @@ static char * shade_toggled_inactive_xpm[] = {
"+++###########+++",
"+++++++++++++++++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index b75dcc8884d403f2690159db1d56f68115d426b2..2f2b30570ed1c384fe50fd10cd6a8ebf9b2151ef 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * shade_toggled_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * shade_toggled_pressed_xpm[] = {
".@@...........@@=",
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
-"+================",
-" "};
+"+================"};
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 6c36137fc49a4d09cf5724f973139345375cf513..659abf79a6ccb76cdde0223c489aa90ca5459891 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * stick_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * stick_active_xpm[] = {
"+++++++++$+++$+++",
"+++++++++++++++++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index d670072194887dd3cb767d8d5dc892ed7875fdc8..16a9a6ec6723861aa322f4dce37555bd829d60df 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * stick_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -24,6 +24,5 @@ static char * stick_inactive_xpm[] = {
"+++++++++++++++++",
"+++++++++++++++++",
"+++++++++++++++++",
-"$$$$$$$$$$$$$$$$$",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index 482f970dc2216dfdf48e39fb4430e90cdca1d010..657a35795ae37ad88339b8b6ba31779de8500ee2 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * stick_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * stick_pressed_xpm[] = {
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
".@@@@@@@@@@@@@@@=",
-"+================",
-" "};
+"+================"};
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index 888744f2719405f4159c4f25443e27ebf89f368c..864307503c4be06dac4ea30ba6f201adc6616ac0 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * stick_toggled_active_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
@@ -24,6 +24,5 @@ static char * stick_toggled_active_xpm[] = {
"+++++++++###+++++",
"+++++++++++++++++",
"+++++++++++++++++",
-"#################",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 276058815e963fe523c69a93b71f7a7731615e63..4766b1021c80fc2987af5fc4a44fdb6fcfe81990 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * stick_toggled_inactive_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
@@ -24,6 +24,5 @@ static char * stick_toggled_inactive_xpm[] = {
"+++++++++###+++++",
"+++++++++++++++++",
"+++++++++++++++++",
-"#################",
-" "};
+"+++++++++++++++++"};
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index 805ab1e29291b08178e802a070d85c6a577c90b8..57ce7280f39fd7be099abd7d8376d2443374e7cf 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * stick_toggled_pressed_xpm[] = {
-"17 19 6 1",
+"17 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #B4BAB4 s active_mid_2",
@@ -24,6 +24,5 @@ static char * stick_toggled_pressed_xpm[] = {
".++++++++...++++=",
".+++++++++++++++=",
".+++++++++++++++=",
-"@================",
-" "};
+"@================"};
diff --git a/themes/default/themerc b/themes/default/themerc
index a9b3d6fd1d3ecb9dd1d126500df7a565d48db867..0f1f1bd2a6c8cc7bf0185ca56b7b29d018ba2aa2 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -1,8 +1,8 @@
-button_offset=2
-button_spacing=2
+button_offset=3
+button_spacing=1
full_width_title=true
title_horizontal_offset=0
-title_vertical_offset_active=0
-title_vertical_offset_inactive=0
+title_vertical_offset_active=1
+title_vertical_offset_inactive=1
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 5bed104e2833b7352b36924199fc565126a1ba5b..6e35b0c57f57a5213439a5e8cb9349427bd3ca7f 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -1,13 +1,13 @@
/* XPM */
static char * title_1_active_xpm[] = {
-"8 19 6 1",
+"8 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
"@ c #D5D6D5 s active_color_2",
"# c #B4BAB4 s active_mid_2",
"$ c #000000",
-"........",
+"$$$$$$$$",
"++++++++",
"@@@@@@@@",
"@@@@@@@@",
@@ -24,5 +24,4 @@ static char * title_1_active_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
-"########",
-"........"};
+"@@@@@@@@"};
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index e41de19e30b71a4c911bb33cd6bc3830b95c293c..14e72e85dbace6c58f9cd4963f7589db9df1d501 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -1,13 +1,13 @@
/* XPM */
static char * title_1_inactive_xpm[] = {
-"8 19 6 1",
+"8 18 6 1",
" c None",
". c #949594 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
"@ c #D5D6D5 s inactive_color_2",
"# c #B4BAB4 s inactive_mid_2",
"$ c #000000",
-"........",
+"$$$$$$$$",
"++++++++",
"@@@@@@@@",
"@@@@@@@@",
@@ -24,5 +24,4 @@ static char * title_1_inactive_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
-"########",
-"........"};
+"@@@@@@@@"};
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index 3561a2e9d76f45706b731816f463236e2d08f723..50f5587b185c0009548170a75a192ef1baec0c05 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 19 10 1",
+"16 18 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s active_hilight_2",
@@ -11,7 +11,7 @@ static char * title_2_active_xpm[] = {
"& c #B4BAB4 s active_mid_2",
"* c #949594 s active_shadow_2",
"= c #FFFFFF s active_hilight_1",
-"*****###########",
+"................",
"+++++===========",
"@@@@@$$$$$$$$$$$",
"@@@@@$$$$$$$$$$$",
@@ -24,9 +24,8 @@ static char * title_2_active_xpm[] = {
"@@@@@$$$$$$$$$$$",
"@@@@@$$$$$$$$$$$",
"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@&$$$$$$$$$$",
"@@@@@@$$$$$$$$$$",
-"@@@@@@&$$$$$$$$$",
-"&&&&&&&&%%%%%%%%",
-"**********######"};
+"@@@@@@$$$$$$$$$$",
+"@@@@@@@$$$$$$$$$",
+"@@@@@@@@$$$$$$$$",
+"@@@@@@@@@@$$$$$$"};
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index cd21a3bfa8e297f6e4138d2d460bf703f0497d70..f9d31752bda420041b9725160cdc7d70a1493271 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 19 10 1",
+"16 18 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s inactive_hilight_2",
@@ -11,7 +11,7 @@ static char * title_2_inactive_xpm[] = {
"& c #B4BAB4 s inactive_mid_2",
"* c #949594 s inactive_shadow_2",
"= c #FFFFFF s inactive_hilight_1",
-"*****###########",
+"................",
"+++++===========",
"@@@@@$$$$$$$$$$$",
"@@@@@$$$$$$$$$$$",
@@ -24,9 +24,8 @@ static char * title_2_inactive_xpm[] = {
"@@@@@$$$$$$$$$$$",
"@@@@@$$$$$$$$$$$",
"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@&$$$$$$$$$$",
"@@@@@@$$$$$$$$$$",
-"@@@@@@&$$$$$$$$$",
-"&&&&&&&&%%%%%%%%",
-"**********######"};
+"@@@@@@$$$$$$$$$$",
+"@@@@@@@$$$$$$$$$",
+"@@@@@@@@$$$$$$$$",
+"@@@@@@@@@@$$$$$$"};
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index 857c14e4576ddfb96abaed7436cfd88e7167b1b7..2ad2dd2a24b60ba32028efa321d9bf1c6b121c79 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 19 10 1",
+"20 18 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s active_hilight_2",
@@ -11,7 +11,7 @@ static char * title_3_active_xpm[] = {
"& c #B4BAB4 s active_mid_2",
"* c #949594 s active_shadow_2",
"= c #FFFFFF s active_hilight_1",
-"####################",
+"....................",
"====================",
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
@@ -28,5 +28,4 @@ static char * title_3_active_xpm[] = {
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
-"$$$$$$$$$$$$$$$$$$$$",
-"####################"};
+"%%%%%%%%%%%%%%%%%%%%"};
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index eae1c1d454ee68ec7a3525c00fdf03f6f0d20b07..4d4633a3787a06351c8f472ee2f2eeaca9c2dc2a 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 19 10 1",
+"20 18 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s inactive_hilight_2",
@@ -11,7 +11,7 @@ static char * title_3_inactive_xpm[] = {
"& c #B4BAB4 s inactive_mid_2",
"* c #949594 s inactive_shadow_2",
"= c #FFFFFF s inactive_hilight_1",
-"####################",
+"....................",
"====================",
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
@@ -28,5 +28,4 @@ static char * title_3_inactive_xpm[] = {
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
-"$$$$$$$$$$$$$$$$$$$$",
-"####################"};
+"%%%%%%%%%%%%%%%%%%%%"};
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index a0dca80af154452eea1680f3a821ee3fe92dff4c..f0bcbc328521c316f32491264658fb9a27fc9193 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 19 10 1",
+"16 18 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s active_hilight_2",
@@ -11,7 +11,7 @@ static char * title_4_active_xpm[] = {
"& c #525FAB s active_color_1",
"* c #B4BAB4 s active_mid_2",
"= c #FFFFFF s active_hilight_1",
-"$$$$$$$$$$$#####",
+"................",
"===========+++++",
"&&&&&&&&&&&@@@@@",
"&&&&&&&&&&&@@@@@",
@@ -24,9 +24,8 @@ static char * title_4_active_xpm[] = {
"&&&&&&&&&&&@@@@@",
"&&&&&&&&&&&@@@@@",
"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&*@@@@@",
"&&&&&&&&&&@@@@@@",
-"&&&&&&&&&*@@@@@@",
-"%%%%%%%%********",
-"$$$$$$##########"};
+"&&&&&&&&&&@@@@@@",
+"&&&&&&&&&@@@@@@@",
+"&&&&&&&&@@@@@@@@",
+"&&&&&&@@@@@@@@@@"};
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index e4494c7b23c658f17115989e16cbaddb0e8ddeba..d9002ed59f2b3d0decb0bbcdc6a5388ec840f107 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 19 10 1",
+"16 18 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s inactive_hilight_2",
@@ -11,7 +11,7 @@ static char * title_4_inactive_xpm[] = {
"& c #525FAB s inactive_color_1",
"* c #B4BAB4 s inactive_mid_2",
"= c #FFFFFF s inactive_hilight_1",
-"$$$$$$$$$$$#####",
+"................",
"===========+++++",
"&&&&&&&&&&&@@@@@",
"&&&&&&&&&&&@@@@@",
@@ -24,9 +24,8 @@ static char * title_4_inactive_xpm[] = {
"&&&&&&&&&&&@@@@@",
"&&&&&&&&&&&@@@@@",
"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&*@@@@@",
"&&&&&&&&&&@@@@@@",
-"&&&&&&&&&*@@@@@@",
-"%%%%%%%%********",
-"$$$$$$##########"};
+"&&&&&&&&&&@@@@@@",
+"&&&&&&&&&@@@@@@@",
+"&&&&&&&&@@@@@@@@",
+"&&&&&&@@@@@@@@@@"};
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index 30de9e38f23655e2260c421c479819845ef4e991..af62128a3ee1bad73cd1421d53686bd63e4a191d 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -1,13 +1,13 @@
/* XPM */
static char * title_5_active_xpm[] = {
-"8 19 6 1",
+"8 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
"@ c #D5D6D5 s active_color_2",
"# c #B4BAB4 s active_mid_2",
"$ c #000000",
-"........",
+"$$$$$$$$",
"++++++++",
"@@@@@@@@",
"@@@@@@@@",
@@ -24,5 +24,4 @@ static char * title_5_active_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
-"########",
-"........"};
+"@@@@@@@@"};
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index 5fffd03cb5fafeb87b4e926d36d1a48955d5ab54..ea45ab05a14b139478a724b02d94fd07a4f6e3f8 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -1,13 +1,13 @@
/* XPM */
static char * title_5_inactive_xpm[] = {
-"8 19 6 1",
+"8 18 6 1",
" c None",
". c #949594 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
"@ c #D5D6D5 s inactive_color_2",
"# c #B4BAB4 s inactive_mid_2",
"$ c #000000",
-"........",
+"$$$$$$$$",
"++++++++",
"@@@@@@@@",
"@@@@@@@@",
@@ -24,5 +24,4 @@ static char * title_5_inactive_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
-"########",
-"........"};
+"@@@@@@@@"};
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index bb3156e2aeec5ac00469c93238e53c6b7db1a32e..67ebc959e0437aa6fc4d20128fdcd75d58f7a664 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -1,29 +1,27 @@
/* XPM */
static char * top_left_active_xpm[] = {
-"7 19 7 1",
+"7 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
"@ c #B4BAB4 s active_mid_2",
"# c #D5D6D5 s active_color_2",
"$ c #000000",
-"% c #202020",
-" ..",
-" ..++",
-" .#+##",
-" .@####",
-" .@####",
-".@@####",
-".@@####",
-".@@####",
-".@@####",
-".@@####",
-".@@####",
-".@@####",
-".@@####",
-".@@####",
-".@@####",
-".@@####",
-".@@@###",
-".@#@@@@",
-".@#@..."};
+" $",
+" $$+",
+" $++#",
+" $@###",
+" $@####",
+" $@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####""};
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index d80f08a94f9647305680f0e77b4a8af31c8cf6cd..8353adcf78206b6dacdc2aa8acec030a529cce26 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -1,29 +1,27 @@
/* XPM */
static char * top_left_inactive_xpm[] = {
-"7 19 7 1",
+"7 18 6 1",
" c None",
". c #949594 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
"@ c #B4BAB4 s inactive_mid_2",
"# c #D5D6D5 s inactive_color_2",
"$ c #000000",
-"% c #202020",
-" ..",
-" ..++",
-" .#+##",
-" .@####",
-" .@####",
-".@@####",
-".@@####",
-".@@####",
-".@@####",
-".@@####",
-".@@####",
-".@@####",
-".@@####",
-".@@####",
-".@@####",
-".@@####",
-".@@@###",
-".@#@@@@",
-".@#@..."};
+" $",
+" $$+",
+" $++#",
+" $@###",
+" $@####",
+" $@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####",
+"$.@####""};
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index ea0bffd85a225a498b27bb569df7d31e284e2fc0..47e087ff3ae31128dd52ba25072255bc8854b950 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -1,29 +1,28 @@
/* XPM */
static char * top_right_active_xpm[] = {
-"7 19 7 1",
+"7 18 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
"@ c #B4BAB4 s active_mid_2",
"# c #D5D6D5 s active_color_2",
"$ c #000000",
-"% c #202020",
-".. ",
-"++.. ",
-"##+#. ",
-"####@. ",
-"####@. ",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"###@@@.",
-"@@@@#@.",
-"...@#@."};
+"$ ",
+"+$$ ",
+"#++$ ",
+"###@$ ",
+"####@$ ",
+"####@$ ",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$"};
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index 008717ac10127a0eaa6206a829ae6240c80f9269..8a60fc0ad99d6af4700c2ed1dbee5a0cd4a00840 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -1,29 +1,27 @@
/* XPM */
static char * top_right_inactive_xpm[] = {
-"7 19 7 1",
+"7 18 6 1",
" c None",
". c #949594 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
"@ c #B4BAB4 s inactive_mid_2",
"# c #D5D6D5 s inactive_color_2",
"$ c #000000",
-"% c #202020",
-".. ",
-"++.. ",
-"##+#. ",
-"####@. ",
-"####@. ",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"###@@@.",
-"@@@@#@.",
-"...@#@."};
+"$ ",
+"+$$ ",
+"#++$ ",
+"###@$ ",
+"####@$ ",
+"####@$ ",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$"};