diff --git a/Makefile.in b/Makefile.in
index 7be59ec4e5bb773d1e3573f7866e58449d388e89..2fc9f8b288fdd631ebf92692aed9e1099bda5a68 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = .
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 
 noinst_DATA = example.xfwm4rc
 
@@ -123,11 +94,10 @@ DIST_SOURCES =
 DATA = $(noinst_DATA)
 
 
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+	uninstall-info-recursive all-recursive install-data-recursive \
+	install-exec-recursive installdirs-recursive install-recursive \
+	uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = README AUTHORS COPYING ChangeLog INSTALL Makefile.am \
 	Makefile.in NEWS TODO aclocal.m4 compile config.guess \
 	config.h.in config.sub configure configure.in depcomp \
@@ -228,17 +198,10 @@ tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
 
 ETAGS = etags
 ETAGSFLAGS =
 
-CTAGS = ctags
-CTAGSFLAGS =
-
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -269,28 +232,13 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	     $$tags $$unique
 
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS) config.h.in $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = .
@@ -302,20 +250,13 @@ am__remove_distdir = \
          && rm -fr $(distdir); }; }
 
 GZIP_ENV = --best
-distuninstallcheck_listfiles = find . -type f -print
 distcleancheck_listfiles = find . -type f -print
 
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
 	$(mkinstalldirs) $(distdir)/.
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -372,9 +313,8 @@ distcheck: dist
 	mkdir $(distdir)/=inst
 	chmod a-w $(distdir)
 	dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
-	  && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \
 	  && cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -382,39 +322,23 @@ distcheck: dist
 	  && $(MAKE) $(AM_MAKEFLAGS) install \
 	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
 	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
-	  && $(MAKE) $(AM_MAKEFLAGS) distuninstallcheck_dir="$$dc_install_base" \
-	        distuninstallcheck \
-	  && chmod -R a-w "$$dc_install_base" \
-	  && ({ \
-	       (cd ../.. && $(mkinstalldirs) "$$dc_destdir") \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" install \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" uninstall \
-	       && $(MAKE) $(AM_MAKEFLAGS) DESTDIR="$$dc_destdir" \
-	            distuninstallcheck_dir="$$dc_destdir" distuninstallcheck; \
-	      } || { rm -rf "$$dc_destdir"; exit 1; }) \
-	  && rm -rf "$$dc_destdir" \
+	  && (test `find $$dc_install_base -type f -print | wc -l` -le 1 \
+	      || { echo "ERROR: files left after uninstall:" ; \
+	           find $$dc_install_base -type f -print ; \
+	           exit 1; } >&2 ) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dist-gzip \
 	  && rm -f $(distdir).tar.gz \
 	  && $(MAKE) $(AM_MAKEFLAGS) distcleancheck
 	$(am__remove_distdir)
 	@echo "$(distdir).tar.gz is ready for distribution" | \
 	  sed 'h;s/./=/g;p;x;p;x'
-distuninstallcheck:
-	cd $(distuninstallcheck_dir) \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-	   || { echo "ERROR: files left after uninstall:" ; \
-	        if test -n "$(DESTDIR)"; then \
-	          echo "  (check DESTDIR support)"; \
-	        fi ; \
-	        $(distuninstallcheck_listfiles) ; \
-	        exit 1; } >&2
 distcleancheck: distclean
 	if test '$(srcdir)' = . ; then \
 	  echo "ERROR: distcleancheck can only run from a VPATH build" ; \
 	  exit 1 ; \
 	fi
 	test `$(distcleancheck_listfiles) | wc -l` -eq 0 \
