From c2c9e777e8e314208caa9af8fa4b3e45f7a9df2e Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Tue, 6 Apr 2004 19:12:28 +0000
Subject: [PATCH] Various cleanups and play with the alpha channel in themes

(Old svn revision: 11685)
---
 po/xfwm4.pot                                 |  58 +++---
 themes/default-4.0/Makefile.am               | 105 +++++-----
 themes/default-4.0/Makefile.in               | 105 +++++-----
 themes/default/Makefile.am                   | 189 +++++++++---------
 themes/default/Makefile.in                   | 191 ++++++++++---------
 themes/default/close-active.png              | Bin 404 -> 324 bytes
 themes/default/close-active.xpm              |  37 ++--
 themes/default/close-inactive.png            | Bin 404 -> 342 bytes
 themes/default/close-inactive.xpm            |   8 +-
 themes/default/close-pressed.png             | Bin 415 -> 324 bytes
 themes/default/close-pressed.xpm             |  37 ++--
 themes/default/hide-active.png               | Bin 404 -> 324 bytes
 themes/default/hide-active.xpm               |   8 +-
 themes/default/hide-inactive.png             | Bin 404 -> 342 bytes
 themes/default/hide-inactive.xpm             |   8 +-
 themes/default/hide-pressed.png              | Bin 415 -> 324 bytes
 themes/default/hide-pressed.xpm              |   8 +-
 themes/default/maximize-active.png           | Bin 404 -> 324 bytes
 themes/default/maximize-active.xpm           |   8 +-
 themes/default/maximize-inactive.png         | Bin 404 -> 342 bytes
 themes/default/maximize-inactive.xpm         |   8 +-
 themes/default/maximize-pressed.png          | Bin 415 -> 324 bytes
 themes/default/maximize-pressed.xpm          |   8 +-
 themes/default/maximize-toggled-active.png   | Bin 404 -> 324 bytes
 themes/default/maximize-toggled-active.xpm   |   8 +-
 themes/default/maximize-toggled-inactive.png | Bin 404 -> 342 bytes
 themes/default/maximize-toggled-inactive.xpm |   8 +-
 themes/default/maximize-toggled-pressed.png  | Bin 415 -> 324 bytes
 themes/default/maximize-toggled-pressed.xpm  |   8 +-
 themes/default/menu-active.png               | Bin 404 -> 324 bytes
 themes/default/menu-active.xpm               |   8 +-
 themes/default/menu-inactive.png             | Bin 0 -> 342 bytes
 themes/default/menu-inactive.xpm             |   8 +-
 themes/default/menu-pressed.png              | Bin 415 -> 324 bytes
 themes/default/menu-pressed.xpm              |   8 +-
 themes/default/shade-active.png              | Bin 404 -> 324 bytes
 themes/default/shade-active.xpm              |   8 +-
 themes/default/shade-inactive.png            | Bin 404 -> 342 bytes
 themes/default/shade-inactive.xpm            |   8 +-
 themes/default/shade-pressed.png             | Bin 415 -> 324 bytes
 themes/default/shade-pressed.xpm             |   8 +-
 themes/default/shade-toggled-active.png      | Bin 404 -> 324 bytes
 themes/default/shade-toggled-active.xpm      |   8 +-
 themes/default/shade-toggled-inactive.png    | Bin 404 -> 342 bytes
 themes/default/shade-toggled-inactive.xpm    |   8 +-
 themes/default/shade-toggled-pressed.png     | Bin 415 -> 324 bytes
 themes/default/shade-toggled-pressed.xpm     |   8 +-
 themes/default/stick-active.png              | Bin 404 -> 324 bytes
 themes/default/stick-active.xpm              |   8 +-
 themes/default/stick-inactive.png            | Bin 404 -> 342 bytes
 themes/default/stick-inactive.xpm            |   8 +-
 themes/default/stick-pressed.png             | Bin 415 -> 324 bytes
 themes/default/stick-pressed.xpm             |   8 +-
 themes/default/stick-toggled-active.png      | Bin 404 -> 324 bytes
 themes/default/stick-toggled-active.xpm      |   8 +-
 themes/default/stick-toggled-inactive.png    | Bin 404 -> 342 bytes
 themes/default/stick-toggled-inactive.xpm    |   8 +-
 themes/default/stick-toggled-pressed.png     | Bin 415 -> 324 bytes
 themes/default/stick-toggled-pressed.xpm     |   8 +-
 themes/default/themerc                       |   2 +-
 themes/default/title-1-active.png            | Bin 248 -> 242 bytes
 themes/default/title-2-active.png            | Bin 248 -> 242 bytes
 themes/default/title-3-active.png            | Bin 248 -> 242 bytes
 themes/default/title-4-active.png            | Bin 248 -> 242 bytes
 themes/default/title-5-active.png            | Bin 248 -> 242 bytes
 themes/default/top-left-active.png           | Bin 305 -> 316 bytes
 themes/default/top-right-active.png          | Bin 305 -> 324 bytes
 themes/opta/Makefile.am                      | 105 +++++-----
 themes/opta/Makefile.in                      | 105 +++++-----
 themes/synthetic/Makefile.am                 | 105 +++++-----
 themes/synthetic/Makefile.in                 | 105 +++++-----
 71 files changed, 675 insertions(+), 669 deletions(-)
 create mode 100644 themes/default/menu-inactive.png

diff --git a/po/xfwm4.pot b/po/xfwm4.pot
index 51d1866c0..151367dea 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-03-07 14:51+0100\n"
+"POT-Creation-Date: 2004-04-06 13:19+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"
@@ -46,7 +46,7 @@ msgid "Workspaces and Margins"
 msgstr ""
 
 #. Number of workspaces
-#: mcs-plugin/plugin.c:139 mcs-plugin/plugin.c:172 mcs-plugin/workspaces.c:538
+#: mcs-plugin/plugin.c:139 mcs-plugin/plugin.c:172 mcs-plugin/workspaces.c:542
 msgid "Workspaces"
 msgstr ""
 
@@ -54,29 +54,29 @@ msgstr ""
 msgid "Margins"
 msgstr ""
 
-#: mcs-plugin/workspaces.c:337
+#: mcs-plugin/workspaces.c:341
 msgid "Change name"
 msgstr ""
 
-#: mcs-plugin/workspaces.c:349
+#: mcs-plugin/workspaces.c:353
 #, c-format
 msgid "Workspace %d"
 msgstr ""
 
-#: mcs-plugin/workspaces.c:359
+#: mcs-plugin/workspaces.c:363
 msgid "Name:"
 msgstr ""
 
-#: mcs-plugin/workspaces.c:447
+#: mcs-plugin/workspaces.c:451
 msgid "Click on a workspace name to edit it"
 msgstr ""
 
-#: mcs-plugin/workspaces.c:519
+#: mcs-plugin/workspaces.c:523
 msgid "Number of workspaces:"
 msgstr ""
 
 #. Workspace names
-#: mcs-plugin/workspaces.c:550
+#: mcs-plugin/workspaces.c:554
 msgid "Workspace names"
 msgstr ""
 
@@ -299,12 +299,12 @@ msgstr ""
 msgid "Advanced"
 msgstr ""
 
-#: src/client.c:510
+#: src/client.c:519
 #, c-format
 msgid "%s: Unmanaged net_wm_state (window 0x%lx)"
 msgstr ""
 
-#: src/events.c:1555
+#: src/events.c:1560
 #, c-format
 msgid "%s: Operation not supported (yet)\n"
 msgstr ""
@@ -339,81 +339,81 @@ msgstr ""
 msgid "%s: Unknown error occured"
 msgstr ""
 
-#: src/menu.c:42
+#: src/menu.c:43
 msgid "Ma_ximize"
 msgstr ""
 
-#: src/menu.c:43
+#: src/menu.c:44
 msgid "Un_maximize"
 msgstr ""
 
-#: src/menu.c:44
+#: src/menu.c:45
 msgid "_Hide"
 msgstr ""
 
-#: src/menu.c:45
+#: src/menu.c:46
 msgid "Hide _all others"
 msgstr ""
 
-#: src/menu.c:46
+#: src/menu.c:47
 msgid "S_how"
 msgstr ""
 
-#: src/menu.c:47
+#: src/menu.c:48
 msgid "_Shade"
 msgstr ""
 
-#: src/menu.c:48
+#: src/menu.c:49
 msgid "Un_shade"
 msgstr ""
 
-#: src/menu.c:49
+#: src/menu.c:50
 msgid "S_tick"
 msgstr ""
 
-#: src/menu.c:50
+#: src/menu.c:51
 msgid "Uns_tick"
 msgstr ""
 
-#: src/menu.c:51
+#: src/menu.c:52
 msgid "Context _help"
 msgstr ""
 
-#: src/menu.c:52 src/menu.c:53
+#: src/menu.c:53 src/menu.c:54
 msgid "Always on top"
 msgstr ""
 
-#: src/menu.c:54
+#: src/menu.c:55
 msgid "Send to..."
 msgstr ""
 
-#: src/menu.c:56
+#: src/menu.c:57
 msgid "_Close"
 msgstr ""
 
-#: src/menu.c:59
+#: src/menu.c:60
 msgid "Destroy"
 msgstr ""
 
-#: src/menu.c:62
+#: src/menu.c:63
 msgid "_Quit"
 msgstr ""
 
-#: src/menu.c:63
+#: src/menu.c:64
 msgid "Restart"
 msgstr ""
 
-#: src/menu.c:169
+#: src/menu.c:170
 #, c-format
 msgid "Workspace %i (%s)"
 msgstr ""
 
-#: src/menu.c:181
+#: src/menu.c:182
 #, c-format
 msgid "Workspace %i"
 msgstr ""
 
-#: src/menu.c:424
+#: src/menu.c:425
 #, c-format
 msgid "%s: GtkMenu failed to grab the pointer\n"
 msgstr ""
diff --git a/themes/default-4.0/Makefile.am b/themes/default-4.0/Makefile.am
index 14d836510..94dbc2736 100644
--- a/themes/default-4.0/Makefile.am
+++ b/themes/default-4.0/Makefile.am
@@ -1,55 +1,56 @@
 themedir = $(datadir)/themes/Default-4.0/xfwm4
-theme_DATA = README \
-	bottom-active.xpm \
-	bottom-inactive.xpm \
-	bottom-left-active.xpm \
-	bottom-left-inactive.xpm \
-	bottom-right-active.xpm \
-	bottom-right-inactive.xpm \
-	close-active.xpm \
-	close-inactive.xpm \
-	close-pressed.xpm \
-	hide-active.xpm \
-	hide-inactive.xpm \
-	hide-pressed.xpm \
-	left-active.xpm \
-	left-inactive.xpm \
-	maximize-active.xpm \
-	maximize-inactive.xpm \
-	maximize-pressed.xpm \
-        maximize-toggled-active.xpm \
-        maximize-toggled-inactive.xpm \
-        maximize-toggled-pressed.xpm \
-	menu-active.xpm \
-	menu-inactive.xpm \
-	menu-pressed.xpm \
-	right-active.xpm \
-	right-inactive.xpm \
-	shade-active.xpm \
-	shade-inactive.xpm \
-	shade-pressed.xpm \
-        shade-toggled-active.xpm \
-        shade-toggled-inactive.xpm \
-        shade-toggled-pressed.xpm \
-	stick-active.xpm \
-	stick-inactive.xpm \
-	stick-pressed.xpm \
-        stick-toggled-active.xpm \
-        stick-toggled-inactive.xpm \
-        stick-toggled-pressed.xpm \
-	themerc \
-	title-1-active.xpm \
-	title-1-inactive.xpm \
-	title-2-active.xpm \
-	title-2-inactive.xpm \
-	title-3-active.xpm \
-	title-3-inactive.xpm \
-	title-4-active.xpm \
-	title-4-inactive.xpm \
-	title-5-active.xpm \
-	title-5-inactive.xpm \
-	top-left-active.xpm \
-	top-left-inactive.xpm \
-	top-right-active.xpm \
+theme_DATA = 								\
+	README 								\
+	themerc 							\
+	bottom-active.xpm 						\
+	bottom-inactive.xpm 						\
+	bottom-left-active.xpm 						\
+	bottom-left-inactive.xpm 					\
+	bottom-right-active.xpm 					\
+	bottom-right-inactive.xpm 					\
+	close-active.xpm 						\
+	close-inactive.xpm 						\
+	close-pressed.xpm 						\
+	hide-active.xpm 						\
+	hide-inactive.xpm 						\
+	hide-pressed.xpm 						\
+	left-active.xpm 						\
+	left-inactive.xpm 						\
+	maximize-active.xpm 						\
+	maximize-inactive.xpm 						\
+	maximize-pressed.xpm 						\
+        maximize-toggled-active.xpm 					\
+        maximize-toggled-inactive.xpm 					\
+        maximize-toggled-pressed.xpm 					\
+	menu-active.xpm 						\
+	menu-inactive.xpm 						\
+	menu-pressed.xpm 						\
+	right-active.xpm 						\
+	right-inactive.xpm 						\
+	shade-active.xpm 						\
+	shade-inactive.xpm 						\
+	shade-pressed.xpm 						\
+        shade-toggled-active.xpm 					\
+        shade-toggled-inactive.xpm 					\
+        shade-toggled-pressed.xpm 					\
+	stick-active.xpm 						\
+	stick-inactive.xpm 						\
+	stick-pressed.xpm 						\
+        stick-toggled-active.xpm 					\
+        stick-toggled-inactive.xpm 					\
+        stick-toggled-pressed.xpm 					\
+	title-1-active.xpm 						\
+	title-1-inactive.xpm 						\
+	title-2-active.xpm 						\
+	title-2-inactive.xpm 						\
+	title-3-active.xpm 						\
+	title-3-inactive.xpm 						\
+	title-4-active.xpm 						\
+	title-4-inactive.xpm 						\
+	title-5-active.xpm 						\
+	title-5-inactive.xpm 						\
+	top-left-active.xpm 						\
+	top-left-inactive.xpm 						\
+	top-right-active.xpm 						\
 	top-right-inactive.xpm
 EXTRA_DIST = $(theme_DATA)
