From 158a2f1ede70b2175312e4d4acf6cdb8f3448964 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Tue, 3 Feb 2004 21:29:41 +0000
Subject: [PATCH] Change default

(Old svn revision: 11560)
---
 themes/default/close-active.xpm              | 59 +++++++++---------
 themes/default/close-inactive.xpm            | 59 +++++++++---------
 themes/default/close-pressed.xpm             | 57 ++++++++---------
 themes/default/hide-active.xpm               | 59 +++++++++---------
 themes/default/hide-inactive.xpm             | 59 +++++++++---------
 themes/default/hide-pressed.xpm              | 57 ++++++++---------
 themes/default/maximize-active.xpm           | 59 +++++++++---------
 themes/default/maximize-inactive.xpm         | 59 +++++++++---------
 themes/default/maximize-pressed.xpm          | 57 ++++++++---------
 themes/default/maximize-toggled-active.xpm   | 59 +++++++++---------
 themes/default/maximize-toggled-inactive.xpm | 59 +++++++++---------
 themes/default/maximize-toggled-pressed.xpm  | 57 ++++++++---------
 themes/default/menu-active.xpm               | 59 +++++++++---------
 themes/default/menu-inactive.xpm             | 59 +++++++++---------
 themes/default/menu-pressed.xpm              | 57 ++++++++---------
 themes/default/shade-active.xpm              | 59 +++++++++---------
 themes/default/shade-inactive.xpm            | 59 +++++++++---------
 themes/default/shade-pressed.xpm             | 57 ++++++++---------
 themes/default/shade-toggled-active.xpm      | 59 +++++++++---------
 themes/default/shade-toggled-inactive.xpm    | 59 +++++++++---------
 themes/default/shade-toggled-pressed.xpm     | 57 ++++++++---------
 themes/default/stick-active.xpm              | 60 +++++++++---------
 themes/default/stick-inactive.xpm            | 59 +++++++++---------
 themes/default/stick-pressed.xpm             | 57 ++++++++---------
 themes/default/stick-toggled-active.xpm      | 60 +++++++++---------
 themes/default/stick-toggled-inactive.xpm    | 59 +++++++++---------
 themes/default/stick-toggled-pressed.xpm     | 57 ++++++++---------
 themes/default/themerc                       |  6 +-
 themes/default/title-1-active.xpm            | 46 +++++++-------
 themes/default/title-1-inactive.xpm          | 14 ++---
 themes/default/title-2-active.xpm            | 42 ++++++-------
 themes/default/title-2-inactive.xpm          | 62 ++++++++++---------
 themes/default/title-3-active.xpm            |  4 +-
 themes/default/title-3-inactive.xpm          | 62 ++++++++++---------
 themes/default/title-4-active.xpm            | 42 ++++++-------
 themes/default/title-4-inactive.xpm          | 64 ++++++++++----------
 themes/default/title-5-active.xpm            | 46 +++++++-------
 themes/default/title-5-inactive.xpm          | 14 ++---
 themes/default/top-left-active.xpm           | 48 +++++++--------
 themes/default/top-left-inactive.xpm         | 18 +++---
 themes/default/top-right-active.xpm          | 48 +++++++--------
 themes/default/top-right-inactive.xpm        | 18 +++---
 42 files changed, 1042 insertions(+), 1069 deletions(-)

diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index b92b42e1c..510ddd4d0 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,32 +1,31 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"18 23 6 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@$$@@@@$$@@@#.",
-".+@@@$$$@@$$$@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@$$$@@$$$@@@#.",
-".+@@@$$@@@@$$@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++##+++++##++++",
+"++++###+++###++++",
+"++++@###+###@++++",
+"++++$@#####@$++++",
+"+++++$@###@$+++++",
+"++++++#####++++++",
+"+++++###@###+++++",
+"++++###@$@###++++",
+"++++##@$+$@##++++",
+"++++@@$+++$@@++++",
+"++++$$+++++$$++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 0ca6f18a9..a382d6b6a 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,32 +1,31 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"18 23 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@$$@@@@$$@@@#.",
-".+@@@$$$@@$$$@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@$$$@@$$$@@@#.",
-".+@@@$$@@@@$$@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++@@+++++@@++++",
+"++++@@@+++@@@++++",
+"++++$@@@+@@@$++++",
+"+++++$@@@@@$+++++",
+"++++++$@@@$++++++",
+"++++++@@@@@++++++",
+"+++++@@@$@@@+++++",
+"++++@@@$+$@@@++++",
+"++++@@$+++$@@++++",
+"++++$$+++++$$++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index a4b413301..528f73d40 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,30 +1,31 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"18 23 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++@@++++@@++++.",
-".++++@@@++@@@++++.",
-".+++++@@@@@@+++++.",
-".++++++@@@@++++++.",
-".++++++@@@@++++++.",
-".+++++@@@@@@+++++.",
-".++++@@@++@@@++++.",
-".++++@@++++@@++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"................+",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@##@@@@@##@@@=",
+".@@@###@@@###@@@=",
+".@@@.###@###.@@@=",
+".@@@@.#####.@@@@=",
+".@@@@@.###.@@@@@=",
+".@@@@@#####@@@@@=",
+".@@@@###.###@@@@=",
+".@@@###.@.###@@@=",
+".@@@##.@@@.##@@@=",
+".@@@..@@@@@..@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+"+================",
+"                 "}:
+
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 026255933..9e9e75ee0 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,32 +1,31 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"18 23 6 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++#####++++++",
+"++++++#####++++++",
+"++++++##+##++++++",
+"++++++#####++++++",
+"++++++#####++++++",
+"++++++@@@@@++++++",
+"++++++$$$$$++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index eb3703411..ea2241fb0 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,32 +1,31 @@
 /* XPM */
 static char * hide_inactive_xpm[] = {
-"18 23 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++@@@@@++++++",
+"++++++@@@@@++++++",
+"++++++@@+@@++++++",
+"++++++@@@@@++++++",
+"++++++@@@@@++++++",
+"++++++$$$$$++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index a919a29a4..c1f437e13 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,30 +1,31 @@
 /* XPM */
 static char * hide_pressed_xpm[] = {
-"18 23 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".+++++@@@@@@+++++.",
-".+++++@@@@@@+++++.",
-".+++++@@@@@@+++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"................+",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@#####@@@@@=",
+".@@@@@#####@@@@@=",
+".@@@@@##@##@@@@@=",
+".@@@@@#####@@@@@=",
+".@@@@@#####@@@@@=",
+".@@@@@.....@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+"+================",
+"                 "};
+
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index 24642ae61..e430d4c07 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,32 +1,31 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"18 23 6 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@$@@@@@@$@@@#.",
-".+@@@$@@@@@@$@@@#.",
-".+@@@$@@@@@@$@@@#.",
-".+@@@$@@@@@@$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++#########++++",
+"++++#########++++",
+"++++##@@@@@##++++",
+"++++##$$$$$##++++",
+"++++##+++++##++++",
+"++++##+++++##++++",
+"++++##+++++##++++",
+"++++#########++++",
+"++++#########++++",
+"++++@@@@@@@@@++++",
+"++++$$$$$$$$$++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index a511aa2e6..56687a6fe 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,32 +1,31 @@
 /* XPM */
 static char * maximize_inactive_xpm[] = {
-"18 23 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@$@@@@@@$@@@#.",
-".+@@@$@@@@@@$@@@#.",
-".+@@@$@@@@@@$@@@#.",
-".+@@@$@@@@@@$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++@@@@@@@@@++++",
+"++++@@@@@@@@@++++",
+"++++@@$$$$$@@++++",
+"++++@@+++++@@++++",
+"++++@@+++++@@++++",
+"++++@@+++++@@++++",
+"++++@@+++++@@++++",
+"++++@@@@@@@@@++++",
+"++++@@@@@@@@@++++",
+"++++$$$$$$$$$++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index c776d8114..2ff539793 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,30 +1,31 @@
 /* XPM */
 static char * maximize_pressed_xpm[] = {
-"18 23 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++@@@@@@@@++++.",
-".++++@@@@@@@@++++.",
-".++++@@@@@@@@++++.",
-".++++@++++++@++++.",
-".++++@++++++@++++.",
-".++++@++++++@++++.",
-".++++@++++++@++++.",
-".++++@@@@@@@@++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"................+",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@#########@@@=",
+".@@@#########@@@=",
+".@@@##.....##@@@=",
+".@@@##@@@@@##@@@=",
+".@@@##@@@@@##@@@=",
+".@@@##@@@@@##@@@=",
+".@@@##@@@@@##@@@=",
+".@@@#########@@@=",
+".@@@#########@@@=",
+".@@@.........@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+"+================",
+"                 "};
+
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index bb86d4edd..1d9863961 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -1,32 +1,31 @@
 /* XPM */
 static char * maximize_toggled_active_xpm[] = {
-"18 23 6 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@$$$$$$$@@#.",
-".+@@@@@$$$$$$$@@#.",
-".+@@@@@@@@@@@$@@#.",
-".+@@$$$$$$$@@$@@#.",
-".+@@$$$$$$$@@$@@#.",
-".+@@$$$$$$$@@$@@#.",
-".+@@$@@@@@$@$$@@#.",
-".+@@$@@@@@$@@@@@#.",
-".+@@$@@@@@$@@@@@#.",
-".+@@$$$$$$$@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++########++++++",
+"+++########++++++",
+"+++##@@@@##++++++",
+"+++##$$$$##@##+++",
+"+++##++++##@##+++",
+"+++##++++##+##+++",
+"+++########+##+++",
+"+++########+##+++",
+"+++@@@@@++++##+++",
+"+++$$$########+++",
+"++++++########+++",
+"++++++@@@@@@@@+++",
+"++++++$$$$$$$$+++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index f9a0464cc..a3e7e7e95 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -1,32 +1,31 @@
 /* XPM */
 static char * maximize_toggled_inactive_xpm[] = {
-"18 23 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@$$$$$$$@@#.",
-".+@@@@@$$$$$$$@@#.",
-".+@@@@@@@@@@@$@@#.",
-".+@@$$$$$$$@@$@@#.",
-".+@@$$$$$$$@@$@@#.",
-".+@@$$$$$$$@@$@@#.",
-".+@@$@@@@@$@$$@@#.",
-".+@@$@@@@@$@@@@@#.",
-".+@@$@@@@@$@@@@@#.",
-".+@@$$$$$$$@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++@@@@@@@@++++++",
+"+++@@@@@@@@++++++",
+"+++@@$$$$@@++++++",
+"+++@@++++@@$@@+++",
+"+++@@++++@@$@@+++",
+"+++@@++++@@+@@+++",
+"+++@@@@@@@@+@@+++",
+"+++@@@@@@@@+@@+++",
+"+++$$$$$++++@@+++",
+"++++++@@@@@@@@+++",
+"++++++@@@@@@@@+++",
+"++++++$$$$$$$$+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index c3cefc529..5c9c1b16a 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -1,30 +1,31 @@
 /* XPM */
 static char * maximize_toggled_pressed_xpm[] = {
-"18 23 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++@@@@@@@+++.",
-".++++++@@@@@@@+++.",
-".++++++++++++@+++.",
-".+++@@@@@@@++@+++.",
-".+++@@@@@@@++@+++.",
-".+++@@@@@@@++@+++.",
-".+++@+++++@+@@+++.",
-".+++@+++++@++++++.",
-".+++@+++++@++++++.",
-".+++@@@@@@@++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"................+",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@########@@@@@=",
+".@@########@@@@@=",
+".@@##....##@@@@@=",
+".@@##@@@@##.##@@=",
+".@@##@@@@##.##@@=",
+".@@##@@@@##@##@@=",
+".@@########@##@@=",
+".@@########@##@@=",
+".@@.....@@@@##@@=",
+".@@@@@########@@=",
+".@@@@@########@@=",
+".@@@@@........@@=",
+".@@@@@@@@@@@@@@@=",
+"+================",
+"                 "};
+
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index fd52a2878..d06d5fb96 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -1,32 +1,31 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"18 23 6 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@$@@@@$@@@@#.",
-".+@@@$$$@@$$$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++###########+++",
+"+++###########+++",
+"+++@@@@@@@@@@@+++",
+"+++$#########$+++",
+"++++##@@@@@##++++",
+"++++@##$$$##@++++",
+"++++$@##+##@$++++",
+"+++++$@###@$+++++",
+"++++++$@#@$++++++",
+"+++++++$@$+++++++",
+"++++++++$++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index d7698c167..d28e430c5 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -1,32 +1,31 @@
 /* XPM */
 static char * menu_inactive_xpm[] = {
-"18 23 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@$@@@@$@@@@#.",
-".+@@@$$$@@$$$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++@@@@@@@@@@@+++",
+"+++@@@@@@@@@@@+++",
+"+++$$$$$$$$$$$+++",
+"++++@@@@@@@@@++++",
+"++++@@$$$$$@@++++",
+"++++$@@+++@@$++++",
+"+++++$@@+@@$+++++",
+"++++++$@@@$++++++",
+"+++++++$@$+++++++",
+"++++++++$++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index cc2b6e9fc..331c6cbf9 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -1,30 +1,31 @@
 /* XPM */
 static char * menu_pressed_xpm[] = {
-"18 23 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".+++++@++++@+++++.",
-".++++@@@++@@@++++.",
-".++++@@@@@@@@++++.",
-".+++++@@@@@@+++++.",
-".++++++@@@@++++++.",
-".+++++++@@+++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"................+",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@###########@@=",
+".@@###########@@=",
+".@@...........@@=",
+".@@@#########@@@=",
+".@@@##.....##@@@=",
+".@@@.##.@.##.@@@=",
+".@@@@.##.##.@@@@=",
+".@@@@@.###.@@@@@=",
+".@@@@@@.#.@@@@@@=",
+".@@@@@@@.@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+"+================",
+"                 "};
+
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index cd3475a00..cb2ce98f8 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,32 +1,31 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"18 23 6 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@$$@$$@$$@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #B4BAB4 s active_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++++$++++++++",
+"+++++++$$$+++++++",
+"++++++$$@$$++++++",
+"+++++$$@#@$$+++++",
+"++++$$@#+#@$$++++",
+"++++$$$$$$$$$++++",
+"++++@@@@@@@@@++++",
+"+++$$$$$$$$$$$+++",
+"+++$$$$$$$$$$$+++",
+"+++@@@@@@@@@@@+++",
+"+++###########+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index a27a13b0d..12983e5ea 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,32 +1,31 @@
 /* XPM */
 static char * shade_inactive_xpm[] = {
-"18 23 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@$$@$$@$$@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #B4BAB4 s inactive_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++++@++++++++",
+"+++++++@@@+++++++",
+"++++++@@#@@++++++",
+"+++++@@#+#@@+++++",
+"++++@@+++++@@++++",
+"++++@@@@@@@@@++++",
+"++++#########++++",
+"+++@@@@@@@@@@@+++",
+"+++@@@@@@@@@@@+++",
+"+++###########+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index f6c22629b..42fb2dd3a 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,30 +1,31 @@
 /* XPM */
 static char * shade_pressed_xpm[] = {
-"18 23 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".+++++++@@+++++++.",
-".++++++@@@@++++++.",
-".+++++@@@@@@+++++.",
-".++++@@@@@@@@++++.",
-".++++@@+@@+@@++++.",
-".+++++++@@+++++++.",
-".+++++++@@+++++++.",
-".+++++++@@+++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"................+",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@#@@@@@@@=",
+".@@@@@@###@@@@@@=",
+".@@@@@##.##@@@@@=",
+".@@@@##.@.##@@@@=",
+".@@@##.@@@.##@@@=",
+".@@@#########@@@=",
+".@@@.........@@@=",
+".@@###########@@=",
+".@@###########@@=",
+".@@...........@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+"+================",
+"                 "};
+
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index dfccaf310..5b89b2169 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -1,32 +1,31 @@
 /* XPM */
 static char * shade_toggled_active_xpm[] = {
-"18 23 6 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@$$@$$@$$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #B4BAB4 s active_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++$$$$$$$$$++++",
+"++++$$@@@@@$$++++",
+"++++@$$###$$@++++",
+"++++#@$$+$$@#++++",
+"+++++#@$$$@#+++++",
+"++++++#@$@#++++++",
+"+++++++#@#+++++++",
+"+++$$$$$$$$$$$+++",
+"+++$$$$$$$$$$$+++",
+"+++@@@@@@@@@@@+++",
+"+++###########+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index ef69a4b23..e17fa92c7 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -1,32 +1,31 @@
 /* XPM */
 static char * shade_toggled_inactive_xpm[] = {
-"18 23 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@$$@$$@$$@@@#.",
-".+@@@$$$$$$$$@@@#.",
-".+@@@@$$$$$$@@@@#.",
-".+@@@@@$$$$@@@@@#.",
-".+@@@@@@$$@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #B4BAB4 s inactive_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++@@@@@@@@@++++",
+"++++@@#####@@++++",
+"++++#@@+++@@#++++",
+"+++++#@@+@@#+++++",
+"++++++#@@@#++++++",
+"+++++++#@#+++++++",
+"++++++++#++++++++",
+"+++@@@@@@@@@@@+++",
+"+++@@@@@@@@@@@+++",
+"+++###########+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index 36c4cdbfd..b7189a48d 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -1,30 +1,31 @@
 /* XPM */
 static char * shade_toggled_pressed_xpm[] = {
-"18 23 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".+++++++@@+++++++.",
-".+++++++@@+++++++.",
-".+++++++@@+++++++.",
-".++++@@+@@+@@++++.",
-".++++@@@@@@@@++++.",
-".+++++@@@@@@+++++.",
-".++++++@@@@++++++.",
-".+++++++@@+++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"................+",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@#########@@@=",
+".@@@##.....##@@@=",
+".@@@.##@@@##.@@@=",
+".@@@@.##@##.@@@@=",
+".@@@@@.###.@@@@@=",
+".@@@@@@.#.@@@@@@=",
+".@@@@@@@.@@@@@@@=",
+".@@###########@@=",
+".@@###########@@=",
+".@@...........@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+"+================",
+"                 "};
+
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 5184d9abc..789d8c7be 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,33 +1,31 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"18 23 7 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #949595 s active_shadow_2",
-"%	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@$%%%%$@@@@#.",
-".+@@@$%%%%%%$@@@#.",
-".+@@@%%$@@$%%@@@#.",
-".+@@@%%@@@@%%@@@#.",
-".+@@@%%@@@@%%@@@#.",
-".+@@@%%$@@$%%@@@#.",
-".+@@@$%%%%%%$@@@#.",
-".+@@@@$%%%%$@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++#+++#+++",
+"+++++++++#####+++",
+"+++@######++##+++",
+"+++#$$$$$#$$##+++",
+"+++@######@@##+++",
+"+++$@@@@@#####+++",
+"++++$$$$$#@@@#+++",
+"+++++++++@$$$@+++",
+"+++++++++$+++$+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index eadb8ed61..ba25fc57f 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,32 +1,31 @@
 /* XPM */
 static char * stick_inactive_xpm[] = {
-"18 23 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@#$$$$#@@@@#.",
-".+@@@#$$$$$$#@@@#.",
-".+@@@$$#@@#$$@@@#.",
-".+@@@$$@@@@$$@@@#.",
-".+@@@$$@@@@$$@@@#.",
-".+@@@$$#@@#$$@@@#.",
-".+@@@#$$$$$$#@@@#.",
-".+@@@@#$$$$#@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++@+++@+++",
+"+++++++++@@@@@+++",
+"+++$@@@@@@++@@+++",
+"+++@$$$$$@$$@@+++",
+"+++$@@@@@@$$@@+++",
+"++++$$$$$@@@@@+++",
+"+++++++++@$$$@+++",
+"+++++++++$+++$+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index 6ca09059c..06f52e64d 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,30 +1,31 @@
 /* XPM */
 static char * stick_pressed_xpm[] = {
-"18 23 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++@@@@++++++.",
-".+++++@@@@@@+++++.",
-".++++@@@++@@@++++.",
-".++++@@++++@@++++.",
-".++++@@++++@@++++.",
-".++++@@@++@@@++++.",
-".+++++@@@@@@+++++.",
-".++++++@@@@++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"................+",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@#@@@#@@=",
+".@@@@@@@@#####@@=",
+".@@.######@@##@@=",
+".@@#.....#..##@@=",
+".@@.######..##@@=",
+".@@@.....#####@@=",
+".@@@@@@@@#...#@@=",
+".@@@@@@@@.@@@.@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+".@@@@@@@@@@@@@@@=",
+"+================",
+"                 "};
+
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index 1153ab53b..46a233db1 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -1,33 +1,31 @@
 /* XPM */
 static char * stick_toggled_active_xpm[] = {
-"18 23 7 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_2",,
-"@	c #D5D6D5 s active_color_2",
-"#	c #B4BAB5 s active_mid_2",
-"$	c #949595 s active_shadow_2",
-"%	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@$%%%%$@@@@#.",
-".+@@@$%%%%%%$@@@#.",
-".+@@@%%$@@$%%@@@#.",
-".+@@@%%@%%@%%@@@#.",
-".+@@@%%@%%@%%@@@#.",
-".+@@@%%$@@$%%@@@#.",
-".+@@@$%%%%%%$@@@#.",
-".+@@@@$%%%%$@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #B4BAB4 s active_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++#$$$#++++++",
+"+++++#$++@$#+++++",
+"+++++$+++#@$#++++",
+"+++++$++$#@$@++++",
+"+++++$@###@$@#+++",
+"+++++#$@@@$@@#+++",
+"++++++#$$$@@##+++",
+"+++++++#@@@##++++",
+"+++++++++###+++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 92a0bcfe7..f9e704a98 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -1,32 +1,31 @@
 /* XPM */
 static char * stick_toggled_inactive_xpm[] = {
-"18 23 6 1",
-" 	c None",
-".	c #4B58A2 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_2",
-"@	c #D5D6D5 s inactive_color_2",
-"#	c #B4BAB5 s inactive_mid_2",
-"$	c #949595 s inactive_shadow_2",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@#$$$$#@@@@#.",
-".+@@@#$$$$$$#@@@#.",
-".+@@@$$#@@#$$@@@#.",
-".+@@@$$@$$@$$@@@#.",
-".+@@@$$@$$@$$@@@#.",
-".+@@@$$#@@#$$@@@#.",
-".+@@@#$$$$$$#@@@#.",
-".+@@@@#$$$$#@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-".+@@@@@@@@@@@@@@#.",
-" .##############. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #B4BAB4 s inactive_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++#@@@#++++++",
+"+++++#@++#@#+++++",
+"+++++@+++##@#++++",
+"+++++@++@##@#++++",
+"+++++@#####@##+++",
+"+++++#@###@###+++",
+"++++++#@@@####+++",
+"+++++++######++++",
+"+++++++++###+++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"                 "};
+
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index 8e8057844..f559d2c43 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -1,30 +1,31 @@
 /* XPM */
 static char * stick_toggled_pressed_xpm[] = {
-"18 23 4 1",
-" 	c None",
-".	c #4B58A2 s active_shadow_1",
-"+	c #949595 s active_shadow_2",
-"@	c #000000",
-"                  ",
-"                  ",
-"                  ",
-"                  ",
-"  ..............  ",
-" .++++++++++++++. ",
-".++++++++++++++++.",
-".++++++++++++++++.",
-".++++++@@@@++++++.",
-".+++++@@@@@@+++++.",
-".++++@@@++@@@++++.",
-".++++@@+@@+@@++++.",
-".++++@@+@@+@@++++.",
-".++++@@@++@@@++++.",
-".+++++@@@@@@+++++.",
-".++++++@@@@++++++.",
-".++++++++++++++++.",
-".++++++++++++++++.",
-" .++++++++++++++. ",
-"  ..............  ",
-"                  ",
-"                  ",
-"                  "};
+"17 21 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #B4BAB4 s active_mid_2",
+"@      c #D5D6D5 s active_color_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+"................@",
+".+++++++++++++++=",
+".+++++++++++++++=",
+".+++++++++++++++=",
+".+++++++++++++++=",
+".+++++.###.+++++=",
+".++++.#@@.#.++++=",
+".++++#@@@+.#.+++=",
+".++++#@@#+.#.+++=",
+".++++#.+++.#..++=",
+".++++.#...#...++=",
+".+++++.###....++=",
+".++++++......+++=",
+".++++++++...++++=",
+".+++++++++++++++=",
+".+++++++++++++++=",
+"@================",
+"                 "};
+
diff --git a/themes/default/themerc b/themes/default/themerc
index 1168c0f4b..195c07ae7 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -1,8 +1,8 @@
-button_offset=1
+button_offset=2
 button_spacing=2
 full_width_title=true
 title_horizontal_offset=0
-title_vertical_offset_active=3
-title_vertical_offset_inactive=3
+title_vertical_offset_active=2
+title_vertical_offset_inactive=2
 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 6e2ee8321..737534c12 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -1,32 +1,30 @@
 /* XPM */
 static char * title_1_active_xpm[] = {
-"8 23 6 1",
+"8 21 6 1",
 " 	c None",
-".	c #949594 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #D5D6D5 s active_color_1",
-"#	c #B4BAB4 s active_mid_1",
+".	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",
 "$$$$$$$$",
 "$$$$$$$$",
 "++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
 "........"};
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index 47626cb6a..8260a4866 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -1,11 +1,11 @@
 /* XPM */
-static char * title_inactive_xpm[] = {
-"8 23 6 1",
+static char * title_1_inactive_xpm[] = {
+"8 21 6 1",
 " 	c None",
-".	c #949594 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #D5D6D5 s inactive_color_1",
-"#	c #B4BAB4 s inactive_mid_1",
+".	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",
 "$$$$$$$$",
 "$$$$$$$$",
@@ -27,6 +27,4 @@ static char * title_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "........"};
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index a6818f100..e5e76bc91 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 23 10 1",
+"16 21 10 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
@@ -13,24 +13,22 @@ static char * title_2_active_xpm[] = {
 "=	c #FFFFFF s active_hilight_1",
 "................",
 "................",
-"====$#==========",
-"====$#$$$$$$$$$$",
-"====$#$$$$$$$$$$",
-"====$#$$$$$$$$$$",
-"====$#$$$$$$$$$$",
-"====$#$$$$$$$$$$",
-"====$#$$$$$$$$$$",
-"====$#$$$$$$$$$$",
-"====$#$$$$$$$$$$",
-"====$#$$$$$$$$$$",
-"====$#$$$$$$$$$$",
-"====$#$$$$$$$$$$",
-"====$#$$$$$$$$$$",
-"====$#$$$$$$$$$$",
-"====$#$$$$$$$$$$",
-"====$#$$$$$$$$$$",
-"====$#$$$$$$$$$$",
-"====$#$$$$$$$$$$",
-"====$#$$$$$$$$$$",
-"====$#%%%%%%%%%%",
-"################"};
+"+++++===========",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"*****###########"};
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index 47626cb6a..84a9647d7 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -1,32 +1,34 @@
 /* XPM */
-static char * title_inactive_xpm[] = {
-"8 23 6 1",
+static char * title_2_inactive_xpm[] = {
+"16 21 10 1",
 " 	c None",
-".	c #949594 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #D5D6D5 s inactive_color_1",
-"#	c #B4BAB4 s inactive_mid_1",
-"$	c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
-"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"........"};
+".	c #000000",
+"+	c #FFFFFF s inactive_hilight_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #4B58A2 s inactive_shadow_1",
+"$	c #525FAB s inactive_color_1",
+"%	c #848FD6 s inactive_mid_1",
+"&	c #B4BAB4 s inactive_mid_2",
+"*	c #949594 s inactive_shadow_2",
+"=	c #FFFFFF s inactive_hilight_1",
+"................",
+"................",
+"+++++===========",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"@@@@@$$$$$$$$$$$",
+"*****###########"};
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index 01eb11347..f89c8d35d 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 23 10 1",
+"20 21 10 1",
 " 	c None",
 ".	c #000000",
 "+	c #FFFFFF s active_hilight_2",
@@ -31,6 +31,4 @@ static char * title_3_active_xpm[] = {
 "%%%%%%%%%%%%%%%%%%%%",
 "%%%%%%%%%%%%%%%%%%%%",
 "%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"$$$$$$$$$$$$$$$$$$$$",
 "####################"};
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index 47626cb6a..62d5d7f32 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -1,32 +1,34 @@
 /* XPM */
-static char * title_inactive_xpm[] = {
-"8 23 6 1",
+static char * title_3_inactive_xpm[] = {
+"20 21 10 1",
 " 	c None",
-".	c #949594 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #D5D6D5 s inactive_color_1",
-"#	c #B4BAB4 s inactive_mid_1",
-"$	c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
-"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"........"};
+".	c #000000",
+"+	c #FFFFFF s inactive_hilight_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #4B58A2 s inactive_shadow_1",
+"$	c #848FD6 s inactive_mid_1",
+"%	c #525FAB s inactive_color_1",
+"&	c #B4BAB4 s inactive_mid_2",
+"*	c #949594 s inactive_shadow_2",
+"=	c #FFFFFF s inactive_hilight_1",
+"....................",
+"....................",
+"====================",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"####################"};
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index 8cd600b53..5a9b3d467 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 23 10 1",
+"16 21 10 1",
 "       c None",
 ".      c #000000",
 "+      c #FFFFFF s active_hilight_2",
@@ -13,24 +13,22 @@ static char * title_4_active_xpm[] = {
 "=      c #FFFFFF s active_hilight_1",
 "................",
 "................",
-"==========$&====",
-"&&&&&&&&&&$&====",
-"&&&&&&&&&&$&====",
-"&&&&&&&&&&$&====",
-"&&&&&&&&&&$&====",
-"&&&&&&&&&&$&====",
-"&&&&&&&&&&$&====",
-"&&&&&&&&&&$&====",
-"&&&&&&&&&&$&====",
-"&&&&&&&&&&$&====",
-"&&&&&&&&&&$&====",
-"&&&&&&&&&&$&====",
-"&&&&&&&&&&$&====",
-"&&&&&&&&&&$&====",
-"&&&&&&&&&&$&====",
-"&&&&&&&&&&$&====",
-"&&&&&&&&&&$&====",
-"&&&&&&&&&&$&====",
-"&&&&&&&&&&$&====",
-"%%%%%%%%%%$&====",
-"$$$$$$$$$$$$$$$$"};
+"===========+++++",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"$$$$$$$$$$$#####"};
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index 47626cb6a..7aeebae91 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -1,32 +1,34 @@
 /* XPM */
-static char * title_inactive_xpm[] = {
-"8 23 6 1",
-" 	c None",
-".	c #949594 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #D5D6D5 s inactive_color_1",
-"#	c #B4BAB4 s inactive_mid_1",
-"$	c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
-"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"........"};
+static char * title_4_inactive_xpm[] = {
+"16 21 10 1",
+"       c None",
+".      c #000000",
+"+      c #FFFFFF s inactive_hilight_2",
+"@      c #D5D6D5 s inactive_color_2",
+"#      c #949594 s inactive_shadow_2",
+"$      c #4B58A2 s inactive_shadow_1",
+"%      c #848FD6 s inactive_mid_1",
+"&      c #525FAB s inactive_color_1",
+"*      c #B4BAB4 s inactive_mid_2",
+"=      c #FFFFFF s inactive_hilight_1",
+"................",
+"................",
+"===========+++++",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"&&&&&&&&&&&@@@@@",
+"$$$$$$$$$$$#####"};
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index ddacb57a8..2bb65d29d 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -1,32 +1,30 @@
 /* XPM */
 static char * title_5_active_xpm[] = {
-"8 23 6 1",
+"8 21 6 1",
 " 	c None",
-".	c #949594 s active_shadow_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #D5D6D5 s active_color_1",
-"#	c #B4BAB4 s active_mid_1",
+".	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",
 "$$$$$$$$",
 "$$$$$$$$",
 "++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
-"++++++++",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
 "........"};
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index 47626cb6a..d0a08a562 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -1,11 +1,11 @@
 /* XPM */
-static char * title_inactive_xpm[] = {
-"8 23 6 1",
+static char * title_5_inactive_xpm[] = {
+"8 21 6 1",
 " 	c None",
-".	c #949594 s inactive_shadow_1",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #D5D6D5 s inactive_color_1",
-"#	c #B4BAB4 s inactive_mid_1",
+".	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",
 "$$$$$$$$",
 "$$$$$$$$",
@@ -27,6 +27,4 @@ static char * title_inactive_xpm[] = {
 "@@@@@@@@",
 "@@@@@@@@",
 "@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
 "........"};
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index 0daea67cb..7234e9d6d 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -1,32 +1,30 @@
 /* XPM */
 static char * top_left_active_xpm[] = {
-"7 23 6 1",
+"7 21 6 1",
 "       c None",
-".      c #949594 s active_shadow_1",
-"+      c #FFFFFF s active_hilight_1",
-"@      c #B4BAB4 s active_mid_1",
-"#      c #D5D6D5 s active_color_1",
+".      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",
 "    $$$",
 "  $$$$$",
 " $$$.@+",
-" $$@+++",
-"$$.++++",
-"$$@++++",
-"$$+++++",
-"$$+++++",
-"$$+++++",
-"$$+++++",
-"$$+++++",
-"$$+++++",
-"$$+++++",
-"$$+++++",
-"$$+++++",
-"$$+++++",
-"$$+++++",
-"$$+++++",
-"$$+++++",
-"$$+++++",
-"$$+++++",
-"$$+++++",
-"$$....."};
+" $$@#+#",
+"$$.####",
+"$$@####",
+"$$#####",
+"$$#####",
+"$$#####",
+"$$#####",
+"$$#####",
+"$$#####",
+"$$#####",
+"$$#####",
+"$$#####",
+"$$#####",
+"$$#####",
+"$$#####",
+"$$#####",
+"$$#####",
+"$$##@.."};
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index eff00d939..eb89dd145 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -1,16 +1,16 @@
 /* XPM */
 static char * top_left_inactive_xpm[] = {
-"7 23 6 1",
+"7 21 6 1",
 "       c None",
-".      c #949594 s inactive_shadow_1",
-"+      c #FFFFFF s inactive_hilight_1",
-"@      c #B4BAB4 s inactive_mid_1",
-"#      c #D5D6D5 s inactive_color_1",
+".      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",
 "    $$$",
 "  $$$$$",
-" $$$.++",
-" $$@+##",
+" $$$.@+",
+" $$@#+#",
 "$$.####",
 "$$@####",
 "$$#####",
@@ -27,6 +27,4 @@ static char * top_left_inactive_xpm[] = {
 "$$#####",
 "$$#####",
 "$$#####",
-"$$#####",
-"$$#####",
-"$$....."};
+"$$##@.."};
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index aef88077d..1fca73675 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -1,32 +1,30 @@
 /* XPM */
 static char * top_right_active_xpm[] = {
-"7 23 6 1",
+"7 21 6 1",
 "       c None",
-".      c #949594 s active_shadow_1",
-"+      c #FFFFFF s active_hilight_1",
-"@      c #B4BAB4 s active_mid_1",
-"#      c #D5D6D5 s active_color_1",
+".      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",
 "$$$    ",
 "$$$$$  ",
 "+@.$$$ ",
-"+++@$$ ",
-"++++.$$",
-"++++@$$",
-"+++++$$",
-"+++++$$",
-"+++++$$",
-"+++++$$",
-"+++++$$",
-"+++++$$",
-"+++++$$",
-"+++++$$",
-"+++++$$",
-"+++++$$",
-"+++++$$",
-"+++++$$",
-"+++++$$",
-"+++++$$",
-"+++++$$",
-"+++++$$",
-".....$$"};
+"#+#@$$ ",
+"####.$$",
+"####@$$",
+"#####$$",
+"#####$$",
+"#####$$",
+"#####$$",
+"#####$$",
+"#####$$",
+"#####$$",
+"#####$$",
+"#####$$",
+"#####$$",
+"#####$$",
+"#####$$",
+"#####$$",
+"#####$$",
+"..@##$$"};
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index 455095996..a7bd0095d 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -1,16 +1,16 @@
 /* XPM */
 static char * top_right_inactive_xpm[] = {
-"7 23 6 1",
+"7 21 6 1",
 "       c None",
-".      c #949594 s inactive_shadow_1",
-"+      c #FFFFFF s inactive_hilight_1",
-"@      c #B4BAB4 s inactive_mid_1",
-"#      c #D5D6D5 s inactive_color_1",
+".      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",
 "$$$    ",
 "$$$$$  ",
-"++.$$$ ",
-"##+@$$ ",
+"+@.$$$ ",
+"#+#@$$ ",
 "####.$$",
 "####@$$",
 "#####$$",
@@ -27,6 +27,4 @@ static char * top_right_inactive_xpm[] = {
 "#####$$",
 "#####$$",
 "#####$$",
-"#####$$",
-"#####$$",
-".....$$"};
+"..@##$$"};
-- 
GitLab