diff --git a/themes/default/README b/themes/default/README
index ebc8d8ae911624a878a73dd88e41dc3103aa9c2c..aed4ae5996f18acce07b3a852372ced6d1de39c3 100644
--- a/themes/default/README
+++ b/themes/default/README
@@ -1,10 +1,6 @@
-Smooth Therapy
---------------
+breeze
+------
 
 An original theme for xfwm4.
+Created Apr. 2004 by Olivier Fourdan <fourdan@xfce.org>
 Theme released under GNU GPL license.
-
-Created  Dec. 18th 2004 by Olivier Fourdan <fourdan@xfce.org>
-Modified Dec. 28th 2004 by Olivier Fourdan <fourdan@xfce.org>
-Modified Jan. 7th 2005  by Olivier Fourdan <fourdan@xfce.org>
-
diff --git a/themes/default/bottom-active.png b/themes/default/bottom-active.png
index e5a72da2f5577690710d39468a42c946af93738b..03600d07ade512a49189309162b02c8ea05b4d2d 100644
Binary files a/themes/default/bottom-active.png and b/themes/default/bottom-active.png differ
diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm
index 72c92692458121e9092028a4600dc12719dc647c..1094b9c5cb89bff118dab6b0cef662b9757b3192 100644
--- a/themes/default/bottom-active.xpm
+++ b/themes/default/bottom-active.xpm
@@ -1,10 +1,14 @@
 /* XPM */
 static char * bottom_active_xpm[] = {
-"32 4 3 1",
+"32 5 6 1",
 " 	c None",
 ".	c #000000",
-"@	c #C2C2C2 s active_color_1",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
+"+	c #6EA0CD s active_hilight_2",
+"@	c #3E566B s active_shadow_2",
+"$	c #567B9C s active_mid_2",
+"#	c #4C7BA6 s active_color_2",
+"################################",
+"################################",
+"################################",
+"################################",
+"................................"};
diff --git a/themes/default/bottom-inactive.png b/themes/default/bottom-inactive.png
index e5a72da2f5577690710d39468a42c946af93738b..03600d07ade512a49189309162b02c8ea05b4d2d 100644
Binary files a/themes/default/bottom-inactive.png and b/themes/default/bottom-inactive.png differ
diff --git a/themes/default/bottom-inactive.xpm b/themes/default/bottom-inactive.xpm
index 24b466e077f08fe322948dd2bad224db3db33899..4ee0fec035278f0cca0e333d7a824bf5542d924e 100644
--- a/themes/default/bottom-inactive.xpm
+++ b/themes/default/bottom-inactive.xpm
@@ -1,10 +1,14 @@
 /* XPM */
 static char * bottom_inactive_xpm[] = {
-"32 4 3 1",
+"32 5 6 1",
 " 	c None",
 ".	c #000000",
-"@	c #C2C2C2 s inactive_color_1",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
+"+	c #6EA0CD s inactive_hilight_2",
+"@	c #3E566B s inactive_shadow_2",
+"$	c #567B9C s inactive_mid_2",
+"#	c #4C7BA6 s inactive_color_2",
+"################################",
+"################################",
+"################################",
+"################################",
+"................................"};
diff --git a/themes/default/bottom-left-active.png b/themes/default/bottom-left-active.png
index 8a0d9ad448c98364dc9a392a52c8437582d7b50d..2a7bb8e05594b8eed2f6f1874ef7f92d9c4624e9 100644
Binary files a/themes/default/bottom-left-active.png and b/themes/default/bottom-left-active.png differ
diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm
index 1227d5e7e1bdbd6d66ab980eb173af8246fd7e6d..d73c513153c6ea46735bdae51866988236f03765 100644
--- a/themes/default/bottom-left-active.xpm
+++ b/themes/default/bottom-left-active.xpm
@@ -1,22 +1,25 @@
 /* XPM */
 static char * bottom_left_active_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"@	c #C2C2C2 s active_color_1",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@"};
+"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",
+".####           ",
+".####           ",
+".####           ",
+".####           ",
+".####           ",
+".####           ",
+".####           ",
+".####           ",
+".####           ",
+".####           ",
+".$###           ",
+".@##############",
+" .$#############",
+" .@$############",
+"  ..@$##########",
+"    ............"};
diff --git a/themes/default/bottom-left-inactive.png b/themes/default/bottom-left-inactive.png
index 8a0d9ad448c98364dc9a392a52c8437582d7b50d..2a7bb8e05594b8eed2f6f1874ef7f92d9c4624e9 100644
Binary files a/themes/default/bottom-left-inactive.png and b/themes/default/bottom-left-inactive.png differ
diff --git a/themes/default/bottom-left-inactive.xpm b/themes/default/bottom-left-inactive.xpm
index 472c317c35527e0b05ab4be05144e2d94ba2d05f..d3402f93d605bd3f8fae69f697143a24f66cdf0e 100644
--- a/themes/default/bottom-left-inactive.xpm
+++ b/themes/default/bottom-left-inactive.xpm
@@ -1,22 +1,25 @@
 /* XPM */
 static char * bottom_left_inactive_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"@	c #C2C2C2 s inactive_color_1",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@            ",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@"};