diff --git a/themes/default-4.0/Makefile.in b/themes/default-4.0/Makefile.in
index 1450dca42..2dda5a6eb 100644
--- a/themes/default-4.0/Makefile.in
+++ b/themes/default-4.0/Makefile.in
@@ -198,58 +198,59 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 themedir = $(datadir)/themes/Default-4.0/xfwm4
-theme_DATA = README \
-	bottom-active.xpm \
-	bottom-inactive.xpm \
-	bottom-left-active.xpm \
-	bottom-left-inactive.xpm \
-	bottom-right-active.xpm \
-	bottom-right-inactive.xpm \
-	close-active.xpm \
-	close-inactive.xpm \
-	close-pressed.xpm \
-	hide-active.xpm \
-	hide-inactive.xpm \
-	hide-pressed.xpm \
-	left-active.xpm \
-	left-inactive.xpm \
-	maximize-active.xpm \
-	maximize-inactive.xpm \
-	maximize-pressed.xpm \
-        maximize-toggled-active.xpm \
-        maximize-toggled-inactive.xpm \
-        maximize-toggled-pressed.xpm \
-	menu-active.xpm \
-	menu-inactive.xpm \
-	menu-pressed.xpm \
-	right-active.xpm \
-	right-inactive.xpm \
-	shade-active.xpm \
-	shade-inactive.xpm \
-	shade-pressed.xpm \
-        shade-toggled-active.xpm \
-        shade-toggled-inactive.xpm \
-        shade-toggled-pressed.xpm \
-	stick-active.xpm \
-	stick-inactive.xpm \
-	stick-pressed.xpm \
-        stick-toggled-active.xpm \
-        stick-toggled-inactive.xpm \
-        stick-toggled-pressed.xpm \
-	themerc \
-	title-1-active.xpm \
-	title-1-inactive.xpm \
-	title-2-active.xpm \
-	title-2-inactive.xpm \
-	title-3-active.xpm \
-	title-3-inactive.xpm \
-	title-4-active.xpm \
-	title-4-inactive.xpm \
-	title-5-active.xpm \
-	title-5-inactive.xpm \
-	top-left-active.xpm \
-	top-left-inactive.xpm \
-	top-right-active.xpm \
+theme_DATA = \
+	README 								\
+	themerc 							\
+	bottom-active.xpm 						\
+	bottom-inactive.xpm 						\
+	bottom-left-active.xpm 						\
+	bottom-left-inactive.xpm 					\
+	bottom-right-active.xpm 					\
+	bottom-right-inactive.xpm 					\
+	close-active.xpm 						\
+	close-inactive.xpm 						\
+	close-pressed.xpm 						\
+	hide-active.xpm 						\
+	hide-inactive.xpm 						\
+	hide-pressed.xpm 						\
+	left-active.xpm 						\
+	left-inactive.xpm 						\
+	maximize-active.xpm 						\
+	maximize-inactive.xpm 						\
+	maximize-pressed.xpm 						\
+        maximize-toggled-active.xpm 					\
+        maximize-toggled-inactive.xpm 					\
+        maximize-toggled-pressed.xpm 					\
+	menu-active.xpm 						\
+	menu-inactive.xpm 						\
+	menu-pressed.xpm 						\
+	right-active.xpm 						\
+	right-inactive.xpm 						\
+	shade-active.xpm 						\
+	shade-inactive.xpm 						\
+	shade-pressed.xpm 						\
+        shade-toggled-active.xpm 					\
+        shade-toggled-inactive.xpm 					\
+        shade-toggled-pressed.xpm 					\
+	stick-active.xpm 						\
+	stick-inactive.xpm 						\
+	stick-pressed.xpm 						\
+        stick-toggled-active.xpm 					\
+        stick-toggled-inactive.xpm 					\
+        stick-toggled-pressed.xpm 					\
+	title-1-active.xpm 						\
+	title-1-inactive.xpm 						\
+	title-2-active.xpm 						\
+	title-2-inactive.xpm 						\
+	title-3-active.xpm 						\
+	title-3-inactive.xpm 						\
+	title-4-active.xpm 						\
+	title-4-inactive.xpm 						\
+	title-5-active.xpm 						\
+	title-5-inactive.xpm 						\
+	top-left-active.xpm 						\
+	top-left-inactive.xpm 						\
+	top-right-active.xpm 						\
 	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
diff --git a/themes/default/Makefile.am b/themes/default/Makefile.am
index 84020252f..5c966101a 100644
--- a/themes/default/Makefile.am
+++ b/themes/default/Makefile.am
@@ -1,94 +1,97 @@
 themedir = $(datadir)/themes/Default/xfwm4
