From 284e59ddef7f5758fbf66eb0f10525b9bdd408da Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Thu, 6 Nov 2003 21:52:51 +0000
Subject: [PATCH] Reduce title height by 1 pix
(Old svn revision: 11399)
---
themes/default/close-active.xpm | 49 ++++++++-----------
themes/default/close-inactive.xpm | 48 +++++++------------
themes/default/close-pressed.xpm | 50 ++++++++------------
themes/default/hide-active.xpm | 49 ++++++++-----------
themes/default/hide-inactive.xpm | 48 +++++++------------
themes/default/hide-pressed.xpm | 50 ++++++++------------
themes/default/maximize-active.xpm | 49 ++++++++-----------
themes/default/maximize-inactive.xpm | 48 +++++++------------
themes/default/maximize-pressed.xpm | 50 ++++++++------------
themes/default/maximize-toggled-active.xpm | 49 ++++++++-----------
themes/default/maximize-toggled-inactive.xpm | 48 +++++++------------
themes/default/maximize-toggled-pressed.xpm | 50 ++++++++------------
themes/default/menu-active.xpm | 49 ++++++++-----------
themes/default/menu-inactive.xpm | 48 +++++++------------
themes/default/menu-pressed.xpm | 49 ++++++++-----------
themes/default/shade-active.xpm | 49 ++++++++-----------
themes/default/shade-inactive.xpm | 48 +++++++------------
themes/default/shade-pressed.xpm | 50 ++++++++------------
themes/default/shade-toggled-active.xpm | 49 ++++++++-----------
themes/default/shade-toggled-inactive.xpm | 48 +++++++------------
themes/default/shade-toggled-pressed.xpm | 50 ++++++++------------
themes/default/stick-active.xpm | 49 ++++++++-----------
themes/default/stick-inactive.xpm | 48 +++++++------------
themes/default/stick-pressed.xpm | 50 ++++++++------------
themes/default/stick-toggled-active.xpm | 49 ++++++++-----------
themes/default/stick-toggled-inactive.xpm | 48 +++++++------------
themes/default/stick-toggled-pressed.xpm | 50 ++++++++------------
themes/default/themerc | 4 +-
themes/default/title-1-active.xpm | 4 +-
themes/default/title-1-inactive.xpm | 4 +-
themes/default/title-2-active.xpm | 4 +-
themes/default/title-2-inactive.xpm | 4 +-
themes/default/title-3-active.xpm | 4 +-
themes/default/title-3-inactive.xpm | 4 +-
themes/default/title-4-active.xpm | 4 +-
themes/default/title-4-inactive.xpm | 4 +-
themes/default/title-5-active.xpm | 4 +-
themes/default/title-5-inactive.xpm | 4 +-
themes/default/top-left-active.xpm | 6 +--
themes/default/top-left-inactive.xpm | 6 +--
themes/default/top-right-active.xpm | 6 +--
themes/default/top-right-inactive.xpm | 6 +--
42 files changed, 533 insertions(+), 857 deletions(-)
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index b216f5d44..38b7f8a4c 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * close_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++#+++++++#$++++",
-"++++###+++++###++++",
-"++++@###+++###@++++",
-"++++$@###+###@$++++",
-"+++++$@#####@$+++++",
-"++++++$@###@$++++++",
-"+++++++#####+++++++",
-"++++++###@###++++++",
-"+++++###@$@###+++++",
-"++++###@$+$@###++++",
-"++++@#@$+++$@#@++++",
-"++++$@$+++++$@$++++",
-"+++++$+++++++$+++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #000000",
+"@ c #A4A1A4",
+"# c #D5D2D5",
+".............",
+".............",
+"..++.....++..",
+"..+++...+++..",
+"..@+++.+++@..",
+"..#@+++++@#..",
+"...#@+++@#...",
+"....+++++....",
+"...+++@+++...",
+"..+++@#@+++..",
+"..++@#.#@++..",
+"..@@#...#@@..",
+"..##.....##.."};
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 76c3b8ca7..72a4c9f22 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * close_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++@+++++++@+++++",
-"++++@@@+++++@@@++++",
-"++++$@@@+++@@@$++++",
-"+++++$@@@+@@@$+++++",
-"++++++$@@@@@$++++++",
-"+++++++$@@@$+++++++",
-"+++++++@@@@@+++++++",
-"++++++@@@$@@@++++++",
-"+++++@@@$+$@@@+++++",
-"++++@@@$+++$@@@++++",
-"++++$@$+++++$@$++++",
-"+++++$+++++++$+++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #A4A1A4",
+"@ c #D5D2D5",
+".............",
+".............",
+"..++.....++..",
+"..+++...+++..",
+"..@+++.+++@..",
+"..@@+++++@@..",
+"...@@+++@@...",
+"....+++++....",
+"...+++@+++...",
+"..+++@@@+++..",
+"..++@@.@@++..",
+"..@@@...@@@..",
+"..@@.....@@.."};
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index 86db5a0ef..e1820f8d3 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,32 +1,22 @@
/* XPM */
static char * close_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #B4BAB4 s active_mid_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................+",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@.#@@@@@@@#.@@@=",
-".@@@###@@@@@###@@@=",
-".@@@.###@@@###.@@@=",
-".@@@@.###@###.@@@@=",
-".@@@@@.#####.@@@@@=",
-".@@@@@@.###.@@@@@@=",
-".@@@@@@#####@@@@@@=",
-".@@@@@###.###@@@@@=",
-".@@@@###.@.###@@@@=",
-".@@@###.@@@.###@@@=",
-".@@@.#.@@@@@.#.@@@=",
-".@@@@.@@@@@@@.@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-"+==================",
-" ",
-" "};
-
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #E6E6E6",
+"@ c #D5D2D5",
+"# c #FFFFFF",
+"$ c #000000",
+"............+",
+".@@@@@@@@@@@#",
+".@$$@@@@@$$@#",
+".@$$$@@@$$$@#",
+".@.$$$@$$$.@#",
+".@@.$$$$$.@@#",
+".@@@.$$$.@@@#",
+".@@@$$$$$@@@#",
+".@@$$$.$$$@@#",
+".@$$$.@.$$$@#",
+".@$$.@@@.$$@#",
+".@..@@@@@..@#",
+"+############"};
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 34ffbb19d..f3648a88e 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * hide_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++#####+++++++",
-"+++++++#####+++++++",
-"+++++++##+##+++++++",
-"+++++++#####+++++++",
-"+++++++#####+++++++",
-"+++++++@@@@@+++++++",
-"+++++++$$$$$+++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #000000",
+"@ c #A4A1A4",
+"# c #D5D2D5",
+".............",
+".............",
+".............",
+".............",
+"....+++++....",
+"....+++++....",
+"....++.++....",
+"....+++++....",
+"....+++++....",
+"....@@@@@....",
+"....#####....",
+".............",
+"............."};
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index 060734312..48dc7d881 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * hide_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++@@@@@+++++++",
-"+++++++@@@@@+++++++",
-"+++++++@@+@@+++++++",
-"+++++++@@@@@+++++++",
-"+++++++@@@@@+++++++",
-"+++++++$$$$$+++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #A4A1A4",
+"@ c #D5D2D5",
+".............",
+".............",
+".............",
+".............",
+"....+++++....",
+"....+++++....",
+"....++.++....",
+"....+++++....",
+"....+++++....",
+"....@@@@@....",
+"....@@@@@....",
+".............",
+"............."};
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index 106e4d044..cb802b573 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,32 +1,22 @@
/* XPM */
static char * hide_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #B4BAB4 s active_mid_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................+",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@#####@@@@@@=",
-".@@@@@@#####@@@@@@=",
-".@@@@@@##@##@@@@@@=",
-".@@@@@@#####@@@@@@=",
-".@@@@@@#####@@@@@@=",
-".@@@@@@.....@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-"+==================",
-" ",
-" "};
-
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #E6E6E6",
+"@ c #D5D2D5",
+"# c #FFFFFF",
+"$ c #000000",
+"............+",
+".@@@@@@@@@@@#",
+".@@@@@@@@@@@#",
+".@@@@@@@@@@@#",
+".@@@$$$$$@@@#",
+".@@@$$$$$@@@#",
+".@@@$$@$$@@@#",
+".@@@$$$$$@@@#",
+".@@@$$$$$@@@#",
+".@@@.....@@@#",
+".@@@@@@@@@@@#",
+".@@@@@@@@@@@#",
+"+############"};
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index 72cc47b20..89ed5e0c6 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * maximize_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"++++###########++++",
-"++++###########++++",
-"++++##@@@@@@@##++++",
-"++++##$$$$$$$##++++",
-"++++##+++++++##++++",
-"++++##+++++++##++++",
-"++++##+++++++##++++",
-"++++##+++++++##++++",
-"++++##+++++++##++++",
-"++++###########++++",
-"++++###########++++",
-"++++@@@@@@@@@@@++++",
-"++++$$$$$$$$$$$++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #000000",
+"@ c #A4A1A4",
+"# c #D5D2D5",
+".............",
+".............",
+"..+++++++++..",
+"..+++++++++..",
+"..++@@@@@++..",
+"..++#####++..",
+"..++.....++..",
+"..++.....++..",
+"..++.....++..",
+"..+++++++++..",
+"..+++++++++..",
+"..@@@@@@@@@..",
+"..#########.."};
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index a412fcd2a..66c5847e0 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * maximize_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"++++@@@@@@@@@@@++++",
-"++++@@@@@@@@@@@++++",
-"++++@@$$$$$$$@@++++",
-"++++@@+++++++@@++++",
-"++++@@+++++++@@++++",
-"++++@@+++++++@@++++",
-"++++@@+++++++@@++++",
-"++++@@+++++++@@++++",
-"++++@@+++++++@@++++",
-"++++@@@@@@@@@@@++++",
-"++++@@@@@@@@@@@++++",
-"++++$$$$$$$$$$$++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #A4A1A4",
+"@ c #D5D2D5",
+".............",
+".............",
+"..+++++++++..",
+"..+++++++++..",
+"..++@@@@@++..",
+"..++@@@@@++..",
+"..++.....++..",
+"..++.....++..",
+"..++.....++..",
+"..+++++++++..",
+"..+++++++++..",
+"..@@@@@@@@@..",
+"..@@@@@@@@@.."};
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index cba74a5e0..f8bc8dd0c 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,32 +1,22 @@
/* XPM */
static char * maximize_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #B4BAB4 s active_mid_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................+",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@###########@@@=",
-".@@@###########@@@=",
-".@@@##.......##@@@=",
-".@@@##@@@@@@@##@@@=",
-".@@@##@@@@@@@##@@@=",
-".@@@##@@@@@@@##@@@=",
-".@@@##@@@@@@@##@@@=",
-".@@@##@@@@@@@##@@@=",
-".@@@##@@@@@@@##@@@=",
-".@@@###########@@@=",
-".@@@###########@@@=",
-".@@@...........@@@=",
-".@@@@@@@@@@@@@@@@@=",
-"+==================",
-" ",
-" "};
-
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #E6E6E6",
+"@ c #D5D2D5",
+"# c #FFFFFF",
+"$ c #000000",
+"............+",
+".@@@@@@@@@@@#",
+".@$$$$$$$$$@#",
+".@$$$$$$$$$@#",
+".@$$.....$$@#",
+".@$$@@@@@$$@#",
+".@$$@@@@@$$@#",
+".@$$@@@@@$$@#",
+".@$$@@@@@$$@#",
+".@$$$$$$$$$@#",
+".@$$$$$$$$$@#",
+".@.........@#",
+"+############"};
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index e9bfb7b65..918174c0a 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * maximize_toggled_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"++++########+++++++",
-"++++########+++++++",
-"++++##@@@@##+++++++",
-"++++##$$$$##@##++++",
-"++++##++++##@##++++",
-"++++##++++##+##++++",
-"++++########+##++++",
-"++++########+##++++",
-"++++@@@@@++++##++++",
-"++++$$$########++++",
-"+++++++########++++",
-"+++++++@@@@@@@@++++",
-"+++++++$$$$$$$$++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #000000",
+"@ c #A4A1A4",
+"# c #D5D2D5",
+".............",
+".............",
+"..++++++.....",
+"..++++++.....",
+"..++@@++.....",
+"..++##++@++..",
+"..++++++@++..",
+"..++++++#++..",
+"..@@@@@##++..",
+"..###++++++..",
+".....++++++..",
+".....@@@@@@..",
+".....######.."};
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index 82b89605b..ed5fa8f8e 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * maximize_toggled_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"++++@@@@@@@@+++++++",
-"++++@@@@@@@@+++++++",
-"++++@@$$$$@@+++++++",
-"++++@@++++@@$@@++++",
-"++++@@++++@@$@@++++",
-"++++@@++++@@+@@++++",
-"++++@@@@@@@@+@@++++",
-"++++@@@@@@@@+@@++++",
-"++++$$$$$++++@@++++",
-"+++++++@@@@@@@@++++",
-"+++++++@@@@@@@@++++",
-"+++++++$$$$$$$$++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #A4A1A4",
+"@ c #D5D2D5",
+".............",
+".............",
+"..++++++.....",
+"..++++++.....",
+"..++@@++.....",
+"..++@@++@++..",
+"..++++++@++..",
+"..++++++@++..",
+"..@@@@@@@++..",
+"..@@@++++++..",
+".....++++++..",
+".....@@@@@@..",
+".....@@@@@@.."};
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index 74e0ccdd2..5d4caa111 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -1,32 +1,22 @@
/* XPM */
static char * maximize_toggled_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #B4BAB4 s active_mid_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................+",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@########@@@@@@=",
-".@@@########@@@@@@=",
-".@@@##....##@@@@@@=",
-".@@@##@@@@##.##@@@=",
-".@@@##@@@@##.##@@@=",
-".@@@##@@@@##@##@@@=",
-".@@@########@##@@@=",
-".@@@########@##@@@=",
-".@@@.....@@@@##@@@=",
-".@@@@@@########@@@=",
-".@@@@@@########@@@=",
-".@@@@@@........@@@=",
-".@@@@@@@@@@@@@@@@@=",
-"+==================",
-" ",
-" "};
-
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #E6E6E6",
+"@ c #D5D2D5",
+"# c #FFFFFF",
+"$ c #000000",
+"............+",
+".@@@@@@@@@@@#",
+".@$$$$$$@@@@#",
+".@$$$$$$@@@@#",
+".@$$..$$@@@@#",
+".@$$@@$$.$$@#",
+".@$$$$$$.$$@#",
+".@$$$$$$@$$@#",
+".@.....@@$$@#",
+".@@@@$$$$$$@#",
+".@@@@$$$$$$@#",
+".@@@@......@#",
+"+############"};
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index e928be9d2..9f994a57d 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * menu_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"++++###########++++",
-"++++###########++++",
-"++++@@@@@@@@@@@++++",
-"++++$#########$++++",
-"+++++##@@@@@##+++++",
-"+++++@##$$$##@+++++",
-"+++++$@##+##@$+++++",
-"++++++$@###@$++++++",
-"+++++++$@#@$+++++++",
-"++++++++$@$++++++++",
-"+++++++++$+++++++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #A4A1A4",
+"@ c #000000",
+"# c #D5D2D5",
+".............",
+".............",
+".............",
+"..+@.....@+..",
+"..@@+...+@@..",
+"..@@@+.+@@@..",
+"..+@@@+@@@+..",
+"..#+@@@@@+#..",
+"...#+@@@+#...",
+"....#+@+#....",
+".....#+#.....",
+"......#......",
+"............."};
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index e30c06f90..c7e5eed7d 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * menu_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"++++@@@@@@@@@@@++++",
-"++++@@@@@@@@@@@++++",
-"++++$$$$$$$$$$$++++",
-"+++++@@@@@@@@@+++++",
-"+++++@@$$$$$@@+++++",
-"+++++$@@+++@@$+++++",
-"++++++$@@+@@$++++++",
-"+++++++$@@@$+++++++",
-"++++++++$@$++++++++",
-"+++++++++$+++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #D5D2D5",
+"@ c #A4A1A4",
+".............",
+".............",
+".............",
+"..+@.....@+..",
+"..@@+...+@@..",
+"..@@@+.+@@@..",
+"..+@@@+@@@+..",
+"..++@@@@@++..",
+"...++@@@++...",
+"....++@++....",
+".....+++.....",
+"......+......",
+"............."};
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index 749f30513..e2315446c 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -1,31 +1,22 @@
/* XPM */
static char * menu_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #B4BAB4 s active_mid_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................+",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@###########@@@=",
-".@@@###########@@@=",
-".@@@...........@@@=",
-".@@@@#########@@@@=",
-".@@@@##.....##@@@@=",
-".@@@@.##.@.##.@@@@=",
-".@@@@@.##.##.@@@@@=",
-".@@@@@@.###.@@@@@@=",
-".@@@@@@@.#.@@@@@@@=",
-".@@@@@@@@.@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-"+==================",
-" ",
-" "};
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #E6E6E6",
+"@ c #D5D2D5",
+"# c #FFFFFF",
+"$ c #000000",
+"............+",
+".@@@@@@@@@@@#",
+".@@@@@@@@@@@#",
+".@.$@@@@@$.@#",
+".@$$.@@@.$$@#",
+".@$$$.@.$$$@#",
+".@.$$$.$$$.@#",
+".@@.$$$$$.@@#",
+".@@@.$$$.@@@#",
+".@@@@.$.@@@@#",
+".@@@@@.@@@@@#",
+".@@@@@@@@@@@#",
+"+############"};
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index 6a288087c..fa5619adf 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * shade_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #B4BAB4 s active_mid_2",
-"$ c #000000",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++$+++++++++",
-"++++++++$$$++++++++",
-"+++++++$$@$$+++++++",
-"++++++$$@#@$$++++++",
-"+++++$$@#+#@$$+++++",
-"+++++$$$$$$$$$+++++",
-"+++++@@@@@@@@@+++++",
-"++++$$$$$$$$$$$++++",
-"++++$$$$$$$$$$$++++",
-"++++@@@@@@@@@@@++++",
-"++++###########++++",
-"+++++++++++++++++++",
-"###################",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #000000",
+"@ c #A4A1A4",
+"# c #D5D2D5",
+".............",
+".............",
+"......+......",
+".....+++.....",
+"....++@++....",
+"...++@#@++...",
+"..++@#.#@++..",
+"..+++++++++..",
+"..@@@@@@@@@..",
+"..+++++++++..",
+"..+++++++++..",
+"..@@@@@@@@@..",
+"..#########.."};
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index eac7ada71..a66904389 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * shade_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #B4BAB4 s inactive_mid_2",
-"$ c #000000",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++@+++++++++",
-"++++++++@@@++++++++",
-"+++++++@@#@@+++++++",
-"++++++@@#+#@@++++++",
-"+++++@@+++++@@+++++",
-"+++++@@@@@@@@@+++++",
-"+++++#########+++++",
-"++++@@@@@@@@@@@++++",
-"++++@@@@@@@@@@@++++",
-"++++###########++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"###################",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #A4A1A4",
+"@ c #D5D2D5",
+".............",
+".............",
+"......+......",
+".....+++.....",
+"....++@++....",
+"...++@@@++...",
+"..++@@.@@++..",
+"..+++++++++..",
+"..@@@@@@@@@..",
+"..+++++++++..",
+"..+++++++++..",
+"..@@@@@@@@@..",
+"..@@@@@@@@@.."};
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index 2d25f05f1..00bf4edf8 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,32 +1,22 @@
/* XPM */
static char * shade_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #B4BAB4 s active_mid_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................+",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@#@@@@@@@@=",
-".@@@@@@@###@@@@@@@=",
-".@@@@@@##.##@@@@@@=",
-".@@@@@##.@.##@@@@@=",
-".@@@@##.@@@.##@@@@=",
-".@@@@#########@@@@=",
-".@@@@.........@@@@=",
-".@@@###########@@@=",
-".@@@###########@@@=",
-".@@@...........@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-"+==================",
-" ",
-" "};
-
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #E6E6E6",
+"@ c #D5D2D5",
+"# c #FFFFFF",
+"$ c #000000",
+"............+",
+".@@@@@@@@@@@#",
+".@@@@@$@@@@@#",
+".@@@@$$$@@@@#",
+".@@@$$.$$@@@#",
+".@@$$.@.$$@@#",
+".@$$.@@@.$$@#",
+".@$$$$$$$$$@#",
+".@.........@#",
+".@$$$$$$$$$@#",
+".@$$$$$$$$$@#",
+".@.........@#",
+"+############"};
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index 36f1e7915..dbd9f1623 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * shade_toggled_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #B4BAB4 s active_mid_2",
-"$ c #000000",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++$$$$$$$$$+++++",
-"+++++$$@@@@@$$+++++",
-"+++++@$$###$$@+++++",
-"+++++#@$$+$$@#+++++",
-"++++++#@$$$@#++++++",
-"+++++++#@$@#+++++++",
-"++++++++#@#++++++++",
-"++++$$$$$$$$$$$++++",
-"++++$$$$$$$$$$$++++",
-"++++@@@@@@@@@@@++++",
-"++++###########++++",
-"+++++++++++++++++++",
-"###################",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #000000",
+"@ c #A4A1A4",
+"# c #D5D2D5",
+".............",
+".............",
+"..+++++++++..",
+"..+++++++++..",
+"..@@@@@@@@@..",
+"..+++++++++..",
+"..++@@@@@++..",
+"..@++###++@..",
+"..#@++.++@#..",
+"...#@+++@#...",
+"....#@+@#....",
+".....#@#.....",
+"......#......"};
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index a90c74522..773a4f682 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * shade_toggled_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #B4BAB4 s inactive_mid_2",
-"$ c #000000",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++@@@@@@@@@+++++",
-"+++++@@#####@@+++++",
-"+++++#@@+++@@#+++++",
-"++++++#@@+@@#++++++",
-"+++++++#@@@#+++++++",
-"++++++++#@#++++++++",
-"+++++++++#+++++++++",
-"++++@@@@@@@@@@@++++",
-"++++@@@@@@@@@@@++++",
-"++++###########++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"###################",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #A4A1A4",
+"@ c #D5D2D5",
+".............",
+".............",
+"..+++++++++..",
+"..+++++++++..",
+"..@@@@@@@@@..",
+"..+++++++++..",
+"..++@@@@@++..",
+"..@++@@@++@..",
+"..@@++.++@@..",
+"...@@+++@@...",
+"....@@+@@....",
+".....@@@.....",
+"......@......"};
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index 86db12ecc..69d2c9b79 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -1,32 +1,22 @@
/* XPM */
static char * shade_toggled_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #B4BAB4 s active_mid_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................+",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@#########@@@@=",
-".@@@@##.....##@@@@=",
-".@@@@.##@@@##.@@@@=",
-".@@@@@.##@##.@@@@@=",
-".@@@@@@.###.@@@@@@=",
-".@@@@@@@.#.@@@@@@@=",
-".@@@@@@@@.@@@@@@@@=",
-".@@@###########@@@=",
-".@@@###########@@@=",
-".@@@...........@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-"+==================",
-" ",
-" "};
-
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #E6E6E6",
+"@ c #D5D2D5",
+"# c #FFFFFF",
+"$ c #000000",
+"............+",
+".@@@@@@@@@@@#",
+".@$$$$$$$$$@#",
+".@$$$$$$$$$@#",
+".@.........@#",
+".@$$$$$$$$$@#",
+".@$$.....$$@#",
+".@.$$@@@$$.@#",
+".@@.$$@$$.@@#",
+".@@@.$$$.@@@#",
+".@@@@.$.@@@@#",
+".@@@@@.@@@@@#",
+"+############"};
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 67ee34a21..59d4ff3bb 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * stick_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"++++++++++#+++#++++",
-"++++++++++#####++++",
-"++++@######++##++++",
-"++++#$$$$$#$$##++++",
-"++++@######@@##++++",
-"++++$@@@@@#####++++",
-"+++++$$$$$#@@@#++++",
-"++++++++++@$$$@++++",
-"++++++++++$+++$++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #000000",
+"@ c #A4A1A4",
+"# c #D5D2D5",
+".............",
+".............",
+".............",
+".......+...+.",
+".......+++++.",
+".@++++++..++.",
+".+#####+##++.",
+".@++++++@@++.",
+".#@@@@@+++++.",
+"..#####+@@@+.",
+".......@###@.",
+".......#...#.",
+"............."};
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index d971359f3..43b706d6d 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * stick_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #000000",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"++++++++++@+++@++++",
-"++++++++++@@@@@++++",
-"++++$@@@@@@++@@++++",
-"++++@$$$$$@$$@@++++",
-"++++$@@@@@@$$@@++++",
-"+++++$$$$$@@@@@++++",
-"++++++++++@$$$@++++",
-"++++++++++$+++$++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"$$$$$$$$$$$$$$$$$$$",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #A4A1A4",
+"@ c #D5D2D5",
+".............",
+".............",
+".............",
+".......+...+.",
+".......+++++.",
+".@++++++..++.",
+".+@@@@@+@@++.",
+".@++++++@@++.",
+".@@@@@@+++++.",
+"..@@@@@+@@@+.",
+".......@@@@@.",
+".......@...@.",
+"............."};
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index 8100d7f12..47a58ec6d 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,32 +1,22 @@
/* XPM */
static char * stick_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #B4BAB4 s active_mid_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................+",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@#@@@#@@@=",
-".@@@@@@@@@#####@@@=",
-".@@@.######@@##@@@=",
-".@@@#.....#..##@@@=",
-".@@@.######..##@@@=",
-".@@@@.....#####@@@=",
-".@@@@@@@@@#...#@@@=",
-".@@@@@@@@@.@@@.@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-".@@@@@@@@@@@@@@@@@=",
-"+==================",
-" ",
-" "};
-
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #FFFFFF",
+"@ c #000000",
+"# c #D5D2D5",
+"$ c #E6E6E6",
+".............",
+".+++++++++++.",
+".+++++++++++.",
+".++++++@+++@.",
+".++++++@@@@@.",
+".#@@@@@@$$@@.",
+".@#####@$$@@.",
+".#@@@@@@##@@.",
+".+#####@@@@@.",
+".++++++@###@.",
+".++++++#+++#.",
+".+++++++++++.",
+"............."};
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index 828810354..5d6648320 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -1,32 +1,21 @@
/* XPM */
static char * stick_toggled_active_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s active_hilight_2",
-"+ c #D5D6D5 s active_color_2",
-"@ c #949594 s active_shadow_2",
-"# c #B4BAB4 s active_mid_2",
-"$ c #000000",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++#$$$#+++++++",
-"++++++#$++@$#++++++",
-"++++++$+++#@$#+++++",
-"++++++$++$#@$@+++++",
-"++++++$@###@$@#++++",
-"++++++#$@@@$@@#++++",
-"+++++++#$$$@@##++++",
-"++++++++#@@@##+++++",
-"++++++++++###++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"###################",
-" ",
-" "};
-
+"13 13 5 1",
+" c None",
+". c #E6E6E6",
+"+ c #D5D2D5",
+"@ c #000000",
+"# c #A4A1A4",
+".............",
+".............",
+".............",
+"....+@@@+....",
+"...+@..#@+...",
+"...@...+#@+..",
+"...@..@+#@#..",
+"...@#+++#@#+.",
+"...+@###@##+.",
+"....+@@@##++.",
+".....+###++..",
+".......+++...",
+"............."};
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 9cdbdaedf..9375fbf08 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -1,32 +1,20 @@
/* XPM */
static char * stick_toggled_inactive_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #FFFFFF s inactive_hilight_2",
-"+ c #D5D6D5 s inactive_color_2",
-"@ c #949594 s inactive_shadow_2",
-"# c #B4BAB4 s inactive_mid_2",
-"$ c #000000",
-" ",
-" ",
-" ",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"+++++++#@@@#+++++++",
-"++++++#@++#@#++++++",
-"++++++@+++##@#+++++",
-"++++++@++@##@#+++++",
-"++++++@#####@##++++",
-"++++++#@###@###++++",
-"+++++++#@@@####++++",
-"++++++++######+++++",
-"++++++++++###++++++",
-"+++++++++++++++++++",
-"+++++++++++++++++++",
-"###################",
-" ",
-" "};
-
+"13 13 4 1",
+" c None",
+". c #E6E6E6",
+"+ c #D5D2D5",
+"@ c #A4A1A4",
+".............",
+".............",
+".............",
+"....+@@@+....",
+"...+@..+@+...",
+"...@...++@+..",
+"...@..@++@+..",
+"...@+++++@++.",
+"...+@+++@+++.",
+"....+@@@++++.",
+".....++++++..",
+".......+++...",
+"............."};
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index c976b147f..a1f3cf312 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -1,32 +1,22 @@
/* XPM */
static char * stick_toggled_pressed_xpm[] = {
-"19 22 6 1",
-" c None",
-". c #949594 s active_shadow_2",
-"+ c #B4BAB4 s active_mid_2",
-"@ c #D5D6D5 s active_color_2",
-"= c #FFFFFF s active_hilight_2",
-"# c #000000",
-" ",
-" ",
-" ",
-"..................@",
-".+++++++++++++++++=",
-".+++++++++++++++++=",
-".+++++++++++++++++=",
-".+++++++++++++++++=",
-".++++++.###.++++++=",
-".+++++.#@@.#.+++++=",
-".+++++#@@@+.#.++++=",
-".+++++#@@#+.#.++++=",
-".+++++#.+++.#..+++=",
-".+++++.#...#...+++=",
-".++++++.###....+++=",
-".+++++++......++++=",
-".+++++++++...+++++=",
-".+++++++++++++++++=",
-".+++++++++++++++++=",
-"@==================",
-" ",
-" "};
-
+"13 13 6 1",
+" c None",
+". c #A4A1A4",
+"+ c #E6E6E6",
+"@ c #D5D2D5",
+"# c #FFFFFF",
+"$ c #000000",
+"............+",
+".@@@@@@@@@@@#",
+".@@@@@@@@@@@#",
+".@@@@$$$@@@@#",
+".@@@$++.$@@@#",
+".@@$+++@.$@@#",
+".@@$++$@.$.@#",
+".@@$.@@@.$.@#",
+".@@@$...$..@#",
+".@@@@$$$..@@#",
+".@@@@@...@@@#",
+".@@@@@@@@@@@#",
+"+############"};
diff --git a/themes/default/themerc b/themes/default/themerc
index 78cf29161..92dad386d 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -3,7 +3,7 @@ button_offset=1
button_spacing=0
full_width_title=true
title_horizontal_offset=0
-title_vertical_offset_active=1
-title_vertical_offset_inactive=1
+title_vertical_offset_active=0
+title_vertical_offset_inactive=0
title_shadow_active=false
title_shadow_inactive=false
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index 84102a4a2..f1bed57f1 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_1_active_xpm[] = {
-"8 22 6 1",
+"8 20 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
@@ -24,8 +24,6 @@ static char * title_1_active_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
"########",
"........",
"$$$$$$$$"};
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index 5606e8bfb..e8a051ae2 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_1_inactive_xpm[] = {
-"8 22 6 1",
+"8 20 6 1",
" c None",
". c #949594 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
@@ -24,8 +24,6 @@ static char * title_1_inactive_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
"########",
"........",
"$$$$$$$$"};
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index 247e42f66..a1128b159 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_2_active_xpm[] = {
-"16 22 10 1",
+"16 20 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s active_hilight_2",
@@ -23,8 +23,6 @@ static char * title_2_active_xpm[] = {
"@@@@@#$$$$$$$$$$",
"@@@@@#$$$$$$$$$$",
"@@@@@#$$$$$$$$$$",
-"@@@@@#$$$$$$$$$$",
-"@@@@@#$$$$$$$$$$",
"@@@@@#%$$$$$$$$$",
"@@@@@#%$$$$$$$$$",
"@@@@@&#$$$$$$$$$",
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index 626895bf5..550927c83 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_2_inactive_xpm[] = {
-"16 22 10 1",
+"16 20 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s inactive_hilight_2",
@@ -23,8 +23,6 @@ static char * title_2_inactive_xpm[] = {
"@@@@@#$$$$$$$$$$",
"@@@@@#$$$$$$$$$$",
"@@@@@#$$$$$$$$$$",
-"@@@@@#$$$$$$$$$$",
-"@@@@@#$$$$$$$$$$",
"@@@@@#%$$$$$$$$$",
"@@@@@#%$$$$$$$$$",
"@@@@@&#$$$$$$$$$",
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index f66b4c837..74ec28ccb 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_3_active_xpm[] = {
-"20 22 10 1",
+"20 20 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s active_hilight_2",
@@ -28,8 +28,6 @@ static char * title_3_active_xpm[] = {
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
"$$$$$$$$$$$$$$$$$$$$",
"####################",
"...................."};
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index 906a5c413..0e80c83a5 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_3_inactive_xpm[] = {
-"20 22 10 1",
+"20 20 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s inactive_hilight_2",
@@ -28,8 +28,6 @@ static char * title_3_inactive_xpm[] = {
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
-"%%%%%%%%%%%%%%%%%%%%",
"$$$$$$$$$$$$$$$$$$$$",
"####################",
"...................."};
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index 15d9e394f..9ee794357 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_4_active_xpm[] = {
-"16 22 10 1",
+"16 20 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s active_hilight_2",
@@ -23,8 +23,6 @@ static char * title_4_active_xpm[] = {
"&&&&&&&&&&$@@@@@",
"&&&&&&&&&&$@@@@@",
"&&&&&&&&&&$@@@@@",
-"&&&&&&&&&&$@@@@@",
-"&&&&&&&&&&$@@@@@",
"&&&&&&&&&%$@@@@@",
"&&&&&&&&&%$@@@@@",
"&&&&&&&&&$*@@@@@",
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index 92445563a..84114787b 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_4_inactive_xpm[] = {
-"16 22 10 1",
+"16 20 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s inactive_hilight_2",
@@ -23,8 +23,6 @@ static char * title_4_inactive_xpm[] = {
"&&&&&&&&&&$@@@@@",
"&&&&&&&&&&$@@@@@",
"&&&&&&&&&&$@@@@@",
-"&&&&&&&&&&$@@@@@",
-"&&&&&&&&&&$@@@@@",
"&&&&&&&&&%$@@@@@",
"&&&&&&&&&%$@@@@@",
"&&&&&&&&&$*@@@@@",
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index bb000a401..15fd9d8bc 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_5_active_xpm[] = {
-"8 22 6 1",
+"8 20 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
@@ -24,8 +24,6 @@ static char * title_5_active_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
"########",
"........",
"$$$$$$$$"};
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index 974eacf7c..813d71261 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_5_inactive_xpm[] = {
-"8 22 6 1",
+"8 20 6 1",
" c None",
". c #949594 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
@@ -24,8 +24,6 @@ static char * title_5_inactive_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
"########",
"........",
"$$$$$$$$"};
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index 22620337c..7ed0d7f99 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_left_active_xpm[] = {
-"7 22 6 1",
+"7 20 6 1",
" c None",
". c #949595 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
@@ -21,9 +21,7 @@ static char * top_left_active_xpm[] = {
"$.@####",
"$.@####",
"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
+"$.@#@##",
"$.@#@##",
"$.@#@@#",
"$.@#.@@",
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index 85b105c54..33d042af3 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_left_inactive_xpm[] = {
-"7 22 6 1",
+"7 20 6 1",
" c None",
". c #949595 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
@@ -21,9 +21,7 @@ static char * top_left_inactive_xpm[] = {
"$.@####",
"$.@####",
"$.@####",
-"$.@####",
-"$.@####",
-"$.@####",
+"$.@#@##",
"$.@#@##",
"$.@#@@#",
"$.@#.@@",
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index 2fa8ff98a..4828d1fd1 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_right_active_xpm[] = {
-"7 22 6 1",
+"7 20 6 1",
" c None",
". c #949595 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
@@ -21,9 +21,7 @@ static char * top_right_active_xpm[] = {
"####@.$",
"####@.$",
"####@.$",
-"####@.$",
-"####@.$",
-"####@.$",
+"##@#@.$",
"##@#@.$",
"#@@#@.$",
"@@.#@.$",
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index d57e7b7a9..32e0697ad 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * top_right_inactive_xpm[] = {
-"7 22 6 1",
+"7 20 6 1",
" c None",
". c #949595 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
@@ -21,9 +21,7 @@ static char * top_right_inactive_xpm[] = {
"####@.$",
"####@.$",
"####@.$",
-"####@.$",
-"####@.$",
-"####@.$",
+"##@#@.$",
"##@#@.$",
"#@@#@.$",
"@@.#@.$",
--
GitLab