diff --git a/themes/default/Makefile.am b/themes/default/Makefile.am
index 63abc5430e2e2206fda733f99e5c743dc86d5974..95cf08ab409602ed6eb83c597233cf4f35199de1 100644
--- a/themes/default/Makefile.am
+++ b/themes/default/Makefile.am
@@ -1,6 +1,7 @@
themedir = $(datadir)/themes/Default/xfwm4
theme_DATA = \
- README \
+ README \
+ themerc \
bottom-active.png \
bottom-active.xpm \
bottom-inactive.png \
@@ -13,11 +14,15 @@ theme_DATA = \
bottom-right-active.xpm \
bottom-right-inactive.png \
bottom-right-inactive.xpm \
+ close-active.png \
close-active.xpm \
+ close-inactive.png \
close-inactive.xpm \
close-pressed.png \
close-pressed.xpm \
+ hide-active.png \
hide-active.xpm \
+ hide-inactive.png \
hide-inactive.xpm \
hide-pressed.png \
hide-pressed.xpm \
@@ -25,15 +30,21 @@ theme_DATA = \
left-active.xpm \
left-inactive.png \
left-inactive.xpm \
+ maximize-active.png \
maximize-active.xpm \
+ maximize-inactive.png \
maximize-inactive.xpm \
maximize-pressed.png \
maximize-pressed.xpm \
+ maximize-toggled-active.png \
maximize-toggled-active.xpm \
+ maximize-toggled-inactive.png \
maximize-toggled-inactive.xpm \
maximize-toggled-pressed.png \
maximize-toggled-pressed.xpm \
+ menu-active.png \
menu-active.xpm \
+ menu-inactive.png \
menu-inactive.xpm \
menu-pressed.png \
menu-pressed.xpm \
@@ -41,23 +52,30 @@ theme_DATA = \
right-active.xpm \
right-inactive.png \
right-inactive.xpm \
+ shade-active.png \
shade-active.xpm \
+ shade-inactive.png \
shade-inactive.xpm \
shade-pressed.png \
shade-pressed.xpm \
+ shade-toggled-active.png \
shade-toggled-active.xpm \
+ shade-toggled-inactive.png \
shade-toggled-inactive.xpm \
shade-toggled-pressed.png \
shade-toggled-pressed.xpm \
+ stick-active.png \
stick-active.xpm \
+ stick-inactive.png \
stick-inactive.xpm \
stick-pressed.png \
stick-pressed.xpm \
+ stick-toggled-active.png \
stick-toggled-active.xpm \
+ stick-toggled-inactive.png \
stick-toggled-inactive.xpm \
stick-toggled-pressed.png \
stick-toggled-pressed.xpm \
- themerc \
title-1-active.png \
title-1-active.xpm \
title-1-inactive.png \
diff --git a/themes/default/README b/themes/default/README
index aed4ae5996f18acce07b3a852372ced6d1de39c3..e5b34e789fc048066dbc12084378311ff19093c3 100644
--- a/themes/default/README
+++ b/themes/default/README
@@ -1,6 +1,6 @@
-breeze
-------
+just4fun
+--------
An original theme for xfwm4.
-Created Apr. 2004 by Olivier Fourdan <fourdan@xfce.org>
+Created Feb. 2005 by Olivier Fourdan <fourdan@xfce.org>
Theme released under GNU GPL license.
diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm
index 1094b9c5cb89bff118dab6b0cef662b9757b3192..b72569b936bf828baaa16cb571bf31d18a2a8ddb 100644
--- a/themes/default/bottom-active.xpm
+++ b/themes/default/bottom-active.xpm
@@ -3,10 +3,10 @@ static char * bottom_active_xpm[] = {
"32 5 6 1",
" c None",
". c #000000",
-"+ c #6EA0CD s active_hilight_2",
-"@ c #3E566B s active_shadow_2",
-"$ c #567B9C s active_mid_2",
-"# c #4C7BA6 s active_color_2",
+"+ c #E0E0E0 s active_hilight_2",
+"@ c #A0A0A0 s active_shadow_2",
+"$ c #B0B0B0 s active_mid_2",
+"# c #C0C0C0 s active_color_2",
"################################",
"################################",
"################################",
diff --git a/themes/default/bottom-inactive.xpm b/themes/default/bottom-inactive.xpm
index 4ee0fec035278f0cca0e333d7a824bf5542d924e..7225014f8c3576456a359436fd0646ae14ba843c 100644
--- a/themes/default/bottom-inactive.xpm
+++ b/themes/default/bottom-inactive.xpm
@@ -3,10 +3,10 @@ static char * bottom_inactive_xpm[] = {
"32 5 6 1",
" c None",
". c #000000",
-"+ c #6EA0CD s inactive_hilight_2",
-"@ c #3E566B s inactive_shadow_2",
-"$ c #567B9C s inactive_mid_2",
-"# c #4C7BA6 s inactive_color_2",
+"+ c #E0E0E0 s inactive_hilight_2",
+"@ c #A0A0A0 s inactive_shadow_2",
+"$ c #B0B0B0 s inactive_mid_2",
+"# c #C0C0C0 s inactive_color_2",
"################################",
"################################",
"################################",
diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm
index d73c513153c6ea46735bdae51866988236f03765..a5b3004993d3c71f0a2aa8f847d53405fbf2b7b9 100644
--- a/themes/default/bottom-left-active.xpm
+++ b/themes/default/bottom-left-active.xpm
@@ -3,10 +3,10 @@ static char * bottom_left_active_xpm[] = {
"16 16 6 1",
" c None",
". c #000000",
-"+ c #6EA0CD s active_hilight_2",
-"@ c #3E566B s active_shadow_2",
-"$ c #567B9C s active_mid_2",
-"# c #4C7BA6 s active_color_2",
+"+ c #E0E0E0 s active_hilight_2",
+"@ c #A0A0A0 s active_shadow_2",
+"$ c #B0B0B0 s active_mid_2",
+"# c #C0C0C0 s active_color_2",
".#### ",
".#### ",
".#### ",
@@ -17,9 +17,9 @@ static char * bottom_left_active_xpm[] = {
".#### ",
".#### ",
".#### ",
-".$### ",
+".#### ",
+".###############",
+".###############",
+".###############",
".@##############",
-" .$#############",
-" .@$############",
-" ..@$##########",
-" ............"};
+" ..............."};
diff --git a/themes/default/bottom-left-inactive.xpm b/themes/default/bottom-left-inactive.xpm
index d3402f93d605bd3f8fae69f697143a24f66cdf0e..5ba442d4dabe1a709ce4c759fcb518d276c48a22 100644
--- a/themes/default/bottom-left-inactive.xpm
+++ b/themes/default/bottom-left-inactive.xpm
@@ -3,10 +3,10 @@ static char * bottom_left_inactive_xpm[] = {
"16 16 6 1",
" c None",
". c #000000",
-"+ c #6EA0CD s inactive_hilight_2",
-"@ c #3E566B s inactive_shadow_2",
-"$ c #567B9C s inactive_mid_2",
-"# c #4C7BA6 s inactive_color_2",
+"+ c #E0E0E0 s inactive_hilight_2",
+"@ c #A0A0A0 s inactive_shadow_2",
+"$ c #B0B0B0 s inactive_mid_2",
+"# c #C0C0C0 s inactive_color_2",
".#### ",
".#### ",
".#### ",
@@ -17,9 +17,9 @@ static char * bottom_left_inactive_xpm[] = {
".#### ",
".#### ",
".#### ",
-".$### ",
+".#### ",
+".###############",
+".###############",
+".###############",
".@##############",
-" .$#############",
-" .@$############",
-" ..@$##########",
-" ............"};
+" ..............."};
diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm
index b08dcdd6b58c4beb3c38357dc6680b72e467a699..a39ab6a8bd7c6fdff350d06166e21f55a8971f3d 100644
--- a/themes/default/bottom-right-active.xpm
+++ b/themes/default/bottom-right-active.xpm
@@ -3,10 +3,10 @@ static char * bottom_right_active_xpm[] = {
"16 16 6 1",
" c None",
". c #000000",
-"+ c #6EA0CD s active_hilight_2",
-"@ c #3E566B s active_shadow_2",
-"$ c #567B9C s active_mid_2",
-"# c #4C7BA6 s active_color_2",
+"+ c #E0E0E0 s active_hilight_2",
+"@ c #A0A0A0 s active_shadow_2",
+"$ c #B0B0B0 s active_mid_2",
+"# c #C0C0C0 s active_color_2",
" ####.",
" ####.",
" ####.",
@@ -17,9 +17,9 @@ static char * bottom_right_active_xpm[] = {
" ####.",
" ####.",
" ####.",
-" ###$.",
+" ####.",
+"###############.",
+"###############.",
+"###############.",
"##############@.",
-"#############$. ",
-"############$@. ",
-"##########$@.. ",
-"............ "};
+"............... "};
diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm
index 904ef2eec7b7d78c74274fa7cd4477c606854ea9..dd64486225155093fea70ae22500ae619ae66153 100644
--- a/themes/default/bottom-right-inactive.xpm
+++ b/themes/default/bottom-right-inactive.xpm
@@ -3,10 +3,10 @@ static char * bottom_right_inactive_xpm[] = {
"16 16 6 1",
" c None",
". c #000000",
-"+ c #6EA0CD s inactive_hilight_2",
-"@ c #3E566B s inactive_shadow_2",
-"$ c #567B9C s inactive_mid_2",
-"# c #4C7BA6 s inactive_color_2",
+"+ c #E0E0E0 s inactive_hilight_2",
+"@ c #A0A0A0 s inactive_shadow_2",
+"$ c #B0B0B0 s inactive_mid_2",
+"# c #C0C0C0 s inactive_color_2",
" ####.",
" ####.",
" ####.",
@@ -17,9 +17,9 @@ static char * bottom_right_inactive_xpm[] = {
" ####.",
" ####.",
" ####.",
-" ###$.",
+" ####.",
+"###############.",
+"###############.",
+"###############.",
"##############@.",
-"#############$. ",
-"############$@. ",
-"##########$@.. ",
-"............ "};
+"............... "};
diff --git a/themes/default/close-active.png b/themes/default/close-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..8856e82be0b3dbe0c53b5fd6ebdf33ae154d32bd
Binary files /dev/null and b/themes/default/close-active.png differ
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index 9ea41708f01d5b4fbd4d1009116cdaf8a3acbf5e..e5fa2e9231c13699cd6151a07b52ffd1b3e95a54 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,32 +1,26 @@
/* 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 s active_border_color",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++##+++++##++++",
-"++++###+++###++++",
-"++++@###+###@++++",
-"++++$@#####@$++++",
-"+++++$@###@$+++++",
-"++++++#####++++++",
-"+++++###@###+++++",
-"++++###@$@###++++",
-"++++##@$+$@##++++",
-"++++@@$+++$@@++++",
-"++++$$+++++$$++++",
-"+++++++++++++++++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@.#@@@@#.@@@@+",
+"+@@@@###@@###@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@###@@###@@@@+",
+"+@@@@.#@@@@#.@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/close-inactive.png b/themes/default/close-inactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2d43887fe35038d763813398cb473241965f7a4
Binary files /dev/null and b/themes/default/close-inactive.png differ
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 2590fdb6b6bdcb3e1cbb92282276e5ed2905b8fd..996a9afc926f2a25fe589a77724b3ed1cc833842 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,32 +1,26 @@
/* 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 s inactive_border_color",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++@@+++++@@++++",
-"++++@@@+++@@@++++",
-"++++$@@@+@@@$++++",
-"+++++$@@@@@$+++++",
-"++++++$@@@$++++++",
-"++++++@@@@@++++++",
-"+++++@@@$@@@+++++",
-"++++@@@$+$@@@++++",
-"++++@@$+++$@@++++",
-"++++$$+++++$$++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s inactive_color_1",
+"+ c #D0D0FF s inactive_hilight_1",
+"@ c #B0B0FF s inactive_mid_1",
+"# c #D0D0FF s inactive_hilight_1",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@.#@@@@#.@@@@+",
+"+@@@@###@@###@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@###@@###@@@@+",
+"+@@@@.#@@@@#.@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/close-pressed.png b/themes/default/close-pressed.png
index c31f3bdb5e924b954f4f97d8b349046feb3147e5..571ac66a1e7511f4762c77002e7ca513b7cde158 100644
Binary files a/themes/default/close-pressed.png and b/themes/default/close-pressed.png differ
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index ee602bcfeea24fc188aed8dde78ada1d770b0eb1..fdbd941fcc0099c66b634b410d7325539a7ee062 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,32 +1,26 @@
/* 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 s active_border_color",
-" ",
-" ",
-" ",
-" ............... ",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@##@@@@@##@@@.",
-".@@@###@@@###@@@.",
-".@@@.###@###.@@@.",
-".@@@@.#####.@@@@.",
-".@@@@@.###.@@@@@.",
-".@@@@@#####@@@@@.",
-".@@@@###.###@@@@.",
-".@@@###.@.###@@@.",
-".@@@##.@@@.##@@@.",
-".@@@..@@@@@..@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-" ............... ",
-" ",
-" "}:
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@+#@@@@#+@@@@+",
+"+@@@@###@@###@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@###@@###@@@@+",
+"+@@@@+#@@@@#+@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/hide-active.png b/themes/default/hide-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..8856e82be0b3dbe0c53b5fd6ebdf33ae154d32bd
Binary files /dev/null and b/themes/default/hide-active.png differ
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 6be563c11f803c273587303e59a3b312c1570783..649d826ef8d2c6e6c2993c26b2adcb889903dfa8 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,32 +1,26 @@
/* 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 s active_border_color",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++++#####++++++",
-"++++++#####++++++",
-"++++++##+##++++++",
-"++++++#####++++++",
-"++++++#####++++++",
-"++++++@@@@@++++++",
-"++++++$$$$$++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/hide-inactive.png b/themes/default/hide-inactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2d43887fe35038d763813398cb473241965f7a4
Binary files /dev/null and b/themes/default/hide-inactive.png differ
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index af9faad9ccc68ab08959a344a1ac681f28bed97d..7e1582a3166f40efa5a96aabd0a3dbe590faaa53 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,32 +1,26 @@
/* 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 s inactive_border_color",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++++@@@@@++++++",
-"++++++@@@@@++++++",
-"++++++@@+@@++++++",
-"++++++@@@@@++++++",
-"++++++@@@@@++++++",
-"++++++$$$$$++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s inactive_color_1",
+"+ c #D0D0FF s inactive_hilight_1",
+"@ c #B0B0FF s inactive_mid_1",
+"# c #D0D0FF s inactive_hilight_1",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/hide-pressed.png b/themes/default/hide-pressed.png
index c31f3bdb5e924b954f4f97d8b349046feb3147e5..4057e05253adf6e954fefe2949deb8edfd6b54a3 100644
Binary files a/themes/default/hide-pressed.png and b/themes/default/hide-pressed.png differ
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index 82f1c6be4047bccd8c6f5028bd60b43152e55b7c..61d6aad8b5e6c14b7a7a0c65b0bf55349cdcf8a6 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,32 +1,26 @@
/* 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 s active_border_color",
-" ",
-" ",
-" ",
-" ............... ",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@#####@@@@@.",
-".@@@@@#####@@@@@.",
-".@@@@@##@##@@@@@.",
-".@@@@@#####@@@@@.",
-".@@@@@#####@@@@@.",
-".@@@@@.....@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-" ............... ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/left-active.xpm b/themes/default/left-active.xpm
index 37af8ff5129f5b3ba9c4e945edede72734cdd500..46ede23e794a6f860b6784397878a256014c4f73 100644
--- a/themes/default/left-active.xpm
+++ b/themes/default/left-active.xpm
@@ -3,10 +3,10 @@ static char * left_active_xpm[] = {
"5 32 6 1",
" c None",
". c #000000",
-"+ c #6EA0CD s active_hilight_2",
-"@ c #3E566B s active_shadow_2",
-"$ c #567B9C s active_mid_2",
-"# c #4C7BA6 s active_color_2",
+"+ c #E0E0E0 s active_hilight_2",
+"@ c #A0A0A0 s active_shadow_2",
+"$ c #B0B0B0 s active_mid_2",
+"# c #C0C0C0 s active_color_2",
".####",
".####",
".####",
diff --git a/themes/default/left-inactive.xpm b/themes/default/left-inactive.xpm
index db3b991b41e269d18eaa360194e1cbfebfb99ebe..8bece8791129c3d5158bc2503610eaf8f124e271 100644
--- a/themes/default/left-inactive.xpm
+++ b/themes/default/left-inactive.xpm
@@ -3,10 +3,10 @@ static char * left_inactive_xpm[] = {
"5 32 6 1",
" c None",
". c #000000",
-"+ c #6EA0CD s inactive_hilight_2",
-"@ c #3E566B s inactive_shadow_2",
-"$ c #567B9C s inactive_mid_2",
-"# c #4C7BA6 s inactive_color_2",
+"+ c #E0E0E0 s inactive_hilight_2",
+"@ c #A0A0A0 s inactive_shadow_2",
+"$ c #B0B0B0 s inactive_mid_2",
+"# c #C0C0C0 s inactive_color_2",
".####",
".####",
".####",
diff --git a/themes/default/maximize-active.png b/themes/default/maximize-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..8856e82be0b3dbe0c53b5fd6ebdf33ae154d32bd
Binary files /dev/null and b/themes/default/maximize-active.png differ
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index b4fc772f434ba9bfb1187ac741bd4aeac19f7367..66f56e22b6930bd5b1ccbe9e3cdf772ad8918049 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,32 +1,26 @@
/* 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 s active_border_color",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++#########++++",
-"++++#########++++",
-"++++##@@@@@##++++",
-"++++##$$$$$##++++",
-"++++##+++++##++++",
-"++++##+++++##++++",
-"++++##+++++##++++",
-"++++#########++++",
-"++++#########++++",
-"++++@@@@@@@@@++++",
-"++++$$$$$$$$$++++",
-"+++++++++++++++++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@.######.@@@@+",
+"+@@@@########@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@########@@@@+",
+"+@@@@.######.@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/maximize-inactive.png b/themes/default/maximize-inactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2d43887fe35038d763813398cb473241965f7a4
Binary files /dev/null and b/themes/default/maximize-inactive.png differ
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index 65c58f41d2b40507e2fc39d56c5b37e9536a6626..4c823036c3ca448af78eed8a9b675f5f87851127 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,32 +1,26 @@
/* 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 s inactive_border_color",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++@@@@@@@@@++++",
-"++++@@@@@@@@@++++",
-"++++@@$$$$$@@++++",
-"++++@@+++++@@++++",
-"++++@@+++++@@++++",
-"++++@@+++++@@++++",
-"++++@@+++++@@++++",
-"++++@@@@@@@@@++++",
-"++++@@@@@@@@@++++",
-"++++$$$$$$$$$++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s inactive_color_1",
+"+ c #D0D0FF s inactive_hilight_1",
+"@ c #B0B0FF s inactive_mid_1",
+"# c #D0D0FF s inactive_hilight_1",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@.######.@@@@+",
+"+@@@@########@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@########@@@@+",
+"+@@@@.######.@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/maximize-pressed.png b/themes/default/maximize-pressed.png
index c31f3bdb5e924b954f4f97d8b349046feb3147e5..571ac66a1e7511f4762c77002e7ca513b7cde158 100644
Binary files a/themes/default/maximize-pressed.png and b/themes/default/maximize-pressed.png differ
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index a4ec6dfd9615d46d3e3309ef559bd0e0a4ea705c..00066a3283407c5a4a9aa8e4e8a7140ef4bf2782 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,32 +1,26 @@
/* 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 s active_border_color",
-" ",
-" ",
-" ",
-" ............... ",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@#########@@@.",
-".@@@#########@@@.",
-".@@@##.....##@@@.",
-".@@@##@@@@@##@@@.",
-".@@@##@@@@@##@@@.",
-".@@@##@@@@@##@@@.",
-".@@@##@@@@@##@@@.",
-".@@@#########@@@.",
-".@@@#########@@@.",
-".@@@.........@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-" ............... ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@########@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@########@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/maximize-toggled-active.png b/themes/default/maximize-toggled-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..8856e82be0b3dbe0c53b5fd6ebdf33ae154d32bd
Binary files /dev/null and b/themes/default/maximize-toggled-active.png differ
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index 3c14896a3a4aab57b70cd4cb038dcdc5d8b515ee..24735734d4b57d563aed9644572c66dc25f6fa7f 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -1,32 +1,26 @@
/* 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 s active_border_color",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++########++++++",
-"+++########++++++",
-"+++##@@@@##++++++",
-"+++##$$$$##@##+++",
-"+++##++++##@##+++",
-"+++##++++##+##+++",
-"+++########+##+++",
-"+++########+##+++",
-"+++@@@@@++++##+++",
-"+++$$$########+++",
-"++++++########+++",
-"++++++@@@@@@@@+++",
-"++++++$$$$$$$$+++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@.#####.@@@+",
+"+@@@@@@#######@@@+",
+"+@@@@@@@@@@@##@@@+",
+"+@@@.#####.@##@@@+",
+"+@@@#######@##@@@+",
+"+@@@##@@@##@##@@@+",
+"+@@@##@@@##@#.@@@+",
+"+@@@##@@@##@@@@@@+",
+"+@@@#######@@@@@@+",
+"+@@@.#####.@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/maximize-toggled-inactive.png b/themes/default/maximize-toggled-inactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2d43887fe35038d763813398cb473241965f7a4
Binary files /dev/null and b/themes/default/maximize-toggled-inactive.png differ
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index bf83c512cf231124dbf8fa843a55fe8428e448d4..457c73b5064bd3f6431be13380d1b18ff86c7a4e 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -1,32 +1,26 @@
/* 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 s inactive_border_color",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++@@@@@@@@++++++",
-"+++@@@@@@@@++++++",
-"+++@@$$$$@@++++++",
-"+++@@++++@@$@@+++",
-"+++@@++++@@$@@+++",
-"+++@@++++@@+@@+++",
-"+++@@@@@@@@+@@+++",
-"+++@@@@@@@@+@@+++",
-"+++$$$$$++++@@+++",
-"++++++@@@@@@@@+++",
-"++++++@@@@@@@@+++",
-"++++++$$$$$$$$+++",
-"+++++++++++++++++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s inactive_color_1",
+"+ c #D0D0FF s inactive_hilight_1",
+"@ c #B0B0FF s inactive_mid_1",
+"# c #D0D0FF s inactive_hilight_1",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@.#####.@@@+",
+"+@@@@@@#######@@@+",
+"+@@@@@@@@@@@##@@@+",
+"+@@@.#####.@##@@@+",
+"+@@@#######@##@@@+",
+"+@@@##@@@##@##@@@+",
+"+@@@##@@@##@#.@@@+",
+"+@@@##@@@##@@@@@@+",
+"+@@@#######@@@@@@+",
+"+@@@.#####.@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/maximize-toggled-pressed.png b/themes/default/maximize-toggled-pressed.png
index c31f3bdb5e924b954f4f97d8b349046feb3147e5..571ac66a1e7511f4762c77002e7ca513b7cde158 100644
Binary files a/themes/default/maximize-toggled-pressed.png and b/themes/default/maximize-toggled-pressed.png differ
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index 182b9612ffebb4c952b02ea35d21a866e812c06c..7fab581f2e7257e3282e5b5c377d1c98d43eacb1 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -1,32 +1,26 @@
/* 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 s active_border_color",
-" ",
-" ",
-" ",
-" ............... ",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@########@@@@@.",
-".@@########@@@@@.",
-".@@##....##@@@@@.",
-".@@##@@@@##.##@@.",
-".@@##@@@@##.##@@.",
-".@@##@@@@##@##@@.",
-".@@########@##@@.",
-".@@########@##@@.",
-".@@.....@@@@##@@.",
-".@@@@@########@@.",
-".@@@@@########@@.",
-".@@@@@........@@.",
-".@@@@@@@@@@@@@@@.",
-" ............... ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@#####@@@@+",
+"+@@@@@@#######@@@+",
+"+@@@@@@@@@@@##@@@+",
+"+@@@@#####@@##@@@+",
+"+@@@#######@##@@@+",
+"+@@@##@@@##@##@@@+",
+"+@@@##@@@##@#@@@@+",
+"+@@@##@@@##@@@@@@+",
+"+@@@#######@@@@@@+",
+"+@@@@#####@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/menu-active.png b/themes/default/menu-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..8856e82be0b3dbe0c53b5fd6ebdf33ae154d32bd
Binary files /dev/null and b/themes/default/menu-active.png differ
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index 8f49b5187f1b7cd1261b14b177a29e9a3d5a1d6d..7717497a99bd4d21158456720d861142ec4e5139 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -1,32 +1,26 @@
/* 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 s active_border_color",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++###########+++",
-"+++###########+++",
-"+++@@@@@@@@@@@+++",
-"+++$#########$+++",
-"++++##@@@@@##++++",
-"++++@##$$$##@++++",
-"++++$@##+##@$++++",
-"+++++$@###@$+++++",
-"++++++$@#@$++++++",
-"+++++++$@$+++++++",
-"++++++++$++++++++",
-"+++++++++++++++++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@#@@@@#@@@@@+",
+"+@@@@###@@###@@@@+",
+"+@@@@########@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/menu-inactive.png b/themes/default/menu-inactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2d43887fe35038d763813398cb473241965f7a4
Binary files /dev/null and b/themes/default/menu-inactive.png differ
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index 72a451152742040f3bd3ec8d8b4777ad75e7c206..d20696a386532276b22aa666e4908bf7abcea449 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -1,32 +1,26 @@
/* 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 s inactive_border_color",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++@@@@@@@@@@@+++",
-"+++@@@@@@@@@@@+++",
-"+++$$$$$$$$$$$+++",
-"++++@@@@@@@@@++++",
-"++++@@$$$$$@@++++",
-"++++$@@+++@@$++++",
-"+++++$@@+@@$+++++",
-"++++++$@@@$++++++",
-"+++++++$@$+++++++",
-"++++++++$++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s inactive_color_1",
+"+ c #D0D0FF s inactive_hilight_1",
+"@ c #B0B0FF s inactive_mid_1",
+"# c #D0D0FF s inactive_hilight_1",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@#@@@@#@@@@@+",
+"+@@@@###@@###@@@@+",
+"+@@@@########@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/menu-pressed.png b/themes/default/menu-pressed.png
index c31f3bdb5e924b954f4f97d8b349046feb3147e5..571ac66a1e7511f4762c77002e7ca513b7cde158 100644
Binary files a/themes/default/menu-pressed.png and b/themes/default/menu-pressed.png differ
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index deb0a202774470eef0675211c0c3e06764bd5670..a67ff48197feb61be3e1060109d8e4d11936bbd2 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -1,32 +1,26 @@
/* 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 s active_border_color",
-" ",
-" ",
-" ",
-" ............... ",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@###########@@.",
-".@@###########@@.",
-".@@...........@@.",
-".@@@#########@@@.",
-".@@@##.....##@@@.",
-".@@@.##.@.##.@@@.",
-".@@@@.##.##.@@@@.",
-".@@@@@.###.@@@@@.",
-".@@@@@@.#.@@@@@@.",
-".@@@@@@@.@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-" ............... ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@#@@@@#@@@@@+",
+"+@@@@###@@###@@@@+",
+"+@@@@########@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm
index 9a09a968e5cf57aef70c0c57cfec9dbe06c9cd95..0c4f10dac52f5d4838a5e7c8b164642334fceeaa 100644
--- a/themes/default/right-active.xpm
+++ b/themes/default/right-active.xpm
@@ -3,10 +3,10 @@ static char * right_active_xpm[] = {
"5 32 6 1",
" c None",
". c #000000",
-"+ c #6EA0CD s active_hilight_2",
-"@ c #3E566B s active_shadow_2",
-"$ c #567B9C s active_mid_2",
-"# c #4C7BA6 s active_color_2",
+"+ c #E0E0E0 s active_hilight_2",
+"@ c #A0A0A0 s active_shadow_2",
+"$ c #B0B0B0 s active_mid_2",
+"# c #C0C0C0 s active_color_2",
"####.",
"####.",
"####.",
diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm
index f5e1c3e55099702d501d3f1ae59bff0ea9ac03c3..a107a25e70dc86b38a93cac01d0f47c96eb6d07f 100644
--- a/themes/default/right-inactive.xpm
+++ b/themes/default/right-inactive.xpm
@@ -3,10 +3,10 @@ static char * right_inactive_xpm[] = {
"5 32 6 1",
" c None",
". c #000000",
-"+ c #6EA0CD s inactive_hilight_2",
-"@ c #3E566B s inactive_shadow_2",
-"$ c #567B9C s inactive_mid_2",
-"# c #4C7BA6 s inactive_color_2",
+"+ c #E0E0E0 s inactive_hilight_2",
+"@ c #A0A0A0 s inactive_shadow_2",
+"$ c #B0B0B0 s inactive_mid_2",
+"# c #C0C0C0 s inactive_color_2",
"####.",
"####.",
"####.",
diff --git a/themes/default/shade-active.png b/themes/default/shade-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..8856e82be0b3dbe0c53b5fd6ebdf33ae154d32bd
Binary files /dev/null and b/themes/default/shade-active.png differ
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index ca54531922079b0f28f6b5313171c383def347af..513e538233ed40481d2b5ff7326695a9656d01e4 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,32 +1,26 @@
/* 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 s active_border_color",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++++++$++++++++",
-"+++++++$$$+++++++",
-"++++++$$@$$++++++",
-"+++++$$@#@$$+++++",
-"++++$$@#+#@$$++++",
-"++++$$$$$$$$$++++",
-"++++@@@@@@@@@++++",
-"+++$$$$$$$$$$$+++",
-"+++$$$$$$$$$$$+++",
-"+++@@@@@@@@@@@+++",
-"+++###########+++",
-"+++++++++++++++++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@########@@@@+",
+"+@@@@##@##@##@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/shade-inactive.png b/themes/default/shade-inactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2d43887fe35038d763813398cb473241965f7a4
Binary files /dev/null and b/themes/default/shade-inactive.png differ
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index adf1582fa43d79bd0485ebfe18ea11985b8a62a7..9e95d91eda058f4bcd5d1229bd74a5cfb0e12f9d 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,32 +1,26 @@
/* 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 s inactive_border_color",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++++++@++++++++",
-"+++++++@@@+++++++",
-"++++++@@#@@++++++",
-"+++++@@#+#@@+++++",
-"++++@@+++++@@++++",
-"++++@@@@@@@@@++++",
-"++++#########++++",
-"+++@@@@@@@@@@@+++",
-"+++@@@@@@@@@@@+++",
-"+++###########+++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s inactive_color_1",
+"+ c #D0D0FF s inactive_hilight_1",
+"@ c #B0B0FF s inactive_mid_1",
+"# c #D0D0FF s inactive_hilight_1",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@########@@@@+",
+"+@@@@##@##@##@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/shade-pressed.png b/themes/default/shade-pressed.png
index c31f3bdb5e924b954f4f97d8b349046feb3147e5..571ac66a1e7511f4762c77002e7ca513b7cde158 100644
Binary files a/themes/default/shade-pressed.png and b/themes/default/shade-pressed.png differ
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index 603cdb7ba3c654ce672fa1fe34adfec1f525ff4c..8191ebe8f5698791872bbdb6af6cf35186ea91d9 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,32 +1,26 @@
/* 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 s active_border_color",
-" ",
-" ",
-" ",
-" ............... ",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@#@@@@@@@.",
-".@@@@@@###@@@@@@.",
-".@@@@@##.##@@@@@.",
-".@@@@##.@.##@@@@.",
-".@@@##.@@@.##@@@.",
-".@@@#########@@@.",
-".@@@.........@@@.",
-".@@###########@@.",
-".@@###########@@.",
-".@@...........@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-" ............... ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@########@@@@+",
+"+@@@@##@##@##@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/shade-toggled-active.png b/themes/default/shade-toggled-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..8856e82be0b3dbe0c53b5fd6ebdf33ae154d32bd
Binary files /dev/null and b/themes/default/shade-toggled-active.png differ
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index 563303967d71845bf4f8ed9f49d773549494cdf8..c254b6f4ed98b1b5781a64c40f03d514b2b7fcb0 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -1,32 +1,26 @@
/* 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 s active_border_color",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++$$$$$$$$$++++",
-"++++$$@@@@@$$++++",
-"++++@$$###$$@++++",
-"++++#@$$+$$@#++++",
-"+++++#@$$$@#+++++",
-"++++++#@$@#++++++",
-"+++++++#@#+++++++",
-"+++$$$$$$$$$$$+++",
-"+++$$$$$$$$$$$+++",
-"+++@@@@@@@@@@@+++",
-"+++###########+++",
-"+++++++++++++++++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@##@##@##@@@@+",
+"+@@@@########@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/shade-toggled-inactive.png b/themes/default/shade-toggled-inactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2d43887fe35038d763813398cb473241965f7a4
Binary files /dev/null and b/themes/default/shade-toggled-inactive.png differ
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index 2cb8949183a6d127285e785deaf6bfd442d87c56..5b83b5b56fe0ef87c5d6de552f153aae4f8ff4e5 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -1,32 +1,26 @@
/* 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 s inactive_border_color",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++@@@@@@@@@++++",
-"++++@@#####@@++++",
-"++++#@@+++@@#++++",
-"+++++#@@+@@#+++++",
-"++++++#@@@#++++++",
-"+++++++#@#+++++++",
-"++++++++#++++++++",
-"+++@@@@@@@@@@@+++",
-"+++@@@@@@@@@@@+++",
-"+++###########+++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s inactive_color_1",
+"+ c #D0D0FF s inactive_hilight_1",
+"@ c #B0B0FF s inactive_mid_1",
+"# c #D0D0FF s inactive_hilight_1",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@##@##@##@@@@+",
+"+@@@@########@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/shade-toggled-pressed.png b/themes/default/shade-toggled-pressed.png
index c31f3bdb5e924b954f4f97d8b349046feb3147e5..571ac66a1e7511f4762c77002e7ca513b7cde158 100644
Binary files a/themes/default/shade-toggled-pressed.png and b/themes/default/shade-toggled-pressed.png differ
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index 0411a3be24757f85ccbc30e9d855454b632e43be..ac6f8acffd50870e478c58a84859d2174237a571 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -1,32 +1,26 @@
/* 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 s active_border_color",
-" ",
-" ",
-" ",
-" ............... ",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@#########@@@.",
-".@@@##.....##@@@.",
-".@@@.##@@@##.@@@.",
-".@@@@.##@##.@@@@.",
-".@@@@@.###.@@@@@.",
-".@@@@@@.#.@@@@@@.",
-".@@@@@@@.@@@@@@@.",
-".@@###########@@.",
-".@@###########@@.",
-".@@...........@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-" ............... ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@##@##@##@@@@+",
+"+@@@@########@@@@+",
+"+@@@@@######@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@@##@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/stick-active.png b/themes/default/stick-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..8856e82be0b3dbe0c53b5fd6ebdf33ae154d32bd
Binary files /dev/null and b/themes/default/stick-active.png differ
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index 580e9a72a740101b66f257adebd9691062993457..98709f127fd3a718c063d345c47301bb8f829d2c 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,32 +1,27 @@
/* 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 s active_border_color",
-"$ c #B4BAB4 s active_mid_2",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++#+++#+++",
-"+++++++++#####+++",
-"+++@######++##+++",
-"+++#$$$$$#$$##+++",
-"+++@######@@##+++",
-"+++$@@@@@#####+++",
-"++++$$$$$#@@@#+++",
-"+++++++++@$$$@+++",
-"+++++++++$+++$+++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 6 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #C0C0FF s active_color_1",
+"$ c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@$$@@@@$$@@@@+",
+"+@@@@$$@@@@$$@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/stick-inactive.png b/themes/default/stick-inactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2d43887fe35038d763813398cb473241965f7a4
Binary files /dev/null and b/themes/default/stick-inactive.png differ
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index 3fde2dd0e48d1b2aaf3b64377034b92616cb5401..372049e1b4eb3cda40cf44a63d9a3128b5977f99 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,32 +1,26 @@
/* 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 s inactive_border_color",
-"$ c #B4BAB4 s inactive_mid_2",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++@+++@+++",
-"+++++++++@@@@@+++",
-"+++$@@@@@@++@@+++",
-"+++@$$$$$@$$@@+++",
-"+++$@@@@@@$$@@+++",
-"++++$$$$$@@@@@+++",
-"+++++++++@$$$@+++",
-"+++++++++$+++$+++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+"+ c #D0D0FF s inactive_hilight_1",
+"@ c #B0B0FF s inactive_mid_1",
+"# c #C0C0FF s inactive_color_1",
+"$ c #D0D0FF s inactive_hilight_1",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@$$@@@@$$@@@@+",
+"+@@@@$$@@@@$$@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/stick-pressed.png b/themes/default/stick-pressed.png
index c31f3bdb5e924b954f4f97d8b349046feb3147e5..571ac66a1e7511f4762c77002e7ca513b7cde158 100644
Binary files a/themes/default/stick-pressed.png and b/themes/default/stick-pressed.png differ
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index 70e9b1c4c848463b1a0ca36aa081df89f0a9f53b..17ddece75ec015c10f52d9761f9dfc4785685e14 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,32 +1,27 @@
/* 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 s active_border_color",
-" ",
-" ",
-" ",
-" ............... ",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@#@@@#@@.",
-".@@@@@@@@#####@@.",
-".@@.######@@##@@.",
-".@@#.....#..##@@.",
-".@@.######..##@@.",
-".@@@.....#####@@.",
-".@@@@@@@@#...#@@.",
-".@@@@@@@@.@@@.@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-".@@@@@@@@@@@@@@@.",
-" ............... ",
-" ",
-" "};
-
+"18 18 6 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #C0C0FF s active_color_1",
+"$ c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@$$@@@@$$@@@@+",
+"+@@@@$$@@@@$$@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/stick-toggled-active.png b/themes/default/stick-toggled-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..8856e82be0b3dbe0c53b5fd6ebdf33ae154d32bd
Binary files /dev/null and b/themes/default/stick-toggled-active.png differ
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index 1c8964afee2670d042f2368641d6b65d3306a0e7..c1c5290b7cf5c8da12b2180d9f93e17bb24031c4 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -1,32 +1,27 @@
/* 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 s active_border_color",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++++#$$$#++++++",
-"+++++#$++@$#+++++",
-"+++++$+++#@$#++++",
-"+++++$++$#@$@++++",
-"+++++$@###@$@#+++",
-"+++++#$@@@$@@#+++",
-"++++++#$$$@@##+++",
-"+++++++#@@@##++++",
-"+++++++++###+++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 6 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #C0C0FF s active_color_1",
+"$ c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@$$@$$@$$@@@@+",
+"+@@@@$$@$$@$$@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/stick-toggled-inactive.png b/themes/default/stick-toggled-inactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..a2d43887fe35038d763813398cb473241965f7a4
Binary files /dev/null and b/themes/default/stick-toggled-inactive.png differ
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 043f0ca430b5f33c14ad636eb99496439c00d986..3aa3df90b8bf3e55f12d701e96d103f5a709809e 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -1,32 +1,26 @@
/* 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 s inactive_border_color",
-" ",
-" ",
-" ",
-" +++++++++++++++ ",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-"++++++#@@@#++++++",
-"+++++#@++#@#+++++",
-"+++++@+++##@#++++",
-"+++++@++@##@#++++",
-"+++++@#####@##+++",
-"+++++#@###@###+++",
-"++++++#@@@####+++",
-"+++++++######++++",
-"+++++++++###+++++",
-"+++++++++++++++++",
-"+++++++++++++++++",
-" +++++++++++++++ ",
-" ",
-" "};
-
+"18 18 5 1",
+" c None",
+"+ c #D0D0FF s inactive_hilight_1",
+"@ c #B0B0FF s inactive_mid_1",
+"# c #C0C0FF s inactive_color_1",
+"$ c #D0D0FF s inactive_hilight_1",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@$$@$$@$$@@@@+",
+"+@@@@$$@$$@$$@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/stick-toggled-pressed.png b/themes/default/stick-toggled-pressed.png
index c31f3bdb5e924b954f4f97d8b349046feb3147e5..571ac66a1e7511f4762c77002e7ca513b7cde158 100644
Binary files a/themes/default/stick-toggled-pressed.png and b/themes/default/stick-toggled-pressed.png differ
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index e9e07431307cc84625d78e445c65b99d101a27ad..8c987bcda2c0a0ee24971a36823640a99bd1bd8b 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -1,32 +1,27 @@
/* 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 s active_border_color",
-" ",
-" ",
-" ",
-" ............... ",
-".+++++++++++++++.",
-".+++++++++++++++.",
-".+++++++++++++++.",
-".+++++++++++++++.",
-".+++++.###.+++++.",
-".++++.#@@.#.++++.",
-".++++#@@@+.#.+++.",
-".++++#@@#+.#.+++.",
-".++++#.+++.#..++.",
-".++++.#...#...++.",
-".+++++.###....++.",
-".++++++......+++.",
-".++++++++...++++.",
-".+++++++++++++++.",
-".+++++++++++++++.",
-" ............... ",
-" ",
-" "};
-
+"18 18 6 1",
+" c None",
+". c #C0C0FF s active_color_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #A0A0FF s active_shadow_1",
+"# c #C0C0FF s active_color_1",
+"$ c #FFFFFF",
+" ",
+" ",
+" ++++++++++++++ ",
+" +@@@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@$$@$$@$$@@@@+",
+"+@@@@$$@$$@$$@@@@+",
+"+@@@@$$+@@+$$@@@@+",
+"+@@@@#$$$$$$#@@@@+",
+"+@@@@@#$$$$#@@@@@+",
+"+@@@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@@@+ ",
+" ++++++++++++++ "};
diff --git a/themes/default/themerc b/themes/default/themerc
index e6487c422a5e8a8dc94181564de234a72e6451dc..21cf5b09d867d25139edcadfce4eaf042e427d54 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -1,6 +1,6 @@
active_text_color=#FFFFFF
-button_offset=-1
-button_spacing=0
+button_offset=0
+button_spacing=2
full_width_title=true
title_horizontal_offset=8
title_vertical_offset_active=1
diff --git a/themes/default/title-1-active.png b/themes/default/title-1-active.png
index a017084383e70fb7873153508ac848b9a1693c96..b0023dcd608b1dee3d5dbd96ccf2ffde42121419 100644
Binary files a/themes/default/title-1-active.png and b/themes/default/title-1-active.png differ
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index f909e1cc282b7cf3f9e403c21de5167c84df71db..66c90c95432e8bcb629b6fc65af5127b4b92cae3 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -1,30 +1,34 @@
/* XPM */
-static char * title_1_active_xpm[] = {
-"8 21 6 1",
+static char * title_3_active_xpm[] = {
+"4 21 10 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 #E0E0E0 s active_hilight_2",
+"@ c #C0C0C0 s active_color_2",
+"# c #A0A0FF s active_shadow_1",
+"$ c #B0B0FF s active_mid_1",
+"% c #C0C0FF s active_color_1",
+"& c #B0B0B0 s active_mid_2",
+"* c #A0A0A0 s active_shadow_2",
+"= c #D0D0FF s active_hilight_1",
+"....",
+"====",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"####"};
diff --git a/themes/default/title-1-inactive.png b/themes/default/title-1-inactive.png
index f6f7ed1bd9b0b128bad9ae0a3dcff7a516dc5d0e..b0023dcd608b1dee3d5dbd96ccf2ffde42121419 100644
Binary files a/themes/default/title-1-inactive.png and b/themes/default/title-1-inactive.png differ
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index 9462f515eb84cd6841919e8c310bfe3f3485848a..bba0f57a7ef58d02ef5dde886ffc2d78ada931d5 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -1,30 +1,34 @@
/* XPM */
-static char * title_1_inactive_xpm[] = {
-"8 21 6 1",
+static char * title_3_inactive_xpm[] = {
+"4 21 10 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 #E0E0E0 s inactive_hilight_2",
+"@ c #C0C0C0 s inactive_color_2",
+"# c #A0A0FF s inactive_shadow_1",
+"$ c #B0B0FF s inactive_mid_1",
+"% c #C0C0FF s inactive_color_1",
+"& c #B0B0B0 s inactive_mid_2",
+"* c #A0A0A0 s inactive_shadow_2",
+"= c #D0D0FF s inactive_hilight_1",
+"....",
+"====",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"####"};
diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png
index cc864673c55c8dc84add5d0a470f4e5815992e5a..b0023dcd608b1dee3d5dbd96ccf2ffde42121419 100644
Binary files a/themes/default/title-2-active.png and b/themes/default/title-2-active.png differ
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index 0463b4b9a483ad8f57d57f8850c4017e54d78730..66c90c95432e8bcb629b6fc65af5127b4b92cae3 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -1,34 +1,34 @@
/* XPM */
-static char * title_2_active_xpm[] = {
+static char * title_3_active_xpm[] = {
"4 21 10 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 #E0E0E0 s active_hilight_2",
+"@ c #C0C0C0 s active_color_2",
+"# c #A0A0FF s active_shadow_1",
+"$ c #B0B0FF s active_mid_1",
+"% c #C0C0FF s active_color_1",
+"& c #B0B0B0 s active_mid_2",
+"* c #A0A0A0 s active_shadow_2",
+"= c #D0D0FF s active_hilight_1",
"....",
-"+++#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@@",
-"@@@@"};
+"====",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"####"};
diff --git a/themes/default/title-2-inactive.png b/themes/default/title-2-inactive.png
index 78f66e5021e979f509f7663ac37f4664b02205a4..b0023dcd608b1dee3d5dbd96ccf2ffde42121419 100644
Binary files a/themes/default/title-2-inactive.png and b/themes/default/title-2-inactive.png differ
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index dd98d25ebd38c02811ab58fd6c6059c7a35fb3a3..bba0f57a7ef58d02ef5dde886ffc2d78ada931d5 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -1,34 +1,34 @@
/* XPM */
-static char * title_2_inactive_xpm[] = {
+static char * title_3_inactive_xpm[] = {
"4 21 10 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 #E0E0E0 s inactive_hilight_2",
+"@ c #C0C0C0 s inactive_color_2",
+"# c #A0A0FF s inactive_shadow_1",
+"$ c #B0B0FF s inactive_mid_1",
+"% c #C0C0FF s inactive_color_1",
+"& c #B0B0B0 s inactive_mid_2",
+"* c #A0A0A0 s inactive_shadow_2",
+"= c #D0D0FF s inactive_hilight_1",
"....",
-"+++#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@#",
-"@@@@",
-"@@@@"};
+"====",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"####"};
diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png
index f65f0fc1ee4d7049025fd9b83d1faab2b96d5e8b..b0023dcd608b1dee3d5dbd96ccf2ffde42121419 100644
Binary files a/themes/default/title-3-active.png and b/themes/default/title-3-active.png differ
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index 525557fdb853410c1ffd0d741e890cfa28624a84..66c90c95432e8bcb629b6fc65af5127b4b92cae3 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -1,34 +1,34 @@
/* XPM */
static char * title_3_active_xpm[] = {
-"20 21 10 1",
+"4 21 10 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 #E0E0E0 s active_hilight_2",
+"@ c #C0C0C0 s active_color_2",
+"# c #A0A0FF s active_shadow_1",
+"$ c #B0B0FF s active_mid_1",
+"% c #C0C0FF s active_color_1",
+"& c #B0B0B0 s active_mid_2",
+"* c #A0A0A0 s active_shadow_2",
+"= c #D0D0FF s active_hilight_1",
+"....",
+"====",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"####"};
diff --git a/themes/default/title-3-inactive.png b/themes/default/title-3-inactive.png
index 333aca348ef48d9c6dd6ac6057d270e1e56a665c..b0023dcd608b1dee3d5dbd96ccf2ffde42121419 100644
Binary files a/themes/default/title-3-inactive.png and b/themes/default/title-3-inactive.png differ
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index 5f4ba76c0a65714cef0f8cac165a75d20c2089ba..bba0f57a7ef58d02ef5dde886ffc2d78ada931d5 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -1,34 +1,34 @@
/* XPM */
static char * title_3_inactive_xpm[] = {
-"20 21 10 1",
+"4 21 10 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 #E0E0E0 s inactive_hilight_2",
+"@ c #C0C0C0 s inactive_color_2",
+"# c #A0A0FF s inactive_shadow_1",
+"$ c #B0B0FF s inactive_mid_1",
+"% c #C0C0FF s inactive_color_1",
+"& c #B0B0B0 s inactive_mid_2",
+"* c #A0A0A0 s inactive_shadow_2",
+"= c #D0D0FF s inactive_hilight_1",
+"....",
+"====",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"####"};
diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png
index bf2105eceef23b971d03bf593707c14adf23159f..b0023dcd608b1dee3d5dbd96ccf2ffde42121419 100644
Binary files a/themes/default/title-4-active.png and b/themes/default/title-4-active.png differ
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index eaf1ff52c50c24844b0352f7448d0ad90bd8ecaf..66c90c95432e8bcb629b6fc65af5127b4b92cae3 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -1,34 +1,34 @@
/* XPM */
-static char * title_4_active_xpm[] = {
+static char * title_3_active_xpm[] = {
"4 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",
+" c None",
+". c #000000",
+"+ c #E0E0E0 s active_hilight_2",
+"@ c #C0C0C0 s active_color_2",
+"# c #A0A0FF s active_shadow_1",
+"$ c #B0B0FF s active_mid_1",
+"% c #C0C0FF s active_color_1",
+"& c #B0B0B0 s active_mid_2",
+"* c #A0A0A0 s active_shadow_2",
+"= c #D0D0FF s active_hilight_1",
"....",
-"$+++",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"@@@@",
-"@@@@"};
+"====",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"####"};
diff --git a/themes/default/title-4-inactive.png b/themes/default/title-4-inactive.png
index 78f66e5021e979f509f7663ac37f4664b02205a4..b0023dcd608b1dee3d5dbd96ccf2ffde42121419 100644
Binary files a/themes/default/title-4-inactive.png and b/themes/default/title-4-inactive.png differ
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index 5697e6483fb06f43628d22892639b687958b8bd9..bba0f57a7ef58d02ef5dde886ffc2d78ada931d5 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -1,34 +1,34 @@
/* XPM */
-static char * title_4_inactive_xpm[] = {
+static char * title_3_inactive_xpm[] = {
"4 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",
+" c None",
+". c #000000",
+"+ c #E0E0E0 s inactive_hilight_2",
+"@ c #C0C0C0 s inactive_color_2",
+"# c #A0A0FF s inactive_shadow_1",
+"$ c #B0B0FF s inactive_mid_1",
+"% c #C0C0FF s inactive_color_1",
+"& c #B0B0B0 s inactive_mid_2",
+"* c #A0A0A0 s inactive_shadow_2",
+"= c #D0D0FF s inactive_hilight_1",
"....",
-"$+++",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"$@@@",
-"@@@@",
-"@@@@"};
+"====",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"####"};
diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png
index f0db2cfb5ba266dba93522ca495b41722ad0623f..b0023dcd608b1dee3d5dbd96ccf2ffde42121419 100644
Binary files a/themes/default/title-5-active.png and b/themes/default/title-5-active.png differ
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index d2d777dcf1f4cd16f1c7eb71957191a576566f98..66c90c95432e8bcb629b6fc65af5127b4b92cae3 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -1,30 +1,34 @@
/* XPM */
-static char * title_5_active_xpm[] = {
-"8 21 6 1",
+static char * title_3_active_xpm[] = {
+"4 21 10 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 #E0E0E0 s active_hilight_2",
+"@ c #C0C0C0 s active_color_2",
+"# c #A0A0FF s active_shadow_1",
+"$ c #B0B0FF s active_mid_1",
+"% c #C0C0FF s active_color_1",
+"& c #B0B0B0 s active_mid_2",
+"* c #A0A0A0 s active_shadow_2",
+"= c #D0D0FF s active_hilight_1",
+"....",
+"====",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"####"};
diff --git a/themes/default/title-5-inactive.png b/themes/default/title-5-inactive.png
index f6f7ed1bd9b0b128bad9ae0a3dcff7a516dc5d0e..b0023dcd608b1dee3d5dbd96ccf2ffde42121419 100644
Binary files a/themes/default/title-5-inactive.png and b/themes/default/title-5-inactive.png differ
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index d016c03365cf2ad1bb9c43ea5ec21cbc0f9dd786..bba0f57a7ef58d02ef5dde886ffc2d78ada931d5 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -1,30 +1,34 @@
/* XPM */
-static char * title_5_inactive_xpm[] = {
-"8 21 6 1",
+static char * title_3_inactive_xpm[] = {
+"4 21 10 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 #E0E0E0 s inactive_hilight_2",
+"@ c #C0C0C0 s inactive_color_2",
+"# c #A0A0FF s inactive_shadow_1",
+"$ c #B0B0FF s inactive_mid_1",
+"% c #C0C0FF s inactive_color_1",
+"& c #B0B0B0 s inactive_mid_2",
+"* c #A0A0A0 s inactive_shadow_2",
+"= c #D0D0FF s inactive_hilight_1",
+"....",
+"====",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"%%%%",
+"####"};
diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png
index b489f543aed5d05d1b4a4a782f69210c8bf7965f..5624bd3919478cc89f07813fc3c8fa1c3d7c921a 100644
Binary files a/themes/default/top-left-active.png and b/themes/default/top-left-active.png differ
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index 99e92cb9a12c973725607489a11459ea1781367a..f4bc920f1eaa3e0d1ca4e190704a4853b8c80746 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -2,10 +2,10 @@
static char * top_left_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 #949594 s active_shadow_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #B4BAB4 s active_mid_1",
+"# c #D5D6D5 s active_color_1",
"$ c #000000",
" $$",
" $$@#",
@@ -27,4 +27,4 @@ static char * top_left_active_xpm[] = {
"$######",
"$######",
"$######",
-"$######"};
+"$......"};
diff --git a/themes/default/top-left-inactive.png b/themes/default/top-left-inactive.png
index b489f543aed5d05d1b4a4a782f69210c8bf7965f..5624bd3919478cc89f07813fc3c8fa1c3d7c921a 100644
Binary files a/themes/default/top-left-inactive.png and b/themes/default/top-left-inactive.png differ
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index a3a36977684eb822cc05b6801bf86c145c679fb2..a1729bf9f7c2be41af0149e43c4179e302e597c6 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -2,10 +2,10 @@
static char * top_left_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 #949594 s inactive_shadow_1",
+"+ c #D0D0FF s inactive_hilight_1",
+"@ c #B4BAB4 s inactive_mid_1",
+"# c #D5D6D5 s inactive_color_1",
"$ c #000000",
" $$",
" $$@#",
@@ -27,4 +27,4 @@ static char * top_left_inactive_xpm[] = {
"$######",
"$######",
"$######",
-"$######"};
+"$......"};
diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
index 61aa728b352ab2a40f5613fe6cabdd8169f8ae05..1265a2095f5728b1b7fae14a4fb8860bf14286f2 100644
Binary files a/themes/default/top-right-active.png and b/themes/default/top-right-active.png differ
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index 56aa2e8bf08618178160ba66e285ad81ee4f8682..df67bdc8852f9b4ef500e1cb3beeeee795367098 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -2,10 +2,10 @@
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 #949594 s active_shadow_1",
+"+ c #D0D0FF s active_hilight_1",
+"@ c #B4BAB4 s active_mid_1",
+"# c #D5D6D5 s active_color_1",
"$ c #000000",
"$$ ",
"#@$$ ",
@@ -27,4 +27,4 @@ static char * top_right_active_xpm[] = {
"######$",
"######$",
"######$",
-"######$"};
+"......$"};
diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png
index b489f543aed5d05d1b4a4a782f69210c8bf7965f..1265a2095f5728b1b7fae14a4fb8860bf14286f2 100644
Binary files a/themes/default/top-right-inactive.png and b/themes/default/top-right-inactive.png differ
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index e8836ea00b41e63eca988a357c979e7605d68a3f..90f7261b0de806171d38d427dde19598f87e3b70 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -2,10 +2,10 @@
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 #949594 s inactive_shadow_1",
+"+ c #D0D0FF s inactive_hilight_1",
+"@ c #B4BAB4 s inactive_mid_1",
+"# c #D5D6D5 s inactive_color_1",
"$ c #000000",
"$$ ",
"#@$$ ",
@@ -27,4 +27,4 @@ static char * top_right_inactive_xpm[] = {
"######$",
"######$",
"######$",
-"######$"};
+"......$"};