diff --git a/po/xfwm4.pot b/po/xfwm4.pot
index 04c6a3b2c0114c0930852f28c858418e55e362a6..9d66812ba500edb8f696784060dcacb8e8dd11fb 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: 2004-07-07 22:00+0200\n"
+"POT-Creation-Date: 2004-07-11 21:54+0200\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"
@@ -80,459 +80,238 @@ msgstr ""
 msgid "Workspace names"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:129
+#: mcs-plugin/xfwm4_plugin.c:99
 msgid "Title"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:130
+#: mcs-plugin/xfwm4_plugin.c:100
 msgid "Menu"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:131
+#: mcs-plugin/xfwm4_plugin.c:101
 msgid "Stick"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:132
+#: mcs-plugin/xfwm4_plugin.c:102
 msgid "Shade"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:133
+#: mcs-plugin/xfwm4_plugin.c:103
 msgid "Hide"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:134
+#: mcs-plugin/xfwm4_plugin.c:104
 msgid "Maximize"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:135
+#: mcs-plugin/xfwm4_plugin.c:105
 msgid "Close"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:139 mcs-plugin/xfwm4_plugin.c:1203
-#: mcs-plugin/xfwm4_plugin.c:1573
+#: mcs-plugin/xfwm4_plugin.c:109
 msgid "Shade window"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:140 mcs-plugin/xfwm4_plugin.c:1198
-#: mcs-plugin/xfwm4_plugin.c:1569
+#: mcs-plugin/xfwm4_plugin.c:110
 msgid "Hide window"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:141 mcs-plugin/xfwm4_plugin.c:1183
-#: mcs-plugin/xfwm4_plugin.c:1557
+#: mcs-plugin/xfwm4_plugin.c:111
 msgid "Maximize window"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:142
+#: mcs-plugin/xfwm4_plugin.c:112
 msgid "Nothing"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:147
+#: mcs-plugin/xfwm4_plugin.c:117
 msgid "Left"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:148
+#: mcs-plugin/xfwm4_plugin.c:118
 msgid "Center"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:149
+#: mcs-plugin/xfwm4_plugin.c:119
 msgid "Right"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:423
+#: mcs-plugin/xfwm4_plugin.c:328
 msgid "Hidden"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1107
+#: mcs-plugin/xfwm4_plugin.c:1012
 msgid "Font Selection Dialog"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:1178 mcs-plugin/xfwm4_plugin.c:1553
