diff --git a/Makefile.am b/Makefile.am
index 4fa954adf19b81cd76c74e96cd4e4eb4ed8a4dd0..2f71bd33a5303a2891edeea2ce10b69dd54644e5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,3 +12,4 @@ example.xfwm4rc :
 
 rpm : dist
 	rpm -ta $(PACKAGE)-$(VERSION).tar.gz
+	@rm -f $(PACKAGE)-$(VERSION).tar.gz
diff --git a/Makefile.in b/Makefile.in
index a7fb7761bb69997386e31b2ad00f2c41a8b59360..889fad241272267cc8becb28655a77b2192d922a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -358,6 +358,7 @@ example.xfwm4rc :
 
 rpm : dist
 	rpm -ta $(PACKAGE)-$(VERSION).tar.gz
+	@rm -f $(PACKAGE)-$(VERSION).tar.gz
 
 # 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.
diff --git a/src/Makefile.in b/src/Makefile.in
index 21d5f9977cd65562bdccc30164bf90284f256dc4..229a8cebff12a7e1927d7f742542bf8b84625715 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -67,7 +67,36 @@ CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -DDATADIR=\"$(pkgdatadir
 LIBS = @LIBS@ @X_LIBS@  @BASE_DEPENDENCIES_LIBS@
 
 bin_PROGRAMS = xfwm4
