From 00aa2414b65a9e2045d34eb8865fa319ed456f1a Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Wed, 4 Feb 2004 21:06:55 +0000
Subject: [PATCH] Change default theme for xfwm4

(Old svn revision: 11561)
---
 themes/default/bottom-active.xpm             | 23 +++---
 themes/default/bottom-inactive.xpm           | 23 +++---
 themes/default/bottom-left-active.xpm        | 45 ++++++------
 themes/default/bottom-left-inactive.xpm      | 45 ++++++------
 themes/default/bottom-right-active.xpm       | 45 ++++++------
 themes/default/bottom-right-inactive.xpm     | 45 ++++++------
 themes/default/close-active.xpm              | 60 ++++++++--------
 themes/default/close-inactive.xpm            | 60 ++++++++--------
 themes/default/close-pressed.xpm             | 58 +++++++--------
 themes/default/hide-active.xpm               | 60 ++++++++--------
 themes/default/hide-inactive.xpm             | 60 ++++++++--------
 themes/default/hide-pressed.xpm              | 58 +++++++--------
 themes/default/left-active.xpm               | 76 ++++++++++----------
 themes/default/left-inactive.xpm             | 76 ++++++++++----------
 themes/default/maximize-active.xpm           | 60 ++++++++--------
 themes/default/maximize-inactive.xpm         | 60 ++++++++--------
 themes/default/maximize-pressed.xpm          | 58 +++++++--------
 themes/default/maximize-toggled-active.xpm   | 60 ++++++++--------
 themes/default/maximize-toggled-inactive.xpm | 60 ++++++++--------
 themes/default/maximize-toggled-pressed.xpm  | 58 +++++++--------
 themes/default/menu-active.xpm               | 60 ++++++++--------
 themes/default/menu-inactive.xpm             | 60 ++++++++--------
 themes/default/menu-pressed.xpm              | 58 +++++++--------
 themes/default/right-active.xpm              | 76 ++++++++++----------
 themes/default/right-inactive.xpm            | 76 ++++++++++----------
 themes/default/shade-active.xpm              | 60 ++++++++--------
 themes/default/shade-inactive.xpm            | 60 ++++++++--------
 themes/default/shade-pressed.xpm             | 58 +++++++--------
 themes/default/shade-toggled-active.xpm      | 60 ++++++++--------
 themes/default/shade-toggled-inactive.xpm    | 60 ++++++++--------
 themes/default/shade-toggled-pressed.xpm     | 58 +++++++--------
 themes/default/stick-active.xpm              | 61 ++++++++--------
 themes/default/stick-inactive.xpm            | 60 ++++++++--------
 themes/default/stick-pressed.xpm             | 58 +++++++--------
 themes/default/stick-toggled-active.xpm      | 61 ++++++++--------
 themes/default/stick-toggled-inactive.xpm    | 60 ++++++++--------
 themes/default/stick-toggled-pressed.xpm     | 58 +++++++--------
 themes/default/themerc                       |  4 +-
 themes/default/title-1-active.xpm            | 56 ++++++++-------
 themes/default/title-1-inactive.xpm          | 56 ++++++++-------
 themes/default/title-2-active.xpm            | 60 ++++++++--------
 themes/default/title-2-inactive.xpm          | 60 ++++++++--------
 themes/default/title-3-active.xpm            | 60 ++++++++--------
 themes/default/title-3-inactive.xpm          | 60 ++++++++--------
 themes/default/title-4-active.xpm            | 64 ++++++++---------
 themes/default/title-4-inactive.xpm          | 64 ++++++++---------
 themes/default/title-5-active.xpm            | 56 ++++++++-------
 themes/default/title-5-inactive.xpm          | 56 ++++++++-------
 themes/default/top-left-active.xpm           | 57 ++++++++-------
 themes/default/top-left-inactive.xpm         | 57 ++++++++-------
 themes/default/top-right-active.xpm          | 59 +++++++--------
 themes/default/top-right-inactive.xpm        | 59 +++++++--------
 52 files changed, 1497 insertions(+), 1465 deletions(-)

diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm
index 463f05298..43c912a9f 100644
--- a/themes/default/bottom-active.xpm
+++ b/themes/default/bottom-active.xpm
@@ -1,14 +1,13 @@
 /* XPM */
 static char * bottom_active_xpm[] = {
-"32 5 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",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"};
+"32 5 5 1",
+" 	c None",
+".	c #F4F4F4 s active_color_2",
+"+	c #D5D5D5 s active_mid_1",
+"@	c #ABABAB s active_shadow_2",
+"#	c #000000",
+"................................",
+"................................",
+"................................",
+"++++++++++++++++++++++++++++++++",
+"################################"};
diff --git a/themes/default/bottom-inactive.xpm b/themes/default/bottom-inactive.xpm
index acac072dc..377241598 100644
--- a/themes/default/bottom-inactive.xpm
+++ b/themes/default/bottom-inactive.xpm
@@ -1,14 +1,13 @@
 /* XPM */
 static char * bottom_inactive_xpm[] = {
-"32 5 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",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"};
+"32 5 5 1",
+" 	c None",
+".	c #F4F4F4 s inactive_color_2",
+"+	c #D5D5D5 s inactive_mid_1",
+"@	c #ABABAB s inactive_shadow_2",
+"#	c #000000",
+"................................",
+"................................",
+"................................",
+"++++++++++++++++++++++++++++++++",
+"################################"};
diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm
index c9ad83d15..9b2db2899 100644
--- a/themes/default/bottom-left-active.xpm
+++ b/themes/default/bottom-left-active.xpm
@@ -1,25 +1,24 @@
 /* XPM */
 static char * bottom_left_active_xpm[] = {
-"16 16 6 1",
-"       c None",
-"@      c #000000",
-".      c #4B58A2 s active_shadow_2",
-"+      c #525FAB s active_color_2",
-"#      c #FFFFFF s active_hilight_2",
-"$      c #848FD6 s active_mid_2",
-"@@+++           ",
-"@@+++           ",
-"@@+++           ",
-"@@+++           ",
-"@@+++           ",
-"@@+++           ",
-"@@+++           ",
-"@@+++           ",
-"@@+++           ",
-"@@+++           ",
-"@@$++           ",
-"@@.+++++++++++++",
-" @@$++++++++++++",
-" @@@.$++++++++++",
-"  @@@@@@@@@@@@@@",
-"    @@@@@@@@@@@@"};
+"16 16 5 1",
+" 	c None",
+".	c #000000",
+"+	c #D5D5D5 s active_mid_1",
+"@	c #F4F4F4 s active_color_2",
+"#	c #ABABAB s active_shadow_1",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@@@@@@@@@@@@",
+".+@@@@@@@@@@@@@@",
+".+@@@@@@@@@@@@@@",
+".#++++++++++++++",
+" ..............."};
diff --git a/themes/default/bottom-left-inactive.xpm b/themes/default/bottom-left-inactive.xpm
index 8250281fd..9a32b9127 100644
--- a/themes/default/bottom-left-inactive.xpm
+++ b/themes/default/bottom-left-inactive.xpm
@@ -1,25 +1,24 @@
 /* XPM */
 static char * bottom_left_inactive_xpm[] = {
-"16 16 6 1",
-"       c None",
-"@      c #000000",
-".      c #4B58A2 s inactive_shadow_2",
-"+      c #525FAB s inactive_color_2",
-"#      c #FFFFFF s inactive_hilight_2",
-"$      c #848FD6 s inactive_mid_2",
-"@@+++           ",
-"@@+++           ",
-"@@+++           ",
-"@@+++           ",
-"@@+++           ",
-"@@+++           ",
-"@@+++           ",
-"@@+++           ",
-"@@+++           ",
-"@@+++           ",
-"@@$++           ",
-"@@.+++++++++++++",
-" @@$++++++++++++",
-" @@@.$++++++++++",
-"  @@@@@@@@@@@@@@",
-"    @@@@@@@@@@@@"};
+"16 16 5 1",
+" 	c None",
+".	c #000000",
+"+	c #D5D5D5 s inactive_mid_1",
+"@	c #F4F4F4 s inactive_color_2",
+"#	c #ABABAB s inactive_shadow_1",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@           ",
+".+@@@@@@@@@@@@@@",
+".+@@@@@@@@@@@@@@",
+".+@@@@@@@@@@@@@@",
+".#++++++++++++++",
+" ..............."};
diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm
index 7c937ce8e..8a3155360 100644
--- a/themes/default/bottom-right-active.xpm
+++ b/themes/default/bottom-right-active.xpm
@@ -1,25 +1,24 @@
 /* XPM */
 static char * bottom_right_active_xpm[] = {
-"16 16 6 1",
-"       c None",
-"@      c #000000",
-".      c #4B58A2 s active_shadow_2",
-"+      c #525FAB s active_color_2",
-"#      c #FFFFFF s active_hilight_2",
-"$      c #848FD6 s active_mid_2",
-"           +++@@",
-"           +++@@",
-"           +++@@",
-"           +++@@",
-"           +++@@",
-"           +++@@",
-"           +++@@",
-"           +++@@",
-"           +++@@",
-"           +++@@",
-"           ++$@@",
-"+++++++++++++.@@",
-"++++++++++++$@@ ",
-"++++++++++$.@@@ ",
-"@@@@@@@@@@@@@@  ",
-"@@@@@@@@@@@@    "};
+"16 16 5 1",
+" 	c None",
+".	c #F4F4F4 s active_color_2",
+"+	c #D5D5D5 s active_mid_1",
+"@	c #000000",
+"#	c #ABABAB s active_shadow_1",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"..............+@",
+"..............+@",
+"..............+@",
+"++++++++++++++#@",
+"@@@@@@@@@@@@@@@ "};
diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm
index 4abbfe1ef..af2287988 100644
--- a/themes/default/bottom-right-inactive.xpm
+++ b/themes/default/bottom-right-inactive.xpm
@@ -1,25 +1,24 @@
 /* XPM */
 static char * bottom_right_inactive_xpm[] = {
-"16 16 6 1",
-"       c None",
-"@      c #000000",
-".      c #4B58A2 s inactive_shadow_2",
-"+      c #525FAB s inactive_color_2",
-"#      c #FFFFFF s inactive_hilight_2",
-"$      c #848FD6 s inactive_mid_2",
-"           +++@@",
-"           +++@@",
-"           +++@@",
-"           +++@@",
-"           +++@@",
-"           +++@@",
-"           +++@@",
-"           +++@@",
-"           +++@@",
-"           +++@@",
-"           ++$@@",
-"+++++++++++++.@@",
-"++++++++++++$@@ ",
-"++++++++++$.@@@ ",
-"@@@@@@@@@@@@@@  ",
-"@@@@@@@@@@@@    "};
+"16 16 5 1",
+" 	c None",
+".	c #F4F4F4 s inactive_color_2",
+"+	c #D5D5D5 s inactive_mid_1",
+"@	c #000000",
+"#	c #ABABAB s inactive_shadow_1",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"           ...+@",
+"..............+@",
+"..............+@",
+"..............+@",
+"++++++++++++++#@",
+"@@@@@@@@@@@@@@@ "};
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index 510ddd4d0..a3e342df2 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++##+++++##++++",
-"++++###+++###++++",
-"++++@###+###@++++",
-"++++$@#####@$++++",
-"+++++$@###@$+++++",
-"++++++#####++++++",
-"+++++###@###+++++",
-"++++###@$@###++++",
-"++++##@$+$@##++++",
-"++++@@$+++$@@++++",
-"++++$$+++++$$++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 6 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_color_2",,
+"@	c #D5D6D5 s active_color_2",
+"#	c #B4BAB5 s active_color_2",
+"$	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@$$@@@@$$@@@#.",
+".+@@@$$$@@$$$@@@#.",
+".+@@@@$$$$$$@@@@#.",
+".+@@@@@$$$$@@@@@#.",
+".+@@@@@$$$$@@@@@#.",
+".+@@@@$$$$$$@@@@#.",
+".+@@@$$$@@$$$@@@#.",
+".+@@@$$@@@@$$@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index a382d6b6a..e95ddece1 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++@@+++++@@++++",
-"++++@@@+++@@@++++",
-"++++$@@@+@@@$++++",
-"+++++$@@@@@$+++++",
-"++++++$@@@$++++++",
-"++++++@@@@@++++++",
-"+++++@@@$@@@+++++",
-"++++@@@$+$@@@++++",
-"++++@@$+++$@@++++",
-"++++$$+++++$$++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 6 1",
+" 	c None",
+".	c #4B58A2 s inactive_shadow_1",
+"+	c #FFFFFF s inactive_color_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #B4BAB5 s inactive_color_2",
+"$	c #949595 s inactive_shadow_2",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@$$@@@@$$@@@#.",
+".+@@@$$$@@$$$@@@#.",
+".+@@@@$$$$$$@@@@#.",
+".+@@@@@$$$$@@@@@#.",
+".+@@@@@$$$$@@@@@#.",
+".+@@@@$$$$$$@@@@#.",
+".+@@@$$$@@$$$@@@#.",
+".+@@@$$@@@@$$@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index 528f73d40..e8b7c05c8 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,31 +1,31 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"................+",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@##@@@@@##@@@=",
-".@@@###@@@###@@@=",
-".@@@.###@###.@@@=",
-".@@@@.#####.@@@@=",
-".@@@@@.###.@@@@@=",
-".@@@@@#####@@@@@=",
-".@@@@###.###@@@@=",
-".@@@###.@.###@@@=",
-".@@@##.@@@.##@@@=",
-".@@@..@@@@@..@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-"+================",
-"                 "}:
-
+"18 24 4 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #949595 s active_shadow_2",
+"@	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++@@++++@@++++.",
+".++++@@@++@@@++++.",
+".+++++@@@@@@+++++.",
+".++++++@@@@++++++.",
+".++++++@@@@++++++.",
+".+++++@@@@@@+++++.",
+".++++@@@++@@@++++.",
+".++++@@++++@@++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 9e9e75ee0..720f84ae5 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++++#####++++++",
-"++++++#####++++++",
-"++++++##+##++++++",
-"++++++#####++++++",
-"++++++#####++++++",
-"++++++@@@@@++++++",
-"++++++$$$$$++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 6 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_color_2",,
+"@	c #D5D6D5 s active_color_2",
+"#	c #B4BAB5 s active_color_2",
+"$	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@$$$$$$@@@@#.",
+".+@@@@$$$$$$@@@@#.",
+".+@@@@$$$$$$@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index ea2241fb0..e953520c2 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * hide_inactive_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++++@@@@@++++++",
-"++++++@@@@@++++++",
-"++++++@@+@@++++++",
-"++++++@@@@@++++++",
-"++++++@@@@@++++++",
-"++++++$$$$$++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 6 1",
+" 	c None",
+".	c #4B58A2 s inactive_shadow_1",
+"+	c #FFFFFF s inactive_color_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #B4BAB5 s inactive_color_2",
+"$	c #949595 s inactive_shadow_2",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@$$$$$$@@@@#.",
+".+@@@@$$$$$$@@@@#.",
+".+@@@@$$$$$$@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index c1f437e13..9176fc928 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,31 +1,31 @@
 /* XPM */
 static char * hide_pressed_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"................+",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@#####@@@@@=",