-	  || { echo "ERROR: files left in build directory after distclean:" ; \
+	  || { echo "ERROR: files left after distclean:" ; \
 	       $(distcleancheck_listfiles) ; \
 	       exit 1; } >&2
 check-am: all-am
@@ -483,23 +407,14 @@ mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
 uninstall-am: uninstall-info-am
 
 uninstall-info: uninstall-info-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-recursive ctags ctags-recursive dist \
-	dist-all dist-gzip distcheck distclean distclean-generic \
-	distclean-hdr distclean-local distclean-recursive \
-	distclean-tags distcleancheck distdir distuninstallcheck dvi \
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
+	clean-generic clean-recursive dist dist-all dist-gzip distcheck \
+	distclean distclean-generic distclean-hdr distclean-local \
+	distclean-recursive distclean-tags distcleancheck distdir dvi \
 	dvi-am dvi-recursive info info-am info-recursive install \
 	install-am install-data install-data-am install-data-recursive \
 	install-exec install-exec-am install-exec-recursive \
@@ -508,9 +423,9 @@ uninstall-info: uninstall-info-recursive
 	installdirs installdirs-am installdirs-recursive \
 	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
-	ps-recursive tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-info-recursive uninstall-recursive
+	mostlyclean-recursive tags tags-recursive uninstall \
+	uninstall-am uninstall-info-am uninstall-info-recursive \
+	uninstall-recursive
 
 @SET_MAKE@
 
diff --git a/aclocal.m4 b/aclocal.m4
index 627a76f4e39ed7fe9c98081b444d5e97e84dab87..79c445748110643023f391a3853f7436d9976184 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,6 +1,6 @@
-# generated automatically by aclocal 1.7.1 -*- Autoconf -*-
+# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
 # Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -43,7 +43,7 @@
 # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
 
 
-AC_PREREQ([2.54])
+AC_PREREQ([2.52])
 
 # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
 # the ones we care about.
@@ -69,16 +69,6 @@ if test "`cd $srcdir && pwd`" != "`pwd`" &&
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
 
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-AC_SUBST([CYGPATH_W])
-
 # Define the identity of the package.
 dnl Distinguish between old-style and new-style calls.
 m4_ifval([$2],
@@ -110,29 +100,17 @@ AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([AC_PROG_MAKE_SET])dnl
 
 _AM_IF_OPTION([no-dependencies],,
-[AC_PROVIDE_IFELSE([AC_PROG_CC],
+[AC_PROVIDE_IFELSE([AC_PROG_][CC],
                   [_AM_DEPENDENCIES(CC)],
-                  [define([AC_PROG_CC],
-                          defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl
-AC_PROVIDE_IFELSE([AC_PROG_CXX],
+                  [define([AC_PROG_][CC],
+                          defn([AC_PROG_][CC])[_AM_DEPENDENCIES(CC)])])dnl
+AC_PROVIDE_IFELSE([AC_PROG_][CXX],
                   [_AM_DEPENDENCIES(CXX)],
-                  [define([AC_PROG_CXX],
-                          defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+                  [define([AC_PROG_][CXX],
+                          defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
 ])
 ])
 
-
-# When config.status generates a header, we must update the stamp-h file.
-# This file resides in the same directory as the config header
-# that is generated.  The stamp files are numbered to have different names.
-
-# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the
-# loop where config.status creates the headers, so we can generate
-# our stamp files there.
-AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK],
-[_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
-echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
-
 # Copyright 2002  Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -153,14 +131,14 @@ echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
 # generated from the m4 files accompanying Automake X.Y.
-AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"])
+AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.6"])
 
 # AM_SET_CURRENT_AUTOMAKE_VERSION
 # -------------------------------
 # Call AM_AUTOMAKE_VERSION so it can be traced.
 # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-	 [AM_AUTOMAKE_VERSION([1.7.1])])
+	 [AM_AUTOMAKE_VERSION([1.6.3])])
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 
@@ -540,7 +518,7 @@ AC_CACHE_CHECK([dependency style of $depcc],
     if depmode=$depmode \
        source=conftest.c object=conftest.o \
        depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
+       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
        grep conftest.h conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       am_cv_$1_dependencies_compiler_type=$depmode
@@ -555,9 +533,6 @@ else
 fi
 ])
 AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
-AM_CONDITIONAL([am__fastdep$1], [
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
 ])
 
 
@@ -677,9 +652,7 @@ AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
      [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
 ])
 
-# Check to see how 'make' treats includes.	-*- Autoconf -*-
-
-# Copyright (C) 2001, 2002 Free Software Foundation, Inc.
+# Copyright 2001 Free Software Foundation, Inc.             -*- Autoconf -*-
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -719,7 +692,7 @@ echo "include confinc" > confmf
 # In particular we don't look at `^make:' because GNU make might
 # be invoked under some other name (usually "gmake"), in which
 # case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
    am__include=include
    am__quote=
    _am_result=GNU
@@ -779,7 +752,7 @@ else
 fi
 AC_CONFIG_COMMANDS_PRE(
 [if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
-  AC_MSG_ERROR([conditional "$1" was never defined.
+  AC_MSG_ERROR([conditional \"$1\" was never defined.
 Usually this means the macro was only invoked conditionally.])
 fi])])
 
@@ -806,8 +779,60 @@ AC_PREREQ([2.52])
 
 # serial 6
 
-# AM_CONFIG_HEADER is obsolete.  It has been replaced by AC_CONFIG_HEADERS.
-AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
+# When config.status generates a header, we must update the stamp-h file.
+# This file resides in the same directory as the config header
+# that is generated.  We must strip everything past the first ":",
+# and everything past the last "/".
+
+# _AM_DIRNAME(PATH)
+# -----------------
+# Like AS_DIRNAME, only do it during macro expansion
+AC_DEFUN([_AM_DIRNAME],
+       [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
+	      m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
+		    m4_if(regexp([$1], [^/.*]), -1,
+			  [.],
+			  patsubst([$1], [^\(/\).*], [\1])),
+		    patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
+	      patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
+])# _AM_DIRNAME
+
+
+# The stamp files are numbered to have different names.
+# We could number them on a directory basis, but that's additional
+# complications, let's have a unique counter.
+m4_define([_AM_STAMP_Count], [0])
+
+
+# _AM_STAMP(HEADER)
+# -----------------
+# The name of the stamp file for HEADER.
+AC_DEFUN([_AM_STAMP],
+[m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
+AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
+                               [:.*])))/stamp-h[]_AM_STAMP_Count])
+
+
+# _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
+# ------------------------------------------------------------
+# We used to try to get a real timestamp in stamp-h.  But the fear is that
+# that will cause unnecessary cvs conflicts.
+AC_DEFUN([_AM_CONFIG_HEADER],
+[# Add the stamp file to the list of files AC keeps track of,
+# along with our hook.
+AC_CONFIG_HEADERS([$1],
+                  [# update the timestamp
+echo 'timestamp for $1' >"_AM_STAMP([$1])"
+$2],
+                  [$3])
+])# _AM_CONFIG_HEADER
+
+
+# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
+# --------------------------------------------------------------
+AC_DEFUN([AM_CONFIG_HEADER],
+[AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
+])# AM_CONFIG_HEADER
 
 
 dnl PKG_CHECK_MODULES(GSTUFF, gtk+-2.0 >= 1.3 glib = 1.3.4, action-if, action-not)
diff --git a/configure b/configure
index 94ff0e9c9053597725d7351bec21bdb161b7fa1c..ba71404449da8a64a8eda72dee680f86da2dc3f7 100755
--- a/configure
+++ b/configure
@@ -305,7 +305,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS EGREP PKG_CONFIG BASE_DEPENDENCIES_CFLAGS BASE_DEPENDENCIES_LIBS LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE CPP X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS EGREP PKG_CONFIG BASE_DEPENDENCIES_CFLAGS BASE_DEPENDENCIES_LIBS LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1243,7 +1243,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 VERSION=`date +%y%m%d`
-am__api_version="1.7"
+am__api_version="1.6"
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -1495,16 +1495,6 @@ echo "$as_me: error: source directory already configured; run \"make distclean\"
    { (exit 1); exit 1; }; }
 fi
 
-# test whether we have cygpath
-if test -z "$CYGPATH_W"; then
-  if (cygpath --version) >/dev/null 2>/dev/null; then
-    CYGPATH_W='cygpath -w'
-  else
-    CYGPATH_W=echo
-  fi
-fi
-
-
 # Define the identity of the package.
  PACKAGE=xfwm4
  VERSION=$VERSION
@@ -1634,9 +1624,13 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 
 
 
+# Add the stamp file to the list of files AC keeps track of,
+# along with our hook.
           ac_config_headers="$ac_config_headers config.h"
 
 
+
+
 # Honor aclocal flags
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
@@ -2484,7 +2478,7 @@ echo "include confinc" > confmf
 # In particular we don't look at `^make:' because GNU make might
 # be invoked under some other name (usually "gmake"), in which
 # case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+if test "`$am_make -s -f confmf 2> /dev/null | fgrep -v 'ing directory'`" = "done"; then
    am__include=include
    am__quote=
    _am_result=GNU
@@ -2575,7 +2569,7 @@ else
     if depmode=$depmode \
        source=conftest.c object=conftest.o \
        depfile=conftest.Po tmpdepfile=conftest.TPo \
-       $SHELL ./depcomp $depcc -c -o conftest.o conftest.c >/dev/null 2>&1 &&
+       $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
        grep conftest.h conftest.Po > /dev/null 2>&1 &&
        ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
       am_cv_CC_dependencies_compiler_type=$depmode
@@ -2595,18 +2589,6 @@ echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
 
-
-if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
-  am__fastdepCC_TRUE=
-  am__fastdepCC_FALSE='#'
-else
-  am__fastdepCC_TRUE='#'
-  am__fastdepCC_FALSE=
-fi
-
-
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
 # incompatible versions:
@@ -4800,7 +4782,7 @@ echo "$as_me: error: Library requirements (glib-2.0 >= $GLIB_REQUIRED_VERSION gt
   fi
 
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                ac_config_files="$ac_config_files xfwm4.spec Makefile src/Makefile defaults/Makefile themes/Makefile themes/adept/Makefile themes/agua/Makefile themes/b5/Makefile themes/b6/Makefile themes/bbs/Makefile themes/biz/Makefile themes/coldsteel/Makefile themes/coolclean/Makefile themes/crux/Makefile themes/cruxish/Makefile themes/curve/Makefile themes/default.keys/Makefile themes/eazel-blue/Makefile themes/exocet/Makefile themes/g2/Makefile themes/gnububble/Makefile themes/gorilla/Makefile themes/gtk/Makefile themes/iceg/Makefile themes/kde/Makefile themes/kindaker/Makefile themes/linea/Makefile themes/metabox/Makefile themes/microgui/Makefile themes/mofit/Makefile themes/next/Makefile themes/ops/Makefile themes/oroborus/Makefile themes/pills/Makefile themes/piranha/Makefile themes/platinum/Makefile themes/quinx/Makefile themes/r9x/Makefile themes/redmond/Makefile themes/redmondxp/Makefile themes/retro/Makefile themes/silverado/Makefile themes/slick/Makefile themes/slimline/Makefile themes/tabs/Makefile themes/trench/Makefile themes/variation/Makefile themes/xfce/Makefile"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                          ac_config_files="$ac_config_files xfwm4.spec Makefile src/Makefile defaults/Makefile themes/Makefile themes/adept/Makefile themes/agua/Makefile themes/b5/Makefile themes/b6/Makefile themes/bbs/Makefile themes/biz/Makefile themes/coldsteel/Makefile themes/coolclean/Makefile themes/crux/Makefile themes/cruxish/Makefile themes/curve/Makefile themes/default.keys/Makefile themes/eazel-blue/Makefile themes/elberg/Makefile themes/exocet/Makefile themes/g2/Makefile themes/gnububble/Makefile themes/gorilla/Makefile themes/gtk/Makefile themes/iceg/Makefile themes/kde/Makefile themes/kindaker/Makefile themes/linea/Makefile themes/metabox/Makefile themes/microgui/Makefile themes/mofit/Makefile themes/next/Makefile themes/ops/Makefile themes/oroborus/Makefile themes/pills/Makefile themes/piranha/Makefile themes/platinum/Makefile themes/quinx/Makefile themes/r9x/Makefile themes/redmond/Makefile themes/redmondxp/Makefile themes/retro/Makefile themes/silverado/Makefile themes/slick/Makefile themes/slimline/Makefile themes/tabs/Makefile themes/trench/Makefile themes/variation/Makefile themes/xfce/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -4899,13 +4881,6 @@ echo "$as_me: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"am__fastdepCC\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
@@ -5347,6 +5322,7 @@ do
   "themes/curve/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/curve/Makefile" ;;
   "themes/default.keys/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/default.keys/Makefile" ;;
   "themes/eazel-blue/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/eazel-blue/Makefile" ;;
+  "themes/elberg/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/elberg/Makefile" ;;
   "themes/exocet/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/exocet/Makefile" ;;
   "themes/g2/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/g2/Makefile" ;;
   "themes/gnububble/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/gnububble/Makefile" ;;
@@ -5464,7 +5440,6 @@ s,@LIBS@,$LIBS,;t t
 s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
 s,@INSTALL_SCRIPT@,$INSTALL_SCRIPT,;t t
 s,@INSTALL_DATA@,$INSTALL_DATA,;t t
-s,@CYGPATH_W@,$CYGPATH_W,;t t
 s,@PACKAGE@,$PACKAGE,;t t
 s,@VERSION@,$VERSION,;t t
 s,@ACLOCAL@,$ACLOCAL,;t t
@@ -5493,8 +5468,6 @@ s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
 s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
 s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
 s,@CCDEPMODE@,$CCDEPMODE,;t t
-s,@am__fastdepCC_TRUE@,$am__fastdepCC_TRUE,;t t
-s,@am__fastdepCC_FALSE@,$am__fastdepCC_FALSE,;t t
 s,@CPP@,$CPP,;t t
 s,@X_CFLAGS@,$X_CFLAGS,;t t
 s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
@@ -5931,19 +5904,12 @@ echo "$as_me: error: cannot create directory \"$ac_dir\"" >&2;}
     cat $tmp/config.h
     rm -f $tmp/config.h
   fi
-_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
-echo "timestamp for $ac_file" >`(dirname $ac_file) 2>/dev/null ||
-$as_expr X$ac_file : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
-         X$ac_file : 'X\(//\)[^/]' \| \
-         X$ac_file : 'X\(//\)$' \| \
-         X$ac_file : 'X\(/\)' \| \
-         .     : '\(.\)' 2>/dev/null ||
-echo X$ac_file |
-    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
-  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
-  	  /^X\(\/\/\)$/{ s//\1/; q; }
-  	  /^X\(\/\).*/{ s//\1/; q; }
-  	  s/.*/./; q'`/stamp-h$_am_stamp_count
+  # Run the commands associated with the file.
+  case $ac_file in
+    config.h ) # update the timestamp
+echo 'timestamp for config.h' >"./stamp-h1"
+ ;;
+  esac
 done
 _ACEOF
 cat >>$CONFIG_STATUS <<\_ACEOF
diff --git a/configure.in b/configure.in
index bc72bf18ec39aaee256273e92a1847b63f91170d..8dfe5b18d8c99fde4c97a6e7089a484b2b5c541b 100644
--- a/configure.in
+++ b/configure.in
@@ -54,6 +54,7 @@ themes/cruxish/Makefile
 themes/curve/Makefile
 themes/default.keys/Makefile
 themes/eazel-blue/Makefile
+themes/elberg/Makefile
 themes/exocet/Makefile
 themes/g2/Makefile
 themes/gnububble/Makefile
diff --git a/defaults/Makefile.in b/defaults/Makefile.in
index c59038ca16e3a849eaf67792fb97a7bdd2c62ab0..016e7d50df6fd491dc96967e2393012ba43a0687 100644
--- a/defaults/Makefile.in
+++ b/defaults/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 defaultsdir = $(pkgdatadir)
 defaults_DATA = defaults
 EXTRA_DIST = defaults.in
@@ -149,22 +120,13 @@ uninstall-defaultsDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -249,14 +211,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-defaultsDATA uninstall-info-am
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -265,9 +219,8 @@ uninstall-am: uninstall-defaultsDATA uninstall-info-am
 	install-defaultsDATA install-exec install-exec-am install-info \
 	install-info-am install-man install-strip installcheck \
 	installcheck-am installdirs maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
-	pdf-am ps ps-am uninstall uninstall-am uninstall-defaultsDATA \
-	uninstall-info-am
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	uninstall uninstall-am uninstall-defaultsDATA uninstall-info-am
 
 
 distclean-local:
diff --git a/src/Makefile.in b/src/Makefile.in
index 97438a9bc858bb2b000ad4af0bc4814f8adc441d..01515d498d73efd90b6939396c5f31281e8d53b8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 bin_PROGRAMS = xfwm4
 xfwm4_SOURCES = \
 	client.c \
@@ -159,7 +130,11 @@ xfwm4_OBJECTS = $(am_xfwm4_OBJECTS)
 xfwm4_DEPENDENCIES =
 xfwm4_LDFLAGS =
 
+DEFS = @DEFS@
 DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
 depcomp = $(SHELL) $(top_srcdir)/depcomp
 am__depfiles_maybe = depfiles
 @AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/xfwm4-client.Po \
@@ -177,6 +152,7 @@ COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
 	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
 LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
 DIST_SOURCES = $(xfwm4_SOURCES)
 DIST_COMMON = Makefile.am Makefile.in
 SOURCES = $(xfwm4_SOURCES)
@@ -200,7 +176,7 @@ install-binPROGRAMS: $(bin_PROGRAMS)
 	  ; then \
 	    f=`echo "$$p1" | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'`; \
 	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
-	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f || exit 1; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
 	done
 
@@ -253,298 +229,166 @@ distclean-depend:
 	-rm -rf ./$(DEPDIR)
 
 .c.o:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `test -f '$<' || echo '$(srcdir)/'`$<
 
 .c.obj:
-@am__fastdepCC_TRUE@	if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o $@ `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/$*.Tpo" "$(DEPDIR)/$*.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/$*.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(COMPILE) -c `if test -f '$<'; then $(CYGPATH_W) '$<'; else $(CYGPATH_W) '$(srcdir)/$<'`
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(COMPILE) -c `cygpath -w $<`
 
 xfwm4-client.o: client.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-client.o -MD -MP -MF "$(DEPDIR)/xfwm4-client.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-client.o `test -f 'client.c' || echo '$(srcdir)/'`client.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-client.Tpo" "$(DEPDIR)/xfwm4-client.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-client.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client.c' object='xfwm4-client.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-client.Po' tmpdepfile='$(DEPDIR)/xfwm4-client.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-client.o `test -f 'client.c' || echo '$(srcdir)/'`client.c
+@AMDEP_TRUE@	source='client.c' object='xfwm4-client.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-client.Po' tmpdepfile='$(DEPDIR)/xfwm4-client.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-client.o `test -f 'client.c' || echo '$(srcdir)/'`client.c
 
 xfwm4-client.obj: client.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-client.obj -MD -MP -MF "$(DEPDIR)/xfwm4-client.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-client.obj `if test -f 'client.c'; then $(CYGPATH_W) 'client.c'; else $(CYGPATH_W) '$(srcdir)/client.c'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-client.Tpo" "$(DEPDIR)/xfwm4-client.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-client.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='client.c' object='xfwm4-client.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-client.Po' tmpdepfile='$(DEPDIR)/xfwm4-client.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-client.obj `if test -f 'client.c'; then $(CYGPATH_W) 'client.c'; else $(CYGPATH_W) '$(srcdir)/client.c'`
+@AMDEP_TRUE@	source='client.c' object='xfwm4-client.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-client.Po' tmpdepfile='$(DEPDIR)/xfwm4-client.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-client.obj `cygpath -w client.c`
 
 xfwm4-events.o: events.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-events.o -MD -MP -MF "$(DEPDIR)/xfwm4-events.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-events.o `test -f 'events.c' || echo '$(srcdir)/'`events.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-events.Tpo" "$(DEPDIR)/xfwm4-events.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-events.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='events.c' object='xfwm4-events.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-events.Po' tmpdepfile='$(DEPDIR)/xfwm4-events.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-events.o `test -f 'events.c' || echo '$(srcdir)/'`events.c
+@AMDEP_TRUE@	source='events.c' object='xfwm4-events.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-events.Po' tmpdepfile='$(DEPDIR)/xfwm4-events.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-events.o `test -f 'events.c' || echo '$(srcdir)/'`events.c
 
 xfwm4-events.obj: events.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-events.obj -MD -MP -MF "$(DEPDIR)/xfwm4-events.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-events.obj `if test -f 'events.c'; then $(CYGPATH_W) 'events.c'; else $(CYGPATH_W) '$(srcdir)/events.c'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-events.Tpo" "$(DEPDIR)/xfwm4-events.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-events.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='events.c' object='xfwm4-events.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-events.Po' tmpdepfile='$(DEPDIR)/xfwm4-events.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-events.obj `if test -f 'events.c'; then $(CYGPATH_W) 'events.c'; else $(CYGPATH_W) '$(srcdir)/events.c'`
+@AMDEP_TRUE@	source='events.c' object='xfwm4-events.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-events.Po' tmpdepfile='$(DEPDIR)/xfwm4-events.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-events.obj `cygpath -w events.c`
 
 xfwm4-frame.o: frame.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-frame.o -MD -MP -MF "$(DEPDIR)/xfwm4-frame.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-frame.o `test -f 'frame.c' || echo '$(srcdir)/'`frame.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-frame.Tpo" "$(DEPDIR)/xfwm4-frame.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-frame.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='frame.c' object='xfwm4-frame.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-frame.Po' tmpdepfile='$(DEPDIR)/xfwm4-frame.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-frame.o `test -f 'frame.c' || echo '$(srcdir)/'`frame.c
+@AMDEP_TRUE@	source='frame.c' object='xfwm4-frame.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-frame.Po' tmpdepfile='$(DEPDIR)/xfwm4-frame.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-frame.o `test -f 'frame.c' || echo '$(srcdir)/'`frame.c
 
 xfwm4-frame.obj: frame.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-frame.obj -MD -MP -MF "$(DEPDIR)/xfwm4-frame.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-frame.obj `if test -f 'frame.c'; then $(CYGPATH_W) 'frame.c'; else $(CYGPATH_W) '$(srcdir)/frame.c'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-frame.Tpo" "$(DEPDIR)/xfwm4-frame.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-frame.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='frame.c' object='xfwm4-frame.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-frame.Po' tmpdepfile='$(DEPDIR)/xfwm4-frame.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-frame.obj `if test -f 'frame.c'; then $(CYGPATH_W) 'frame.c'; else $(CYGPATH_W) '$(srcdir)/frame.c'`
+@AMDEP_TRUE@	source='frame.c' object='xfwm4-frame.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-frame.Po' tmpdepfile='$(DEPDIR)/xfwm4-frame.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-frame.obj `cygpath -w frame.c`
 
 xfwm4-hints.o: hints.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-hints.o -MD -MP -MF "$(DEPDIR)/xfwm4-hints.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-hints.o `test -f 'hints.c' || echo '$(srcdir)/'`hints.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-hints.Tpo" "$(DEPDIR)/xfwm4-hints.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-hints.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hints.c' object='xfwm4-hints.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-hints.Po' tmpdepfile='$(DEPDIR)/xfwm4-hints.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-hints.o `test -f 'hints.c' || echo '$(srcdir)/'`hints.c
+@AMDEP_TRUE@	source='hints.c' object='xfwm4-hints.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-hints.Po' tmpdepfile='$(DEPDIR)/xfwm4-hints.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-hints.o `test -f 'hints.c' || echo '$(srcdir)/'`hints.c
 
 xfwm4-hints.obj: hints.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-hints.obj -MD -MP -MF "$(DEPDIR)/xfwm4-hints.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-hints.obj `if test -f 'hints.c'; then $(CYGPATH_W) 'hints.c'; else $(CYGPATH_W) '$(srcdir)/hints.c'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-hints.Tpo" "$(DEPDIR)/xfwm4-hints.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-hints.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='hints.c' object='xfwm4-hints.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-hints.Po' tmpdepfile='$(DEPDIR)/xfwm4-hints.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-hints.obj `if test -f 'hints.c'; then $(CYGPATH_W) 'hints.c'; else $(CYGPATH_W) '$(srcdir)/hints.c'`
+@AMDEP_TRUE@	source='hints.c' object='xfwm4-hints.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-hints.Po' tmpdepfile='$(DEPDIR)/xfwm4-hints.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-hints.obj `cygpath -w hints.c`
 
 xfwm4-keyboard.o: keyboard.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-keyboard.o -MD -MP -MF "$(DEPDIR)/xfwm4-keyboard.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-keyboard.o `test -f 'keyboard.c' || echo '$(srcdir)/'`keyboard.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-keyboard.Tpo" "$(DEPDIR)/xfwm4-keyboard.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-keyboard.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='keyboard.c' object='xfwm4-keyboard.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-keyboard.Po' tmpdepfile='$(DEPDIR)/xfwm4-keyboard.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-keyboard.o `test -f 'keyboard.c' || echo '$(srcdir)/'`keyboard.c
+@AMDEP_TRUE@	source='keyboard.c' object='xfwm4-keyboard.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-keyboard.Po' tmpdepfile='$(DEPDIR)/xfwm4-keyboard.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-keyboard.o `test -f 'keyboard.c' || echo '$(srcdir)/'`keyboard.c
 
 xfwm4-keyboard.obj: keyboard.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-keyboard.obj -MD -MP -MF "$(DEPDIR)/xfwm4-keyboard.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-keyboard.obj `if test -f 'keyboard.c'; then $(CYGPATH_W) 'keyboard.c'; else $(CYGPATH_W) '$(srcdir)/keyboard.c'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-keyboard.Tpo" "$(DEPDIR)/xfwm4-keyboard.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-keyboard.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='keyboard.c' object='xfwm4-keyboard.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-keyboard.Po' tmpdepfile='$(DEPDIR)/xfwm4-keyboard.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-keyboard.obj `if test -f 'keyboard.c'; then $(CYGPATH_W) 'keyboard.c'; else $(CYGPATH_W) '$(srcdir)/keyboard.c'`
+@AMDEP_TRUE@	source='keyboard.c' object='xfwm4-keyboard.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-keyboard.Po' tmpdepfile='$(DEPDIR)/xfwm4-keyboard.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-keyboard.obj `cygpath -w keyboard.c`
 
 xfwm4-main.o: main.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-main.o -MD -MP -MF "$(DEPDIR)/xfwm4-main.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-main.Tpo" "$(DEPDIR)/xfwm4-main.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-main.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='xfwm4-main.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-main.Po' tmpdepfile='$(DEPDIR)/xfwm4-main.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
+@AMDEP_TRUE@	source='main.c' object='xfwm4-main.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-main.Po' tmpdepfile='$(DEPDIR)/xfwm4-main.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-main.o `test -f 'main.c' || echo '$(srcdir)/'`main.c
 
 xfwm4-main.obj: main.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-main.obj -MD -MP -MF "$(DEPDIR)/xfwm4-main.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-main.Tpo" "$(DEPDIR)/xfwm4-main.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-main.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='main.c' object='xfwm4-main.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-main.Po' tmpdepfile='$(DEPDIR)/xfwm4-main.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-main.obj `if test -f 'main.c'; then $(CYGPATH_W) 'main.c'; else $(CYGPATH_W) '$(srcdir)/main.c'`
+@AMDEP_TRUE@	source='main.c' object='xfwm4-main.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-main.Po' tmpdepfile='$(DEPDIR)/xfwm4-main.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-main.obj `cygpath -w main.c`
 
 xfwm4-menu.o: menu.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-menu.o -MD -MP -MF "$(DEPDIR)/xfwm4-menu.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-menu.o `test -f 'menu.c' || echo '$(srcdir)/'`menu.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-menu.Tpo" "$(DEPDIR)/xfwm4-menu.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-menu.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='menu.c' object='xfwm4-menu.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-menu.Po' tmpdepfile='$(DEPDIR)/xfwm4-menu.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-menu.o `test -f 'menu.c' || echo '$(srcdir)/'`menu.c
+@AMDEP_TRUE@	source='menu.c' object='xfwm4-menu.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-menu.Po' tmpdepfile='$(DEPDIR)/xfwm4-menu.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-menu.o `test -f 'menu.c' || echo '$(srcdir)/'`menu.c
 
 xfwm4-menu.obj: menu.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-menu.obj -MD -MP -MF "$(DEPDIR)/xfwm4-menu.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-menu.obj `if test -f 'menu.c'; then $(CYGPATH_W) 'menu.c'; else $(CYGPATH_W) '$(srcdir)/menu.c'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-menu.Tpo" "$(DEPDIR)/xfwm4-menu.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-menu.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='menu.c' object='xfwm4-menu.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-menu.Po' tmpdepfile='$(DEPDIR)/xfwm4-menu.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-menu.obj `if test -f 'menu.c'; then $(CYGPATH_W) 'menu.c'; else $(CYGPATH_W) '$(srcdir)/menu.c'`
+@AMDEP_TRUE@	source='menu.c' object='xfwm4-menu.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-menu.Po' tmpdepfile='$(DEPDIR)/xfwm4-menu.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-menu.obj `cygpath -w menu.c`
 
 xfwm4-misc.o: misc.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-misc.o -MD -MP -MF "$(DEPDIR)/xfwm4-misc.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-misc.o `test -f 'misc.c' || echo '$(srcdir)/'`misc.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-misc.Tpo" "$(DEPDIR)/xfwm4-misc.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-misc.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='misc.c' object='xfwm4-misc.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-misc.Po' tmpdepfile='$(DEPDIR)/xfwm4-misc.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-misc.o `test -f 'misc.c' || echo '$(srcdir)/'`misc.c
+@AMDEP_TRUE@	source='misc.c' object='xfwm4-misc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-misc.Po' tmpdepfile='$(DEPDIR)/xfwm4-misc.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-misc.o `test -f 'misc.c' || echo '$(srcdir)/'`misc.c
 
 xfwm4-misc.obj: misc.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-misc.obj -MD -MP -MF "$(DEPDIR)/xfwm4-misc.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-misc.obj `if test -f 'misc.c'; then $(CYGPATH_W) 'misc.c'; else $(CYGPATH_W) '$(srcdir)/misc.c'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-misc.Tpo" "$(DEPDIR)/xfwm4-misc.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-misc.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='misc.c' object='xfwm4-misc.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-misc.Po' tmpdepfile='$(DEPDIR)/xfwm4-misc.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-misc.obj `if test -f 'misc.c'; then $(CYGPATH_W) 'misc.c'; else $(CYGPATH_W) '$(srcdir)/misc.c'`
+@AMDEP_TRUE@	source='misc.c' object='xfwm4-misc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-misc.Po' tmpdepfile='$(DEPDIR)/xfwm4-misc.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-misc.obj `cygpath -w misc.c`
 
 xfwm4-parserc.o: parserc.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-parserc.o -MD -MP -MF "$(DEPDIR)/xfwm4-parserc.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-parserc.o `test -f 'parserc.c' || echo '$(srcdir)/'`parserc.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-parserc.Tpo" "$(DEPDIR)/xfwm4-parserc.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-parserc.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parserc.c' object='xfwm4-parserc.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-parserc.Po' tmpdepfile='$(DEPDIR)/xfwm4-parserc.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-parserc.o `test -f 'parserc.c' || echo '$(srcdir)/'`parserc.c
+@AMDEP_TRUE@	source='parserc.c' object='xfwm4-parserc.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-parserc.Po' tmpdepfile='$(DEPDIR)/xfwm4-parserc.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-parserc.o `test -f 'parserc.c' || echo '$(srcdir)/'`parserc.c
 
 xfwm4-parserc.obj: parserc.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-parserc.obj -MD -MP -MF "$(DEPDIR)/xfwm4-parserc.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-parserc.obj `if test -f 'parserc.c'; then $(CYGPATH_W) 'parserc.c'; else $(CYGPATH_W) '$(srcdir)/parserc.c'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-parserc.Tpo" "$(DEPDIR)/xfwm4-parserc.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-parserc.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='parserc.c' object='xfwm4-parserc.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-parserc.Po' tmpdepfile='$(DEPDIR)/xfwm4-parserc.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-parserc.obj `if test -f 'parserc.c'; then $(CYGPATH_W) 'parserc.c'; else $(CYGPATH_W) '$(srcdir)/parserc.c'`
+@AMDEP_TRUE@	source='parserc.c' object='xfwm4-parserc.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-parserc.Po' tmpdepfile='$(DEPDIR)/xfwm4-parserc.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-parserc.obj `cygpath -w parserc.c`
 
 xfwm4-pixmap.o: pixmap.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-pixmap.o -MD -MP -MF "$(DEPDIR)/xfwm4-pixmap.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-pixmap.o `test -f 'pixmap.c' || echo '$(srcdir)/'`pixmap.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-pixmap.Tpo" "$(DEPDIR)/xfwm4-pixmap.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-pixmap.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pixmap.c' object='xfwm4-pixmap.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-pixmap.Po' tmpdepfile='$(DEPDIR)/xfwm4-pixmap.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-pixmap.o `test -f 'pixmap.c' || echo '$(srcdir)/'`pixmap.c
+@AMDEP_TRUE@	source='pixmap.c' object='xfwm4-pixmap.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-pixmap.Po' tmpdepfile='$(DEPDIR)/xfwm4-pixmap.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-pixmap.o `test -f 'pixmap.c' || echo '$(srcdir)/'`pixmap.c
 
 xfwm4-pixmap.obj: pixmap.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-pixmap.obj -MD -MP -MF "$(DEPDIR)/xfwm4-pixmap.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-pixmap.obj `if test -f 'pixmap.c'; then $(CYGPATH_W) 'pixmap.c'; else $(CYGPATH_W) '$(srcdir)/pixmap.c'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-pixmap.Tpo" "$(DEPDIR)/xfwm4-pixmap.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-pixmap.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='pixmap.c' object='xfwm4-pixmap.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-pixmap.Po' tmpdepfile='$(DEPDIR)/xfwm4-pixmap.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-pixmap.obj `if test -f 'pixmap.c'; then $(CYGPATH_W) 'pixmap.c'; else $(CYGPATH_W) '$(srcdir)/pixmap.c'`
+@AMDEP_TRUE@	source='pixmap.c' object='xfwm4-pixmap.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-pixmap.Po' tmpdepfile='$(DEPDIR)/xfwm4-pixmap.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-pixmap.obj `cygpath -w pixmap.c`
 
 xfwm4-settings.o: settings.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-settings.o -MD -MP -MF "$(DEPDIR)/xfwm4-settings.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-settings.o `test -f 'settings.c' || echo '$(srcdir)/'`settings.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-settings.Tpo" "$(DEPDIR)/xfwm4-settings.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-settings.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='settings.c' object='xfwm4-settings.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-settings.Po' tmpdepfile='$(DEPDIR)/xfwm4-settings.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-settings.o `test -f 'settings.c' || echo '$(srcdir)/'`settings.c
+@AMDEP_TRUE@	source='settings.c' object='xfwm4-settings.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-settings.Po' tmpdepfile='$(DEPDIR)/xfwm4-settings.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-settings.o `test -f 'settings.c' || echo '$(srcdir)/'`settings.c
 
 xfwm4-settings.obj: settings.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-settings.obj -MD -MP -MF "$(DEPDIR)/xfwm4-settings.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-settings.obj `if test -f 'settings.c'; then $(CYGPATH_W) 'settings.c'; else $(CYGPATH_W) '$(srcdir)/settings.c'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-settings.Tpo" "$(DEPDIR)/xfwm4-settings.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-settings.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='settings.c' object='xfwm4-settings.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-settings.Po' tmpdepfile='$(DEPDIR)/xfwm4-settings.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-settings.obj `if test -f 'settings.c'; then $(CYGPATH_W) 'settings.c'; else $(CYGPATH_W) '$(srcdir)/settings.c'`
+@AMDEP_TRUE@	source='settings.c' object='xfwm4-settings.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-settings.Po' tmpdepfile='$(DEPDIR)/xfwm4-settings.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-settings.obj `cygpath -w settings.c`
 
 xfwm4-workspaces.o: workspaces.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-workspaces.o -MD -MP -MF "$(DEPDIR)/xfwm4-workspaces.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-workspaces.o `test -f 'workspaces.c' || echo '$(srcdir)/'`workspaces.c; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-workspaces.Tpo" "$(DEPDIR)/xfwm4-workspaces.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-workspaces.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='workspaces.c' object='xfwm4-workspaces.o' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-workspaces.Po' tmpdepfile='$(DEPDIR)/xfwm4-workspaces.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-workspaces.o `test -f 'workspaces.c' || echo '$(srcdir)/'`workspaces.c
+@AMDEP_TRUE@	source='workspaces.c' object='xfwm4-workspaces.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-workspaces.Po' tmpdepfile='$(DEPDIR)/xfwm4-workspaces.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-workspaces.o `test -f 'workspaces.c' || echo '$(srcdir)/'`workspaces.c
 
 xfwm4-workspaces.obj: workspaces.c
-@am__fastdepCC_TRUE@	if $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -MT xfwm4-workspaces.obj -MD -MP -MF "$(DEPDIR)/xfwm4-workspaces.Tpo" \
-@am__fastdepCC_TRUE@	  -c -o xfwm4-workspaces.obj `if test -f 'workspaces.c'; then $(CYGPATH_W) 'workspaces.c'; else $(CYGPATH_W) '$(srcdir)/workspaces.c'`; \
-@am__fastdepCC_TRUE@	then mv "$(DEPDIR)/xfwm4-workspaces.Tpo" "$(DEPDIR)/xfwm4-workspaces.Po"; \
-@am__fastdepCC_TRUE@	else rm -f "$(DEPDIR)/xfwm4-workspaces.Tpo"; exit 1; \
-@am__fastdepCC_TRUE@	fi
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	source='workspaces.c' object='xfwm4-workspaces.obj' libtool=no @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	depfile='$(DEPDIR)/xfwm4-workspaces.Po' tmpdepfile='$(DEPDIR)/xfwm4-workspaces.TPo' @AMDEPBACKSLASH@
-@AMDEP_TRUE@@am__fastdepCC_FALSE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-@am__fastdepCC_FALSE@	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-workspaces.obj `if test -f 'workspaces.c'; then $(CYGPATH_W) 'workspaces.c'; else $(CYGPATH_W) '$(srcdir)/workspaces.c'`
+@AMDEP_TRUE@	source='workspaces.c' object='xfwm4-workspaces.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-workspaces.Po' tmpdepfile='$(DEPDIR)/xfwm4-workspaces.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-workspaces.obj `cygpath -w workspaces.c`
+CCDEPMODE = @CCDEPMODE@
 uninstall-info-am:
 
 ETAGS = etags
 ETAGSFLAGS =
 
-CTAGS = ctags
-CTAGSFLAGS =
-
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -570,41 +414,20 @@ TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	     $$tags $$unique
 
-ctags: CTAGS
-CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -690,26 +513,18 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-compile mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 
-.PHONY: CTAGS GTAGS all all-am check check-am clean clean-binPROGRAMS \
-	clean-generic ctags distclean distclean-compile \
-	distclean-depend distclean-generic distclean-tags distdir dvi \
-	dvi-am info info-am install install-am install-binPROGRAMS \
-	install-data install-data-am install-exec install-exec-am \
-	install-info install-info-am install-man install-strip \
-	installcheck installcheck-am installdirs maintainer-clean \
+.PHONY: GTAGS all all-am check check-am clean clean-binPROGRAMS \
+	clean-generic distclean distclean-compile distclean-depend \
+	distclean-generic distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-binPROGRAMS install-data \
+	install-data-am install-exec install-exec-am install-info \
+	install-info-am install-man install-strip installcheck \
+	installcheck-am installdirs maintainer-clean \
 	maintainer-clean-generic mostlyclean mostlyclean-compile \
-	mostlyclean-generic pdf pdf-am ps ps-am tags uninstall \
-	uninstall-am uninstall-binPROGRAMS uninstall-info-am
+	mostlyclean-generic tags uninstall uninstall-am \
+	uninstall-binPROGRAMS uninstall-info-am
 
 # 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/themes/Makefile.am b/themes/Makefile.am
index 19b653c9d996b662b5be9946365924b1edf2bd63..b73d54669cf39cd473e098752ac122ef1a5e4b7a 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -12,6 +12,7 @@ cruxish \
 curve \
 default.keys \
 eazel-blue \
+elberg \
 exocet \
 g2 \
 gnububble \
diff --git a/themes/Makefile.in b/themes/Makefile.in
index fd5db41ccfbb90647b2f4fd26ac89a8441dc5357..61fa5984fc3fde68b42d0ecca9950953d04e1adf 100644
--- a/themes/Makefile.in
+++ b/themes/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 SUBDIRS = \
 adept \
 agua \
@@ -122,6 +93,7 @@ cruxish \
 curve \
 default.keys \
 eazel-blue \
+elberg \
 exocet \
 g2 \
 gnububble \
@@ -159,11 +131,10 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES =
 DIST_SOURCES =
 
-RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
-	ps-recursive install-info-recursive uninstall-info-recursive \
-	all-recursive install-data-recursive install-exec-recursive \
-	installdirs-recursive install-recursive uninstall-recursive \
-	check-recursive installcheck-recursive
+RECURSIVE_TARGETS = info-recursive dvi-recursive install-info-recursive \
+	uninstall-info-recursive all-recursive install-data-recursive \
+	install-exec-recursive installdirs-recursive install-recursive \
+	uninstall-recursive check-recursive installcheck-recursive
 DIST_COMMON = Makefile.am Makefile.in
 DIST_SUBDIRS = $(SUBDIRS)
 all: all-recursive
@@ -230,17 +201,10 @@ tags-recursive:
 	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
-ctags-recursive:
-	list='$(SUBDIRS)'; for subdir in $$list; do \
-	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
-	done
 
 ETAGS = etags
 ETAGSFLAGS =
 
-CTAGS = ctags
-CTAGSFLAGS =
-
 tags: TAGS
 
 ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
@@ -271,41 +235,20 @@ TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
 	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
 	     $$tags $$unique
 
-ctags: CTAGS
-CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
-		$(TAGS_FILES) $(LISP)
-	tags=; \
-	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
-	unique=`for i in $$list; do \
-	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
-	  done | \
-	  $(AWK) '    { files[$$0] = 1; } \
-	       END { for (i in files) print i; }'`; \
-	test -z "$(CTAGS_ARGS)$$tags$$unique" \
-	  || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
-	     $$tags $$unique
-
 GTAGS:
 	here=`$(am__cd) $(top_builddir) && pwd` \
 	  && cd $(top_srcdir) \
 	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -402,32 +345,24 @@ mostlyclean: mostlyclean-recursive
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-recursive
-
-pdf-am:
-
-ps: ps-recursive
-
-ps-am:
-
 uninstall-am: uninstall-info-am
 
 uninstall-info: uninstall-info-recursive
 
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
-	clean-generic clean-recursive ctags ctags-recursive distclean \
-	distclean-generic distclean-recursive distclean-tags distdir \
-	dvi dvi-am dvi-recursive info info-am info-recursive install \
-	install-am install-data install-data-am install-data-recursive \
+.PHONY: $(RECURSIVE_TARGETS) GTAGS all all-am check check-am clean \
+	clean-generic clean-recursive distclean distclean-generic \
+	distclean-recursive distclean-tags distdir dvi dvi-am \
+	dvi-recursive info info-am info-recursive install install-am \
+	install-data install-data-am install-data-recursive \
 	install-exec install-exec-am install-exec-recursive \
 	install-info install-info-am install-info-recursive install-man \
 	install-recursive install-strip installcheck installcheck-am \
 	installdirs installdirs-am installdirs-recursive \
 	maintainer-clean maintainer-clean-generic \
 	maintainer-clean-recursive mostlyclean mostlyclean-generic \
-	mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
-	ps-recursive tags tags-recursive uninstall uninstall-am \
-	uninstall-info-am uninstall-info-recursive uninstall-recursive
+	mostlyclean-recursive tags tags-recursive uninstall \
+	uninstall-am uninstall-info-am uninstall-info-recursive \
+	uninstall-recursive
 
 # 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/themes/adept/Makefile.in b/themes/adept/Makefile.in
index b35fb689f5e90352dd0b093653de56ef794609e6..a67efd1e552acc8a9fc3d4c3a52f372e96c5fc11 100644
--- a/themes/adept/Makefile.in
+++ b/themes/adept/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/adept
 theme_DATA = README \
 	bottom-active.xpm \
@@ -184,22 +155,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -284,14 +246,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -300,8 +254,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/agua/Makefile.in b/themes/agua/Makefile.in
index 63f3583f959a1f0deb62d9364fce73338bd0f6e6..9a2d8d6bd906a518f5ca20ad90d2cd0348d73023 100644
--- a/themes/agua/Makefile.in
+++ b/themes/agua/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/agua
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/b5/Makefile.in b/themes/b5/Makefile.in
index 369a160f06ce311feb236f65314c6ca380dfd6cf..0266f9c3d8aed1b79218c65f740a35a762c1ae01 100644
--- a/themes/b5/Makefile.in
+++ b/themes/b5/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/b5
 theme_DATA = README \
 	bottom-active.xpm \
@@ -178,22 +149,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -278,14 +240,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -294,8 +248,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/b6/Makefile.in b/themes/b6/Makefile.in
index ddd265e2dc31ce4d4547dec61c611ee639ebe1da..64c60e2c25ad445a22385ccbc5aa780d4d9eb5f0 100644
--- a/themes/b6/Makefile.in
+++ b/themes/b6/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/b6
 theme_DATA = README \
 	bottom-active.xpm \
@@ -187,22 +158,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -287,14 +249,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -303,8 +257,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/bbs/Makefile.in b/themes/bbs/Makefile.in
index ff39d0a974b93e28308123f86f6b575b79af3cc6..361d544c2bc503e01dc06322a4428ce611401868 100644
--- a/themes/bbs/Makefile.in
+++ b/themes/bbs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/bbs
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/biz/Makefile.in b/themes/biz/Makefile.in
index 44119b66d0dcb21824b227f6087668456f4ea657..5514100254511c009768081db918f2ec10fa5b91 100644
--- a/themes/biz/Makefile.in
+++ b/themes/biz/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/biz
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/coldsteel/Makefile.in b/themes/coldsteel/Makefile.in
index 29cedc2030017394c9ca3158b20d65ab6b1b6d57..7df3617492d0e3c328c472ee6008da6834d0a480 100644
--- a/themes/coldsteel/Makefile.in
+++ b/themes/coldsteel/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/coldsteel
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/coolclean/Makefile.in b/themes/coolclean/Makefile.in
index 6e2c60bf4ef93af10ef084bd6a36b041a6196aed..9d3a92bfd69e6fac36d34135e0aa872feb7d44ad 100644
--- a/themes/coolclean/Makefile.in
+++ b/themes/coolclean/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/coolclean
 theme_DATA = README \
 	bottom-active.xpm \
@@ -187,22 +158,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -287,14 +249,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -303,8 +257,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/crux/Makefile.in b/themes/crux/Makefile.in
index cbf2bc9632e8cac9f0268e4b8a1f29c796bfdebd..8978b8dd1028308aa9100a3cf1a228fc1b08ebec 100644
--- a/themes/crux/Makefile.in
+++ b/themes/crux/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/crux
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/cruxish/Makefile.in b/themes/cruxish/Makefile.in
index c54415db875a1bfad1bde22aa7ef75dfba30f4c2..d5cc43c41cb1b80e6fbe27ba3ba31ce72d70e6f8 100644
--- a/themes/cruxish/Makefile.in
+++ b/themes/cruxish/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/cruxish
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/curve/Makefile.in b/themes/curve/Makefile.in
index 5a91088f458c1c16159ada3763c8e8299ce8ee46..62f0e202053dc57f8d835de6b6d189265ec3862e 100644
--- a/themes/curve/Makefile.in
+++ b/themes/curve/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/curve
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/default.keys/Makefile.in b/themes/default.keys/Makefile.in
index e8235db335b316678af157c727b43e568fe632f9..d84393f5f7f10f2dbfb3e3ad0853dfa90ca8166e 100644
--- a/themes/default.keys/Makefile.in
+++ b/themes/default.keys/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/default.keys
 theme_DATA = keythemerc
 EXTRA_DIST = $(theme_DATA)
@@ -149,22 +120,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -249,14 +211,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -265,8 +219,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/eazel-blue/Makefile.in b/themes/eazel-blue/Makefile.in
index 0276c41f9a75e8be8c39b7aa05a2fc3e295380ad..fd46d4ffc45feee200733cfb30e4b60a15b99af4 100644
--- a/themes/eazel-blue/Makefile.in
+++ b/themes/eazel-blue/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/eazel-blue
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/elberg/Makefile.am b/themes/elberg/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..ec433661efdac289eb1585283a5789d00438e4e2
--- /dev/null
+++ b/themes/elberg/Makefile.am
@@ -0,0 +1,40 @@
+themedir = $(pkgdatadir)/themes/elberg
+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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.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)
diff --git a/themes/elberg/Makefile.in b/themes/elberg/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..ca33923918d718e5b0119ac8c66935d29396a7f9
--- /dev/null
+++ b/themes/elberg/Makefile.in
@@ -0,0 +1,265 @@
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = @program_transform_name@
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+AMTAR = @AMTAR@
+AWK = @AWK@
+CC = @CC@
+DEPDIR = @DEPDIR@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+PACKAGE = @PACKAGE@
+PKG_CONFIG = @PKG_CONFIG@
+STRIP = @STRIP@
+VERSION = @VERSION@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+am__include = @am__include@
+am__quote = @am__quote@
+install_sh = @install_sh@
+themedir = $(pkgdatadir)/themes/elberg
+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 \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.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)
+subdir = themes/elberg
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
+
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/elberg/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+uninstall-info-am:
+themeDATA_INSTALL = $(INSTALL_DATA)
+install-themeDATA: $(theme_DATA)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
+	@list='$(theme_DATA)'; for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f"; \
+	  $(themeDATA_INSTALL) $$d$$p $(DESTDIR)$(themedir)/$$f; \
+	done
+
+uninstall-themeDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(theme_DATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(themedir)/$$f"; \
+	  rm -f $(DESTDIR)$(themedir)/$$f; \
+	done
+tags: TAGS
+TAGS:
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@list='$(DISTFILES)'; for file in $$list; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-themeDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+uninstall-am: uninstall-info-am uninstall-themeDATA
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distdir dvi dvi-am info info-am install \
+	install-am install-data install-data-am install-exec \
+	install-exec-am install-info install-info-am install-man \
+	install-strip install-themeDATA installcheck installcheck-am \
+	installdirs maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
+
+# 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/elberg/README b/themes/elberg/README
new file mode 100644
index 0000000000000000000000000000000000000000..7e37fe63270b8e975e3fbc1e2f59734c7eb1497a
--- /dev/null
+++ b/themes/elberg/README
@@ -0,0 +1,60 @@
+elberg
+------
+
+A port of the sawfish theme Elberg by Dagmar.
+
+Here follows original README file :
+
+Elberg v1.0 
+
+This theme uses 95% original artwork done by me, Dagmar.
+
+2.5% is the colors of the outline borders for both normal and transient
+windows, which I freely admit I borrowed from the microGUI theme (as well as
+the initial theme.jl file, but I had to start *somewhere*... having been
+unable to find some reasonable documentation for sawfish-themer) since they
+work so well with everything.
+
+The remaining 2.5% are the colors taken right out of the classic Cheese GTK
+theme, which is also fine since this theme was meant to be used with it.
+
+I got *very* tired of the tinting of my widgets making my window titles appear
+to be slightly bleached out.  This theme also has properly smoothed ends on
+the rolled up windows, and all buttons have both highlight and clicked images.
+
+Oh... The ICONS are something entirely new.  I admit I am woefully bored with
+the somewhat overused arrows pointing this way and that, and just came up
+with some icons that have enough of an alien look to be interesting while
+still being obvious enough for people to figure out what they are from looking
+at them.
+
+ - The Three Dots represent increasing complexity, and refer to the fact
+   that this button reveals the window control menu.
+
+ - The Whoosh Mark represents the window being whisked away into a corner
+   and/or titlebar by iconification.
+
+ - The Expanding Dot represents making the window bigger, i.e., maximizing.
+
+ - The X is still the best and only way I can think of to represent killing
+   the app.
+
+
+TODOS:
+
+ - Think about convering the hollowed area for text into something that can be
+   configured to use different colors.
+
+ - Redo the two beveled edges around the hollow area to have a one-pixel
+   thickness instead of what it is now (closer to two).
+
+ - MAYBE go back through and re-twiddle all those PNGs explicitly nuke their
+   alpha layer.  Hopefully it's not going to impact people's performance.
+
+ - Find out how to assign Trebuchet MS as the default font for the titlebars.
+
+
+Comments, suggestions (don't ask me how to install, AND NO SPAM!)
+"Dagmar" d'Surreal
+        at
+          speakeasy.net
diff --git a/themes/elberg/bottom-active.xpm b/themes/elberg/bottom-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..d1d979f51aee0fae215bf0aab853be0dfcdc4229
--- /dev/null
+++ b/themes/elberg/bottom-active.xpm
@@ -0,0 +1,15 @@
+/* XPM */
+static char * bottom_active_xpm[] = {
+"16 6 6 1",
+" 	c None",
+".	c #313031",
+"+	c #FFFFFF",
+"@	c #C6C7AD",
+"#	c #94926B",
+"$	c #4A4D4A",
+"................",
+"++++++++++++++++",
+"@@@@@@@@@@@@@@@@",
+"################",
+"................",
+"$$$$$$$$$$$$$$$$"};
diff --git a/themes/elberg/bottom-inactive.xpm b/themes/elberg/bottom-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..f878604e6c40977a21a768ebc2d97376a7704ed1
--- /dev/null
+++ b/themes/elberg/bottom-inactive.xpm
@@ -0,0 +1,16 @@
+/* XPM */
+static char * bottom_inactive_xpm[] = {
+"16 6 7 1",
+" 	c None",
+".	c #2F2E2F",
+"+	c #E4E4E4",
+"@	c #ADAE97",
+"#	c #81805E",
+"$	c #2E2D2E",
+"%	c #4A4D4A",
+"................",
+"++++++++++++++++",
+"@@@@@@@@@@@@@@@@",
+"################",
+"$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%"};
diff --git a/themes/elberg/bottom-left-active.xpm b/themes/elberg/bottom-left-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..bb683cb702404034748e11e075b402560a45002c
--- /dev/null
+++ b/themes/elberg/bottom-left-active.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char * bottom_left_active_xpm[] = {
+"16 16 7 1",
+" 	c None",
+".	c #4A4D4A",
+"+	c #313031",
+"@	c #F7F3EF",
+"#	c #C6C7AD",
+"$	c #94926B",
+"%	c #FFFFFF",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$+++++++++++",
+".+%#$%%%%%%%%%%%",
+".+@#############",
+".+@#$$$$$$$$$$$$",
+".+++++++++++++++",
+"................"};
diff --git a/themes/elberg/bottom-left-inactive.xpm b/themes/elberg/bottom-left-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..84797b74aa5fdbedda878a48c43bfdc2d2acdf3a
--- /dev/null
+++ b/themes/elberg/bottom-left-inactive.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * bottom_left_inactive_xpm[] = {
+"16 16 12 1",
+" 	c None",
+".	c #4A4D4A",
+"+	c #2E2D2E",
+"@	c #D8D5D1",
+"#	c #ADAE97",
+"$	c #81805E",
+"%	c #2D2C2D",
+"&	c #2F2E2F",
+"*	c #DFDFDF",
+"=	c #E1E1E1",
+"-	c #E4E4E4",
+";	c #302E30",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$+          ",
+".+@#$%&&&&&&&&&&",
+".+*#$=----------",
+".+@#############",
+".+@#$$$$$$$$$$$$",
+".;++++++++++++++",
+"................"};
diff --git a/themes/elberg/bottom-right-active.xpm b/themes/elberg/bottom-right-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..31c272e12a5ccafeee46bec54669b9831922a9b7
--- /dev/null
+++ b/themes/elberg/bottom-right-active.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * bottom_right_active_xpm[] = {
+"16 16 6 1",
+" 	c None",
+".	c #313031",
+"+	c #FFFFFF",
+"@	c #C6C7AD",
+"#	c #94926B",
+"$	c #4A4D4A",
+"          .+@#.$",
+"          .+@#.$",
+"          .+@#.$",
+"          .+@#.$",
+"          .+@#.$",
+"          .+@#.$",
+"          .+@#.$",
+"          .+@#.$",
+"          .+@#.$",
+"          .+@#.$",
+"...........+@#.$",
+"++++++++++++@#.$",
+"@@@@@@@@@@@@@#.$",
+"##############.$",
+"...............$",
+"$$$$$$$$$$$$$$$$"};
diff --git a/themes/elberg/bottom-right-inactive.xpm b/themes/elberg/bottom-right-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..aede9b9e7400a4fd9fcc00397375eab6c89663bf
--- /dev/null
+++ b/themes/elberg/bottom-right-inactive.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * bottom_right_inactive_xpm[] = {
+"16 16 9 1",
+" 	c None",
+".	c #2F2E2F",
+"+	c #E4E4E4",
+"@	c #ADAE97",
+"#	c #81805E",
+"$	c #2E2D2E",
+"%	c #4A4D4A",
+"&	c #E1E1E1",
+"*	c #302E30",
+"          .+@#$%",
+"          .+@#$%",
+"          .+@#$%",
+"          .+@#$%",
+"          .+@#$%",
+"          .+@#$%",
+"          .+@#$%",
+"          .+@#$%",
+"          .+@#$%",
+"          .+@#$%",
+"..........$+@#$%",
+"+++++++++++&@#$%",
+"@@@@@@@@@@@@@#$%",
+"##############$%",
+"$$$$$$$$$$$$$$*%",
+"%%%%%%%%%%%%%%%%"};
diff --git a/themes/elberg/close-active.xpm b/themes/elberg/close-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..24bb4104d796cae406084f027cdba033f929d238
--- /dev/null
+++ b/themes/elberg/close-active.xpm
@@ -0,0 +1,214 @@
+/* XPM */
+static char * close_active_xpm[] = {
+"16 19 192 2",
+"  	c None",
+". 	c #4A4D4A",
+"+ 	c #313031",
+"@ 	c #F6F1ED",
+"# 	c #F0ECE5",
+"$ 	c #C2BFB9",
+"% 	c #66652D",
+"& 	c #959287",
+"* 	c #ECEAE1",
+"= 	c #D4DFCA",
+"- 	c #D6E0CC",
+"; 	c #EEEBE3",
+"> 	c #CAC6C0",
+", 	c #646241",
+"' 	c #C1BEB9",
+") 	c #E9E5DC",
+"! 	c #BCB9B2",
+"~ 	c #7F7F42",
+"{ 	c #FDFC5F",
+"] 	c #ABA32D",
+"^ 	c #10640E",
+"/ 	c #008300",
+"( 	c #008500",
+"_ 	c #138212",
+": 	c #7B7F40",
+"< 	c #FBED52",
+"[ 	c #736629",
+"} 	c #BBB8B1",
+"| 	c #E2DFD4",
+"1 	c #B6B4AB",
+"2 	c #7E7E40",
+"3 	c #FDFA72",
+"4 	c #FEF04D",
+"5 	c #FBE733",
+"6 	c #7D781A",
+"7 	c #007200",
+"8 	c #008800",
+"9 	c #446420",
+"0 	c #F8EC6D",
+"a 	c #FFD94D",
+"b 	c #F8CE28",
+"c 	c #6D5C21",
+"d 	c #B5B3AA",
+"e 	c #DCD8CB",
+"f 	c #62613D",
+"g 	c #FCF850",
+"h 	c #FEEC49",
+"i 	c #FEE632",
+"j 	c #FEE230",
+"k 	c #F9DB2D",
+"l 	c #565D12",
+"m 	c #2A5915",
+"n 	c #EDE267",
+"o 	c #FFD657",
+"p 	c #FECE27",
+"q 	c #FDCA24",
+"r 	c #EEBB20",
+"s 	c #4F4018",
+"t 	c #D6D2C3",
+"u 	c #ADAA9E",
+"v 	c #867924",
+"w 	c #FCDF2F",
+"x 	c #FEDE2E",
+"y 	c #FEDB2C",
+"z 	c #FED72A",
+"A 	c #F5CE29",
+"B 	c #E2CD57",
+"C 	c #FFD45F",
+"D 	c #FECA28",
+"E 	c #FEC722",
+"F 	c #F7BE1F",
+"G 	c #A57E14",
+"H 	c #847F70",
+"I 	c #D0CCBA",
+"J 	c #2A7925",
+"K 	c #7A7215",
+"L 	c #FCD42A",
+"M 	c #FED328",
+"N 	c #FED026",
+"O 	c #FECD25",
+"P 	c #FECA33",
+"Q 	c #FEC627",
+"R 	c #FEC220",
+"S 	c #F7BA1D",
+"T 	c #A97E13",
+"U 	c #3A622D",
+"V 	c #C9C6B2",
+"W 	c #0B8F09",
+"X 	c #006F00",
+"Y 	c #847214",
+"Z 	c #FDCB24",
+"` 	c #FEC823",
+" .	c #FEC521",
+"..	c #FEC21F",
+"+.	c #FEBE1D",
+"@.	c #F8B71B",
+"#.	c #AB7D12",
+"$.	c #0B5D01",
+"%.	c #21A61D",
+"&.	c #C2C0A9",
+"*.	c #099108",
+"=.	c #009600",
+"-.	c #016201",
+";.	c #C19F25",
+">.	c #FEC222",
+",.	c #FEBD1D",
+"'.	c #FEBA1B",
+").	c #FEB71A",
+"!.	c #E09F16",
+"~.	c #0D4B01",
+"{.	c #00AB00",
+"].	c #1FA91B",
+"^.	c #BCBAA1",
+"/.	c #24991E",
+"(.	c #008D00",
+"_.	c #65712C",
+":.	c #FDCE65",
+"<.	c #FEBA2A",
+"[.	c #FEB619",
+"}.	c #FEB317",
+"|.	c #FEAF16",
+"1.	c #FAAA14",
+"2.	c #7C5B09",
+"3.	c #009000",
+"4.	c #38AE30",
+"5.	c #B6B398",
+"6.	c #5E9F4F",
+"7.	c #466120",
+"8.	c #F9CC6E",
+"9.	c #FEB74B",
+"0.	c #FEB219",
+"a.	c #FCAD15",
+"b.	c #FCAA14",
+"c.	c #FEA812",
+"d.	c #FEA410",
+"e.	c #F99E0F",
+"f.	c #584D06",
+"g.	c #6FA15C",
+"h.	c #B0AD90",
+"i.	c #AFAC8F",
+"j.	c #645D40",
+"k.	c #EEC162",
+"l.	c #FFB555",
+"m.	c #FEAD1A",
+"n.	c #F9A713",
+"o.	c #BC7C0E",
+"p.	c #A0680A",
+"q.	c #FC9F0E",
+"r.	c #FE9D0C",
+"s.	c #FD9A0B",
+"t.	c #EE8D09",
+"u.	c #594221",
+"v.	c #AAA78B",
+"w.	c #A9A687",
+"x.	c #A3A082",
+"y.	c #65501E",
+"z.	c #FBAF39",
+"A.	c #FEA91A",
+"B.	c #F9A311",
+"C.	c #BC790C",
+"D.	c #125801",
+"E.	c #037D00",
+"F.	c #A46507",
+"G.	c #FC9509",
+"H.	c #FC9107",
+"I.	c #E88305",
+"J.	c #57350B",
+"K.	c #99977A",
+"L.	c #A2A07F",
+"M.	c #828166",
+"N.	c #65450F",
+"O.	c #F0990E",
+"P.	c #BD760A",
+"Q.	c #155302",
+"R.	c #00B200",
+"S.	c #00B700",
+"T.	c #0D7405",
+"U.	c #A75E03",
+"V.	c #E77E03",
+"W.	c #5A3609",
+"X.	c #828066",
+"Y.	c #9C9A76",
+"Z.	c #7D7B5E",
+"`.	c #51360C",
+" +	c #564C31",
+".+	c #959A70",
+"++	c #819D62",
+"@+	c #829E63",
+"#+	c #979A72",
+"$+	c #646048",
+"%+	c #462A09",
+"&+	c #96946E",
+". . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# # # $ % & * = - ; > , ' # # # ",
+") ) ! ~ { ] ^ / ( _ : < [ } ) ) ",
+"| 1 2 3 4 5 6 7 8 9 0 a b c d | ",
+"e f g h i j k l m n o p q r s e ",
+"t u v w x y z A B C D E F G H t ",
+"I I J K L M N O P Q R S T U I I ",
+"V V W X Y Z `  ...+.@.#.$.%.V V ",
+"&.&.*.=.-.;.>.,.'.).!.~.{.].&.&.",
+"^.^./.(._.:.<.[.}.|.1.2.3.4.^.^.",
+"5.5.6.7.8.9.0.a.b.c.d.e.f.g.5.5.",
+"h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.h.",
+"w.x.y.z.A.B.C.D.E.F.G.H.I.J.K.w.",
+"L.L.M.N.O.P.Q.R.S.T.U.V.W.X.L.L.",
+"Y.Y.Y.Z.`. +.+++@+#+$+%+Z.Y.Y.Y.",
+"&+&+&+&+&+&+&+&+&+&+&+&+&+&+&+&+",
+"+ + + + + + + + + + + + + + + + "};
diff --git a/themes/elberg/close-inactive.xpm b/themes/elberg/close-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..e439d705273b8c1cc99791d55b79016c2415151e
--- /dev/null
+++ b/themes/elberg/close-inactive.xpm
@@ -0,0 +1,188 @@
+/* XPM */
+static char * close_inactive_xpm[] = {
+"16 19 166 2",
+"  	c None",
+". 	c #4A4D4A",
+"+ 	c #2E2D2E",
+"@ 	c #D7D3CF",
+"# 	c #D2CEC8",
+"$ 	c #AAA7A1",
+"% 	c #4D4C40",
+"& 	c #817E79",
+"* 	c #D0CCC6",
+"= 	c #C7C3BA",
+"- 	c #C8C4BB",
+"; 	c #D1CDC7",
+"> 	c #B1ADA8",
+", 	c #514F47",
+"' 	c #AAA6A1",
+") 	c #CCC8C1",
+"! 	c #A5A29C",
+"~ 	c #666556",
+"{ 	c #BAB9A1",
+"] 	c #77755F",
+"^ 	c #5B5A45",
+"/ 	c #787657",
+"( 	c #757359",
+"_ 	c #656456",
+": 	c #B3B298",
+"< 	c #555344",
+"[ 	c #A4A19B",
+"} 	c #C6C3BA",
+"| 	c #A09E96",
+"1 	c #656454",
+"2 	c #C2C1AB",
+"3 	c #B3B297",
+"4 	c #A7A586",
+"5 	c #5A5946",
+"6 	c #656449",
+"7 	c #787656",
+"8 	c #535240",
+"9 	c #BDBCA6",
+"0 	c #A19F7E",
+"a 	c #4D4C3D",
+"b 	c #9F9C95",
+"c 	c #C1BEB2",
+"d 	c #4F4E44",
+"e 	c #B2B095",
+"f 	c #A7A687",
+"g 	c #A6A485",
+"h 	c #A4A281",
+"i 	c #4A4938",
+"j 	c #4B4A39",
+"k 	c #B5B39E",
+"l 	c #B7B69C",
+"m 	c #A3A181",
+"n 	c #999773",
+"o 	c #36362A",
+"p 	c #BBB8AA",
+"q 	c #98958A",
+"r 	c #5C5A4A",
+"s 	c #A6A484",
+"t 	c #A6A483",
+"u 	c #A5A382",
+"v 	c #9F9D7D",
+"w 	c #A8A790",
+"x 	c #BBBAA1",
+"y 	c #A19F7D",
+"z 	c #9D9B78",
+"A 	c #6B694E",
+"B 	c #716F66",
+"C 	c #B6B3A3",
+"D 	c #6C6A54",
+"E 	c #585744",
+"F 	c #A3A180",
+"G 	c #A2A07F",
+"H 	c #A8A687",
+"I 	c #A09E7C",
+"J 	c #9C9A77",
+"K 	c #6C6B4F",
+"L 	c #555345",
+"M 	c #B0AD9C",
+"N 	c #7E7C5C",
+"O 	c #5F5E45",
+"P 	c #5B5A46",
+"Q 	c #A29F7E",
+"R 	c #A19E7C",
+"S 	c #A09E7B",
+"T 	c #9F9D7A",
+"U 	c #9C9A76",
+"V 	c #6D6B4F",
+"W 	c #4C4A36",
+"X 	c #8A8768",
+"Y 	c #AAA894",
+"Z 	c #7F7D5C",
+"` 	c #51503A",
+" .	c #807E65",
+"..	c #9E9C79",
+"+.	c #8C8A68",
+"@.	c #3B3A2B",
+"#.	c #868461",
+"$.	c #8A8867",
+"%.	c #A5A28D",
+"&.	c #858364",
+"*.	c #767455",
+"=.	c #605F4E",
+"-.	c #BDBBA4",
+";.	c #9A9873",
+">.	c #53523D",
+",.	c #706E51",
+"'.	c #8F8D6E",
+").	c #9F9C85",
+"!.	c #8B886E",
+"~.	c #555442",
+"{.	c #BEBDA7",
+"].	c #B2B195",
+"^.	c #9B9975",
+"/.	c #9A9874",
+"(.	c #9B9874",
+"_.	c #979570",
+":.	c #474634",
+"<.	c #8A876E",
+"[.	c #9A977E",
+"}.	c #99967D",
+"|.	c #535243",
+"1.	c #B3B29B",
+"2.	c #B7B59B",
+"3.	c #9E9B79",
+"4.	c #989672",
+"5.	c #747254",
+"6.	c #626048",
+"7.	c #989671",
+"8.	c #8E8C67",
+"9.	c #403E31",
+"0.	c #95927A",
+"a.	c #949276",
+"b.	c #8E8C71",
+"c.	c #474638",
+"d.	c #A9A789",
+"e.	c #989570",
+"f.	c #737153",
+"g.	c #454432",
+"h.	c #5E5D44",
+"i.	c #646248",
+"j.	c #96936E",
+"k.	c #95936D",
+"l.	c #898763",
+"m.	c #373527",
+"n.	c #86846B",
+"o.	c #8E8C6F",
+"p.	c #727059",
+"q.	c #403F30",
+"r.	c #92906B",
+"s.	c #444330",
+"t.	c #8A8863",
+"u.	c #8C8A65",
+"v.	c #5A5941",
+"w.	c #636147",
+"x.	c #878561",
+"y.	c #383729",
+"z.	c #898767",
+"A.	c #6E6C52",
+"B.	c #343325",
+"C.	c #454433",
+"D.	c #888666",
+"E.	c #898766",
+"F.	c #565540",
+"G.	c #2B2B20",
+"H.	c #838160",
+"I.	c #2D2C2D",
+". . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# # # $ % & * = - ; > , ' # # # ",
+") ) ! ~ { ] ^ / / ( _ : < [ ) ) ",
+"} | 1 2 3 4 5 6 7 8 9 3 0 a b } ",
+"c d 3 e f g h i j k l m 0 n o c ",
+"p q r s s t u v w x m y z A B p ",
+"C C D E F h F G H F I J K L C C ",
+"M M N O P Q 0 R S T U V W X M M ",
+"Y Y Z Z `  .y T ..z +.@.#.$.Y Y ",
+"%.%.&.*.=.-.u z J J ;.>.,.'.%.%.",
+").).!.~.{.].z ^./.(.;._.:.<.).).",
+"[.}.|.1.2.3.4.5.6.7.7._.8.9.0.[.",
+"a.b.c.d...e.f.g.h.i.j.k.l.m.n.a.",
+"o.o.p.q.r.f.s.t.u.v.w.x.y.p.o.o.",
+"z.z.z.A.B.C.D.E.E.E.F.G.A.z.z.z.",
+"H.H.H.H.H.H.H.H.H.H.H.H.H.H.H.H.",
+"+ + + + + + + + + + + + + + + I."};
diff --git a/themes/elberg/close-pressed.xpm b/themes/elberg/close-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..7cb46a6e48f1b91346ba2fd21706a61c2a92c301
--- /dev/null
+++ b/themes/elberg/close-pressed.xpm
@@ -0,0 +1,211 @@
+/* XPM */
+static char * close_pressed_xpm[] = {
+"16 19 189 2",
+"  	c None",
+". 	c #4A4D4A",
+"+ 	c #313031",
+"@ 	c #F6F1ED",
+"# 	c #F0ECE5",
+"$ 	c #C7C4BE",
+"% 	c #757543",
+"& 	c #9F9C91",
+"* 	c #EEECE1",
+"= 	c #E3EDCA",
+"- 	c #E4EDCC",
+"; 	c #EFECE3",
+"> 	c #CECAC5",
+", 	c #737254",
+"' 	c #C7C3BE",
+") 	c #E9E5DC",
+"! 	c #C1BEB7",
+"~ 	c #8C8C59",
+"{ 	c #FDFD7C",
+"] 	c #B8B542",
+"^ 	c #6FB716",
+"/ 	c #8AF500",
+"( 	c #8DF500",
+"_ 	c #8CE213",
+": 	c #8C8F56",
+"< 	c #FCF86C",
+"[ 	c #837D3E",
+"} 	c #C1BDB6",
+"| 	c #E2DFD4",
+"1 	c #BBB9B0",
+"2 	c #8B8B57",
+"3 	c #FDFD93",
+"4 	c #FFFC67",
+"5 	c #FFF948",
+"6 	c #949530",
+"7 	c #82CE05",
+"8 	c #97ED01",
+"9 	c #748933",
+"0 	c #F9F68E",
+"a 	c #FFF267",
+"b 	c #FCEA3D",
+"c 	c #7F7636",
+"d 	c #BBB8AF",
+"e 	c #DCD8CB",
+"f 	c #717050",
+"g 	c #FDFC6A",
+"h 	c #FFFA62",
+"i 	c #FFF847",
+"j 	c #FFF745",
+"k 	c #FEF342",
+"l 	c #7B8026",
+"m 	c #6D8526",
+"n 	c #EEEC87",
+"o 	c #FFF073",
+"p 	c #FFEC3C",
+"q 	c #FFE939",
+"r 	c #F9DD36",
+"s 	c #665C2F",
+"t 	c #D6D2C3",
+"u 	c #B2AFA3",
+"v 	c #94903A",
+"w 	c #FFF544",
+"x 	c #FFF543",
+"y 	c #FFF341",
+"z 	c #FFF13F",
+"A 	c #F7E93E",
+"B 	c #E5DF73",
+"C 	c #FFEF7C",
+"D 	c #FFE93D",
+"E 	c #FFE637",
+"F 	c #FDE035",
+"G 	c #BDA02B",
+"H 	c #8F8B7C",
+"I 	c #D0CCBA",
+"J 	c #82BE2B",
+"K 	c #93922C",
+"L 	c #FFEF3F",
+"M 	c #FFEF3D",
+"N 	c #FFED3B",
+"O 	c #FFEB3A",
+"P 	c #FFE949",
+"Q 	c #FFE63C",
+"R 	c #FFE335",
+"S 	c #FEDD33",
+"T 	c #C0A12A",
+"U 	c #78873A",
+"V 	c #C9C6B2",
+"W 	c #95F209",
+"X 	c #7FBF07",
+"Y 	c #9B922B",
+"Z 	c #FFE838",
+"` 	c #FFE536",
+" .	c #FFE334",
+"..	c #FFE032",
+"+.	c #FEDA31",
+"@.	c #C2A029",
+"#.	c #7C930E",
+"$.	c #B9EA1D",
+"%.	c #C2C0A9",
+"&.	c #99F108",
+"*.	c #A5F300",
+"=.	c #78A10B",
+"-.	c #C7BA3B",
+";.	c #FFE337",
+">.	c #FFDD31",
+",.	c #FFDA30",
+"'.	c #ECC32C",
+").	c #6D7412",
+"!.	c #CAF100",
+"~.	c #BEE91B",
+"{.	c #BCBAA1",
+"].	c #A0E81E",
+"^.	c #9CE202",
+"/.	c #899041",
+"(.	c #FDEA84",
+"_.	c #FFDD40",
+":.	c #FFDA2F",
+"<.	c #FFD72D",
+"[.	c #FFD42C",
+"}.	c #FFCF2A",
+"|.	c #987D21",
+"1.	c #AECB05",
+"2.	c #C0E030",
+"3.	c #B6B398",
+"4.	c #A5CA50",
+"5.	c #788834",
+"6.	c #FAE78E",
+"7.	c #FFDB65",
+"8.	c #FFD62F",
+"9.	c #FFD22B",
+"0.	c #FFCD29",
+"a.	c #FFCA27",
+"b.	c #FEC426",
+"c.	c #83701C",
+"d.	c #ADB85F",
+"e.	c #B0AD90",
+"f.	c #AFAC8F",
+"g.	c #716E50",
+"h.	c #F0DD80",
+"i.	c #FFD971",
+"j.	c #FFD230",
+"k.	c #FECC29",
+"l.	c #CFA025",
+"m.	c #B08A23",
+"n.	c #FFC525",
+"o.	c #FFC324",
+"p.	c #FFC023",
+"q.	c #F6B221",
+"r.	c #6C5A36",
+"s.	c #ABA88C",
+"t.	c #A9A687",
+"u.	c #A3A183",
+"v.	c #746A34",
+"w.	c #FDD350",
+"x.	c #FFCF31",
+"y.	c #FEC928",
+"z.	c #D19D24",
+"A.	c #798011",
+"B.	c #99A80A",
+"C.	c #B48720",
+"D.	c #FFBB21",
+"E.	c #FFB720",
+"F.	c #F7A81E",
+"G.	c #6F5123",
+"H.	c #9C997D",
+"I.	c #A2A07F",
+"J.	c #87866B",
+"K.	c #776226",
+"L.	c #FABF26",
+"M.	c #D29A22",
+"N.	c #707F12",
+"O.	c #C6F000",
+"P.	c #CCF100",
+"Q.	c #8C9F10",
+"R.	c #B6801D",
+"S.	c #F7A21D",
+"T.	c #725122",
+"U.	c #87856B",
+"V.	c #9C9A76",
+"W.	c #828164",
+"X.	c #695224",
+"Y.	c #665E41",
+"Z.	c #9C9C71",
+"`.	c #A1A862",
+" +	c #A2A763",
+".+	c #9D9C72",
+"++	c #6E6B52",
+"@+	c #5E4522",
+"#+	c #96946E",
+". . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# # # $ % & * = - ; > , ' # # # ",
+") ) ! ~ { ] ^ / ( _ : < [ } ) ) ",
+"| 1 2 3 4 5 6 7 8 9 0 a b c d | ",
+"e f g h i j k l m n o p q r s e ",
+"t u v w x y z A B C D E F G H t ",
+"I I J K L M N O P Q R S T U I I ",
+"V V W X Y q Z `  ...+.@.#.$.V V ",
+"%.%.&.*.=.-.;...>.,.'.).!.~.%.%.",
+"{.{.].^./.(._.:.<.[.}.|.1.2.{.{.",
+"3.3.4.5.6.7.8.9.}.0.a.b.c.d.3.3.",
+"e.f.g.h.i.j.k.l.m.n.o.p.q.r.s.e.",
+"t.u.v.w.x.y.z.A.B.C.D.E.F.G.H.t.",
+"I.I.J.K.L.M.N.O.P.Q.R.S.T.U.I.I.",
+"V.V.V.W.X.Y.Z.`. +.+++@+W.V.V.V.",
+"#+#+#+#+#+#+#+#+#+#+#+#+#+#+#+#+",
+"+ + + + + + + + + + + + + + + + "};
diff --git a/themes/elberg/hide-active.xpm b/themes/elberg/hide-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..31f4b57b73594a5ada3f333fa83cecd25361ef49
--- /dev/null
+++ b/themes/elberg/hide-active.xpm
@@ -0,0 +1,200 @@
+/* XPM */
+static char * hide_active_xpm[] = {
+"16 19 178 2",
+"  	c None",
+". 	c #4A4D4A",
+"+ 	c #313031",
+"@ 	c #F6F1ED",
+"# 	c #F0ECE5",
+"$ 	c #BEBBB6",
+"% 	c #7F7E66",
+"& 	c #878579",
+"* 	c #ECEAE1",
+"= 	c #D4DFCA",
+"- 	c #D6E0CC",
+"; 	c #EEEBE3",
+"> 	c #E9E5DC",
+", 	c #85837B",
+"' 	c #FBFB49",
+") 	c #807F3C",
+"! 	c #D4DCC9",
+"~ 	c #5FA95A",
+"{ 	c #0E870D",
+"] 	c #008300",
+"^ 	c #008500",
+"/ 	c #138C12",
+"( 	c #6CB266",
+"_ 	c #DCDFCF",
+": 	c #E2DFD4",
+"< 	c #868569",
+"[ 	c #FCF94C",
+"} 	c #697228",
+"| 	c #168B14",
+"1 	c #008900",
+"2 	c #008B00",
+"3 	c #008D00",
+"4 	c #21981F",
+"5 	c #C9D5BC",
+"6 	c #DCD8CB",
+"7 	c #8C8B5C",
+"8 	c #FCF44C",
+"9 	c #596613",
+"0 	c #008800",
+"a 	c #008C00",
+"b 	c #009000",
+"c 	c #009300",
+"d 	c #009500",
+"e 	c #2EA02A",
+"f 	c #D9D7C8",
+"g 	c #D6D2C3",
+"h 	c #919054",
+"i 	c #FCED4D",
+"j 	c #6A6815",
+"k 	c #008E00",
+"l 	c #009700",
+"m 	c #009B00",
+"n 	c #009D00",
+"o 	c #009400",
+"p 	c #027102",
+"q 	c #0A6009",
+"r 	c #0C570B",
+"s 	c #778B6D",
+"t 	c #D0CCBA",
+"u 	c #97964E",
+"v 	c #FEE54E",
+"w 	c #937F1A",
+"x 	c #008100",
+"y 	c #009100",
+"z 	c #017701",
+"A 	c #14630D",
+"B 	c #506F22",
+"C 	c #94893D",
+"D 	c #D2B755",
+"E 	c #F7CE5A",
+"F 	c #FFC94B",
+"G 	c #B9891F",
+"H 	c #7B7769",
+"I 	c #C9C6B2",
+"J 	c #979149",
+"K 	c #FFDD4F",
+"L 	c #EDC526",
+"M 	c #7F751A",
+"N 	c #998C3A",
+"O 	c #CDB753",
+"P 	c #F9D661",
+"Q 	c #FFD061",
+"R 	c #FFC554",
+"S 	c #FEBE3E",
+"T 	c #FEB92C",
+"U 	c #FEB520",
+"V 	c #F8AD17",
+"W 	c #705828",
+"X 	c #C2C0A9",
+"Y 	c #8D803E",
+"Z 	c #FFD44A",
+"` 	c #FECB24",
+" .	c #FFCB29",
+"..	c #FFC93F",
+"+.	c #FEC33C",
+"@.	c #FEBE2E",
+"#.	c #FEBA21",
+"$.	c #FEB71A",
+"%.	c #FDB318",
+"&.	c #FDAF16",
+"*.	c #FEAC14",
+"=.	c #F9A613",
+"-.	c #795A22",
+";.	c #BCBAA1",
+">.	c #6B6446",
+",.	c #F7C132",
+"'.	c #FEC220",
+").	c #FEBF1E",
+"!.	c #FEBC1C",
+"~.	c #FDB81B",
+"{.	c #FBB319",
+"].	c #F5AC17",
+"^.	c #E79F14",
+"/.	c #B57B0F",
+"(.	c #97650B",
+"_.	c #E1920F",
+":.	c #F79D0F",
+"<.	c #705221",
+"[.	c #B6B398",
+"}.	c #A09D85",
+"|.	c #68541E",
+"1.	c #E7AA19",
+"2.	c #F5B119",
+"3.	c #F1AB17",
+"4.	c #D69513",
+"5.	c #8E620C",
+"6.	c #455006",
+"7.	c #0B6301",
+"8.	c #00A100",
+"9.	c #6F5A16",
+"0.	c #F69619",
+"a.	c #69512A",
+"b.	c #B0AD90",
+"c.	c #9E9C81",
+"d.	c #205211",
+"e.	c #395205",
+"f.	c #285404",
+"g.	c #026600",
+"h.	c #00C300",
+"i.	c #00C800",
+"j.	c #00BB00",
+"k.	c #5C6423",
+"l.	c #F48E25",
+"m.	c #5F5237",
+"n.	c #A9A687",
+"o.	c #87A46C",
+"p.	c #0CA20A",
+"q.	c #00A900",
+"r.	c #00B100",
+"s.	c #00B800",
+"t.	c #00BE00",
+"u.	c #00C100",
+"v.	c #13B50F",
+"w.	c #775F2E",
+"x.	c #EA801E",
+"y.	c #5C5947",
+"z.	c #A2A07F",
+"A.	c #8EA070",
+"B.	c #39A42D",
+"C.	c #05AC03",
+"D.	c #00B300",
+"E.	c #00B700",
+"F.	c #07B705",
+"G.	c #42AE34",
+"H.	c #929F73",
+"I.	c #884D21",
+"J.	c #BC610B",
+"K.	c #706F58",
+"L.	c #9C9A76",
+"M.	c #959A71",
+"N.	c #819D62",
+"O.	c #829E63",
+"P.	c #979A72",
+"Q.	c #979572",
+"R.	c #514832",
+"S.	c #4F452D",
+"T.	c #8F8D6C",
+"U.	c #96946E",
+". . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# $ % & # # * = - ; # # # # # # ",
+"> , ' ) ! ~ { ] ^ / ( _ > > > > ",
+": < [ } | ^ 1 2 3 3 3 4 5 : : : ",
+"6 7 8 9 0 a b c d d d c e f 6 6 ",
+"g h i j k c l m n o p q r s g g ",
+"t u v w x y z A B C D E F G H t ",
+"I J K L M N O P Q R S T U V W I ",
+"X Y Z `  ...+.@.#.$.%.&.*.=.-.X ",
+";.>.,.'.).!.~.{.].^./.(._.:.<.;.",
+"[.}.|.1.2.3.4.5.6.7.2 8.9.0.a.[.",
+"b.b.c.d.e.f.g.8.h.i.h.j.k.l.m.b.",
+"n.n.n.o.p.q.r.s.t.u.t.v.w.x.y.n.",
+"z.z.z.z.A.B.C.D.E.F.G.H.I.J.K.z.",
+"L.L.L.L.L.L.M.N.O.P.L.Q.R.S.T.L.",
+"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.",
+"+ + + + + + + + + + + + + + + + "};
diff --git a/themes/elberg/hide-inactive.xpm b/themes/elberg/hide-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..8e7d6cbf8e37208308c80210c24b1fe62b533a58
--- /dev/null
+++ b/themes/elberg/hide-inactive.xpm
@@ -0,0 +1,183 @@
+/* XPM */
+static char * hide_inactive_xpm[] = {
+"16 19 161 2",
+"  	c None",
+". 	c #4A4D4A",
+"+ 	c #2E2D2E",
+"@ 	c #D7D3CF",
+"# 	c #D2CEC8",
+"$ 	c #A7A49F",
+"% 	c #6C6A63",
+"& 	c #74726D",
+"* 	c #D0CCC6",
+"= 	c #C7C3BA",
+"- 	c #C8C4BB",
+"; 	c #D1CDC7",
+"> 	c #CCC8C1",
+", 	c #76746D",
+"' 	c #B0AE93",
+") 	c #605F52",
+"! 	c #C4C0B7",
+"~ 	c #9A9782",
+"{ 	c #7C7A5C",
+"] 	c #787657",
+"^ 	c #7F7D5F",
+"/ 	c #9F9C89",
+"( 	c #C7C3BB",
+"_ 	c #C6C3BA",
+": 	c #737166",
+"< 	c #B2B095",
+"[ 	c #585746",
+"} 	c #7E7C5F",
+"| 	c #797757",
+"1 	c #7A7858",
+"2 	c #7B7958",
+"3 	c #7C7A59",
+"4 	c #868466",
+"5 	c #BDBAAF",
+"6 	c #C1BEB2",
+"7 	c #747364",
+"8 	c #4E4D3A",
+"9 	c #7D7B5A",
+"0 	c #7E7C5B",
+"a 	c #8B896C",
+"b 	c #C0BDB0",
+"c 	c #BBB8AA",
+"d 	c #757363",
+"e 	c #B3B195",
+"f 	c #4F4E3C",
+"g 	c #7F7D5C",
+"h 	c #817E5D",
+"i 	c #817F5D",
+"j 	c #5F5D44",
+"k 	c #53523C",
+"l 	c #4D4C38",
+"m 	c #7B796C",
+"n 	c #B6B3A3",
+"o 	c #787765",
+"p 	c #B3B297",
+"q 	c #61604A",
+"r 	c #6E6D50",
+"s 	c #797758",
+"t 	c #626047",
+"u 	c #54523D",
+"v 	c #5C5B48",
+"w 	c #747361",
+"x 	c #9E9D87",
+"y 	c #B5B39B",
+"z 	c #B2B195",
+"A 	c #79785D",
+"B 	c #6A695F",
+"C 	c #B0AD9C",
+"D 	c #777563",
+"E 	c #B4B398",
+"F 	c #999778",
+"G 	c #5A5947",
+"H 	c #737260",
+"I 	c #9B9983",
+"J 	c #B9B7A0",
+"K 	c #BCBBA3",
+"L 	c #B6B59B",
+"M 	c #ADAB8E",
+"N 	c #A5A383",
+"O 	c #A09E7C",
+"P 	c #9A9874",
+"Q 	c #504E3F",
+"R 	c #AAA894",
+"S 	c #6C6B5A",
+"T 	c #A2A07F",
+"U 	c #A4A282",
+"V 	c #ADAC8E",
+"W 	c #ACAA8C",
+"X 	c #A6A484",
+"Y 	c #A19F7D",
+"Z 	c #9E9C79",
+"` 	c #9C9A77",
+" .	c #9B9976",
+"..	c #9B9975",
+"+.	c #989671",
+"@.	c #535140",
+"#.	c #A5A28D",
+"$.	c #595849",
+"%.	c #A4A283",
+"&.	c #A09E7B",
+"*.	c #9F9D7A",
+"=.	c #9C9A76",
+"-.	c #989672",
+";.	c #908D69",
+">.	c #706F52",
+",.	c #5E5C44",
+"'.	c #898766",
+").	c #96946E",
+"!.	c #4D4B3B",
+"~.	c #9F9C85",
+"{.	c #8B8975",
+"].	c #494738",
+"^.	c #92906D",
+"/.	c #9A9773",
+"(.	c #979470",
+"_.	c #868462",
+":.	c #595740",
+"<.	c #434231",
+"[.	c #4A4835",
+"}.	c #67654A",
+"|.	c #575643",
+"1.	c #4C4A3B",
+"2.	c #9A977E",
+"3.	c #8B8872",
+"4.	c #464534",
+"5.	c #464533",
+"6.	c #464432",
+"7.	c #4F4E39",
+"8.	c #908D68",
+"9.	c #928F69",
+"0.	c #8F8D68",
+"a.	c #8D8B66",
+"b.	c #62614D",
+"c.	c #9D9B7A",
+"d.	c #4B4A3C",
+"e.	c #949276",
+"f.	c #908E71",
+"g.	c #858360",
+"h.	c #878562",
+"i.	c #8A8763",
+"j.	c #8C8A65",
+"k.	c #8E8C67",
+"l.	c #8C8A67",
+"m.	c #656451",
+"n.	c #949272",
+"o.	c #504F3F",
+"p.	c #8E8C6F",
+"q.	c #8C8A6D",
+"r.	c #888665",
+"s.	c #888663",
+"t.	c #8B8864",
+"u.	c #8C8A69",
+"v.	c #5E5D49",
+"w.	c #727054",
+"x.	c #898767",
+"y.	c #888666",
+"z.	c #858364",
+"A.	c #434232",
+"B.	c #403F2F",
+"C.	c #7D7B5E",
+"D.	c #838160",
+". . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# $ % & # # * = - ; # # # # # # ",
+"> , ' ) ! ~ { ] ] ^ / ( > > > > ",
+"_ : < [ } | 1 2 3 3 3 4 5 _ _ _ ",
+"6 7 < 8 1 3 9 0 0 0 0 0 a b 6 6 ",
+"c d e f 3 0 g h i 1 j k l m c c ",
+"n o p q r s t u v w x y z A B n ",
+"C D E F G H I J K L M N O P Q C ",
+"R S z T U V W X Y Z `  ...+.@.R ",
+"#.$.%.&.&.*.Z =.-.;.>.,.'.).!.#.",
+"~.{.].^./.(._.:.<.[.}.1 |.P 1.~.",
+"2.2.3.4.5.6.7.s 8.9.0.a.b.c.d.2.",
+"e.e.e.f.g.h.i.j.k.0.k.l.m.n.o.e.",
+"p.p.p.p.q.r.s.t.j.a.u.a v.w.b.p.",
+"x.x.x.x.x.x.y.'.'.'.x.z.A.B.C.x.",
+"D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.D.",
+"+ + + + + + + + + + + + + + + + "};
diff --git a/themes/elberg/hide-pressed.xpm b/themes/elberg/hide-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..4456a19686acfa4f8de4474294a492838781074b
--- /dev/null
+++ b/themes/elberg/hide-pressed.xpm
@@ -0,0 +1,206 @@
+/* XPM */
+static char * hide_pressed_xpm[] = {
+"16 19 184 2",
+"  	c None",
+". 	c #4A4D4A",
+"+ 	c #313031",
+"@ 	c #F6F1ED",
+"# 	c #F0ECE5",
+"$ 	c #C4C1BB",
+"% 	c #8C8A75",
+"& 	c #939185",
+"* 	c #EEECE1",
+"= 	c #E3EDCA",
+"- 	c #E4EDCC",
+"; 	c #EFECE3",
+"> 	c #E9E5DC",
+", 	c #908E86",
+"' 	c #FCFC60",
+") 	c #919050",
+"! 	c #DFE6C9",
+"~ 	c #ADEF5A",
+"{ 	c #8DF40D",
+"] 	c #8AF500",
+"^ 	c #8DF500",
+"/ 	c #95F312",
+"( 	c #B9ED66",
+"_ 	c #E4E5CF",
+": 	c #E2DFD4",
+"< 	c #919077",
+"[ 	c #FFFE65",
+"} 	c #88903C",
+"| 	c #8FF314",
+"1 	c #94F500",
+"2 	c #98F400",
+"3 	c #9BF400",
+"4 	c #9CF400",
+"5 	c #A3F01F",
+"6 	c #D9E1BC",
+"7 	c #DCD8CB",
+"8 	c #97966D",
+"9 	c #FFFC66",
+"0 	c #808C27",
+"a 	c #91F500",
+"b 	c #99F400",
+"c 	c #A1F400",
+"d 	c #A7F300",
+"e 	c #AAF300",
+"f 	c #ABF300",
+"g 	c #A9F300",
+"h 	c #A5F300",
+"i 	c #ADEE2A",
+"j 	c #DBD8C8",
+"k 	c #D6D2C3",
+"l 	c #9C9B67",
+"m 	c #FFFA67",
+"n 	c #88882B",
+"o 	c #AEF300",
+"p 	c #B4F200",
+"q 	c #B8F200",
+"r 	c #B0E602",
+"s 	c #8BB709",
+"t 	c #779D14",
+"u 	c #6D9217",
+"v 	c #97A174",
+"w 	c #D0CCBA",
+"x 	c #A1A164",
+"y 	c #FFF768",
+"z 	c #A69C31",
+"A 	c #94D803",
+"B 	c #A8E701",
+"C 	c #91BC08",
+"D 	c #7D9719",
+"E 	c #889235",
+"F 	c #A39F56",
+"G 	c #D7CD70",
+"H 	c #F8E875",
+"I 	c #FFE863",
+"J 	c #C4A935",
+"K 	c #878375",
+"L 	c #C9C6B2",
+"M 	c #A1A060",
+"N 	c #FFF46A",
+"O 	c #F2E13B",
+"P 	c #929030",
+"Q 	c #A5A152",
+"R 	c #D2CB6E",
+"S 	c #FAED7E",
+"T 	c #FFEC7F",
+"U 	c #FFE56F",
+"V 	c #FFE056",
+"W 	c #FFDC42",
+"X 	c #FFD936",
+"Y 	c #FED22D",
+"Z 	c #84723C",
+"` 	c #C2C0A9",
+" .	c #999455",
+"..	c #FFEF63",
+"+.	c #FFEA39",
+"@.	c #FFE93E",
+"#.	c #FFE856",
+"$.	c #FFE453",
+"%.	c #FFE044",
+"&.	c #FFDD37",
+"*.	c #FFDA30",
+"=.	c #FFD72E",
+"-.	c #FFD42C",
+";.	c #FFD22B",
+">.	c #FECC29",
+",.	c #8D7437",
+"'.	c #BCBAA1",
+").	c #787456",
+"!.	c #F9E148",
+"~.	c #FFE335",
+"{.	c #FFE133",
+"].	c #FFDF32",
+"^.	c #FFDB30",
+"/.	c #FFD72F",
+"(.	c #FDD12D",
+"_.	c #F5C42A",
+":.	c #C89E26",
+"<.	c #AB8724",
+"[.	c #E8B726",
+"}.	c #FEC326",
+"|.	c #856C36",
+"1.	c #B6B398",
+"2.	c #A3A089",
+"3.	c #7A6E33",
+"4.	c #F1CE2F",
+"5.	c #FDD52F",
+"6.	c #FCD02D",
+"7.	c #E7BA2A",
+"8.	c #A58424",
+"9.	c #83711B",
+"0.	c #8B840F",
+"a.	c #B1B308",
+"b.	c #C4D304",
+"c.	c #8F7B2B",
+"d.	c #FDBC30",
+"e.	c #7B673D",
+"f.	c #B0AD90",
+"g.	c #A29F84",
+"h.	c #687F1F",
+"i.	c #7A7D18",
+"j.	c #7A7F15",
+"k.	c #82940C",
+"l.	c #C1D204",
+"m.	c #E7EF00",
+"n.	c #EBEF00",
+"o.	c #E5EF00",
+"p.	c #DAF000",
+"q.	c #928736",
+"r.	c #FCB33C",
+"s.	c #6F6448",
+"t.	c #A9A687",
+"u.	c #A8B56C",
+"v.	c #AFED0A",
+"w.	c #BCF200",
+"x.	c #C8F100",
+"y.	c #D3F000",
+"z.	c #DCF000",
+"A.	c #D9F000",
+"B.	c #CCE80F",
+"C.	c #937E43",
+"D.	c #F5A436",
+"E.	c #696654",
+"F.	c #A2A07F",
+"G.	c #A3A970",
+"H.	c #AED42D",
+"I.	c #BDEF03",
+"J.	c #C7F100",
+"K.	c #CCF100",
+"L.	c #CBED05",
+"M.	c #BBCF34",
+"N.	c #A3A473",
+"O.	c #966B37",
+"P.	c #D08224",
+"Q.	c #787760",
+"R.	c #9C9A76",
+"S.	c #9D9D71",
+"T.	c #A1A862",
+"U.	c #A2A763",
+"V.	c #9D9C72",
+"W.	c #989673",
+"X.	c #605841",
+"Y.	c #60563E",
+"Z.	c #918F6E",
+"`.	c #96946E",
+". . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# $ % & # # * = - ; # # # # # # ",
+"> , ' ) ! ~ { ] ^ / ( _ > > > > ",
+": < [ } | ^ 1 2 3 4 3 5 6 : : : ",
+"7 8 9 0 a b c d e f g h i j 7 7 ",
+"k l m n 3 h o p q r s t u v k k ",
+"w x y z A B C D E F G H I J K w ",
+"L M N O P Q R S T U V W X Y Z L ",
+"`  ...+.@.#.$.%.&.*.=.-.;.>.,.` ",
+"'.).!.~.{.].^./.(._.:.<.[.}.|.'.",
+"1.2.3.4.5.6.7.8.9.0.a.b.c.d.e.1.",
+"f.f.g.h.i.j.k.l.m.n.o.p.q.r.s.f.",
+"t.t.t.u.v.w.x.y.p.z.A.B.C.D.E.t.",
+"F.F.F.F.G.H.I.J.K.L.M.N.O.P.Q.F.",
+"R.R.R.R.R.R.S.T.U.V.R.W.X.Y.Z.R.",
+"`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.`.",
+"+ + + + + + + + + + + + + + + + "};
diff --git a/themes/elberg/left-active.xpm b/themes/elberg/left-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..bc2a21858631f2ba0f992109adff1f0d17377599
--- /dev/null
+++ b/themes/elberg/left-active.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * left_active_xpm[] = {
+"6 16 6 1",
+" 	c None",
+".	c #4A4D4A",
+"+	c #313031",
+"@	c #F7F3EF",
+"#	c #C6C7AD",
+"$	c #94926B",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+"};
diff --git a/themes/elberg/left-inactive.xpm b/themes/elberg/left-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..cfcf800f1456414ffd263c9b968d0c438f59d6ce
--- /dev/null
+++ b/themes/elberg/left-inactive.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * left_inactive_xpm[] = {
+"6 16 6 1",
+" 	c None",
+".	c #4A4D4A",
+"+	c #2E2D2E",
+"@	c #D8D5D1",
+"#	c #ADAE97",
+"$	c #81805E",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+",
+".+@#$+"};
diff --git a/themes/elberg/maximize-active.xpm b/themes/elberg/maximize-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..69aa063eb066f0e6acc7c01831b217bb25845307
--- /dev/null
+++ b/themes/elberg/maximize-active.xpm
@@ -0,0 +1,200 @@
+/* XPM */
+static char * maximize_active_xpm[] = {
+"16 19 178 2",
+"  	c None",
+". 	c #4A4D4A",
+"+ 	c #313031",
+"@ 	c #F6F1ED",
+"# 	c #F0ECE5",
+"$ 	c #D9D5CF",
+"% 	c #888679",
+"& 	c #8C8B50",
+"* 	c #939242",
+"= 	c #93923F",
+"- 	c #8C894B",
+"; 	c #858276",
+"> 	c #E9E5DC",
+", 	c #A7A49E",
+"' 	c #8C8C43",
+") 	c #F4F369",
+"! 	c #FFFB69",
+"~ 	c #FFF658",
+"{ 	c #FFF24E",
+"] 	c #FFEE49",
+"^ 	c #F2DC3E",
+"/ 	c #84762B",
+"( 	c #A5A29B",
+"_ 	c #E2DFD4",
+": 	c #A8A69D",
+"< 	c #A7A744",
+"[ 	c #FDFA61",
+"} 	c #F7EC43",
+"| 	c #F2E334",
+"1 	c #F4E032",
+"2 	c #F9E130",
+"3 	c #FDE02F",
+"4 	c #FEDD2D",
+"5 	c #FCD72B",
+"6 	c #987F1F",
+"7 	c #A5A39B",
+"8 	c #DCD8CB",
+"9 	c #D3CFC3",
+"0 	c #7F7F3B",
+"a 	c #F8F247",
+"b 	c #A9A026",
+"c 	c #465A0F",
+"d 	c #1E5606",
+"e 	c #205806",
+"f 	c #505D0F",
+"g 	c #BCA221",
+"h 	c #FBD329",
+"i 	c #FDD127",
+"j 	c #FACA25",
+"k 	c #6E5A22",
+"l 	c #D6D2C3",
+"m 	c #858379",
+"n 	c #DCD535",
+"o 	c #656916",
+"p 	c #006400",
+"q 	c #009300",
+"r 	c #009700",
+"s 	c #009B00",
+"t 	c #009C00",
+"u 	c #026600",
+"v 	c #807013",
+"w 	c #FDCA24",
+"x 	c #FDC521",
+"y 	c #D09F1A",
+"z 	c #827F75",
+"A 	c #D0CCBA",
+"B 	c #747048",
+"C 	c #8F871E",
+"D 	c #006F00",
+"E 	c #009400",
+"F 	c #008800",
+"G 	c #0A6009",
+"H 	c #0A6109",
+"I 	c #009100",
+"J 	c #00A500",
+"K 	c #007500",
+"L 	c #AD8717",
+"M 	c #FEC01E",
+"N 	c #F5B41B",
+"O 	c #6E6041",
+"P 	c #C9C6B2",
+"Q 	c #766E32",
+"R 	c #194C05",
+"S 	c #018301",
+"T 	c #757E30",
+"U 	c #F5E463",
+"V 	c #F5CE4F",
+"W 	c #6F631A",
+"X 	c #00AC00",
+"Y 	c #33590A",
+"Z 	c #FFBE1F",
+"` 	c #F8B018",
+" .	c #725B29",
+"..	c #C2C0A9",
+"+.	c #504A29",
+"@.	c #006500",
+"#.	c #009600",
+"$.	c #1E600F",
+"%.	c #FBE763",
+"&.	c #FFCE4E",
+"*.	c #FEC72C",
+"=.	c #F0B81F",
+"-.	c #165B03",
+";.	c #00B400",
+">.	c #057104",
+",.	c #EBAF30",
+"'.	c #F7A915",
+").	c #6F5626",
+"!.	c #BCBAA1",
+"~.	c #AEAC95",
+"{.	c #23981E",
+"].	c #009900",
+"^.	c #296110",
+"/.	c #FFD241",
+"(.	c #FEC423",
+"_.	c #FDBF1E",
+":.	c #EDAF1B",
+"<.	c #205C03",
+"[.	c #00BB00",
+"}.	c #038303",
+"|.	c #E0A43E",
+"1.	c #F19E14",
+"2.	c #665635",
+"3.	c #B6B398",
+"4.	c #5EA44F",
+"5.	c #027402",
+"6.	c #AA8217",
+"7.	c #F6B71C",
+"8.	c #F0AF1A",
+"9.	c #9A6E0F",
+"0.	c #008700",
+"a.	c #00C100",
+"b.	c #0C720A",
+"c.	c #F3AA43",
+"d.	c #CC800C",
+"e.	c #6D6A59",
+"f.	c #B0AD90",
+"g.	c #A6AB88",
+"h.	c #139C0F",
+"i.	c #00A300",
+"j.	c #036F00",
+"k.	c #3B5606",
+"l.	c #395506",
+"m.	c #037C00",
+"n.	c #00C800",
+"o.	c #55631F",
+"p.	c #F69D2E",
+"q.	c #654310",
+"r.	c #A7A488",
+"s.	c #A9A687",
+"t.	c #87A46C",
+"u.	c #0CA20A",
+"v.	c #00A900",
+"w.	c #00B100",
+"x.	c #00B800",
+"y.	c #00BE00",
+"z.	c #0F6C06",
+"A.	c #D48B2A",
+"B.	c #92570B",
+"C.	c #75735D",
+"D.	c #A2A07F",
+"E.	c #8EA070",
+"F.	c #39A42D",
+"G.	c #05AC03",
+"H.	c #00B300",
+"I.	c #00A200",
+"J.	c #185601",
+"K.	c #B46F0C",
+"L.	c #7C4B0B",
+"M.	c #6C6A53",
+"N.	c #9C9A76",
+"O.	c #959A71",
+"P.	c #7F9B60",
+"Q.	c #2A1E05",
+"R.	c #684410",
+"S.	c #564C31",
+"T.	c #888667",
+"U.	c #96946E",
+". . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# # # # $ % & * = - ; $ # # # # ",
+"> > > , ' ) ! ~ { ] ^ / ( > > > ",
+"_ _ : < [ } | 1 2 3 4 5 6 7 _ _ ",
+"8 9 0 a b c d e f g h i j k 9 8 ",
+"l m n o p q r s t u v w x y z l ",
+"A B C D E F G H I J K L M N O A ",
+"P Q R q S T U V W I X Y Z `  .P ",
+"..+.@.#.$.%.&.*.=.-.;.>.,.'.)...",
+"!.~.{.].^./.(._.:.<.[.}.|.1.2.!.",
+"3.3.4.s 5.6.7.8.9.0.a.b.c.d.e.3.",
+"f.f.g.h.i.j.k.l.m.n.a.o.p.q.r.f.",
+"s.s.s.t.u.v.w.x.y.a.z.A.B.C.s.s.",
+"D.D.D.D.E.F.G.H.I.J.K.L.M.D.D.D.",
+"N.N.N.N.N.N.O.P.Q.R.S.T.N.N.N.N.",
+"U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.U.",
+"+ + + + + + + + + + + + + + + + "};
diff --git a/themes/elberg/maximize-inactive.xpm b/themes/elberg/maximize-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..64612bc160cb1b9179a1471c6566930ff6bd2b34
--- /dev/null
+++ b/themes/elberg/maximize-inactive.xpm
@@ -0,0 +1,186 @@
+/* XPM */
+static char * maximize_inactive_xpm[] = {
+"16 19 164 2",
+"  	c None",
+". 	c #4A4D4A",
+"+ 	c #2E2D2E",
+"@ 	c #D7D3CF",
+"# 	c #D2CEC8",
+"$ 	c #BEBAB5",
+"% 	c #77756D",
+"& 	c #706F61",
+"* 	c #727160",
+"= 	c #71705F",
+"- 	c #6E6C5E",
+"; 	c #74726B",
+"> 	c #CCC8C1",
+", 	c #93918A",
+"' 	c #6E6D5E",
+") 	c #B9B8A2",
+"! 	c #BFBEA7",
+"~ 	c #B8B79D",
+"{ 	c #B4B297",
+"] 	c #B2B094",
+"^ 	c #A6A588",
+"/ 	c #5E5D4C",
+"( 	c #918E88",
+"_ 	c #C6C3BA",
+": 	c #94928A",
+"< 	c #7E7D6A",
+"[ 	c #BBBAA2",
+"} 	c #ACAA8C",
+"| 	c #A4A281",
+"1 	c #A3A180",
+"2 	c #A5A383",
+"3 	c #A6A484",
+"4 	c #A4A282",
+"5 	c #65644F",
+"6 	c #918F88",
+"7 	c #C1BEB2",
+"8 	c #B9B6AB",
+"9 	c #626151",
+"0 	c #AEAC8F",
+"a 	c #747359",
+"b 	c #464533",
+"c 	c #474634",
+"d 	c #484734",
+"e 	c #484736",
+"f 	c #7C7A5F",
+"g 	c #A09E7C",
+"h 	c #4C4B3C",
+"i 	c #BBB8AA",
+"j 	c #757369",
+"k 	c #979579",
+"l 	c #4E4D3B",
+"m 	c #57553E",
+"n 	c #7E7C5B",
+"o 	c #7F7D5C",
+"p 	c #817E5D",
+"q 	c #817F5D",
+"r 	c #54523C",
+"s 	c #595844",
+"t 	c #A19F7E",
+"u 	c #A19E7C",
+"v 	c #858364",
+"w 	c #716F67",
+"x 	c #B6B3A3",
+"y 	c #5C5B4F",
+"z 	c #63614D",
+"A 	c #616046",
+"B 	c #727052",
+"C 	c #52503B",
+"D 	c #52513B",
+"E 	c #747354",
+"F 	c #858360",
+"G 	c #5E5C43",
+"H 	c #6F6D55",
+"I 	c #A09E7B",
+"J 	c #9A9874",
+"K 	c #565448",
+"L 	c #B0AD9C",
+"M 	c #565547",
+"N 	c #403F2F",
+"O 	c #6E6C4F",
+"P 	c #626150",
+"Q 	c #B7B69F",
+"R 	c #AFAD93",
+"S 	c #545341",
+"T 	c #716F52",
+"U 	c #878562",
+"V 	c #494836",
+"W 	c #515040",
+"X 	c #AAA894",
+"Y 	c #3C3C32",
+"Z 	c #57563F",
+"` 	c #51503C",
+" .	c #BBB9A2",
+"..	c #999774",
+"+.	c #474633",
+"@.	c #8A8763",
+"#.	c #595740",
+"$.	c #9D9B7D",
+"%.	c #999772",
+"&.	c #4E4D3D",
+"*.	c #A5A28D",
+"=.	c #999683",
+"-.	c #848263",
+";.	c #807E5D",
+">.	c #52503D",
+",.	c #AEAD90",
+"'.	c #A29F7D",
+").	c #A09D7B",
+"!.	c #979470",
+"~.	c #8C8A65",
+"{.	c #656348",
+"].	c #9C9B80",
+"^.	c #95936F",
+"/.	c #4E4C3F",
+"(.	c #9F9C85",
+"_.	c #8F8D71",
+":.	c #5F5D44",
+"<.	c #6D6B53",
+"[.	c #9B9975",
+"}.	c #979571",
+"|.	c #626047",
+"1.	c #636147",
+"2.	c #8E8C67",
+"3.	c #5A5841",
+"4.	c #A9A88C",
+"5.	c #7C7A5B",
+"6.	c #5E5D4F",
+"7.	c #9A977E",
+"8.	c #98957C",
+"9.	c #848160",
+"0.	c #84825F",
+"a.	c #585740",
+"b.	c #464532",
+"c.	c #5C5B43",
+"d.	c #928F69",
+"e.	c #5A5946",
+"f.	c #A2A080",
+"g.	c #414030",
+"h.	c #928F77",
+"i.	c #949276",
+"j.	c #908E71",
+"k.	c #8F8D68",
+"l.	c #54523D",
+"m.	c #8E8C70",
+"n.	c #595842",
+"o.	c #666551",
+"p.	c #8E8C6F",
+"q.	c #8C8A6D",
+"r.	c #888665",
+"s.	c #888663",
+"t.	c #8B8864",
+"u.	c #7C7A5A",
+"v.	c #444432",
+"w.	c #6E6C51",
+"x.	c #4C4B39",
+"y.	c #5E5D49",
+"z.	c #898767",
+"A.	c #888666",
+"B.	c #878565",
+"C.	c #1D1C15",
+"D.	c #424131",
+"E.	c #454433",
+"F.	c #77765A",
+"G.	c #838160",
+". . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# # # # $ % & * = - ; $ # # # # ",
+"> > > , ' ) ! ~ { ] ^ / ( > > > ",
+"_ _ : < [ } | 1 2 3 3 4 5 6 _ _ ",
+"7 8 9 0 a b c d e f 1 1 g h 8 7 ",
+"i j k l m n o p q r s t u v w i ",
+"x y z A n B C D E F G H I J K x ",
+"L M N n O P Q R S T U V g J W L ",
+"X Y Z o `  .{ 2 ..+.@.#.$.%.&.X ",
+"*.=.-.;.>.,.'.).!.+.~.{.].^./.*.",
+"(.(._.q :.<.[.}.|.1.2.3.4.5.6.(.",
+"7.7.8.9.0.a.+.b.c.d.2.e.f.g.h.7.",
+"i.i.i.j.F U @.~.2.k.l.m.n.o.i.i.",
+"p.p.p.p.q.r.s.t.u.v.w.x.y.p.p.p.",
+"z.z.z.z.z.z.A.B.C.D.E.F.z.z.z.z.",
+"G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.G.",
+"+ + + + + + + + + + + + + + + + "};
diff --git a/themes/elberg/maximize-pressed.xpm b/themes/elberg/maximize-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..3f53b4d30a506028d71078aed5517fe656d541d4
--- /dev/null
+++ b/themes/elberg/maximize-pressed.xpm
@@ -0,0 +1,198 @@
+/* XPM */
+static char * maximize_pressed_xpm[] = {
+"16 19 176 2",
+"  	c None",
+". 	c #4A4D4A",
+"+ 	c #313031",
+"@ 	c #F6F1ED",
+"# 	c #F0ECE5",
+"$ 	c #DBD8D1",
+"% 	c #939186",
+"& 	c #989864",
+"* 	c #9E9E5B",
+"= 	c #9E9E58",
+"- 	c #97975E",
+"; 	c #918F82",
+"> 	c #E9E5DC",
+", 	c #AFACA5",
+"' 	c #98975C",
+") 	c #F5F589",
+"! 	c #FFFE88",
+"~ 	c #FFFD74",
+"{ 	c #FFFC68",
+"] 	c #FFFB61",
+"^ 	c #F4EE54",
+"/ 	c #928D40",
+"( 	c #ADAAA3",
+"_ 	c #E2DFD4",
+": 	c #AFACA4",
+"< 	c #B0AF5D",
+"[ 	c #FFFE7F",
+"} 	c #FDFA5B",
+"| 	c #FCF649",
+"1 	c #FDF547",
+"2 	c #FEF645",
+"3 	c #FFF644",
+"4 	c #FFF442",
+"5 	c #FFF140",
+"6 	c #A79B35",
+"7 	c #ACAAA2",
+"8 	c #DCD8CB",
+"9 	c #D4D0C4",
+"0 	c #8C8C4F",
+"a 	c #FDFB5F",
+"b 	c #BDB93C",
+"c 	c #778323",
+"d 	c #708E15",
+"e 	c #738E16",
+"f 	c #7D8224",
+"g 	c #CABE37",
+"h 	c #FFEE3E",
+"i 	c #FFED3C",
+"j 	c #FEE83A",
+"k 	c #807537",
+"l 	c #D6D2C3",
+"m 	c #8F8D83",
+"n 	c #E3E14B",
+"o 	c #86892C",
+"p 	c #76B208",
+"q 	c #A5F300",
+"r 	c #AEF300",
+"s 	c #B4F200",
+"t 	c #B8F100",
+"u 	c #83A50A",
+"v 	c #99902A",
+"w 	c #FFE839",
+"x 	c #FFE636",
+"y 	c #DEC130",
+"z 	c #8D8A80",
+"A 	c #D0CCBA",
+"B 	c #827F58",
+"C 	c #A3A035",
+"D 	c #7EC406",
+"E 	c #9EDB03",
+"F 	c #799A14",
+"G 	c #7D9814",
+"H 	c #B1D703",
+"I 	c #C8F100",
+"J 	c #95B208",
+"K 	c #B8A62D",
+"L 	c #FFE233",
+"M 	c #FDD831",
+"N 	c #7F7452",
+"O 	c #C9C6B2",
+"P 	c #858246",
+"Q 	c #618315",
+"R 	c #A0F400",
+"S 	c #97D305",
+"T 	c #8D9147",
+"U 	c #F6F181",
+"V 	c #F6E868",
+"W 	c #8B812F",
+"X 	c #B7CD05",
+"Y 	c #D3F000",
+"Z 	c #7C811B",
+"` 	c #FFE034",
+" .	c #FED42E",
+"..	c #86743D",
+"+.	c #C2C0A9",
+"@.	c #605F3E",
+"#.	c #73B308",
+"$.	c #75931C",
+"%.	c #FCF681",
+"&.	c #FFEB69",
+"*.	c #FFE741",
+"=.	c #FADA34",
+"-.	c #838312",
+";.	c #E0F000",
+">.	c #93A10E",
+",.	c #EDD045",
+"'.	c #FECE2B",
+").	c #84703A",
+"!.	c #BCBAA1",
+"~.	c #B0AE97",
+"{.	c #9FE71E",
+"].	c #A8F300",
+"^.	c #79901E",
+"/.	c #FFED58",
+"(.	c #FFE538",
+"_.	c #FFE133",
+":.	c #FAD430",
+"<.	c #888014",
+"[.	c #EBEF00",
+"}.	c #A7B20A",
+"|.	c #E3C554",
+"1.	c #FCC42A",
+"2.	c #786B47",
+"3.	c #B6B398",
+"4.	c #AAD24F",
+"5.	c #89B409",
+"6.	c #B7A22D",
+"7.	c #FDDB32",
+"8.	c #FBD32F",
+"9.	c #B29127",
+"0.	c #B1AB09",
+"a.	c #EDEF00",
+"b.	c #939A15",
+"c.	c #F5CE5A",
+"d.	c #DEA524",
+"e.	c #787564",
+"f.	c #B0AD90",
+"g.	c #AFB088",
+"h.	c #A7EB0F",
+"i.	c #88A70A",
+"j.	c #7F7C19",
+"k.	c #817919",
+"l.	c #9DA20A",
+"m.	c #E3ED00",
+"n.	c #8A8333",
+"o.	c #FDC345",
+"p.	c #7D6027",
+"q.	c #A8A58A",
+"r.	c #A9A687",
+"s.	c #A8B56C",
+"t.	c #AFED0A",
+"u.	c #BCF200",
+"v.	c #DAF000",
+"w.	c #DCF000",
+"x.	c #899212",
+"y.	c #DBAE40",
+"z.	c #A87924",
+"A.	c #7D7B65",
+"B.	c #A2A07F",
+"C.	c #A3A970",
+"D.	c #AED42D",
+"E.	c #BDEF03",
+"F.	c #C7F100",
+"G.	c #B8D803",
+"H.	c #767C12",
+"I.	c #BD9124",
+"J.	c #8E6B24",
+"K.	c #75735C",
+"L.	c #9C9A76",
+"M.	c #9D9D71",
+"N.	c #A0A661",
+"O.	c #433B1E",
+"P.	c #776127",
+"Q.	c #645C41",
+"R.	c #8B8A6A",
+"S.	c #96946E",
+". . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# # # # $ % & * = - ; $ # # # # ",
+"> > > , ' ) ! ~ { ] ^ / ( > > > ",
+"_ _ : < [ } | 1 2 3 4 5 6 7 _ _ ",
+"8 9 0 a b c d e f g h i j k 9 8 ",
+"l m n o p q r s t u v w x y z l ",
+"A B C D q E F G H I J K L M N A ",
+"O P Q R S T U V W X Y Z `  ...O ",
+"+.@.#.q $.%.&.*.=.-.;.>.,.'.).+.",
+"!.~.{.].^./.(._.:.<.[.}.|.1.2.!.",
+"3.3.4.].5.6.7.8.9.0.a.b.c.d.e.3.",
+"f.f.g.h.s i.j.k.l.[.m.n.o.p.q.f.",
+"r.r.r.s.t.u.I Y v.w.x.y.z.A.r.r.",
+"B.B.B.B.C.D.E.F.G.H.I.J.K.B.B.B.",
+"L.L.L.L.L.L.M.N.O.P.Q.R.L.L.L.L.",
+"S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.S.",
+"+ + + + + + + + + + + + + + + + "};
diff --git a/themes/elberg/menu-active.xpm b/themes/elberg/menu-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..5d1e9ce193964d882640b15427dd3df8890c4c97
--- /dev/null
+++ b/themes/elberg/menu-active.xpm
@@ -0,0 +1,182 @@
+/* XPM */
+static char * menu_active_xpm[] = {
+"16 19 160 2",
+"  	c None",
+". 	c #4A4D4A",
+"+ 	c #313031",
+"@ 	c #F6F1ED",
+"# 	c #F0ECE5",
+"$ 	c #ECEAE1",
+"% 	c #D4DFCA",
+"& 	c #A9A7A1",
+"* 	c #85846E",
+"= 	c #8B887F",
+"- 	c #E3DFD9",
+"; 	c #E9E5DC",
+"> 	c #D4DCC9",
+", 	c #5FA95A",
+"' 	c #0E870D",
+") 	c #055D04",
+"! 	c #B8B84B",
+"~ 	c #FFFF62",
+"{ 	c #E8E63B",
+"] 	c #686645",
+"^ 	c #E2DFD4",
+"/ 	c #BBCEAF",
+"( 	c #168B14",
+"_ 	c #008500",
+": 	c #008900",
+"< 	c #366517",
+"[ 	c #FFFE6C",
+"} 	c #FEF547",
+"| 	c #FBEF37",
+"1 	c #837C1D",
+"2 	c #C2CAB6",
+"3 	c #DCD8CB",
+"4 	c #D1CFC1",
+"5 	c #40612B",
+"6 	c #74812B",
+"7 	c #556C1A",
+"8 	c #026901",
+"9 	c #1E5C0D",
+"0 	c #F4E641",
+"a 	c #FBE833",
+"b 	c #F1DD31",
+"c 	c #626114",
+"d 	c #2E9C2A",
+"e 	c #D9D7C8",
+"f 	c #D6D2C3",
+"g 	c #797862",
+"h 	c #ECEB63",
+"i 	c #FFF363",
+"j 	c #FDE938",
+"k 	c #7B7318",
+"l 	c #007900",
+"m 	c #41550F",
+"n 	c #95851C",
+"o 	c #6B6314",
+"p 	c #046401",
+"q 	c #009700",
+"r 	c #8CBC7F",
+"s 	c #D0CCBA",
+"t 	c #838242",
+"u 	c #FFED6A",
+"v 	c #FEDF35",
+"w 	c #FDDC2D",
+"x 	c #CAAF23",
+"y 	c #006A00",
+"z 	c #00A300",
+"A 	c #008F00",
+"B 	c #009C00",
+"C 	c #00A200",
+"D 	c #009E00",
+"E 	c #41A93A",
+"F 	c #C9C6B2",
+"G 	c #465F1E",
+"H 	c #FCD73D",
+"I 	c #FDD429",
+"J 	c #F7CE27",
+"K 	c #9E8319",
+"L 	c #008300",
+"M 	c #00AD00",
+"N 	c #00A400",
+"O 	c #00A700",
+"P 	c #00A900",
+"Q 	c #00A500",
+"R 	c #21A61D",
+"S 	c #C2C0A9",
+"T 	c #0A7709",
+"U 	c #5D5911",
+"V 	c #B5911A",
+"W 	c #947615",
+"X 	c #165403",
+"Y 	c #028E02",
+"Z 	c #4F6B21",
+"` 	c #9C883C",
+" .	c #8D742A",
+"..	c #235809",
+"+.	c #1FA91B",
+"@.	c #BCBAA1",
+"#.	c #24991E",
+"$.	c #009100",
+"%.	c #007700",
+"&.	c #008B00",
+"*.	c #00A000",
+"=.	c #767631",
+"-.	c #FED073",
+";.	c #FFBE56",
+">.	c #FFBA30",
+",.	c #EAA719",
+"'.	c #234D03",
+").	c #38AE30",
+"!.	c #B6B398",
+"~.	c #5EA44F",
+"{.	c #009B00",
+"].	c #00AB00",
+"^.	c #086F07",
+"/.	c #EDBD65",
+"(.	c #FEB352",
+"_.	c #FEAE19",
+":.	c #FEAD14",
+"<.	c #FCA914",
+"[.	c #8B5D0A",
+"}.	c #72A05F",
+"|.	c #B0AD90",
+"1.	c #A6AB88",
+"2.	c #139C0F",
+"3.	c #0E670C",
+"4.	c #FEB35C",
+"5.	c #FEA72A",
+"6.	c #FEA510",
+"7.	c #FEA30F",
+"8.	c #FCA00F",
+"9.	c #9C6209",
+"0.	c #928F77",
+"a.	c #A9A687",
+"b.	c #87A46C",
+"c.	c #0CA20A",
+"d.	c #028102",
+"e.	c #C27E34",
+"f.	c #FD9C1D",
+"g.	c #FE9B0B",
+"h.	c #FD990A",
+"i.	c #F29009",
+"j.	c #66410D",
+"k.	c #A4A183",
+"l.	c #A2A07F",
+"m.	c #8EA070",
+"n.	c #39A42D",
+"o.	c #05AB03",
+"p.	c #235308",
+"q.	c #BF6F09",
+"r.	c #F18906",
+"s.	c #E78205",
+"t.	c #834B04",
+"u.	c #6B6952",
+"v.	c #9C9A76",
+"w.	c #959A71",
+"x.	c #819C62",
+"y.	c #66654D",
+"z.	c #564B31",
+"A.	c #554E36",
+"B.	c #7D7B5E",
+"C.	c #96946E",
+". . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# # # # # # $ % & * = - # # # # ",
+"; ; ; ; > , ' ) ! ~ { ] ; ; ; ; ",
+"^ ^ ^ / ( _ : < [ } | 1 2 ^ ^ ^ ",
+"3 3 4 5 6 7 8 9 0 a b c d e 3 3 ",
+"f f g h i j k l m n o p q r f f ",
+"s s t u v w x y z A B C D E s s ",
+"F F G H I J K L M N O P Q R F F ",
+"S S T U V W X Y Z `  ...C +.S S ",
+"@.@.#.$.%.&.*.=.-.;.>.,.'.).@.@.",
+"!.!.~.{.z ].^./.(._.:.<.[.}.!.!.",
+"|.|.1.2.z ].3.4.5.6.7.8.9.0.|.|.",
+"a.a.a.b.c.P d.e.f.g.h.i.j.k.a.a.",
+"l.l.l.l.m.n.o.p.q.r.s.t.u.l.l.l.",
+"v.v.v.v.v.v.w.x.y.z.A.B.v.v.v.v.",
+"C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.C.",
+"+ + + + + + + + + + + + + + + + "};
diff --git a/themes/elberg/menu-inactive.xpm b/themes/elberg/menu-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..91270c9d966d90af00cdcd62cd557cd94ae25da0
--- /dev/null
+++ b/themes/elberg/menu-inactive.xpm
@@ -0,0 +1,175 @@
+/* XPM */
+static char * menu_inactive_xpm[] = {
+"16 19 153 2",
+"  	c None",
+". 	c #4A4D4A",
+"+ 	c #2E2D2E",
+"@ 	c #D7D3CF",
+"# 	c #D2CEC8",
+"$ 	c #D0CCC6",
+"% 	c #C7C3BA",
+"& 	c #96938E",
+"* 	c #737168",
+"= 	c #797771",
+"- 	c #C7C3BD",
+"; 	c #CCC8C1",
+"> 	c #C4C0B7",
+", 	c #9A9782",
+"' 	c #7C7A5C",
+") 	c #56543E",
+"! 	c #8B8A76",
+"~ 	c #BCBBA3",
+"{ 	c #A09E82",
+"] 	c #53524A",
+"^ 	c #C6C3BA",
+"/ 	c #B8B5A8",
+"( 	c #7E7C5F",
+"_ 	c #797757",
+": 	c #7A7858",
+"< 	c #545340",
+"[ 	c #C1BFA9",
+"} 	c #B1AF93",
+"| 	c #A9A788",
+"1 	c #5A5945",
+"2 	c #B3B1A6",
+"3 	c #C1BEB2",
+"4 	c #B9B6AA",
+"5 	c #555444",
+"6 	c #626150",
+"7 	c #545341",
+"8 	c #5B5A42",
+"9 	c #4E4D39",
+"0 	c #A9A78B",
+"a 	c #A7A586",
+"b 	c #A2A07E",
+"c 	c #4A4936",
+"d 	c #88866A",
+"e 	c #C0BDB0",
+"f 	c #BBB8AA",
+"g 	c #69675C",
+"h 	c #B3B19B",
+"i 	c #BDBBA4",
+"j 	c #AAA889",
+"k 	c #565542",
+"l 	c #646248",
+"m 	c #424132",
+"n 	c #65634C",
+"o 	c #4D4C38",
+"p 	c #53523C",
+"q 	c #7F7D5C",
+"r 	c #A5A38E",
+"s 	c #B6B3A3",
+"t 	c #676657",
+"u 	c #C0BEA8",
+"v 	c #A5A383",
+"w 	c #868466",
+"x 	c #83815F",
+"y 	c #727052",
+"z 	c #7D7B5A",
+"A 	c #83815E",
+"B 	c #82805D",
+"C 	c #908E72",
+"D 	c #B0AD9C",
+"E 	c #525140",
+"F 	c #ABA98C",
+"G 	c #A3A180",
+"H 	c #A19F7D",
+"I 	c #69674D",
+"J 	c #67654A",
+"K 	c #878562",
+"L 	c #7F7E5D",
+"M 	c #868461",
+"N 	c #84825F",
+"O 	c #8A8768",
+"P 	c #AAA894",
+"Q 	c #69674C",
+"R 	c #494837",
+"S 	c #767458",
+"T 	c #615F47",
+"U 	c #424130",
+"V 	c #6F6D50",
+"W 	c #585745",
+"X 	c #757462",
+"Y 	c #676653",
+"Z 	c #484735",
+"` 	c #8A8867",
+" .	c #A5A28D",
+"..	c #858364",
+"+.	c #7A7758",
+"@.	c #615F46",
+"#.	c #6E6D50",
+"$.	c #656453",
+"%.	c #C3C2AD",
+"&.	c #B7B59C",
+"*.	c #92906F",
+"=.	c #3F3E2E",
+"-.	c #8F8D6E",
+";.	c #9F9C85",
+">.	c #8F8D71",
+",.	c #817F5D",
+"'.	c #595740",
+").	c #B4B39D",
+"!.	c #B5B49A",
+"~.	c #9D9B78",
+"{.	c #9B9976",
+"].	c #9A9874",
+"^.	c #56553F",
+"/.	c #89866E",
+"(.	c #9A977E",
+"_.	c #98957C",
+":.	c #848160",
+"<.	c #55533D",
+"[.	c #B9B79F",
+"}.	c #A4A282",
+"|.	c #9A9873",
+"1.	c #999772",
+"2.	c #989671",
+"3.	c #5F5D45",
+"4.	c #807D68",
+"5.	c #949276",
+"6.	c #908E71",
+"7.	c #858360",
+"8.	c #666449",
+"9.	c #88866E",
+"0.	c #9F9D7A",
+"a.	c #979570",
+"b.	c #97956F",
+"c.	c #918E69",
+"d.	c #403F2F",
+"e.	c #8F8D72",
+"f.	c #8E8C6F",
+"g.	c #8C8A6D",
+"h.	c #888665",
+"i.	c #888562",
+"j.	c #484634",
+"k.	c #737154",
+"l.	c #8E8C67",
+"m.	c #888662",
+"n.	c #5D5C49",
+"o.	c #898767",
+"p.	c #888666",
+"q.	c #878565",
+"r.	c #5A5944",
+"s.	c #454433",
+"t.	c #464535",
+"u.	c #6E6C52",
+"v.	c #838160",
+". . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# # # # # # $ % & * = - # # # # ",
+"; ; ; ; > , ' ) ! ~ { ] ; ; ; ; ",
+"^ ^ ^ / ( _ : < [ } | 1 2 ^ ^ ^ ",
+"3 3 4 5 6 7 8 9 0 a b c d e 3 3 ",
+"f f g h i j k l m n o p q r f f ",
+"s s t u | v w ) x y z A B C s s ",
+"D D E F G H I J K L x M N O D D ",
+"P P Q R S T U V W X Y Z q ` P P ",
+" . ...+.@.#.z $.%.&.a *.=.-. . .",
+";.;.>.,.N K '.).!.~.{.].^./.;.;.",
+"(.(._.:.N K <.[.}.|.1.2.3.4.(.(.",
+"5.5.5.6.7.K 8.9.0.a.b.c.d.e.5.5.",
+"f.f.f.f.g.h.i.j.k.l.m.o n.f.f.f.",
+"o.o.o.o.o.o.p.q.r.s.t.u.o.o.o.o.",
+"v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.v.",
+"+ + + + + + + + + + + + + + + + "};
diff --git a/themes/elberg/menu-pressed.xpm b/themes/elberg/menu-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..7532c5ec70bc44d77dcbbce70387864b21638508
--- /dev/null
+++ b/themes/elberg/menu-pressed.xpm
@@ -0,0 +1,185 @@
+/* XPM */
+static char * menu_pressed_xpm[] = {
+"16 19 163 2",
+"  	c None",
+". 	c #4A4D4A",
+"+ 	c #313031",
+"@ 	c #F6F1ED",
+"# 	c #F0ECE5",
+"$ 	c #EEECE1",
+"% 	c #E3EDCA",
+"& 	c #B2B0A8",
+"* 	c #91907C",
+"= 	c #96938A",
+"- 	c #E5E1DA",
+"; 	c #E9E5DC",
+"> 	c #DFE6C9",
+", 	c #ADEF5A",
+"' 	c #8DF40D",
+") 	c #69B20D",
+"! 	c #BFBF65",
+"~ 	c #FFFF7F",
+"{ 	c #EDEC51",
+"] 	c #797857",
+"^ 	c #E2DFD4",
+"/ 	c #D1E2AF",
+"( 	c #8FF314",
+"_ 	c #8DF500",
+": 	c #94F500",
+"< 	c #759526",
+"[ 	c #FFFF8C",
+"} 	c #FFFD5F",
+"| 	c #FFFC4C",
+"1 	c #999634",
+"2 	c #CFD3B8",
+"3 	c #DCD8CB",
+"4 	c #D4D1C2",
+"5 	c #6E8B3A",
+"6 	c #8D9840",
+"7 	c #7D8F2D",
+"8 	c #7CB809",
+"9 	c #71921B",
+"0 	c #F8F458",
+"a 	c #FFF949",
+"b 	c #FCF346",
+"c 	c #83812B",
+"d 	c #AAE82B",
+"e 	c #DBD8C8",
+"f 	c #D6D2C3",
+"g 	c #858470",
+"h 	c #EEEE81",
+"i 	c #FFFC81",
+"j 	c #FFF94D",
+"k 	c #928F2F",
+"l 	c #93C306",
+"m 	c #727823",
+"n 	c #ABA133",
+"o 	c #8A832B",
+"p 	c #7EA50B",
+"q 	c #ACF300",
+"r 	c #C5DD7F",
+"s 	c #D0CCBA",
+"t 	c #909056",
+"u 	c #FFFA8A",
+"v 	c #FFF54A",
+"w 	c #FFF442",
+"x 	c #DBCC39",
+"y 	c #88A609",
+"z 	c #C5F000",
+"A 	c #B1D304",
+"B 	c #BDE601",
+"C 	c #C0F200",
+"D 	c #B7F200",
+"E 	c #B9E63A",
+"F 	c #C9C6B2",
+"G 	c #73892F",
+"H 	c #FEF054",
+"I 	c #FFEF3E",
+"J 	c #FEEB3C",
+"K 	c #B6A430",
+"L 	c #A5BF06",
+"M 	c #D5F000",
+"N 	c #CCE401",
+"O 	c #CEEA01",
+"P 	c #CCF100",
+"Q 	c #C2F200",
+"R 	c #B9EA1D",
+"S 	c #C2C0A9",
+"T 	c #82CA0E",
+"U 	c #7E7B26",
+"V 	c #C7B231",
+"W 	c #AC972C",
+"X 	c #777F13",
+"Y 	c #B3C707",
+"Z 	c #868935",
+"` 	c #A7A055",
+" .	c #9C9140",
+"..	c #7A8019",
+"+.	c #C1E601",
+"@.	c #BEE91B",
+"#.	c #BCBAA1",
+"$.	c #A0E81E",
+"%.	c #A0E801",
+"&.	c #8DB907",
+"*.	c #A7CB05",
+"=.	c #C3DE02",
+"-.	c #928F49",
+";.	c #FFEB95",
+">.	c #FFE071",
+",.	c #FFDD46",
+"'.	c #F0CA2F",
+").	c #727715",
+"!.	c #C0E030",
+"~.	c #B6B398",
+"{.	c #AAD24F",
+"].	c #A8F300",
+"^.	c #C5F100",
+"/.	c #8D9F12",
+"(.	c #EFDA83",
+"_.	c #FFD76D",
+":.	c #FFD32F",
+"<.	c #FFD22B",
+"[.	c #FFCF2A",
+"}.	c #A07F23",
+"|.	c #ABB561",
+"1.	c #B0AD90",
+"2.	c #AFB088",
+"3.	c #A7EB0F",
+"4.	c #B4F200",
+"5.	c #829417",
+"6.	c #FED778",
+"7.	c #FFCD40",
+"8.	c #FFCB27",
+"9.	c #FFC926",
+"0.	c #FFC626",
+"a.	c #B28521",
+"b.	c #96947C",
+"c.	c #A9A687",
+"d.	c #A8B56C",
+"e.	c #AFED0A",
+"f.	c #BCF200",
+"g.	c #99B809",
+"h.	c #CA9F4B",
+"i.	c #FFC233",
+"j.	c #FFC123",
+"k.	c #FFBF22",
+"l.	c #FCB622",
+"m.	c #7F5E25",
+"n.	c #A5A284",
+"o.	c #A2A07F",
+"p.	c #A3A970",
+"q.	c #AED42D",
+"r.	c #BDEE03",
+"s.	c #747C18",
+"t.	c #CD9222",
+"u.	c #FCAF1F",
+"v.	c #F6A71E",
+"w.	c #9C6A1E",
+"x.	c #75725C",
+"y.	c #9C9A76",
+"z.	c #9D9D71",
+"A.	c #A0A662",
+"B.	c #706F56",
+"C.	c #655C40",
+"D.	c #635C44",
+"E.	c #828164",
+"F.	c #96946E",
+". . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# # # # # # $ % & * = - # # # # ",
+"; ; ; ; > , ' ) ! ~ { ] ; ; ; ; ",
+"^ ^ ^ / ( _ : < [ } | 1 2 ^ ^ ^ ",
+"3 3 4 5 6 7 8 9 0 a b c d e 3 3 ",
+"f f g h i j k l m n o p q r f f ",
+"s s t u v w x y z A B C D E s s ",
+"F F G H I J K L M N O P Q R F F ",
+"S S T U V W X Y Z `  ...+.@.S S ",
+"#.#.$.%.&.*.=.-.;.>.,.'.).!.#.#.",
+"~.~.{.].D ^./.(._.:.<.[.}.|.~.~.",
+"1.1.2.3.4.Q 5.6.7.8.9.0.a.b.1.1.",
+"c.c.c.d.e.f.g.h.i.j.k.l.m.n.c.c.",
+"o.o.o.o.p.q.r.s.t.u.v.w.x.o.o.o.",
+"y.y.y.y.y.y.z.A.B.C.D.E.y.y.y.y.",
+"F.F.F.F.F.F.F.F.F.F.F.F.F.F.F.F.",
+"+ + + + + + + + + + + + + + + + "};
diff --git a/themes/elberg/right-active.xpm b/themes/elberg/right-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..133cfaed9c4376b190873513357be0a9ac3007bf
--- /dev/null
+++ b/themes/elberg/right-active.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * right_active_xpm[] = {
+"6 16 6 1",
+" 	c None",
+".	c #313031",
+"+	c #FFFFFF",
+"@	c #C6C7AD",
+"#	c #94926B",
+"$	c #4A4D4A",
+".+@#.$",
+".+@#.$",
+".+@#.$",
+".+@#.$",
+".+@#.$",
+".+@#.$",
+".+@#.$",
+".+@#.$",
+".+@#.$",
+".+@#.$",
+".+@#.$",
+".+@#.$",
+".+@#.$",
+".+@#.$",
+".+@#.$",
+".+@#.$"};
diff --git a/themes/elberg/right-inactive.xpm b/themes/elberg/right-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..439dc6be38a0139ca770180c72f8e1fa379feae1
--- /dev/null
+++ b/themes/elberg/right-inactive.xpm
@@ -0,0 +1,26 @@
+/* XPM */
+static char * right_inactive_xpm[] = {
+"6 16 7 1",
+" 	c None",
+".	c #2F2E2F",
+"+	c #E4E4E4",
+"@	c #ADAE97",
+"#	c #81805E",
+"$	c #2E2D2E",
+"%	c #4A4D4A",
+".+@#$%",
+".+@#$%",
+".+@#$%",
+".+@#$%",
+".+@#$%",
+".+@#$%",
+".+@#$%",
+".+@#$%",
+".+@#$%",
+".+@#$%",
+".+@#$%",
+".+@#$%",
+".+@#$%",
+".+@#$%",
+".+@#$%",
+".+@#$%"};
diff --git a/themes/elberg/themerc b/themes/elberg/themerc
new file mode 100644
index 0000000000000000000000000000000000000000..a61875c7ef70d1412b4e54a8c544e54aeefcdfd0
--- /dev/null
+++ b/themes/elberg/themerc
@@ -0,0 +1,6 @@
+full_width_title=false
+button_spacing=0
+button_offset=1
+button_layout=O|HMC
+active_text_color=#ffffff
+inactive_text_color=#d9d9d9
diff --git a/themes/elberg/title-1-active.xpm b/themes/elberg/title-1-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..a5f841ac4f04199d26149893b40b1fcdaf2155c6
--- /dev/null
+++ b/themes/elberg/title-1-active.xpm
@@ -0,0 +1,41 @@
+/* XPM */
+static char * title_1_active_xpm[] = {
+"8 19 19 1",
+" 	c None",
+".	c #4A4D4A",
+"+	c #313031",
+"@	c #F6F1ED",
+"#	c #F0ECE5",
+"$	c #E9E5DC",
+"%	c #E2DFD4",
+"&	c #DCD8CB",
+"*	c #D6D2C3",
+"=	c #D0CCBA",
+"-	c #C9C6B2",
+";	c #C2C0A9",
+">	c #BCBAA1",
+",	c #B6B398",
+"'	c #B0AD90",
+")	c #A9A687",
+"!	c #A2A07F",
+"~	c #9C9A76",
+"{	c #96946E",
+"........",
+"++++++++",
+"@@@@@@@@",
+"########",
+"$$$$$$$$",
+"%%%%%%%%",
+"&&&&&&&&",
+"********",
+"========",
+"--------",
+";;;;;;;;",
+">>>>>>>>",
+",,,,,,,,",
+"''''''''",
+"))))))))",
+"!!!!!!!!",
+"~~~~~~~~",
+"{{{{{{{{",
+"++++++++"};
diff --git a/themes/elberg/title-1-inactive.xpm b/themes/elberg/title-1-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..09a7a7562f9de79bf876a72b41c900f764f798eb
--- /dev/null
+++ b/themes/elberg/title-1-inactive.xpm
@@ -0,0 +1,41 @@
+/* XPM */
+static char * title_1_inactive_xpm[] = {
+"8 19 19 1",
+" 	c None",
+".	c #4A4D4A",
+"+	c #2E2D2E",
+"@	c #D7D3CF",
+"#	c #D2CEC8",
+"$	c #CCC8C1",
+"%	c #C6C3BA",
+"&	c #C1BEB2",
+"*	c #BBB8AA",
+"=	c #B6B3A3",
+"-	c #B0AD9C",
+";	c #AAA894",
+">	c #A5A28D",
+",	c #9F9C85",
+"'	c #9A977E",
+")	c #949276",
+"!	c #8E8C6F",
+"~	c #898767",
+"{	c #838160",
+"........",
+"++++++++",
+"@@@@@@@@",
+"########",
+"$$$$$$$$",
+"%%%%%%%%",
+"&&&&&&&&",
+"********",
+"========",
+"--------",
+";;;;;;;;",
+">>>>>>>>",
+",,,,,,,,",
+"''''''''",
+"))))))))",
+"!!!!!!!!",
+"~~~~~~~~",
+"{{{{{{{{",
+"++++++++"};
diff --git a/themes/elberg/title-2-active.xpm b/themes/elberg/title-2-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..20a11f4a36a3e14bf9ddc9ac5d5b139323e3e257
--- /dev/null
+++ b/themes/elberg/title-2-active.xpm
@@ -0,0 +1,115 @@
+/* XPM */
+static char * title_2_active_xpm[] = {
+"12 19 93 2",
+"  	c None",
+". 	c #4A4D4A",
+"+ 	c #313031",
+"@ 	c #2A3027",
+"# 	c #283024",
+"$ 	c #F6F1ED",
+"% 	c #E2DEDA",
+"& 	c #656363",
+"* 	c #24551B",
+"= 	c #158400",
+"- 	c #F0ECE5",
+"; 	c #DEDAD5",
+"> 	c #C3C0BB",
+", 	c #A7A4A1",
+"' 	c #2C4824",
+") 	c #1D8800",
+"! 	c #E9E5DC",
+"~ 	c #888683",
+"{ 	c #343433",
+"] 	c #303F29",
+"^ 	c #6E6C6A",
+"/ 	c #A4A19C",
+"( 	c #4A4848",
+"_ 	c #2A6415",
+": 	c #258C00",
+"< 	c #E2DFD4",
+"[ 	c #A29F99",
+"} 	c #313C2B",
+"| 	c #2E8307",
+"1 	c #2D9100",
+"2 	c #2E8605",
+"3 	c #305B1B",
+"4 	c #314B24",
+"5 	c #2F6715",
+"6 	c #2D9000",
+"7 	c #DCD8CB",
+"8 	c #656360",
+"9 	c #336A15",
+"0 	c #359600",
+"a 	c #D6D2C3",
+"b 	c #63615D",
+"c 	c #386D15",
+"d 	c #3D9A00",
+"e 	c #D0CCBA",
+"f 	c #959388",
+"g 	c #333C2C",
+"h 	c #429006",
+"i 	c #459E00",
+"j 	c #C9C6B2",
+"k 	c #747269",
+"l 	c #344328",
+"m 	c #4C9E01",
+"n 	c #4DA200",
+"o 	c #C2C0A9",
+"p 	c #C0BDA8",
+"q 	c #4D4C48",
+"r 	c #447115",
+"s 	c #55A600",
+"t 	c #BCBAA1",
+"u 	c #8B8979",
+"v 	c #394826",
+"w 	c #5EAA00",
+"x 	c #B6B398",
+"y 	c #A9A78E",
+"z 	c #31332E",
+"A 	c #66AE00",
+"B 	c #B0AD90",
+"C 	c #A4A287",
+"D 	c #32342E",
+"E 	c #6EB200",
+"F 	c #A9A687",
+"G 	c #7F7D69",
+"H 	c #3E4B26",
+"I 	c #76B700",
+"J 	c #A2A07F",
+"K 	c #A19F7E",
+"L 	c #474640",
+"M 	c #5B7D15",
+"N 	c #7EBC00",
+"O 	c #9C9A76",
+"P 	c #9B9975",
+"Q 	c #605F50",
+"R 	c #3E4828",
+"S 	c #83BB01",
+"T 	c #86C000",
+"U 	c #737259",
+"V 	c #44443D",
+"W 	c #404928",
+"X 	c #83B206",
+"Y 	c #8EC400",
+"Z 	c #303030",
+"` 	c #313028",
+" .	c #313025",
+". . . . . . . . . . . . ",
+"+ + + + + + + + + @ # # ",
+"$ $ $ $ $ $ $ % & * = = ",
+"- - - ; > ; - - , ' ) ) ",
+"! ! ~ { ] { ^ / ( _ : : ",
+"< [ } | 1 2 3 4 5 6 1 1 ",
+"7 8 9 0 0 0 0 0 0 0 0 0 ",
+"a b c d d d d d d d d d ",
+"e f g h i i i i i i i i ",
+"j j k l m n n n n n n n ",
+"o o p q r s s s s s s s ",
+"t t t u v w w w w w w w ",
+"x x x y z A A A A A A A ",
+"B B B C D E E E E E E E ",
+"F F F G H I I I I I I I ",
+"J J K L M N N N N N N N ",
+"O P Q R S T T T T T T T ",
+"U V W X Y Y Y Y Y Y Y Y ",
+"Z Z `  . . . . . . . . ."};
diff --git a/themes/elberg/title-2-inactive.xpm b/themes/elberg/title-2-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..8dd189aeca5e345c4c39e3f999b6e3ab9da2d7ae
--- /dev/null
+++ b/themes/elberg/title-2-inactive.xpm
@@ -0,0 +1,106 @@
+/* XPM */
+static char * title_2_inactive_xpm[] = {
+"12 19 84 1",
+" 	c None",
+".	c #4A4D4A",
+"+	c #2E2D2E",
+"@	c #2F2E2F",
+"#	c #2C2B2C",
+"$	c #2A2A2A",
+"%	c #D7D3CF",
+"&	c #C6C2BF",
+"*	c #585756",
+"=	c #373737",
+"-	c #424242",
+";	c #D2CEC8",
+">	c #C2BFBA",
+",	c #AAA8A3",
+"'	c #92908D",
+")	c #343434",
+"!	c #444444",
+"~	c #CCC8C1",
+"{	c #777572",
+"]	c #313131",
+"^	c #2F2F2F",
+"/	c #605F5D",
+"(	c #908D89",
+"_	c #414040",
+":	c #3C3C3C",
+"<	c #464646",
+"[	c #C6C3BA",
+"}	c #8E8B86",
+"|	c #302F30",
+"1	c #484848",
+"2	c #454545",
+"3	c #3A3A3A",
+"4	c #363536",
+"5	c #3D3D3D",
+"6	c #C1BEB2",
+"7	c #585754",
+"8	c #3F3F3F",
+"9	c #4A4A4A",
+"0	c #BBB8AA",
+"a	c #565551",
+"b	c #404040",
+"c	c #4C4C4C",
+"d	c #B6B3A3",
+"e	c #828077",
+"f	c #303030",
+"g	c #4B4B4B",
+"h	c #4E4E4E",
+"i	c #B0AD9C",
+"j	c #65645C",
+"k	c #323232",
+"l	c #505050",
+"m	c #AAA894",
+"n	c #A8A692",
+"o	c #43433F",
+"p	c #535353",
+"q	c #A5A28D",
+"r	c #7A786A",
+"s	c #353535",
+"t	c #555555",
+"u	c #9F9C85",
+"v	c #94927C",
+"w	c #2E2E2E",
+"x	c #575757",
+"y	c #9A977E",
+"z	c #8F8D76",
+"A	c #595959",
+"B	c #949276",
+"C	c #6F6D5C",
+"D	c #363636",
+"E	c #5B5B5B",
+"F	c #8E8C6F",
+"G	c #8D8B6E",
+"H	c #3E3E38",
+"I	c #5E5E5E",
+"J	c #898767",
+"K	c #878666",
+"L	c #545346",
+"M	c #606060",
+"N	c #64634E",
+"O	c #3C3C35",
+"P	c #5C5C5C",
+"Q	c #626262",
+"R	c #2C2C2C",
+"S	c #2B2A2B",
+"............",
+"++++++++@#$$",
+"%%%%%%%&*=--",
+";;;>,>;;')!!",
+"~~{@]^/(_:<<",
+"[}|!12345111",
+"678999999999",
+"0abccccccccc",
+"defghhhhhhhh",
+"iijkllllllll",
+"mmno-ppppppp",
+"qqqrsttttttt",
+"uuuvwxxxxxxx",
+"yyyzwAAAAAAA",
+"BBBCDEEEEEEE",
+"FFGH1IIIIIII",
+"JKLsIMMMMMMM",
+"NODPQQQQQQQQ",
+"wfRSSSSSSSSS"};
diff --git a/themes/elberg/title-3-active.xpm b/themes/elberg/title-3-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..44777180d60c0613cb9106718866fae3bb868c42
--- /dev/null
+++ b/themes/elberg/title-3-active.xpm
@@ -0,0 +1,42 @@
+/* XPM */
+static char * title_3_active_xpm[] = {
+"16 19 20 1",
+" 	c None",
+".	c #4A4D4A",
+"+	c #283024",
+"@	c #158400",
+"#	c #1D8800",
+"$	c #258C00",
+"%	c #2D9100",
+"&	c #359600",
+"*	c #3D9A00",
+"=	c #459E00",
+"-	c #4DA200",
+";	c #55A600",
+">	c #5EAA00",
+",	c #66AE00",
+"'	c #6EB200",
+")	c #76B700",
+"!	c #7EBC00",
+"~	c #86C000",
+"{	c #8EC400",
+"]	c #313025",
+"................",
+"++++++++++++++++",
+"@@@@@@@@@@@@@@@@",
+"################",
+"$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%",
+"&&&&&&&&&&&&&&&&",
+"****************",
+"================",
+"----------------",
+";;;;;;;;;;;;;;;;",
+">>>>>>>>>>>>>>>>",
+",,,,,,,,,,,,,,,,",
+"''''''''''''''''",
+"))))))))))))))))",
+"!!!!!!!!!!!!!!!!",
+"~~~~~~~~~~~~~~~~",
+"{{{{{{{{{{{{{{{{",
+"]]]]]]]]]]]]]]]]"};
diff --git a/themes/elberg/title-3-inactive.xpm b/themes/elberg/title-3-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..7d6c51525a669ab16227147619806024f08e02fa
--- /dev/null
+++ b/themes/elberg/title-3-inactive.xpm
@@ -0,0 +1,42 @@
+/* XPM */
+static char * title_3_inactive_xpm[] = {
+"16 19 20 1",
+" 	c None",
+".	c #4A4D4A",
+"+	c #2A2A2A",
+"@	c #424242",
+"#	c #444444",
+"$	c #464646",
+"%	c #484848",
+"&	c #4A4A4A",
+"*	c #4C4C4C",
+"=	c #4E4E4E",
+"-	c #505050",
+";	c #535353",
+">	c #555555",
+",	c #575757",
+"'	c #595959",
+")	c #5B5B5B",
+"!	c #5E5E5E",
+"~	c #606060",
+"{	c #626262",
+"]	c #2B2A2B",
+"................",
+"++++++++++++++++",
+"@@@@@@@@@@@@@@@@",
+"################",
+"$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%",
+"&&&&&&&&&&&&&&&&",
+"****************",
+"================",
+"----------------",
+";;;;;;;;;;;;;;;;",
+">>>>>>>>>>>>>>>>",
+",,,,,,,,,,,,,,,,",
+"''''''''''''''''",
+"))))))))))))))))",
+"!!!!!!!!!!!!!!!!",
+"~~~~~~~~~~~~~~~~",
+"{{{{{{{{{{{{{{{{",
+"]]]]]]]]]]]]]]]]"};
diff --git a/themes/elberg/title-4-active.xpm b/themes/elberg/title-4-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..64a9f70e0c86cae7e0207f792d1ea1fc04178d52
--- /dev/null
+++ b/themes/elberg/title-4-active.xpm
@@ -0,0 +1,115 @@
+/* XPM */
+static char * title_4_active_xpm[] = {
+"12 19 93 2",
+"  	c None",
+". 	c #4A4D4A",
+"+ 	c #283024",
+"@ 	c #303030",
+"# 	c #313031",
+"$ 	c #158400",
+"% 	c #1B7409",
+"& 	c #25561A",
+"* 	c #323531",
+"= 	c #9A9795",
+"- 	c #F6F1ED",
+"; 	c #1D8800",
+"> 	c #207A08",
+", 	c #2E392B",
+"' 	c #AAA8A3",
+") 	c #F0ECE5",
+"! 	c #258C00",
+"~ 	c #296F0F",
+"{ 	c #3F3F3E",
+"] 	c #E3DFD7",
+"^ 	c #E9E5DC",
+"/ 	c #2D9100",
+"( 	c #303F29",
+"_ 	c #ADAAA2",
+": 	c #E2DFD4",
+"< 	c #359600",
+"[ 	c #32591C",
+"} 	c #8B8982",
+"| 	c #DCD8CB",
+"1 	c #3D9A00",
+"2 	c #355B1C",
+"3 	c #87867E",
+"4 	c #D6D2C3",
+"5 	c #459E00",
+"6 	c #459D00",
+"7 	c #334029",
+"8 	c #9F9D90",
+"9 	c #D0CCBA",
+"0 	c #4DA200",
+"a 	c #437D0F",
+"b 	c #3C3C3A",
+"c 	c #C4C1AE",
+"d 	c #C9C6B2",
+"e 	c #55A600",
+"f 	c #4F9407",
+"g 	c #333B2B",
+"h 	c #8D8B7C",
+"i 	c #C2C0A9",
+"j 	c #5EAA00",
+"k 	c #5DA901",
+"l 	c #37422A",
+"m 	c #747367",
+"n 	c #BCBAA1",
+"o 	c #66AE00",
+"p 	c #5B950A",
+"q 	c #3D3C3A",
+"r 	c #B4B196",
+"s 	c #B6B398",
+"t 	c #6EB200",
+"u 	c #62990A",
+"v 	c #AEAB8E",
+"w 	c #B0AD90",
+"x 	c #76B700",
+"y 	c #75B501",
+"z 	c #3B442A",
+"A 	c #6C6A5B",
+"B 	c #A7A586",
+"C 	c #82806C",
+"D 	c #55544B",
+"E 	c #5C5A50",
+"F 	c #97957A",
+"G 	c #A9A687",
+"H 	c #7EBC00",
+"I 	c #72A508",
+"J 	c #3D452A",
+"K 	c #3C3B38",
+"L 	c #3A402B",
+"M 	c #5D7F15",
+"N 	c #526B1C",
+"O 	c #3D3C39",
+"P 	c #9E9C7C",
+"Q 	c #86C000",
+"R 	c #85BE01",
+"S 	c #76A30A",
+"T 	c #3B412B",
+"U 	c #848266",
+"V 	c #8EC400",
+"W 	c #8DC101",
+"X 	c #6F9310",
+"Y 	c #343432",
+"Z 	c #8D8B68",
+"` 	c #313025",
+" .	c #313028",
+". . . . . . . . . . . . ",
+"+ @ @ # # # # # # # # # ",
+"$ % & * = - - - - - - - ",
+"; ; ; > , ' ) ) ) ) ) ) ",
+"! ! ! ! ~ { ] ^ ^ ^ ^ ^ ",
+"/ / / / / ( _ : : : : : ",
+"< < < < < [ } | | | | | ",
+"1 1 1 1 1 2 3 4 4 4 4 4 ",
+"5 5 5 5 6 7 8 9 9 9 9 9 ",
+"0 0 0 0 a b c d d d d d ",
+"e e e f g h i i i i i i ",
+"j j k l m n n n n n n n ",
+"o o p q r s s s s s s s ",
+"t t u q v w w w w w w w ",
+"x x y z A B B C D E F G ",
+"H H H I J K K L M N O P ",
+"Q Q Q Q R S S R Q Q T U ",
+"V V V V V V V V W X Y Z ",
+"` ` ` ` ` ` ` `  .# # # "};
diff --git a/themes/elberg/title-4-inactive.xpm b/themes/elberg/title-4-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..fe67190180f719459f1eac8a52a28da9a11fc9fe
--- /dev/null
+++ b/themes/elberg/title-4-inactive.xpm
@@ -0,0 +1,105 @@
+/* XPM */
+static char * title_4_inactive_xpm[] = {
+"12 19 83 1",
+" 	c None",
+".	c #4A4D4A",
+"+	c #2A2A2A",
+"@	c #303030",
+"#	c #2F2E2F",
+"$	c #2E2D2E",
+"%	c #424242",
+"&	c #3E3E3E",
+"*	c #383838",
+"=	c #302F2F",
+"-	c #868583",
+";	c #D7D3CF",
+">	c #444444",
+",	c #414141",
+"'	c #2E2E2E",
+")	c #95938F",
+"!	c #D2CEC8",
+"~	c #464646",
+"{	c #3F3F3F",
+"]	c #383837",
+"^	c #C7C3BC",
+"/	c #CCC8C1",
+"(	c #484848",
+"_	c #313131",
+":	c #97958E",
+"<	c #C6C3BA",
+"[	c #4A4A4A",
+"}	c #3A3A3A",
+"|	c #7A7872",
+"1	c #C1BEB2",
+"2	c #4C4C4C",
+"3	c #76756E",
+"4	c #BBB8AA",
+"5	c #4E4E4E",
+"6	c #323232",
+"7	c #8B897E",
+"8	c #B6B3A3",
+"9	c #505050",
+"0	c #363634",
+"a	c #ABA998",
+"b	c #B0AD9C",
+"c	c #535353",
+"d	c #7B796D",
+"e	c #AAA894",
+"f	c #555555",
+"g	c #545454",
+"h	c #333333",
+"i	c #66645A",
+"j	c #A5A28D",
+"k	c #575757",
+"l	c #4F4F4F",
+"m	c #373634",
+"n	c #9D9B84",
+"o	c #9F9C85",
+"p	c #595959",
+"q	c #515151",
+"r	c #98967D",
+"s	c #9A977E",
+"t	c #5B5B5B",
+"u	c #343434",
+"v	c #5E5D50",
+"w	c #929075",
+"x	c #72705E",
+"y	c #4B4A42",
+"z	c #504F46",
+"A	c #84826B",
+"B	c #949276",
+"C	c #5E5E5E",
+"D	c #565656",
+"E	c #363533",
+"F	c #4A494A",
+"G	c #434343",
+"H	c #8A886C",
+"I	c #606060",
+"J	c #5F5F5F",
+"K	c #343334",
+"L	c #737159",
+"M	c #626262",
+"N	c #616161",
+"O	c #7B795B",
+"P	c #2B2A2B",
+"Q	c #2C2C2C",
+"R	c #313031",
+"............",
+"+@@#$$$$$$$$",
+"%&*=-;;;;;;;",
+">>>,')!!!!!!",
+"~~~~{]^/////",
+"(((((_:<<<<<",
+"[[[[[}|11111",
+"22222}344444",
+"555556788888",
+"9999~0abbbbb",
+"ccc5@deeeeee",
+"ffghijjjjjjj",
+"kklmnooooooo",
+"ppqmrsssssss",
+"tttuvwwxyzAB",
+"CCCDuEEhFGEH",
+"IIIIJDDJIIKL",
+"MMMMMMMMNq=O",
+"PPPPPPPPQR#$"};
diff --git a/themes/elberg/title-5-active.xpm b/themes/elberg/title-5-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..231c656bcfe49e8eac546c8d28da4244a5beccaa
--- /dev/null
+++ b/themes/elberg/title-5-active.xpm
@@ -0,0 +1,41 @@
+/* XPM */
+static char * title_5_active_xpm[] = {
+"8 19 19 1",
+" 	c None",
+".	c #4A4D4A",
+"+	c #313031",
+"@	c #F6F1ED",
+"#	c #F0ECE5",
+"$	c #E9E5DC",
+"%	c #E2DFD4",
+"&	c #DCD8CB",
+"*	c #D6D2C3",
+"=	c #D0CCBA",
+"-	c #C9C6B2",
+";	c #C2C0A9",
+">	c #BCBAA1",
+",	c #B6B398",
+"'	c #B0AD90",
+")	c #A9A687",
+"!	c #A2A07F",
+"~	c #9C9A76",
+"{	c #96946E",
+"........",
+"++++++++",
+"@@@@@@@@",
+"########",
+"$$$$$$$$",
+"%%%%%%%%",
+"&&&&&&&&",
+"********",
+"========",
+"--------",
+";;;;;;;;",
+">>>>>>>>",
+",,,,,,,,",
+"''''''''",
+"))))))))",
+"!!!!!!!!",
+"~~~~~~~~",
+"{{{{{{{{",
+"++++++++"};
diff --git a/themes/elberg/title-5-inactive.xpm b/themes/elberg/title-5-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..7cc4d323e64e8877a39fa0ec88e0f4973ecbaebf
--- /dev/null
+++ b/themes/elberg/title-5-inactive.xpm
@@ -0,0 +1,41 @@
+/* XPM */
+static char * title_5_inactive_xpm[] = {
+"8 19 19 1",
+" 	c None",
+".	c #4A4D4A",
+"+	c #2E2D2E",
+"@	c #D7D3CF",
+"#	c #D2CEC8",
+"$	c #CCC8C1",
+"%	c #C6C3BA",
+"&	c #C1BEB2",
+"*	c #BBB8AA",
+"=	c #B6B3A3",
+"-	c #B0AD9C",
+";	c #AAA894",
+">	c #A5A28D",
+",	c #9F9C85",
+"'	c #9A977E",
+")	c #949276",
+"!	c #8E8C6F",
+"~	c #898767",
+"{	c #838160",
+"........",
+"++++++++",
+"@@@@@@@@",
+"########",
+"$$$$$$$$",
+"%%%%%%%%",
+"&&&&&&&&",
+"********",
+"========",
+"--------",
+";;;;;;;;",
+">>>>>>>>",
+",,,,,,,,",
+"''''''''",
+"))))))))",
+"!!!!!!!!",
+"~~~~~~~~",
+"{{{{{{{{",
+"++++++++"};
diff --git a/themes/elberg/top-left-active.xpm b/themes/elberg/top-left-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..56556ca9e48c333da1dfe1a926d0a184f3f09507
--- /dev/null
+++ b/themes/elberg/top-left-active.xpm
@@ -0,0 +1,44 @@
+/* XPM */
+static char * top_left_active_xpm[] = {
+"8 19 22 1",
+" 	c None",
+".	c #4A4D4A",
+"+	c #313031",
+"@	c #F7F3EF",
+"#	c #F6F1ED",
+"$	c #F0ECE5",
+"%	c #E9E5DC",
+"&	c #E2DFD4",
+"*	c #DCD8CB",
+"=	c #D6D2C3",
+"-	c #D0CCBA",
+";	c #C9C6B2",
+">	c #C6C7AD",
+",	c #C2C0A9",
+"'	c #BCBAA1",
+")	c #B6B398",
+"!	c #B0AD90",
+"~	c #A9A687",
+"{	c #A2A07F",
+"]	c #9C9A76",
+"^	c #96946E",
+"/	c #94926B",
+"........",
+".+++++++",
+".+@#####",
+".+@$$$$$",
+".+@%%%%%",
+".+@&&&&&",
+".+@*****",
+".+@=====",
+".+@-----",
+".+@;;;;;",
+".+@>,,,,",
+".+@>''''",
+".+@>))))",
+".+@>!!!!",
+".+@>~~~~",
+".+@>{{{{",
+".+@>]]]]",
+".+@>^^^^",
+".+@>/+++"};
diff --git a/themes/elberg/top-left-inactive.xpm b/themes/elberg/top-left-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..ac44ccab57c0e6bb9afa01c8b0d827f3f632bf4c
--- /dev/null
+++ b/themes/elberg/top-left-inactive.xpm
@@ -0,0 +1,46 @@
+/* XPM */
+static char * top_left_inactive_xpm[] = {
+"8 19 24 1",
+" 	c None",
+".	c #4A4D4A",
+"+	c #302E30",
+"@	c #2E2D2E",
+"#	c #D8D5D1",
+"$	c #D7D3CF",
+"%	c #D2CEC8",
+"&	c #CCC8C1",
+"*	c #C6C3BA",
+"=	c #C1BEB2",
+"-	c #BBB8AA",
+";	c #B6B3A3",
+">	c #B0AD9C",
+",	c #ADAE97",
+"'	c #AAA894",
+")	c #A5A28D",
+"!	c #9F9C85",
+"~	c #9A977E",
+"{	c #949276",
+"]	c #8E8C6F",
+"^	c #898767",
+"/	c #838160",
+"(	c #81805E",
+"_	c #2C2C2C",
+"........",
+".+@@@@@@",
+".@#$$$$$",
+".@#%%%%%",
+".@#&&&&&",
+".@#*****",
+".@#=====",
+".@#-----",
+".@#;;;;;",
+".@#>>>>>",
+".@#,''''",
+".@#,))))",
+".@#,!!!!",
+".@#,~~~~",
+".@#,{{{{",
+".@#,]]]]",
+".@#,^^^^",
+".@#,////",
+".@#,(_@@"};
diff --git a/themes/elberg/top-right-active.xpm b/themes/elberg/top-right-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..e2dc07e0a9620088cf227345cbcf2017439e3982
--- /dev/null
+++ b/themes/elberg/top-right-active.xpm
@@ -0,0 +1,45 @@
+/* XPM */
+static char * top_right_active_xpm[] = {
+"8 19 23 1",
+" 	c None",
+".	c #4A4D4A",
+"+	c #313031",
+"@	c #F6F1ED",
+"#	c #F7F3EF",
+"$	c #F0ECE5",
+"%	c #C6C7AD",
+"&	c #E9E5DC",
+"*	c #94926B",
+"=	c #E2DFD4",
+"-	c #DCD8CB",
+";	c #D6D2C3",
+">	c #D0CCBA",
+",	c #C9C6B2",
+"'	c #C2C0A9",
+")	c #BCBAA1",
+"!	c #B6B398",
+"~	c #B0AD90",
+"{	c #A9A687",
+"]	c #A2A07F",
+"^	c #9C9A76",
+"/	c #96946E",
+"(	c #FFFFFF",
+"........",
+"+++++++.",
+"@@@@@#+.",
+"$$$$$%+.",
+"&&&&&*+.",
+"=====*+.",
+"-----*+.",
+";;;;;*+.",
+">>>>>*+.",
+",,,,,*+.",
+"''''%*+.",
+"))))%*+.",
+"!!!!%*+.",
+"~~~~%*+.",
+"{{{{%*+.",
+"]]]]%*+.",
+"^^^^%*+.",
+"////%*+.",
+"+++(%*+."};
diff --git a/themes/elberg/top-right-inactive.xpm b/themes/elberg/top-right-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..c8fe2ebe1221aa758db45345aa79d72726f0986e
--- /dev/null
+++ b/themes/elberg/top-right-inactive.xpm
@@ -0,0 +1,47 @@
+/* XPM */
+static char * top_right_inactive_xpm[] = {
+"8 19 25 1",
+" 	c None",
+".	c #4A4D4A",
+"+	c #2E2D2E",
+"@	c #302E30",
+"#	c #D7D3CF",
+"$	c #D8D5D1",
+"%	c #D2CEC8",
+"&	c #ADAE97",
+"*	c #CCC8C1",
+"=	c #81805E",
+"-	c #C6C3BA",
+";	c #C1BEB2",
+">	c #BBB8AA",
+",	c #B6B3A3",
+"'	c #B0AD9C",
+")	c #AAA894",
+"!	c #A5A28D",
+"~	c #9F9C85",
+"{	c #9A977E",
+"]	c #949276",
+"^	c #8E8C6F",
+"/	c #898767",
+"(	c #838160",
+"_	c #2D2C2D",
+":	c #E1E1E1",
+"........",
+"++++++@.",
+"#####$+.",
+"%%%%%&+.",
+"*****=+.",
+"-----=+.",
+";;;;;=+.",
+">>>>>=+.",
+",,,,,=+.",
+"'''''=+.",
+"))))&=+.",
+"!!!!&=+.",
+"~~~~&=+.",
+"{{{{&=+.",
+"]]]]&=+.",
+"^^^^&=+.",
+"////&=+.",
+"((((&=+.",
+"+__:&=+."};
diff --git a/themes/exocet/Makefile.in b/themes/exocet/Makefile.in
index ef04149c87778318dd0d12073e9fe09f441d8b27..d9963e18e793df23fc4e2cccbf744b4e242eee16 100644
--- a/themes/exocet/Makefile.in
+++ b/themes/exocet/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/exocet
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/g2/Makefile.in b/themes/g2/Makefile.in
index f5e4d01c895b98e3c7fe90398ba1516552bee4ad..5a2464f8da5dd91380d3b14821b74142cf0a44ee 100644
--- a/themes/g2/Makefile.in
+++ b/themes/g2/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/g2
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/gnububble/Makefile.in b/themes/gnububble/Makefile.in
index 2742553b6425f5f0a4596c3e9939f0d9ec73e65e..2f8f3f626cc747a11cc785bb820fff56f800104c 100644
--- a/themes/gnububble/Makefile.in
+++ b/themes/gnububble/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/gnububble
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/gorilla/Makefile.in b/themes/gorilla/Makefile.in
index f8902b889dd08df2174de0ea670dce8a5a0952ee..f5dd80c0880e74fbdc63efa229071acdaf8e3231 100644
--- a/themes/gorilla/Makefile.in
+++ b/themes/gorilla/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/gorilla
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/gtk/Makefile.in b/themes/gtk/Makefile.in
index 193a6fe3e9367b0b4c7688b5111b05abf0ae94f9..c4db5bced0823308672784db9d37ebe968d76c39 100644
--- a/themes/gtk/Makefile.in
+++ b/themes/gtk/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/gtk
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/iceg/Makefile.in b/themes/iceg/Makefile.in
index 5e9694fe2c14b014377b14369ea0191ab7211ed9..f9a6cc95ffb2465253959794a37c33e6dc3016bf 100644
--- a/themes/iceg/Makefile.in
+++ b/themes/iceg/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/iceg
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/kde/Makefile.in b/themes/kde/Makefile.in
index 797d83f47d82854ac1fcc7cc65588f7ddac3744c..c51279252a858908c0ef6d640c2cc62f156d5b9b 100644
--- a/themes/kde/Makefile.in
+++ b/themes/kde/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/kde
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/kindaker/Makefile.in b/themes/kindaker/Makefile.in
index 55b987d86ed0cab373bb7652a4e6a13cea124516..56025c9231f5494a25ca5f014eaaf1451a8ed819 100644
--- a/themes/kindaker/Makefile.in
+++ b/themes/kindaker/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/kindaker
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/linea/Makefile.in b/themes/linea/Makefile.in
index bc7b0f0b9018a1aed048171258321f2658b62a2e..583259c47f6e5cce07adc07bf4ee90a334a253fb 100644
--- a/themes/linea/Makefile.in
+++ b/themes/linea/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/linea
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/metabox/Makefile.in b/themes/metabox/Makefile.in
index 48146dd2bd59a2ac96225dc9f03e2faa57101caa..8d905599b7b66a063a2fd9a816d37118ac173686 100644
--- a/themes/metabox/Makefile.in
+++ b/themes/metabox/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/metabox
 theme_DATA = README \
 	bottom-active.xpm \
@@ -187,22 +158,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -287,14 +249,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -303,8 +257,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/microgui/Makefile.in b/themes/microgui/Makefile.in
index 3663c93b2b7483dbe52bdf2df20f9d38878b2972..96bbbe6536a4e26aa24abc2e2bbf1603dd439d0a 100644
--- a/themes/microgui/Makefile.in
+++ b/themes/microgui/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/microgui
 theme_DATA = README \
 	bottom-active.xpm \
@@ -187,22 +158,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -287,14 +249,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -303,8 +257,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/mofit/Makefile.in b/themes/mofit/Makefile.in
index 788b9a5954a5720ce3c70e02c29f374bed586bb8..8e0bc7ef8ea658ff2efcf102d690e7fa782cd3c5 100644
--- a/themes/mofit/Makefile.in
+++ b/themes/mofit/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/mofit
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/next/Makefile.in b/themes/next/Makefile.in
index f5fd0ef9174943a24686297f392fa6aa48507c96..d8556774c27fb0836fcdb64dfe61fa04e687ef51 100644
--- a/themes/next/Makefile.in
+++ b/themes/next/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/next
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/ops/Makefile.in b/themes/ops/Makefile.in
index 50b608805ddabe678e9207baa2bc4fe3e7cec63e..721b92a4505f0fee521a51418672b2bc1c94bbfd 100644
--- a/themes/ops/Makefile.in
+++ b/themes/ops/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/ops
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/oroborus/Makefile.in b/themes/oroborus/Makefile.in
index 263f0a33735d009573ac12066373ae7f22e1a416..924b8e3ccb0dcee2d69fecae8e4aadb23eec6766 100644
--- a/themes/oroborus/Makefile.in
+++ b/themes/oroborus/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/oroborus
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/pills/Makefile.in b/themes/pills/Makefile.in
index 7984e26f0d018d02c56c1ea3e7899147fb635938..ccae49a257a2d13f24fe0fe4a23ab9707fd4d99b 100644
--- a/themes/pills/Makefile.in
+++ b/themes/pills/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/pills
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/piranha/Makefile.in b/themes/piranha/Makefile.in
index 93175d85ef823190d283a1d206706e29fb320cca..4465cd01058209c66c770f5b786caa6af50c5e53 100644
--- a/themes/piranha/Makefile.in
+++ b/themes/piranha/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/piranha
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/platinum/Makefile.in b/themes/platinum/Makefile.in
index 7c27f559f3dfd010f4bfe8828dbd189c25bbb398..7bd2554a3fec335884dcdb3cf5799bacaa56e251 100644
--- a/themes/platinum/Makefile.in
+++ b/themes/platinum/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/platinum
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/quinx/Makefile.in b/themes/quinx/Makefile.in
index 4e1a6a34432b80a6b7c0294efb4b8e5de194a19d..4a377fb54fe291c57194eebcba60cdb2518623d2 100644
--- a/themes/quinx/Makefile.in
+++ b/themes/quinx/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/quinx
 theme_DATA = README \
 	bottom-active.xpm \
@@ -190,22 +161,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -290,14 +252,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -306,8 +260,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/r9x/Makefile.in b/themes/r9x/Makefile.in
index 0a9a2f1d1285bfaa7ff6e9d4aa14863bc160ed5a..25249073c28c052f9f099b7a0129043d7d5cda8e 100644
--- a/themes/r9x/Makefile.in
+++ b/themes/r9x/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/r9x
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/redmond/Makefile.in b/themes/redmond/Makefile.in
index f895315809c979b0ff52988dd40a605655a07a7c..3561fa625291e4c9fa85d26b0643c24ca323215a 100644
--- a/themes/redmond/Makefile.in
+++ b/themes/redmond/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/redmond
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/redmondxp/Makefile.in b/themes/redmondxp/Makefile.in
index 5beba94a31d4ecb28b32f4e7ecf290d8ca599483..074abffc7bf9a56401d4e1113e0b360f73eb64b2 100644
--- a/themes/redmondxp/Makefile.in
+++ b/themes/redmondxp/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/redmondxp
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/retro/Makefile.in b/themes/retro/Makefile.in
index e7f3d752d94f25605623a22a93cc5d37ab2159a5..df01f03981b82d78a8e373366d86f87067f29704 100644
--- a/themes/retro/Makefile.in
+++ b/themes/retro/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/retro
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/silverado/Makefile.in b/themes/silverado/Makefile.in
index c462a32728c93c6d71e97f897a6fa3e5cf036455..1f5e9a3a5e0797f9ba3cb9abf7edc1b4d1f7d980 100644
--- a/themes/silverado/Makefile.in
+++ b/themes/silverado/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/silverado
 theme_DATA = README \
 	bottom-active.xpm \
@@ -187,22 +158,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -287,14 +249,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -303,8 +257,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/slick/Makefile.in b/themes/slick/Makefile.in
index a2fdad263fa5d86b45c0f5f783b6d9208956919d..d4932b76d5dfecff353f4fae5e299c44a19b5ab7 100644
--- a/themes/slick/Makefile.in
+++ b/themes/slick/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/slick
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/slimline/Makefile.in b/themes/slimline/Makefile.in
index 4e6852216b5de25d85d477bb08a22c6c00818862..26fe7f056653c6870d2c1bcaad24355ab55cc413 100644
--- a/themes/slimline/Makefile.in
+++ b/themes/slimline/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/slimline
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/tabs/Makefile.in b/themes/tabs/Makefile.in
index f941f95ee85b65d7cea978753c0e6440df98bd0b..936fd07c136b02ae6adcec633eeeb680e9d22e49 100644
--- a/themes/tabs/Makefile.in
+++ b/themes/tabs/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/tabs
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/trench/Makefile.in b/themes/trench/Makefile.in
index e722a69fa347c62ce997d272202b6a8ddd2388d0..1ced54ab1ee5dd5fdc981a372bb04987ebd6e9ec 100644
--- a/themes/trench/Makefile.in
+++ b/themes/trench/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/trench
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/variation/Makefile.in b/themes/variation/Makefile.in
index f755ab19415d19925bcee84b11194d1ae1d16bb2..d4037ffe76d77a89bb9cede6f0421ee53793f632 100644
--- a/themes/variation/Makefile.in
+++ b/themes/variation/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/variation
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/themes/xfce/Makefile.in b/themes/xfce/Makefile.in
index b30193312c6e3e8ec33f442e247ccd694e45da1e..6821f6963d1c54f2a6adf036a82a62d042f90ad3 100644
--- a/themes/xfce/Makefile.in
+++ b/themes/xfce/Makefile.in
@@ -1,4 +1,4 @@
-# Makefile.in generated by automake 1.7.1 from Makefile.am.
+# Makefile.in generated by automake 1.6.3 from Makefile.am.
 # @configure_input@
 
 # Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
@@ -13,101 +13,72 @@
 # PARTICULAR PURPOSE.
 
 @SET_MAKE@
+SHELL = @SHELL@
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 top_builddir = ../..
 
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
 install_sh_DATA = $(install_sh) -c -m 644
 install_sh_PROGRAM = $(install_sh) -c
 install_sh_SCRIPT = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_HEADER = $(INSTALL_DATA)
-transform = $(program_transform_name)
+transform = @program_transform_name@
 NORMAL_INSTALL = :
 PRE_INSTALL = :
 POST_INSTALL = :
 NORMAL_UNINSTALL = :
 PRE_UNINSTALL = :
 POST_UNINSTALL = :
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
 AMTAR = @AMTAR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BASE_DEPENDENCIES_CFLAGS = @BASE_DEPENDENCIES_CFLAGS@
-BASE_DEPENDENCIES_LIBS = @BASE_DEPENDENCIES_LIBS@
 CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DEFS = @DEFS@
 DEPDIR = @DEPDIR@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-INSTALL_DATA = @INSTALL_DATA@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@
-INSTALL_SCRIPT = @INSTALL_SCRIPT@
 INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
-LDFLAGS = @LDFLAGS@
-LIBS = @LIBS@
-LTLIBOBJS = @LTLIBOBJS@
-MAKEINFO = @MAKEINFO@
-OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
-PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
-PACKAGE_NAME = @PACKAGE_NAME@
-PACKAGE_STRING = @PACKAGE_STRING@
-PACKAGE_TARNAME = @PACKAGE_TARNAME@
-PACKAGE_VERSION = @PACKAGE_VERSION@
-PATH_SEPARATOR = @PATH_SEPARATOR@
 PKG_CONFIG = @PKG_CONFIG@
-SET_MAKE = @SET_MAKE@
-SHELL = @SHELL@
 STRIP = @STRIP@
 VERSION = @VERSION@
 X_CFLAGS = @X_CFLAGS@
 X_EXTRA_LIBS = @X_EXTRA_LIBS@
 X_LIBS = @X_LIBS@
 X_PRE_LIBS = @X_PRE_LIBS@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_STRIP = @ac_ct_STRIP@
-am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
-am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
 am__include = @am__include@
 am__quote = @am__quote@
-bindir = @bindir@
-build_alias = @build_alias@
-datadir = @datadir@
-exec_prefix = @exec_prefix@
-host_alias = @host_alias@
-includedir = @includedir@
-infodir = @infodir@
 install_sh = @install_sh@
-libdir = @libdir@
-libexecdir = @libexecdir@
-localstatedir = @localstatedir@
-mandir = @mandir@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
 themedir = $(pkgdatadir)/themes/xfce
 theme_DATA = README \
 	bottom-active.xpm \
@@ -193,22 +164,13 @@ uninstall-themeDATA:
 tags: TAGS
 TAGS:
 
-ctags: CTAGS
-CTAGS:
-
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
 top_distdir = ../..
 distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
-	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
-	list='$(DISTFILES)'; for file in $$list; do \
-	  case $$file in \
-	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
-	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
-	  esac; \
+	@list='$(DISTFILES)'; for file in $$list; do \
 	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
@@ -293,14 +255,6 @@ mostlyclean: mostlyclean-am
 
 mostlyclean-am: mostlyclean-generic
 
-pdf: pdf-am
-
-pdf-am:
-
-ps: ps-am
-
-ps-am:
-
 uninstall-am: uninstall-info-am uninstall-themeDATA
 
 .PHONY: all all-am check check-am clean clean-generic distclean \
@@ -309,8 +263,8 @@ uninstall-am: uninstall-info-am uninstall-themeDATA
 	install-exec-am install-info install-info-am install-man \
 	install-strip install-themeDATA installcheck installcheck-am \
 	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
-	uninstall-am uninstall-info-am uninstall-themeDATA
+	mostlyclean mostlyclean-generic uninstall uninstall-am \
+	uninstall-info-am uninstall-themeDATA
 
 # 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/xfwm4.spec.in b/xfwm4.spec.in
index 2ae7e0c26f14d374086de6bb22bac090a02302d4..6e76ea27be231b957dd2398601a31ee2c07b4ff5 100644
--- a/xfwm4.spec.in
+++ b/xfwm4.spec.in
@@ -54,6 +54,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfwm4/themes/adept
 %{_datadir}/xfwm4/themes/bbs
 %{_datadir}/xfwm4/themes/curve
+%{_datadir}/xfwm4/themes/elberg
 %{_datadir}/xfwm4/themes/exocet
 %{_datadir}/xfwm4/themes/kindaker