-xfwm4_SOURCES =  	client.c 	events.c 	frame.c 	gtk_style.c 	gtktoxevent.c 	hints.c 	keyboard.c 	main.c 	menu.c 	misc.c 	parserc.c 	pixmap.c 	settings.c 	workspaces.c 	client.h 	debug.h 	events.h 	frame.h 	gtk_style.h 	gtktoxevent.h 	hints.h 	keyboard.h 	main.h 	menu.h 	misc.h 	parserc.h 	pixmap.h 	settings.h 	workspaces.h
+xfwm4_SOURCES = \
+	client.c \
+	events.c \
+	frame.c \
+	gtk_style.c \
+	gtktoxevent.c \
+	hints.c \
+	keyboard.c \
+	main.c \
+	menu.c \
+	misc.c \
+	parserc.c \
+	pixmap.c \
+	settings.c \
+	workspaces.c \
+	client.h \
+	debug.h \
+	events.h \
+	frame.h \
+	gtk_style.h \
+	gtktoxevent.h \
+	hints.h \
+	keyboard.h \
+	main.h \
+	menu.h \
+	misc.h \
+	parserc.h \
+	pixmap.h \
+	settings.h \
+	workspaces.h
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
diff --git a/themes/Makefile.in b/themes/Makefile.in
index faeb14158c26cd6e5393fb3cd0cd5405fa5f1a73..85ccfaea525c0aedc2aa2b7714b5ca4b4727a582 100644
--- a/themes/Makefile.in
+++ b/themes/Makefile.in
@@ -63,7 +63,23 @@ PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
-SUBDIRS =  agua coldsteel crux cruxish gtk kde linea mofit next oroborus platinum redmond redmondxp slimline trench xfce
+SUBDIRS = \
+agua \
+coldsteel \
+crux \
+cruxish \
+gtk \
+kde \
+linea \
+mofit \
+next \
+oroborus \
+platinum \
+redmond \
+redmondxp \
+slimline \
+trench \
+xfce
 
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
diff --git a/themes/agua/Makefile.in b/themes/agua/Makefile.in
index 2e7e7956fdd85e7d757b7382e8176bc1e3fbf2a6..7e5c9679ba55a2d3f83680981c319a4906194b56 100644
--- a/themes/agua/Makefile.in
+++ b/themes/agua/Makefile.in
@@ -64,7 +64,49 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/agua
-theme_DATA = 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 	menu-active.xpm 	menu-inactive.xpm 	menu-pressed.xpm 	right-active.xpm 	right-inactive.xpm 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-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 	top-right-inactive.xpm
+theme_DATA = 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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-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 \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/themes/coldsteel/Makefile.in b/themes/coldsteel/Makefile.in
index c75db2aafb0a20b6d92604d5f2d860e6f01b34ac..b4d1d5ca6e9acf6fed88f7a04e00d34081cf03c3 100644
--- a/themes/coldsteel/Makefile.in
+++ b/themes/coldsteel/Makefile.in
@@ -64,7 +64,49 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/coldsteel
-theme_DATA = 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 	menu-active.xpm 	menu-inactive.xpm 	menu-pressed.xpm 	right-active.xpm 	right-inactive.xpm 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-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 	top-right-inactive.xpm
+theme_DATA = 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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-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 \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/themes/crux/Makefile.in b/themes/crux/Makefile.in
index 9b7ee8a7b47465ba50e29d21cc49dca950278e78..75833077fc55e10cb4f3132069bbbd885fefe286 100644
--- a/themes/crux/Makefile.in
+++ b/themes/crux/Makefile.in
@@ -64,7 +64,49 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/crux
-theme_DATA = 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 	menu-active.xpm 	menu-inactive.xpm 	menu-pressed.xpm 	right-active.xpm 	right-inactive.xpm 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-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 	top-right-inactive.xpm
+theme_DATA = 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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-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 \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/themes/cruxish/Makefile.in b/themes/cruxish/Makefile.in
index 5c94fa4e10ea214688628493d26ec180cb80a3bd..ac9ea42a5b8ce80d03176486595fe2cfe155d52e 100644
--- a/themes/cruxish/Makefile.in
+++ b/themes/cruxish/Makefile.in
@@ -64,7 +64,49 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/cruxish
-theme_DATA = 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 	menu-active.xpm 	menu-inactive.xpm 	menu-pressed.xpm 	right-active.xpm 	right-inactive.xpm 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-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 	top-right-inactive.xpm
+theme_DATA = 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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-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 \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/themes/gtk/Makefile.in b/themes/gtk/Makefile.in
index 6aa74fe13a797ea3f7b84c286a84bfb26348a136..e1b0f064a4ca727a35e0a24a4e067ac100de6ace 100644
--- a/themes/gtk/Makefile.in
+++ b/themes/gtk/Makefile.in
@@ -64,7 +64,49 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/gtk
-theme_DATA = 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 	menu-active.xpm 	menu-inactive.xpm 	menu-pressed.xpm 	right-active.xpm 	right-inactive.xpm 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-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 	top-right-inactive.xpm
+theme_DATA = 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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-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 \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/themes/kde/Makefile.in b/themes/kde/Makefile.in
index 46cb285afcfefd8abb31d8e1a4e89372c5b4b9d6..94534a19bd65eff8bd2ca3086e2bbcbfdf7cbcff 100644
--- a/themes/kde/Makefile.in
+++ b/themes/kde/Makefile.in
@@ -64,7 +64,49 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/kde
-theme_DATA = 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 	menu-active.xpm 	menu-inactive.xpm 	menu-pressed.xpm 	right-active.xpm 	right-inactive.xpm 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-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 	top-right-inactive.xpm
+theme_DATA = 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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-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 \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/themes/linea/Makefile.in b/themes/linea/Makefile.in
index ce159dce040e03eef14e8ab2e52044d194f8cdfc..002d780ba4cc444bda2b5dee747bc3ba5d070f73 100644
--- a/themes/linea/Makefile.in
+++ b/themes/linea/Makefile.in
@@ -64,7 +64,49 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/linea
-theme_DATA = 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 	menu-active.xpm 	menu-inactive.xpm 	menu-pressed.xpm 	right-active.xpm 	right-inactive.xpm 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-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 	top-right-inactive.xpm
+theme_DATA = 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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-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 \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/themes/mofit/Makefile.in b/themes/mofit/Makefile.in
index e0ad590ec4084d6d10c0a05e1e7b7cc98cdaf856..0d353503cefc85dd53498ef2ed67b76345b7e984 100644
--- a/themes/mofit/Makefile.in
+++ b/themes/mofit/Makefile.in
@@ -64,7 +64,49 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/mofit
-theme_DATA = 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 	menu-active.xpm 	menu-inactive.xpm 	menu-pressed.xpm 	right-active.xpm 	right-inactive.xpm 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-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 	top-right-inactive.xpm
+theme_DATA = 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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-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 \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/themes/next/Makefile.in b/themes/next/Makefile.in
index 326ce1841a686f90776ddb9efb08079171107ed4..73b585e12d7490f76b488867ccfabd076624fd29 100644
--- a/themes/next/Makefile.in
+++ b/themes/next/Makefile.in
@@ -64,7 +64,49 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/next
-theme_DATA = 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 	menu-active.xpm 	menu-inactive.xpm 	menu-pressed.xpm 	right-active.xpm 	right-inactive.xpm 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-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 	top-right-inactive.xpm
+theme_DATA = 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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-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 \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/themes/oroborus/Makefile.in b/themes/oroborus/Makefile.in
index 7dbabc66dcc3b3b2e5d614c7bef6afafd7bf876c..1e43687b59b44250132783e6ded98487c9b43aae 100644
--- a/themes/oroborus/Makefile.in
+++ b/themes/oroborus/Makefile.in
@@ -64,7 +64,49 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/oroborus
-theme_DATA = 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 	menu-active.xpm 	menu-inactive.xpm 	menu-pressed.xpm 	right-active.xpm 	right-inactive.xpm 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-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 	top-right-inactive.xpm
+theme_DATA = 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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-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 \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/themes/platinum/Makefile.in b/themes/platinum/Makefile.in
index a62f61763176564da3bf7047169aab873684aee8..7aac26242de0739378b6cf59d39589f13abb427e 100644
--- a/themes/platinum/Makefile.in
+++ b/themes/platinum/Makefile.in
@@ -64,7 +64,49 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/platinum
-theme_DATA = 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 	menu-active.xpm 	menu-inactive.xpm 	menu-pressed.xpm 	right-active.xpm 	right-inactive.xpm 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-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 	top-right-inactive.xpm
+theme_DATA = 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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-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 \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/themes/redmond/Makefile.in b/themes/redmond/Makefile.in
index 0d8f6bc01aec90a8cb51191e443675c59e22073c..83f178b4bb98888e8e5a55ce5b5283805e4b6192 100644
--- a/themes/redmond/Makefile.in
+++ b/themes/redmond/Makefile.in
@@ -64,7 +64,49 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/redmond
-theme_DATA = 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 	menu-active.xpm 	menu-inactive.xpm 	menu-pressed.xpm 	right-active.xpm 	right-inactive.xpm 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-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 	top-right-inactive.xpm
+theme_DATA = 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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-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 \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/themes/redmondxp/Makefile.in b/themes/redmondxp/Makefile.in
index dc42cea802ed9253c654eec7c97231bcf22093f1..84e8663d3c483c632c2035023c09ecd0f29ce09c 100644
--- a/themes/redmondxp/Makefile.in
+++ b/themes/redmondxp/Makefile.in
@@ -64,7 +64,49 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/redmondxp
-theme_DATA = 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 	menu-active.xpm 	menu-inactive.xpm 	menu-pressed.xpm 	right-active.xpm 	right-inactive.xpm 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-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 	top-right-inactive.xpm
+theme_DATA = 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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-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 \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/themes/slimline/Makefile.in b/themes/slimline/Makefile.in
index b63f8a1774bdb1956eb7cdfe763e2e5140632206..88e3ca71fb78db0589a4c247cf4f7eecc35b5cd9 100644
--- a/themes/slimline/Makefile.in
+++ b/themes/slimline/Makefile.in
@@ -64,7 +64,49 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/slimline
-theme_DATA = 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 	menu-active.xpm 	menu-inactive.xpm 	menu-pressed.xpm 	right-active.xpm 	right-inactive.xpm 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-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 	top-right-inactive.xpm
+theme_DATA = 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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-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 \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/themes/trench/Makefile.in b/themes/trench/Makefile.in
index be30a0f9ef109c676645988aadd75bba5ede3a80..56ce96d7f5ad90c29ed28a590d0bfea2c155fbb0 100644
--- a/themes/trench/Makefile.in
+++ b/themes/trench/Makefile.in
@@ -64,7 +64,49 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/trench
-theme_DATA = 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 	menu-active.xpm 	menu-inactive.xpm 	menu-pressed.xpm 	right-active.xpm 	right-inactive.xpm 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-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 	top-right-inactive.xpm
+theme_DATA = 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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-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 \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/themes/xfce/Makefile.in b/themes/xfce/Makefile.in
index 95dcce2986fbe5c81385fdaaa53db9c8b9da1573..ffba6e56cdfeab23fef4a7c2175eb7821268d85a 100644
--- a/themes/xfce/Makefile.in
+++ b/themes/xfce/Makefile.in
@@ -64,7 +64,49 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/xfce
-theme_DATA = 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 	menu-active.xpm 	menu-inactive.xpm 	menu-pressed.xpm 	right-active.xpm 	right-inactive.xpm 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-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 	top-right-inactive.xpm
+theme_DATA = 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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-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 \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/xfwm4.spec.in b/xfwm4.spec.in
index 97f70c8a04de98b337ddfb8c697ca45e7a6ecb57..bb66fd52f9b70fbfac03662ddb1557e25d9051d1 100644
--- a/xfwm4.spec.in
+++ b/xfwm4.spec.in
@@ -14,6 +14,15 @@ BuildRequires: 	pango-devel >= 1.0.0
 %description
 xfwm4 is a window manager compatable with GNOME, GNOME2, KDE2, KDE3 and Xfce.
 