-".@@@@@#####@@@@@=",
-".@@@@@##@##@@@@@=",
-".@@@@@#####@@@@@=",
-".@@@@@#####@@@@@=",
-".@@@@@.....@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-"+================",
-"                 "};
-
+"18 24 4 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #949595 s active_shadow_2",
+"@	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".+++++@@@@@@+++++.",
+".+++++@@@@@@+++++.",
+".+++++@@@@@@+++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/left-active.xpm b/themes/default/left-active.xpm
index d6bc2654f..4571b3955 100644
--- a/themes/default/left-active.xpm
+++ b/themes/default/left-active.xpm
@@ -1,41 +1,39 @@
 /* XPM */
 static char * left_active_xpm[] = {
-"5 32 6 1",
-"       c None",
-".      c #949595 s active_shadow_2",
-"+      c #FFFFFF s active_hilight_2",
-"#      c #D5D6D5 s active_color_2",
-"*      c #B4BAB5 s active_mid_2",
-"@      c #000000",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###"};
+"5 32 4 1",
+" 	c None",
+".	c #000000",
+"+	c #D5D5D5 s active_mid_1",
+"@	c #F4F4F4 s active_color_2",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@"};
diff --git a/themes/default/left-inactive.xpm b/themes/default/left-inactive.xpm
index ae47b7a24..05ea2c4cd 100644
--- a/themes/default/left-inactive.xpm
+++ b/themes/default/left-inactive.xpm
@@ -1,41 +1,39 @@
 /* XPM */
 static char * left_inactive_xpm[] = {
-"5 32 6 1",
-"       c None",
-".      c #949595 s inactive_shadow_2",
-"+      c #FFFFFF s inactive_hilight_2",
-"#      c #D5D6D5 s inactive_color_2",
-"*      c #B4BAB5 s inactive_mid_2",
-"@      c #000000",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###"};
+"5 32 4 1",
+" 	c None",
+".	c #000000",
+"+	c #D5D5D5 s inactive_mid_1",
+"@	c #F4F4F4 s inactive_color_2",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@",
+".+@@@"};
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index e430d4c07..b0183be5b 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++#########++++",
-"++++#########++++",
-"++++##@@@@@##++++",
-"++++##$$$$$##++++",
-"++++##+++++##++++",
-"++++##+++++##++++",
-"++++##+++++##++++",
-"++++#########++++",
-"++++#########++++",
-"++++@@@@@@@@@++++",
-"++++$$$$$$$$$++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 6 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_color_2",,
+"@	c #D5D6D5 s active_color_2",
+"#	c #B4BAB5 s active_color_2",
+"$	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@$$$$$$$$@@@#.",
+".+@@@$$$$$$$$@@@#.",
+".+@@@$$$$$$$$@@@#.",
+".+@@@$@@@@@@$@@@#.",
+".+@@@$@@@@@@$@@@#.",
+".+@@@$@@@@@@$@@@#.",
+".+@@@$@@@@@@$@@@#.",
+".+@@@$$$$$$$$@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index 56687a6fe..5d3f40a5c 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * maximize_inactive_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++@@@@@@@@@++++",
-"++++@@@@@@@@@++++",
-"++++@@$$$$$@@++++",
-"++++@@+++++@@++++",
-"++++@@+++++@@++++",
-"++++@@+++++@@++++",
-"++++@@+++++@@++++",
-"++++@@@@@@@@@++++",
-"++++@@@@@@@@@++++",
-"++++$$$$$$$$$++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 6 1",
+" 	c None",
+".	c #4B58A2 s inactive_shadow_1",
+"+	c #FFFFFF s inactive_color_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #B4BAB5 s inactive_color_2",
+"$	c #949595 s inactive_shadow_2",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@$$$$$$$$@@@#.",
+".+@@@$$$$$$$$@@@#.",
+".+@@@$$$$$$$$@@@#.",
+".+@@@$@@@@@@$@@@#.",
+".+@@@$@@@@@@$@@@#.",
+".+@@@$@@@@@@$@@@#.",
+".+@@@$@@@@@@$@@@#.",
+".+@@@$$$$$$$$@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index 2ff539793..6d614481e 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,31 +1,31 @@
 /* XPM */
 static char * maximize_pressed_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"................+",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@#########@@@=",
-".@@@#########@@@=",
-".@@@##.....##@@@=",
-".@@@##@@@@@##@@@=",
-".@@@##@@@@@##@@@=",
-".@@@##@@@@@##@@@=",
-".@@@##@@@@@##@@@=",
-".@@@#########@@@=",
-".@@@#########@@@=",
-".@@@.........@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-"+================",
-"                 "};
-
+"18 24 4 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #949595 s active_shadow_2",
+"@	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++@@@@@@@@++++.",
+".++++@@@@@@@@++++.",
+".++++@@@@@@@@++++.",
+".++++@++++++@++++.",
+".++++@++++++@++++.",
+".++++@++++++@++++.",
+".++++@++++++@++++.",
+".++++@@@@@@@@++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index 1d9863961..d9ffcdc93 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * maximize_toggled_active_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++########++++++",
-"+++########++++++",
-"+++##@@@@##++++++",
-"+++##$$$$##@##+++",
-"+++##++++##@##+++",
-"+++##++++##+##+++",
-"+++########+##+++",
-"+++########+##+++",
-"+++@@@@@++++##+++",
-"+++$$$########+++",
-"++++++########+++",
-"++++++@@@@@@@@+++",
-"++++++$$$$$$$$+++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 6 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_color_2",,
+"@	c #D5D6D5 s active_color_2",
+"#	c #B4BAB5 s active_color_2",
+"$	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@$$$$$$$@@#.",
+".+@@@@@$$$$$$$@@#.",
+".+@@@@@@@@@@@$@@#.",
+".+@@$$$$$$$@@$@@#.",
+".+@@$$$$$$$@@$@@#.",
+".+@@$$$$$$$@@$@@#.",
+".+@@$@@@@@$@$$@@#.",
+".+@@$@@@@@$@@@@@#.",
+".+@@$@@@@@$@@@@@#.",
+".+@@$$$$$$$@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index a3e7e7e95..0487e82aa 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * maximize_toggled_inactive_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++@@@@@@@@++++++",
-"+++@@@@@@@@++++++",
-"+++@@$$$$@@++++++",
-"+++@@++++@@$@@+++",
-"+++@@++++@@$@@+++",
-"+++@@++++@@+@@+++",
-"+++@@@@@@@@+@@+++",
-"+++@@@@@@@@+@@+++",
-"+++$$$$$++++@@+++",
-"++++++@@@@@@@@+++",
-"++++++@@@@@@@@+++",
-"++++++$$$$$$$$+++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 6 1",
+" 	c None",
+".	c #4B58A2 s inactive_shadow_1",
+"+	c #FFFFFF s inactive_color_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #B4BAB5 s inactive_color_2",
+"$	c #949595 s inactive_shadow_2",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@$$$$$$$@@#.",
+".+@@@@@$$$$$$$@@#.",
+".+@@@@@@@@@@@$@@#.",
+".+@@$$$$$$$@@$@@#.",
+".+@@$$$$$$$@@$@@#.",
+".+@@$$$$$$$@@$@@#.",
+".+@@$@@@@@$@$$@@#.",
+".+@@$@@@@@$@@@@@#.",
+".+@@$@@@@@$@@@@@#.",
+".+@@$$$$$$$@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index 5c9c1b16a..42949c5f2 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -1,31 +1,31 @@
 /* XPM */
 static char * maximize_toggled_pressed_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"................+",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@########@@@@@=",