-theme_DATA = README themerc \
-	bottom-active.xpm \
-	bottom-inactive.xpm \
-	bottom-left-active.xpm \
-	bottom-left-inactive.xpm \
-	bottom-right-active.xpm \
-	bottom-right-inactive.xpm \
-	close-active.png \
-	close-active.xpm \
-	close-inactive.png \
-	close-inactive.xpm \
-	close-pressed.png \
-	close-pressed.xpm \
-	hide-active.png \
-	hide-active.xpm \
-	hide-inactive.png \
-	hide-inactive.xpm \
-	hide-pressed.png \
-	hide-pressed.xpm \
-	left-active.xpm \
-	left-inactive.xpm \
-	maximize-active.png \
-	maximize-active.xpm \
-	maximize-inactive.png \
-	maximize-inactive.xpm \
-	maximize-pressed.png \
-	maximize-pressed.xpm \
-	maximize-toggled-active.png \
-	maximize-toggled-inactive.png \
-	maximize-toggled-pressed.png \
-	menu-active.png \
-	menu-active.xpm \
-	menu-inactive.xpm \
-	menu-pressed.png \
-	menu-pressed.xpm \
-	right-active.xpm \
-	right-inactive.xpm \
-	shade-active.png \
-	shade-active.xpm \
-	shade-inactive.png \
-	shade-inactive.xpm \
-	shade-pressed.png \
-	shade-pressed.xpm \
-	shade-toggled-active.png \
-	shade-toggled-inactive.png \
-	shade-toggled-pressed.png \
-	stick-active.png \
-	stick-active.xpm \
-	stick-inactive.png \
-	stick-inactive.xpm \
-	stick-pressed.png \
-	stick-pressed.xpm \
-	stick-toggled-active.png \
-	stick-toggled-inactive.png \
-	stick-toggled-pressed.png \
-	title-1-active.png \
-	title-1-active.xpm \
-	title-1-inactive.png \
-	title-1-inactive.xpm \
-	title-2-active.png \
-	title-2-active.xpm \
-	title-2-inactive.png \
-	title-2-inactive.xpm \
-	title-3-active.png \
-	title-3-active.xpm \
-	title-3-inactive.png \
-	title-3-inactive.xpm \
-	title-4-active.png \
-	title-4-active.xpm \
-	title-4-inactive.png \
-	title-4-inactive.xpm \
-	title-5-active.png \
-	title-5-active.xpm \
-	title-5-inactive.png \
-	title-5-inactive.xpm \
-	top-left-active.png \
-	top-left-active.xpm \
-	top-left-inactive.png \
-	top-left-inactive.xpm \
-	top-right-active.png \
-	top-right-active.xpm \
-	top-right-inactive.png
-	top-right-inactive.xpm \
-        maximize-toggled-active.xpm \
-        maximize-toggled-inactive.xpm \
-        maximize-toggled-pressed.xpm \
-        shade-toggled-active.xpm \
-        shade-toggled-inactive.xpm \
-        shade-toggled-pressed.xpm \
-        stick-toggled-active.xpm \
-        stick-toggled-inactive.xpm \
-        stick-toggled-pressed.xpm \
-[EXTRA_DIST = $(theme_DATA)
+theme_DATA = 								\
+	README 								\
+	themerc 							\
+	bottom-active.xpm						\
+	bottom-inactive.xpm						\
+	bottom-left-active.xpm						\
+	bottom-left-inactive.xpm					\
+	bottom-right-active.xpm						\
+	bottom-right-inactive.xpm					\
+	close-active.png						\
+	close-active.xpm						\
+	close-inactive.png						\
+	close-inactive.xpm						\
+	close-pressed.png						\
+	close-pressed.xpm						\
+	hide-active.png							\
+	hide-active.xpm							\
+	hide-inactive.png						\
+	hide-inactive.xpm						\
+	hide-pressed.png						\
+	hide-pressed.xpm						\
+	left-active.xpm							\
+	left-inactive.xpm						\
+	maximize-active.png						\
+	maximize-active.xpm						\
+	maximize-inactive.png						\
+	maximize-inactive.xpm						\
+	maximize-pressed.png						\
+	maximize-pressed.xpm						\
+	maximize-toggled-active.png					\
+	maximize-toggled-active.xpm					\
+	maximize-toggled-inactive.png					\
+	maximize-toggled-inactive.xpm					\
+	maximize-toggled-pressed.png					\
+	maximize-toggled-pressed.xpm					\
+	menu-active.png							\
+	menu-active.xpm							\
+	menu-inactive.png						\
+	menu-inactive.xpm						\
+	menu-pressed.png						\
+	menu-pressed.xpm						\
+	right-active.xpm						\
+	right-inactive.xpm						\
+	shade-active.png						\
+	shade-active.xpm						\
+	shade-inactive.png						\
+	shade-inactive.xpm						\
+	shade-pressed.png						\
+	shade-pressed.xpm						\
+	shade-toggled-active.png					\
+	shade-toggled-active.xpm					\
+	shade-toggled-inactive.png					\
+	shade-toggled-inactive.xpm					\
+	shade-toggled-pressed.png					\
+	shade-toggled-pressed.xpm					\
+	stick-active.png						\
+	stick-active.xpm						\
+	stick-inactive.png						\
+	stick-inactive.xpm						\
+	stick-pressed.png						\
+	stick-pressed.xpm						\
+	stick-toggled-active.png					\
+	stick-toggled-active.xpm					\
+	stick-toggled-inactive.png					\
+	stick-toggled-inactive.xpm					\
+	stick-toggled-pressed.png					\
+	stick-toggled-pressed.xpm					\
+	title-1-active.png						\
+	title-1-active.xpm						\
+	title-1-inactive.png						\
+	title-1-inactive.xpm						\
+	title-2-active.png						\
+	title-2-active.xpm						\
+	title-2-inactive.png						\
+	title-2-inactive.xpm						\
+	title-3-active.png						\
+	title-3-active.xpm						\
+	title-3-inactive.png						\
+	title-3-inactive.xpm						\
+	title-4-active.png						\
+	title-4-active.xpm						\
+	title-4-inactive.png						\
+	title-4-inactive.xpm						\
+	title-5-active.png						\
+	title-5-active.xpm						\
+	title-5-inactive.png						\
+	title-5-inactive.xpm						\
+	top-left-active.png						\
+	top-left-active.xpm						\
+	top-left-inactive.png						\
+	top-left-inactive.xpm						\
+	top-right-active.png						\
+	top-right-active.xpm						\
+	top-right-inactive.png						\
+	top-right-inactive.xpm
+EXTRA_DIST = $(theme_DATA)
diff --git a/themes/default/Makefile.in b/themes/default/Makefile.in
index f46e6f6b6..3dc64c822 100644
--- a/themes/default/Makefile.in
+++ b/themes/default/Makefile.in
@@ -198,89 +198,103 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 themedir = $(datadir)/themes/Default/xfwm4
-theme_DATA = README themerc \
-	bottom-active.xpm \
-	bottom-inactive.xpm \
-	bottom-left-active.xpm \
-	bottom-left-inactive.xpm \
-	bottom-right-active.xpm \
-	bottom-right-inactive.xpm \
-	close-active.png \
-	close-active.xpm \
-	close-inactive.png \
-	close-inactive.xpm \
-	close-pressed.png \
-	close-pressed.xpm \
-	hide-active.png \
-	hide-active.xpm \
-	hide-inactive.png \
-	hide-inactive.xpm \
-	hide-pressed.png \
-	hide-pressed.xpm \
-	left-active.xpm \
-	left-inactive.xpm \
-	maximize-active.png \
-	maximize-active.xpm \
-	maximize-inactive.png \
-	maximize-inactive.xpm \
-	maximize-pressed.png \
-	maximize-pressed.xpm \
-	maximize-toggled-active.png \
-	maximize-toggled-inactive.png \
-	maximize-toggled-pressed.png \
-	menu-active.png \
-	menu-active.xpm \
-	menu-inactive.xpm \
-	menu-pressed.png \
-	menu-pressed.xpm \
-	right-active.xpm \
-	right-inactive.xpm \
-	shade-active.png \
-	shade-active.xpm \
-	shade-inactive.png \
-	shade-inactive.xpm \
-	shade-pressed.png \
-	shade-pressed.xpm \
-	shade-toggled-active.png \
-	shade-toggled-inactive.png \
-	shade-toggled-pressed.png \
-	stick-active.png \
-	stick-active.xpm \
-	stick-inactive.png \
-	stick-inactive.xpm \
-	stick-pressed.png \
-	stick-pressed.xpm \
-	stick-toggled-active.png \
-	stick-toggled-inactive.png \
-	stick-toggled-pressed.png \
-	title-1-active.png \
-	title-1-active.xpm \
-	title-1-inactive.png \
-	title-1-inactive.xpm \
-	title-2-active.png \
-	title-2-active.xpm \
-	title-2-inactive.png \
-	title-2-inactive.xpm \
-	title-3-active.png \
-	title-3-active.xpm \
-	title-3-inactive.png \
-	title-3-inactive.xpm \
-	title-4-active.png \
-	title-4-active.xpm \
-	title-4-inactive.png \
-	title-4-inactive.xpm \
-	title-5-active.png \
-	title-5-active.xpm \
-	title-5-inactive.png \
-	title-5-inactive.xpm \
-	top-left-active.png \
-	top-left-active.xpm \
-	top-left-inactive.png \
-	top-left-inactive.xpm \
-	top-right-active.png \
-	top-right-active.xpm \
-	top-right-inactive.png
-
+theme_DATA = \
+	README 								\
+	themerc 							\
+	bottom-active.xpm						\
+	bottom-inactive.xpm						\
+	bottom-left-active.xpm						\
+	bottom-left-inactive.xpm					\
+	bottom-right-active.xpm						\
+	bottom-right-inactive.xpm					\
+	close-active.png						\
+	close-active.xpm						\
+	close-inactive.png						\
+	close-inactive.xpm						\
+	close-pressed.png						\
+	close-pressed.xpm						\
+	hide-active.png							\
+	hide-active.xpm							\
+	hide-inactive.png						\
+	hide-inactive.xpm						\
+	hide-pressed.png						\
+	hide-pressed.xpm						\
+	left-active.xpm							\
+	left-inactive.xpm						\
+	maximize-active.png						\
+	maximize-active.xpm						\
+	maximize-inactive.png						\
+	maximize-inactive.xpm						\
+	maximize-pressed.png						\
+	maximize-pressed.xpm						\
+	maximize-toggled-active.png					\
+	maximize-toggled-active.xpm					\
+	maximize-toggled-inactive.png					\
+	maximize-toggled-inactive.xpm					\
+	maximize-toggled-pressed.png					\
+	maximize-toggled-pressed.xpm					\
+	menu-active.png							\
+	menu-active.xpm							\
+	menu-inactive.png						\
+	menu-inactive.xpm						\
+	menu-pressed.png						\
+	menu-pressed.xpm						\
+	right-active.xpm						\
+	right-inactive.xpm						\
+	shade-active.png						\
+	shade-active.xpm						\
+	shade-inactive.png						\
+	shade-inactive.xpm						\
+	shade-pressed.png						\
+	shade-pressed.xpm						\
+	shade-toggled-active.png					\
+	shade-toggled-active.xpm					\
+	shade-toggled-inactive.png					\
+	shade-toggled-inactive.xpm					\
+	shade-toggled-pressed.png					\
+	shade-toggled-pressed.xpm					\
+	stick-active.png						\
+	stick-active.xpm						\
+	stick-inactive.png						\
+	stick-inactive.xpm						\
+	stick-pressed.png						\
+	stick-pressed.xpm						\
+	stick-toggled-active.png					\
+	stick-toggled-active.xpm					\
+	stick-toggled-inactive.png					\
+	stick-toggled-inactive.xpm					\
+	stick-toggled-pressed.png					\
+	stick-toggled-pressed.xpm					\
+	title-1-active.png						\
+	title-1-active.xpm						\
+	title-1-inactive.png						\
+	title-1-inactive.xpm						\
+	title-2-active.png						\
+	title-2-active.xpm						\
+	title-2-inactive.png						\
+	title-2-inactive.xpm						\
+	title-3-active.png						\
+	title-3-active.xpm						\
+	title-3-inactive.png						\
+	title-3-inactive.xpm						\
+	title-4-active.png						\
+	title-4-active.xpm						\
+	title-4-inactive.png						\
+	title-4-inactive.xpm						\
+	title-5-active.png						\
+	title-5-active.xpm						\
+	title-5-inactive.png						\
+	title-5-inactive.xpm						\
+	top-left-active.png						\
+	top-left-active.xpm						\
+	top-left-inactive.png						\
+	top-left-inactive.xpm						\
+	top-right-active.png						\
+	top-right-active.xpm						\
+	top-right-inactive.png						\
+	top-right-inactive.xpm
+
+EXTRA_DIST = $(theme_DATA)
 all: all-am
 
 .SUFFIXES:
@@ -459,17 +473,6 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
 	uninstall uninstall-am uninstall-info-am uninstall-themeDATA
 
-	top-right-inactive.xpm \
-        maximize-toggled-active.xpm \
-        maximize-toggled-inactive.xpm \
-        maximize-toggled-pressed.xpm \
-        shade-toggled-active.xpm \
-        shade-toggled-inactive.xpm \
-        shade-toggled-pressed.xpm \
-        stick-toggled-active.xpm \
-        stick-toggled-inactive.xpm \
-        stick-toggled-pressed.xpm \
-[EXTRA_DIST = $(theme_DATA)
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/themes/default/close-active.png b/themes/default/close-active.png
index 2c419d7a3c55f1cd7e5e20c86e108419f59173cc..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*i1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jPbahU)B

delta 355
zcmV-p0i6EC0+a)gI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{Vf>{ZNzu009w6L_t(|+NF~*mc%d!L%;U<Rylu8Gj&L*Edbjyc{|Ozv4brT
zLXmC$vwryJ8WGXwBe@u%uOR1}6F{%m3*Z1l1N*pz7PvxrIDf|#ap)u3`xE~ta*TVm
z@P#s{wbpyG(qLt_jl>_^U3;?o6!A$Dz6yX@3~Z2u?M((P>J8G~lNb>fSRdMW##Yfi
zf$L6;h&$&xlO#AlJzcRpQciK+jjLMFCSp>rR(hP?P1Hh~5!VF>)r;0*>SX8lW2PA!
z_k9<ra+^tb!d$e|&g!j6wa_DOpcdUG<BDnN0A}0~C90=6whp@EjZsagl8w0HwCZQF
zXpebGpNwSe_ms|`=>l|uk1o@WeXFcF{`S~u#4oI6z%?EAIM@IH002ovPDHLkV1goJ
Bq7eW9

diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index 76bb406e5..ba803b767 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -1,29 +1,26 @@
 /* XPM */
 static char * close_active_xpm[] = {
-"16 18 8 1",
+"16 18 5 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #4B58A2 s active_shadow_1",
-"$	c #ED2323",
-"=	c #FFA0A0",
-"-	c #BA1B1B",
 "#	c #FFFFFF",
 "                ",
 "                ",
-"..++++++++++++..",
-".+------------+.",
-"+--------------+",
-"+--------------+",
-"+---=#----#=---+",
-"+---###--###---+",
-"+----######----+",
-"+-----####-----+",
-"+-----####-----+",
-"+----######----+",
-"+---###--###---+",
-"+---=#----#=---+",
-"+--------------+",
-"+--------------+",
-".+------------+.",
-"..++++++++++++.."};
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@+",
+"+@@@.#@@@@#.@@@+",
+"+@@@###@@###@@@+",
+"+@@@@######@@@@+",
+"+@@@@@####@@@@@+",
+"+@@@@@####@@@@@+",
+"+@@@@######@@@@+",
+"+@@@###@@###@@@+",
+"+@@@.#@@@@#.@@@+",
+"+@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/close-inactive.png b/themes/default/close-inactive.png
index 2c419d7a3c55f1cd7e5e20c86e108419f59173cc..db794deeece89208bcc91568e5ba63c24f2f0625 100644
GIT binary patch
delta 293
zcmV+=0owkQ1J(kNI)4BF0002_L%V+f008?*L_t(|+SQY>al|kT1ovjXjdv<_<}XR5
zN$I-=i_XpgK#HV4@r)BIf<O+iz#ZY=f2zUr<GBK0kn+fJW*IqiGFaT-?t3e69LI{{
z#|9*1W6_GtT@5VDvfltoDY(a}D48+QHOL}%UcLdGXBk=v@PAC92;>ne2+p(dTN+7T
z<r-lvP=dhMju46~_BC|BfGim!lyjPTj9)Bh8ljvx+Q!_S!cs!WS*Im>g0Ix?_Xf%(
zevXobdy>GIP$bT)oU@FRX_N{7Fwl503Cgg&T*si8b(zUjYxgQ7m-?>0x;CC_u=z2)
rKOU>bmd&oJULNSUwr$)0<T-x>zJ!kTn~*~v00000NkvXXu0mjf=CF(9

delta 355
zcmV-p0i6EU0+a)gI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{Vf>{ZNzu009w6L_t(|+NF~*mc%d!L%;U<Rylu8Gj&L*Edbjyc{|Ozv4brT
zLXmC$vwryJ8WGXwBe@u%uOR1}6F{%m3*Z1l1N*pz7PvxrIDf|#ap)u3`xE~ta*TVm
z@P#s{wbpyG(qLt_jl>_^U3;?o6!A$Dz6yX@3~Z2u?M((P>J8G~lNb>fSRdMW##Yfi
zf$L6;h&$&xlO#AlJzcRpQciK+jjLMFCSp>rR(hP?P1Hh~5!VF>)r;0*>SX8lW2PA!
z_k9<ra+^tb!d$e|&g!j6wa_DOpcdUG<BDnN0A}0~C90=6whp@EjZsagl8w0HwCZQF
zXpebGpNwSe_ms|`=>l|uk1o@WeXFcF{`S~u#4oI6z%?EAIM@IH002ovPDHLkV1heY
Bq9XtR

diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 332af1ac5..77751a767 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -11,8 +11,8 @@ static char * close_inactive_xpm[] = {
 "-	c #BA1B1B",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@.#@@@@#.@@@+",
@@ -25,5 +25,5 @@ static char * close_inactive_xpm[] = {
 "+@@@.#@@@@#.@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/close-pressed.png b/themes/default/close-pressed.png
index c4222e8bfc6cdabdd880df6fd386d05766f520f9..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*t1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jz2aijnM

delta 366
zcmV-!0g?X10-pnrI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{g26*VH!v00A6HL_t(|+Le<#as(j^L|?mzkS{pN`gn7}b=(dRpxKYBmH>ok
zP)llbyZs=H0TAG^inIY2KSl-jMY#%|2H1HdHpUC*oEtN~IDdq&jb`LzVF`Jxcm+HS
zw1^IHWZV+(aXg(Iz}X_=*rb#gqZv)*0k2$#X&)_m2Tjt>G6-v+S8Y~ll8MGyiwKHu
zl*xWU`eB!ZT92TRy3oA%AGf)VB3}Bu0oLfzFlLp;p)DlSqDNK1wdhMo^U*1!jV&qs
zKi;*s^@ts;s%KC`V6uvTi&J@_ea|+|o?ANudF{uS@I~!Ah4=D%=C6D=-7R`hS$;ZN
zk3O0+^`jbiYQy6bmtr}=y8qtC$8gn0UX`aPU$;V>@<tpVvOfX-0Fw%f+Gc!jLI3~&
M07*qoM6N<$g1%Fs(EtDd

diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index 47b8100cb..bc4a38c42 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -1,29 +1,26 @@
 /* XPM */
 static char * close_pressed_xpm[] = {
-"16 18 8 1",
+"16 18 5 1",
 " 	c None",
 ".	c #567B9C s active_color_1",
 "+	c #FFFFFF s active_hilight_1",
 "@	c #B4BAB5 s active_mid_1",
 "#	c #FFFFFF",
-"$	c #ED2323",
-"=	c #FFA0A0",
-"-	c #BA1B1B",
 "                ",
 "                ",
-"..++++++++++++..",
-".+$$$$$$$$$$$$+.",
-"+$$$$$$$$$$$$$$+",
-"+$$$$$$$$$$$$$$+",
-"+$$$=#$$$$#=$$$+",
-"+$$$###$$###$$$+",
-"+$$$$######$$$$+",
-"+$$$$$####$$$$$+",
-"+$$$$$####$$$$$+",
-"+$$$$######$$$$+",
-"+$$$###$$###$$$+",
-"+$$$=#$$$$#=$$$+",
-"+$$$$$$$$$$$$$$+",
-"+$$$$$$$$$$$$$$+",
-".+$$$$$$$$$$$$+.",
-"..++++++++++++.."};
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
+"+@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@+",
+"+@@@+#@@@@#+@@@+",
+"+@@@###@@###@@@+",
+"+@@@@######@@@@+",
+"+@@@@@####@@@@@+",
+"+@@@@@####@@@@@+",
+"+@@@@######@@@@+",
+"+@@@###@@###@@@+",
+"+@@@+#@@@@#+@@@+",
+"+@@@@@@@@@@@@@@+",
+"+@@@@@@@@@@@@@@+",
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/hide-active.png b/themes/default/hide-active.png
index 2c419d7a3c55f1cd7e5e20c86e108419f59173cc..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*i1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jPbahU)B

delta 355
zcmV-p0i6EC0+a)gI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{Vf>{ZNzu009w6L_t(|+NF~*mc%d!L%;U<Rylu8Gj&L*Edbjyc{|Ozv4brT
zLXmC$vwryJ8WGXwBe@u%uOR1}6F{%m3*Z1l1N*pz7PvxrIDf|#ap)u3`xE~ta*TVm
z@P#s{wbpyG(qLt_jl>_^U3;?o6!A$Dz6yX@3~Z2u?M((P>J8G~lNb>fSRdMW##Yfi
zf$L6;h&$&xlO#AlJzcRpQciK+jjLMFCSp>rR(hP?P1Hh~5!VF>)r;0*>SX8lW2PA!
z_k9<ra+^tb!d$e|&g!j6wa_DOpcdUG<BDnN0A}0~C90=6whp@EjZsagl8w0HwCZQF
zXpebGpNwSe_ms|`=>l|uk1o@WeXFcF{`S~u#4oI6z%?EAIM@IH002ovPDHLkV1goJ
Bq7eW9

diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 37afbbbb9..33236b705 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -8,8 +8,8 @@ static char * hide_active_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
@@ -22,5 +22,5 @@ static char * hide_active_xpm[] = {
 "+@@@@######@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/hide-inactive.png b/themes/default/hide-inactive.png
index 2c419d7a3c55f1cd7e5e20c86e108419f59173cc..db794deeece89208bcc91568e5ba63c24f2f0625 100644
GIT binary patch
delta 293
zcmV+=0owkQ1J(kNI)4BF0002_L%V+f008?*L_t(|+SQY>al|kT1ovjXjdv<_<}XR5
zN$I-=i_XpgK#HV4@r)BIf<O+iz#ZY=f2zUr<GBK0kn+fJW*IqiGFaT-?t3e69LI{{
z#|9*1W6_GtT@5VDvfltoDY(a}D48+QHOL}%UcLdGXBk=v@PAC92;>ne2+p(dTN+7T
z<r-lvP=dhMju46~_BC|BfGim!lyjPTj9)Bh8ljvx+Q!_S!cs!WS*Im>g0Ix?_Xf%(
zevXobdy>GIP$bT)oU@FRX_N{7Fwl503Cgg&T*si8b(zUjYxgQ7m-?>0x;CC_u=z2)
rKOU>bmd&oJULNSUwr$)0<T-x>zJ!kTn~*~v00000NkvXXu0mjf=CF(9

delta 355
zcmV-p0i6EU0+a)gI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{Vf>{ZNzu009w6L_t(|+NF~*mc%d!L%;U<Rylu8Gj&L*Edbjyc{|Ozv4brT
zLXmC$vwryJ8WGXwBe@u%uOR1}6F{%m3*Z1l1N*pz7PvxrIDf|#ap)u3`xE~ta*TVm
z@P#s{wbpyG(qLt_jl>_^U3;?o6!A$Dz6yX@3~Z2u?M((P>J8G~lNb>fSRdMW##Yfi
zf$L6;h&$&xlO#AlJzcRpQciK+jjLMFCSp>rR(hP?P1Hh~5!VF>)r;0*>SX8lW2PA!
z_k9<ra+^tb!d$e|&g!j6wa_DOpcdUG<BDnN0A}0~C90=6whp@EjZsagl8w0HwCZQF
zXpebGpNwSe_ms|`=>l|uk1o@WeXFcF{`S~u#4oI6z%?EAIM@IH002ovPDHLkV1heY
Bq9XtR

diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index 468c29607..401509578 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -8,8 +8,8 @@ static char * hide_inactive_xpm[] = {
 "#	c #949595 s inactive_shadow_1",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
@@ -22,5 +22,5 @@ static char * hide_inactive_xpm[] = {
 "+@@@@######@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/hide-pressed.png b/themes/default/hide-pressed.png
index c4222e8bfc6cdabdd880df6fd386d05766f520f9..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*t1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jz2aijnM

delta 366
zcmV-!0g?X10-pnrI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{g26*VH!v00A6HL_t(|+Le<#as(j^L|?mzkS{pN`gn7}b=(dRpxKYBmH>ok
zP)llbyZs=H0TAG^inIY2KSl-jMY#%|2H1HdHpUC*oEtN~IDdq&jb`LzVF`Jxcm+HS
zw1^IHWZV+(aXg(Iz}X_=*rb#gqZv)*0k2$#X&)_m2Tjt>G6-v+S8Y~ll8MGyiwKHu
zl*xWU`eB!ZT92TRy3oA%AGf)VB3}Bu0oLfzFlLp;p)DlSqDNK1wdhMo^U*1!jV&qs
zKi;*s^@ts;s%KC`V6uvTi&J@_ea|+|o?ANudF{uS@I~!Ah4=D%=C6D=-7R`hS$;ZN
zk3O0+^`jbiYQy6bmtr}=y8qtC$8gn0UX`aPU$;V>@<tpVvOfX-0Fw%f+Gc!jLI3~&
M07*qoM6N<$g1%Fs(EtDd

diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index 54acda0b1..bcdaa209f 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -8,8 +8,8 @@ static char * hide_pressed_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
@@ -22,5 +22,5 @@ static char * hide_pressed_xpm[] = {
 "+@@@@######@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/maximize-active.png b/themes/default/maximize-active.png
index 2c419d7a3c55f1cd7e5e20c86e108419f59173cc..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*i1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jPbahU)B

delta 355
zcmV-p0i6EC0+a)gI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{Vf>{ZNzu009w6L_t(|+NF~*mc%d!L%;U<Rylu8Gj&L*Edbjyc{|Ozv4brT
zLXmC$vwryJ8WGXwBe@u%uOR1}6F{%m3*Z1l1N*pz7PvxrIDf|#ap)u3`xE~ta*TVm
z@P#s{wbpyG(qLt_jl>_^U3;?o6!A$Dz6yX@3~Z2u?M((P>J8G~lNb>fSRdMW##Yfi
zf$L6;h&$&xlO#AlJzcRpQciK+jjLMFCSp>rR(hP?P1Hh~5!VF>)r;0*>SX8lW2PA!
z_k9<ra+^tb!d$e|&g!j6wa_DOpcdUG<BDnN0A}0~C90=6whp@EjZsagl8w0HwCZQF
zXpebGpNwSe_ms|`=>l|uk1o@WeXFcF{`S~u#4oI6z%?EAIM@IH002ovPDHLkV1goJ
Bq7eW9

diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index 5c0dd7c00..ad1ca3109 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -8,8 +8,8 @@ static char * maximize_active_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@.######.@@@+",
@@ -22,5 +22,5 @@ static char * maximize_active_xpm[] = {
 "+@@@.######.@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/maximize-inactive.png b/themes/default/maximize-inactive.png
index 2c419d7a3c55f1cd7e5e20c86e108419f59173cc..db794deeece89208bcc91568e5ba63c24f2f0625 100644
GIT binary patch
delta 293
zcmV+=0owkQ1J(kNI)4BF0002_L%V+f008?*L_t(|+SQY>al|kT1ovjXjdv<_<}XR5
zN$I-=i_XpgK#HV4@r)BIf<O+iz#ZY=f2zUr<GBK0kn+fJW*IqiGFaT-?t3e69LI{{
z#|9*1W6_GtT@5VDvfltoDY(a}D48+QHOL}%UcLdGXBk=v@PAC92;>ne2+p(dTN+7T
z<r-lvP=dhMju46~_BC|BfGim!lyjPTj9)Bh8ljvx+Q!_S!cs!WS*Im>g0Ix?_Xf%(
zevXobdy>GIP$bT)oU@FRX_N{7Fwl503Cgg&T*si8b(zUjYxgQ7m-?>0x;CC_u=z2)
rKOU>bmd&oJULNSUwr$)0<T-x>zJ!kTn~*~v00000NkvXXu0mjf=CF(9

delta 355
zcmV-p0i6EU0+a)gI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{Vf>{ZNzu009w6L_t(|+NF~*mc%d!L%;U<Rylu8Gj&L*Edbjyc{|Ozv4brT
zLXmC$vwryJ8WGXwBe@u%uOR1}6F{%m3*Z1l1N*pz7PvxrIDf|#ap)u3`xE~ta*TVm
z@P#s{wbpyG(qLt_jl>_^U3;?o6!A$Dz6yX@3~Z2u?M((P>J8G~lNb>fSRdMW##Yfi
zf$L6;h&$&xlO#AlJzcRpQciK+jjLMFCSp>rR(hP?P1Hh~5!VF>)r;0*>SX8lW2PA!
z_k9<ra+^tb!d$e|&g!j6wa_DOpcdUG<BDnN0A}0~C90=6whp@EjZsagl8w0HwCZQF
zXpebGpNwSe_ms|`=>l|uk1o@WeXFcF{`S~u#4oI6z%?EAIM@IH002ovPDHLkV1heY
Bq9XtR

diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index 0e1e6ba6f..b8c162eec 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -8,8 +8,8 @@ static char * maximize_inactive_xpm[] = {
 "#	c #949595 s inactive_shadow_1",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@.######.@@@+",
@@ -22,5 +22,5 @@ static char * maximize_inactive_xpm[] = {
 "+@@@.######.@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/maximize-pressed.png b/themes/default/maximize-pressed.png
index c4222e8bfc6cdabdd880df6fd386d05766f520f9..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*t1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jz2aijnM

delta 366
zcmV-!0g?X10-pnrI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{g26*VH!v00A6HL_t(|+Le<#as(j^L|?mzkS{pN`gn7}b=(dRpxKYBmH>ok
zP)llbyZs=H0TAG^inIY2KSl-jMY#%|2H1HdHpUC*oEtN~IDdq&jb`LzVF`Jxcm+HS
zw1^IHWZV+(aXg(Iz}X_=*rb#gqZv)*0k2$#X&)_m2Tjt>G6-v+S8Y~ll8MGyiwKHu
zl*xWU`eB!ZT92TRy3oA%AGf)VB3}Bu0oLfzFlLp;p)DlSqDNK1wdhMo^U*1!jV&qs
zKi;*s^@ts;s%KC`V6uvTi&J@_ea|+|o?ANudF{uS@I~!Ah4=D%=C6D=-7R`hS$;ZN
zk3O0+^`jbiYQy6bmtr}=y8qtC$8gn0UX`aPU$;V>@<tpVvOfX-0Fw%f+Gc!jLI3~&
M07*qoM6N<$g1%Fs(EtDd

diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index 573c3559e..7b1089c7e 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -8,8 +8,8 @@ static char * maximize_pressed_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@######@@@@+",
@@ -22,5 +22,5 @@ static char * maximize_pressed_xpm[] = {
 "+@@@@######@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/maximize-toggled-active.png b/themes/default/maximize-toggled-active.png
index 2c419d7a3c55f1cd7e5e20c86e108419f59173cc..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*i1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jPbahU)B

delta 355
zcmV-p0i6EC0+a)gI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{Vf>{ZNzu009w6L_t(|+NF~*mc%d!L%;U<Rylu8Gj&L*Edbjyc{|Ozv4brT
zLXmC$vwryJ8WGXwBe@u%uOR1}6F{%m3*Z1l1N*pz7PvxrIDf|#ap)u3`xE~ta*TVm
z@P#s{wbpyG(qLt_jl>_^U3;?o6!A$Dz6yX@3~Z2u?M((P>J8G~lNb>fSRdMW##Yfi
zf$L6;h&$&xlO#AlJzcRpQciK+jjLMFCSp>rR(hP?P1Hh~5!VF>)r;0*>SX8lW2PA!
z_k9<ra+^tb!d$e|&g!j6wa_DOpcdUG<BDnN0A}0~C90=6whp@EjZsagl8w0HwCZQF
zXpebGpNwSe_ms|`=>l|uk1o@WeXFcF{`S~u#4oI6z%?EAIM@IH002ovPDHLkV1goJ
Bq7eW9

diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index 5090d823a..22d4015b4 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -8,8 +8,8 @@ static char * maximize_toggled_active_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@.#####.@@+",
 "+@@@@@#######@@+",
@@ -22,5 +22,5 @@ static char * maximize_toggled_active_xpm[] = {
 "+@@#######@@@@@+",
 "+@@.#####.@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/maximize-toggled-inactive.png b/themes/default/maximize-toggled-inactive.png
index 2c419d7a3c55f1cd7e5e20c86e108419f59173cc..db794deeece89208bcc91568e5ba63c24f2f0625 100644
GIT binary patch
delta 293
zcmV+=0owkQ1J(kNI)4BF0002_L%V+f008?*L_t(|+SQY>al|kT1ovjXjdv<_<}XR5
zN$I-=i_XpgK#HV4@r)BIf<O+iz#ZY=f2zUr<GBK0kn+fJW*IqiGFaT-?t3e69LI{{
z#|9*1W6_GtT@5VDvfltoDY(a}D48+QHOL}%UcLdGXBk=v@PAC92;>ne2+p(dTN+7T
z<r-lvP=dhMju46~_BC|BfGim!lyjPTj9)Bh8ljvx+Q!_S!cs!WS*Im>g0Ix?_Xf%(
zevXobdy>GIP$bT)oU@FRX_N{7Fwl503Cgg&T*si8b(zUjYxgQ7m-?>0x;CC_u=z2)
rKOU>bmd&oJULNSUwr$)0<T-x>zJ!kTn~*~v00000NkvXXu0mjf=CF(9

delta 355
zcmV-p0i6EU0+a)gI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{Vf>{ZNzu009w6L_t(|+NF~*mc%d!L%;U<Rylu8Gj&L*Edbjyc{|Ozv4brT
zLXmC$vwryJ8WGXwBe@u%uOR1}6F{%m3*Z1l1N*pz7PvxrIDf|#ap)u3`xE~ta*TVm
z@P#s{wbpyG(qLt_jl>_^U3;?o6!A$Dz6yX@3~Z2u?M((P>J8G~lNb>fSRdMW##Yfi
zf$L6;h&$&xlO#AlJzcRpQciK+jjLMFCSp>rR(hP?P1Hh~5!VF>)r;0*>SX8lW2PA!
z_k9<ra+^tb!d$e|&g!j6wa_DOpcdUG<BDnN0A}0~C90=6whp@EjZsagl8w0HwCZQF
zXpebGpNwSe_ms|`=>l|uk1o@WeXFcF{`S~u#4oI6z%?EAIM@IH002ovPDHLkV1heY
Bq9XtR

diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index 180fe0e63..760c62e1f 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -8,8 +8,8 @@ static char * maximize_toggled_inactive_xpm[] = {
 "#	c #949595 s inactive_shadow_1",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@.#####.@@+",
 "+@@@@@#######@@+",
@@ -22,5 +22,5 @@ static char * maximize_toggled_inactive_xpm[] = {
 "+@@#######@@@@@+",
 "+@@.#####.@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/maximize-toggled-pressed.png b/themes/default/maximize-toggled-pressed.png
index c4222e8bfc6cdabdd880df6fd386d05766f520f9..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*t1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jz2aijnM

delta 366
zcmV-!0g?X10-pnrI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{g26*VH!v00A6HL_t(|+Le<#as(j^L|?mzkS{pN`gn7}b=(dRpxKYBmH>ok
zP)llbyZs=H0TAG^inIY2KSl-jMY#%|2H1HdHpUC*oEtN~IDdq&jb`LzVF`Jxcm+HS
zw1^IHWZV+(aXg(Iz}X_=*rb#gqZv)*0k2$#X&)_m2Tjt>G6-v+S8Y~ll8MGyiwKHu
zl*xWU`eB!ZT92TRy3oA%AGf)VB3}Bu0oLfzFlLp;p)DlSqDNK1wdhMo^U*1!jV&qs
zKi;*s^@ts;s%KC`V6uvTi&J@_ea|+|o?ANudF{uS@I~!Ah4=D%=C6D=-7R`hS$;ZN
zk3O0+^`jbiYQy6bmtr}=y8qtC$8gn0UX`aPU$;V>@<tpVvOfX-0Fw%f+Gc!jLI3~&
M07*qoM6N<$g1%Fs(EtDd

diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index ae8845fae..3ee5aa6f4 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -8,8 +8,8 @@ static char * maximize_toggled_pressed_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@#####@@@+",
 "+@@@@@#######@@+",
@@ -22,5 +22,5 @@ static char * maximize_toggled_pressed_xpm[] = {
 "+@@#######@@@@@+",
 "+@@@#####@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/menu-active.png b/themes/default/menu-active.png
index 2c419d7a3c55f1cd7e5e20c86e108419f59173cc..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*i1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jPbahU)B

delta 355
zcmV-p0i6EC0+a)gI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{Vf>{ZNzu009w6L_t(|+NF~*mc%d!L%;U<Rylu8Gj&L*Edbjyc{|Ozv4brT
zLXmC$vwryJ8WGXwBe@u%uOR1}6F{%m3*Z1l1N*pz7PvxrIDf|#ap)u3`xE~ta*TVm
z@P#s{wbpyG(qLt_jl>_^U3;?o6!A$Dz6yX@3~Z2u?M((P>J8G~lNb>fSRdMW##Yfi
zf$L6;h&$&xlO#AlJzcRpQciK+jjLMFCSp>rR(hP?P1Hh~5!VF>)r;0*>SX8lW2PA!
z_k9<ra+^tb!d$e|&g!j6wa_DOpcdUG<BDnN0A}0~C90=6whp@EjZsagl8w0HwCZQF
zXpebGpNwSe_ms|`=>l|uk1o@WeXFcF{`S~u#4oI6z%?EAIM@IH002ovPDHLkV1goJ
Bq7eW9

diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index 355de3df2..65b257af1 100644
--- a/themes/default/menu-active.xpm
+++ b/themes/default/menu-active.xpm
@@ -8,8 +8,8 @@ static char * menu_active_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
@@ -22,5 +22,5 @@ static char * menu_active_xpm[] = {
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/menu-inactive.png b/themes/default/menu-inactive.png
new file mode 100644
index 0000000000000000000000000000000000000000..db794deeece89208bcc91568e5ba63c24f2f0625
GIT binary patch
literal 342
zcmV-c0jd6pP)<h;3K|Lk000e1NJLTq000mG000sQ1^@s6QafI100004XF*Lt006O%
z3;baP00006VoOIv00000008+zyMF)x0Q*TqK~#9!)swMt#4rp5_h!D0cPe$}FG;0I
z>AMDt&dvcqiljgBj1wz@Kn}3L9pT@9s=@Q)xdLF2^2l*!898$@Slr+4dn<4p$BN>|
z1|(!-(TdDn4J^yD-vCM}xW}m|nK98d$Rc)Lz5$$P8CnVOOrZ$m5h@7Iv+-LRNnYg|
zVJ%RCz}JotiYxXtbiaTs86%W)ntF_1ENB{`oH*LX+?~QwLdaRCC3=Fd)bIBO$|Zh|
zl7)Mcz?e`Z&a0fWjFV}U3I8zAcrgjeu)SQzpqO=;$y96iDkPWsuD-f9o@%i9F}*(?
otHzeiuBu+>xVCNE|KvG;1HOcg^_!4G9{>OV07*qoM6N<$f?7M07XSbN

literal 0
HcmV?d00001

diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index 7b33419e3..c198696bf 100644
--- a/themes/default/menu-inactive.xpm
+++ b/themes/default/menu-inactive.xpm
@@ -8,8 +8,8 @@ static char * menu_inactive_xpm[] = {
 "#	c #949595 s inactive_shadow_1",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
@@ -22,5 +22,5 @@ static char * menu_inactive_xpm[] = {
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/menu-pressed.png b/themes/default/menu-pressed.png
index c4222e8bfc6cdabdd880df6fd386d05766f520f9..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*t1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jz2aijnM

delta 366
zcmV-!0g?X10-pnrI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{g26*VH!v00A6HL_t(|+Le<#as(j^L|?mzkS{pN`gn7}b=(dRpxKYBmH>ok
zP)llbyZs=H0TAG^inIY2KSl-jMY#%|2H1HdHpUC*oEtN~IDdq&jb`LzVF`Jxcm+HS
zw1^IHWZV+(aXg(Iz}X_=*rb#gqZv)*0k2$#X&)_m2Tjt>G6-v+S8Y~ll8MGyiwKHu
zl*xWU`eB!ZT92TRy3oA%AGf)VB3}Bu0oLfzFlLp;p)DlSqDNK1wdhMo^U*1!jV&qs
zKi;*s^@ts;s%KC`V6uvTi&J@_ea|+|o?ANudF{uS@I~!Ah4=D%=C6D=-7R`hS$;ZN
zk3O0+^`jbiYQy6bmtr}=y8qtC$8gn0UX`aPU$;V>@<tpVvOfX-0Fw%f+Gc!jLI3~&
M07*qoM6N<$g1%Fs(EtDd

diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index 7e8ea983d..bc84cee15 100644
--- a/themes/default/menu-pressed.xpm
+++ b/themes/default/menu-pressed.xpm
@@ -8,8 +8,8 @@ static char * menu_pressed_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
@@ -22,5 +22,5 @@ static char * menu_pressed_xpm[] = {
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/shade-active.png b/themes/default/shade-active.png
index 2c419d7a3c55f1cd7e5e20c86e108419f59173cc..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*i1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jPbahU)B

delta 355
zcmV-p0i6EC0+a)gI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{Vf>{ZNzu009w6L_t(|+NF~*mc%d!L%;U<Rylu8Gj&L*Edbjyc{|Ozv4brT
zLXmC$vwryJ8WGXwBe@u%uOR1}6F{%m3*Z1l1N*pz7PvxrIDf|#ap)u3`xE~ta*TVm
z@P#s{wbpyG(qLt_jl>_^U3;?o6!A$Dz6yX@3~Z2u?M((P>J8G~lNb>fSRdMW##Yfi
zf$L6;h&$&xlO#AlJzcRpQciK+jjLMFCSp>rR(hP?P1Hh~5!VF>)r;0*>SX8lW2PA!
z_k9<ra+^tb!d$e|&g!j6wa_DOpcdUG<BDnN0A}0~C90=6whp@EjZsagl8w0HwCZQF
zXpebGpNwSe_ms|`=>l|uk1o@WeXFcF{`S~u#4oI6z%?EAIM@IH002ovPDHLkV1goJ
Bq7eW9

diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index d0836d312..ca67d14f4 100644
--- a/themes/default/shade-active.xpm
+++ b/themes/default/shade-active.xpm
@@ -8,8 +8,8 @@ static char * shade_active_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@##@@@@@@+",
@@ -22,5 +22,5 @@ static char * shade_active_xpm[] = {
 "+@@@@@@##@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/shade-inactive.png b/themes/default/shade-inactive.png
index 2c419d7a3c55f1cd7e5e20c86e108419f59173cc..db794deeece89208bcc91568e5ba63c24f2f0625 100644
GIT binary patch
delta 293
zcmV+=0owkQ1J(kNI)4BF0002_L%V+f008?*L_t(|+SQY>al|kT1ovjXjdv<_<}XR5
zN$I-=i_XpgK#HV4@r)BIf<O+iz#ZY=f2zUr<GBK0kn+fJW*IqiGFaT-?t3e69LI{{
z#|9*1W6_GtT@5VDvfltoDY(a}D48+QHOL}%UcLdGXBk=v@PAC92;>ne2+p(dTN+7T
z<r-lvP=dhMju46~_BC|BfGim!lyjPTj9)Bh8ljvx+Q!_S!cs!WS*Im>g0Ix?_Xf%(
zevXobdy>GIP$bT)oU@FRX_N{7Fwl503Cgg&T*si8b(zUjYxgQ7m-?>0x;CC_u=z2)
rKOU>bmd&oJULNSUwr$)0<T-x>zJ!kTn~*~v00000NkvXXu0mjf=CF(9

delta 355
zcmV-p0i6EU0+a)gI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{Vf>{ZNzu009w6L_t(|+NF~*mc%d!L%;U<Rylu8Gj&L*Edbjyc{|Ozv4brT
zLXmC$vwryJ8WGXwBe@u%uOR1}6F{%m3*Z1l1N*pz7PvxrIDf|#ap)u3`xE~ta*TVm
z@P#s{wbpyG(qLt_jl>_^U3;?o6!A$Dz6yX@3~Z2u?M((P>J8G~lNb>fSRdMW##Yfi
zf$L6;h&$&xlO#AlJzcRpQciK+jjLMFCSp>rR(hP?P1Hh~5!VF>)r;0*>SX8lW2PA!
z_k9<ra+^tb!d$e|&g!j6wa_DOpcdUG<BDnN0A}0~C90=6whp@EjZsagl8w0HwCZQF
zXpebGpNwSe_ms|`=>l|uk1o@WeXFcF{`S~u#4oI6z%?EAIM@IH002ovPDHLkV1heY
Bq9XtR

diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index 16c38e8b5..e9a5890c4 100644
--- a/themes/default/shade-inactive.xpm
+++ b/themes/default/shade-inactive.xpm
@@ -8,8 +8,8 @@ static char * shade_inactive_xpm[] = {
 "#	c #949595 s inactive_shadow_1",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@##@@@@@@+",
@@ -22,5 +22,5 @@ static char * shade_inactive_xpm[] = {
 "+@@@@@@##@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/shade-pressed.png b/themes/default/shade-pressed.png
index c4222e8bfc6cdabdd880df6fd386d05766f520f9..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*t1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jz2aijnM

delta 366
zcmV-!0g?X10-pnrI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{g26*VH!v00A6HL_t(|+Le<#as(j^L|?mzkS{pN`gn7}b=(dRpxKYBmH>ok
zP)llbyZs=H0TAG^inIY2KSl-jMY#%|2H1HdHpUC*oEtN~IDdq&jb`LzVF`Jxcm+HS
zw1^IHWZV+(aXg(Iz}X_=*rb#gqZv)*0k2$#X&)_m2Tjt>G6-v+S8Y~ll8MGyiwKHu
zl*xWU`eB!ZT92TRy3oA%AGf)VB3}Bu0oLfzFlLp;p)DlSqDNK1wdhMo^U*1!jV&qs
zKi;*s^@ts;s%KC`V6uvTi&J@_ea|+|o?ANudF{uS@I~!Ah4=D%=C6D=-7R`hS$;ZN
zk3O0+^`jbiYQy6bmtr}=y8qtC$8gn0UX`aPU$;V>@<tpVvOfX-0Fw%f+Gc!jLI3~&
M07*qoM6N<$g1%Fs(EtDd

diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index 9bb8b7ca2..29e69d163 100644
--- a/themes/default/shade-pressed.xpm
+++ b/themes/default/shade-pressed.xpm
@@ -8,8 +8,8 @@ static char * shade_pressed_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@##@@@@@@+",
@@ -22,5 +22,5 @@ static char * shade_pressed_xpm[] = {
 "+@@@@@@##@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/shade-toggled-active.png b/themes/default/shade-toggled-active.png
index 2c419d7a3c55f1cd7e5e20c86e108419f59173cc..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*i1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jPbahU)B

delta 355
zcmV-p0i6EC0+a)gI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{Vf>{ZNzu009w6L_t(|+NF~*mc%d!L%;U<Rylu8Gj&L*Edbjyc{|Ozv4brT
zLXmC$vwryJ8WGXwBe@u%uOR1}6F{%m3*Z1l1N*pz7PvxrIDf|#ap)u3`xE~ta*TVm
z@P#s{wbpyG(qLt_jl>_^U3;?o6!A$Dz6yX@3~Z2u?M((P>J8G~lNb>fSRdMW##Yfi
zf$L6;h&$&xlO#AlJzcRpQciK+jjLMFCSp>rR(hP?P1Hh~5!VF>)r;0*>SX8lW2PA!
z_k9<ra+^tb!d$e|&g!j6wa_DOpcdUG<BDnN0A}0~C90=6whp@EjZsagl8w0HwCZQF
zXpebGpNwSe_ms|`=>l|uk1o@WeXFcF{`S~u#4oI6z%?EAIM@IH002ovPDHLkV1goJ
Bq7eW9

diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index 0f83bbde6..e74348595 100644
--- a/themes/default/shade-toggled-active.xpm
+++ b/themes/default/shade-toggled-active.xpm
@@ -8,8 +8,8 @@ static char * shade_toggled_active_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@##@@@@@@+",
@@ -22,5 +22,5 @@ static char * shade_toggled_active_xpm[] = {
 "+@@@@@@##@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/shade-toggled-inactive.png b/themes/default/shade-toggled-inactive.png
index 2c419d7a3c55f1cd7e5e20c86e108419f59173cc..db794deeece89208bcc91568e5ba63c24f2f0625 100644
GIT binary patch
delta 293
zcmV+=0owkQ1J(kNI)4BF0002_L%V+f008?*L_t(|+SQY>al|kT1ovjXjdv<_<}XR5
zN$I-=i_XpgK#HV4@r)BIf<O+iz#ZY=f2zUr<GBK0kn+fJW*IqiGFaT-?t3e69LI{{
z#|9*1W6_GtT@5VDvfltoDY(a}D48+QHOL}%UcLdGXBk=v@PAC92;>ne2+p(dTN+7T
z<r-lvP=dhMju46~_BC|BfGim!lyjPTj9)Bh8ljvx+Q!_S!cs!WS*Im>g0Ix?_Xf%(
zevXobdy>GIP$bT)oU@FRX_N{7Fwl503Cgg&T*si8b(zUjYxgQ7m-?>0x;CC_u=z2)
rKOU>bmd&oJULNSUwr$)0<T-x>zJ!kTn~*~v00000NkvXXu0mjf=CF(9

delta 355
zcmV-p0i6EU0+a)gI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{Vf>{ZNzu009w6L_t(|+NF~*mc%d!L%;U<Rylu8Gj&L*Edbjyc{|Ozv4brT
zLXmC$vwryJ8WGXwBe@u%uOR1}6F{%m3*Z1l1N*pz7PvxrIDf|#ap)u3`xE~ta*TVm
z@P#s{wbpyG(qLt_jl>_^U3;?o6!A$Dz6yX@3~Z2u?M((P>J8G~lNb>fSRdMW##Yfi
zf$L6;h&$&xlO#AlJzcRpQciK+jjLMFCSp>rR(hP?P1Hh~5!VF>)r;0*>SX8lW2PA!
z_k9<ra+^tb!d$e|&g!j6wa_DOpcdUG<BDnN0A}0~C90=6whp@EjZsagl8w0HwCZQF
zXpebGpNwSe_ms|`=>l|uk1o@WeXFcF{`S~u#4oI6z%?EAIM@IH002ovPDHLkV1heY
Bq9XtR

diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index 3977170e8..5d6dd825f 100644
--- a/themes/default/shade-toggled-inactive.xpm
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -8,8 +8,8 @@ static char * shade_toggled_inactive_xpm[] = {
 "#	c #949595 s inactive_shadow_1",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@##@@@@@@+",
@@ -22,5 +22,5 @@ static char * shade_toggled_inactive_xpm[] = {
 "+@@@@@@##@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/shade-toggled-pressed.png b/themes/default/shade-toggled-pressed.png
index c4222e8bfc6cdabdd880df6fd386d05766f520f9..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*t1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jz2aijnM

delta 366
zcmV-!0g?X10-pnrI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{g26*VH!v00A6HL_t(|+Le<#as(j^L|?mzkS{pN`gn7}b=(dRpxKYBmH>ok
zP)llbyZs=H0TAG^inIY2KSl-jMY#%|2H1HdHpUC*oEtN~IDdq&jb`LzVF`Jxcm+HS
zw1^IHWZV+(aXg(Iz}X_=*rb#gqZv)*0k2$#X&)_m2Tjt>G6-v+S8Y~ll8MGyiwKHu
zl*xWU`eB!ZT92TRy3oA%AGf)VB3}Bu0oLfzFlLp;p)DlSqDNK1wdhMo^U*1!jV&qs
zKi;*s^@ts;s%KC`V6uvTi&J@_ea|+|o?ANudF{uS@I~!Ah4=D%=C6D=-7R`hS$;ZN
zk3O0+^`jbiYQy6bmtr}=y8qtC$8gn0UX`aPU$;V>@<tpVvOfX-0Fw%f+Gc!jLI3~&
M07*qoM6N<$g1%Fs(EtDd

diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index a3e0621a6..c385308a7 100644
--- a/themes/default/shade-toggled-pressed.xpm
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -8,8 +8,8 @@ static char * shade_toggled_pressed_xpm[] = {
 "#	c #FFFFFF",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@##@@@@@@+",
@@ -22,5 +22,5 @@ static char * shade_toggled_pressed_xpm[] = {
 "+@@@@@@##@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/stick-active.png b/themes/default/stick-active.png
index 2c419d7a3c55f1cd7e5e20c86e108419f59173cc..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*i1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jPbahU)B

delta 355
zcmV-p0i6EC0+a)gI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{Vf>{ZNzu009w6L_t(|+NF~*mc%d!L%;U<Rylu8Gj&L*Edbjyc{|Ozv4brT
zLXmC$vwryJ8WGXwBe@u%uOR1}6F{%m3*Z1l1N*pz7PvxrIDf|#ap)u3`xE~ta*TVm
z@P#s{wbpyG(qLt_jl>_^U3;?o6!A$Dz6yX@3~Z2u?M((P>J8G~lNb>fSRdMW##Yfi
zf$L6;h&$&xlO#AlJzcRpQciK+jjLMFCSp>rR(hP?P1Hh~5!VF>)r;0*>SX8lW2PA!
z_k9<ra+^tb!d$e|&g!j6wa_DOpcdUG<BDnN0A}0~C90=6whp@EjZsagl8w0HwCZQF
zXpebGpNwSe_ms|`=>l|uk1o@WeXFcF{`S~u#4oI6z%?EAIM@IH002ovPDHLkV1goJ
Bq7eW9

diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index e8ba14e55..f6f326ca4 100644
--- a/themes/default/stick-active.xpm
+++ b/themes/default/stick-active.xpm
@@ -9,8 +9,8 @@ static char * stick_active_xpm[] = {
 "$	c #FFFFFF",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@#$$$$#@@@@+",
@@ -23,5 +23,5 @@ static char * stick_active_xpm[] = {
 "+@@@@#$$$$#@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/stick-inactive.png b/themes/default/stick-inactive.png
index 2c419d7a3c55f1cd7e5e20c86e108419f59173cc..db794deeece89208bcc91568e5ba63c24f2f0625 100644
GIT binary patch
delta 293
zcmV+=0owkQ1J(kNI)4BF0002_L%V+f008?*L_t(|+SQY>al|kT1ovjXjdv<_<}XR5
zN$I-=i_XpgK#HV4@r)BIf<O+iz#ZY=f2zUr<GBK0kn+fJW*IqiGFaT-?t3e69LI{{
z#|9*1W6_GtT@5VDvfltoDY(a}D48+QHOL}%UcLdGXBk=v@PAC92;>ne2+p(dTN+7T
z<r-lvP=dhMju46~_BC|BfGim!lyjPTj9)Bh8ljvx+Q!_S!cs!WS*Im>g0Ix?_Xf%(
zevXobdy>GIP$bT)oU@FRX_N{7Fwl503Cgg&T*si8b(zUjYxgQ7m-?>0x;CC_u=z2)
rKOU>bmd&oJULNSUwr$)0<T-x>zJ!kTn~*~v00000NkvXXu0mjf=CF(9

delta 355
zcmV-p0i6EU0+a)gI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{Vf>{ZNzu009w6L_t(|+NF~*mc%d!L%;U<Rylu8Gj&L*Edbjyc{|Ozv4brT
zLXmC$vwryJ8WGXwBe@u%uOR1}6F{%m3*Z1l1N*pz7PvxrIDf|#ap)u3`xE~ta*TVm
z@P#s{wbpyG(qLt_jl>_^U3;?o6!A$Dz6yX@3~Z2u?M((P>J8G~lNb>fSRdMW##Yfi
zf$L6;h&$&xlO#AlJzcRpQciK+jjLMFCSp>rR(hP?P1Hh~5!VF>)r;0*>SX8lW2PA!
z_k9<ra+^tb!d$e|&g!j6wa_DOpcdUG<BDnN0A}0~C90=6whp@EjZsagl8w0HwCZQF
zXpebGpNwSe_ms|`=>l|uk1o@WeXFcF{`S~u#4oI6z%?EAIM@IH002ovPDHLkV1heY
Bq9XtR

diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index 64f9214e6..7fa933182 100644
--- a/themes/default/stick-inactive.xpm
+++ b/themes/default/stick-inactive.xpm
@@ -9,8 +9,8 @@ static char * stick_inactive_xpm[] = {
 "$	c #949595 s inactive_shadow_1",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@#$$$$#@@@@+",
@@ -23,5 +23,5 @@ static char * stick_inactive_xpm[] = {
 "+@@@@#$$$$#@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/stick-pressed.png b/themes/default/stick-pressed.png
index c4222e8bfc6cdabdd880df6fd386d05766f520f9..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*t1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jz2aijnM

delta 366
zcmV-!0g?X10-pnrI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{g26*VH!v00A6HL_t(|+Le<#as(j^L|?mzkS{pN`gn7}b=(dRpxKYBmH>ok
zP)llbyZs=H0TAG^inIY2KSl-jMY#%|2H1HdHpUC*oEtN~IDdq&jb`LzVF`Jxcm+HS
zw1^IHWZV+(aXg(Iz}X_=*rb#gqZv)*0k2$#X&)_m2Tjt>G6-v+S8Y~ll8MGyiwKHu
zl*xWU`eB!ZT92TRy3oA%AGf)VB3}Bu0oLfzFlLp;p)DlSqDNK1wdhMo^U*1!jV&qs
zKi;*s^@ts;s%KC`V6uvTi&J@_ea|+|o?ANudF{uS@I~!Ah4=D%=C6D=-7R`hS$;ZN
zk3O0+^`jbiYQy6bmtr}=y8qtC$8gn0UX`aPU$;V>@<tpVvOfX-0Fw%f+Gc!jLI3~&
M07*qoM6N<$g1%Fs(EtDd

diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index 0c86058e6..3cb42bb23 100644
--- a/themes/default/stick-pressed.xpm
+++ b/themes/default/stick-pressed.xpm
@@ -9,8 +9,8 @@ static char * stick_pressed_xpm[] = {
 "$	c #FFFFFF",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@+$$$$+@@@@+",
@@ -23,5 +23,5 @@ static char * stick_pressed_xpm[] = {
 "+@@@@+$$$$+@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/stick-toggled-active.png b/themes/default/stick-toggled-active.png
index 2c419d7a3c55f1cd7e5e20c86e108419f59173cc..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*i1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jPbahU)B

delta 355
zcmV-p0i6EC0+a)gI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{Vf>{ZNzu009w6L_t(|+NF~*mc%d!L%;U<Rylu8Gj&L*Edbjyc{|Ozv4brT
zLXmC$vwryJ8WGXwBe@u%uOR1}6F{%m3*Z1l1N*pz7PvxrIDf|#ap)u3`xE~ta*TVm
z@P#s{wbpyG(qLt_jl>_^U3;?o6!A$Dz6yX@3~Z2u?M((P>J8G~lNb>fSRdMW##Yfi
zf$L6;h&$&xlO#AlJzcRpQciK+jjLMFCSp>rR(hP?P1Hh~5!VF>)r;0*>SX8lW2PA!
z_k9<ra+^tb!d$e|&g!j6wa_DOpcdUG<BDnN0A}0~C90=6whp@EjZsagl8w0HwCZQF
zXpebGpNwSe_ms|`=>l|uk1o@WeXFcF{`S~u#4oI6z%?EAIM@IH002ovPDHLkV1goJ
Bq7eW9

diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index d6850c511..cb271351b 100644
--- a/themes/default/stick-toggled-active.xpm
+++ b/themes/default/stick-toggled-active.xpm
@@ -9,8 +9,8 @@ static char * stick_toggled_active_xpm[] = {
 "$	c #FFFFFF",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@#$$$$#@@@@+",
@@ -23,5 +23,5 @@ static char * stick_toggled_active_xpm[] = {
 "+@@@@#$$$$#@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/stick-toggled-inactive.png b/themes/default/stick-toggled-inactive.png
index 2c419d7a3c55f1cd7e5e20c86e108419f59173cc..db794deeece89208bcc91568e5ba63c24f2f0625 100644
GIT binary patch
delta 293
zcmV+=0owkQ1J(kNI)4BF0002_L%V+f008?*L_t(|+SQY>al|kT1ovjXjdv<_<}XR5
zN$I-=i_XpgK#HV4@r)BIf<O+iz#ZY=f2zUr<GBK0kn+fJW*IqiGFaT-?t3e69LI{{
z#|9*1W6_GtT@5VDvfltoDY(a}D48+QHOL}%UcLdGXBk=v@PAC92;>ne2+p(dTN+7T
z<r-lvP=dhMju46~_BC|BfGim!lyjPTj9)Bh8ljvx+Q!_S!cs!WS*Im>g0Ix?_Xf%(
zevXobdy>GIP$bT)oU@FRX_N{7Fwl503Cgg&T*si8b(zUjYxgQ7m-?>0x;CC_u=z2)
rKOU>bmd&oJULNSUwr$)0<T-x>zJ!kTn~*~v00000NkvXXu0mjf=CF(9

delta 355
zcmV-p0i6EU0+a)gI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{Vf>{ZNzu009w6L_t(|+NF~*mc%d!L%;U<Rylu8Gj&L*Edbjyc{|Ozv4brT
zLXmC$vwryJ8WGXwBe@u%uOR1}6F{%m3*Z1l1N*pz7PvxrIDf|#ap)u3`xE~ta*TVm
z@P#s{wbpyG(qLt_jl>_^U3;?o6!A$Dz6yX@3~Z2u?M((P>J8G~lNb>fSRdMW##Yfi
zf$L6;h&$&xlO#AlJzcRpQciK+jjLMFCSp>rR(hP?P1Hh~5!VF>)r;0*>SX8lW2PA!
z_k9<ra+^tb!d$e|&g!j6wa_DOpcdUG<BDnN0A}0~C90=6whp@EjZsagl8w0HwCZQF
zXpebGpNwSe_ms|`=>l|uk1o@WeXFcF{`S~u#4oI6z%?EAIM@IH002ovPDHLkV1heY
Bq9XtR

diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 20c0a4d25..46dd111b9 100644
--- a/themes/default/stick-toggled-inactive.xpm
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -9,8 +9,8 @@ static char * stick_toggled_inactive_xpm[] = {
 "$	c #949595 s inactive_shadow_1",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@#$$$$#@@@@+",
@@ -23,5 +23,5 @@ static char * stick_toggled_inactive_xpm[] = {
 "+@@@@#$$$$#@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/stick-toggled-pressed.png b/themes/default/stick-toggled-pressed.png
index c4222e8bfc6cdabdd880df6fd386d05766f520f9..da0be437623fb905a671353e90b688a2534bbe96 100644
GIT binary patch
delta 275
zcmV+u0qp*t1H=N5I)4BF0002_L%V+f008MpL_t(|+SOAr5`!=dlkXS^WBEkBSOx|b
zzQ`x&7u3PAV@ONydR>|+7}=I(1^D|TcA2JoCN)3-Ktl*X7AQS&UDwSEEX$J7Kt7*&
zp0^GFQc7QsPzx{)6i#4IF-Qdm2Jb3ZG9i#E4cRiV4qmFLs(-17%KEJXfIcM+QM}U;
zjxYnYu7nYWlzdYLR)!i7LKC4Yl}5x~HL%_+Bxyb<-9;GId=imh)v!3pJ>=A?(56Ba
z(Pj(oquWxGou7ycR7C7wIGn9BeZKlf84N=a$B6Or^$5=!0`S=P%*!{&!{>M#x1T)c
ZCzNVrQxG(Q%?tnl002ovPDHLkV1jz2aijnM

delta 366
zcmV-!0g?X10-pnrI)DEF{{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`
z2h;=x1{g26*VH!v00A6HL_t(|+Le<#as(j^L|?mzkS{pN`gn7}b=(dRpxKYBmH>ok
zP)llbyZs=H0TAG^inIY2KSl-jMY#%|2H1HdHpUC*oEtN~IDdq&jb`LzVF`Jxcm+HS
zw1^IHWZV+(aXg(Iz}X_=*rb#gqZv)*0k2$#X&)_m2Tjt>G6-v+S8Y~ll8MGyiwKHu
zl*xWU`eB!ZT92TRy3oA%AGf)VB3}Bu0oLfzFlLp;p)DlSqDNK1wdhMo^U*1!jV&qs
zKi;*s^@ts;s%KC`V6uvTi&J@_ea|+|o?ANudF{uS@I~!Ah4=D%=C6D=-7R`hS$;ZN
zk3O0+^`jbiYQy6bmtr}=y8qtC$8gn0UX`aPU$;V>@<tpVvOfX-0Fw%f+Gc!jLI3~&
M07*qoM6N<$g1%Fs(EtDd

diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index a1059fb4c..483fce213 100644
--- a/themes/default/stick-toggled-pressed.xpm
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -9,8 +9,8 @@ static char * stick_toggled_pressed_xpm[] = {
 "$	c #FFFFFF",
 "                ",
 "                ",
-"..++++++++++++..",
-".+@@@@@@@@@@@@+.",
+"  ++++++++++++  ",
+" +@@@@@@@@@@@@+ ",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@+$$$$+@@@@+",
@@ -23,5 +23,5 @@ static char * stick_toggled_pressed_xpm[] = {
 "+@@@@+$$$$+@@@@+",
 "+@@@@@@@@@@@@@@+",
 "+@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@+.",
-"..++++++++++++.."};
+" +@@@@@@@@@@@@+ ",
+"  ++++++++++++  "};
diff --git a/themes/default/themerc b/themes/default/themerc
index 4f24fccfe..632749489 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -1,6 +1,6 @@
 button_offset=0
 button_spacing=2
-full_width_title=false
+full_width_title=true
 title_horizontal_offset=0
 title_vertical_offset_active=3
 title_vertical_offset_inactive=3
diff --git a/themes/default/title-1-active.png b/themes/default/title-1-active.png
index 8240f0adea812175486aa53b290bbed797eb385a..46495dc8167f689003e5b2a0db6a76617bb5fca2 100644
GIT binary patch
delta 185
zcmeyt_=$0X3O`$tx4R1i82ohJT|d!Tv0lhbHbJA^94J=r>EaktajUi8kdN7sgZa47
zU8nk;|DT@zExVi{wkUAP1qDeq=^t8e_s%zeSRtd%AjYH={*5KkCq&iELpdev@H?@Y
zmBl}GISiy0etP7%IkB-vaN_C-2PAx+GbA%h9l4<X*S@_&DkVu^^{PbU_vuPJVjXU`
k<PW@G5-yqY`_GnIMh*=%EADrG$3gD%boFyt=akR{09y)15dZ)H

delta 191
zcmV;w06_op0r&xsBp(E4K}|sb0I`n?{9y$E000JJOGiWi{{a60|De66laVtae+CFK
z2panZ0001WNkl<Zc-n=JF%APk2*f<nb_XB0|Nqk|K)EPILWL|01AJAg>&6G1s+!Ia
z;M6rB1d-ESC?pH2dX?`T`~m?a3%Yo6WG4(nB%HdM1VoU@0ir-w5oV?TbA;2YYz)rT
tJ+kckRRqC67-bIlBz>0<_5M8j6#{5HBvk|=&Pf0O002ovPDHLkV1jrwNcR8$

diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png
index 8240f0adea812175486aa53b290bbed797eb385a..46495dc8167f689003e5b2a0db6a76617bb5fca2 100644
GIT binary patch
delta 185
zcmeyt_=$0X3O`$tx4R1i82ohJT|d!Tv0lhbHbJA^94J=r>EaktajUi8kdN7sgZa47
zU8nk;|DT@zExVi{wkUAP1qDeq=^t8e_s%zeSRtd%AjYH={*5KkCq&iELpdev@H?@Y
zmBl}GISiy0etP7%IkB-vaN_C-2PAx+GbA%h9l4<X*S@_&DkVu^^{PbU_vuPJVjXU`
k<PW@G5-yqY`_GnIMh*=%EADrG$3gD%boFyt=akR{09y)15dZ)H

delta 191
zcmV;w06_op0r&xsBp(E4K}|sb0I`n?{9y$E000JJOGiWi{{a60|De66laVtae+CFK
z2panZ0001WNkl<Zc-n=JF%APk2*f<nb_XB0|Nqk|K)EPILWL|01AJAg>&6G1s+!Ia
z;M6rB1d-ESC?pH2dX?`T`~m?a3%Yo6WG4(nB%HdM1VoU@0ir-w5oV?TbA;2YYz)rT
tJ+kckRRqC67-bIlBz>0<_5M8j6#{5HBvk|=&Pf0O002ovPDHLkV1jrwNcR8$

diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png
index 8240f0adea812175486aa53b290bbed797eb385a..46495dc8167f689003e5b2a0db6a76617bb5fca2 100644
GIT binary patch
delta 185
zcmeyt_=$0X3O`$tx4R1i82ohJT|d!Tv0lhbHbJA^94J=r>EaktajUi8kdN7sgZa47
zU8nk;|DT@zExVi{wkUAP1qDeq=^t8e_s%zeSRtd%AjYH={*5KkCq&iELpdev@H?@Y
zmBl}GISiy0etP7%IkB-vaN_C-2PAx+GbA%h9l4<X*S@_&DkVu^^{PbU_vuPJVjXU`
k<PW@G5-yqY`_GnIMh*=%EADrG$3gD%boFyt=akR{09y)15dZ)H

delta 191
zcmV;w06_op0r&xsBp(E4K}|sb0I`n?{9y$E000JJOGiWi{{a60|De66laVtae+CFK
z2panZ0001WNkl<Zc-n=JF%APk2*f<nb_XB0|Nqk|K)EPILWL|01AJAg>&6G1s+!Ia
z;M6rB1d-ESC?pH2dX?`T`~m?a3%Yo6WG4(nB%HdM1VoU@0ir-w5oV?TbA;2YYz)rT
tJ+kckRRqC67-bIlBz>0<_5M8j6#{5HBvk|=&Pf0O002ovPDHLkV1jrwNcR8$

diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png
index 8240f0adea812175486aa53b290bbed797eb385a..46495dc8167f689003e5b2a0db6a76617bb5fca2 100644
GIT binary patch
delta 185
zcmeyt_=$0X3O`$tx4R1i82ohJT|d!Tv0lhbHbJA^94J=r>EaktajUi8kdN7sgZa47
zU8nk;|DT@zExVi{wkUAP1qDeq=^t8e_s%zeSRtd%AjYH={*5KkCq&iELpdev@H?@Y
zmBl}GISiy0etP7%IkB-vaN_C-2PAx+GbA%h9l4<X*S@_&DkVu^^{PbU_vuPJVjXU`
k<PW@G5-yqY`_GnIMh*=%EADrG$3gD%boFyt=akR{09y)15dZ)H

delta 191
zcmV;w06_op0r&xsBp(E4K}|sb0I`n?{9y$E000JJOGiWi{{a60|De66laVtae+CFK
z2panZ0001WNkl<Zc-n=JF%APk2*f<nb_XB0|Nqk|K)EPILWL|01AJAg>&6G1s+!Ia
z;M6rB1d-ESC?pH2dX?`T`~m?a3%Yo6WG4(nB%HdM1VoU@0ir-w5oV?TbA;2YYz)rT
tJ+kckRRqC67-bIlBz>0<_5M8j6#{5HBvk|=&Pf0O002ovPDHLkV1jrwNcR8$

diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png
index 8240f0adea812175486aa53b290bbed797eb385a..46495dc8167f689003e5b2a0db6a76617bb5fca2 100644
GIT binary patch
delta 185
zcmeyt_=$0X3O`$tx4R1i82ohJT|d!Tv0lhbHbJA^94J=r>EaktajUi8kdN7sgZa47
zU8nk;|DT@zExVi{wkUAP1qDeq=^t8e_s%zeSRtd%AjYH={*5KkCq&iELpdev@H?@Y
zmBl}GISiy0etP7%IkB-vaN_C-2PAx+GbA%h9l4<X*S@_&DkVu^^{PbU_vuPJVjXU`
k<PW@G5-yqY`_GnIMh*=%EADrG$3gD%boFyt=akR{09y)15dZ)H

delta 191
zcmV;w06_op0r&xsBp(E4K}|sb0I`n?{9y$E000JJOGiWi{{a60|De66laVtae+CFK
z2panZ0001WNkl<Zc-n=JF%APk2*f<nb_XB0|Nqk|K)EPILWL|01AJAg>&6G1s+!Ia
z;M6rB1d-ESC?pH2dX?`T`~m?a3%Yo6WG4(nB%HdM1VoU@0ir-w5oV?TbA;2YYz)rT
tJ+kckRRqC67-bIlBz>0<_5M8j6#{5HBvk|=&Pf0O002ovPDHLkV1jrwNcR8$

diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png
index 27b9e1232ebd32a097d86a752c224770e5e962f1..224241e8fb40dc1134963abbca6a0af1e310ce5d 100644
GIT binary patch
delta 259
zcmV+e0sQ{40=xo{Bo78+OGiWi000000Qp0^f008We-bzlfEv~W0002VNkl<Zc-oDU
zv5vw(3`E~Z>G1x*)<>UD;A*~?8d~_NxgzUb>ktyIGLAiYV@14IuR{3{5j{Jv=j)pN
zZ4ER8+#mPr<@a*KLe=5?bMD5)S{NS#`@VN+HEc+|0kqbb%jxOD5D|Q;?*>{#;y`i?
zy#bu2X@fvsJSZI+$ZOY{`e0~*$xR_K^?*EK1Jd}irydN)nel<)Jcmn)FYh2qgq0#9
z=83gfi$e?W*w=6wdNEi9&{J>uvv|B(2lqdQ5_6U_uH8Sy`~#H~MF3>C++qL#002ov
JPDHLkV1lujb-e%p

delta 248
zcmV<U00;lP0<i*+Bp(E4K}|sb0I`n?{9y$E000JJOGiWi{{a60|De66laVtae+4ch
zIy<*800024Nkl<Zc-obc!4AVP2t#d&Tg?yb|NqlFKpL`Y(#9z-)WmU0JnJ=qN&y}X
zVle<9B-P5S9({1=QVR(W>Eg%~Y`n<YAOIU!98&hkTYB*J@TGqHpl-HjPmYm88K4iY
z39iPi9UQt6Bq{@U0)rz{01O)dPT41K4oUF3elI5fo5RObf{5%RRt(%;Yr>UTDz~0I
yxRW$s4uhK`+k?Bc1NTnyE|2GKrtQa%I_nL*uuF>d!4*gV0000<MNUMnLSTaQl4r#L

diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
index 46cd2332521571a9db79fabce1a26904afa2b0d8..c37957804893562cee896e1a35e108b39f3f0002 100644
GIT binary patch
delta 267
zcmV+m0rdW{0>lE4Bo78+OGiWi000000Qp0^f008We-b$%$lvFG0002dNkl<Zc-obc
zF_MEY3`O6cp^M!cY7USz+$cxfbI>sq)SQ4`DJ&7QMK<foZ>+DcuQB{_v@FXrV49|%
z<2d$9Md`~>`ZAQ#59_)<gU=4*I1T_p7<LM`ZQB9#c-#jwkZOT|;CY_+E~Q*0Ar=?z
zQc53FaeP-GaCgpIaF=p=`y-Gw938AaoLc8vaLY*49hh$<80d0NfMEtm?(7^E7V-UJ
z%{u<O2XTo2blEMUr{1&Hf?Lj2Wv-V_ZZ>IPY6f%;3lHYMf`)$&+2;E;<_nt<PKa34
RaxDM=002ovPDHLkV1kt4bO-<d

delta 248
zcmV<U00;lX0<i*+Bp(E4K}|sb0I`n?{9y$E000JJOGiWi{{a60|De66laVtae+C8|
z(?*K^00024Nkl<Zc-obbu@S>C3<Do`>P#-+{b%zUNFmCii(DL5e8~_<7=Dx@<HY@h
ztMiD6*;xp%d=_5<MjTN>;U--?G6Nf=c_3JP8ebzK%i@+kc+c>q-hCh_ckXWSh>Y!z
zKz{Ii!SmwQHXd;#5;Fr=0*yyzP5{ORq;lRoA_A}VtLgl24r-Cs7FiZ62JKnr3rFTu
yx%AS5D@lXZ2HZTdW^i5Yz`c{a%k6i+UGoFwJWES~a^5xo0000<MNUMnLSTXwYif`H

diff --git a/themes/opta/Makefile.am b/themes/opta/Makefile.am
index 52467595c..f4214e081 100644
--- a/themes/opta/Makefile.am
+++ b/themes/opta/Makefile.am
@@ -1,55 +1,56 @@
 themedir = $(datadir)/themes/Opta/xfwm4
-theme_DATA = README \
-	bottom-active.xpm \
-	bottom-inactive.xpm \
-	bottom-left-active.xpm \
-	bottom-left-inactive.xpm \
-	bottom-right-active.xpm \
-	bottom-right-inactive.xpm \
-	close-active.xpm \
-	close-inactive.xpm \
-	close-pressed.xpm \
-	hide-active.xpm \
-	hide-inactive.xpm \
-	hide-pressed.xpm \
-	left-active.xpm \
-	left-inactive.xpm \
-	maximize-active.xpm \
-	maximize-inactive.xpm \
-	maximize-pressed.xpm \
-        maximize-toggled-active.xpm \
-        maximize-toggled-inactive.xpm \
-        maximize-toggled-pressed.xpm \
-	menu-active.xpm \
-	menu-inactive.xpm \
-	menu-pressed.xpm \
-	right-active.xpm \
-	right-inactive.xpm \
-	shade-active.xpm \
-	shade-inactive.xpm \
-	shade-pressed.xpm \
-        shade-toggled-active.xpm \
-        shade-toggled-inactive.xpm \
-        shade-toggled-pressed.xpm \
-	stick-active.xpm \
-	stick-inactive.xpm \
-	stick-pressed.xpm \
-        stick-toggled-active.xpm \
-        stick-toggled-inactive.xpm \
-        stick-toggled-pressed.xpm \
-	themerc \
-	title-1-active.xpm \
-	title-1-inactive.xpm \
-	title-2-active.xpm \
-	title-2-inactive.xpm \
-	title-3-active.xpm \
-	title-3-inactive.xpm \
-	title-4-active.xpm \
-	title-4-inactive.xpm \
-	title-5-active.xpm \
-	title-5-inactive.xpm \
-	top-left-active.xpm \
-	top-left-inactive.xpm \
-	top-right-active.xpm \
+theme_DATA = \
+	README 								\
+	themerc 							\
+	bottom-active.xpm 						\
+	bottom-inactive.xpm 						\
+	bottom-left-active.xpm 						\
+	bottom-left-inactive.xpm 					\
+	bottom-right-active.xpm 					\
+	bottom-right-inactive.xpm 					\
+	close-active.xpm 						\
+	close-inactive.xpm 						\
+	close-pressed.xpm 						\
+	hide-active.xpm 						\
+	hide-inactive.xpm 						\
+	hide-pressed.xpm 						\
+	left-active.xpm 						\
+	left-inactive.xpm 						\
+	maximize-active.xpm 						\
+	maximize-inactive.xpm 						\
+	maximize-pressed.xpm 						\
+        maximize-toggled-active.xpm 					\
+        maximize-toggled-inactive.xpm 					\
+        maximize-toggled-pressed.xpm 					\
+	menu-active.xpm 						\
+	menu-inactive.xpm 						\
+	menu-pressed.xpm 						\
+	right-active.xpm 						\
+	right-inactive.xpm 						\
+	shade-active.xpm 						\
+	shade-inactive.xpm 						\
+	shade-pressed.xpm 						\
+        shade-toggled-active.xpm 					\
+        shade-toggled-inactive.xpm 					\
+        shade-toggled-pressed.xpm 					\
+	stick-active.xpm 						\
+	stick-inactive.xpm 						\
+	stick-pressed.xpm 						\
+        stick-toggled-active.xpm 					\
+        stick-toggled-inactive.xpm 					\
+        stick-toggled-pressed.xpm 					\
+	title-1-active.xpm 						\
+	title-1-inactive.xpm 						\
+	title-2-active.xpm 						\
+	title-2-inactive.xpm 						\
+	title-3-active.xpm 						\
+	title-3-inactive.xpm 						\
+	title-4-active.xpm 						\
+	title-4-inactive.xpm 						\
+	title-5-active.xpm 						\
+	title-5-inactive.xpm 						\
+	top-left-active.xpm 						\
+	top-left-inactive.xpm 						\
+	top-right-active.xpm 						\
 	top-right-inactive.xpm
 EXTRA_DIST = $(theme_DATA)
diff --git a/themes/opta/Makefile.in b/themes/opta/Makefile.in
index c831a1ab3..97aa74e2a 100644
--- a/themes/opta/Makefile.in
+++ b/themes/opta/Makefile.in
@@ -198,58 +198,59 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 themedir = $(datadir)/themes/Opta/xfwm4
-theme_DATA = README \
-	bottom-active.xpm \
-	bottom-inactive.xpm \
-	bottom-left-active.xpm \
-	bottom-left-inactive.xpm \
-	bottom-right-active.xpm \
-	bottom-right-inactive.xpm \
-	close-active.xpm \
-	close-inactive.xpm \
-	close-pressed.xpm \
-	hide-active.xpm \
-	hide-inactive.xpm \
-	hide-pressed.xpm \
-	left-active.xpm \
-	left-inactive.xpm \
-	maximize-active.xpm \
-	maximize-inactive.xpm \
-	maximize-pressed.xpm \
-        maximize-toggled-active.xpm \
-        maximize-toggled-inactive.xpm \
-        maximize-toggled-pressed.xpm \
-	menu-active.xpm \
-	menu-inactive.xpm \
-	menu-pressed.xpm \
-	right-active.xpm \
-	right-inactive.xpm \
-	shade-active.xpm \
-	shade-inactive.xpm \
-	shade-pressed.xpm \
-        shade-toggled-active.xpm \
-        shade-toggled-inactive.xpm \
-        shade-toggled-pressed.xpm \
-	stick-active.xpm \
-	stick-inactive.xpm \
-	stick-pressed.xpm \
-        stick-toggled-active.xpm \
-        stick-toggled-inactive.xpm \
-        stick-toggled-pressed.xpm \
-	themerc \
-	title-1-active.xpm \
-	title-1-inactive.xpm \
-	title-2-active.xpm \
-	title-2-inactive.xpm \
-	title-3-active.xpm \
-	title-3-inactive.xpm \
-	title-4-active.xpm \
-	title-4-inactive.xpm \
-	title-5-active.xpm \
-	title-5-inactive.xpm \
-	top-left-active.xpm \
-	top-left-inactive.xpm \
-	top-right-active.xpm \
+theme_DATA = \
+	README 								\
+	themerc 							\
+	bottom-active.xpm 						\
+	bottom-inactive.xpm 						\
+	bottom-left-active.xpm 						\
+	bottom-left-inactive.xpm 					\
+	bottom-right-active.xpm 					\
+	bottom-right-inactive.xpm 					\
+	close-active.xpm 						\
+	close-inactive.xpm 						\
+	close-pressed.xpm 						\
+	hide-active.xpm 						\
+	hide-inactive.xpm 						\
+	hide-pressed.xpm 						\
+	left-active.xpm 						\
+	left-inactive.xpm 						\
+	maximize-active.xpm 						\
+	maximize-inactive.xpm 						\
+	maximize-pressed.xpm 						\
+        maximize-toggled-active.xpm 					\
+        maximize-toggled-inactive.xpm 					\
+        maximize-toggled-pressed.xpm 					\
+	menu-active.xpm 						\
+	menu-inactive.xpm 						\
+	menu-pressed.xpm 						\
+	right-active.xpm 						\
+	right-inactive.xpm 						\
+	shade-active.xpm 						\
+	shade-inactive.xpm 						\
+	shade-pressed.xpm 						\
+        shade-toggled-active.xpm 					\
+        shade-toggled-inactive.xpm 					\
+        shade-toggled-pressed.xpm 					\
+	stick-active.xpm 						\
+	stick-inactive.xpm 						\
+	stick-pressed.xpm 						\
+        stick-toggled-active.xpm 					\
+        stick-toggled-inactive.xpm 					\
+        stick-toggled-pressed.xpm 					\
+	title-1-active.xpm 						\
+	title-1-inactive.xpm 						\
+	title-2-active.xpm 						\
+	title-2-inactive.xpm 						\
+	title-3-active.xpm 						\
+	title-3-inactive.xpm 						\
+	title-4-active.xpm 						\
+	title-4-inactive.xpm 						\
+	title-5-active.xpm 						\
+	title-5-inactive.xpm 						\
+	top-left-active.xpm 						\
+	top-left-inactive.xpm 						\
+	top-right-active.xpm 						\
 	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
diff --git a/themes/synthetic/Makefile.am b/themes/synthetic/Makefile.am
index e2daaf24a..9919067f6 100644
--- a/themes/synthetic/Makefile.am
+++ b/themes/synthetic/Makefile.am
@@ -1,55 +1,56 @@
 themedir = $(datadir)/themes/Synthetic/xfwm4
-theme_DATA = README \
-	bottom-active.xpm \
-	bottom-inactive.xpm \
-	bottom-left-active.xpm \
-	bottom-left-inactive.xpm \
-	bottom-right-active.xpm \
-	bottom-right-inactive.xpm \
-	close-active.xpm \
-	close-inactive.xpm \
-	close-pressed.xpm \
-	hide-active.xpm \
-	hide-inactive.xpm \
-	hide-pressed.xpm \
-	left-active.xpm \
-	left-inactive.xpm \
-	maximize-active.xpm \
-	maximize-inactive.xpm \
-	maximize-pressed.xpm \
-        maximize-toggled-active.xpm \
-        maximize-toggled-inactive.xpm \
-        maximize-toggled-pressed.xpm \
-	menu-active.xpm \
-	menu-inactive.xpm \
-	menu-pressed.xpm \
-	right-active.xpm \
-	right-inactive.xpm \
-	shade-active.xpm \
-	shade-inactive.xpm \
-	shade-pressed.xpm \
-        shade-toggled-active.xpm \
-        shade-toggled-inactive.xpm \
-        shade-toggled-pressed.xpm \
-	stick-active.xpm \
-	stick-inactive.xpm \
-	stick-pressed.xpm \
-        stick-toggled-active.xpm \
-        stick-toggled-inactive.xpm \
-        stick-toggled-pressed.xpm \
-	themerc \
-	title-1-active.xpm \
-	title-1-inactive.xpm \
-	title-2-active.xpm \
-	title-2-inactive.xpm \
-	title-3-active.xpm \
-	title-3-inactive.xpm \
-	title-4-active.xpm \
-	title-4-inactive.xpm \
-	title-5-active.xpm \
-	title-5-inactive.xpm \
-	top-left-active.xpm \
-	top-left-inactive.xpm \
-	top-right-active.xpm \
+theme_DATA = \
+	README 								\
+	themerc 							\
+	bottom-active.xpm 						\
+	bottom-inactive.xpm 						\
+	bottom-left-active.xpm 						\
+	bottom-left-inactive.xpm 					\
+	bottom-right-active.xpm 					\
+	bottom-right-inactive.xpm 					\
+	close-active.xpm 						\
+	close-inactive.xpm 						\
+	close-pressed.xpm 						\
+	hide-active.xpm 						\
+	hide-inactive.xpm 						\
+	hide-pressed.xpm 						\
+	left-active.xpm 						\
+	left-inactive.xpm 						\
+	maximize-active.xpm 						\
+	maximize-inactive.xpm 						\
+	maximize-pressed.xpm 						\
+        maximize-toggled-active.xpm 					\
+        maximize-toggled-inactive.xpm 					\
+        maximize-toggled-pressed.xpm 					\
+	menu-active.xpm 						\
+	menu-inactive.xpm 						\
+	menu-pressed.xpm 						\
+	right-active.xpm 						\
+	right-inactive.xpm 						\
+	shade-active.xpm 						\
+	shade-inactive.xpm 						\
+	shade-pressed.xpm 						\
+        shade-toggled-active.xpm 					\
+        shade-toggled-inactive.xpm 					\
+        shade-toggled-pressed.xpm 					\
+	stick-active.xpm 						\
+	stick-inactive.xpm 						\
+	stick-pressed.xpm 						\
+        stick-toggled-active.xpm 					\
+        stick-toggled-inactive.xpm 					\
+        stick-toggled-pressed.xpm 					\
+	title-1-active.xpm 						\
+	title-1-inactive.xpm 						\
+	title-2-active.xpm 						\
+	title-2-inactive.xpm 						\
+	title-3-active.xpm 						\
+	title-3-inactive.xpm 						\
+	title-4-active.xpm 						\
+	title-4-inactive.xpm 						\
+	title-5-active.xpm 						\
+	title-5-inactive.xpm 						\
+	top-left-active.xpm 						\
+	top-left-inactive.xpm 						\
+	top-right-active.xpm 						\
 	top-right-inactive.xpm
 EXTRA_DIST = $(theme_DATA)
diff --git a/themes/synthetic/Makefile.in b/themes/synthetic/Makefile.in
index 24aa681a7..e84396454 100644
--- a/themes/synthetic/Makefile.in
+++ b/themes/synthetic/Makefile.in
@@ -198,58 +198,59 @@ sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
 themedir = $(datadir)/themes/Synthetic/xfwm4
-theme_DATA = README \
-	bottom-active.xpm \
-	bottom-inactive.xpm \
-	bottom-left-active.xpm \
-	bottom-left-inactive.xpm \
-	bottom-right-active.xpm \
-	bottom-right-inactive.xpm \
-	close-active.xpm \
-	close-inactive.xpm \
-	close-pressed.xpm \
-	hide-active.xpm \
-	hide-inactive.xpm \
-	hide-pressed.xpm \
-	left-active.xpm \
-	left-inactive.xpm \
-	maximize-active.xpm \
-	maximize-inactive.xpm \
-	maximize-pressed.xpm \
-        maximize-toggled-active.xpm \
-        maximize-toggled-inactive.xpm \
-        maximize-toggled-pressed.xpm \
-	menu-active.xpm \
-	menu-inactive.xpm \
-	menu-pressed.xpm \
-	right-active.xpm \
-	right-inactive.xpm \
-	shade-active.xpm \
-	shade-inactive.xpm \
-	shade-pressed.xpm \
-        shade-toggled-active.xpm \
-        shade-toggled-inactive.xpm \
-        shade-toggled-pressed.xpm \
-	stick-active.xpm \
-	stick-inactive.xpm \
-	stick-pressed.xpm \
-        stick-toggled-active.xpm \
-        stick-toggled-inactive.xpm \
-        stick-toggled-pressed.xpm \
-	themerc \
-	title-1-active.xpm \
-	title-1-inactive.xpm \
-	title-2-active.xpm \
-	title-2-inactive.xpm \
-	title-3-active.xpm \
-	title-3-inactive.xpm \
-	title-4-active.xpm \
-	title-4-inactive.xpm \
-	title-5-active.xpm \
-	title-5-inactive.xpm \
-	top-left-active.xpm \
-	top-left-inactive.xpm \
-	top-right-active.xpm \
+theme_DATA = \
+	README 								\
+	themerc 							\
+	bottom-active.xpm 						\
+	bottom-inactive.xpm 						\
+	bottom-left-active.xpm 						\
+	bottom-left-inactive.xpm 					\
+	bottom-right-active.xpm 					\
+	bottom-right-inactive.xpm 					\
+	close-active.xpm 						\
+	close-inactive.xpm 						\
+	close-pressed.xpm 						\
+	hide-active.xpm 						\
+	hide-inactive.xpm 						\
+	hide-pressed.xpm 						\
+	left-active.xpm 						\
+	left-inactive.xpm 						\
+	maximize-active.xpm 						\
+	maximize-inactive.xpm 						\
+	maximize-pressed.xpm 						\
+        maximize-toggled-active.xpm 					\
+        maximize-toggled-inactive.xpm 					\
+        maximize-toggled-pressed.xpm 					\
+	menu-active.xpm 						\
+	menu-inactive.xpm 						\
+	menu-pressed.xpm 						\
+	right-active.xpm 						\
+	right-inactive.xpm 						\
+	shade-active.xpm 						\
+	shade-inactive.xpm 						\
+	shade-pressed.xpm 						\
+        shade-toggled-active.xpm 					\
+        shade-toggled-inactive.xpm 					\
+        shade-toggled-pressed.xpm 					\
+	stick-active.xpm 						\
+	stick-inactive.xpm 						\
+	stick-pressed.xpm 						\
+        stick-toggled-active.xpm 					\
+        stick-toggled-inactive.xpm 					\
+        stick-toggled-pressed.xpm 					\
+	title-1-active.xpm 						\
+	title-1-inactive.xpm 						\
+	title-2-active.xpm 						\
+	title-2-inactive.xpm 						\
+	title-3-active.xpm 						\
+	title-3-inactive.xpm 						\
+	title-4-active.xpm 						\
+	title-4-inactive.xpm 						\
+	title-5-active.xpm 						\
+	title-5-inactive.xpm 						\
+	top-left-active.xpm 						\
+	top-left-inactive.xpm 						\
+	top-right-active.xpm 						\
 	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
-- 
GitLab