diff --git a/src/Makefile.am b/src/Makefile.am
index 9a455fa46622505b81b205f1d84bd26cb379e341..a83edc55276080c0ee502e5b8606bb5671720137 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -DDATADIR=\"$(pkgdatadir)\"
+CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -DG_DISABLE_DEPRECATED -DDATADIR=\"$(pkgdatadir)\"
 LIBS = @LIBS@ @X_LIBS@  @BASE_DEPENDENCIES_LIBS@
 
 bin_PROGRAMS = xfwm4
diff --git a/src/Makefile.in b/src/Makefile.in
index 229a8cebff12a7e1927d7f742542bf8b84625715..c95687df3c9e8798c608d334c571c531458145c2 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -63,40 +63,11 @@ PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
-CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -DDATADIR=\"$(pkgdatadir)\"
+CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -DG_DISABLE_DEPRECATED -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 074ab093e601f7e4602d26cbd1a06a163e54a175..401c0295d9333e8252bbe93ce14f221bd87709b7 100644
--- a/themes/Makefile.in
+++ b/themes/Makefile.in
@@ -63,25 +63,7 @@ PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
-SUBDIRS = \
-agua \
-coldsteel \
-crux \
-cruxish \
-eazel-blue \
-gtk \
-kde \
-linea \
-mofit \
-next \
-oroborus \
-platinum \
-redmond \
-redmondxp \
-slick \
-slimline \
-trench \
-xfce
+SUBDIRS =  agua coldsteel crux cruxish eazel-blue gtk kde linea mofit next oroborus platinum redmond redmondxp slick 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 7e5c9679ba55a2d3f83680981c319a4906194b56..2e7e7956fdd85e7d757b7382e8176bc1e3fbf2a6 100644
--- a/themes/agua/Makefile.in
+++ b/themes/agua/Makefile.in
@@ -64,49 +64,7 @@ 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 b4d1d5ca6e9acf6fed88f7a04e00d34081cf03c3..c75db2aafb0a20b6d92604d5f2d860e6f01b34ac 100644
--- a/themes/coldsteel/Makefile.in
+++ b/themes/coldsteel/Makefile.in
@@ -64,49 +64,7 @@ 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 75833077fc55e10cb4f3132069bbbd885fefe286..9b7ee8a7b47465ba50e29d21cc49dca950278e78 100644
--- a/themes/crux/Makefile.in
+++ b/themes/crux/Makefile.in
@@ -64,49 +64,7 @@ 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 ac9ea42a5b8ce80d03176486595fe2cfe155d52e..5c94fa4e10ea214688628493d26ec180cb80a3bd 100644
--- a/themes/cruxish/Makefile.in
+++ b/themes/cruxish/Makefile.in
@@ -64,49 +64,7 @@ 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/eazel-blue/Makefile.in b/themes/eazel-blue/Makefile.in
index 3ad9b7ca433af74ae6880ea501d4c6b7c7b6f8c3..e3a5e0778e67e7dd93caf4b316fa8013c88bdaaf 100644
--- a/themes/eazel-blue/Makefile.in
+++ b/themes/eazel-blue/Makefile.in
@@ -64,49 +64,7 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/eazel-blue
-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 e1b0f064a4ca727a35e0a24a4e067ac100de6ace..6aa74fe13a797ea3f7b84c286a84bfb26348a136 100644
--- a/themes/gtk/Makefile.in
+++ b/themes/gtk/Makefile.in
@@ -64,49 +64,7 @@ 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 94534a19bd65eff8bd2ca3086e2bbcbfdf7cbcff..46cb285afcfefd8abb31d8e1a4e89372c5b4b9d6 100644
--- a/themes/kde/Makefile.in
+++ b/themes/kde/Makefile.in
@@ -64,49 +64,7 @@ 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 002d780ba4cc444bda2b5dee747bc3ba5d070f73..ce159dce040e03eef14e8ab2e52044d194f8cdfc 100644
--- a/themes/linea/Makefile.in
+++ b/themes/linea/Makefile.in
@@ -64,49 +64,7 @@ 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 0d353503cefc85dd53498ef2ed67b76345b7e984..e0ad590ec4084d6d10c0a05e1e7b7cc98cdaf856 100644
--- a/themes/mofit/Makefile.in
+++ b/themes/mofit/Makefile.in
@@ -64,49 +64,7 @@ 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 73b585e12d7490f76b488867ccfabd076624fd29..326ce1841a686f90776ddb9efb08079171107ed4 100644
--- a/themes/next/Makefile.in
+++ b/themes/next/Makefile.in
@@ -64,49 +64,7 @@ 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 1e43687b59b44250132783e6ded98487c9b43aae..7dbabc66dcc3b3b2e5d614c7bef6afafd7bf876c 100644
--- a/themes/oroborus/Makefile.in
+++ b/themes/oroborus/Makefile.in
@@ -64,49 +64,7 @@ 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 7aac26242de0739378b6cf59d39589f13abb427e..a62f61763176564da3bf7047169aab873684aee8 100644
--- a/themes/platinum/Makefile.in
+++ b/themes/platinum/Makefile.in
@@ -64,49 +64,7 @@ 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 83f178b4bb98888e8e5a55ce5b5283805e4b6192..0d8f6bc01aec90a8cb51191e443675c59e22073c 100644
--- a/themes/redmond/Makefile.in
+++ b/themes/redmond/Makefile.in
@@ -64,49 +64,7 @@ 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 84e8663d3c483c632c2035023c09ecd0f29ce09c..dc42cea802ed9253c654eec7c97231bcf22093f1 100644
--- a/themes/redmondxp/Makefile.in
+++ b/themes/redmondxp/Makefile.in
@@ -64,49 +64,7 @@ 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/slick/Makefile.in b/themes/slick/Makefile.in
index 8962dc4f09c6f179750fd6eae39690ca767510c1..ba58677de88e0665ccc1a26d06d84e661c05b1b9 100644
--- a/themes/slick/Makefile.in
+++ b/themes/slick/Makefile.in
@@ -64,49 +64,7 @@ PKG_CONFIG = @PKG_CONFIG@
 VERSION = @VERSION@
 
 themedir = $(pkgdatadir)/themes/slick
-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 88e3ca71fb78db0589a4c247cf4f7eecc35b5cd9..b63f8a1774bdb1956eb7cdfe763e2e5140632206 100644
--- a/themes/slimline/Makefile.in
+++ b/themes/slimline/Makefile.in
@@ -64,49 +64,7 @@ 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 56ce96d7f5ad90c29ed28a590d0bfea2c155fbb0..be30a0f9ef109c676645988aadd75bba5ede3a80 100644
--- a/themes/trench/Makefile.in
+++ b/themes/trench/Makefile.in
@@ -64,49 +64,7 @@ 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 ffba6e56cdfeab23fef4a7c2175eb7821268d85a..95dcce2986fbe5c81385fdaaa53db9c8b9da1573 100644
--- a/themes/xfce/Makefile.in
+++ b/themes/xfce/Makefile.in
@@ -64,49 +64,7 @@ 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