-msgid "Close window"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1188 mcs-plugin/xfwm4_plugin.c:1561
-msgid "Maximize window vertically"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1193 mcs-plugin/xfwm4_plugin.c:1565
-msgid "Maximize window horizontally"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1208 mcs-plugin/xfwm4_plugin.c:1577
-msgid "Stick window"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1213 mcs-plugin/xfwm4_plugin.c:1581
-msgid "Cycle windows"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1218 mcs-plugin/xfwm4_plugin.c:1585
-msgid "Move window up"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1223 mcs-plugin/xfwm4_plugin.c:1589
-msgid "Move window down"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1228 mcs-plugin/xfwm4_plugin.c:1593
-msgid "Move window left"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1233 mcs-plugin/xfwm4_plugin.c:1597
-msgid "Move window right"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1238 mcs-plugin/xfwm4_plugin.c:1601
-msgid "Resize window up"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1243 mcs-plugin/xfwm4_plugin.c:1605
-msgid "Resize window down"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1248 mcs-plugin/xfwm4_plugin.c:1609
-msgid "Resize window left"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1253 mcs-plugin/xfwm4_plugin.c:1613
-msgid "Resize window right"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1258 mcs-plugin/xfwm4_plugin.c:1617
-msgid "Raise window"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1263 mcs-plugin/xfwm4_plugin.c:1621
-msgid "Lower window"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1268 mcs-plugin/xfwm4_plugin.c:1625
-msgid "Toggle fullscreen"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1273 mcs-plugin/xfwm4_plugin.c:1629
-msgid "Next workspace"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1278 mcs-plugin/xfwm4_plugin.c:1633
-msgid "Previous workspace"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1283 mcs-plugin/xfwm4_plugin.c:1637
-msgid "Add workspace"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1288 mcs-plugin/xfwm4_plugin.c:1641
-msgid "Delete workspace"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1293 mcs-plugin/xfwm4_plugin.c:1645
-msgid "Workspace 1"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1298 mcs-plugin/xfwm4_plugin.c:1649
-msgid "Workspace 2"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1303 mcs-plugin/xfwm4_plugin.c:1653
-msgid "Workspace 3"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1308 mcs-plugin/xfwm4_plugin.c:1657
-msgid "Workspace 4"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1313 mcs-plugin/xfwm4_plugin.c:1661
-msgid "Workspace 5"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1318 mcs-plugin/xfwm4_plugin.c:1665
-msgid "Workspace 6"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1323 mcs-plugin/xfwm4_plugin.c:1669
-msgid "Workspace 7"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1328 mcs-plugin/xfwm4_plugin.c:1673
-msgid "Workspace 8"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1333 mcs-plugin/xfwm4_plugin.c:1677
-msgid "Workspace 9"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1338 mcs-plugin/xfwm4_plugin.c:1681
-msgid "Move window to next workspace"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1343 mcs-plugin/xfwm4_plugin.c:1685
-msgid "Move window to previous workspace"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1348 mcs-plugin/xfwm4_plugin.c:1689
-msgid "Move window to workspace 1"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1353 mcs-plugin/xfwm4_plugin.c:1693
-msgid "Move window to workspace 2"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1358 mcs-plugin/xfwm4_plugin.c:1697
-msgid "Move window to workspace 3"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1363 mcs-plugin/xfwm4_plugin.c:1701
-msgid "Move window to workspace 4"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1368 mcs-plugin/xfwm4_plugin.c:1705
-msgid "Move window to workspace 5"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1373 mcs-plugin/xfwm4_plugin.c:1709
-msgid "Move window to workspace 6"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1378 mcs-plugin/xfwm4_plugin.c:1713
-msgid "Move window to workspace 7"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1383 mcs-plugin/xfwm4_plugin.c:1717
-msgid "Move window to workspace 8"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1388 mcs-plugin/xfwm4_plugin.c:1721
-msgid "Move window to workspace 9"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1769
-msgid "Cannot open the theme directory !"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1788
-#, c-format
-msgid ""
-"Cannot open %s : \n"
-"%s"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1803 mcs-plugin/xfwm4_plugin.c:1814
-#, c-format
-msgid ""
-"Cannot write in %s : \n"
-"%s"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1934
-msgid ""
-"Shortcut already in use !\n"
-"Are you sure you want to use it ?"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:1995
-msgid "Compose shortcut for :"
-msgstr ""
-
-#. Create dialog
-#: mcs-plugin/xfwm4_plugin.c:1998 mcs-plugin/xfwm4_plugin.c:2219
-msgid "Compose shortcut"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:2030 mcs-plugin/xfwm4_plugin.c:2250
-msgid "Cannot grab the keyboard"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:2070
-msgid "Select command"
-msgstr ""
-
-#. Create dialog
-#: mcs-plugin/xfwm4_plugin.c:2124
-msgid "Choose command"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:2126
-msgid "Command :"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:2160
-msgid "The command doesn't exist or the file is not executable !"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:2216
-msgid "Compose shortcut for command :"
-msgstr ""
-
-#: mcs-plugin/xfwm4_plugin.c:2328 mcs-plugin/xfwm4_plugin.c:2831
+#: mcs-plugin/xfwm4_plugin.c:1108 mcs-plugin/xfwm4_plugin.c:1611
 msgid "Window Manager"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2341
+#: mcs-plugin/xfwm4_plugin.c:1121
 msgid "Window Manager Preferences"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2371
+#: mcs-plugin/xfwm4_plugin.c:1151
 msgid "Title font"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2384