-".@@########@@@@@=",
-".@@##....##@@@@@=",
-".@@##@@@@##.##@@=",
-".@@##@@@@##.##@@=",
-".@@##@@@@##@##@@=",
-".@@########@##@@=",
-".@@########@##@@=",
-".@@.....@@@@##@@=",
-".@@@@@########@@=",
-".@@@@@########@@=",
-".@@@@@........@@=",
-".@@@@@@@@@@@@@@@=",
-"+================",
-"                 "};
-
+"18 24 4 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #949595 s active_shadow_2",
+"@	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++@@@@@@@+++.",
+".++++++@@@@@@@+++.",
+".++++++++++++@+++.",
+".+++@@@@@@@++@+++.",
+".+++@@@@@@@++@+++.",
+".+++@@@@@@@++@+++.",
+".+++@+++++@+@@+++.",
+".+++@+++++@++++++.",
+".+++@+++++@++++++.",
+".+++@@@@@@@++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index d06d5fb96..1342d4bb0 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++###########+++",
-"+++###########+++",
-"+++@@@@@@@@@@@+++",
-"+++$#########$+++",
-"++++##@@@@@##++++",
-"++++@##$$$##@++++",
-"++++$@##+##@$++++",
-"+++++$@###@$+++++",
-"++++++$@#@$++++++",
-"+++++++$@$+++++++",
-"++++++++$++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 6 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_color_2",,
+"@	c #D5D6D5 s active_color_2",
+"#	c #B4BAB5 s active_color_2",
+"$	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@$@@@@$@@@@#.",
+".+@@@$$$@@$$$@@@#.",
+".+@@@$$$$$$$$@@@#.",
+".+@@@@$$$$$$@@@@#.",
+".+@@@@@$$$$@@@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index d28e430c5..475767ac5 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * menu_inactive_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++@@@@@@@@@@@+++",
-"+++@@@@@@@@@@@+++",
-"+++$$$$$$$$$$$+++",
-"++++@@@@@@@@@++++",
-"++++@@$$$$$@@++++",
-"++++$@@+++@@$++++",
-"+++++$@@+@@$+++++",
-"++++++$@@@$++++++",
-"+++++++$@$+++++++",
-"++++++++$++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 6 1",
+" 	c None",
+".	c #4B58A2 s inactive_shadow_1",
+"+	c #FFFFFF s inactive_color_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #B4BAB5 s inactive_color_2",
+"$	c #949595 s inactive_shadow_2",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@$@@@@$@@@@#.",
+".+@@@$$$@@$$$@@@#.",
+".+@@@$$$$$$$$@@@#.",
+".+@@@@$$$$$$@@@@#.",
+".+@@@@@$$$$@@@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index 331c6cbf9..72d9fab43 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -1,31 +1,31 @@
 /* XPM */
 static char * menu_pressed_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"................+",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@###########@@=",