+%package themes
+Summary:	Additionnal themes for xfwm4
+Group:		User Interface/Desktops
+BuildArch:	noarch
+Requires:	xfwm4
+
+%description themes
+Various themes for xfwm4.
+
 %prep
 %setup -q
 
@@ -32,6 +41,24 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(-,root,root)
 %doc example.xfwm4rc example.gtkrc-2.0 README INSTALL TODO COPYING AUTHORS
 %{_bindir}/*
-%{_datadir}/xfwm4
+%{_datadir}/xfwm4/defaults
+%{_datadir}/xfwm4/themes/kde
 
+%files themes
+%defattr(-, root, root)
+%{_datadir}/xfwm4/themes/agua
+%{_datadir}/xfwm4/themes/coldsteel
+%{_datadir}/xfwm4/themes/crux
+%{_datadir}/xfwm4/themes/cruxish
+%{_datadir}/xfwm4/themes/gtk
+%{_datadir}/xfwm4/themes/linea
+%{_datadir}/xfwm4/themes/mofit
+%{_datadir}/xfwm4/themes/next
+%{_datadir}/xfwm4/themes/oroborus
+%{_datadir}/xfwm4/themes/platinum
+%{_datadir}/xfwm4/themes/redmond
+%{_datadir}/xfwm4/themes/redmondxp
+%{_datadir}/xfwm4/themes/slimline
+%{_datadir}/xfwm4/themes/trench
+%{_datadir}/xfwm4/themes/xfce