+#: mcs-plugin/xfwm4_plugin.c:1164
 msgid "Title Alignment"
 msgstr ""
 
 #. XXX
-#: mcs-plugin/xfwm4_plugin.c:2390
+#: mcs-plugin/xfwm4_plugin.c:1170
 msgid "Text alignment inside title bar :"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2392
+#: mcs-plugin/xfwm4_plugin.c:1172
 msgid "Button layout"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2398
+#: mcs-plugin/xfwm4_plugin.c:1178
 msgid "Style"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2424
+#: mcs-plugin/xfwm4_plugin.c:1204
 msgid "Windows shortcuts"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2445 mcs-plugin/xfwm4_plugin.c:2473
+#: mcs-plugin/xfwm4_plugin.c:1225 mcs-plugin/xfwm4_plugin.c:1253
 msgid "Command"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2450 mcs-plugin/xfwm4_plugin.c:2478
+#: mcs-plugin/xfwm4_plugin.c:1230 mcs-plugin/xfwm4_plugin.c:1258
 msgid "Shortcut"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2453
+#: mcs-plugin/xfwm4_plugin.c:1233
 msgid "Command shortcuts"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2481
+#: mcs-plugin/xfwm4_plugin.c:1261
 msgid "Keyboard"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2492
+#: mcs-plugin/xfwm4_plugin.c:1272
 msgid "Focus model"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2500
+#: mcs-plugin/xfwm4_plugin.c:1280
 msgid "Click to focus"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2507
+#: mcs-plugin/xfwm4_plugin.c:1287
 msgid "Focus follows mouse"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2514
+#: mcs-plugin/xfwm4_plugin.c:1294
 msgid "New window focus"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2518
+#: mcs-plugin/xfwm4_plugin.c:1298
 msgid ""
 "Automatically give focus to \n"
 "newly created windows"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2523
+#: mcs-plugin/xfwm4_plugin.c:1303
 msgid "Raise on focus"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2531
+#: mcs-plugin/xfwm4_plugin.c:1311
 msgid ""
 "Automatically raise windows \n"
 "when they receive focus"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2541
+#: mcs-plugin/xfwm4_plugin.c:1321
 msgid "Delay before raising focused window :"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2547
+#: mcs-plugin/xfwm4_plugin.c:1327
 msgid "Slow"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2553
+#: mcs-plugin/xfwm4_plugin.c:1333
 msgid "Fast"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2569
+#: mcs-plugin/xfwm4_plugin.c:1349
 msgid "Raise on click"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2573
+#: mcs-plugin/xfwm4_plugin.c:1353
 msgid ""
 "Raise window when clicking inside\n"
 "application window"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2578
+#: mcs-plugin/xfwm4_plugin.c:1358
 msgid "Focus"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2588
+#: mcs-plugin/xfwm4_plugin.c:1368
 msgid "Windows snapping"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2596
+#: mcs-plugin/xfwm4_plugin.c:1376
 msgid "Snap windows to screen border"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2601
+#: mcs-plugin/xfwm4_plugin.c:1381
 msgid "Snap windows to other windows"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2611
+#: mcs-plugin/xfwm4_plugin.c:1391
 msgid "Distance :"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2617 mcs-plugin/xfwm4_plugin.c:2667
+#: mcs-plugin/xfwm4_plugin.c:1397 mcs-plugin/xfwm4_plugin.c:1447
 msgid "Small"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2623 mcs-plugin/xfwm4_plugin.c:2673
+#: mcs-plugin/xfwm4_plugin.c:1403 mcs-plugin/xfwm4_plugin.c:1453
 msgid "Wide"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2638
+#: mcs-plugin/xfwm4_plugin.c:1418
 msgid "Wrap workspaces"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2646
+#: mcs-plugin/xfwm4_plugin.c:1426
 msgid "Wrap workspaces when the pointer reaches a screen edge"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2651
+#: mcs-plugin/xfwm4_plugin.c:1431
 msgid "Wrap workspaces when dragging a window off the screen"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2661
