diff --git a/po/xfwm4.pot b/po/xfwm4.pot
index 51d1866c03b0faa6d397f4c4efbd49bea8cce8cc..151367dead6a6233c7022e5d4ba73afdd5104d33 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 14d83651042a8d0ce5132bc9e5ba02dbe64ff678..94dbc2736e201a874d7f5c20f94af01c40d8616a 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 1450dca42fe217d1f9ec6eaea10c83c4378f8799..2dda5a6ebb20ca53d13cf49e6f0313c5f9d03696 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 84020252f135ab3bf4bd0c87488be622d196693e..5c966101a28b1feb9559c1d25a4bc1db229cb6a2 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 f46e6f6b65e4a7be9ada227c968ff0d5b45f4995..3dc64c82218f8791a2d7070b3abd6df35a5cff66 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
Binary files a/themes/default/close-active.png and b/themes/default/close-active.png differ
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index 76bb406e51dda10e4ea3798564f8886d90cc0b84..ba803b767062cd438bd41b398a60ca05ec14263c 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
Binary files a/themes/default/close-inactive.png and b/themes/default/close-inactive.png differ
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 332af1ac5e642d05b899a396a46d05390ca4a4a4..77751a7672b9493e4848a0af41f00820afbedd41 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
Binary files a/themes/default/close-pressed.png and b/themes/default/close-pressed.png differ
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index 47b8100cbc15aec8ef85c598d272fdb79cccea61..bc4a38c42fc1063e5b663d67bb379990d7acaeaf 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
Binary files a/themes/default/hide-active.png and b/themes/default/hide-active.png differ
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index 37afbbbb94dae313055959d9a2bf59d8802a8f37..33236b705f4ac9f0ce9b044aa544a23b93f42393 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
Binary files a/themes/default/hide-inactive.png and b/themes/default/hide-inactive.png differ
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index 468c29607db5b7167e3e478e2983f1e03dc22b43..401509578bb56719402008f5bdb9d087a5fc39c4 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
Binary files a/themes/default/hide-pressed.png and b/themes/default/hide-pressed.png differ
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index 54acda0b13e2b16871477aa69244648e028b0a8c..bcdaa209f25e46df9b4f917315d3b04ac00a8adf 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
Binary files a/themes/default/maximize-active.png and b/themes/default/maximize-active.png differ
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index 5c0dd7c00a966c7538a9bfc74576a9c751d0c75a..ad1ca310943ee7178c90dacc26348e89ae2ed38f 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
Binary files a/themes/default/maximize-inactive.png and b/themes/default/maximize-inactive.png differ
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index 0e1e6ba6f78d1040bb3f59f2188523436463a32e..b8c162eecd4a8cc60b2b2994ee92893b9b536b1b 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
Binary files a/themes/default/maximize-pressed.png and b/themes/default/maximize-pressed.png differ
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index 573c3559e426a9f86479cd30c87155a05fa567d6..7b1089c7e5da19fbbdf246d3b9a757b3ff36d275 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
Binary files a/themes/default/maximize-toggled-active.png and b/themes/default/maximize-toggled-active.png differ
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index 5090d823afe50777c038523c81d3af30004065d4..22d4015b4ab20e72020dd23aebb97a5a2d2c6c3e 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
Binary files a/themes/default/maximize-toggled-inactive.png and b/themes/default/maximize-toggled-inactive.png differ
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index 180fe0e630b4bb8f7536ce5c0ec3dfc644e89344..760c62e1fe897754c9c140b9396a514d5dd137fa 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
Binary files a/themes/default/maximize-toggled-pressed.png and b/themes/default/maximize-toggled-pressed.png differ
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index ae8845faeb477f862b4861cb0ab5bbf15f28a1f3..3ee5aa6f4a54d30b29b302321237de12c265c396 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
Binary files a/themes/default/menu-active.png and b/themes/default/menu-active.png differ
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
index 355de3df2b64307546cf9920ca5dc052f22a7138..65b257af15d2af9da44dc11450f10176b8ad3d0a 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
Binary files /dev/null and b/themes/default/menu-inactive.png differ
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
index 7b33419e3bef382bf85a9836276f438941e98f74..c198696bfb7a28aa8c8da4bc1dbf521ce6a86b15 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
Binary files a/themes/default/menu-pressed.png and b/themes/default/menu-pressed.png differ
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
index 7e8ea983d9a8a3a47b6052fa9d63e601a9aba1b1..bc84cee151cc42949c6e569c497a08631886a9c8 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
Binary files a/themes/default/shade-active.png and b/themes/default/shade-active.png differ
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
index d0836d312395ba9d9d402001caee0e07ee0e1daa..ca67d14f4dec67d330847f074f40aba1122eb2f2 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
Binary files a/themes/default/shade-inactive.png and b/themes/default/shade-inactive.png differ
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
index 16c38e8b5702c2d815b7719b77dc0615dfa3214b..e9a5890c47560ac1f62b1c75149611ebe564ba4d 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
Binary files a/themes/default/shade-pressed.png and b/themes/default/shade-pressed.png differ
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
index 9bb8b7ca2aa8e8c5d982bb8d2c52b6b1baac5185..29e69d163198d84a11bd2b1117d1b5c394347511 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
Binary files a/themes/default/shade-toggled-active.png and b/themes/default/shade-toggled-active.png differ
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
index 0f83bbde64877f20e8e67ebb65ac3bddf17bf1d8..e7434859509923da2f8a6538a41f16c58f60f2c4 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
Binary files a/themes/default/shade-toggled-inactive.png and b/themes/default/shade-toggled-inactive.png differ
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
index 3977170e86be8387ed1f8e6f72e9c4163d4200b2..5d6dd825f99559c1ff191b7bcedd7b84210f380d 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
Binary files a/themes/default/shade-toggled-pressed.png and b/themes/default/shade-toggled-pressed.png differ
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
index a3e0621a64e34f4eb889b2e552d51e10fdcfa680..c385308a78fff23adf460c52a386a7f4f6da747b 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
Binary files a/themes/default/stick-active.png and b/themes/default/stick-active.png differ
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
index e8ba14e5588431a074d45fcddad510f5ec4cbb4b..f6f326ca475929590453d5223d6f7b614caa8d63 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
Binary files a/themes/default/stick-inactive.png and b/themes/default/stick-inactive.png differ
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
index 64f9214e624093187ec767f7718360b55f80babc..7fa933182eff6135ee7b57bfc653dbec215eca4e 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
Binary files a/themes/default/stick-pressed.png and b/themes/default/stick-pressed.png differ
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
index 0c86058e6863aaef42de0818b3c81c7c07448b51..3cb42bb2303fd64e78f795e743f2a8a4f8ff2747 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
Binary files a/themes/default/stick-toggled-active.png and b/themes/default/stick-toggled-active.png differ
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
index d6850c5119202ac4597a0a314ab7ff3c07926dc1..cb271351b4d17b464d994dc4a3ccbe073d4b2e54 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
Binary files a/themes/default/stick-toggled-inactive.png and b/themes/default/stick-toggled-inactive.png differ
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
index 20c0a4d25981812bee71004b4d34c4b8f40e34ae..46dd111b94fdc60293cfa733b401aaf1072501d8 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
Binary files a/themes/default/stick-toggled-pressed.png and b/themes/default/stick-toggled-pressed.png differ
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
index a1059fb4c07ad096f2f85dc57623ce96e3f049b7..483fce2136d4616b3a22b3ac525583e51f81db2c 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 4f24fccfee74ec8b67b8907d40658ffc91162646..63274948962b601210f7f7ac0808b2107701a946 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
Binary files a/themes/default/title-1-active.png and b/themes/default/title-1-active.png differ
diff --git a/themes/default/title-2-active.png b/themes/default/title-2-active.png
index 8240f0adea812175486aa53b290bbed797eb385a..46495dc8167f689003e5b2a0db6a76617bb5fca2 100644
Binary files a/themes/default/title-2-active.png and b/themes/default/title-2-active.png differ
diff --git a/themes/default/title-3-active.png b/themes/default/title-3-active.png
index 8240f0adea812175486aa53b290bbed797eb385a..46495dc8167f689003e5b2a0db6a76617bb5fca2 100644
Binary files a/themes/default/title-3-active.png and b/themes/default/title-3-active.png differ
diff --git a/themes/default/title-4-active.png b/themes/default/title-4-active.png
index 8240f0adea812175486aa53b290bbed797eb385a..46495dc8167f689003e5b2a0db6a76617bb5fca2 100644
Binary files a/themes/default/title-4-active.png and b/themes/default/title-4-active.png differ
diff --git a/themes/default/title-5-active.png b/themes/default/title-5-active.png
index 8240f0adea812175486aa53b290bbed797eb385a..46495dc8167f689003e5b2a0db6a76617bb5fca2 100644
Binary files a/themes/default/title-5-active.png and b/themes/default/title-5-active.png differ
diff --git a/themes/default/top-left-active.png b/themes/default/top-left-active.png
index 27b9e1232ebd32a097d86a752c224770e5e962f1..224241e8fb40dc1134963abbca6a0af1e310ce5d 100644
Binary files a/themes/default/top-left-active.png and b/themes/default/top-left-active.png differ
diff --git a/themes/default/top-right-active.png b/themes/default/top-right-active.png
index 46cd2332521571a9db79fabce1a26904afa2b0d8..c37957804893562cee896e1a35e108b39f3f0002 100644
Binary files a/themes/default/top-right-active.png and b/themes/default/top-right-active.png differ
diff --git a/themes/opta/Makefile.am b/themes/opta/Makefile.am
index 52467595c633d3192912bf34f0517e16c52c223e..f4214e08175109db8b000153aee8cde65b33e425 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 c831a1ab3b6d1e5c82dccf66b47dc32ef195e51c..97aa74e2a57c03853ae999eb270bbf812f1303af 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 e2daaf24a6cee667b00509cb03ffef3cc7c81503..9919067f608c7761e99421b81e7517f07b282481 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 24aa681a77e00bfc4e33d6df4624929e9d1dd4d0..e84396454847cd34dc5e144e9fd5db9cb8b349de 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)