-".@@###########@@=",
-".@@...........@@=",
-".@@@#########@@@=",
-".@@@##.....##@@@=",
-".@@@.##.@.##.@@@=",
-".@@@@.##.##.@@@@=",
-".@@@@@.###.@@@@@=",
-".@@@@@@.#.@@@@@@=",
-".@@@@@@@.@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-"+================",
-"                 "};
-
+"18 24 4 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #949595 s active_shadow_2",
+"@	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".+++++@++++@+++++.",
+".++++@@@++@@@++++.",
+".++++@@@@@@@@++++.",
+".+++++@@@@@@+++++.",
+".++++++@@@@++++++.",
+".+++++++@@+++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm
index 3433a6806..b02350696 100644
--- a/themes/default/right-active.xpm
+++ b/themes/default/right-active.xpm
@@ -1,41 +1,39 @@
 /* XPM */
 static char * right_active_xpm[] = {
-"5 32 6 1",
-"       c None",
-".      c #949595 s active_shadow_2",
-"+      c #FFFFFF s active_hilight_2",
-"#      c #D5D6D5 s active_color_2",
-"*      c #B4BAB5 s active_mid_2",
-"@      c #000000",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@"};
+"5 32 4 1",
+" 	c None",
+".	c #F4F4F4 s active_color_2",
+"+	c #D5D5D5 s active_mid_1",
+"@	c #000000",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@"};
diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm
index 6dbac73d0..67df2d860 100644
--- a/themes/default/right-inactive.xpm
+++ b/themes/default/right-inactive.xpm
@@ -1,41 +1,39 @@
 /* XPM */
 static char * right_inactive_xpm[] = {
-"5 32 6 1",
-"       c None",
-".      c #949595 s inactive_shadow_2",
-"+      c #FFFFFF s inactive_hilight_2",
-"#      c #D5D6D5 s inactive_color_2",
-"*      c #B4BAB5 s inactive_mid_2",
-"@      c #000000",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@"};
+"5 32 4 1",
+" 	c None",
+".	c #F4F4F4 s inactive_color_2",
+"+	c #D5D5D5 s inactive_mid_1",
+"@	c #000000",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@",
+"...+@"};
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index cb2ce98f8..3fb293ca3 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++++++$++++++++",
-"+++++++$$$+++++++",
-"++++++$$@$$++++++",
-"+++++$$@#@$$+++++",
-"++++$$@#+#@$$++++",
-"++++$$$$$$$$$++++",
-"++++@@@@@@@@@++++",
-"+++$$$$$$$$$$$+++",
-"+++$$$$$$$$$$$+++",
-"+++@@@@@@@@@@@+++",
-"+++###########+++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 6 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_color_2",,
+"@	c #D5D6D5 s active_color_2",
+"#	c #B4BAB5 s active_color_2",
+"$	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@@@$$$$@@@@@#.",
+".+@@@@$$$$$$@@@@#.",
+".+@@@$$$$$$$$@@@#.",
+".+@@@$$@$$@$$@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index 12983e5ea..c8aef944c 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * shade_inactive_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++++++@++++++++",
-"+++++++@@@+++++++",
-"++++++@@#@@++++++",
-"+++++@@#+#@@+++++",
-"++++@@+++++@@++++",
-"++++@@@@@@@@@++++",
-"++++#########++++",
-"+++@@@@@@@@@@@+++",
-"+++@@@@@@@@@@@+++",
-"+++###########+++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 6 1",
+" 	c None",
+".	c #4B58A2 s inactive_shadow_1",
+"+	c #FFFFFF s inactive_color_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #B4BAB5 s inactive_color_2",
+"$	c #949595 s inactive_shadow_2",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@@@$$$$@@@@@#.",
+".+@@@@$$$$$$@@@@#.",
+".+@@@$$$$$$$$@@@#.",
+".+@@@$$@$$@$$@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index 42fb2dd3a..06d0bca2f 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,31 +1,31 @@
 /* XPM */
 static char * shade_pressed_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"................+",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@#@@@@@@@=",
-".@@@@@@###@@@@@@=",
-".@@@@@##.##@@@@@=",
-".@@@@##.@.##@@@@=",
-".@@@##.@@@.##@@@=",
-".@@@#########@@@=",
-".@@@.........@@@=",
-".@@###########@@=",
-".@@###########@@=",
-".@@...........@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-"+================",
-"                 "};
-
+"18 24 4 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #949595 s active_shadow_2",
+"@	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".+++++++@@+++++++.",
+".++++++@@@@++++++.",
+".+++++@@@@@@+++++.",
+".++++@@@@@@@@++++.",
+".++++@@+@@+@@++++.",
+".+++++++@@+++++++.",
+".+++++++@@+++++++.",
+".+++++++@@+++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index 5b89b2169..6ce9c0191 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * shade_toggled_active_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++$$$$$$$$$++++",
-"++++$$@@@@@$$++++",
-"++++@$$###$$@++++",
-"++++#@$$+$$@#++++",
-"+++++#@$$$@#+++++",
-"++++++#@$@#++++++",
-"+++++++#@#+++++++",
-"+++$$$$$$$$$$$+++",
-"+++$$$$$$$$$$$+++",
-"+++@@@@@@@@@@@+++",
-"+++###########+++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 6 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_color_2",,
+"@	c #D5D6D5 s active_color_2",
+"#	c #B4BAB5 s active_color_2",
+"$	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@$$@$$@$$@@@#.",
+".+@@@$$$$$$$$@@@#.",
+".+@@@@$$$$$$@@@@#.",
+".+@@@@@$$$$@@@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index e17fa92c7..d0558ec9d 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * shade_toggled_inactive_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++@@@@@@@@@++++",
-"++++@@#####@@++++",
-"++++#@@+++@@#++++",
-"+++++#@@+@@#+++++",
-"++++++#@@@#++++++",
-"+++++++#@#+++++++",
-"++++++++#++++++++",
-"+++@@@@@@@@@@@+++",
-"+++@@@@@@@@@@@+++",
-"+++###########+++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 6 1",
+" 	c None",
+".	c #4B58A2 s inactive_shadow_1",
+"+	c #FFFFFF s inactive_color_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #B4BAB5 s inactive_color_2",
+"$	c #949595 s inactive_shadow_2",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@$$@$$@$$@@@#.",
+".+@@@$$$$$$$$@@@#.",
+".+@@@@$$$$$$@@@@#.",
+".+@@@@@$$$$@@@@@#.",
+".+@@@@@@$$@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index b7189a48d..2d0443d18 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -1,31 +1,31 @@
 /* XPM */
 static char * shade_toggled_pressed_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"................+",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@#########@@@=",