+#: mcs-plugin/xfwm4_plugin.c:1441
 msgid "Edge Resistance :"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2688
+#: mcs-plugin/xfwm4_plugin.c:1468
 msgid "Opaque move and resize"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2696
+#: mcs-plugin/xfwm4_plugin.c:1476
 msgid "Display content of windows when resizing"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2701
+#: mcs-plugin/xfwm4_plugin.c:1481
 msgid "Display content of windows when moving"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2706
+#: mcs-plugin/xfwm4_plugin.c:1486
 msgid "Double click action"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2712
+#: mcs-plugin/xfwm4_plugin.c:1492
 msgid "Action to perform when double clicking on title bar :"
 msgstr ""
 
-#: mcs-plugin/xfwm4_plugin.c:2714
+#: mcs-plugin/xfwm4_plugin.c:1494
 msgid "Advanced"
 msgstr ""
 
diff --git a/themes/waza/bottom-active.xpm b/themes/waza/bottom-active.xpm
index 1094b9c5cb89bff118dab6b0cef662b9757b3192..c2fc115435a22f14b29133ff7ef6261c56f18c06 100644
--- a/themes/waza/bottom-active.xpm
+++ b/themes/waza/bottom-active.xpm
@@ -10,5 +10,5 @@ static char * bottom_active_xpm[] = {
 "################################",
 "################################",
 "################################",
-"################################",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
 "................................"};
diff --git a/themes/waza/bottom-inactive.xpm b/themes/waza/bottom-inactive.xpm
index 4ee0fec035278f0cca0e333d7a824bf5542d924e..a0c0be7e0382b224d74e3817d35b68242478a84e 100644
--- a/themes/waza/bottom-inactive.xpm
+++ b/themes/waza/bottom-inactive.xpm
@@ -10,5 +10,5 @@ static char * bottom_inactive_xpm[] = {
 "################################",
 "################################",
 "################################",
-"################################",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
 "................................"};