+"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",
+".####           ",
+".####           ",
+".####           ",
+".####           ",
+".####           ",
+".####           ",
+".####           ",
+".####           ",
+".####           ",
+".####           ",
+".$###           ",
+".@##############",
+" .$#############",
+" .@$############",
+"  ..@$##########",
+"    ............"};
diff --git a/themes/default/bottom-right-active.png b/themes/default/bottom-right-active.png
index a341e013e5fc8ae9d1b1c63444c4f216fbce33b1..2a7bb8e05594b8eed2f6f1874ef7f92d9c4624e9 100644
Binary files a/themes/default/bottom-right-active.png and b/themes/default/bottom-right-active.png differ
diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm
index 6b1bed435965f39934eea655b14725d6eed42545..b08dcdd6b58c4beb3c38357dc6680b72e467a699 100644
--- a/themes/default/bottom-right-active.xpm
+++ b/themes/default/bottom-right-active.xpm
@@ -1,22 +1,25 @@
 /* XPM */
 static char * bottom_right_active_xpm[] = {
-"16 16 3 1",
-" 	c None",
-".	c #000000",
-"@	c #C2C2C2 s active_color_1",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@"};
+"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",
+"           ####.",
+"           ####.",
+"           ####.",
+"           ####.",
+"           ####.",
+"           ####.",
+"           ####.",
+"           ####.",
+"           ####.",
+"           ####.",
+"           ###$.",
+"##############@.",
+"#############$. ",
+"############$@. ",
+"##########$@..  ",
+"............    "};
diff --git a/themes/default/bottom-right-inactive.png b/themes/default/bottom-right-inactive.png
index a341e013e5fc8ae9d1b1c63444c4f216fbce33b1..2a7bb8e05594b8eed2f6f1874ef7f92d9c4624e9 100644
Binary files a/themes/default/bottom-right-inactive.png and b/themes/default/bottom-right-inactive.png differ
diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm
index e97fd0d95bea0b741f290817bbfcc4155bae0902..904ef2eec7b7d78c74274fa7cd4477c606854ea9 100644
--- a/themes/default/bottom-right-inactive.xpm
+++ b/themes/default/bottom-right-inactive.xpm
@@ -1,22 +1,25 @@
 /* XPM */
 static char * bottom_right_inactive_xpm[] = {
-"16 16 3 1",
+"16 16 6 1",
 " 	c None",
 ".	c #000000",
-"@	c #C2C2C2 s inactive_color_1",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"            @@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@"};
+"+	c #6EA0CD s inactive_hilight_2",
+"@	c #3E566B s inactive_shadow_2",
+"$	c #567B9C s inactive_mid_2",
+"#	c #4C7BA6 s inactive_color_2",
+"           ####.",
+"           ####.",
+"           ####.",
+"           ####.",
+"           ####.",
+"           ####.",
+"           ####.",
+"           ####.",
+"           ####.",
+"           ####.",
+"           ###$.",
+"##############@.",
+"#############$. ",
+"############$@. ",
+"##########$@..  ",
+"............    "};
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index d71efecf5d944b96c558bc071bf8f1543602547e..a9fef26b38af9929eba78b37b0a73b0f5819de38 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@.#@@@@#.@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@.#@@@@#.@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++##+++++##++++",
+"++++###+++###++++",
+"++++@###+###@++++",
+"++++$@#####@$++++",
+"+++++$@###@$+++++",
+"++++++#####++++++",
+"+++++###@###+++++",
+"++++###@$@###++++",
+"++++##@$+$@##++++",
+"++++@@$+++$@@++++",
+"++++$$+++++$$++++",
+"+++++++++++++++++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index bc8953d0f5a0a6233b926e29157a235f8b3f08d2..9ddf6b6cd69e6fd9ccec0479b020229a06a61be0 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * close_inactive_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s inactive_color_1",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #4B58A2 s inactive_mid_1",
-"#	c #FFFFFF s inactive_hilight_1",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@.#@@@@#.@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@.#@@@@#.@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++@@+++++@@++++",
+"++++@@@+++@@@++++",
+"++++$@@@+@@@$++++",
+"+++++$@@@@@$+++++",
+"++++++$@@@$++++++",
+"++++++@@@@@++++++",
+"+++++@@@$@@@+++++",
+"++++@@@$+$@@@++++",
+"++++@@$+++$@@++++",
+"++++$$+++++$$++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/close-pressed.png b/themes/default/close-pressed.png
index 571ac66a1e7511f4762c77002e7ca513b7cde158..dfcbf22c603541b48124f7286da54d8afcd43f21 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 ff71b305b288d2924f86dc2bbcb636d7f40896ab..fb8295ab62a7e8feea372e3e365a8af3e5471ec6 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@+#@@@@#+@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@+#@@@@#+@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+" ............... ",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@##@@@@@##@@@.",
+".@@@###@@@###@@@.",
+".@@@.###@###.@@@.",
+".@@@@.#####.@@@@.",
+".@@@@@.###.@@@@@.",
+".@@@@@#####@@@@@.",
+".@@@@###.###@@@@.",
+".@@@###.@.###@@@.",
+".@@@##.@@@.##@@@.",
+".@@@..@@@@@..@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+" ............... ",
+"                 "}:
+
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 09eb3f8b1dddfabe8dc94029c2f023a18c19617e..0f45a2fb9ce6f29d093abd77b3fb1789aff88a21 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * hide_active_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++#####++++++",
+"++++++#####++++++",
+"++++++##+##++++++",
+"++++++#####++++++",
+"++++++#####++++++",
+"++++++@@@@@++++++",
+"++++++$$$$$++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index 637df1ce3fa5ea49e376d591f52b29517b6738b8..d944cf21f303fe452cb1b61b041a5917fe16c4d7 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * hide_inactive_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s inactive_color_1",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #4B58A2 s inactive_mid_1",
-"#	c #FFFFFF s inactive_hilight_1",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++@@@@@++++++",
+"++++++@@@@@++++++",
+"++++++@@+@@++++++",
+"++++++@@@@@++++++",
+"++++++@@@@@++++++",
+"++++++$$$$$++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/hide-pressed.png b/themes/default/hide-pressed.png
index 4057e05253adf6e954fefe2949deb8edfd6b54a3..dfcbf22c603541b48124f7286da54d8afcd43f21 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 97792ed238bc8e7f46b98c8eb74117b049f849c2..6d34188efcb2148f52f272eed3cfc97ebc49aa58 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * hide_pressed_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+" ............... ",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@#####@@@@@.",
+".@@@@@#####@@@@@.",
+".@@@@@##@##@@@@@.",
+".@@@@@#####@@@@@.",
+".@@@@@#####@@@@@.",
+".@@@@@.....@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+" ............... ",
+"                 "};
+
diff --git a/themes/default/left-active.png b/themes/default/left-active.png
index 8ff2ff9c5fc7860fd8bccec55c5d1f1893d132b7..70965c0f6ecd291954924033f91ae635a90a00a3 100644
Binary files a/themes/default/left-active.png and b/themes/default/left-active.png differ
diff --git a/themes/default/left-active.xpm b/themes/default/left-active.xpm
index 40d2c11fbad243ce6908791c4b06e8a88b6d567e..37af8ff5129f5b3ba9c4e945edede72734cdd500 100644
--- a/themes/default/left-active.xpm
+++ b/themes/default/left-active.xpm
@@ -1,38 +1,41 @@
 /* XPM */
 static char * left_active_xpm[] = {
-"4 32 3 1",
+"5 32 6 1",
 " 	c None",
 ".	c #000000",
-"@	c #C2C2C2 s active_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"+	c #6EA0CD s active_hilight_2",
+"@	c #3E566B s active_shadow_2",
+"$	c #567B9C s active_mid_2",
+"#	c #4C7BA6 s active_color_2",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####"};
diff --git a/themes/default/left-inactive.png b/themes/default/left-inactive.png
index 8ff2ff9c5fc7860fd8bccec55c5d1f1893d132b7..70965c0f6ecd291954924033f91ae635a90a00a3 100644
Binary files a/themes/default/left-inactive.png and b/themes/default/left-inactive.png differ
diff --git a/themes/default/left-inactive.xpm b/themes/default/left-inactive.xpm
index 30690d30b74cb73d68f999a06be39341f36bc618..db3b991b41e269d18eaa360194e1cbfebfb99ebe 100644
--- a/themes/default/left-inactive.xpm
+++ b/themes/default/left-inactive.xpm
@@ -1,38 +1,41 @@
 /* XPM */
 static char * left_inactive_xpm[] = {
-"4 32 3 1",
+"5 32 6 1",
 " 	c None",
 ".	c #000000",
-"@	c #C2C2C2 s inactive_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"+	c #6EA0CD s inactive_hilight_2",
+"@	c #3E566B s inactive_shadow_2",
+"$	c #567B9C s inactive_mid_2",
+"#	c #4C7BA6 s inactive_color_2",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####",
+".####"};
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index 2da3c22c6042fbe82b4ed1bda9d292593aaa1a15..3c196a89ba6a67a774c896089c2a27ab14c6cc3c 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * maximize_active_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@.######.@@@@+",
-"+@@@@########@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@########@@@@+",
-"+@@@@.######.@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++#########++++",
+"++++#########++++",
+"++++##@@@@@##++++",
+"++++##$$$$$##++++",
+"++++##+++++##++++",
+"++++##+++++##++++",
+"++++##+++++##++++",
+"++++#########++++",
+"++++#########++++",
+"++++@@@@@@@@@++++",
+"++++$$$$$$$$$++++",
+"+++++++++++++++++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index 2d99139b43f8a710383fadd125a61156e5b29967..ea9a0e320c082d17d9d02c039f33a26988c276bf 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * maximize_inactive_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s inactive_color_1",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #4B58A2 s inactive_mid_1",
-"#	c #FFFFFF s inactive_hilight_1",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@.######.@@@@+",
-"+@@@@########@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@########@@@@+",
-"+@@@@.######.@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++@@@@@@@@@++++",
+"++++@@@@@@@@@++++",
+"++++@@$$$$$@@++++",
+"++++@@+++++@@++++",
+"++++@@+++++@@++++",
+"++++@@+++++@@++++",
+"++++@@+++++@@++++",
+"++++@@@@@@@@@++++",
+"++++@@@@@@@@@++++",
+"++++$$$$$$$$$++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/maximize-pressed.png b/themes/default/maximize-pressed.png
index 571ac66a1e7511f4762c77002e7ca513b7cde158..dfcbf22c603541b48124f7286da54d8afcd43f21 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 c23de33151b0c136d247df87e2c5c13ce45b2b76..25f8e83e0af9ef4e1055b388abffd3060a680d50 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * maximize_pressed_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@########@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@########@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+" ............... ",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@#########@@@.",
+".@@@#########@@@.",
+".@@@##.....##@@@.",
+".@@@##@@@@@##@@@.",
+".@@@##@@@@@##@@@.",
+".@@@##@@@@@##@@@.",
+".@@@##@@@@@##@@@.",
+".@@@#########@@@.",
+".@@@#########@@@.",
+".@@@.........@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+" ............... ",
+"                 "};
+
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index da0e5267cc91f1245c40943e169a8af711bec84a..6fe5f486b87f7c895aeb47f81ea70b090f4e6a2f 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * maximize_toggled_active_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@.#####.@@@+",
-"+@@@@@@#######@@@+",
-"+@@@@@@@@@@@##@@@+",
-"+@@@.#####.@##@@@+",
-"+@@@#######@##@@@+",
-"+@@@##@@@##@##@@@+",
-"+@@@##@@@##@#.@@@+",
-"+@@@##@@@##@@@@@@+",
-"+@@@#######@@@@@@+",
-"+@@@.#####.@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++########++++++",
+"+++########++++++",
+"+++##@@@@##++++++",
+"+++##$$$$##@##+++",
+"+++##++++##@##+++",
+"+++##++++##+##+++",
+"+++########+##+++",
+"+++########+##+++",
+"+++@@@@@++++##+++",
+"+++$$$########+++",
+"++++++########+++",
+"++++++@@@@@@@@+++",
+"++++++$$$$$$$$+++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index dcaa48b503afaf6dd2af175612937773e3c606de..dd83f2d945eeed4a52a24026af8217441481b8e2 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * maximize_toggled_inactive_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s inactive_color_1",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #4B58A2 s inactive_mid_1",
-"#	c #FFFFFF s inactive_hilight_1",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@.#####.@@@+",
-"+@@@@@@#######@@@+",
-"+@@@@@@@@@@@##@@@+",
-"+@@@.#####.@##@@@+",
-"+@@@#######@##@@@+",
-"+@@@##@@@##@##@@@+",
-"+@@@##@@@##@#.@@@+",
-"+@@@##@@@##@@@@@@+",
-"+@@@#######@@@@@@+",
-"+@@@.#####.@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++@@@@@@@@++++++",
+"+++@@@@@@@@++++++",
+"+++@@$$$$@@++++++",
+"+++@@++++@@$@@+++",
+"+++@@++++@@$@@+++",
+"+++@@++++@@+@@+++",
+"+++@@@@@@@@+@@+++",
+"+++@@@@@@@@+@@+++",
+"+++$$$$$++++@@+++",
+"++++++@@@@@@@@+++",
+"++++++@@@@@@@@+++",
+"++++++$$$$$$$$+++",
+"+++++++++++++++++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/maximize-toggled-pressed.png b/themes/default/maximize-toggled-pressed.png
index 571ac66a1e7511f4762c77002e7ca513b7cde158..dfcbf22c603541b48124f7286da54d8afcd43f21 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 42b12bcacadd6bcd124c675c1a1540e9a66463c8..9510cdb831fcf002edac2823b420f194fbd87d96 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * maximize_toggled_pressed_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@#####@@@@+",
-"+@@@@@@#######@@@+",
-"+@@@@@@@@@@@##@@@+",
-"+@@@@#####@@##@@@+",
-"+@@@#######@##@@@+",
-"+@@@##@@@##@##@@@+",
-"+@@@##@@@##@#@@@@+",
-"+@@@##@@@##@@@@@@+",
-"+@@@#######@@@@@@+",
-"+@@@@#####@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+" ............... ",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@########@@@@@.",
+".@@########@@@@@.",
+".@@##....##@@@@@.",
+".@@##@@@@##.##@@.",
+".@@##@@@@##.##@@.",
+".@@##@@@@##@##@@.",
+".@@########@##@@.",
+".@@########@##@@.",
+".@@.....@@@@##@@.",
+".@@@@@########@@.",
+".@@@@@########@@.",
+".@@@@@........@@.",
+".@@@@@@@@@@@@@@@.",
+" ............... ",
+"                 "};
+
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index 60c37eaa1b66f48037e5e9b24cc1e3f4e3b34493..3ce66025b2dc4714864a197abd09e54571746763 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * menu_active_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@#@@@@#@@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@########@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++###########+++",
+"+++###########+++",
+"+++@@@@@@@@@@@+++",
+"+++$#########$+++",
+"++++##@@@@@##++++",
+"++++@##$$$##@++++",
+"++++$@##+##@$++++",
+"+++++$@###@$+++++",
+"++++++$@#@$++++++",
+"+++++++$@$+++++++",
+"++++++++$++++++++",
+"+++++++++++++++++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index 639de13740fb86628afe327fdc1a3d7c70d74a70..cf1691f4d460c935f61679aa715063c7b15344fb 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * menu_inactive_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s inactive_color_1",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #4B58A2 s inactive_mid_1",
-"#	c #FFFFFF s inactive_hilight_1",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@#@@@@#@@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@########@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++@@@@@@@@@@@+++",
+"+++@@@@@@@@@@@+++",
+"+++$$$$$$$$$$$+++",
+"++++@@@@@@@@@++++",
+"++++@@$$$$$@@++++",
+"++++$@@+++@@$++++",
+"+++++$@@+@@$+++++",
+"++++++$@@@$++++++",
+"+++++++$@$+++++++",
+"++++++++$++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/menu-pressed.png b/themes/default/menu-pressed.png
index 571ac66a1e7511f4762c77002e7ca513b7cde158..dfcbf22c603541b48124f7286da54d8afcd43f21 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 20c4f8edd903feae494d5fff813263e7056dedb5..0288383ea986a149e9d074595fa9abe1b63ba4ed 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * menu_pressed_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@#@@@@#@@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@########@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+" ............... ",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@###########@@.",
+".@@###########@@.",
+".@@...........@@.",
+".@@@#########@@@.",
+".@@@##.....##@@@.",
+".@@@.##.@.##.@@@.",
+".@@@@.##.##.@@@@.",
+".@@@@@.###.@@@@@.",
+".@@@@@@.#.@@@@@@.",
+".@@@@@@@.@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+" ............... ",
+"                 "};
+
diff --git a/themes/default/right-active.png b/themes/default/right-active.png
index 8ff2ff9c5fc7860fd8bccec55c5d1f1893d132b7..70965c0f6ecd291954924033f91ae635a90a00a3 100644
Binary files a/themes/default/right-active.png and b/themes/default/right-active.png differ
diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm
index 720c7a98c024f51f0182eb7e3da50068ee4394ad..9a09a968e5cf57aef70c0c57cfec9dbe06c9cd95 100644
--- a/themes/default/right-active.xpm
+++ b/themes/default/right-active.xpm
@@ -1,38 +1,41 @@
 /* XPM */
 static char * right_active_xpm[] = {
-"4 32 3 1",
+"5 32 6 1",
 " 	c None",
 ".	c #000000",
-"@	c #C2C2C2 s active_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"+	c #6EA0CD s active_hilight_2",
+"@	c #3E566B s active_shadow_2",
+"$	c #567B9C s active_mid_2",
+"#	c #4C7BA6 s active_color_2",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####."};
diff --git a/themes/default/right-inactive.png b/themes/default/right-inactive.png
index 8ff2ff9c5fc7860fd8bccec55c5d1f1893d132b7..70965c0f6ecd291954924033f91ae635a90a00a3 100644
Binary files a/themes/default/right-inactive.png and b/themes/default/right-inactive.png differ
diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm
index 25e78337ca2a8130d84db4460dde67c7b2e79e67..f5e1c3e55099702d501d3f1ae59bff0ea9ac03c3 100644
--- a/themes/default/right-inactive.xpm
+++ b/themes/default/right-inactive.xpm
@@ -1,38 +1,41 @@
 /* XPM */
 static char * right_inactive_xpm[] = {
-"4 32 3 1",
+"5 32 6 1",
 " 	c None",
 ".	c #000000",
-"@	c #C2C2C2 s inactive_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"+	c #6EA0CD s inactive_hilight_2",
+"@	c #3E566B s inactive_shadow_2",
+"$	c #567B9C s inactive_mid_2",
+"#	c #4C7BA6 s inactive_color_2",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####.",
+"####."};
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index db63663f8c970c90599c1302c17fe7418686fe16..c3b19679ebec8784201884efc18e65cb89505fd1 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * shade_active_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@########@@@@+",
-"+@@@@##@##@##@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #B4BAB4 s active_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++++$++++++++",
+"+++++++$$$+++++++",
+"++++++$$@$$++++++",
+"+++++$$@#@$$+++++",
+"++++$$@#+#@$$++++",
+"++++$$$$$$$$$++++",
+"++++@@@@@@@@@++++",
+"+++$$$$$$$$$$$+++",
+"+++$$$$$$$$$$$+++",
+"+++@@@@@@@@@@@+++",
+"+++###########+++",
+"+++++++++++++++++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index 6dbef04c0a4b013088bf48383eb334bad43b3ccd..dcc24186e2d3228149d6c526e59c3dc74430b405 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * shade_inactive_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s inactive_color_1",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #4B58A2 s inactive_mid_1",
-"#	c #FFFFFF s inactive_hilight_1",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@########@@@@+",
-"+@@@@##@##@##@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #B4BAB4 s inactive_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++++@++++++++",
+"+++++++@@@+++++++",
+"++++++@@#@@++++++",
+"+++++@@#+#@@+++++",
+"++++@@+++++@@++++",
+"++++@@@@@@@@@++++",
+"++++#########++++",
+"+++@@@@@@@@@@@+++",
+"+++@@@@@@@@@@@+++",
+"+++###########+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/shade-pressed.png b/themes/default/shade-pressed.png
index 571ac66a1e7511f4762c77002e7ca513b7cde158..dfcbf22c603541b48124f7286da54d8afcd43f21 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 ee2516f172af720b34729d11827488f939bf9773..dfffe626fddba1aa89a4cf73fcc11b8491d5773d 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * shade_pressed_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@########@@@@+",
-"+@@@@##@##@##@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+" ............... ",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@#@@@@@@@.",
+".@@@@@@###@@@@@@.",
+".@@@@@##.##@@@@@.",
+".@@@@##.@.##@@@@.",
+".@@@##.@@@.##@@@.",
+".@@@#########@@@.",
+".@@@.........@@@.",
+".@@###########@@.",
+".@@###########@@.",
+".@@...........@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+" ............... ",
+"                 "};
+
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index 07a4082e2d0857a621fdea70c382442e0a65a162..385afc8b2c0f5ae5f824581340ececfbd2aa2b9f 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * shade_toggled_active_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@##@##@##@@@@+",
-"+@@@@########@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #B4BAB4 s active_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++$$$$$$$$$++++",
+"++++$$@@@@@$$++++",
+"++++@$$###$$@++++",
+"++++#@$$+$$@#++++",
+"+++++#@$$$@#+++++",
+"++++++#@$@#++++++",
+"+++++++#@#+++++++",
+"+++$$$$$$$$$$$+++",
+"+++$$$$$$$$$$$+++",
+"+++@@@@@@@@@@@+++",
+"+++###########+++",
+"+++++++++++++++++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index c930ef4930f006eb7a58eafd83ddc0f56760b9d3..20f9fd4bcc7a8f1a4f98a7ec76607efc0e21b47f 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * shade_toggled_inactive_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s inactive_color_1",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #4B58A2 s inactive_mid_1",
-"#	c #FFFFFF s inactive_hilight_1",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@##@##@##@@@@+",
-"+@@@@########@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #B4BAB4 s inactive_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++@@@@@@@@@++++",
+"++++@@#####@@++++",
+"++++#@@+++@@#++++",
+"+++++#@@+@@#+++++",
+"++++++#@@@#++++++",
+"+++++++#@#+++++++",
+"++++++++#++++++++",
+"+++@@@@@@@@@@@+++",
+"+++@@@@@@@@@@@+++",
+"+++###########+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/shade-toggled-pressed.png b/themes/default/shade-toggled-pressed.png
index 571ac66a1e7511f4762c77002e7ca513b7cde158..dfcbf22c603541b48124f7286da54d8afcd43f21 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 8766027e688599a5c8e9119039ae8400fcf73d28..c76378ee315d8799d36128009cccf321791804cd 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * shade_toggled_pressed_xpm[] = {
-"18 18 5 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@##@##@##@@@@+",
-"+@@@@########@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+" ............... ",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@#########@@@.",
+".@@@##.....##@@@.",
+".@@@.##@@@##.@@@.",
+".@@@@.##@##.@@@@.",
+".@@@@@.###.@@@@@.",
+".@@@@@@.#.@@@@@@.",
+".@@@@@@@.@@@@@@@.",
+".@@###########@@.",
+".@@###########@@.",
+".@@...........@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+" ............... ",
+"                 "};
+
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index da3985fe33927a5bbb7e680822b56f5b129d7ca7..facf58405afb8faf00a838c36db53193d52e1461 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,27 +1,31 @@
 /* XPM */
 static char * stick_active_xpm[] = {
-"18 18 6 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #949595 s active_color_1",
-"$	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@$$+@@+$$@@@@+",
-"+@@@@$$@@@@$$@@@@+",
-"+@@@@$$@@@@$$@@@@+",
-"+@@@@$$+@@+$$@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++#+++#+++",
+"+++++++++#####+++",
+"+++@######++##+++",
+"+++#$$$$$#$$##+++",
+"+++@######@@##+++",
+"+++$@@@@@#####+++",
+"++++$$$$$#@@@#+++",
+"+++++++++@$$$@+++",
+"+++++++++$+++$+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index 71320f08768bfcf08787443d776a35f293446903..1d12a38319d9018a5f62d21a47abbe87de85950c 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * stick_inactive_xpm[] = {
-"18 18 5 1",
-" 	c None",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #4B58A2 s inactive_mid_1",
-"#	c #949595 s inactive_color_1",
-"$	c #FFFFFF s inactive_hilight_1",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@$$+@@+$$@@@@+",
-"+@@@@$$@@@@$$@@@@+",
-"+@@@@$$@@@@$$@@@@+",
-"+@@@@$$+@@+$$@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++@+++@+++",
+"+++++++++@@@@@+++",
+"+++$@@@@@@++@@+++",
+"+++@$$$$$@$$@@+++",
+"+++$@@@@@@$$@@+++",
+"++++$$$$$@@@@@+++",
+"+++++++++@$$$@+++",
+"+++++++++$+++$+++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/stick-pressed.png b/themes/default/stick-pressed.png
index 571ac66a1e7511f4762c77002e7ca513b7cde158..dfcbf22c603541b48124f7286da54d8afcd43f21 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 d4cf415b5c2140908fdc7a3b0eef08ade1c64599..9fe49bb4195c66b7052be29df5bf018b3fc2c745 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,27 +1,31 @@
 /* XPM */
 static char * stick_pressed_xpm[] = {
-"18 18 6 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #949595 s active_color_1",
-"$	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@$$+@@+$$@@@@+",
-"+@@@@$$@@@@$$@@@@+",
-"+@@@@$$@@@@$$@@@@+",
-"+@@@@$$+@@+$$@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+" ............... ",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@#@@@#@@.",
+".@@@@@@@@#####@@.",
+".@@.######@@##@@.",
+".@@#.....#..##@@.",
+".@@.######..##@@.",
+".@@@.....#####@@.",
+".@@@@@@@@#...#@@.",
+".@@@@@@@@.@@@.@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+".@@@@@@@@@@@@@@@.",
+" ............... ",
+"                 "};
+
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index 5386e043fad5778820ea7e9721ded870e91135f6..ea4f38d35a9c9bf6dac5a5aad4dbb18a61f908b9 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -1,27 +1,31 @@
 /* XPM */
 static char * stick_toggled_active_xpm[] = {
-"18 18 6 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #949595 s active_color_1",
-"$	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@$$+@@+$$@@@@+",
-"+@@@@$$@$$@$$@@@@+",
-"+@@@@$$@$$@$$@@@@+",
-"+@@@@$$+@@+$$@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #B4BAB4 s active_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++#$$$#++++++",
+"+++++#$++@$#+++++",
+"+++++$+++#@$#++++",
+"+++++$++$#@$@++++",
+"+++++$@###@$@#+++",
+"+++++#$@@@$@@#+++",
+"++++++#$$$@@##+++",
+"+++++++#@@@##++++",
+"+++++++++###+++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 1536f124e42c14209a8c133aa9de0318bdeb6731..71ff7bb8164bae75f5dbdcb4c71072296f246312 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -1,26 +1,31 @@
 /* XPM */
 static char * stick_toggled_inactive_xpm[] = {
-"18 18 5 1",
-" 	c None",
-"+	c #FFFFFF s inactive_hilight_1",
-"@	c #4B58A2 s inactive_mid_1",
-"#	c #949595 s inactive_color_1",
-"$	c #FFFFFF s inactive_hilight_1",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@$$+@@+$$@@@@+",
-"+@@@@$$@$$@$$@@@@+",
-"+@@@@$$@$$@$$@@@@+",
-"+@@@@$$+@@+$$@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #B4BAB4 s inactive_mid_2",
+"$      c #000000",
+"                 ",
+"                 ",
+"                 ",
+" +++++++++++++++ ",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+"++++++#@@@#++++++",
+"+++++#@++#@#+++++",
+"+++++@+++##@#++++",
+"+++++@++@##@#++++",
+"+++++@#####@##+++",
+"+++++#@###@###+++",
+"++++++#@@@####+++",
+"+++++++######++++",
+"+++++++++###+++++",
+"+++++++++++++++++",
+"+++++++++++++++++",
+" +++++++++++++++ ",
+"                 "};
+
diff --git a/themes/default/stick-toggled-pressed.png b/themes/default/stick-toggled-pressed.png
index 571ac66a1e7511f4762c77002e7ca513b7cde158..dfcbf22c603541b48124f7286da54d8afcd43f21 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 d28254b9cc5a93171bb6358ac82b4398aac0005b..a0c2089fc205139bd4afa7648a3095a1cc4138d0 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -1,27 +1,31 @@
 /* XPM */
 static char * stick_toggled_pressed_xpm[] = {
-"18 18 6 1",
-" 	c None",
-".	c #567B9C s active_color_1",
-"+	c #FFFFFF s active_hilight_1",
-"@	c #4B58A2 s active_shadow_1",
-"#	c #949595 s active_color_1",
-"$	c #FFFFFF",
-"                  ",
-"                  ",
-"  ++++++++++++++  ",
-" +@@@@@@@@@@@@@@+ ",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@$$+@@+$$@@@@+",
-"+@@@@$$@$$@$$@@@@+",
-"+@@@@$$@$$@$$@@@@+",
-"+@@@@$$+@@+$$@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-" +@@@@@@@@@@@@@@+ ",
-"  ++++++++++++++  "};
+"17 20 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #B4BAB4 s active_mid_2",
+"@      c #D5D6D5 s active_color_2",
+"=      c #FFFFFF s active_hilight_2",
+"#      c #000000",
+"                 ",
+"                 ",
+"                 ",
+" ............... ",
+".+++++++++++++++.",
+".+++++++++++++++.",
+".+++++++++++++++.",
+".+++++++++++++++.",
+".+++++.###.+++++.",
+".++++.#@@.#.++++.",
+".++++#@@@+.#.+++.",
+".++++#@@#+.#.+++.",
+".++++#.+++.#..++.",
+".++++.#...#...++.",
+".+++++.###....++.",
+".++++++......+++.",
+".++++++++...++++.",
+".+++++++++++++++.",
+".+++++++++++++++.",
+" ............... ",
+"                 "};
+
diff --git a/themes/default/themerc b/themes/default/themerc
index c6f48afe636bf93fe6507c7e70268086908c112d..00f36c99177f53fc17d2035e42eb74cb0ef67a58 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -1,10 +1,9 @@
-active_text_color=#ffffff
+active_text_color=#FFFFFF
 button_offset=0
-button_spacing=2
+button_spacing=0
 full_width_title=true
-title_horizontal_offset=2
-title_vertical_offset_active=3
-title_vertical_offset_inactive=3
+title_horizontal_offset=8
+title_vertical_offset_active=1
+title_vertical_offset_inactive=1
 title_shadow_active=true
-# title_shadow_active=false
 title_shadow_inactive=false
diff --git a/themes/default/title-1-active.png b/themes/default/title-1-active.png
index 23dc88e36fdd46358e5d73062a1e845821712d6f..bd319afa35a75ceea15622828372b167654201da 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 63827e0ecc4c8e2eec54bccf358fe7bd2be53326..de06f459d6ff435b85742cacfc086e885bf7b8eb 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -1,29 +1,29 @@
 /* XPM */
-static char * title_active_xpm[] = {
-"4 23 3 1",
+static char * title_1_active_xpm[] = {
+"8 20 6 1",
 " 	c None",
-".	c #000000",
-"@	c #C2C2C2 s active_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+".	c #949594 s active_shadow_2",
+"+	c #FFFFFF s active_hilight_2",
+"@	c #D5D6D5 s active_color_2",
+"#	c #B4BAB4 s active_mid_2",
+"$	c #000000",
+"$$$$$$$$",
+"++++++++",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@"};
diff --git a/themes/default/title-1-inactive.png b/themes/default/title-1-inactive.png
index 23dc88e36fdd46358e5d73062a1e845821712d6f..bd319afa35a75ceea15622828372b167654201da 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 6c40487632d2b61b8a4091bcfb99a3d6fc681316..59b681edf8c76ab47bdf0a4dfb8f553da184aea7 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -1,29 +1,29 @@
 /* XPM */
-static char * title_inactive_xpm[] = {
-"4 23 3 1",
+static char * title_1_inactive_xpm[] = {
+"8 20 6 1",
 " 	c None",
-".	c #000000",
-"@	c #C2C2C2 s inactive_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+".	c #949594 s inactive_shadow_2",
+"+	c #FFFFFF s inactive_hilight_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #B4BAB4 s inactive_mid_2",
+"$	c #000000",
+"$$$$$$$$",
+"++++++++",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@";
diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png
index 23dc88e36fdd46358e5d73062a1e845821712d6f..32ae3d53bc91090d3471d2626719641938500e3d 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 63827e0ecc4c8e2eec54bccf358fe7bd2be53326..479c036947b0045cb5f8898ffe47986c59ef0ce2 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -1,29 +1,33 @@
 /* XPM */
-static char * title_active_xpm[] = {
-"4 23 3 1",
+static char * title_2_active_xpm[] = {
+"6 20 10 1",
 " 	c None",
 ".	c #000000",
-"@	c #C2C2C2 s active_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"+	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",
+"......",
+"+++++#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@@"};
diff --git a/themes/default/title-2-inactive.png b/themes/default/title-2-inactive.png
index 23dc88e36fdd46358e5d73062a1e845821712d6f..32ae3d53bc91090d3471d2626719641938500e3d 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 6c40487632d2b61b8a4091bcfb99a3d6fc681316..a8617d7a18a66821395aae57b640f5f7f94862cb 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -1,29 +1,33 @@
 /* XPM */
-static char * title_inactive_xpm[] = {
-"4 23 3 1",
+static char * title_2_inactive_xpm[] = {
+"6 20 10 1",
 " 	c None",
 ".	c #000000",
-"@	c #C2C2C2 s inactive_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"+	c #FFFFFF s inactive_hilight_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #4B58A2 s inactive_shadow_1",
+"$	c #525FAB s inactive_color_1",
+"%	c #848FD6 s inactive_mid_1",
+"&	c #B4BAB4 s inactive_mid_2",
+"*	c #949594 s inactive_shadow_2",
+"=	c #FFFFFF s inactive_hilight_1",
+"......",
+"+++++#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@#",
+"@@@@@@"};
diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png
index 23dc88e36fdd46358e5d73062a1e845821712d6f..c325a5342464686b0aeb978d10dd1f6525abbfff 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 63827e0ecc4c8e2eec54bccf358fe7bd2be53326..471ebfb2344c6dc02be48813e5f8e21b6153eb30 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -1,29 +1,33 @@
 /* XPM */
-static char * title_active_xpm[] = {
-"4 23 3 1",
+static char * title_3_active_xpm[] = {
+"20 20 10 1",
 " 	c None",
 ".	c #000000",
-"@	c #C2C2C2 s active_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"+	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",
+"....................",
+"====================",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"####################"};
diff --git a/themes/default/title-3-inactive.png b/themes/default/title-3-inactive.png
index 23dc88e36fdd46358e5d73062a1e845821712d6f..96feb0374481e1774a508bdc42732fca50b3d6d3 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 6c40487632d2b61b8a4091bcfb99a3d6fc681316..057b8799f20ce717ca00dc2e38f11f9c39a30f2a 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -1,29 +1,33 @@
 /* XPM */
-static char * title_inactive_xpm[] = {
-"4 23 3 1",
+static char * title_3_inactive_xpm[] = {
+"20 20 10 1",
 " 	c None",
 ".	c #000000",
-"@	c #C2C2C2 s inactive_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+"+	c #FFFFFF s inactive_hilight_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #4B58A2 s inactive_shadow_1",
+"$	c #848FD6 s inactive_mid_1",
+"%	c #525FAB s inactive_color_1",
+"&	c #B4BAB4 s inactive_mid_2",
+"*	c #949594 s inactive_shadow_2",
+"=	c #FFFFFF s inactive_hilight_1",
+"....................",
+"====================",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%",
+"####################"};
diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png
index 23dc88e36fdd46358e5d73062a1e845821712d6f..32ae3d53bc91090d3471d2626719641938500e3d 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 63827e0ecc4c8e2eec54bccf358fe7bd2be53326..19055e70d865ea31297bfe4a7ca63cfdaa63d7bf 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -1,29 +1,33 @@
 /* XPM */
-static char * title_active_xpm[] = {
-"4 23 3 1",
-" 	c None",
-".	c #000000",
-"@	c #C2C2C2 s active_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+static char * title_4_active_xpm[] = {
+"6 20 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",
+"......",
+"$+++++",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"@@@@@@"};
diff --git a/themes/default/title-4-inactive.png b/themes/default/title-4-inactive.png
index 23dc88e36fdd46358e5d73062a1e845821712d6f..32ae3d53bc91090d3471d2626719641938500e3d 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 6c40487632d2b61b8a4091bcfb99a3d6fc681316..610cb8673eba70580d6ad210582687fcac65161f 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -1,29 +1,33 @@
 /* XPM */
-static char * title_inactive_xpm[] = {
-"4 23 3 1",
-" 	c None",
-".	c #000000",
-"@	c #C2C2C2 s inactive_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+static char * title_4_inactive_xpm[] = {
+"6 20 10 1",
+"       c None",
+".      c #000000",
+"+      c #FFFFFF s inactive_hilight_2",
+"@      c #D5D6D5 s inactive_color_2",
+"#      c #949594 s inactive_shadow_2",
+"$      c #4B58A2 s inactive_shadow_1",
+"%      c #848FD6 s inactive_mid_1",
+"&      c #525FAB s inactive_color_1",
+"*      c #B4BAB4 s inactive_mid_2",
+"=      c #FFFFFF s inactive_hilight_1",
+"......",
+"$+++++",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"$@@@@@",
+"@@@@@@"};
diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png
index 23dc88e36fdd46358e5d73062a1e845821712d6f..bd319afa35a75ceea15622828372b167654201da 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 63827e0ecc4c8e2eec54bccf358fe7bd2be53326..884a8101dceaa93b91cb4cb7dfd4e2acb299adaf 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -1,29 +1,29 @@
 /* XPM */
-static char * title_active_xpm[] = {
-"4 23 3 1",
+static char * title_5_active_xpm[] = {
+"8 20 6 1",
 " 	c None",
-".	c #000000",
-"@	c #C2C2C2 s active_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+".	c #949594 s active_shadow_2",
+"+	c #FFFFFF s active_hilight_2",
+"@	c #D5D6D5 s active_color_2",
+"#	c #B4BAB4 s active_mid_2",
+"$	c #000000",
+"$$$$$$$$",
+"++++++++",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@"};
diff --git a/themes/default/title-5-inactive.png b/themes/default/title-5-inactive.png
index 23dc88e36fdd46358e5d73062a1e845821712d6f..bd319afa35a75ceea15622828372b167654201da 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 6c40487632d2b61b8a4091bcfb99a3d6fc681316..7ba0e51a06c5f875b818ae2d380ecb4c0248b72a 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -1,29 +1,29 @@
 /* XPM */
-static char * title_inactive_xpm[] = {
-"4 23 3 1",
+static char * title_5_inactive_xpm[] = {
+"8 20 6 1",
 " 	c None",
-".	c #000000",
-"@	c #C2C2C2 s inactive_color_1",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@",
-"@@@@"};
+".	c #949594 s inactive_shadow_2",
+"+	c #FFFFFF s inactive_hilight_2",
+"@	c #D5D6D5 s inactive_color_2",
+"#	c #B4BAB4 s inactive_mid_2",
+"$	c #000000",
+"$$$$$$$$",
+"++++++++",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@"};
diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png
index 259bf3b4c37b7d2bcae38363c34ddea28e508764..b489f543aed5d05d1b4a4a782f69210c8bf7965f 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 9e73ea9cddf9ed4484e8dc01d22f1123a14747cf..b124a452e78a252e5a720dd6af3c556ce2f92b5a 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -1,29 +1,29 @@
 /* XPM */
 static char * top_left_active_xpm[] = {
-"8 23 3 1",
+"8 20 6 1",
 "       c None",
-".      c #000000",
-"@	c #C2C2C2 s active_color_1",
-"    @@@@",
-"  @@@@@@",
-" @@@@@@@",
-" @@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@"};
+".      c #949594 s active_shadow_2",
+"+      c #FFFFFF s active_hilight_2",
+"@      c #B4BAB4 s active_mid_2",
+"#      c #D5D6D5 s active_color_2",
+"$      c #000000",
+"    $$$$",
+"  $$.@++",
+" $.@#+##",
+" $@#####",
+"$.######",
+"$@######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######"};
diff --git a/themes/default/top-left-inactive.png b/themes/default/top-left-inactive.png
index 259bf3b4c37b7d2bcae38363c34ddea28e508764..b489f543aed5d05d1b4a4a782f69210c8bf7965f 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 7e034c4f45eea6e811f656db61f786c600588196..869547a7b7fdb7401b5ac115a41c715ec4b09659 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -1,29 +1,29 @@
 /* XPM */
 static char * top_left_inactive_xpm[] = {
-"8 23 3 1",
+"8 20 6 1",
 "       c None",
-".      c #000000",
-"@	c #C2C2C2 s inactive_color_1",
-"    @@@@",
-"  @@@@@@",
-" @@@@@@@",
-" @@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@"};
+".      c #949594 s inactive_shadow_2",
+"+      c #FFFFFF s inactive_hilight_2",
+"@      c #B4BAB4 s inactive_mid_2",
+"#      c #D5D6D5 s inactive_color_2",
+"$      c #000000",
+"    $$$$",
+"  $$.@++",
+" $.@#+##",
+" $@#####",
+"$.######",
+"$@######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######",
+"$#######"};
diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
index bed70fcc26a8a21d4c7b68f8f7d735e47eae83a1..b489f543aed5d05d1b4a4a782f69210c8bf7965f 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 f4fa129d2955b2c66c01799fbb7173f22cddf20f..57cc695c47c37664def0c650ec8a7fec640b8de5 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -1,29 +1,29 @@
 /* XPM */
 static char * top_right_active_xpm[] = {
-"8 23 3 1",
+"8 20 6 1",
 "       c None",
-".      c #000000",
-"@	c #C2C2C2 s active_color_1",
-"@@@@    ",
-"@@@@@@  ",
-"@@@@@@@ ",
-"@@@@@@@ ",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@"};
+".      c #949594 s active_shadow_2",
+"+      c #FFFFFF s active_hilight_2",
+"@      c #B4BAB4 s active_mid_2",
+"#      c #D5D6D5 s active_color_2",
+"$      c #000000",
+"$$$$    ",
+"++@.$$  ",
+"##+#@.$ ",
+"#####@$ ",
+"######.$",
+"######@$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$"};
diff --git a/themes/default/top-right-inactive.png b/themes/default/top-right-inactive.png
index bed70fcc26a8a21d4c7b68f8f7d735e47eae83a1..b489f543aed5d05d1b4a4a782f69210c8bf7965f 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 a1c4092cff8af49271c5aa3b9fd60d414f2e7905..f4c256e36fd2a2e8ccd162bdbdb9a458ac67d229 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -1,29 +1,29 @@
 /* XPM */
 static char * top_right_inactive_xpm[] = {
-"8 23 3 1",
+"8 20 6 1",
 "       c None",
-".      c #000000",
-"@	c #C2C2C2 s inactive_color_1",
-"@@@@    ",
-"@@@@@@  ",
-"@@@@@@@ ",
-"@@@@@@@ ",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@"};
+".      c #949594 s inactive_shadow_2",
+"+      c #FFFFFF s inactive_hilight_2",
+"@      c #B4BAB4 s inactive_mid_2",
+"#      c #D5D6D5 s inactive_color_2",
+"$      c #000000",
+"$$$$    ",
+"++@.$$  ",
+"##+#@.$ ",
+"#####@$ ",
+"######.$",
+"######@$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$",
+"#######$"};