diff --git a/po/xfwm4.pot b/po/xfwm4.pot
index 4d5b444ab306c6de9ee4fb12f32d773d3b2894f0..1fc090b45cadd7a99577930ab2bb9249d7680935 100644
--- a/po/xfwm4.pot
+++ b/po/xfwm4.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-01-28 07:27+0100\n"
+"POT-Creation-Date: 2005-01-31 00:28+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/settings.c b/src/settings.c
index 4eaec7f969f8d11a3379421b2133878853b7b446..db98e069b0b46ff345e39bdb0ad82921b467412f 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -637,8 +637,8 @@ loadTheme (ScreenInfo *screen_info, Settings rc[])
rc[0].value = get_style (widget, "fg", "selected");
rc[1].value = get_style (widget, "fg", "insensitive");
- rc[2].value = get_style (widget, "fg", "selected");
- rc[3].value = get_style (widget, "fg", "insensitive");
+ rc[2].value = get_style (widget, "fg", "normal");
+ rc[3].value = get_style (widget, "fg", "normal");
rc[4].value = get_style (widget, "bg", "selected");
rc[5].value = get_style (widget, "light", "selected");
rc[6].value = get_style (widget, "dark", "selected");
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index a9fef26b38af9929eba78b37b0a73b0f5819de38..9ea41708f01d5b4fbd4d1009116cdaf8a3acbf5e 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,11 +1,11 @@
/* XPM */
static char * close_active_xpm[] = {
-"17 20 6 1",
+"17 21 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
"@ c #949594 s active_shadow_2",
-"# c #000000",
+"# c #000000 s active_border_color",
"$ c #B4BAB4 s active_mid_2",
" ",
" ",
@@ -27,5 +27,6 @@ static char * close_active_xpm[] = {
"++++$$+++++$$++++",
"+++++++++++++++++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 9ddf6b6cd69e6fd9ccec0479b020229a06a61be0..2590fdb6b6bdcb3e1cbb92282276e5ed2905b8fd 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -1,11 +1,11 @@
/* XPM */
static char * close_inactive_xpm[] = {
-"17 20 6 1",
+"17 21 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
"@ c #949594 s inactive_shadow_2",
-"# c #000000",
+"# c #000000 s inactive_border_color",
"$ c #B4BAB4 s inactive_mid_2",
" ",
" ",
@@ -27,5 +27,6 @@ static char * close_inactive_xpm[] = {
"+++++++++++++++++",
"+++++++++++++++++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/close-pressed.png b/themes/default/close-pressed.png
index dfcbf22c603541b48124f7286da54d8afcd43f21..c31f3bdb5e924b954f4f97d8b349046feb3147e5 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 fb8295ab62a7e8feea372e3e365a8af3e5471ec6..ee602bcfeea24fc188aed8dde78ada1d770b0eb1 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,12 +1,12 @@
/* XPM */
static char * close_pressed_xpm[] = {
-"17 20 6 1",
+"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",
+"# c #000000 s active_border_color",
" ",
" ",
" ",
@@ -27,5 +27,6 @@ static char * close_pressed_xpm[] = {
".@@@@@@@@@@@@@@@.",
".@@@@@@@@@@@@@@@.",
" ............... ",
+" ",
" "}:
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 0f45a2fb9ce6f29d093abd77b3fb1789aff88a21..6be563c11f803c273587303e59a3b312c1570783 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -1,11 +1,11 @@
/* XPM */
static char * hide_active_xpm[] = {
-"17 20 6 1",
+"17 21 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
"@ c #949594 s active_shadow_2",
-"# c #000000",
+"# c #000000 s active_border_color",
"$ c #B4BAB4 s active_mid_2",
" ",
" ",
@@ -27,5 +27,6 @@ static char * hide_active_xpm[] = {
"+++++++++++++++++",
"+++++++++++++++++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index d944cf21f303fe452cb1b61b041a5917fe16c4d7..af9faad9ccc68ab08959a344a1ac681f28bed97d 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -1,11 +1,11 @@
/* XPM */
static char * hide_inactive_xpm[] = {
-"17 20 6 1",
+"17 21 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
"@ c #949594 s inactive_shadow_2",
-"# c #000000",
+"# c #000000 s inactive_border_color",
"$ c #B4BAB4 s inactive_mid_2",
" ",
" ",
@@ -27,5 +27,6 @@ static char * hide_inactive_xpm[] = {
"+++++++++++++++++",
"+++++++++++++++++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/hide-pressed.png b/themes/default/hide-pressed.png
index dfcbf22c603541b48124f7286da54d8afcd43f21..c31f3bdb5e924b954f4f97d8b349046feb3147e5 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 6d34188efcb2148f52f272eed3cfc97ebc49aa58..82f1c6be4047bccd8c6f5028bd60b43152e55b7c 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -1,12 +1,12 @@
/* XPM */
static char * hide_pressed_xpm[] = {
-"17 20 6 1",
+"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",
+"# c #000000 s active_border_color",
" ",
" ",
" ",
@@ -27,5 +27,6 @@ static char * hide_pressed_xpm[] = {
".@@@@@@@@@@@@@@@.",
".@@@@@@@@@@@@@@@.",
" ............... ",
+" ",
" "};
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index 3c196a89ba6a67a774c896089c2a27ab14c6cc3c..b4fc772f434ba9bfb1187ac741bd4aeac19f7367 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -1,11 +1,11 @@
/* XPM */
static char * maximize_active_xpm[] = {
-"17 20 6 1",
+"17 21 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
"@ c #949594 s active_shadow_2",
-"# c #000000",
+"# c #000000 s active_border_color",
"$ c #B4BAB4 s active_mid_2",
" ",
" ",
@@ -27,5 +27,6 @@ static char * maximize_active_xpm[] = {
"++++$$$$$$$$$++++",
"+++++++++++++++++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index ea9a0e320c082d17d9d02c039f33a26988c276bf..65c58f41d2b40507e2fc39d56c5b37e9536a6626 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -1,11 +1,11 @@
/* XPM */
static char * maximize_inactive_xpm[] = {
-"17 20 6 1",
+"17 21 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
"@ c #949594 s inactive_shadow_2",
-"# c #000000",
+"# c #000000 s inactive_border_color",
"$ c #B4BAB4 s inactive_mid_2",
" ",
" ",
@@ -27,5 +27,6 @@ static char * maximize_inactive_xpm[] = {
"+++++++++++++++++",
"+++++++++++++++++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/maximize-pressed.png b/themes/default/maximize-pressed.png
index dfcbf22c603541b48124f7286da54d8afcd43f21..c31f3bdb5e924b954f4f97d8b349046feb3147e5 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 25f8e83e0af9ef4e1055b388abffd3060a680d50..a4ec6dfd9615d46d3e3309ef559bd0e0a4ea705c 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -1,12 +1,12 @@
/* XPM */
static char * maximize_pressed_xpm[] = {
-"17 20 6 1",
+"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",
+"# c #000000 s active_border_color",
" ",
" ",
" ",
@@ -27,5 +27,6 @@ static char * maximize_pressed_xpm[] = {
".@@@@@@@@@@@@@@@.",
".@@@@@@@@@@@@@@@.",
" ............... ",
+" ",
" "};
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index 6fe5f486b87f7c895aeb47f81ea70b090f4e6a2f..3c14896a3a4aab57b70cd4cb038dcdc5d8b515ee 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -1,11 +1,11 @@
/* XPM */
static char * maximize_toggled_active_xpm[] = {
-"17 20 6 1",
+"17 21 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
"@ c #949594 s active_shadow_2",
-"# c #000000",
+"# c #000000 s active_border_color",
"$ c #B4BAB4 s active_mid_2",
" ",
" ",
@@ -27,5 +27,6 @@ static char * maximize_toggled_active_xpm[] = {
"++++++@@@@@@@@+++",
"++++++$$$$$$$$+++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index dd83f2d945eeed4a52a24026af8217441481b8e2..bf83c512cf231124dbf8fa843a55fe8428e448d4 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -1,11 +1,11 @@
/* XPM */
static char * maximize_toggled_inactive_xpm[] = {
-"17 20 6 1",
+"17 21 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
"@ c #949594 s inactive_shadow_2",
-"# c #000000",
+"# c #000000 s inactive_border_color",
"$ c #B4BAB4 s inactive_mid_2",
" ",
" ",
@@ -27,5 +27,6 @@ static char * maximize_toggled_inactive_xpm[] = {
"++++++$$$$$$$$+++",
"+++++++++++++++++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/maximize-toggled-pressed.png b/themes/default/maximize-toggled-pressed.png
index dfcbf22c603541b48124f7286da54d8afcd43f21..c31f3bdb5e924b954f4f97d8b349046feb3147e5 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 9510cdb831fcf002edac2823b420f194fbd87d96..182b9612ffebb4c952b02ea35d21a866e812c06c 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -1,12 +1,12 @@
/* XPM */
static char * maximize_toggled_pressed_xpm[] = {
-"17 20 6 1",
+"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",
+"# c #000000 s active_border_color",
" ",
" ",
" ",
@@ -27,5 +27,6 @@ static char * maximize_toggled_pressed_xpm[] = {
".@@@@@........@@.",
".@@@@@@@@@@@@@@@.",
" ............... ",
+" ",
" "};
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index 3ce66025b2dc4714864a197abd09e54571746763..8f49b5187f1b7cd1261b14b177a29e9a3d5a1d6d 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -1,11 +1,11 @@
/* XPM */
static char * menu_active_xpm[] = {
-"17 20 6 1",
+"17 21 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
"@ c #949594 s active_shadow_2",
-"# c #000000",
+"# c #000000 s active_border_color",
"$ c #B4BAB4 s active_mid_2",
" ",
" ",
@@ -27,5 +27,6 @@ static char * menu_active_xpm[] = {
"++++++++$++++++++",
"+++++++++++++++++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index cf1691f4d460c935f61679aa715063c7b15344fb..72a451152742040f3bd3ec8d8b4777ad75e7c206 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -1,11 +1,11 @@
/* XPM */
static char * menu_inactive_xpm[] = {
-"17 20 6 1",
+"17 21 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
"@ c #949594 s inactive_shadow_2",
-"# c #000000",
+"# c #000000 s inactive_border_color",
"$ c #B4BAB4 s inactive_mid_2",
" ",
" ",
@@ -27,5 +27,6 @@ static char * menu_inactive_xpm[] = {
"+++++++++++++++++",
"+++++++++++++++++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/menu-pressed.png b/themes/default/menu-pressed.png
index dfcbf22c603541b48124f7286da54d8afcd43f21..c31f3bdb5e924b954f4f97d8b349046feb3147e5 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 0288383ea986a149e9d074595fa9abe1b63ba4ed..deb0a202774470eef0675211c0c3e06764bd5670 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -1,12 +1,12 @@
/* XPM */
static char * menu_pressed_xpm[] = {
-"17 20 6 1",
+"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",
+"# c #000000 s active_border_color",
" ",
" ",
" ",
@@ -27,5 +27,6 @@ static char * menu_pressed_xpm[] = {
".@@@@@@@@@@@@@@@.",
".@@@@@@@@@@@@@@@.",
" ............... ",
+" ",
" "};
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index c3b19679ebec8784201884efc18e65cb89505fd1..ca54531922079b0f28f6b5313171c383def347af 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -1,12 +1,12 @@
/* XPM */
static char * shade_active_xpm[] = {
-"17 20 6 1",
+"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",
+"$ c #000000 s active_border_color",
" ",
" ",
" ",
@@ -27,5 +27,6 @@ static char * shade_active_xpm[] = {
"+++###########+++",
"+++++++++++++++++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index dcc24186e2d3228149d6c526e59c3dc74430b405..adf1582fa43d79bd0485ebfe18ea11985b8a62a7 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -1,12 +1,12 @@
/* XPM */
static char * shade_inactive_xpm[] = {
-"17 20 6 1",
+"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",
+"$ c #000000 s inactive_border_color",
" ",
" ",
" ",
@@ -27,5 +27,6 @@ static char * shade_inactive_xpm[] = {
"+++++++++++++++++",
"+++++++++++++++++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/shade-pressed.png b/themes/default/shade-pressed.png
index dfcbf22c603541b48124f7286da54d8afcd43f21..c31f3bdb5e924b954f4f97d8b349046feb3147e5 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 dfffe626fddba1aa89a4cf73fcc11b8491d5773d..603cdb7ba3c654ce672fa1fe34adfec1f525ff4c 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -1,12 +1,12 @@
/* XPM */
static char * shade_pressed_xpm[] = {
-"17 20 6 1",
+"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",
+"# c #000000 s active_border_color",
" ",
" ",
" ",
@@ -27,5 +27,6 @@ static char * shade_pressed_xpm[] = {
".@@@@@@@@@@@@@@@.",
".@@@@@@@@@@@@@@@.",
" ............... ",
+" ",
" "};
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index 385afc8b2c0f5ae5f824581340ececfbd2aa2b9f..563303967d71845bf4f8ed9f49d773549494cdf8 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -1,12 +1,12 @@
/* XPM */
static char * shade_toggled_active_xpm[] = {
-"17 20 6 1",
+"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",
+"$ c #000000 s active_border_color",
" ",
" ",
" ",
@@ -27,5 +27,6 @@ static char * shade_toggled_active_xpm[] = {
"+++###########+++",
"+++++++++++++++++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index 20f9fd4bcc7a8f1a4f98a7ec76607efc0e21b47f..2cb8949183a6d127285e785deaf6bfd442d87c56 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -1,12 +1,12 @@
/* XPM */
static char * shade_toggled_inactive_xpm[] = {
-"17 20 6 1",
+"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",
+"$ c #000000 s inactive_border_color",
" ",
" ",
" ",
@@ -27,5 +27,6 @@ static char * shade_toggled_inactive_xpm[] = {
"+++++++++++++++++",
"+++++++++++++++++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/shade-toggled-pressed.png b/themes/default/shade-toggled-pressed.png
index dfcbf22c603541b48124f7286da54d8afcd43f21..c31f3bdb5e924b954f4f97d8b349046feb3147e5 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 c76378ee315d8799d36128009cccf321791804cd..0411a3be24757f85ccbc30e9d855454b632e43be 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -1,12 +1,12 @@
/* XPM */
static char * shade_toggled_pressed_xpm[] = {
-"17 20 6 1",
+"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",
+"# c #000000 s active_border_color",
" ",
" ",
" ",
@@ -27,5 +27,6 @@ static char * shade_toggled_pressed_xpm[] = {
".@@@@@@@@@@@@@@@.",
".@@@@@@@@@@@@@@@.",
" ............... ",
+" ",
" "};
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index facf58405afb8faf00a838c36db53193d52e1461..580e9a72a740101b66f257adebd9691062993457 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -1,11 +1,11 @@
/* XPM */
static char * stick_active_xpm[] = {
-"17 20 6 1",
+"17 21 6 1",
" c None",
". c #FFFFFF s active_hilight_2",
"+ c #D5D6D5 s active_color_2",
"@ c #949594 s active_shadow_2",
-"# c #000000",
+"# c #000000 s active_border_color",
"$ c #B4BAB4 s active_mid_2",
" ",
" ",
@@ -27,5 +27,6 @@ static char * stick_active_xpm[] = {
"+++++++++++++++++",
"+++++++++++++++++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index 1d12a38319d9018a5f62d21a47abbe87de85950c..3fde2dd0e48d1b2aaf3b64377034b92616cb5401 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -1,11 +1,11 @@
/* XPM */
static char * stick_inactive_xpm[] = {
-"17 20 6 1",
+"17 21 6 1",
" c None",
". c #FFFFFF s inactive_hilight_2",
"+ c #D5D6D5 s inactive_color_2",
"@ c #949594 s inactive_shadow_2",
-"# c #000000",
+"# c #000000 s inactive_border_color",
"$ c #B4BAB4 s inactive_mid_2",
" ",
" ",
@@ -27,5 +27,6 @@ static char * stick_inactive_xpm[] = {
"+++++++++++++++++",
"+++++++++++++++++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/stick-pressed.png b/themes/default/stick-pressed.png
index dfcbf22c603541b48124f7286da54d8afcd43f21..c31f3bdb5e924b954f4f97d8b349046feb3147e5 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 9fe49bb4195c66b7052be29df5bf018b3fc2c745..70e9b1c4c848463b1a0ca36aa081df89f0a9f53b 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -1,12 +1,12 @@
/* XPM */
static char * stick_pressed_xpm[] = {
-"17 20 6 1",
+"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",
+"# c #000000 s active_border_color",
" ",
" ",
" ",
@@ -27,5 +27,6 @@ static char * stick_pressed_xpm[] = {
".@@@@@@@@@@@@@@@.",
".@@@@@@@@@@@@@@@.",
" ............... ",
+" ",
" "};
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index ea4f38d35a9c9bf6dac5a5aad4dbb18a61f908b9..1c8964afee2670d042f2368641d6b65d3306a0e7 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -1,12 +1,12 @@
/* XPM */
static char * stick_toggled_active_xpm[] = {
-"17 20 6 1",
+"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",
+"$ c #000000 s active_border_color",
" ",
" ",
" ",
@@ -27,5 +27,6 @@ static char * stick_toggled_active_xpm[] = {
"+++++++++++++++++",
"+++++++++++++++++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 71ff7bb8164bae75f5dbdcb4c71072296f246312..043f0ca430b5f33c14ad636eb99496439c00d986 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -1,12 +1,12 @@
/* XPM */
static char * stick_toggled_inactive_xpm[] = {
-"17 20 6 1",
+"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",
+"$ c #000000 s inactive_border_color",
" ",
" ",
" ",
@@ -27,5 +27,6 @@ static char * stick_toggled_inactive_xpm[] = {
"+++++++++++++++++",
"+++++++++++++++++",
" +++++++++++++++ ",
+" ",
" "};
diff --git a/themes/default/stick-toggled-pressed.png b/themes/default/stick-toggled-pressed.png
index dfcbf22c603541b48124f7286da54d8afcd43f21..c31f3bdb5e924b954f4f97d8b349046feb3147e5 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 a0c2089fc205139bd4afa7648a3095a1cc4138d0..e9e07431307cc84625d78e445c65b99d101a27ad 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -1,12 +1,12 @@
/* XPM */
static char * stick_toggled_pressed_xpm[] = {
-"17 20 6 1",
+"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",
+"# c #000000 s active_border_color",
" ",
" ",
" ",
@@ -27,5 +27,6 @@ static char * stick_toggled_pressed_xpm[] = {
".+++++++++++++++.",
".+++++++++++++++.",
" ............... ",
+" ",
" "};
diff --git a/themes/default/title-1-active.png b/themes/default/title-1-active.png
index bd319afa35a75ceea15622828372b167654201da..a017084383e70fb7873153508ac848b9a1693c96 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 de06f459d6ff435b85742cacfc086e885bf7b8eb..f909e1cc282b7cf3f9e403c21de5167c84df71db 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_1_active_xpm[] = {
-"8 20 6 1",
+"8 21 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
@@ -26,4 +26,5 @@ static char * title_1_active_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
+"@@@@@@@@",
"@@@@@@@@"};
diff --git a/themes/default/title-1-inactive.png b/themes/default/title-1-inactive.png
index bd319afa35a75ceea15622828372b167654201da..f6f7ed1bd9b0b128bad9ae0a3dcff7a516dc5d0e 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 59b681edf8c76ab47bdf0a4dfb8f553da184aea7..9462f515eb84cd6841919e8c310bfe3f3485848a 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_1_inactive_xpm[] = {
-"8 20 6 1",
+"8 21 6 1",
" c None",
". c #949594 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
@@ -26,4 +26,5 @@ static char * title_1_inactive_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
-"@@@@@@@@";
+"@@@@@@@@",
+"@@@@@@@@};
diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png
index b2e09122aa85bcde2241d65a18b2a5b53ceabcd0..cc864673c55c8dc84add5d0a470f4e5815992e5a 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 3fc606356e6b65cfd3ad007156832255bfac5538..0463b4b9a483ad8f57d57f8850c4017e54d78730 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -1,10 +1,10 @@
/* XPM */
static char * title_2_active_xpm[] = {
-"4 20 10 1",
+"4 21 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s active_hilight_2",
-"@ c #D5D6D4 s active_color_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",
@@ -30,4 +30,5 @@ static char * title_2_active_xpm[] = {
"@@@#",
"@@@#",
"@@@#",
+"@@@@",
"@@@@"};
diff --git a/themes/default/title-2-inactive.png b/themes/default/title-2-inactive.png
index b2e09122aa85bcde2241d65a18b2a5b53ceabcd0..78f66e5021e979f509f7663ac37f4664b02205a4 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 3526679c5850a80f565fc6006d20843603c2b9e4..dd98d25ebd38c02811ab58fd6c6059c7a35fb3a3 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -1,10 +1,10 @@
/* XPM */
static char * title_2_inactive_xpm[] = {
-"4 20 10 1",
+"4 21 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s inactive_hilight_2",
-"@ c #D5D6D4 s inactive_color_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",
@@ -30,4 +30,5 @@ static char * title_2_inactive_xpm[] = {
"@@@#",
"@@@#",
"@@@#",
+"@@@@",
"@@@@"};
diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png
index c325a5342464686b0aeb978d10dd1f6525abbfff..f65f0fc1ee4d7049025fd9b83d1faab2b96d5e8b 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 471ebfb2344c6dc02be48813e5f8e21b6153eb30..525557fdb853410c1ffd0d741e890cfa28624a84 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_3_active_xpm[] = {
-"20 20 10 1",
+"20 21 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s active_hilight_2",
@@ -30,4 +30,5 @@ static char * title_3_active_xpm[] = {
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
-"####################"};
+"####################",
+"@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/title-3-inactive.png b/themes/default/title-3-inactive.png
index 96feb0374481e1774a508bdc42732fca50b3d6d3..333aca348ef48d9c6dd6ac6057d270e1e56a665c 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 057b8799f20ce717ca00dc2e38f11f9c39a30f2a..5f4ba76c0a65714cef0f8cac165a75d20c2089ba 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_3_inactive_xpm[] = {
-"20 20 10 1",
+"20 21 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s inactive_hilight_2",
@@ -30,4 +30,5 @@ static char * title_3_inactive_xpm[] = {
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
"%%%%%%%%%%%%%%%%%%%%",
-"####################"};
+"####################",
+"@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png
index b2e09122aa85bcde2241d65a18b2a5b53ceabcd0..bf2105eceef23b971d03bf593707c14adf23159f 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 6af136a4dcaad8deea818fd88e7cfcf86a335049..eaf1ff52c50c24844b0352f7448d0ad90bd8ecaf 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -1,10 +1,10 @@
/* XPM */
static char * title_4_active_xpm[] = {
-"4 20 10 1",
+"4 21 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s active_hilight_2",
-"@ c #D5D6D4 s active_color_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",
@@ -30,4 +30,5 @@ static char * title_4_active_xpm[] = {
"$@@@",
"$@@@",
"$@@@",
+"@@@@",
"@@@@"};
diff --git a/themes/default/title-4-inactive.png b/themes/default/title-4-inactive.png
index b2e09122aa85bcde2241d65a18b2a5b53ceabcd0..78f66e5021e979f509f7663ac37f4664b02205a4 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 e61f868e1566cc1fa8c43f95e9dde9d85b44d6dd..5697e6483fb06f43628d22892639b687958b8bd9 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -1,10 +1,10 @@
/* XPM */
static char * title_4_inactive_xpm[] = {
-"4 20 10 1",
+"4 21 10 1",
" c None",
". c #000000",
"+ c #FFFFFF s inactive_hilight_2",
-"@ c #D5D6D4 s inactive_color_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",
@@ -30,4 +30,5 @@ static char * title_4_inactive_xpm[] = {
"$@@@",
"$@@@",
"$@@@",
+"@@@@",
"@@@@"};
diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png
index bd319afa35a75ceea15622828372b167654201da..f0db2cfb5ba266dba93522ca495b41722ad0623f 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 884a8101dceaa93b91cb4cb7dfd4e2acb299adaf..d2d777dcf1f4cd16f1c7eb71957191a576566f98 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_5_active_xpm[] = {
-"8 20 6 1",
+"8 21 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
@@ -26,4 +26,5 @@ static char * title_5_active_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
+"@@@@@@@@",
"@@@@@@@@"};
diff --git a/themes/default/title-5-inactive.png b/themes/default/title-5-inactive.png
index bd319afa35a75ceea15622828372b167654201da..f6f7ed1bd9b0b128bad9ae0a3dcff7a516dc5d0e 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 7ba0e51a06c5f875b818ae2d380ecb4c0248b72a..d016c03365cf2ad1bb9c43ea5ec21cbc0f9dd786 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -1,6 +1,6 @@
/* XPM */
static char * title_5_inactive_xpm[] = {
-"8 20 6 1",
+"8 21 6 1",
" c None",
". c #949594 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
@@ -26,4 +26,5 @@ static char * title_5_inactive_xpm[] = {
"@@@@@@@@",
"@@@@@@@@",
"@@@@@@@@",
+"@@@@@@@@",
"@@@@@@@@"};
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index 797f444a700e2c42064c6217edaf483700a4402f..99e92cb9a12c973725607489a11459ea1781367a 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -1,29 +1,30 @@
/* XPM */
static char * top_left_active_xpm[] = {
-"8 20 6 1",
+"7 21 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
"@ c #B4BAB4 s active_mid_2",
"# c #D5D6D5 s active_color_2",
"$ c #000000",
-" $$$$",
-" $$@#++",
-" $.##+##",
-" $######",
-"$.######",
-"$@######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######"};
+" $$",
+" $$@#",
+" $@##+",
+" $.####",
+" $@####",
+"$.#####",
+"$@#####",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######"};
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index c1f76bbf2f777a5e8f012fcafbfaef6181650763..a3a36977684eb822cc05b6801bf86c145c679fb2 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -1,29 +1,30 @@
/* XPM */
static char * top_left_inactive_xpm[] = {
-"8 20 6 1",
+"7 21 6 1",
" c None",
". c #949594 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
"@ c #B4BAB4 s inactive_mid_2",
"# c #D5D6D5 s inactive_color_2",
"$ c #000000",
-" $$$$",
-" $$@#++",
-" $.##+##",
-" $######",
-"$.######",
-"$@######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######",
-"$#######"};
+" $$",
+" $$@#",
+" $@##+",
+" $.####",
+" $@####",
+"$.#####",
+"$@#####",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######",
+"$######"};
diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
index b489f543aed5d05d1b4a4a782f69210c8bf7965f..61aa728b352ab2a40f5613fe6cabdd8169f8ae05 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 87006a95fbfc53551cfaf14b4ef16c05d0664bca..56aa2e8bf08618178160ba66e285ad81ee4f8682 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -1,29 +1,30 @@
/* XPM */
static char * top_right_active_xpm[] = {
-"8 20 6 1",
+"7 21 6 1",
" c None",
". c #949594 s active_shadow_2",
"+ c #FFFFFF s active_hilight_2",
"@ c #B4BAB4 s active_mid_2",
"# c #D5D6D5 s active_color_2",
"$ c #000000",
-"$$$$ ",
-"++#@$$ ",
-"##+##.$ ",
-"######$ ",
-"######.$",
-"######@$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$"};
+"$$ ",
+"#@$$ ",
+"+##@$ ",
+"####.$ ",
+"####@$ ",
+"#####.$",
+"#####@$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$"};
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index eea80588780912f412e29e55ad24bcb45641b0f5..e8836ea00b41e63eca988a357c979e7605d68a3f 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -1,29 +1,30 @@
/* XPM */
static char * top_right_inactive_xpm[] = {
-"8 20 6 1",
+"7 21 6 1",
" c None",
". c #949594 s inactive_shadow_2",
"+ c #FFFFFF s inactive_hilight_2",
"@ c #B4BAB4 s inactive_mid_2",
"# c #D5D6D5 s inactive_color_2",
"$ c #000000",
-"$$$$ ",
-"++#@$$ ",
-"##+##.$ ",
-"######$ ",
-"######.$",
-"######@$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$",
-"#######$"};
+"$$ ",
+"#@$$ ",
+"+##@$ ",
+"####.$ ",
+"####@$ ",
+"#####.$",
+"#####@$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$",
+"######$"};