-".@@@##.....##@@@=",
-".@@@.##@@@##.@@@=",
-".@@@@.##@##.@@@@=",
-".@@@@@.###.@@@@@=",
-".@@@@@@.#.@@@@@@=",
-".@@@@@@@.@@@@@@@=",
-".@@###########@@=",
-".@@###########@@=",
-".@@...........@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-"+================",
-"                 "};
-
+"18 24 4 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #949595 s active_shadow_2",
+"@	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".+++++++@@+++++++.",
+".+++++++@@+++++++.",
+".+++++++@@+++++++.",
+".++++@@+@@+@@++++.",
+".++++@@@@@@@@++++.",
+".+++++@@@@@@+++++.",
+".++++++@@@@++++++.",
+".+++++++@@+++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 789d8c7be..6dfe7f705 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,31 +1,34 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++#+++#+++",
-"+++++++++#####+++",
-"+++@######++##+++",
-"+++#$$$$$#$$##+++",
-"+++@######@@##+++",
-"+++$@@@@@#####+++",
-"++++$$$$$#@@@#+++",
-"+++++++++@$$$@+++",
-"+++++++++$+++$+++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 7 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_color_2",,
+"@	c #D5D6D5 s active_color_2",
+"#	c #B4BAB5 s active_color_2",
+"$	c #949595 s active_shadow_2",
+"%	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@$%%%%$@@@@#.",
+".+@@@$%%%%%%$@@@#.",
+".+@@@%%$@@$%%@@@#.",
+".+@@@%%@@@@%%@@@#.",
+".+@@@%%@@@@%%@@@#.",
+".+@@@%%$@@$%%@@@#.",
+".+@@@$%%%%%%$@@@#.",
+".+@@@@$%%%%$@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index ba25fc57f..e7bb208ea 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * stick_inactive_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++@+++@+++",
-"+++++++++@@@@@+++",
-"+++$@@@@@@++@@+++",
-"+++@$$$$$@$$@@+++",
-"+++$@@@@@@$$@@+++",
-"++++$$$$$@@@@@+++",
-"+++++++++@$$$@+++",
-"+++++++++$+++$+++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 6 1",
+" 	c None",
+".	c #4B58A2 s inactive_shadow_1",
+"+	c #FFFFFF s inactive_color_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #B4BAB5 s inactive_color_2",
+"$	c #949595 s inactive_shadow_2",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@#$$$$#@@@@#.",
+".+@@@#$$$$$$#@@@#.",
+".+@@@$$#@@#$$@@@#.",
+".+@@@$$@@@@$$@@@#.",
+".+@@@$$@@@@$$@@@#.",
+".+@@@$$#@@#$$@@@#.",
+".+@@@#$$$$$$#@@@#.",
+".+@@@@#$$$$#@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index 06f52e64d..6565898f0 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,31 +1,31 @@
 /* XPM */
 static char * stick_pressed_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"................+",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@#@@@#@@=",
-".@@@@@@@@#####@@=",
-".@@.######@@##@@=",
-".@@#.....#..##@@=",
-".@@.######..##@@=",
-".@@@.....#####@@=",
-".@@@@@@@@#...#@@=",
-".@@@@@@@@.@@@.@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@=",
-"+================",
-"                 "};
-
+"18 24 4 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #949595 s active_shadow_2",
+"@	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++@@@@++++++.",
+".+++++@@@@@@+++++.",
+".++++@@@++@@@++++.",
+".++++@@++++@@++++.",
+".++++@@++++@@++++.",
+".++++@@@++@@@++++.",
+".+++++@@@@@@+++++.",
+".++++++@@@@++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index 46a233db1..8fd5b014e 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -1,31 +1,34 @@
 /* XPM */
 static char * stick_toggled_active_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++++#$$$#++++++",
-"+++++#$++@$#+++++",
-"+++++$+++#@$#++++",
-"+++++$++$#@$@++++",
-"+++++$@###@$@#+++",
-"+++++#$@@@$@@#+++",
-"++++++#$$$@@##+++",
-"+++++++#@@@##++++",
-"+++++++++###+++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 7 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #FFFFFF s active_color_2",,
+"@	c #D5D6D5 s active_color_2",
+"#	c #B4BAB5 s active_color_2",
+"$	c #949595 s active_shadow_2",
+"%	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@$%%%%$@@@@#.",
+".+@@@$%%%%%%$@@@#.",
+".+@@@%%$@@$%%@@@#.",
+".+@@@%%@%%@%%@@@#.",
+".+@@@%%@%%@%%@@@#.",
+".+@@@%%$@@$%%@@@#.",
+".+@@@$%%%%%%$@@@#.",
+".+@@@@$%%%%$@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index f9e704a98..df3089bf6 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -1,31 +1,33 @@
 /* XPM */
 static char * stick_toggled_inactive_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++++#@@@#++++++",