diff --git a/themes/waza/bottom-left-active.xpm b/themes/waza/bottom-left-active.xpm
index 7b3f17de4ef56c0e4cac49f3afdc359971cf96bc..d7578a383072f9632d4a6ea17c9fd9b081fa19ca 100644
--- a/themes/waza/bottom-left-active.xpm
+++ b/themes/waza/bottom-left-active.xpm
@@ -7,19 +7,19 @@ static char * bottom_left_active_xpm[] = {
 "@      c #3E566B s active_shadow_2",
 "$      c #567B9C s active_mid_2",
 "#      c #4C7BA6 s active_color_2",
-".####           ",
-".####           ",
-".####           ",
-".####           ",
-".####           ",
-".####           ",
-".####           ",
-".####           ",
-".####           ",
-".####           ",
-".#####          ",
-".@##############",
-" .##############",
-" .@#############",
-"  ..@###########",
-"    ............"};
+".+###           ",
+".+###           ",
+".+###           ",
+".+###           ",
+".+###           ",
+".+###           ",
+".+###           ",
+".+###           ",
+".+###           ",
+".+###           ",
+".+###           ",
+".+##############",
+".+##############",
+".+##############",
+".@@@@@@@@@@@@@@@",
+" ..............."};
diff --git a/themes/waza/bottom-left-inactive.xpm b/themes/waza/bottom-left-inactive.xpm
index 8dc1bb29771c16c92f811578ee11da0aa40fded9..9c5f35869fb9de4d5ca3bd7ffb518db9777fd4a9 100644
--- a/themes/waza/bottom-left-inactive.xpm
+++ b/themes/waza/bottom-left-inactive.xpm
@@ -7,19 +7,19 @@ static char * bottom_left_inactive_xpm[] = {
 "@      c #3E566B s inactive_shadow_2",
 "$      c #567B9C s inactive_mid_2",
 "#      c #4C7BA6 s inactive_color_2",
-".####           ",
-".####           ",
-".####           ",
-".####           ",
-".####           ",
-".####           ",
-".####           ",
-".####           ",
-".####           ",
-".####           ",
-".#####          ",
-".@##############",
-" .##############",
-" .@#############",
-"  ..@###########",
-"    ............"};
+".+###           ",
+".+###           ",
+".+###           ",
+".+###           ",
+".+###           ",
+".+###           ",
+".+###           ",
+".+###           ",
+".+###           ",
+".+###           ",
+".+###           ",
+".+##############",
+".+##############",
+".+##############",
+".@@@@@@@@@@@@@@@",
+" ..............."};
diff --git a/themes/waza/bottom-right-active.xpm b/themes/waza/bottom-right-active.xpm
index eddf1c03f83e604680f21c1ddb3512bdc527ffb8..24416cfa21faa6d9a8eaea81db3c3ab3563ddba8 100644
--- a/themes/waza/bottom-right-active.xpm
+++ b/themes/waza/bottom-right-active.xpm
@@ -7,19 +7,19 @@ static char * bottom_right_active_xpm[] = {
 "@      c #3E566B s active_shadow_2",
 "$      c #567B9C s active_mid_2",
 "#      c #4C7BA6 s active_color_2",
-"           ####.",
-"           ####.",
-"           ####.",
-"           ####.",
-"           ####.",
-"           ####.",
-"           ####.",
-"           ####.",
-"           ####.",
-"           ####.",
-"          #####.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
 "##############@.",
-"##############. ",
-"#############@.  ",
-"###########@..   ",
-"............     "};
+"##############@.",
+"##############@.",
+"@@@@@@@@@@@@@@@.",
+"............... "};
diff --git a/themes/waza/bottom-right-inactive.xpm b/themes/waza/bottom-right-inactive.xpm
index f82d9c1de20ecb4fd1e1cf91a19aa3fb9d5088df..e06f5e0e93e9253d6ca9bd0b359af4d820e2020f 100644
--- a/themes/waza/bottom-right-inactive.xpm
+++ b/themes/waza/bottom-right-inactive.xpm
@@ -7,19 +7,19 @@ static char * bottom_right_inactive_xpm[] = {
 "@	c #3E566B s inactive_shadow_2",
 "$	c #567B9C s inactive_mid_2",
 "#	c #4C7BA6 s inactive_color_2",
-"           ####.",
-"           ####.",
-"           ####.",
-"           ####.",
-"           ####.",
-"           ####.",
-"           ####.",
-"           ####.",
-"           ####.",
-"           ####.",
-"          #####.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
+"           ###@.",
 "##############@.",
-"##############. ",
-"#############@.  ",
-"###########@..   ",
-"............     "};
+"##############@.",
+"##############@.",
+"@@@@@@@@@@@@@@@.",
+"............... "};
diff --git a/themes/waza/left-active.xpm b/themes/waza/left-active.xpm
index 37af8ff5129f5b3ba9c4e945edede72734cdd500..50ba9c9e46e512a3fb2b8b7ac4415124f6197c48 100644
--- a/themes/waza/left-active.xpm
+++ b/themes/waza/left-active.xpm
@@ -7,35 +7,35 @@ static char * left_active_xpm[] = {
 "@	c #3E566B s active_shadow_2",
 "$	c #567B9C s active_mid_2",
 "#	c #4C7BA6 s active_color_2",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####"};
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###"};
diff --git a/themes/waza/left-inactive.xpm b/themes/waza/left-inactive.xpm
index db3b991b41e269d18eaa360194e1cbfebfb99ebe..7df8e5fd97e3bfbf101b481418b484f975cad0d6 100644
--- a/themes/waza/left-inactive.xpm
+++ b/themes/waza/left-inactive.xpm
@@ -7,35 +7,35 @@ static char * left_inactive_xpm[] = {
 "@	c #3E566B s inactive_shadow_2",
 "$	c #567B9C s inactive_mid_2",
 "#	c #4C7BA6 s inactive_color_2",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####",
-".####"};
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###"};
diff --git a/themes/waza/right-active.xpm b/themes/waza/right-active.xpm
index 9a09a968e5cf57aef70c0c57cfec9dbe06c9cd95..c12fec51843eecf1fb82a6a64004f2fa7c7a7563 100644
--- a/themes/waza/right-active.xpm
+++ b/themes/waza/right-active.xpm
@@ -7,35 +7,35 @@ static char * right_active_xpm[] = {
 "@	c #3E566B s active_shadow_2",
 "$	c #567B9C s active_mid_2",
 "#	c #4C7BA6 s active_color_2",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####."};
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@."};
diff --git a/themes/waza/right-inactive.xpm b/themes/waza/right-inactive.xpm
index f5e1c3e55099702d501d3f1ae59bff0ea9ac03c3..70080c64e985b4ad4a4e2500f59cf133a31845e9 100644
--- a/themes/waza/right-inactive.xpm
+++ b/themes/waza/right-inactive.xpm
@@ -7,35 +7,35 @@ static char * right_inactive_xpm[] = {
 "@	c #3E566B s inactive_shadow_2",
 "$	c #567B9C s inactive_mid_2",
 "#	c #4C7BA6 s inactive_color_2",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####.",
-"####."};
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@.",
+"###@."};
diff --git a/themes/waza/top-left-active.xpm b/themes/waza/top-left-active.xpm
index 61b3330d860f24ed18132ad98aabf4409383efa0..0017255a00e48da1f2d250ee7d6040d9aef37784 100644
--- a/themes/waza/top-left-active.xpm
+++ b/themes/waza/top-left-active.xpm
@@ -9,23 +9,23 @@ static char * top_left_active_xpm[] = {
 "$	c #4C7BA6 s active_color_1",
 "    ....",
 "  ..#+++",
-" .#$++++",
+" .@$++++",
 " .$+$$$$",
-".@$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
+".@+$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
 ".@@@@@@@"};
diff --git a/themes/waza/top-left-inactive.xpm b/themes/waza/top-left-inactive.xpm
index cadf88f134c3f82d752b16189fb17a8f900fff50..7cff61275ea3b58e0ff5c3bdd74ddd82d14edd24 100644
--- a/themes/waza/top-left-inactive.xpm
+++ b/themes/waza/top-left-inactive.xpm
@@ -9,23 +9,23 @@ static char * top_left_inactive_xpm[] = {
 "$	c #4C7BA6 s inactive_color_1",
 "    ....",
 "  ..#+++",
-" .#$++++",
+" .@$++++",
 " .$+$$$$",
-".@$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
-".$$$$$$$",
+".@+$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
+".+$$$$$$",
 ".@@@@@@@"};
diff --git a/themes/waza/top-right-active.xpm b/themes/waza/top-right-active.xpm
index cfe666ffb9066339430061e068f7192f41e89eb3..638f3c7cc2baf40a495e33d4c9060578b4ad3a09 100644
--- a/themes/waza/top-right-active.xpm
+++ b/themes/waza/top-right-active.xpm
@@ -9,23 +9,23 @@ static char * top_right_active_xpm[] = {
 "$	c #4C7BA6 s active_color_1",
 "....    ",
 "+++#..  ",
-"++++$#. ",
+"++++$@. ",
 "$$$$+$. ",
 "$$$$$$@.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
 "@@@@@@@."};
diff --git a/themes/waza/top-right-inactive.xpm b/themes/waza/top-right-inactive.xpm
index 650f80f81c5cd1766bbaabeeb2082212a306d780..33014093676691afb9b1a88885ef04d90884c148 100644
--- a/themes/waza/top-right-inactive.xpm
+++ b/themes/waza/top-right-inactive.xpm
@@ -9,23 +9,23 @@ static char * top_right_inactive_xpm[] = {
 "$	c #4C7BA6 s inactive_color_1",
 "....    ",
 "+++#..  ",
-"++++$#. ",
+"++++$@. ",
 "$$$$+$. ",
 "$$$$$$@.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
-"$$$$$$$.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
+"$$$$$$@.",
 "@@@@@@@."};