From 8db879c5da38527936e37c875b444430a0382976 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Sat, 22 Nov 2003 23:03:41 +0000
Subject: [PATCH] Themes Merges from xfce_4_0
(Old svn revision: 11447)
---
src/misc.c | 19 ++++--
themes/default-4.0/bottom-active.xpm | 4 +-
themes/default-4.0/bottom-inactive.xpm | 4 +-
themes/default-4.0/bottom-left-active.xpm | 24 +++----
themes/default-4.0/bottom-left-inactive.xpm | 24 +++----
themes/default-4.0/bottom-right-active.xpm | 24 +++----
themes/default-4.0/bottom-right-inactive.xpm | 24 +++----
themes/default-4.0/close-active.xpm | 7 +-
themes/default-4.0/close-inactive.xpm | 7 +-
themes/default-4.0/close-pressed.xpm | 5 +-
themes/default-4.0/hide-active.xpm | 7 +-
themes/default-4.0/hide-inactive.xpm | 7 +-
themes/default-4.0/hide-pressed.xpm | 5 +-
themes/default-4.0/left-active.xpm | 64 +++++++++----------
themes/default-4.0/left-inactive.xpm | 64 +++++++++----------
themes/default-4.0/maximize-active.xpm | 7 +-
themes/default-4.0/maximize-inactive.xpm | 7 +-
themes/default-4.0/maximize-pressed.xpm | 5 +-
.../default-4.0/maximize-toggled-active.xpm | 7 +-
.../default-4.0/maximize-toggled-inactive.xpm | 7 +-
.../default-4.0/maximize-toggled-pressed.xpm | 5 +-
themes/default-4.0/menu-active.xpm | 7 +-
themes/default-4.0/menu-inactive.xpm | 7 +-
themes/default-4.0/menu-pressed.xpm | 6 +-
themes/default-4.0/right-active.xpm | 64 +++++++++----------
themes/default-4.0/right-inactive.xpm | 64 +++++++++----------
themes/default-4.0/shade-active.xpm | 7 +-
themes/default-4.0/shade-inactive.xpm | 7 +-
themes/default-4.0/shade-pressed.xpm | 5 +-
themes/default-4.0/shade-toggled-active.xpm | 7 +-
themes/default-4.0/shade-toggled-inactive.xpm | 7 +-
themes/default-4.0/shade-toggled-pressed.xpm | 5 +-
themes/default-4.0/stick-active.xpm | 7 +-
themes/default-4.0/stick-inactive.xpm | 7 +-
themes/default-4.0/stick-pressed.xpm | 5 +-
themes/default-4.0/stick-toggled-active.xpm | 7 +-
themes/default-4.0/stick-toggled-inactive.xpm | 7 +-
themes/default-4.0/stick-toggled-pressed.xpm | 5 +-
themes/default-4.0/themerc | 8 +--
themes/default-4.0/title-1-active.xpm | 7 +-
themes/default-4.0/title-1-inactive.xpm | 7 +-
themes/default-4.0/title-2-active.xpm | 11 ++--
themes/default-4.0/title-2-inactive.xpm | 11 ++--
themes/default-4.0/title-3-active.xpm | 7 +-
themes/default-4.0/title-3-inactive.xpm | 7 +-
themes/default-4.0/title-4-active.xpm | 11 ++--
themes/default-4.0/title-4-inactive.xpm | 11 ++--
themes/default-4.0/title-5-active.xpm | 7 +-
themes/default-4.0/title-5-inactive.xpm | 7 +-
themes/default-4.0/top-left-active.xpm | 7 +-
themes/default-4.0/top-left-inactive.xpm | 7 +-
themes/default-4.0/top-right-active.xpm | 8 +--
themes/default-4.0/top-right-inactive.xpm | 7 +-
themes/default/bottom-active.xpm | 4 +-
themes/default/bottom-inactive.xpm | 4 +-
themes/default/bottom-left-active.xpm | 32 +++++-----
themes/default/bottom-left-inactive.xpm | 32 +++++-----
themes/default/bottom-right-active.xpm | 32 +++++-----
themes/default/bottom-right-inactive.xpm | 32 +++++-----
themes/default/close-active.xpm | 5 +-
themes/default/close-inactive.xpm | 5 +-
themes/default/close-pressed.xpm | 5 +-
themes/default/hide-active.xpm | 5 +-
themes/default/hide-inactive.xpm | 5 +-
themes/default/hide-pressed.xpm | 5 +-
themes/default/left-active.xpm | 64 +++++++++----------
themes/default/left-inactive.xpm | 64 +++++++++----------
themes/default/maximize-active.xpm | 5 +-
themes/default/maximize-inactive.xpm | 5 +-
themes/default/maximize-pressed.xpm | 5 +-
themes/default/maximize-toggled-active.xpm | 5 +-
themes/default/maximize-toggled-inactive.xpm | 5 +-
themes/default/maximize-toggled-pressed.xpm | 5 +-
themes/default/menu-active.xpm | 5 +-
themes/default/menu-inactive.xpm | 5 +-
themes/default/menu-pressed.xpm | 6 +-
themes/default/right-active.xpm | 64 +++++++++----------
themes/default/right-inactive.xpm | 64 +++++++++----------
themes/default/shade-active.xpm | 5 +-
themes/default/shade-inactive.xpm | 5 +-
themes/default/shade-pressed.xpm | 5 +-
themes/default/shade-toggled-active.xpm | 5 +-
themes/default/shade-toggled-inactive.xpm | 5 +-
themes/default/shade-toggled-pressed.xpm | 5 +-
themes/default/stick-active.xpm | 5 +-
themes/default/stick-inactive.xpm | 5 +-
themes/default/stick-pressed.xpm | 5 +-
themes/default/stick-toggled-active.xpm | 5 +-
themes/default/stick-toggled-inactive.xpm | 5 +-
themes/default/stick-toggled-pressed.xpm | 5 +-
themes/default/themerc | 8 +--
themes/default/title-1-active.xpm | 7 +-
themes/default/title-1-inactive.xpm | 7 +-
themes/default/title-2-active.xpm | 13 ++--
themes/default/title-2-inactive.xpm | 13 ++--
themes/default/title-3-active.xpm | 7 +-
themes/default/title-3-inactive.xpm | 7 +-
themes/default/title-4-active.xpm | 13 ++--
themes/default/title-4-inactive.xpm | 13 ++--
themes/default/title-5-active.xpm | 7 +-
themes/default/title-5-inactive.xpm | 7 +-
themes/default/top-left-active.xpm | 40 ++++++------
themes/default/top-left-inactive.xpm | 40 ++++++------
themes/default/top-right-active.xpm | 41 ++++++------
themes/default/top-right-inactive.xpm | 40 ++++++------
105 files changed, 695 insertions(+), 770 deletions(-)
diff --git a/src/misc.c b/src/misc.c
index cc49fc15b..9bdff84ed 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 93561c94d..fdcc9b8db 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 2e491a07e..5541a0fdb 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 4641a202d..6bc3b9895 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 5f1fa10b1..f0c93c2b5 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 407faee64..d04b3933b 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 486a7f2cc..8e929bd73 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 95e96d0f6..cb3bdd772 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 30e91c161..78bb106d2 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 fcdfe1a0c..a6c4a82b6 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 24a9ca503..ac61bd12a 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 3c792a8ac..65ef8890b 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 a14193af9..efc7eb1b8 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 b90ab152b..9ec0d6b7c 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 0e8958919..ff0710a87 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 2cf4b17f6..eb40ed9de 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 808feebbe..e7bf09709 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 d70690276..d80c65eaf 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 68a3e242c..19ab7be94 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 98cc0a9a1..447c3568f 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 b8fcee943..a3e7d1e57 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 3642e9425..736cc32fe 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 5351e0f79..85fd35009 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 151f26e9c..9c59c954c 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 00949a67a..f0989ffb9 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 b9f80e45d..48a10d25a 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 59ef22f7a..61502a82d 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 553eb3e24..f549c142b 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 20be91624..35d609b99 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 adc0e08e3..6bcdbaaf2 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 d78883a35..7bc8af11f 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 b75dcc888..2f2b30570 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 60f357fe4..659abf79a 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 840a6329a..16a9a6ec6 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 482f970dc..657a35795 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 cdaf1de70..864307503 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 dd0b16bcf..4766b1021 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 805ab1e29..57ce7280f 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 326bf8628..b39f2670f 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 bbf592a61..6e35b0c57 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 0c755cba0..14e72e85d 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 d4178eef0..50f5587b1 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 01f3e2fb2..f9d31752b 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 a50a2174b..2ad2dd2a2 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 94f486f46..4d4633a37 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 47dcde8df..f0bcbc328 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 dc133b240..d9002ed59 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 527bde6ce..af62128a3 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 0da189c85..ea45ab05a 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 b00297b44..67ebc959e 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 a904eba4b..8353adcf7 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 486aaec58..47e087ff3 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 bf733ec00..8a60fc0ad 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 f7d205dbc..8503d821b 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 4deb1181a..4c92c8f37 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 43ea7b702..d72e0d491 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 664538f27..247dc251c 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 d3e3382b1..9fea6bb8e 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 807dd277c..004c66699 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 bc9387077..cb3bdd772 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 0d31ca806..78bb106d2 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 fcdfe1a0c..a6c4a82b6 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 12aa8e4ee..ac61bd12a 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 ec254c2bf..65ef8890b 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 a14193af9..efc7eb1b8 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 8c4ed0c3f..694b0282f 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 cc2a14cce..97d2d612d 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 5f5dad64c..eb40ed9de 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 400688749..e7bf09709 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 d70690276..d80c65eaf 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 eb7e48515..19ab7be94 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 d8e7668d5..447c3568f 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 b8fcee943..a3e7d1e57 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 60be60818..736cc32fe 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 b09a82de3..85fd35009 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 151f26e9c..9c59c954c 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 7d4c1464b..94fdff063 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 ab8e3b501..4d4271c2a 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 4e7eff510..61502a82d 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 6d777299b..f549c142b 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 20be91624..35d609b99 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 42a8e45f5..6bcdbaaf2 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 df0096dbf..7bc8af11f 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 b75dcc888..2f2b30570 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 6c36137fc..659abf79a 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 d67007219..16a9a6ec6 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 482f970dc..657a35795 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 888744f27..864307503 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 276058815..4766b1021 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 805ab1e29..57ce7280f 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 a9b3d6fd1..0f1f1bd2a 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 5bed104e2..6e35b0c57 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 e41de19e3..14e72e85d 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 3561a2e9d..50f5587b1 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 cd21a3bfa..f9d31752b 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 857c14e45..2ad2dd2a2 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 eae1c1d45..4d4633a37 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 a0dca80af..f0bcbc328 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 e4494c7b2..d9002ed59 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 30de9e38f..af62128a3 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 5fffd03cb..ea45ab05a 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 bb3156e2a..67ebc959e 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 d80f08a94..8353adcf7 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 ea0bffd85..47e087ff3 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 008717ac1..8a60fc0ad 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",
-".. ",
-"++.. ",
-"##+#. ",
-"####@. ",
-"####@. ",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"####@@.",
-"###@@@.",
-"@@@@#@.",
-"...@#@."};
+"$ ",
+"+$$ ",
+"#++$ ",
+"###@$ ",
+"####@$ ",
+"####@$ ",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$",
+"####@.$"};
--
GitLab