-"+++++#@++#@#+++++",
-"+++++@+++##@#++++",
-"+++++@++@##@#++++",
-"+++++@#####@##+++",
-"+++++#@###@###+++",
-"++++++#@@@####+++",
-"+++++++######++++",
-"+++++++++###+++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"                 "};
-
+"18 24 6 1",
+" 	c None",
+".	c #4B58A2 s inactive_shadow_1",
+"+	c #FFFFFF s inactive_color_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #B4BAB5 s inactive_color_2",
+"$	c #949595 s inactive_shadow_2",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@#$$$$#@@@@#.",
+".+@@@#$$$$$$#@@@#.",
+".+@@@$$#@@#$$@@@#.",
+".+@@@$$@$$@$$@@@#.",
+".+@@@$$@$$@$$@@@#.",
+".+@@@$$#@@#$$@@@#.",
+".+@@@#$$$$$$#@@@#.",
+".+@@@@#$$$$#@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+".+@@@@@@@@@@@@@@#.",
+" .##############. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index f559d2c43..44d47e640 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -1,31 +1,31 @@
 /* XPM */
 static char * stick_toggled_pressed_xpm[] = {
-"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",
-"                 ",
-"                 ",
-"                 ",
-"................@",
-".+++++++++++++++=",
-".+++++++++++++++=",
-".+++++++++++++++=",
-".+++++++++++++++=",
-".+++++.###.+++++=",
-".++++.#@@.#.++++=",
-".++++#@@@+.#.+++=",
-".++++#@@#+.#.+++=",
-".++++#.+++.#..++=",
-".++++.#...#...++=",
-".+++++.###....++=",
-".++++++......+++=",
-".++++++++...++++=",
-".+++++++++++++++=",
-".+++++++++++++++=",
-"@================",
-"                 "};
-
+"18 24 4 1",
+" 	c None",
+".	c #4B58A2 s active_shadow_1",
+"+	c #949595 s active_shadow_2",
+"@	c #000000",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"                  ",
+"  ..............  ",
+" .++++++++++++++. ",
+".++++++++++++++++.",
+".++++++++++++++++.",
+".++++++@@@@++++++.",
+".+++++@@@@@@+++++.",
+".++++@@@++@@@++++.",
+".++++@@+@@+@@++++.",
+".++++@@+@@+@@++++.",
+".++++@@@++@@@++++.",
+".+++++@@@@@@+++++.",
+".++++++@@@@++++++.",
+".++++++++++++++++.",
+".++++++++++++++++.",
+" .++++++++++++++. ",
+"  ..............  ",
+"                  ",
+"                  ",
+"                  "};
diff --git a/themes/default/themerc b/themes/default/themerc
index 195c07ae7..d917dc223 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -1,5 +1,5 @@
-button_offset=2
-button_spacing=2
+button_offset=0
+button_spacing=1
 full_width_title=true
 title_horizontal_offset=0
 title_vertical_offset_active=2
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index 737534c12..f6a67b6c0 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -1,30 +1,32 @@
 /* XPM */
-static char * title_1_active_xpm[] = {
-"8 21 6 1",
+static char * title_active_xpm[] = {
+"8 24 5 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",
-"$$$$$$$$",
-"$$$$$$$$",
+".	c #000000",
+"+	c #6EA0CD s active_hilight_1",
+"@	c #567B9C s active_mid_1",
+"#	c #4C7BA6 s active_color_1",
+"........",
 "++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"........"};
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########"};
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index 8260a4866..b38fea169 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -1,30 +1,32 @@
 /* XPM */
-static char * title_1_inactive_xpm[] = {
-"8 21 6 1",
+static char * title_inactive_xpm[] = {
+"8 24 5 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",
-"$$$$$$$$",
-"$$$$$$$$",
+".	c #000000",
+"+	c #6EA0CD s inactive_hilight_1",
+"@	c #567B9C s inactive_mid_1",
+"#	c #4C7BA6 s inactive_color_1",
+"........",
 "++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"........"};
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########"};
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index e5e76bc91..f6a67b6c0 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -1,34 +1,32 @@
 /* XPM */
-static char * title_2_active_xpm[] = {
-"16 21 10 1",
+static char * title_active_xpm[] = {
+"8 24 5 1",
 " 	c None",
 ".	c #000000",
-"+	c #FFFFFF s active_hilight_2",
-"@	c #D5D6D5 s active_color_2",
-"#	c #4B58A2 s active_shadow_1",
-"$	c #525FAB s active_color_1",
-"%	c #848FD6 s active_mid_1",
-"&	c #B4BAB4 s active_mid_2",
-"*	c #949594 s active_shadow_2",
-"=	c #FFFFFF s active_hilight_1",
-"................",
-"................",
-"+++++===========",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"*****###########"};
+"+	c #6EA0CD s active_hilight_1",
+"@	c #567B9C s active_mid_1",
+"#	c #4C7BA6 s active_color_1",
+"........",
+"++++++++",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########"};
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index 84a9647d7..b38fea169 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -1,34 +1,32 @@
 /* XPM */
-static char * title_2_inactive_xpm[] = {
-"16 21 10 1",
+static char * title_inactive_xpm[] = {
+"8 24 5 1",
 " 	c None",
 ".	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",
-"................",
-"................",
-"+++++===========",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"@@@@@$$$$$$$$$$$",
-"*****###########"};
+"+	c #6EA0CD s inactive_hilight_1",
+"@	c #567B9C s inactive_mid_1",
+"#	c #4C7BA6 s inactive_color_1",
+"........",
+"++++++++",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########"};
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index f89c8d35d..f6a67b6c0 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -1,34 +1,32 @@
 /* XPM */
-static char * title_3_active_xpm[] = {
-"20 21 10 1",
+static char * title_active_xpm[] = {
+"8 24 5 1",
 " 	c None",
 ".	c #000000",
-"+	c #FFFFFF s active_hilight_2",
-"@	c #D5D6D5 s active_color_2",
-"#	c #4B58A2 s active_shadow_1",
-"$	c #848FD6 s active_mid_1",
-"%	c #525FAB s active_color_1",
-"&	c #B4BAB4 s active_mid_2",
-"*	c #949594 s active_shadow_2",
-"=	c #FFFFFF s active_hilight_1",
-"....................",
-"....................",
-"====================",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"####################"};
+"+	c #6EA0CD s active_hilight_1",
+"@	c #567B9C s active_mid_1",
+"#	c #4C7BA6 s active_color_1",
+"........",
+"++++++++",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########"};
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index 62d5d7f32..b38fea169 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -1,34 +1,32 @@
 /* XPM */
-static char * title_3_inactive_xpm[] = {
-"20 21 10 1",
+static char * title_inactive_xpm[] = {
+"8 24 5 1",
 " 	c None",
 ".	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",
-"....................",
-"....................",
-"====================",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"####################"};
+"+	c #6EA0CD s inactive_hilight_1",
+"@	c #567B9C s inactive_mid_1",
+"#	c #4C7BA6 s inactive_color_1",
+"........",
+"++++++++",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########"};
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index 5a9b3d467..f6a67b6c0 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -1,34 +1,32 @@
 /* XPM */
-static char * title_4_active_xpm[] = {
-"16 21 10 1",
-"       c None",
-".      c #000000",
-"+      c #FFFFFF s active_hilight_2",
-"@      c #D5D6D5 s active_color_2",
-"#      c #949594 s active_shadow_2",
-"$      c #4B58A2 s active_shadow_1",
-"%      c #848FD6 s active_mid_1",
-"&      c #525FAB s active_color_1",
-"*      c #B4BAB4 s active_mid_2",
-"=      c #FFFFFF s active_hilight_1",
-"................",
-"................",
-"===========+++++",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"$$$$$$$$$$$#####"};
+static char * title_active_xpm[] = {
+"8 24 5 1",
+" 	c None",
+".	c #000000",
+"+	c #6EA0CD s active_hilight_1",
+"@	c #567B9C s active_mid_1",
+"#	c #4C7BA6 s active_color_1",
+"........",
+"++++++++",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########"};
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index 7aeebae91..b38fea169 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -1,34 +1,32 @@
 /* XPM */
-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",
-"................",
-"................",
-"===========+++++",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"&&&&&&&&&&&@@@@@",
-"$$$$$$$$$$$#####"};
+static char * title_inactive_xpm[] = {
+"8 24 5 1",
+" 	c None",
+".	c #000000",
+"+	c #6EA0CD s inactive_hilight_1",
+"@	c #567B9C s inactive_mid_1",
+"#	c #4C7BA6 s inactive_color_1",
+"........",
+"++++++++",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########"};
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index 2bb65d29d..f6a67b6c0 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -1,30 +1,32 @@
 /* XPM */
-static char * title_5_active_xpm[] = {
-"8 21 6 1",
+static char * title_active_xpm[] = {
+"8 24 5 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",
-"$$$$$$$$",
-"$$$$$$$$",
+".	c #000000",
+"+	c #6EA0CD s active_hilight_1",
+"@	c #567B9C s active_mid_1",
+"#	c #4C7BA6 s active_color_1",
+"........",
 "++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"........"};
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########"};
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index d0a08a562..b38fea169 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -1,30 +1,32 @@
 /* XPM */
-static char * title_5_inactive_xpm[] = {
-"8 21 6 1",
+static char * title_inactive_xpm[] = {
+"8 24 5 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",
-"$$$$$$$$",
-"$$$$$$$$",
+".	c #000000",
+"+	c #6EA0CD s inactive_hilight_1",
+"@	c #567B9C s inactive_mid_1",
+"#	c #4C7BA6 s inactive_color_1",
+"........",
 "++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"........"};
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########"};
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index 7234e9d6d..a603eebbc 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -1,30 +1,33 @@
 /* XPM */
 static char * top_left_active_xpm[] = {
-"7 21 6 1",
+"8 24 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 #000000",
+"+	c #6EA0CD s active_hilight_1",
+"@	c #3E566B s active_shadow_1",
+"#	c #567B9C s active_mid_1",
+"$	c #4C7BA6 s active_color_1",
+"    ....",
+"  ..@#++",
+" .@#$+$$",
+" .#$$$$$",
+".@$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$"};
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index eb89dd145..7f2c78149 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -1,30 +1,33 @@
 /* XPM */
 static char * top_left_inactive_xpm[] = {
-"7 21 6 1",
+"8 24 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 #000000",
+"+	c #6EA0CD s inactive_hilight_1",
+"@	c #3E566B s inactive_shadow_1",
+"#	c #567B9C s inactive_mid_1",
+"$	c #4C7BA6 s inactive_color_1",
+"    ....",
+"  ..@#++",
+" .@#$+$$",
+" .#$$$$$",
+".@$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$"};
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index 1fca73675..2d839a9ff 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -1,30 +1,33 @@
 /* XPM */
 static char * top_right_active_xpm[] = {
-"7 21 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",
-"$$$    ",
-"$$$$$  ",
-"+@.$$$ ",
-"#+#@$$ ",
-"####.$$",
-"####@$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"..@##$$"};
+"8 24 6 1",
+" 	c None",
+".	c #000000",
+"+	c #6EA0CD s active_hilight_1",
+"@	c #3E566B s active_shadow_1",
+"#	c #567B9C s active_mid_1",
+"$	c #4C7BA6 s active_color_1",
+"....    ",
+"++#@..  ",
+"$$+$#@. ",
+"$$$$$#. ",
+"$$$$$$@.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#."};
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index a7bd0095d..5e48624a9 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -1,30 +1,33 @@
 /* XPM */
 static char * top_right_inactive_xpm[] = {
-"7 21 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",
-"$$$    ",
-"$$$$$  ",
-"+@.$$$ ",
-"#+#@$$ ",
-"####.$$",
-"####@$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"..@##$$"};
+"8 24 6 1",
+" 	c None",
+".	c #000000",
+"+	c #6EA0CD s inactive_hilight_1",
+"@	c #3E566B s inactive_shadow_1",
+"#	c #567B9C s inactive_mid_1",
+"$	c #4C7BA6 s inactive_color_1",
+"....    ",
+"++#@..  ",
+"$$+$#@. ",
+"$$$$$#. ",
+"$$$$$$@.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#."};
-- 
GitLab