diff --git a/Makefile.in b/Makefile.in
index b5087a308a6b0514a1c6adcb8f04e909c2ba76f1..0f566687280faca393147e140320a02bc102094b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = .
 
 ACLOCAL = @ACLOCAL@
@@ -45,90 +43,102 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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@
 
 noinst_DATA = example.xfwm4rc
 
 EXTRA_DIST = example.xfwm4rc.in example.gtkrc-2.0 xfwm4.spec xfwm4.spec.in
 
 SUBDIRS = src defaults themes
+subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = config.h
-CONFIG_CLEAN_FILES =  xfwm4.spec
-DATA =  $(noinst_DATA)
-
-DIST_COMMON =  README ./stamp-h.in AUTHORS COPYING ChangeLog INSTALL \
-Makefile.am Makefile.in NEWS TODO acconfig.h aclocal.m4 config.h.in \
-configure configure.in install-sh missing mkinstalldirs xfwm4.spec.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
+CONFIG_CLEAN_FILES = xfwm4.spec
+DIST_SOURCES =
+DATA = $(noinst_DATA)
+
+
+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 acconfig.h aclocal.m4 compile config.h.in \
+	configure configure.in depcomp install-sh missing mkinstalldirs \
+	xfwm4.spec.in
+DIST_SUBDIRS = $(SUBDIRS)
+all: config.h
+	$(MAKE) $(AM_MAKEFLAGS) all-recursive
 
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-$(ACLOCAL_M4):  configure.in 
-	cd $(srcdir) && $(ACLOCAL)
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
 
-config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
 	$(SHELL) ./config.status --recheck
-$(srcdir)/configure: $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure:  $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
 	cd $(srcdir) && $(AUTOCONF)
 
-config.h: stamp-h
-	@if test ! -f $@; then \
-		rm -f stamp-h; \
-		$(MAKE) stamp-h; \
-	else :; fi
-stamp-h: $(srcdir)/config.h.in $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES= CONFIG_HEADERS=config.h \
-	     $(SHELL) ./config.status
-	@echo timestamp > stamp-h 2> /dev/null
-$(srcdir)/config.h.in: $(srcdir)/stamp-h.in
+$(ACLOCAL_M4):  configure.in 
+	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
+
+config.h: stamp-h1
 	@if test ! -f $@; then \
-		rm -f $(srcdir)/stamp-h.in; \
-		$(MAKE) $(srcdir)/stamp-h.in; \
+	  rm -f stamp-h1; \
+	  $(MAKE) stamp-h1; \
 	else :; fi
-$(srcdir)/stamp-h.in: $(top_srcdir)/configure.in $(ACLOCAL_M4) acconfig.h
-	cd $(top_srcdir) && $(AUTOHEADER)
-	@echo timestamp > $(srcdir)/stamp-h.in 2> /dev/null
 
-mostlyclean-hdr:
+stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
+	@rm -f stamp-h1
+	cd $(top_builddir) && $(SHELL) ./config.status config.h
 
-clean-hdr:
+$(srcdir)/config.h.in:  $(top_srcdir)/configure.in $(ACLOCAL_M4) $(top_srcdir)/acconfig.h
+	cd $(top_srcdir) && $(AUTOHEADER)
+	touch $(srcdir)/config.h.in
 
 distclean-hdr:
 	-rm -f config.h
-
-maintainer-clean-hdr:
 xfwm4.spec: $(top_builddir)/config.status xfwm4.spec.in
-	cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $@
+uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -136,13 +146,8 @@ xfwm4.spec: $(top_builddir)/config.status xfwm4.spec.in
 # (1) if the variable is set in `config.status', edit `config.status'
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -162,13 +167,18 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
+	@set fnord $$MAKEFLAGS; amf=$$2; \
 	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
 	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
+	rev="$$rev ."; \
 	target=`echo $@ | sed s/-recursive//`; \
 	for subdir in $$rev; do \
 	  echo "Making $$target in $$subdir"; \
@@ -185,172 +195,232 @@ tags-recursive:
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 
+ETAGS = etags
+ETAGSFLAGS =
+
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	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; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
+	  if test "$$subdir" = .; then :; else \
 	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
+	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	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 "$(ETAGS_ARGS)config.h.in$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags config.h.in $$unique $(LISP) -o $$here/TAGS)
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 
-mostlyclean-tags:
-
-clean-tags:
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
+top_distdir = .
 distdir = $(PACKAGE)-$(VERSION)
-top_distdir = $(distdir)
 
-# This target untars the dist file and tries a VPATH configuration.  Then
-# it guarantees that the distribution is self-contained by making another
-# tarfile.
-distcheck: dist
-	-rm -rf $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
-	mkdir $(distdir)/=build
-	mkdir $(distdir)/=inst
-	dc_install_base=`cd $(distdir)/=inst && pwd`; \
-	cd $(distdir)/=build \
-	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
-	  && $(MAKE) $(AM_MAKEFLAGS) \
-	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
-	  && $(MAKE) $(AM_MAKEFLAGS) check \
-	  && $(MAKE) $(AM_MAKEFLAGS) install \
-	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
-	  && $(MAKE) $(AM_MAKEFLAGS) dist
-	-rm -rf $(distdir)
-	@banner="$(distdir).tar.gz is ready for distribution"; \
-	dashes=`echo "$$banner" | sed s/./=/g`; \
-	echo "$$dashes"; \
-	echo "$$banner"; \
-	echo "$$dashes"
-dist: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
-dist-all: distdir
-	-chmod -R a+r $(distdir)
-	GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)
-	-rm -rf $(distdir)
+am__remove_distdir = \
+  { test ! -d $(distdir) \
+    || { find $(distdir) -type d ! -perm -200 -exec chmod u+w {} ';' \
+         && rm -fr $(distdir); }; }
+
+GZIP_ENV = --best
+distcleancheck_listfiles = find . -type f -print
+
 distdir: $(DISTFILES)
-	-rm -rf $(distdir)
+	$(am__remove_distdir)
 	mkdir $(distdir)
-	-chmod 777 $(distdir)
+	$(mkinstalldirs) $(distdir)/.
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-	for subdir in $(SUBDIRS); do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d $(distdir)/$$subdir \
 	    || mkdir $(distdir)/$$subdir \
 	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(distdir) distdir=../$(distdir)/$$subdir distdir) \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$(top_distdir)" \
+	        distdir=../$(distdir)/$$subdir \
+	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
+	-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
+	  ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -400 -exec chmod a+r {} \; -o \
+	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+	|| chmod -R a+r $(distdir)
+dist-gzip: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+dist dist-all: distdir
+	$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+	$(am__remove_distdir)
+
+# This target untars the dist file and tries a VPATH configuration.  Then
+# it guarantees that the distribution is self-contained by making another
+# tarfile.
+distcheck: dist
+	$(am__remove_distdir)
+	GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(AMTAR) xf -
+	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	mkdir $(distdir)/=build
+	mkdir $(distdir)/=inst
+	chmod a-w $(distdir)
+	dc_install_base=`$(am__cd) $(distdir)/=inst && pwd` \
+	  && cd $(distdir)/=build \
+	  && ../configure --srcdir=.. --prefix=$$dc_install_base \
+	    $(DISTCHECK_CONFIGURE_FLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) \
+	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
+	  && $(MAKE) $(AM_MAKEFLAGS) check \
+	  && $(MAKE) $(AM_MAKEFLAGS) install \
+	  && $(MAKE) $(AM_MAKEFLAGS) installcheck \
+	  && $(MAKE) $(AM_MAKEFLAGS) uninstall \
+	  && (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'
+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 after distclean:" ; \
+	       $(distcleancheck_listfiles) ; \
+	       exit 1; } >&2
 check-am: all-am
 check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-all-recursive-am: config.h
-	$(MAKE) $(AM_MAKEFLAGS) all-recursive
+all-am: Makefile $(DATA) config.h
+installdirs: installdirs-recursive
+installdirs-am:
 
-install-exec-am:
+install: install-recursive
 install-exec: install-exec-recursive
-
-install-data-am:
 install-data: install-data-recursive
+uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile $(DATA) config.h
-all-redirect: all-recursive-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
 
+installcheck: installcheck-recursive
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-hdr mostlyclean-tags mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
 
-mostlyclean: mostlyclean-recursive
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-hdr clean-tags clean-generic mostlyclean-am
+distclean: distclean-recursive
+	-rm -f config.status config.cache config.log
+distclean-am: clean-am distclean-generic distclean-hdr distclean-local \
+	distclean-tags
 
-clean: clean-recursive
+dvi: dvi-recursive
 
-distclean-am:  distclean-hdr distclean-tags distclean-generic clean-am \
-		distclean-local
+dvi-am:
 
-distclean: distclean-recursive
-	-rm -f config.status
+info: info-recursive
 
-maintainer-clean-am:  maintainer-clean-hdr maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
-	-rm -f config.status
-
-.PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \
-install-data-recursive uninstall-data-recursive install-exec-recursive \
-uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \
-all-recursive check-recursive installcheck-recursive info-recursive \
-dvi-recursive mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck all-recursive-am \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
 
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.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 \
+	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 tags tags-recursive uninstall \
+	uninstall-am uninstall-info-am uninstall-info-recursive \
+	uninstall-recursive
 
 @SET_MAKE@
 
@@ -363,7 +433,6 @@ example.xfwm4rc:
 rpm: dist
 	rpm -ta $(PACKAGE)-$(VERSION).tar.gz
 	@rm -f $(PACKAGE)-$(VERSION).tar.gz
-
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/aclocal.m4 b/aclocal.m4
index 2c426b6ddeb3a3db399d26c72b9094328405db54..46e7ada07cc5b6f6628023a03846e5d6eb6bc05e 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,70 +1,233 @@
-dnl aclocal.m4 generated automatically by aclocal 1.4-p5
+# aclocal.m4 generated automatically by aclocal 1.6.1 -*- Autoconf -*-
 
-dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
-dnl This file is free software; the Free Software Foundation
-dnl gives unlimited permission to copy and/or distribute it,
-dnl with or without modifications, as long as this notice is preserved.
+# 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,
+# with or without modifications, as long as this notice is preserved.
 
-dnl This program is distributed in the hope that it will be useful,
-dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without
-dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-dnl PARTICULAR PURPOSE.
+# 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.
 
-# Do all the work for Automake.  This macro actually does too much --
-# some checks are only needed if your package does certain things.
-# But this isn't really a big deal.
+# Do all the work for Automake.                            -*- Autoconf -*-
 
-# serial 1
+# This macro actually does too much some checks are only needed if
+# your package does certain things.  But this isn't really a big deal.
 
-dnl Usage:
-dnl AM_INIT_AUTOMAKE(package,version, [no-define])
+# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
 
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 8
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+AC_PREREQ([2.52])
+
+# Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
+# the ones we care about.
+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl
+
+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE])
+# AM_INIT_AUTOMAKE([OPTIONS])
+# -----------------------------------------------
+# The call with PACKAGE and VERSION arguments is the old style
+# call (pre autoconf-2.50), which is being phased out.  PACKAGE
+# and VERSION should now be passed to AC_INIT and removed from
+# the call to AM_INIT_AUTOMAKE.
+# We support both call styles for the transition.  After
+# the next Automake release, Autoconf can make the AC_INIT
+# arguments mandatory, and then we can depend on a new Autoconf
+# release and drop the old call support.
 AC_DEFUN([AM_INIT_AUTOMAKE],
-[AC_REQUIRE([AC_PROG_INSTALL])
-PACKAGE=[$1]
-AC_SUBST(PACKAGE)
-VERSION=[$2]
-AC_SUBST(VERSION)
-dnl test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
+[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
+ AC_REQUIRE([AC_PROG_INSTALL])dnl
+# test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+   test -f $srcdir/config.status; then
   AC_MSG_ERROR([source directory already configured; run "make distclean" there first])
 fi
-ifelse([$3],,
-AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
-AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
-AC_REQUIRE([AM_SANITY_CHECK])
-AC_REQUIRE([AC_ARG_PROGRAM])
-dnl FIXME This is truly gross.
-missing_dir=`cd $ac_aux_dir && pwd`
-AM_MISSING_PROG(ACLOCAL, aclocal, $missing_dir)
-AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
-AM_MISSING_PROG(AUTOMAKE, automake, $missing_dir)
-AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
-AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
-AC_REQUIRE([AC_PROG_MAKE_SET])])
+
+# Define the identity of the package.
+dnl Distinguish between old-style and new-style calls.
+m4_ifval([$2],
+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl
+ AC_SUBST([PACKAGE], [$1])dnl
+ AC_SUBST([VERSION], [$2])],
+[_AM_SET_OPTIONS([$1])dnl
+ AC_SUBST([PACKAGE], [AC_PACKAGE_TARNAME])dnl
+ AC_SUBST([VERSION], [AC_PACKAGE_VERSION])])dnl
+
+_AM_IF_OPTION([no-define],,
+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl
+
+# Some tools Automake needs.
+AC_REQUIRE([AM_SANITY_CHECK])dnl
+AC_REQUIRE([AC_ARG_PROGRAM])dnl
+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version})
+AM_MISSING_PROG(AUTOCONF, autoconf)
+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version})
+AM_MISSING_PROG(AUTOHEADER, autoheader)
+AM_MISSING_PROG(MAKEINFO, makeinfo)
+AM_MISSING_PROG(AMTAR, tar)
+AM_PROG_INSTALL_SH
+AM_PROG_INSTALL_STRIP
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+AC_REQUIRE([AC_PROG_AWK])dnl
+AC_REQUIRE([AC_PROG_MAKE_SET])dnl
+
+_AM_IF_OPTION([no-dependencies],,
+[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],
+                  [_AM_DEPENDENCIES(CXX)],
+                  [define([AC_PROG_][CXX],
+                          defn([AC_PROG_][CXX])[_AM_DEPENDENCIES(CXX)])])dnl
+])
+])
+
+# Copyright 2002  Free Software Foundation, Inc.
+
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+
+# AM_AUTOMAKE_VERSION(VERSION)
+# ----------------------------
+# 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.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.6.1])])
+
+# Helper functions for option handling.                    -*- Autoconf -*-
+
+# Copyright 2001, 2002  Free Software Foundation, Inc.
+
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
+# _AM_MANGLE_OPTION(NAME)
+# -----------------------
+AC_DEFUN([_AM_MANGLE_OPTION],
+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
+
+# _AM_SET_OPTION(NAME)
+# ------------------------------
+# Set option NAME.  Presently that only means defining a flag for this option.
+AC_DEFUN([_AM_SET_OPTION],
+[m4_define(_AM_MANGLE_OPTION([$1]), 1)])
+
+# _AM_SET_OPTIONS(OPTIONS)
+# ----------------------------------
+# OPTIONS is a space-separated list of Automake options.
+AC_DEFUN([_AM_SET_OPTIONS],
+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
+
+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET])
+# -------------------------------------------
+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise.
+AC_DEFUN([_AM_IF_OPTION],
+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])])
 
 #
 # Check to make sure that the build environment is sane.
 #
 
+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+# AM_SANITY_CHECK
+# ---------------
 AC_DEFUN([AM_SANITY_CHECK],
 [AC_MSG_CHECKING([whether build environment is sane])
 # Just in case
 sleep 1
-echo timestamp > conftestfile
+echo timestamp > conftest.file
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
-   if test "[$]*" = "X"; then
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
+   if test "$[*]" = "X"; then
       # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
+      set X `ls -t $srcdir/configure conftest.file`
    fi
-   if test "[$]*" != "X $srcdir/configure conftestfile" \
-      && test "[$]*" != "X conftestfile $srcdir/configure"; then
+   rm -f conftest.file
+   if test "$[*]" != "X $srcdir/configure conftest.file" \
+      && test "$[*]" != "X conftest.file $srcdir/configure"; then
 
       # If neither matched, then we have a broken ls.  This can happen
       # if, for instance, CONFIG_SHELL is bash and it inherits a
@@ -74,7 +237,7 @@ if (
 alias in your environment])
    fi
 
-   test "[$]2" = conftestfile
+   test "$[2]" = conftest.file
    )
 then
    # Ok.
@@ -83,47 +246,587 @@ else
    AC_MSG_ERROR([newly created file is older than distributed files!
 Check your system clock])
 fi
-rm -f conftest*
 AC_MSG_RESULT(yes)])
 
-dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
-dnl The program must properly implement --version.
+#  -*- Autoconf -*-
+
+
+# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc.
+
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 3
+
+# AM_MISSING_PROG(NAME, PROGRAM)
+# ------------------------------
 AC_DEFUN([AM_MISSING_PROG],
-[AC_MSG_CHECKING(for working $2)
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if ($2 --version) < /dev/null > /dev/null 2>&1; then
-   $1=$2
-   AC_MSG_RESULT(found)
+[AC_REQUIRE([AM_MISSING_HAS_RUN])
+$1=${$1-"${am_missing_run}$2"}
+AC_SUBST($1)])
+
+
+# AM_MISSING_HAS_RUN
+# ------------------
+# Define MISSING if not defined so far and test if it supports --run.
+# If it does, set am_missing_run to use it, otherwise, to nothing.
+AC_DEFUN([AM_MISSING_HAS_RUN],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
 else
-   $1="$3/missing $2"
-   AC_MSG_RESULT(missing)
+  am_missing_run=
+  AC_MSG_WARN([`missing' script is too old or missing])
 fi
-AC_SUBST($1)])
+])
+
+# AM_AUX_DIR_EXPAND
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
+# $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
+# `$srcdir', `$srcdir/..', or `$srcdir/../..'.
+#
+# Of course, Automake must honor this variable whenever it calls a
+# tool from the auxiliary directory.  The problem is that $srcdir (and
+# therefore $ac_aux_dir as well) can be either absolute or relative,
+# depending on how configure is run.  This is pretty annoying, since
+# it makes $ac_aux_dir quite unusable in subdirectories: in the top
+# source directory, any form will work fine, but in subdirectories a
+# relative path needs to be adjusted first.
+#
+# $ac_aux_dir/missing
+#    fails when called from a subdirectory if $ac_aux_dir is relative
+# $top_srcdir/$ac_aux_dir/missing
+#    fails if $ac_aux_dir is absolute,
+#    fails when called from a subdirectory in a VPATH build with
+#          a relative $ac_aux_dir
+#
+# The reason of the latter failure is that $top_srcdir and $ac_aux_dir
+# are both prefixed by $srcdir.  In an in-source build this is usually
+# harmless because $srcdir is `.', but things will broke when you
+# start a VPATH build or use an absolute $srcdir.
+#
+# So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
+# iff we strip the leading $srcdir from $ac_aux_dir.  That would be:
+#   am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
+# and then we would define $MISSING as
+#   MISSING="\${SHELL} $am_aux_dir/missing"
+# This will work as long as MISSING is not called from configure, because
+# unfortunately $(top_srcdir) has no meaning in configure.
+# However there are other variables, like CC, which are often used in
+# configure, and could therefore not use this "fixed" $ac_aux_dir.
+#
+# Another solution, used here, is to always expand $ac_aux_dir to an
+# absolute PATH.  The drawback is that using absolute paths prevent a
+# configured tree to be moved without reconfiguration.
+
+# Rely on autoconf to set up CDPATH properly.
+AC_PREREQ([2.50])
+
+AC_DEFUN([AM_AUX_DIR_EXPAND], [
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+])
+
+# AM_PROG_INSTALL_SH
+# ------------------
+# Define $install_sh.
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+AC_DEFUN([AM_PROG_INSTALL_SH],
+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+AC_SUBST(install_sh)])
+
+# AM_PROG_INSTALL_STRIP
+
+# Copyright 2001 Free Software Foundation, Inc.
+
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# One issue with vendor `install' (even GNU) is that you can't
+# specify the program used to strip binaries.  This is especially
+# annoying in cross-compiling environments, where the build's strip
+# is unlikely to handle the host's binaries.
+# Fortunately install-sh will honor a STRIPPROG variable, so we
+# always use install-sh in `make install-strip', and initialize
+# STRIPPROG with the value of the STRIP variable (set by the user).
+AC_DEFUN([AM_PROG_INSTALL_STRIP],
+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+dnl Don't test for $cross_compiling = yes, because it might be `maybe'.
+if test "$cross_compiling" != no; then
+  AC_CHECK_TOOL([STRIP], [strip], :)
+fi
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+AC_SUBST([INSTALL_STRIP_PROGRAM])])
+
+# serial 4						-*- Autoconf -*-
+
+# Copyright 1999, 2000, 2001 Free Software Foundation, Inc.
+
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+
+# There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
+# written in clear, in which case automake, when reading aclocal.m4,
+# will think it sees a *use*, and therefore will trigger all it's
+# C support machinery.  Also note that it means that autoscan, seeing
+# CC etc. in the Makefile, will ask for an AC_PROG_CC use...
+
+
+
+# _AM_DEPENDENCIES(NAME)
+# ----------------------
+# See how the compiler implements dependency checking.
+# NAME is "CC", "CXX", "GCJ", or "OBJC".
+# We try a few techniques and use that to set a single cache variable.
+#
+# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
+# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
+# dependency, and given that the user is not expected to run this macro,
+# just rely on AC_PROG_CC.
+AC_DEFUN([_AM_DEPENDENCIES],
+[AC_REQUIRE([AM_SET_DEPDIR])dnl
+AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
+AC_REQUIRE([AM_MAKE_INCLUDE])dnl
+AC_REQUIRE([AM_DEP_TRACK])dnl
+
+ifelse([$1], CC,   [depcc="$CC"   am_compiler_list=],
+       [$1], CXX,  [depcc="$CXX"  am_compiler_list=],
+       [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc']
+       [$1], GCJ,  [depcc="$GCJ"  am_compiler_list='gcc3 gcc'],
+                   [depcc="$$1"   am_compiler_list=])
+
+AC_CACHE_CHECK([dependency style of $depcc],
+               [am_cv_$1_dependencies_compiler_type],
+[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+
+  am_cv_$1_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    echo '#include "conftest.h"' > conftest.c
+    echo 'int i;' > conftest.h
+    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=conftest.c object=conftest.o \
+       depfile=conftest.Po tmpdepfile=conftest.TPo \
+       $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
+      break
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_$1_dependencies_compiler_type=none
+fi
+])
+AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
+])
+
+
+# AM_SET_DEPDIR
+# -------------
+# Choose a directory name for dependency files.
+# This macro is AC_REQUIREd in _AM_DEPENDENCIES
+AC_DEFUN([AM_SET_DEPDIR],
+[rm -f .deps 2>/dev/null
+mkdir .deps 2>/dev/null
+if test -d .deps; then
+  DEPDIR=.deps
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  DEPDIR=_deps
+fi
+rmdir .deps 2>/dev/null
+AC_SUBST([DEPDIR])
+])
+
+
+# AM_DEP_TRACK
+# ------------
+AC_DEFUN([AM_DEP_TRACK],
+[AC_ARG_ENABLE(dependency-tracking,
+[  --disable-dependency-tracking Speeds up one-time builds
+  --enable-dependency-tracking  Do not reject slow dependency extractors])
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
+AC_SUBST([AMDEPBACKSLASH])
+])
+
+# Generate code to set up dependency tracking.   -*- Autoconf -*-
+
+# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+#serial 2
+
+# _AM_OUTPUT_DEPENDENCY_COMMANDS
+# ------------------------------
+AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
+[for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  if (sed 1q $mf | fgrep 'generated by automake') > /dev/null 2>&1; then
+    dirpart=`AS_DIRNAME("$mf")`
+  else
+    continue
+  fi
+  grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
+  # Extract the definition of DEP_FILES from the Makefile without
+  # running `make'.
+  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n -e '/^U = / s///p' < "$mf"`
+  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+  # We invoke sed twice because it is the simplest approach to
+  # changing $(DEPDIR) to its actual value in the expansion.
+  for file in `sed -n -e '
+    /^DEP_FILES = .*\\\\$/ {
+      s/^DEP_FILES = //
+      :loop
+	s/\\\\$//
+	p
+	n
+	/\\\\$/ b loop
+      p
+    }
+    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`AS_DIRNAME(["$file"])`
+    AS_MKDIR_P([$dirpart/$fdir])
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+])# _AM_OUTPUT_DEPENDENCY_COMMANDS
+
+
+# AM_OUTPUT_DEPENDENCY_COMMANDS
+# -----------------------------
+# This macro should only be invoked once -- use via AC_REQUIRE.
+#
+# This code is only required when automatic dependency tracking
+# is enabled.  FIXME.  This creates each `.P' file that we will
+# need in order to bootstrap the dependency handling code.
+AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
+[AC_CONFIG_COMMANDS([depfiles],
+     [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
+     [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
+])
+
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 2
+
+# AM_MAKE_INCLUDE()
+# -----------------
+# Check to see how make treats includes.
+AC_DEFUN([AM_MAKE_INCLUDE],
+[am_make=${MAKE-make}
+cat > confinc << 'END'
+doit:
+	@echo done
+END
+# If we don't find an include directive, just comment out the code.
+AC_MSG_CHECKING([for style of include used by $am_make])
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# 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 | fgrep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+AC_SUBST(am__include)
+AC_SUBST(am__quote)
+AC_MSG_RESULT($_am_result)
+rm -f confinc confmf
+])
+
+# AM_CONDITIONAL                                              -*- Autoconf -*-
+
+# Copyright 1997, 2000, 2001 Free Software Foundation, Inc.
+
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+# serial 5
+
+AC_PREREQ(2.52)
+
+# AM_CONDITIONAL(NAME, SHELL-CONDITION)
+# -------------------------------------
+# Define a conditional.
+AC_DEFUN([AM_CONDITIONAL],
+[ifelse([$1], [TRUE],  [AC_FATAL([$0: invalid condition: $1])],
+        [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl
+AC_SUBST([$1_TRUE])
+AC_SUBST([$1_FALSE])
+if $2; then
+  $1_TRUE=
+  $1_FALSE='#'
+else
+  $1_TRUE='#'
+  $1_FALSE=
+fi
+AC_CONFIG_COMMANDS_PRE(
+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then
+  AC_MSG_ERROR([conditional \"$1\" was never defined.
+Usually this means the macro was only invoked conditionally.])
+fi])])
+
+# Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
+
+# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc.
+
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+# 02111-1307, USA.
+
+AC_PREREQ([2.52])
+
+# serial 6
+
+# 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
 
-# Like AC_CONFIG_HEADER, but automatically create stamp file.
 
+# AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
+# --------------------------------------------------------------
 AC_DEFUN([AM_CONFIG_HEADER],
-[AC_PREREQ([2.12])
-AC_CONFIG_HEADER([$1])
-dnl When config.status generates a header, we must update the stamp-h file.
-dnl This file resides in the same directory as the config header
-dnl that is generated.  We must strip everything past the first ":",
-dnl and everything past the last "/".
-AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
-ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
-<<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>, <<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
-<<am_indx=1
-for am_file in <<$1>>; do
-  case " <<$>>CONFIG_HEADERS " in
-  *" <<$>>am_file "*<<)>>
-    echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e 's%[^/]*$%%'`stamp-h$am_indx
-    ;;
-  esac
-  am_indx=`expr "<<$>>am_indx" + 1`
-done<<>>dnl>>)
-changequote([,]))])
+[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/compile b/compile
new file mode 100755
index 0000000000000000000000000000000000000000..9bb997a6a9b4549a733ed71f7e449e70c89f7a69
--- /dev/null
+++ b/compile
@@ -0,0 +1,99 @@
+#! /bin/sh
+
+# Wrapper for compilers which do not understand `-c -o'.
+
+# Copyright 1999, 2000 Free Software Foundation, Inc.
+# Written by Tom Tromey <tromey@cygnus.com>.
+#
+# 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
+# the Free Software Foundation; either version 2, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
+# Usage:
+# compile PROGRAM [ARGS]...
+# `-o FOO.o' is removed from the args passed to the actual compile.
+
+prog=$1
+shift
+
+ofile=
+cfile=
+args=
+while test $# -gt 0; do
+   case "$1" in
+    -o)
+       # configure might choose to run compile as `compile cc -o foo foo.c'.
+       # So we do something ugly here.
+       ofile=$2
+       shift
+       case "$ofile" in
+	*.o | *.obj)
+	   ;;
+	*)
+	   args="$args -o $ofile"
+	   ofile=
+	   ;;
+       esac
+       ;;
+    *.c)
+       cfile=$1
+       args="$args $1"
+       ;;
+    *)
+       args="$args $1"
+       ;;
+   esac
+   shift
+done
+
+if test -z "$ofile" || test -z "$cfile"; then
+   # If no `-o' option was seen then we might have been invoked from a
+   # pattern rule where we don't need one.  That is ok -- this is a
+   # normal compilation that the losing compiler can handle.  If no
+   # `.c' file was seen then we are probably linking.  That is also
+   # ok.
+   exec "$prog" $args
+fi
+
+# Name of file we expect compiler to create.
+cofile=`echo $cfile | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
+
+# Create the lock directory.
+# Note: use `[/.-]' here to ensure that we don't use the same name
+# that we are using for the .o file.  Also, base the name on the expected
+# object file name, since that is what matters with a parallel build.
+lockdir=`echo $cofile | sed -e 's|[/.-]|_|g'`.d
+while true; do
+   if mkdir $lockdir > /dev/null 2>&1; then
+      break
+   fi
+   sleep 1
+done
+# FIXME: race condition here if user kills between mkdir and trap.
+trap "rmdir $lockdir; exit 1" 1 2 15
+
+# Run the compile.
+"$prog" $args
+status=$?
+
+if test -f "$cofile"; then
+   mv "$cofile" "$ofile"
+fi
+
+rmdir $lockdir
+exit $status
diff --git a/configure b/configure
index 731286baa0e2cf2914f0b1d46970df777c461622..3a7fb2c37266f2d6d5dc510f9fea49908310df52 100755
--- a/configure
+++ b/configure
@@ -636,6 +636,8 @@ if test -n "$ac_init_help"; then
 Optional Features:
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
+  --disable-dependency-tracking Speeds up one-time builds
+  --enable-dependency-tracking  Do not reject slow dependency extractors
   --enable-debug  	use this option if you want to debug xfwm4
 
 Optional Packages:
@@ -835,7 +837,7 @@ if test -z "$CONFIG_SITE"; then
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:838: loading site script $ac_site_file" >&5
+    { echo "$as_me:840: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
@@ -846,7 +848,7 @@ if test -r "$cache_file"; then
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:849: loading cache $cache_file" >&5
+    { echo "$as_me:851: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -854,7 +856,7 @@ echo "$as_me: loading cache $cache_file" >&6;}
     esac
   fi
 else
-  { echo "$as_me:857: creating cache $cache_file" >&5
+  { echo "$as_me:859: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -870,21 +872,21 @@ for ac_var in `(set) 2>&1 |
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:873: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:875: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:877: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:879: error: \`$ac_var' was not set in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:883: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:885: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:885:   former value:  $ac_old_val" >&5
+        { echo "$as_me:887:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:887:   current value: $ac_new_val" >&5
+        { echo "$as_me:889:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -903,9 +905,9 @@ echo "$as_me:   current value: $ac_new_val" >&2;}
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:906: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:908: error: changes in the environment can compromise the build" >&5
 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:908: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:910: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -925,10 +927,10 @@ esac
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:928: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:930: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:931: \$? = $ac_status" >&5
+  echo "$as_me:933: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_path_separator=';'
 else
@@ -938,6 +940,7 @@ PATH_SEPARATOR="$ac_path_separator"
 rm -f conftest.sh
 
 VERSION=`date +%y%m%d`
+am__api_version="1.6"
 ac_aux_dir=
 for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   if test -f $ac_dir/install-sh; then
@@ -955,7 +958,7 @@ for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:958: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:961: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -975,7 +978,7 @@ ac_configure="$SHELL $ac_aux_dir/configure" # This should be Cygnus configure.
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:978: checking for a BSD compatible install" >&5
+echo "$as_me:981: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -1024,7 +1027,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:1027: result: $INSTALL" >&5
+echo "$as_me:1030: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -1035,50 +1038,50 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:1038: checking whether build environment is sane" >&5
+echo "$as_me:1041: checking whether build environment is sane" >&5
 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
-echo timestamp > conftestfile
+echo timestamp > conftest.file
 # Do `set' in a subshell so we don't clobber the current shell's
 # arguments.  Must try -L first in case configure is actually a
 # symlink; some systems play weird games with the mod time of symlinks
 # (eg FreeBSD returns the mod time of the symlink's containing
 # directory).
 if (
-   set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
+   set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null`
    if test "$*" = "X"; then
       # -L didn't work.
-      set X `ls -t $srcdir/configure conftestfile`
+      set X `ls -t $srcdir/configure conftest.file`
    fi
-   if test "$*" != "X $srcdir/configure conftestfile" \
-      && test "$*" != "X conftestfile $srcdir/configure"; then
+   rm -f conftest.file
+   if test "$*" != "X $srcdir/configure conftest.file" \
+      && test "$*" != "X conftest.file $srcdir/configure"; then
 
       # If neither matched, then we have a broken ls.  This can happen
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:1061: error: ls -t appears to fail.  Make sure there is not a broken
+      { { echo "$as_me:1065: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&5
 echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}
    { (exit 1); exit 1; }; }
    fi
 
-   test "$2" = conftestfile
+   test "$2" = conftest.file
    )
 then
    # Ok.
    :
 else
-   { { echo "$as_me:1074: error: newly created file is older than distributed files!
+   { { echo "$as_me:1078: error: newly created file is older than distributed files!
 Check your system clock" >&5
 echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-rm -f conftest*
-echo "$as_me:1081: result: yes" >&5
+echo "$as_me:1084: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 test "$program_prefix" != NONE &&
   program_transform_name="s,^,$program_prefix,;$program_transform_name"
@@ -1093,7 +1096,57 @@ _ACEOF
 program_transform_name=`echo $program_transform_name | sed -f conftest.sed`
 rm conftest.sed
 
-echo "$as_me:1096: checking whether ${MAKE-make} sets \${MAKE}" >&5
+# expand $ac_aux_dir to an absolute path
+am_aux_dir=`cd $ac_aux_dir && pwd`
+
+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing"
+# Use eval to expand $SHELL
+if eval "$MISSING --run true"; then
+  am_missing_run="$MISSING --run "
+else
+  am_missing_run=
+  { echo "$as_me:1108: WARNING: \`missing' script is too old or missing" >&5
+echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
+fi
+
+for ac_prog in mawk gawk nawk awk
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo "$as_me:1116: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_AWK+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$AWK"; then
+  ac_cv_prog_AWK="$AWK" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_AWK="$ac_prog"
+echo "$as_me:1131: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+AWK=$ac_cv_prog_AWK
+if test -n "$AWK"; then
+  echo "$as_me:1139: result: $AWK" >&5
+echo "${ECHO_T}$AWK" >&6
+else
+  echo "$as_me:1142: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+  test -n "$AWK" && break
+done
+
+echo "$as_me:1149: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -1113,25 +1166,27 @@ fi
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:1116: result: yes" >&5
+  echo "$as_me:1169: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:1120: result: no" >&5
+  echo "$as_me:1173: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
 
-PACKAGE=xfwm4
-
-VERSION=$VERSION
-
-if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
-  { { echo "$as_me:1130: error: source directory already configured; run \"make distclean\" there first" >&5
+ # test to see if srcdir already configured
+if test "`cd $srcdir && pwd`" != "`pwd`" &&
+   test -f $srcdir/config.status; then
+  { { echo "$as_me:1181: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
+# Define the identity of the package.
+ PACKAGE=xfwm4
+ VERSION=$VERSION
+
 cat >>confdefs.h <<EOF
 #define PACKAGE "$PACKAGE"
 EOF
@@ -1140,85 +1195,110 @@ cat >>confdefs.h <<EOF
 #define VERSION "$VERSION"
 EOF
 
-missing_dir=`cd $ac_aux_dir && pwd`
-echo "$as_me:1144: checking for working aclocal" >&5
-echo $ECHO_N "checking for working aclocal... $ECHO_C" >&6
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
-   ACLOCAL=aclocal
-   echo "$as_me:1151: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
-   ACLOCAL="$missing_dir/missing aclocal"
-   echo "$as_me:1155: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-echo "$as_me:1159: checking for working autoconf" >&5
-echo $ECHO_N "checking for working autoconf... $ECHO_C" >&6
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
-   AUTOCONF=autoconf
-   echo "$as_me:1166: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
-   AUTOCONF="$missing_dir/missing autoconf"
-   echo "$as_me:1170: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-echo "$as_me:1174: checking for working automake" >&5
-echo $ECHO_N "checking for working automake... $ECHO_C" >&6
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (automake --version) < /dev/null > /dev/null 2>&1; then
-   AUTOMAKE=automake
-   echo "$as_me:1181: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
-   AUTOMAKE="$missing_dir/missing automake"
-   echo "$as_me:1185: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-echo "$as_me:1189: checking for working autoheader" >&5
-echo $ECHO_N "checking for working autoheader... $ECHO_C" >&6
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
-   AUTOHEADER=autoheader
-   echo "$as_me:1196: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
-   AUTOHEADER="$missing_dir/missing autoheader"
-   echo "$as_me:1200: result: missing" >&5
-echo "${ECHO_T}missing" >&6
-fi
-
-echo "$as_me:1204: checking for working makeinfo" >&5
-echo $ECHO_N "checking for working makeinfo... $ECHO_C" >&6
-# Run test in a subshell; some versions of sh will print an error if
-# an executable is not found, even if stderr is redirected.
-# Redirect stdin to placate older versions of autoconf.  Sigh.
-if (makeinfo --version) < /dev/null > /dev/null 2>&1; then
-   MAKEINFO=makeinfo
-   echo "$as_me:1211: result: found" >&5
-echo "${ECHO_T}found" >&6
-else
-   MAKEINFO="$missing_dir/missing makeinfo"
-   echo "$as_me:1215: result: missing" >&5
-echo "${ECHO_T}missing" >&6
+# Some tools Automake needs.
+
+ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
+
+AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
+
+AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
+
+AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
+
+MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
+
+AMTAR=${AMTAR-"${am_missing_run}tar"}
+
+install_sh=${install_sh-"$am_aux_dir/install-sh"}
+
+# Installed binaries are usually stripped using `strip' when the user
+# run `make install-strip'.  However `strip' might not be the right
+# tool to use in cross-compilation environments, therefore Automake
+# will honor the `STRIP' environment variable to overrule this program.
+if test "$cross_compiling" != no; then
+  if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+echo "$as_me:1222: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+echo "$as_me:1237: found $ac_dir/$ac_word" >&5
+break
+done
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  echo "$as_me:1245: result: $STRIP" >&5
+echo "${ECHO_T}$STRIP" >&6
+else
+  echo "$as_me:1248: result: no" >&5
+echo "${ECHO_T}no" >&6
 fi
 
-ac_config_headers="$ac_config_headers config.h"
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+echo "$as_me:1257: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
+if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+  ac_save_IFS=$IFS; IFS=$ac_path_separator
+ac_dummy="$PATH"
+for ac_dir in $ac_dummy; do
+  IFS=$ac_save_IFS
+  test -z "$ac_dir" && ac_dir=.
+  $as_executable_p "$ac_dir/$ac_word" || continue
+ac_cv_prog_ac_ct_STRIP="strip"
+echo "$as_me:1272: found $ac_dir/$ac_word" >&5
+break
+done
+
+  test -z "$ac_cv_prog_ac_ct_STRIP" && ac_cv_prog_ac_ct_STRIP=":"
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  echo "$as_me:1281: result: $ac_ct_STRIP" >&5
+echo "${ECHO_T}$ac_ct_STRIP" >&6
+else
+  echo "$as_me:1284: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
 
-ac_config_commands="$ac_config_commands default-1"
+  STRIP=$ac_ct_STRIP
+else
+  STRIP="$ac_cv_prog_STRIP"
+fi
+
+fi
+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+
+# We need awk for the "check" target.  The system "awk" is bad on
+# some platforms.
+
+# 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"
@@ -1231,7 +1311,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1234: checking for $ac_word" >&5
+echo "$as_me:1314: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1246,7 +1326,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1249: found $ac_dir/$ac_word" >&5
+echo "$as_me:1329: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1254,10 +1334,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1257: result: $CC" >&5
+  echo "$as_me:1337: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1260: result: no" >&5
+  echo "$as_me:1340: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1266,7 +1346,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1269: checking for $ac_word" >&5
+echo "$as_me:1349: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1281,7 +1361,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1284: found $ac_dir/$ac_word" >&5
+echo "$as_me:1364: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1289,10 +1369,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1292: result: $ac_ct_CC" >&5
+  echo "$as_me:1372: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1295: result: no" >&5
+  echo "$as_me:1375: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1305,7 +1385,7 @@ if test -z "$CC"; then
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1308: checking for $ac_word" >&5
+echo "$as_me:1388: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1320,7 +1400,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1323: found $ac_dir/$ac_word" >&5
+echo "$as_me:1403: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1328,10 +1408,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1331: result: $CC" >&5
+  echo "$as_me:1411: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1334: result: no" >&5
+  echo "$as_me:1414: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1340,7 +1420,7 @@ if test -z "$ac_cv_prog_CC"; then
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1343: checking for $ac_word" >&5
+echo "$as_me:1423: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1355,7 +1435,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1358: found $ac_dir/$ac_word" >&5
+echo "$as_me:1438: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1363,10 +1443,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1366: result: $ac_ct_CC" >&5
+  echo "$as_me:1446: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1369: result: no" >&5
+  echo "$as_me:1449: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1379,7 +1459,7 @@ fi
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1382: checking for $ac_word" >&5
+echo "$as_me:1462: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1399,7 +1479,7 @@ if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1402: found $ac_dir/$ac_word" >&5
+echo "$as_me:1482: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1421,10 +1501,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1424: result: $CC" >&5
+  echo "$as_me:1504: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1427: result: no" >&5
+  echo "$as_me:1507: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1435,7 +1515,7 @@ if test -z "$CC"; then
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1438: checking for $ac_word" >&5
+echo "$as_me:1518: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1450,7 +1530,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1453: found $ac_dir/$ac_word" >&5
+echo "$as_me:1533: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1458,10 +1538,10 @@ fi
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1461: result: $CC" >&5
+  echo "$as_me:1541: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1464: result: no" >&5
+  echo "$as_me:1544: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1474,7 +1554,7 @@ if test -z "$CC"; then
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1477: checking for $ac_word" >&5
+echo "$as_me:1557: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1489,7 +1569,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1492: found $ac_dir/$ac_word" >&5
+echo "$as_me:1572: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1497,10 +1577,10 @@ fi
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1500: result: $ac_ct_CC" >&5
+  echo "$as_me:1580: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1503: result: no" >&5
+  echo "$as_me:1583: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1512,32 +1592,32 @@ fi
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1515: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1595: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:1520:" \
+echo "$as_me:1600:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1523: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1603: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1526: \$? = $ac_status" >&5
+  echo "$as_me:1606: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1528: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1608: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1531: \$? = $ac_status" >&5
+  echo "$as_me:1611: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1533: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1613: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1536: \$? = $ac_status" >&5
+  echo "$as_me:1616: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1540 "configure"
+#line 1620 "configure"
 #include "confdefs.h"
 
 int
@@ -1553,13 +1633,13 @@ ac_clean_files="$ac_clean_files a.out a.exe"
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1556: checking for C compiler default output" >&5
+echo "$as_me:1636: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1559: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1639: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1562: \$? = $ac_status" >&5
+  echo "$as_me:1642: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1582,34 +1662,34 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1585: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1665: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1591: result: $ac_file" >&5
+echo "$as_me:1671: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1596: checking whether the C compiler works" >&5
+echo "$as_me:1676: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:1602: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1682: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1605: \$? = $ac_status" >&5
+  echo "$as_me:1685: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:1612: error: cannot run C compiled programs.
+	{ { echo "$as_me:1692: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -1617,24 +1697,24 @@ If you meant to cross compile, use \`--host'." >&2;}
     fi
   fi
 fi
-echo "$as_me:1620: result: yes" >&5
+echo "$as_me:1700: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1627: checking whether we are cross compiling" >&5
+echo "$as_me:1707: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:1629: result: $cross_compiling" >&5
+echo "$as_me:1709: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:1632: checking for executable suffix" >&5
+echo "$as_me:1712: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:1634: \"$ac_link\"") >&5
+if { (eval echo "$as_me:1714: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:1637: \$? = $ac_status" >&5
+  echo "$as_me:1717: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -1650,25 +1730,25 @@ for ac_file in `(ls conftest.exe; ls conftest; ls conftest.*) 2>/dev/null`; do
   esac
 done
 else
-  { { echo "$as_me:1653: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:1733: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:1659: result: $ac_cv_exeext" >&5
+echo "$as_me:1739: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:1665: checking for object suffix" >&5
+echo "$as_me:1745: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1671 "configure"
+#line 1751 "configure"
 #include "confdefs.h"
 
 int
@@ -1680,10 +1760,10 @@ main ()
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:1683: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1763: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1686: \$? = $ac_status" >&5
+  echo "$as_me:1766: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -1695,24 +1775,24 @@ done
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1698: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:1778: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:1705: result: $ac_cv_objext" >&5
+echo "$as_me:1785: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:1709: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:1789: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1715 "configure"
+#line 1795 "configure"
 #include "confdefs.h"
 
 int
@@ -1727,16 +1807,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1730: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1810: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1733: \$? = $ac_status" >&5
+  echo "$as_me:1813: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1736: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1816: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1739: \$? = $ac_status" >&5
+  echo "$as_me:1819: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -1748,19 +1828,19 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:1751: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:1831: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:1757: checking whether $CC accepts -g" >&5
+echo "$as_me:1837: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 1763 "configure"
+#line 1843 "configure"
 #include "confdefs.h"
 
 int
@@ -1772,16 +1852,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1775: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1855: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1778: \$? = $ac_status" >&5
+  echo "$as_me:1858: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1781: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1861: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1784: \$? = $ac_status" >&5
+  echo "$as_me:1864: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -1791,7 +1871,7 @@ ac_cv_prog_cc_g=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:1794: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:1874: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -1818,16 +1898,16 @@ cat >conftest.$ac_ext <<_ACEOF
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1821: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1901: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1824: \$? = $ac_status" >&5
+  echo "$as_me:1904: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1907: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1830: \$? = $ac_status" >&5
+  echo "$as_me:1910: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -1839,7 +1919,7 @@ if { (eval echo "$as_me:1821: \"$ac_compile\"") >&5
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 1842 "configure"
+#line 1922 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -1852,16 +1932,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1855: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1935: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1858: \$? = $ac_status" >&5
+  echo "$as_me:1938: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1861: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1941: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1864: \$? = $ac_status" >&5
+  echo "$as_me:1944: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -1871,7 +1951,7 @@ continue
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 1874 "configure"
+#line 1954 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -1883,16 +1963,16 @@ exit (42);
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:1886: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:1966: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:1889: \$? = $ac_status" >&5
+  echo "$as_me:1969: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:1892: \"$ac_try\"") >&5
+  { (eval echo "$as_me:1972: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:1895: \$? = $ac_status" >&5
+  echo "$as_me:1975: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -1918,6 +1998,140 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
+rm -f .deps 2>/dev/null
+mkdir .deps 2>/dev/null
+if test -d .deps; then
+  DEPDIR=.deps
+else
+  # MS-DOS does not allow filenames that begin with a dot.
+  DEPDIR=_deps
+fi
+rmdir .deps 2>/dev/null
+
+ac_config_commands="$ac_config_commands depfiles"
+
+am_make=${MAKE-make}
+cat > confinc << 'END'
+doit:
+	@echo done
+END
+# If we don't find an include directive, just comment out the code.
+echo "$as_me:2019: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# 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 | fgrep -v 'ing directory'`" = "done"; then
+   am__include=include
+   am__quote=
+   _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+   echo '.include "confinc"' > confmf
+   if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+      am__include=.include
+      am__quote="\""
+      _am_result=BSD
+   fi
+fi
+
+echo "$as_me:2046: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6
+rm -f confinc confmf
+
+# Check whether --enable-dependency-tracking or --disable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+  enableval="$enable_dependency_tracking"
+
+fi;
+if test "x$enable_dependency_tracking" != xno; then
+  am_depcomp="$ac_aux_dir/depcomp"
+  AMDEPBACKSLASH='\'
+fi
+
+if test "x$enable_dependency_tracking" != xno; then
+  AMDEP_TRUE=
+  AMDEP_FALSE='#'
+else
+  AMDEP_TRUE='#'
+  AMDEP_FALSE=
+fi
+
+depcc="$CC"   am_compiler_list=
+
+echo "$as_me:2070: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+  # We make a subdir and do the tests there.  Otherwise we can end up
+  # making bogus files that we don't know about and never remove.  For
+  # instance it was reported that on HP-UX the gcc test will end up
+  # making a dummy file named `D' -- because `-MD' means `put the output
+  # in D'.
+  mkdir conftest.dir
+  # Copy depcomp to subdir because otherwise we won't find it if we're
+  # using a relative directory.
+  cp "$am_depcomp" conftest.dir
+  cd conftest.dir
+
+  am_cv_CC_dependencies_compiler_type=none
+  if test "$am_compiler_list" = ""; then
+     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+  fi
+  for depmode in $am_compiler_list; do
+    # We need to recreate these files for each test, as the compiler may
+    # overwrite some of them when testing with obscure command lines.
+    # This happens at least with the AIX C compiler.
+    echo '#include "conftest.h"' > conftest.c
+    echo 'int i;' > conftest.h
+    echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
+
+    case $depmode in
+    nosideeffect)
+      # after this tag, mechanisms are not by side-effect, so they'll
+      # only be used when explicitly requested
+      if test "x$enable_dependency_tracking" = xyes; then
+	continue
+      else
+	break
+      fi
+      ;;
+    none) break ;;
+    esac
+    # We check with `-c' and `-o' for the sake of the "dashmstdout"
+    # mode.  It turns out that the SunPro C++ compiler does not properly
+    # handle `-M -o', and we need to detect this.
+    if depmode=$depmode \
+       source=conftest.c object=conftest.o \
+       depfile=conftest.Po tmpdepfile=conftest.TPo \
+       $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
+      break
+    fi
+  done
+
+  cd ..
+  rm -rf conftest.dir
+else
+  am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+echo "$as_me:2132: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
 # Find a good install program.  We prefer a C program (faster),
 # so one script is as good as another.  But avoid the broken or
@@ -1931,7 +2145,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:1934: checking for a BSD compatible install" >&5
+echo "$as_me:2148: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -1980,7 +2194,7 @@ fi
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:1983: result: $INSTALL" >&5
+echo "$as_me:2197: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -1991,7 +2205,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:1994: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:2208: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1999,7 +2213,7 @@ else
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 2002 "configure"
+#line 2216 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -2048,16 +2262,16 @@ for ac_arg in "" -qlanglvl=ansi -std1 -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIO
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2051: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2265: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2054: \$? = $ac_status" >&5
+  echo "$as_me:2268: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2057: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2271: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2060: \$? = $ac_status" >&5
+  echo "$as_me:2274: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -2074,15 +2288,15 @@ fi
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:2077: result: none needed" >&5
+    echo "$as_me:2291: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:2080: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:2294: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
-echo "$as_me:2085: checking for inline" >&5
+echo "$as_me:2299: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2090,7 +2304,7 @@ else
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 2093 "configure"
+#line 2307 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -2099,16 +2313,16 @@ $ac_kw int foo () {return 0; }
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2102: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2316: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2105: \$? = $ac_status" >&5
+  echo "$as_me:2319: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2108: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2322: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2111: \$? = $ac_status" >&5
+  echo "$as_me:2325: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -2119,7 +2333,7 @@ rm -f conftest.$ac_objext conftest.$ac_ext
 done
 
 fi
-echo "$as_me:2122: result: $ac_cv_c_inline" >&5
+echo "$as_me:2336: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -2134,13 +2348,13 @@ EOF
  ;;
 esac
 
-echo "$as_me:2137: checking for an ANSI C-conforming const" >&5
+echo "$as_me:2351: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2143 "configure"
+#line 2357 "configure"
 #include "confdefs.h"
 
 int
@@ -2198,16 +2412,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2201: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2415: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2204: \$? = $ac_status" >&5
+  echo "$as_me:2418: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2207: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2421: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2210: \$? = $ac_status" >&5
+  echo "$as_me:2424: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -2217,7 +2431,7 @@ ac_cv_c_const=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2220: result: $ac_cv_c_const" >&5
+echo "$as_me:2434: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -2232,7 +2446,7 @@ ac_cpp='$CPP $CPPFLAGS'
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:2235: checking how to run the C preprocessor" >&5
+echo "$as_me:2449: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -2253,18 +2467,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2256 "configure"
+#line 2470 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2261: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2475: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2267: \$? = $ac_status" >&5
+  echo "$as_me:2481: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2287,17 +2501,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2290 "configure"
+#line 2504 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2294: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2508: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2300: \$? = $ac_status" >&5
+  echo "$as_me:2514: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2334,7 +2548,7 @@ fi
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2337: result: $CPP" >&5
+echo "$as_me:2551: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2344,18 +2558,18 @@ do
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2347 "configure"
+#line 2561 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2352: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2566: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2358: \$? = $ac_status" >&5
+  echo "$as_me:2572: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2378,17 +2592,17 @@ rm -f conftest.err conftest.$ac_ext
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2381 "configure"
+#line 2595 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2385: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2599: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2391: \$? = $ac_status" >&5
+  echo "$as_me:2605: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2416,7 +2630,7 @@ rm -f conftest.err conftest.$ac_ext
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2419: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2633: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2427,7 +2641,7 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
-echo "$as_me:2430: checking for X" >&5
+echo "$as_me:2644: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -2524,17 +2738,17 @@ if test "$ac_x_includes" = no; then
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2527 "configure"
+#line 2741 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:2531: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2745: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2537: \$? = $ac_status" >&5
+  echo "$as_me:2751: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2567,7 +2781,7 @@ if test "$ac_x_libraries" = no; then
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 2570 "configure"
+#line 2784 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -2579,16 +2793,16 @@ XtMalloc (0)
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2582: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2796: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2585: \$? = $ac_status" >&5
+  echo "$as_me:2799: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2588: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2802: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2591: \$? = $ac_status" >&5
+  echo "$as_me:2805: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -2626,7 +2840,7 @@ fi
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:2629: result: $have_x" >&5
+  echo "$as_me:2843: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -2636,7 +2850,7 @@ else
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:2639: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:2853: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
@@ -2660,11 +2874,11 @@ else
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:2663: checking whether -R must be followed by a space" >&5
+      echo "$as_me:2877: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >conftest.$ac_ext <<_ACEOF
-#line 2667 "configure"
+#line 2881 "configure"
 #include "confdefs.h"
 
 int
@@ -2676,16 +2890,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2679: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2893: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2682: \$? = $ac_status" >&5
+  echo "$as_me:2896: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2685: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2899: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2688: \$? = $ac_status" >&5
+  echo "$as_me:2902: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -2695,13 +2909,13 @@ ac_R_nospace=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:2698: result: no" >&5
+	echo "$as_me:2912: result: no" >&5
 echo "${ECHO_T}no" >&6
 	X_LIBS="$X_LIBS -R$x_libraries"
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 2704 "configure"
+#line 2918 "configure"
 #include "confdefs.h"
 
 int
@@ -2713,16 +2927,16 @@ main ()
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2716: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2930: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2719: \$? = $ac_status" >&5
+  echo "$as_me:2933: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2722: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2936: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2725: \$? = $ac_status" >&5
+  echo "$as_me:2939: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -2732,11 +2946,11 @@ ac_R_space=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:2735: result: yes" >&5
+	  echo "$as_me:2949: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:2739: result: neither works" >&5
+	  echo "$as_me:2953: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -2756,7 +2970,7 @@ echo "${ECHO_T}neither works" >&6
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF
-#line 2759 "configure"
+#line 2973 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2775,22 +2989,22 @@ XOpenDisplay ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2778: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2992: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2781: \$? = $ac_status" >&5
+  echo "$as_me:2995: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2784: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2998: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2787: \$? = $ac_status" >&5
+  echo "$as_me:3001: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:2793: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:3007: checking for dnet_ntoa in -ldnet" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2798,7 +3012,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2801 "configure"
+#line 3015 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2817,16 +3031,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2820: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2823: \$? = $ac_status" >&5
+  echo "$as_me:3037: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2829: \$? = $ac_status" >&5
+  echo "$as_me:3043: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -2837,14 +3051,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2840: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:3054: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:2847: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:3061: checking for dnet_ntoa in -ldnet_stub" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2852,7 +3066,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2855 "configure"
+#line 3069 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2871,16 +3085,16 @@ dnet_ntoa ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2874: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3088: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2877: \$? = $ac_status" >&5
+  echo "$as_me:3091: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2880: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3094: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2883: \$? = $ac_status" >&5
+  echo "$as_me:3097: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -2891,7 +3105,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:2894: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:3108: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
@@ -2910,13 +3124,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:2913: checking for gethostbyname" >&5
+    echo "$as_me:3127: checking for gethostbyname" >&5
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2919 "configure"
+#line 3133 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -2947,16 +3161,16 @@ f = gethostbyname;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:2950: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3164: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2953: \$? = $ac_status" >&5
+  echo "$as_me:3167: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:2956: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3170: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2959: \$? = $ac_status" >&5
+  echo "$as_me:3173: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -2966,11 +3180,11 @@ ac_cv_func_gethostbyname=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:2969: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:3183: result: $ac_cv_func_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:2973: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:3187: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2978,7 +3192,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 2981 "configure"
+#line 3195 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -2997,16 +3211,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3000: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3214: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3003: \$? = $ac_status" >&5
+  echo "$as_me:3217: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3220: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3009: \$? = $ac_status" >&5
+  echo "$as_me:3223: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -3017,14 +3231,14 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3020: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:3234: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:3027: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:3241: checking for gethostbyname in -lbsd" >&5
 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3032,7 +3246,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3035 "configure"
+#line 3249 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3051,16 +3265,16 @@ gethostbyname ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3054: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3268: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3057: \$? = $ac_status" >&5
+  echo "$as_me:3271: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3274: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3063: \$? = $ac_status" >&5
+  echo "$as_me:3277: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -3071,7 +3285,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3074: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:3288: result: $ac_cv_lib_bsd_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
@@ -3087,13 +3301,13 @@ fi
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:3090: checking for connect" >&5
+    echo "$as_me:3304: checking for connect" >&5
 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3096 "configure"
+#line 3310 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -3124,16 +3338,16 @@ f = connect;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3127: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3341: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3130: \$? = $ac_status" >&5
+  echo "$as_me:3344: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3133: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3136: \$? = $ac_status" >&5
+  echo "$as_me:3350: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -3143,11 +3357,11 @@ ac_cv_func_connect=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3146: result: $ac_cv_func_connect" >&5
+echo "$as_me:3360: result: $ac_cv_func_connect" >&5
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
-      echo "$as_me:3150: checking for connect in -lsocket" >&5
+      echo "$as_me:3364: checking for connect in -lsocket" >&5
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3155,7 +3369,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3158 "configure"
+#line 3372 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3174,16 +3388,16 @@ connect ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3177: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3391: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3180: \$? = $ac_status" >&5
+  echo "$as_me:3394: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3183: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3397: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3186: \$? = $ac_status" >&5
+  echo "$as_me:3400: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -3194,7 +3408,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3197: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:3411: result: $ac_cv_lib_socket_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
@@ -3203,13 +3417,13 @@ fi
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:3206: checking for remove" >&5
+    echo "$as_me:3420: checking for remove" >&5
 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3212 "configure"
+#line 3426 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -3240,16 +3454,16 @@ f = remove;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3243: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3457: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3246: \$? = $ac_status" >&5
+  echo "$as_me:3460: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3249: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3463: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3252: \$? = $ac_status" >&5
+  echo "$as_me:3466: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -3259,11 +3473,11 @@ ac_cv_func_remove=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3262: result: $ac_cv_func_remove" >&5
+echo "$as_me:3476: result: $ac_cv_func_remove" >&5
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
-      echo "$as_me:3266: checking for remove in -lposix" >&5
+      echo "$as_me:3480: checking for remove in -lposix" >&5
 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3271,7 +3485,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3274 "configure"
+#line 3488 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3290,16 +3504,16 @@ remove ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3293: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3507: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3296: \$? = $ac_status" >&5
+  echo "$as_me:3510: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3299: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3513: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3302: \$? = $ac_status" >&5
+  echo "$as_me:3516: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -3310,7 +3524,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3313: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:3527: result: $ac_cv_lib_posix_remove" >&5
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
@@ -3319,13 +3533,13 @@ fi
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:3322: checking for shmat" >&5
+    echo "$as_me:3536: checking for shmat" >&5
 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3328 "configure"
+#line 3542 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -3356,16 +3570,16 @@ f = shmat;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3359: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3573: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3362: \$? = $ac_status" >&5
+  echo "$as_me:3576: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3365: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3579: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3368: \$? = $ac_status" >&5
+  echo "$as_me:3582: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -3375,11 +3589,11 @@ ac_cv_func_shmat=no
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3378: result: $ac_cv_func_shmat" >&5
+echo "$as_me:3592: result: $ac_cv_func_shmat" >&5
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
-      echo "$as_me:3382: checking for shmat in -lipc" >&5
+      echo "$as_me:3596: checking for shmat in -lipc" >&5
 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3387,7 +3601,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3390 "configure"
+#line 3604 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3406,16 +3620,16 @@ shmat ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3409: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3623: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3412: \$? = $ac_status" >&5
+  echo "$as_me:3626: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3415: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3629: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3418: \$? = $ac_status" >&5
+  echo "$as_me:3632: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -3426,7 +3640,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3429: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:3643: result: $ac_cv_lib_ipc_shmat" >&5
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
@@ -3444,7 +3658,7 @@ fi
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:3447: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:3661: checking for IceConnectionNumber in -lICE" >&5
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3452,7 +3666,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3455 "configure"
+#line 3669 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -3471,16 +3685,16 @@ IceConnectionNumber ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3474: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3688: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3477: \$? = $ac_status" >&5
+  echo "$as_me:3691: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3480: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3694: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3483: \$? = $ac_status" >&5
+  echo "$as_me:3697: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -3491,7 +3705,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3494: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:3708: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
@@ -3501,13 +3715,13 @@ fi
 
 fi
 
-echo "$as_me:3504: checking for ANSI C header files" >&5
+echo "$as_me:3718: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3510 "configure"
+#line 3724 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -3515,13 +3729,13 @@ else
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:3518: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3732: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3524: \$? = $ac_status" >&5
+  echo "$as_me:3738: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3543,7 +3757,7 @@ rm -f conftest.err conftest.$ac_ext
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3546 "configure"
+#line 3760 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -3561,7 +3775,7 @@ fi
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 3564 "configure"
+#line 3778 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -3582,7 +3796,7 @@ if test $ac_cv_header_stdc = yes; then
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3585 "configure"
+#line 3799 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -3608,15 +3822,15 @@ main ()
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:3611: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3825: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3614: \$? = $ac_status" >&5
+  echo "$as_me:3828: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:3616: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3830: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3619: \$? = $ac_status" >&5
+  echo "$as_me:3833: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -3629,7 +3843,7 @@ rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
 fi
-echo "$as_me:3632: result: $ac_cv_header_stdc" >&5
+echo "$as_me:3846: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -3642,23 +3856,23 @@ fi
 for ac_header in stdlib.h string.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3645: checking for $ac_header" >&5
+echo "$as_me:3859: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3651 "configure"
+#line 3865 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3655: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3869: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3661: \$? = $ac_status" >&5
+  echo "$as_me:3875: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3677,7 +3891,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3680: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:3894: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3687,7 +3901,7 @@ EOF
 fi
 done
 
-echo "$as_me:3690: checking for main in -lX11" >&5
+echo "$as_me:3904: checking for main in -lX11" >&5
 echo $ECHO_N "checking for main in -lX11... $ECHO_C" >&6
 if test "${ac_cv_lib_X11_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3695,7 +3909,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lX11 $X_CFLAGS $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3698 "configure"
+#line 3912 "configure"
 #include "confdefs.h"
 
 int
@@ -3707,16 +3921,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3710: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3924: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3713: \$? = $ac_status" >&5
+  echo "$as_me:3927: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3716: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3930: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3719: \$? = $ac_status" >&5
+  echo "$as_me:3933: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_X11_main=yes
 else
@@ -3727,7 +3941,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3730: result: $ac_cv_lib_X11_main" >&5
+echo "$as_me:3944: result: $ac_cv_lib_X11_main" >&5
 echo "${ECHO_T}$ac_cv_lib_X11_main" >&6
 if test $ac_cv_lib_X11_main = yes; then
   cat >>confdefs.h <<EOF
@@ -3737,12 +3951,12 @@ EOF
   LIBS="-lX11 $LIBS"
 
 else
-  { { echo "$as_me:3740: error: libX11 is missing from your system: Make sure you have both the  X Window System libraries and development headers correctly installed" >&5
+  { { echo "$as_me:3954: error: libX11 is missing from your system: Make sure you have both the  X Window System libraries and development headers correctly installed" >&5
 echo "$as_me: error: libX11 is missing from your system: Make sure you have both the  X Window System libraries and development headers correctly installed" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:3745: checking for main in -lXext" >&5
+echo "$as_me:3959: checking for main in -lXext" >&5
 echo $ECHO_N "checking for main in -lXext... $ECHO_C" >&6
 if test "${ac_cv_lib_Xext_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3750,7 +3964,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXext $X_CFLAGS $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3753 "configure"
+#line 3967 "configure"
 #include "confdefs.h"
 
 int
@@ -3762,16 +3976,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3765: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3979: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3768: \$? = $ac_status" >&5
+  echo "$as_me:3982: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3771: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3774: \$? = $ac_status" >&5
+  echo "$as_me:3988: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xext_main=yes
 else
@@ -3782,7 +3996,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3785: result: $ac_cv_lib_Xext_main" >&5
+echo "$as_me:3999: result: $ac_cv_lib_Xext_main" >&5
 echo "${ECHO_T}$ac_cv_lib_Xext_main" >&6
 if test $ac_cv_lib_Xext_main = yes; then
   cat >>confdefs.h <<EOF
@@ -3792,12 +4006,12 @@ EOF
   LIBS="-lXext $LIBS"
 
 else
-  { { echo "$as_me:3795: error: The X Window System installed on this machine does not support the shape extension" >&5
+  { { echo "$as_me:4009: error: The X Window System installed on this machine does not support the shape extension" >&5
 echo "$as_me: error: The X Window System installed on this machine does not support the shape extension" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
-echo "$as_me:3800: checking for main in -lXpm" >&5
+echo "$as_me:4014: checking for main in -lXpm" >&5
 echo $ECHO_N "checking for main in -lXpm... $ECHO_C" >&6
 if test "${ac_cv_lib_Xpm_main+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3805,7 +4019,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lXpm $X_CFLAGS $X_PRE_LIBS $X_EXTRA_LIBS $X_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 3808 "configure"
+#line 4022 "configure"
 #include "confdefs.h"
 
 int
@@ -3817,16 +4031,16 @@ main ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3820: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4034: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3823: \$? = $ac_status" >&5
+  echo "$as_me:4037: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3826: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4040: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3829: \$? = $ac_status" >&5
+  echo "$as_me:4043: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_Xpm_main=yes
 else
@@ -3837,7 +4051,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:3840: result: $ac_cv_lib_Xpm_main" >&5
+echo "$as_me:4054: result: $ac_cv_lib_Xpm_main" >&5
 echo "${ECHO_T}$ac_cv_lib_Xpm_main" >&6
 if test $ac_cv_lib_Xpm_main = yes; then
   cat >>confdefs.h <<EOF
@@ -3847,7 +4061,7 @@ EOF
   LIBS="-lXpm $LIBS"
 
 else
-  { { echo "$as_me:3850: error: libXpm is missing from your system: Make sure you have both the Xpm libraries and development headers correctly installed" >&5
+  { { echo "$as_me:4064: error: libXpm is missing from your system: Make sure you have both the Xpm libraries and development headers correctly installed" >&5
 echo "$as_me: error: libXpm is missing from your system: Make sure you have both the Xpm libraries and development headers correctly installed" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -3855,13 +4069,13 @@ fi
 for ac_func in malloc setlocale strchr strdup strrchr strstr
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:3858: checking for $ac_func" >&5
+echo "$as_me:4072: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3864 "configure"
+#line 4078 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -3892,16 +4106,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3895: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4109: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3898: \$? = $ac_status" >&5
+  echo "$as_me:4112: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3901: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4115: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3904: \$? = $ac_status" >&5
+  echo "$as_me:4118: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -3911,7 +4125,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:3914: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:4128: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3940,7 +4154,7 @@ PANGO_REQUIRED_VERSION=1.0.0
   if test -z "$PKG_CONFIG"; then
     # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
-echo "$as_me:3943: checking for $ac_word" >&5
+echo "$as_me:4157: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3957,7 +4171,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   if $as_executable_p "$ac_dir/$ac_word"; then
    ac_cv_path_PKG_CONFIG="$ac_dir/$ac_word"
-   echo "$as_me:3960: found $ac_dir/$ac_word" >&5
+   echo "$as_me:4174: found $ac_dir/$ac_word" >&5
    break
 fi
 done
@@ -3969,10 +4183,10 @@ fi
 PKG_CONFIG=$ac_cv_path_PKG_CONFIG
 
 if test -n "$PKG_CONFIG"; then
-  echo "$as_me:3972: result: $PKG_CONFIG" >&5
+  echo "$as_me:4186: result: $PKG_CONFIG" >&5
 echo "${ECHO_T}$PKG_CONFIG" >&6
 else
-  echo "$as_me:3975: result: no" >&5
+  echo "$as_me:4189: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3986,24 +4200,24 @@ fi
   else
      PKG_CONFIG_MIN_VERSION=0.9.0
      if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
-        echo "$as_me:3989: checking for glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION" >&5
+        echo "$as_me:4203: checking for glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION" >&5
 echo $ECHO_N "checking for glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION... $ECHO_C" >&6
 
         if $PKG_CONFIG --exists "glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION" ; then
-            echo "$as_me:3993: result: yes" >&5
+            echo "$as_me:4207: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             succeeded=yes
 
-            echo "$as_me:3997: checking BASE_DEPENDENCIES_CFLAGS" >&5
+            echo "$as_me:4211: checking BASE_DEPENDENCIES_CFLAGS" >&5
 echo $ECHO_N "checking BASE_DEPENDENCIES_CFLAGS... $ECHO_C" >&6
             BASE_DEPENDENCIES_CFLAGS=`$PKG_CONFIG --cflags "glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION"`
-            echo "$as_me:4000: result: $BASE_DEPENDENCIES_CFLAGS" >&5
+            echo "$as_me:4214: result: $BASE_DEPENDENCIES_CFLAGS" >&5
 echo "${ECHO_T}$BASE_DEPENDENCIES_CFLAGS" >&6
 
-            echo "$as_me:4003: checking BASE_DEPENDENCIES_LIBS" >&5
+            echo "$as_me:4217: checking BASE_DEPENDENCIES_LIBS" >&5
 echo $ECHO_N "checking BASE_DEPENDENCIES_LIBS... $ECHO_C" >&6
             BASE_DEPENDENCIES_LIBS=`$PKG_CONFIG --libs "glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION"`
-            echo "$as_me:4006: result: $BASE_DEPENDENCIES_LIBS" >&5
+            echo "$as_me:4220: result: $BASE_DEPENDENCIES_LIBS" >&5
 echo "${ECHO_T}$BASE_DEPENDENCIES_LIBS" >&6
         else
             BASE_DEPENDENCIES_CFLAGS=""
@@ -4023,12 +4237,12 @@ echo "${ECHO_T}$BASE_DEPENDENCIES_LIBS" >&6
   if test $succeeded = yes; then
      :
   else
-     { { echo "$as_me:4026: error: Library requirements (glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
+     { { echo "$as_me:4240: error: Library requirements (glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
 echo "$as_me: error: Library requirements (glib-2.0 >= $GLIB_REQUIRED_VERSION gtk+-2.0 >= $GTK_REQUIRED_VERSION pango >= $PANGO_REQUIRED_VERSION) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
    { (exit 1); exit 1; }; }
   fi
 
-ac_config_files="$ac_config_files xfwm4.spec Makefile src/Makefile defaults/Makefile themes/Makefile themes/agua/Makefile themes/coldsteel/Makefile themes/crux/Makefile themes/cruxish/Makefile themes/eazel-blue/Makefile themes/gtk/Makefile themes/kde/Makefile themes/kindaker/Makefile themes/linea/Makefile themes/mofit/Makefile themes/next/Makefile themes/oroborus/Makefile themes/platinum/Makefile themes/redmond/Makefile themes/redmondxp/Makefile themes/slick/Makefile themes/slimline/Makefile themes/trench/Makefile themes/xfce/Makefile"
+ac_config_files="$ac_config_files xfwm4.spec Makefile src/Makefile defaults/Makefile themes/Makefile themes/agua/Makefile themes/coldsteel/Makefile themes/crux/Makefile themes/cruxish/Makefile themes/eazel-blue/Makefile themes/gorilla/Makefile themes/gtk/Makefile themes/kde/Makefile themes/kindaker/Makefile themes/linea/Makefile themes/mofit/Makefile themes/next/Makefile themes/oroborus/Makefile themes/platinum/Makefile themes/redmond/Makefile themes/redmondxp/Makefile themes/slick/Makefile themes/slimline/Makefile themes/trench/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
@@ -4105,10 +4319,18 @@ fi
 
 DEFS=-DHAVE_CONFIG_H
 
+if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
+  { { echo "$as_me:4323: error: conditional \"AMDEP\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"AMDEP\" 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
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:4111: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:4333: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -4284,7 +4506,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:4287: error: ambiguous option: $1
+    { { echo "$as_me:4509: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -4303,7 +4525,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:4306: error: unrecognized option: $1
+  -*) { { echo "$as_me:4528: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -4338,6 +4560,8 @@ cat >>$CONFIG_STATUS <<EOF
 # INIT-COMMANDS section.
 #
 
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
+
 EOF
 
 cat >>$CONFIG_STATUS <<\EOF
@@ -4355,6 +4579,7 @@ do
   "themes/crux/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/crux/Makefile" ;;
   "themes/cruxish/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/cruxish/Makefile" ;;
   "themes/eazel-blue/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/eazel-blue/Makefile" ;;
+  "themes/gorilla/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/gorilla/Makefile" ;;
   "themes/gtk/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/gtk/Makefile" ;;
   "themes/kde/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/kde/Makefile" ;;
   "themes/kindaker/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/kindaker/Makefile" ;;
@@ -4369,9 +4594,9 @@ do
   "themes/slimline/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/slimline/Makefile" ;;
   "themes/trench/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/trench/Makefile" ;;
   "themes/xfce/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/xfce/Makefile" ;;
-  "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
+  "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:4374: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:4599: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -4463,6 +4688,12 @@ s,@AUTOCONF@,$AUTOCONF,;t t
 s,@AUTOMAKE@,$AUTOMAKE,;t t
 s,@AUTOHEADER@,$AUTOHEADER,;t t
 s,@MAKEINFO@,$MAKEINFO,;t t
+s,@AMTAR@,$AMTAR,;t t
+s,@install_sh@,$install_sh,;t t
+s,@STRIP@,$STRIP,;t t
+s,@ac_ct_STRIP@,$ac_ct_STRIP,;t t
+s,@INSTALL_STRIP_PROGRAM@,$INSTALL_STRIP_PROGRAM,;t t
+s,@AWK@,$AWK,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
@@ -4471,6 +4702,13 @@ s,@CPPFLAGS@,$CPPFLAGS,;t t
 s,@ac_ct_CC@,$ac_ct_CC,;t t
 s,@EXEEXT@,$EXEEXT,;t t
 s,@OBJEXT@,$OBJEXT,;t t
+s,@DEPDIR@,$DEPDIR,;t t
+s,@am__include@,$am__include,;t t
+s,@am__quote@,$am__quote,;t t
+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,@CPP@,$CPP,;t t
 s,@X_CFLAGS@,$X_CFLAGS,;t t
 s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
@@ -4593,7 +4831,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:4596: creating $ac_file" >&5
+    { echo "$as_me:4834: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -4611,7 +4849,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:4614: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:4852: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -4624,7 +4862,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:4627: error: cannot find input file: $f" >&5
+           { { echo "$as_me:4865: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -4685,7 +4923,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:4688: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:4926: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -4696,7 +4934,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:4699: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:4937: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -4709,7 +4947,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:4712: error: cannot find input file: $f" >&5
+           { { echo "$as_me:4950: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -4826,7 +5064,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:4829: $ac_file is unchanged" >&5
+      { echo "$as_me:5067: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -4865,6 +5103,12 @@ done; }
     cat $tmp/config.h
     rm -f $tmp/config.h
   fi
+  # 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
 EOF
 cat >>$CONFIG_STATUS <<\EOF
@@ -4877,7 +5121,80 @@ for ac_file in : $CONFIG_COMMANDS; do test "x$ac_file" = x: && continue
   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
 
   case $ac_dest in
-    default-1 ) test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h ;;
+    depfiles ) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
+  # Strip MF so we end up with the name of the file.
+  mf=`echo "$mf" | sed -e 's/:.*$//'`
+  if (sed 1q $mf | fgrep 'generated by automake') > /dev/null 2>&1; then
+    dirpart=`$as_expr X"$mf" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$mf" : 'X\(//\)[^/]' \| \
+         X"$mf" : 'X\(//\)$' \| \
+         X"$mf" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$mf" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+  else
+    continue
+  fi
+  grep '^DEP_FILES *= *[^ #]' < "$mf" > /dev/null || continue
+  # Extract the definition of DEP_FILES from the Makefile without
+  # running `make'.
+  DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
+  test -z "$DEPDIR" && continue
+  # When using ansi2knr, U may be empty or an underscore; expand it
+  U=`sed -n -e '/^U = / s///p' < "$mf"`
+  test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
+  # We invoke sed twice because it is the simplest approach to
+  # changing $(DEPDIR) to its actual value in the expansion.
+  for file in `sed -n -e '
+    /^DEP_FILES = .*\\\\$/ {
+      s/^DEP_FILES = //
+      :loop
+	s/\\\\$//
+	p
+	n
+	/\\\\$/ b loop
+      p
+    }
+    /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
+       sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
+    # Make sure the directory exists.
+    test -f "$dirpart/$file" && continue
+    fdir=`$as_expr X"$file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+         X"$file" : 'X\(//\)[^/]' \| \
+         X"$file" : 'X\(//\)$' \| \
+         X"$file" : 'X\(/\)' \| \
+         .     : '\(.\)' 2>/dev/null ||
+echo X"$file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+  	  /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+  	  /^X\(\/\/\)$/{ s//\1/; q; }
+  	  /^X\(\/\).*/{ s//\1/; q; }
+  	  s/.*/./; q'`
+    { case $dirpart/$fdir in
+  [\\/]* | ?:[\\/]* ) as_incr_dir=;;
+  *)                      as_incr_dir=.;;
+esac
+as_dummy=$dirpart/$fdir
+for as_mkdir_dir in `IFS='/\\'; set X $as_dummy; shift; echo "$@"`; do
+  case $as_mkdir_dir in
+    # Skip DOS drivespec
+    ?:) as_incr_dir=$as_mkdir_dir ;;
+    *)
+      as_incr_dir=$as_incr_dir/$as_mkdir_dir
+      test -d "$as_incr_dir" || mkdir "$as_incr_dir"
+    ;;
+  esac
+done; }
+
+    # echo "creating $dirpart/$file"
+    echo '# dummy' > "$dirpart/$file"
+  done
+done
+ ;;
   esac
 done
 EOF
diff --git a/configure.in b/configure.in
index 61f83a6bc8e4900dfde6bb3f1482338296561e34..c7a5cee9753caa64cc0a2d59145940ec1f4ab159 100644
--- a/configure.in
+++ b/configure.in
@@ -44,6 +44,7 @@ themes/coldsteel/Makefile
 themes/crux/Makefile
 themes/cruxish/Makefile
 themes/eazel-blue/Makefile
+themes/gorilla/Makefile
 themes/gtk/Makefile
 themes/kde/Makefile
 themes/kindaker/Makefile
diff --git a/defaults/Makefile.in b/defaults/Makefile.in
index 08c972665f9df8d410c87a9c8ee8238b35daf23e..12cb6b382e07867d3e03e99b9c016d6b2586c551 100644
--- a/defaults/Makefile.in
+++ b/defaults/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -45,153 +43,189 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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@
 defaultsdir = $(pkgdatadir)
 defaults_DATA = defaults
 EXTRA_DIST = defaults.in
+subdir = defaults
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(defaults_DATA)
-
-DIST_COMMON =  Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(defaults_DATA)
 
+DIST_COMMON = Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps defaults/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  defaults/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+uninstall-info-am:
+defaultsDATA_INSTALL = $(INSTALL_DATA)
 install-defaultsDATA: $(defaults_DATA)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(defaultsdir)
 	@list='$(defaults_DATA)'; for p in $$list; do \
-	  if test -f $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defaultsdir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(defaultsdir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(defaultsdir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(defaultsdir)/$$p; \
-	  fi; fi; \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(defaultsDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultsdir)/$$f"; \
+	  $(defaultsDATA_INSTALL) $$d$$p $(DESTDIR)$(defaultsdir)/$$f; \
 	done
 
 uninstall-defaultsDATA:
 	@$(NORMAL_UNINSTALL)
-	list='$(defaults_DATA)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(defaultsdir)/$$p; \
+	@list='$(defaults_DATA)'; for p in $$list; do \
+	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " rm -f $(DESTDIR)$(defaultsdir)/$$f"; \
+	  rm -f $(DESTDIR)$(defaultsdir)/$$f; \
 	done
 tags: TAGS
 TAGS:
 
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = defaults
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-defaultsDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(defaultsdir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-defaultsDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(defaultsdir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic distclean-local
 
-distclean-am:  distclean-generic clean-am distclean-local
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+info: info-am
+
+info-am:
+
+install-data-am: install-defaultsDATA
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: uninstall-defaultsDATA install-defaultsDATA tags distdir info-am \
-info dvi-am dvi check check-am installcheck-am installcheck \
-install-exec-am install-exec install-data-am install-data install-am \
-install uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic
+
+uninstall-am: uninstall-defaultsDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic distclean \
+	distclean-generic distclean-local distdir dvi dvi-am info \
+	info-am install install-am install-data install-data-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 \
+	uninstall uninstall-am uninstall-defaultsDATA uninstall-info-am
 
 
 distclean-local:
 	rm -f defaults
 defaults :
 	@sed -e "s%_pkgdatadir_%$(pkgdatadir)%g" defaults.in > defaults
-
 # 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/missing b/missing
index cbe2b0ef0e3aa005628a84fb179c341db985f7dc..dd583709f535918128e0f8d3b6a4fddf64c87cec 100755
--- a/missing
+++ b/missing
@@ -1,7 +1,7 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
-# Copyright (C) 1996, 1997 Free Software Foundation, Inc.
-# Franc,ois Pinard <pinard@iro.umontreal.ca>, 1996.
+# Copyright 1996, 1997, 1999, 2000 Free Software Foundation, Inc.
+# Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # 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
@@ -18,11 +18,37 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 # 02111-1307, USA.
 
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program that contains a
+# configuration script generated by Autoconf, you may include it under
+# the same distribution terms that you use for the rest of that program.
+
 if test $# -eq 0; then
   echo 1>&2 "Try \`$0 --help' for more information"
   exit 1
 fi
 
+run=:
+
+# In the cases where this matters, `missing' is being run in the
+# srcdir already.
+if test -f configure.ac; then
+  configure_ac=configure.ac
+else
+  configure_ac=configure.in
+fi
+
+case "$1" in
+--run)
+  # Try to run requested program, and just exit if it succeeds.
+  run=
+  shift
+  "$@" && exit 0
+  ;;
+esac
+
+# If it does not exist, or fails to run (possibly an outdated version),
+# try to emulate it.
 case "$1" in
 
   -h|--h|--he|--hel|--help)
@@ -35,6 +61,7 @@ error status if there is no known handling for PROGRAM.
 Options:
   -h, --help      display this help and exit
   -v, --version   output version information and exit
+  --run           try to run the given command, and emulate it if it fails
 
 Supported PROGRAM values:
   aclocal      touch file \`aclocal.m4'
@@ -43,13 +70,15 @@ Supported PROGRAM values:
   automake     touch all \`Makefile.in' files
   bison        create \`y.tab.[ch]', if possible, from existing .[ch]
   flex         create \`lex.yy.c', if possible, from existing .c
+  help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
+  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]"
     ;;
 
   -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
-    echo "missing - GNU libit 0.0"
+    echo "missing 0.4 - GNU automake"
     ;;
 
   -*)
@@ -58,50 +87,100 @@ Supported PROGRAM values:
     exit 1
     ;;
 
-  aclocal)
+  aclocal*)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acinclude.m4' or \`configure.in'.  You might want
+         you modified \`acinclude.m4' or \`${configure_ac}'.  You might want
          to install the \`Automake' and \`Perl' packages.  Grab them from
          any GNU archive site."
     touch aclocal.m4
     ;;
 
   autoconf)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`configure.in'.  You might want to install the
+         you modified \`${configure_ac}'.  You might want to install the
          \`Autoconf' and \`GNU m4' packages.  Grab them from any GNU
          archive site."
     touch configure
     ;;
 
   autoheader)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`acconfig.h' or \`configure.in'.  You might want
+         you modified \`acconfig.h' or \`${configure_ac}'.  You might want
          to install the \`Autoconf' and \`GNU m4' packages.  Grab them
          from any GNU archive site."
-    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER([^):]*:\([^)]*\)).*/\1/p' configure.in`
-    if test -z "$files"; then
-      files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^):]*\)).*/\1/p' configure.in`
-      test -z "$files" || files="$files.in"
-    else
-      files=`echo "$files" | sed -e 's/:/ /g'`
-    fi
-    test -z "$files" && files="config.h.in"
-    touch $files
+    files=`sed -n 's/^[ ]*A[CM]_CONFIG_HEADER(\([^)]*\)).*/\1/p' ${configure_ac}`
+    test -z "$files" && files="config.h"
+    touch_files=
+    for f in $files; do
+      case "$f" in
+      *:*) touch_files="$touch_files "`echo "$f" |
+				       sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+      *) touch_files="$touch_files $f.in";;
+      esac
+    done
+    touch $touch_files
     ;;
 
-  automake)
+  automake*)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
-         you modified \`Makefile.am', \`acinclude.m4' or \`configure.in'.
+         you modified \`Makefile.am', \`acinclude.m4' or \`${configure_ac}'.
          You might want to install the \`Automake' and \`Perl' packages.
          Grab them from any GNU archive site."
-    find . -type f -name Makefile.am -print \
-      | sed 's/^\(.*\).am$/touch \1.in/' \
-      | sh
+    find . -type f -name Makefile.am -print |
+	   sed 's/\.am$/.in/' |
+	   while read f; do touch "$f"; done
+    ;;
+
+  autom4te)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is needed, and you do not seem to have it handy on your
+         system.  You might have modified some files without having the
+         proper tools for further handling them.
+         You can get \`$1Help2man' as part of \`Autoconf' from any GNU
+         archive site."
+
+    file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+    test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
+    if test -f "$file"; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo "#! /bin/sh"
+	echo "# Created by GNU Automake missing as a replacement of"
+	echo "#  $ $@"
+	echo "exit 0"
+	chmod +x $file
+	exit 1
+    fi
     ;;
 
   bison|yacc)
@@ -157,7 +236,37 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     fi
     ;;
 
+  help2man)
+    if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
+       # We have it, but it failed.
+       exit 1
+    fi
+
+    echo 1>&2 "\
+WARNING: \`$1' is missing on your system.  You should only need it if
+	 you modified a dependency of a manual page.  You may need the
+	 \`Help2man' package in order for those modifications to take
+	 effect.  You can get \`Help2man' from any GNU archive site."
+
+    file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+    if test -z "$file"; then
+	file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+    fi
+    if [ -f "$file" ]; then
+	touch $file
+    else
+	test -z "$file" || exec >$file
+	echo ".ab help2man is required to generate this page"
+	exit 1
+    fi
+    ;;
+
   makeinfo)
+    if test -z "$run" && (makeinfo --version) > /dev/null 2>&1; then
+       # We have makeinfo, but it failed.
+       exit 1
+    fi
+
     echo 1>&2 "\
 WARNING: \`$1' is missing on your system.  You should only need it if
          you modified a \`.texi' or \`.texinfo' file, or any other file
@@ -173,6 +282,45 @@ WARNING: \`$1' is missing on your system.  You should only need it if
     touch $file
     ;;
 
+  tar)
+    shift
+    if test -n "$run"; then
+      echo 1>&2 "ERROR: \`tar' requires --run"
+      exit 1
+    fi
+
+    # We have already tried tar in the generic part.
+    # Look for gnutar/gtar before invocation to avoid ugly error
+    # messages.
+    if (gnutar --version > /dev/null 2>&1); then
+       gnutar ${1+"$@"} && exit 0
+    fi
+    if (gtar --version > /dev/null 2>&1); then
+       gtar ${1+"$@"} && exit 0
+    fi
+    firstarg="$1"
+    if shift; then
+	case "$firstarg" in
+	*o*)
+	    firstarg=`echo "$firstarg" | sed s/o//`
+	    tar "$firstarg" ${1+"$@"} && exit 0
+	    ;;
+	esac
+	case "$firstarg" in
+	*h*)
+	    firstarg=`echo "$firstarg" | sed s/h//`
+	    tar "$firstarg" ${1+"$@"} && exit 0
+	    ;;
+	esac
+    fi
+
+    echo 1>&2 "\
+WARNING: I can't seem to be able to run \`tar' with the given arguments.
+         You may want to install GNU tar or Free paxutils, or check the
+         command line arguments."
+    exit 1
+    ;;
+
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and you do not seem to have it handy on your
diff --git a/src/Makefile.am b/src/Makefile.am
index a83edc55276080c0ee502e5b8606bb5671720137..74f9939da8bdbbf016de451c90b8b19680a6071a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,3 @@
-CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -DG_DISABLE_DEPRECATED -DDATADIR=\"$(pkgdatadir)\"
-LIBS = @LIBS@ @X_LIBS@  @BASE_DEPENDENCIES_LIBS@
-
 bin_PROGRAMS = xfwm4
 xfwm4_SOURCES = \
 	client.c \
@@ -32,3 +29,6 @@ xfwm4_SOURCES = \
 	pixmap.h \
 	settings.h \
 	workspaces.h
+
+xfwm4_CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -DG_DISABLE_DEPRECATED -DDATADIR=\"$(pkgdatadir)\"
+xfwm4_LDADD = @LIBS@ @X_LIBS@  @BASE_DEPENDENCIES_LIBS@
diff --git a/src/Makefile.in b/src/Makefile.in
index c95687df3c9e8798c608d334c571c531458145c2..9fa041389e76ce3cdc091b3b4b9a89a8aa1a085f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -45,235 +43,521 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+DEPDIR = @DEPDIR@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
 PACKAGE = @PACKAGE@
 PKG_CONFIG = @PKG_CONFIG@
+STRIP = @STRIP@
 VERSION = @VERSION@
-
-CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -DG_DISABLE_DEPRECATED -DDATADIR=\"$(pkgdatadir)\"
-LIBS = @LIBS@ @X_LIBS@  @BASE_DEPENDENCIES_LIBS@
-
+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@
 bin_PROGRAMS = xfwm4
-xfwm4_SOURCES =  	client.c 	events.c 	frame.c 	gtk_style.c 	gtktoxevent.c 	hints.c 	keyboard.c 	main.c 	menu.c 	misc.c 	parserc.c 	pixmap.c 	settings.c 	workspaces.c 	client.h 	debug.h 	events.h 	frame.h 	gtk_style.h 	gtktoxevent.h 	hints.h 	keyboard.h 	main.h 	menu.h 	misc.h 	parserc.h 	pixmap.h 	settings.h 	workspaces.h
-
+xfwm4_SOURCES = \
+	client.c \
+	events.c \
+	frame.c \
+	gtk_style.c \
+	gtktoxevent.c \
+	hints.c \
+	keyboard.c \
+	main.c \
+	menu.c \
+	misc.c \
+	parserc.c \
+	pixmap.c \
+	settings.c \
+	workspaces.c \
+	client.h \
+	debug.h \
+	events.h \
+	frame.h \
+	gtk_style.h \
+	gtktoxevent.h \
+	hints.h \
+	keyboard.h \
+	main.h \
+	menu.h \
+	misc.h \
+	parserc.h \
+	pixmap.h \
+	settings.h \
+	workspaces.h
+
+
+xfwm4_CFLAGS = @CFLAGS@ @X_CFLAGS@ @BASE_DEPENDENCIES_CFLAGS@ -DG_DISABLE_DEPRECATED -DDATADIR=\"$(pkgdatadir)\"
+xfwm4_LDADD = @LIBS@ @X_LIBS@  @BASE_DEPENDENCIES_LIBS@
+subdir = src
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-PROGRAMS =  $(bin_PROGRAMS)
-
-
-DEFS = @DEFS@ -I. -I$(srcdir) -I..
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+bin_PROGRAMS = xfwm4$(EXEEXT)
+PROGRAMS = $(bin_PROGRAMS)
+
+am_xfwm4_OBJECTS = xfwm4-client.$(OBJEXT) xfwm4-events.$(OBJEXT) \
+	xfwm4-frame.$(OBJEXT) xfwm4-gtk_style.$(OBJEXT) \
+	xfwm4-gtktoxevent.$(OBJEXT) xfwm4-hints.$(OBJEXT) \
+	xfwm4-keyboard.$(OBJEXT) xfwm4-main.$(OBJEXT) \
+	xfwm4-menu.$(OBJEXT) xfwm4-misc.$(OBJEXT) \
+	xfwm4-parserc.$(OBJEXT) xfwm4-pixmap.$(OBJEXT) \
+	xfwm4-settings.$(OBJEXT) xfwm4-workspaces.$(OBJEXT)
+xfwm4_OBJECTS = $(am_xfwm4_OBJECTS)
+xfwm4_DEPENDENCIES =
+xfwm4_LDFLAGS =
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
 CPPFLAGS = @CPPFLAGS@
 LDFLAGS = @LDFLAGS@
-X_CFLAGS = @X_CFLAGS@
-X_LIBS = @X_LIBS@
-X_EXTRA_LIBS = @X_EXTRA_LIBS@
-X_PRE_LIBS = @X_PRE_LIBS@
-xfwm4_OBJECTS =  client.o events.o frame.o gtk_style.o gtktoxevent.o \
-hints.o keyboard.o main.o menu.o misc.o parserc.o pixmap.o settings.o \
-workspaces.o
-xfwm4_LDADD = $(LDADD)
-xfwm4_DEPENDENCIES = 
-xfwm4_LDFLAGS = 
-COMPILE = $(CC) $(DEFS) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/xfwm4-client.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xfwm4-events.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xfwm4-frame.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xfwm4-gtk_style.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xfwm4-gtktoxevent.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xfwm4-hints.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xfwm4-keyboard.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xfwm4-main.Po ./$(DEPDIR)/xfwm4-menu.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xfwm4-misc.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xfwm4-parserc.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xfwm4-pixmap.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xfwm4-settings.Po \
+@AMDEP_TRUE@	./$(DEPDIR)/xfwm4-workspaces.Po
+COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
 CCLD = $(CC)
-LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(LDFLAGS) -o $@
-DIST_COMMON =  Makefile.am Makefile.in
-
-
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
+LINK = $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@
+CFLAGS = @CFLAGS@
+DIST_SOURCES = $(xfwm4_SOURCES)
+DIST_COMMON = Makefile.am Makefile.in
 SOURCES = $(xfwm4_SOURCES)
-OBJECTS = $(xfwm4_OBJECTS)
-
-all: all-redirect
-.SUFFIXES:
-.SUFFIXES: .S .c .o .s
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps src/Makefile
 
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
-mostlyclean-binPROGRAMS:
-
-clean-binPROGRAMS:
-	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
-
-distclean-binPROGRAMS:
-
-maintainer-clean-binPROGRAMS:
+all: all-am
 
+.SUFFIXES:
+.SUFFIXES: .c .o .obj
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  src/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+binPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
 	$(mkinstalldirs) $(DESTDIR)$(bindir)
 	@list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  if test -f $$p; then \
-	    echo "  $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`"; \
-	     $(INSTALL_PROGRAM) $$p $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	  p1=`echo $$p|sed 's/$(EXEEXT)$$//'`; \
+	  if test -f $$p \
+	  ; then \
+	    p1=`echo "$$p1" | sed -e 's,^.*/,,'`; \
+	    f=`echo $$p1|sed '$(transform);s/$$/$(EXEEXT)/'`; \
+	   echo " $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f"; \
+	   $(INSTALL_PROGRAM_ENV) $(binPROGRAMS_INSTALL) $$p $(DESTDIR)$(bindir)/$$f; \
 	  else :; fi; \
 	done
 
 uninstall-binPROGRAMS:
 	@$(NORMAL_UNINSTALL)
-	list='$(bin_PROGRAMS)'; for p in $$list; do \
-	  rm -f $(DESTDIR)$(bindir)/`echo $$p|sed 's/$(EXEEXT)$$//'|sed '$(transform)'|sed 's/$$/$(EXEEXT)/'`; \
+	@list='$(bin_PROGRAMS)'; for p in $$list; do \
+	  f=`echo $$p|sed 's/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
+	  f=`echo "$$f" | sed -e 's,^.*/,,'`; \
+	  echo " rm -f $(DESTDIR)$(bindir)/$$f"; \
+	  rm -f $(DESTDIR)$(bindir)/$$f; \
 	done
 
-.c.o:
-	$(COMPILE) -c $<
-
-.s.o:
-	$(COMPILE) -c $<
-
-.S.o:
-	$(COMPILE) -c $<
+clean-binPROGRAMS:
+	-test -z "$(bin_PROGRAMS)" || rm -f $(bin_PROGRAMS)
+xfwm4-client.$(OBJEXT): client.c
+xfwm4-events.$(OBJEXT): events.c
+xfwm4-frame.$(OBJEXT): frame.c
+xfwm4-gtk_style.$(OBJEXT): gtk_style.c
+xfwm4-gtktoxevent.$(OBJEXT): gtktoxevent.c
+xfwm4-hints.$(OBJEXT): hints.c
+xfwm4-keyboard.$(OBJEXT): keyboard.c
+xfwm4-main.$(OBJEXT): main.c
+xfwm4-menu.$(OBJEXT): menu.c
+xfwm4-misc.$(OBJEXT): misc.c
+xfwm4-parserc.$(OBJEXT): parserc.c
+xfwm4-pixmap.$(OBJEXT): pixmap.c
+xfwm4-settings.$(OBJEXT): settings.c
+xfwm4-workspaces.$(OBJEXT): workspaces.c
+xfwm4$(EXEEXT): $(xfwm4_OBJECTS) $(xfwm4_DEPENDENCIES) 
+	@rm -f xfwm4$(EXEEXT)
+	$(LINK) $(xfwm4_LDFLAGS) $(xfwm4_OBJECTS) $(xfwm4_LDADD) $(LIBS)
 
 mostlyclean-compile:
-	-rm -f *.o core *.core
-
-clean-compile:
+	-rm -f *.$(OBJEXT) core *.core
 
 distclean-compile:
 	-rm -f *.tab.c
 
-maintainer-clean-compile:
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-client.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-events.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-frame.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-gtk_style.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-gtktoxevent.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-hints.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-keyboard.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-main.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-menu.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-misc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-parserc.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-pixmap.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-settings.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/xfwm4-workspaces.Po@am__quote@
+
+distclean-depend:
+	-rm -rf ./$(DEPDIR)
 
-xfwm4: $(xfwm4_OBJECTS) $(xfwm4_DEPENDENCIES)
-	@rm -f xfwm4
-	$(LINK) $(xfwm4_LDFLAGS) $(xfwm4_OBJECTS) $(xfwm4_LDADD) $(LIBS)
+.c.o:
+@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:
+@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
+@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
+@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
+@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
+@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
+@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
+@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-gtk_style.o: gtk_style.c
+@AMDEP_TRUE@	source='gtk_style.c' object='xfwm4-gtk_style.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-gtk_style.Po' tmpdepfile='$(DEPDIR)/xfwm4-gtk_style.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-gtk_style.o `test -f 'gtk_style.c' || echo '$(srcdir)/'`gtk_style.c
+
+xfwm4-gtk_style.obj: gtk_style.c
+@AMDEP_TRUE@	source='gtk_style.c' object='xfwm4-gtk_style.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-gtk_style.Po' tmpdepfile='$(DEPDIR)/xfwm4-gtk_style.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-gtk_style.obj `cygpath -w gtk_style.c`
+
+xfwm4-gtktoxevent.o: gtktoxevent.c
+@AMDEP_TRUE@	source='gtktoxevent.c' object='xfwm4-gtktoxevent.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-gtktoxevent.Po' tmpdepfile='$(DEPDIR)/xfwm4-gtktoxevent.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-gtktoxevent.o `test -f 'gtktoxevent.c' || echo '$(srcdir)/'`gtktoxevent.c
+
+xfwm4-gtktoxevent.obj: gtktoxevent.c
+@AMDEP_TRUE@	source='gtktoxevent.c' object='xfwm4-gtktoxevent.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/xfwm4-gtktoxevent.Po' tmpdepfile='$(DEPDIR)/xfwm4-gtktoxevent.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(xfwm4_CFLAGS) $(CFLAGS) -c -o xfwm4-gtktoxevent.obj `cygpath -w gtktoxevent.c`
+
+xfwm4-hints.o: 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
+@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
+@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
+@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
+@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
+@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
+@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
+@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
+@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
+@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
+@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
+@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
+@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
+@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
+@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
+@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
+@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
+@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 =
 
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	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; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique
 
-TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	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 "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 
-mostlyclean-tags:
-
-clean-tags:
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
-
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-subdir = src
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am: install-binPROGRAMS
-install-exec: install-exec-am
+all-am: Makefile $(PROGRAMS)
 
-install-data-am:
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(bindir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-binPROGRAMS
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(PROGRAMS)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(bindir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-binPROGRAMS mostlyclean-compile \
-		mostlyclean-tags mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-binPROGRAMS clean-generic mostlyclean-am
 
-clean-am:  clean-binPROGRAMS clean-compile clean-tags clean-generic \
-		mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-tags
+
+dvi: dvi-am
 
-distclean-am:  distclean-binPROGRAMS distclean-compile distclean-tags \
-		distclean-generic clean-am
+dvi-am:
 
-distclean: distclean-am
+info: info-am
 
-maintainer-clean-am:  maintainer-clean-binPROGRAMS \
-		maintainer-clean-compile maintainer-clean-tags \
-		maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+info-am:
+
+install-data-am:
+
+install-exec-am: install-binPROGRAMS
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
 
 maintainer-clean: maintainer-clean-am
 
-.PHONY: mostlyclean-binPROGRAMS distclean-binPROGRAMS clean-binPROGRAMS \
-maintainer-clean-binPROGRAMS uninstall-binPROGRAMS install-binPROGRAMS \
-mostlyclean-compile distclean-compile clean-compile \
-maintainer-clean-compile tags mostlyclean-tags distclean-tags \
-clean-tags maintainer-clean-tags distdir info-am info dvi-am dvi check \
-check-am installcheck-am installcheck install-exec-am install-exec \
-install-data-am install-data install-am install uninstall-am uninstall \
-all-redirect all-am all installdirs mostlyclean-generic \
-distclean-generic clean-generic maintainer-clean-generic clean \
-mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic
+
+uninstall-am: uninstall-binPROGRAMS uninstall-info-am
 
+.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 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 0a0db6e5d9fcb13002cacc46e376b4fb9a9d1ed8..aaf633913ea1d06cfad7311a29774adc9a3bf075 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -4,6 +4,7 @@ coldsteel \
 crux \
 cruxish \
 eazel-blue \
+gorilla \
 gtk \
 kde \
 kindaker \
diff --git a/themes/Makefile.in b/themes/Makefile.in
index c68be3473412423f2615dd8e004e42b8a2d7c2c6..0d83fb18ff7dcc66357f90b8d3f13075acc8b35d 100644
--- a/themes/Makefile.in
+++ b/themes/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ..
 
 ACLOCAL = @ACLOCAL@
@@ -45,45 +43,84 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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@
+SUBDIRS = \
+agua \
+coldsteel \
+crux \
+cruxish \
+eazel-blue \
+gorilla \
+gtk \
+kde \
+kindaker \
+linea \
+mofit \
+next \
+oroborus \
+platinum \
+redmond \
+redmondxp \
+slick \
+slimline \
+trench \
+xfce
 
-SUBDIRS =  agua coldsteel crux cruxish eazel-blue gtk kde kindaker linea mofit next oroborus platinum redmond redmondxp slick slimline trench xfce
-
+subdir = themes
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../config.h
-CONFIG_CLEAN_FILES = 
-DIST_COMMON =  Makefile.am Makefile.in
-
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+
+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
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/Makefile
+Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+uninstall-info-am:
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -91,13 +128,8 @@ Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
 # (1) if the variable is set in `config.status', edit `config.status'
 #     (which will cause the Makefiles to be regenerated when you run `make');
 # (2) otherwise, pass the desired values on the `make' command line.
-
-@SET_MAKE@
-
-all-recursive install-data-recursive install-exec-recursive \
-installdirs-recursive install-recursive uninstall-recursive  \
-check-recursive installcheck-recursive info-recursive dvi-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
+$(RECURSIVE_TARGETS):
+	@set fnord $$MAKEFLAGS; amf=$$2; \
 	dot_seen=no; \
 	target=`echo $@ | sed s/-recursive//`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
@@ -117,13 +149,18 @@ check-recursive installcheck-recursive info-recursive dvi-recursive:
 
 mostlyclean-recursive clean-recursive distclean-recursive \
 maintainer-clean-recursive:
-	@set fnord $(MAKEFLAGS); amf=$$2; \
+	@set fnord $$MAKEFLAGS; amf=$$2; \
 	dot_seen=no; \
-	rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \
-	  rev="$$subdir $$rev"; \
-	  test "$$subdir" != "." || dot_seen=yes; \
+	case "$@" in \
+	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+	  *) list='$(SUBDIRS)' ;; \
+	esac; \
+	rev=''; for subdir in $$list; do \
+	  if test "$$subdir" = "."; then :; else \
+	    rev="$$subdir $$rev"; \
+	  fi; \
 	done; \
-	test "$$dot_seen" = "no" && rev=". $$rev"; \
+	rev="$$rev ."; \
 	target=`echo $@ | sed s/-recursive//`; \
 	for subdir in $$rev; do \
 	  echo "Making $$target in $$subdir"; \
@@ -140,133 +177,167 @@ tags-recursive:
 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
 	done
 
+ETAGS = etags
+ETAGSFLAGS =
+
 tags: TAGS
 
-ID: $(HEADERS) $(SOURCES) $(LISP)
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	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; }'`; \
-	here=`pwd` && cd $(srcdir) \
-	  && mkid -f$$here/ID $$unique $(LISP)
+	mkid -fID $$unique
 
-TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) $(LISP)
+TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
 	tags=; \
 	here=`pwd`; \
 	list='$(SUBDIRS)'; for subdir in $$list; do \
-   if test "$$subdir" = .; then :; else \
+	  if test "$$subdir" = .; then :; else \
 	    test -f $$subdir/TAGS && tags="$$tags -i $$here/$$subdir/TAGS"; \
-   fi; \
+	  fi; \
 	done; \
-	list='$(SOURCES) $(HEADERS)'; \
-	unique=`for i in $$list; do echo $$i; done | \
-	  awk '    { files[$$0] = 1; } \
+	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 "$(ETAGS_ARGS)$$unique$(LISP)$$tags" \
-	  || (cd $(srcdir) && etags $(ETAGS_ARGS) $$tags  $$unique $(LISP) -o $$here/TAGS)
-
-mostlyclean-tags:
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
 
-clean-tags:
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
 
 distclean-tags:
-	-rm -f TAGS ID
-
-maintainer-clean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes
+top_distdir = ..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-	for subdir in $(SUBDIRS); do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d $(distdir)/$$subdir \
 	    || mkdir $(distdir)/$$subdir \
 	    || exit 1; \
-	    chmod 777 $(distdir)/$$subdir; \
-	    (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) top_distdir=../$(top_distdir) distdir=../$(distdir)/$$subdir distdir) \
+	    (cd $$subdir && \
+	      $(MAKE) $(AM_MAKEFLAGS) \
+	        top_distdir="$(top_distdir)" \
+	        distdir=../$(distdir)/$$subdir \
+	        distdir) \
 	      || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-recursive
-dvi-am:
-dvi: dvi-recursive
 check-am: all-am
 check: check-recursive
-installcheck-am:
-installcheck: installcheck-recursive
-install-exec-am:
-install-exec: install-exec-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
 
-install-data-am:
+install: install-recursive
+install-exec: install-exec-recursive
 install-data: install-data-recursive
+uninstall: uninstall-recursive
 
 install-am: all-am
 	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-install: install-recursive
-uninstall-am:
-uninstall: uninstall-recursive
-all-am: Makefile
-all-redirect: all-recursive
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs: installdirs-recursive
-installdirs-am:
-
 
+installcheck: installcheck-recursive
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-tags mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-recursive
 
-mostlyclean: mostlyclean-recursive
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-tags clean-generic mostlyclean-am
+distclean: distclean-recursive
 
-clean: clean-recursive
+distclean-am: clean-am distclean-generic distclean-tags
 
-distclean-am:  distclean-tags distclean-generic clean-am
+dvi: dvi-recursive
 
-distclean: distclean-recursive
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-tags maintainer-clean-generic \
-		distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
 
 maintainer-clean: maintainer-clean-recursive
 
-.PHONY: install-data-recursive uninstall-data-recursive \
-install-exec-recursive uninstall-exec-recursive installdirs-recursive \
-uninstalldirs-recursive all-recursive check-recursive \
-installcheck-recursive info-recursive dvi-recursive \
-mostlyclean-recursive distclean-recursive clean-recursive \
-maintainer-clean-recursive tags tags-recursive mostlyclean-tags \
-distclean-tags clean-tags maintainer-clean-tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs-am \
-installdirs mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
 
+mostlyclean-am: mostlyclean-generic
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-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 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/agua/Makefile.in b/themes/agua/Makefile.in
index 7f7551a60eebf34924129cda346d56a7a7a1a745..77af7c3e06108f17fb5001aaad753045359c6311 100644
--- a/themes/agua/Makefile.in
+++ b/themes/agua/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/agua
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/agua
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/agua/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/agua/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/agua
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/coldsteel/Makefile.in b/themes/coldsteel/Makefile.in
index 4dbf1f4caefa1f66b2d3ef25c92a02f999e1b166..e9e676e77c7386eb8a3de25e195cee3dd337746f 100644
--- a/themes/coldsteel/Makefile.in
+++ b/themes/coldsteel/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/coldsteel
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/coldsteel
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/coldsteel/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/coldsteel/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/coldsteel
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/crux/Makefile.in b/themes/crux/Makefile.in
index 219afc0a2601ca841bb4072cd997cd6f91c9cae9..92d844f353d781c3b760b4857ca2a1416d83f398 100644
--- a/themes/crux/Makefile.in
+++ b/themes/crux/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/crux
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/crux
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/crux/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/crux/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/crux
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/cruxish/Makefile.in b/themes/cruxish/Makefile.in
index e6e7c302dae2681b99ecae90dbe69619aba1bfa1..e30e316dc337ddf3a886b0cfb44213294e46a14f 100644
--- a/themes/cruxish/Makefile.in
+++ b/themes/cruxish/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/cruxish
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/cruxish
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/cruxish/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/cruxish/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/cruxish
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/eazel-blue/Makefile.in b/themes/eazel-blue/Makefile.in
index 65ff0b6438011c4396a61fbf509e4d10e5bd2876..c9d1e4c761ea81ba27718e96e2325edc556a29b5 100644
--- a/themes/eazel-blue/Makefile.in
+++ b/themes/eazel-blue/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/eazel-blue
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/eazel-blue
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/eazel-blue/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/eazel-blue/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/eazel-blue
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/gorilla/Makefile.am b/themes/gorilla/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..e3a1de7c07f2023dd01dad95094bd89e5f21c56b
--- /dev/null
+++ b/themes/gorilla/Makefile.am
@@ -0,0 +1,46 @@
+themedir = $(pkgdatadir)/themes/gorilla
+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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
+EXTRA_DIST = $(theme_DATA)
diff --git a/themes/gorilla/Makefile.in b/themes/gorilla/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..18383df391edad19fba3597f5b8b5d50cf54382a
--- /dev/null
+++ b/themes/gorilla/Makefile.in
@@ -0,0 +1,270 @@
+# Makefile.in generated by automake 1.6.1 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_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/gorilla
+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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
+
+EXTRA_DIST = $(theme_DATA)
+subdir = themes/gorilla
+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/gorilla/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)
+	@for file in $(DISTFILES); 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) stamp-h stamp-h[0-9]*
+
+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/gorilla/README b/themes/gorilla/README
new file mode 100644
index 0000000000000000000000000000000000000000..c1592231ae1d8eef410f469cb369286cac229d32
--- /dev/null
+++ b/themes/gorilla/README
@@ -0,0 +1,9 @@
+Gorilla
+-------
+
+A port of the popular theme for Sawfish and Metacity.
+
+Credits go the original author of Gorilla, Jacub Steiner.
+(c) Ximian Inc 2001
+
+Buttons are from Mozilla theme "Orbit" by Chris Neal, Kent Thuresson.
diff --git a/themes/gorilla/bottom-active.xpm b/themes/gorilla/bottom-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..63b8ffccd28276e2e01cf47cb2559fded8e2eff1
--- /dev/null
+++ b/themes/gorilla/bottom-active.xpm
@@ -0,0 +1,11 @@
+/* XPM */
+static char * bottom_active_xpm[] = {
+"128 5 3 1",
+" 	c None",
+".	c #D3D3D3",
+"+	c #000000",
+"................................................................................................................................",
+"................................................................................................................................",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++"};
diff --git a/themes/gorilla/bottom-inactive.xpm b/themes/gorilla/bottom-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..44c07995aa8e60510a0ae46a3e25731155e57018
--- /dev/null
+++ b/themes/gorilla/bottom-inactive.xpm
@@ -0,0 +1,12 @@
+/* XPM */
+static char * bottom_inactive_xpm[] = {
+"128 5 4 1",
+" 	c None",
+".	c #D3D3D3",
+"+	c #000000",
+"@	c #D7D7CF",
+"................................................................................................................................",
+"................................................................................................................................",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/gorilla/bottom-left-active.xpm b/themes/gorilla/bottom-left-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..23a82e7199f5f8a129390c46e3da6588936aff8e
--- /dev/null
+++ b/themes/gorilla/bottom-left-active.xpm
@@ -0,0 +1,37 @@
+/* XPM */
+static char * bottom_left_active_xpm[] = {
+"30 30 4 1",
+" 	c None",
+".	c #000000",
+"+	c #A9A9A9",
+"@	c #D3D3D3",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@                        ",
+"...+@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"...+@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"..............................",
+"..............................",
+".............................."};
diff --git a/themes/gorilla/bottom-left-inactive.xpm b/themes/gorilla/bottom-left-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..16546acc5ab6ab7d7ef5a24bdb8ae8ed5a7fc5ee
--- /dev/null
+++ b/themes/gorilla/bottom-left-inactive.xpm
@@ -0,0 +1,38 @@
+/* XPM */
+static char * bottom_left_inactive_xpm[] = {
+"30 30 5 1",
+" 	c None",
+".	c #D7D7CF",
+"+	c #000000",
+"@	c #A9A9A9",
+"#	c #D3D3D3",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##                        ",
+".++@##########################",
+".++@##########################",
+".+++++++++++++++++++++++++++++",
+".+++++++++++++++++++++++++++++",
+".............................."};
diff --git a/themes/gorilla/bottom-right-active.xpm b/themes/gorilla/bottom-right-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..abd155d2ce4e030431fd00c9571a239c2d747502
--- /dev/null
+++ b/themes/gorilla/bottom-right-active.xpm
@@ -0,0 +1,36 @@
+/* XPM */
+static char * bottom_right_active_xpm[] = {
+"30 30 3 1",
+" 	c None",
+".	c #D3D3D3",
+"+	c #000000",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"                        ..++++",
+"..........................++++",
+"..........................++++",
+"++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++"};
diff --git a/themes/gorilla/bottom-right-inactive.xpm b/themes/gorilla/bottom-right-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..b1779313c0364490b8b9152a29cffde8a4b68f59
--- /dev/null
+++ b/themes/gorilla/bottom-right-inactive.xpm
@@ -0,0 +1,37 @@
+/* XPM */
+static char * bottom_right_inactive_xpm[] = {
+"30 30 4 1",
+" 	c None",
+".	c #D3D3D3",
+"+	c #000000",
+"@	c #D7D7CF",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"                        ..+++@",
+"..........................+++@",
+"..........................+++@",
+"+++++++++++++++++++++++++++++@",
+"+++++++++++++++++++++++++++++@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/gorilla/close-active.xpm b/themes/gorilla/close-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..ab7fb329575611c133d885f454dd6a03c8922754
--- /dev/null
+++ b/themes/gorilla/close-active.xpm
@@ -0,0 +1,305 @@
+/* XPM */
+static char * close_active_xpm[] = {
+"20 26 276 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #A9A9A9",
+"@ 	c #D3D3D3",
+"# 	c #0D0D0D",
+"$ 	c #343434",
+"% 	c #5F5F5F",
+"& 	c #858585",
+"* 	c #929292",
+"= 	c #8D8D8D",
+"- 	c #777777",
+"; 	c #565656",
+"> 	c #323232",
+", 	c #161616",
+"' 	c #050505",
+") 	c #494D59",
+"! 	c #4A4E5A",
+"~ 	c #696C76",
+"{ 	c #9B9DA4",
+"] 	c #C3C4C8",
+"^ 	c #C4C5C6",
+"/ 	c #AAAAAB",
+"( 	c #919292",
+"_ 	c #878888",
+": 	c #8A8B8C",
+"< 	c #929397",
+"[ 	c #8C8F95",
+"} 	c #787B83",
+"| 	c #61656F",
+"1 	c #505460",
+"2 	c #515961",
+"3 	c #545C64",
+"4 	c #7B8187",
+"5 	c #B6B9BD",
+"6 	c #CACBCC",
+"7 	c #90908E",
+"8 	c #4D4D47",
+"9 	c #39382F",
+"0 	c #3D3D31",
+"a 	c #3E3D2F",
+"b 	c #37362A",
+"c 	c #2F302B",
+"d 	c #484A4B",
+"e 	c #737679",
+"f 	c #70767C",
+"g 	c #636A71",
+"h 	c #575E66",
+"i 	c #70737C",
+"j 	c #B4B5BA",
+"k 	c #B9B9BA",
+"l 	c #5A5A56",
+"m 	c #39392D",
+"n 	c #817F6D",
+"o 	c #C3C0A7",
+"p 	c #E9E0BA",
+"q 	c #F0E3AD",
+"r 	c #DCCD88",
+"s 	c #AC9D59",
+"t 	c #59522D",
+"u 	c #1D1E1B",
+"v 	c #47494B",
+"w 	c #555962",
+"x 	c #4E525E",
+"y 	c #4B4F5A",
+"z 	c #656C73",
+"A 	c #A5A9AD",
+"B 	c #B9BABA",
+"C 	c #4F504B",
+"D 	c #4F4E3F",
+"E 	c #D2D0B7",
+"F 	c #FFFFEB",
+"G 	c #FFFFE6",
+"H 	c #FFF9D2",
+"I 	c #FFF4B7",
+"J 	c #FFEF96",
+"K 	c #FFED72",
+"L 	c #FADA4D",
+"M 	c #9B872B",
+"N 	c #202016",
+"O 	c #2E3232",
+"P 	c #515960",
+"Q 	c #7F828A",
+"R 	c #B3B4B8",
+"S 	c #646462",
+"T 	c #434333",
+"U 	c #E3DDBB",
+"V 	c #FFFFE5",
+"W 	c #FFF9DE",
+"X 	c #FFF8DA",
+"Y 	c #FFF5C9",
+"Z 	c #FFEFAC",
+"` 	c #FFE783",
+" .	c #FFDE58",
+"..	c #FFD931",
+"+.	c #FFD910",
+"@.	c #9E8317",
+"#.	c #171918",
+"$.	c #33363B",
+"%.	c #484C58",
+"&.	c #5E666D",
+"*.	c #9A9EA3",
+"=.	c #959798",
+"-.	c #2D2D25",
+";.	c #B4AB82",
+">.	c #FFFFD0",
+",.	c #FFF5CF",
+"'.	c #FFF7D4",
+").	c #FFF2BF",
+"!.	c #FFEC9D",
+"~.	c #FFE36D",
+"{.	c #FFD011",
+"].	c #FFCB00",
+"^.	c #FCC203",
+"/.	c #5E501E",
+"(.	c #1D2124",
+"_.	c #484F55",
+":.	c #646872",
+"<.	c #989AA1",
+"[.	c #636363",
+"}.	c #4A4731",
+"|.	c #F9E8A1",
+"1.	c #FFF2B3",
+"2.	c #FFF1BA",
+"3.	c #FFE787",
+"4.	c #FFBF00",
+"5.	c #FFC000",
+"6.	c #B38513",
+"7.	c #191C1B",
+"8.	c #34373E",
+"9.	c #71777E",
+"0.	c #909598",
+"a.	c #3D3E3E",
+"b.	c #7E7444",
+"c.	c #FFEE8A",
+"d.	c #FFE98F",
+"e.	c #FFEA96",
+"f.	c #FFEB9B",
+"g.	c #FFBB00",
+"h.	c #FFB300",
+"i.	c #FFB000",
+"j.	c #E1990A",
+"k.	c #2F2C1E",
+"l.	c #2A2F32",
+"m.	c #4D555D",
+"n.	c #686B75",
+"o.	c #7D7F86",
+"p.	c #292B2D",
+"q.	c #96863F",
+"r.	c #FFEA62",
+"s.	c #FFDF60",
+"t.	c #FFE061",
+"u.	c #FFDF5F",
+"v.	c #FFDE54",
+"w.	c #FFB400",
+"x.	c #FFAC00",
+"y.	c #FFA500",
+"z.	c #FFA200",
+"A.	c #F39905",
+"B.	c #38331F",
+"C.	c #212327",
+"D.	c #444752",
+"E.	c #666D74",
+"F.	c #73797E",
+"G.	c #24282A",
+"H.	c #907E2D",
+"I.	c #FFE032",
+"J.	c #FFD528",
+"K.	c #FFD320",
+"L.	c #FFD017",
+"M.	c #FF9C00",
+"N.	c #FF9800",
+"O.	c #FF9700",
+"P.	c #EE8F06",
+"Q.	c #36311F",
+"R.	c #23282A",
+"S.	c #4A5259",
+"T.	c #565A65",
+"U.	c #5D606A",
+"V.	c #282B2F",
+"W.	c #685C1E",
+"X.	c #FFD108",
+"Y.	c #FFCA00",
+"Z.	c #FFC500",
+"`.	c #FF8F00",
+" +	c #FF9300",
+".+	c #D17E0E",
+"++	c #26261D",
+"@+	c #27292E",
+"#+	c #434752",
+"$+	c #535B63",
+"%+	c #34383A",
+"&+	c #2F2D1B",
+"*+	c #E5B108",
+"=+	c #FFC300",
+"-+	c #FFB800",
+";+	c #FFB200",
+">+	c #FFA000",
+",+	c #FF9600",
+"'+	c #FF9000",
+")+	c #906019",
+"!+	c #151B1B",
+"~+	c #363B3F",
+"{+	c #4B535A",
+"]+	c #020202",
+"^+	c #010100",
+"/+	c #101314",
+"(+	c #81691B",
+"_+	c #FFBC01",
+":+	c #FFA700",
+"<+	c #FF9F00",
+"[+	c #FF9500",
+"}+	c #FF9400",
+"|+	c #DF840B",
+"1+	c #373120",
+"2+	c #090B09",
+"3+	c #0A0A08",
+"4+	c #21211C",
+"5+	c #A87C17",
+"6+	c #FFAD01",
+"7+	c #FF9100",
+"8+	c #EB8B08",
+"9+	c #5C461F",
+"0+	c #0E1210",
+"a+	c #040402",
+"b+	c #BEBEBE",
+"c+	c #BBBBBB",
+"d+	c #AAAAA9",
+"e+	c #50504E",
+"f+	c #22231C",
+"g+	c #86611B",
+"h+	c #E48F09",
+"i+	c #FF9501",
+"j+	c #FC9103",
+"k+	c #C17811",
+"l+	c #4F3F20",
+"m+	c #202524",
+"n+	c #6B6B69",
+"o+	c #9A9A99",
+"p+	c #B4B4B4",
+"q+	c #BCBCBC",
+"r+	c #B6B6B6",
+"s+	c #A3A3A3",
+"t+	c #5C5D5B",
+"u+	c #1F2323",
+"v+	c #37311F",
+"w+	c #6F4F1D",
+"x+	c #936117",
+"y+	c #9A6316",
+"z+	c #865B1A",
+"A+	c #56421F",
+"B+	c #21241C",
+"C+	c #303332",
+"D+	c #70706F",
+"E+	c #969696",
+"F+	c #AFAFAF",
+"G+	c #A7A7A6",
+"H+	c #818180",
+"I+	c #4E4F4E",
+"J+	c #1E2425",
+"K+	c #1C2325",
+"L+	c #242A2B",
+"M+	c #3A3D3B",
+"N+	c #5D5D5C",
+"O+	c #848484",
+"P+	c #9C9C9C",
+"Q+	c #B2B2B2",
+"R+	c #BDBDBD",
+"S+	c #ADADAD",
+"T+	c #A0A0A0",
+"U+	c #8E8E8E",
+"V+	c #7E7E7E",
+"W+	c #797979",
+"X+	c #808080",
+"Y+	c #8F8F8F",
+"Z+	c #9B9B9B",
+"`+	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . # $ % & * = - ; > , ' . . . . ",
+") ) ) ! ~ { ] ^ / ( _ : < [ } | 1 ) ) ) ",
+"2 2 3 4 5 6 7 8 9 0 a b c d e f g h 2 2 ",
+") ) i j k l m n o p q r s t u v w x y ) ",
+"2 z A B C D E F G H I J K L M N O P 2 2 ",
+"y Q R S T U V W X Y Z `  ...+.@.#.$.%.) ",
+"&.*.=.-.;.>.,.'.. ).!.~.. {.].^./.(._.2 ",
+":.<.[.}.|.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.t.u.v.. . . w.x.y.z.A.B.C.D.",
+"E.F.G.H.I.J.K.L.. . . . . M.N.O.P.Q.R.S.",
+"T.U.V.W.X.Y.Z.. . . y.. . . `. +.+++@+#+",
+"h $+%+&+*+=+-+;+. >+,+'+. '+'+,+)+!+~+{+",
+"]+. ^+/+(+_+i.:+<+[+'+'+'+'+}+|+1+2+. . ",
+". . . 3+4+5+6+z.,+'+'+'+7+[+8+9+0+a+. . ",
+"b+b+c+d+e+f+g+h+i+,+,+[+j+k+l+m+n+o+p+b+",
+"b+b+q+r+s+t+u+v+w+x+y+z+A+B+C+D+E+F+b+b+",
+"b+b+b+c+p+G+H+I+O J+K+L+M+N+O+P+Q+R+b+b+",
+"b+b+b+b+c+r+S+T+U+V+W+X+Y+Z++ `+b+b+b+b+"};
diff --git a/themes/gorilla/close-inactive.xpm b/themes/gorilla/close-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..8aa4b390e7f15df068053868aec637b824398940
--- /dev/null
+++ b/themes/gorilla/close-inactive.xpm
@@ -0,0 +1,312 @@
+/* XPM */
+static char * close_inactive_xpm[] = {
+"20 26 283 2",
+"  	c None",
+". 	c #D7D7CF",
+"+ 	c #000000",
+"@ 	c #A9A9A9",
+"# 	c #D3D3D3",
+"$ 	c #0D0D0D",
+"% 	c #343434",
+"& 	c #5F5F5F",
+"* 	c #858585",
+"= 	c #929292",
+"- 	c #8D8D8D",
+"; 	c #777777",
+"> 	c #565656",
+", 	c #323232",
+"' 	c #161616",
+") 	c #050505",
+"! 	c #494D59",
+"~ 	c #4A4E5A",
+"{ 	c #696C76",
+"] 	c #9B9DA4",
+"^ 	c #C3C4C8",
+"/ 	c #C4C5C6",
+"( 	c #AAAAAB",
+"_ 	c #919292",
+": 	c #878888",
+"< 	c #8A8B8C",
+"[ 	c #929397",
+"} 	c #8C8F95",
+"| 	c #787B83",
+"1 	c #61656F",
+"2 	c #505460",
+"3 	c #515961",
+"4 	c #545C64",
+"5 	c #7B8187",
+"6 	c #B6B9BD",
+"7 	c #CACBCC",
+"8 	c #90908D",
+"9 	c #4D4D46",
+"0 	c #39392F",
+"a 	c #3D3D32",
+"b 	c #3E3E31",
+"c 	c #37372B",
+"d 	c #2F2F2A",
+"e 	c #48494A",
+"f 	c #737679",
+"g 	c #70767C",
+"h 	c #636A71",
+"i 	c #575E66",
+"j 	c #70737C",
+"k 	c #B4B5BA",
+"l 	c #B9B9BA",
+"m 	c #5A5A55",
+"n 	c #39392E",
+"o 	c #818177",
+"p 	c #C3C3B9",
+"q 	c #E9E9D1",
+"r 	c #F0F0C4",
+"s 	c #DCDC9D",
+"t 	c #ACAB67",
+"u 	c #595732",
+"v 	c #1D1E1B",
+"w 	c #47484B",
+"x 	c #555962",
+"y 	c #4E525E",
+"z 	c #4B4F5A",
+"A 	c #656C73",
+"B 	c #A5A9AD",
+"C 	c #B9BABA",
+"D 	c #4F4F4A",
+"E 	c #4F4F43",
+"F 	c #D2D2CB",
+"G 	c #FFFFFF",
+"H 	c #FFFFEB",
+"I 	c #FFFFD1",
+"J 	c #FFFFB0",
+"K 	c #FFFF8D",
+"L 	c #FAF365",
+"M 	c #9B9337",
+"N 	c #202016",
+"O 	c #2E3232",
+"P 	c #515960",
+"Q 	c #7F828A",
+"R 	c #B3B4B8",
+"S 	c #646461",
+"T 	c #434336",
+"U 	c #E3E3D0",
+"V 	c #FFFFF8",
+"W 	c #FFFFF3",
+"X 	c #FFFFE2",
+"Y 	c #FFFFC5",
+"Z 	c #FFFF9C",
+"` 	c #FFF770",
+" .	c #FFF34B",
+"..	c #FFF32A",
+"+.	c #9E9024",
+"@.	c #171918",
+"#.	c #33363B",
+"$.	c #484C58",
+"%.	c #5D646C",
+"&.	c #9A9EA3",
+"*.	c #959797",
+"=.	c #2D2D25",
+"-.	c #B4B492",
+";.	c #FFFFEA",
+">.	c #FFFFE8",
+",.	c #FFFFED",
+"'.	c #FFFFD8",
+").	c #FFFFB6",
+"!.	c #FFFC86",
+"~.	c #FFE92A",
+"{.	c #FFE418",
+"].	c #FCDB1B",
+"^.	c #5E5623",
+"/.	c #1D2123",
+"(.	c #484F56",
+"_.	c #505860",
+":.	c #62656F",
+"<.	c #9A9CA2",
+"[.	c #636363",
+"}.	c #4A4A35",
+"|.	c #F9F9B9",
+"1.	c #FFFFCD",
+"2.	c #FFFFD3",
+"3.	c #FFFFA0",
+"4.	c #FFD818",
+"5.	c #FFDB18",
+"6.	c #B39522",
+"7.	c #191C1B",
+"8.	c #36383F",
+"9.	c #464A56",
+"0.	c #6E747B",
+"a.	c #93979B",
+"b.	c #3D3D3D",
+"c.	c #7E7D4E",
+"d.	c #FFFFA4",
+"e.	c #FFFFA8",
+"f.	c #FFFFAF",
+"g.	c #FFFFB4",
+"h.	c #FFD418",
+"i.	c #FFCC19",
+"j.	c #FFCA18",
+"k.	c #E1AE1F",
+"l.	c #2F2D1F",
+"m.	c #2D3134",
+"n.	c #4C545B",
+"o.	c #666973",
+"p.	c #7F8188",
+"q.	c #29292C",
+"r.	c #96934B",
+"s.	c #FFFF7C",
+"t.	c #FFF979",
+"u.	c #FFF97A",
+"v.	c #FFF878",
+"w.	c #FFF76D",
+"x.	c #FFCD19",
+"y.	c #FFC519",
+"z.	c #FFBE19",
+"A.	c #FFBB19",
+"B.	c #F3B01B",
+"C.	c #383420",
+"D.	c #232529",
+"E.	c #424651",
+"F.	c #646B72",
+"G.	c #747A7F",
+"H.	c #242529",
+"I.	c #908A39",
+"J.	c #FFFB4D",
+"K.	c #FFEE42",
+"L.	c #FFED39",
+"M.	c #FFE930",
+"N.	c #FFB519",
+"O.	c #FFB119",
+"P.	c #EEA61C",
+"Q.	c #363220",
+"R.	c #262A2C",
+"S.	c #495057",
+"T.	c #545863",
+"U.	c #5D616B",
+"V.	c #282A2E",
+"W.	c #686225",
+"X.	c #FFEA21",
+"Y.	c #FFE31A",
+"Z.	c #FFDE17",
+"`.	c #FFA819",
+" +	c #FFAE18",
+".+	c #D19121",
+"++	c #26261D",
+"@+	c #292B31",
+"#+	c #424550",
+"$+	c #555D65",
+"%+	c #535B63",
+"&+	c #34383A",
+"*+	c #2F2E1C",
+"=+	c #E5C71D",
+"-+	c #FFDD18",
+";+	c #FFD119",
+">+	c #FFCB19",
+",+	c #FFB919",
+"'+	c #FFAF19",
+")+	c #FFA919",
+"!+	c #FFB019",
+"~+	c #906B24",
+"{+	c #151A1B",
+"]+	c #373C41",
+"^+	c #4A5259",
+"/+	c #010101",
+"(+	c #010100",
+"_+	c #101213",
+":+	c #817225",
+"<+	c #FFD61A",
+"[+	c #FFC919",
+"}+	c #FFC019",
+"|+	c #FFB819",
+"1+	c #FFAE19",
+"2+	c #FFAF18",
+"3+	c #DF9920",
+"4+	c #373321",
+"5+	c #090A09",
+"6+	c #0A0A08",
+"7+	c #21211C",
+"8+	c #A88924",
+"9+	c #FFC71A",
+"0+	c #FFBC18",
+"a+	c #FFAA19",
+"b+	c #FFB018",
+"c+	c #EBA11E",
+"d+	c #5C4B24",
+"e+	c #0E1010",
+"f+	c #040402",
+"g+	c #BEBEBE",
+"h+	c #BBBBBB",
+"i+	c #AAAAA9",
+"j+	c #50504E",
+"k+	c #22231C",
+"l+	c #866C25",
+"m+	c #E4A51E",
+"n+	c #FFAE1A",
+"o+	c #FFB118",
+"p+	c #FCAA1C",
+"q+	c #C18922",
+"r+	c #4F4323",
+"s+	c #202423",
+"t+	c #6B6B69",
+"u+	c #9A9A99",
+"v+	c #B4B4B4",
+"w+	c #BCBCBC",
+"x+	c #B6B6B6",
+"y+	c #A3A3A3",
+"z+	c #5C5D5B",
+"A+	c #1F2222",
+"B+	c #373220",
+"C+	c #6F5624",
+"D+	c #936C23",
+"E+	c #9A7022",
+"F+	c #866524",
+"G+	c #564724",
+"H+	c #21231C",
+"I+	c #303332",
+"J+	c #70706F",
+"K+	c #969696",
+"L+	c #AFAFAF",
+"M+	c #A7A7A6",
+"N+	c #818180",
+"O+	c #4E4F4E",
+"P+	c #2E3131",
+"Q+	c #1E2324",
+"R+	c #1C2223",
+"S+	c #242829",
+"T+	c #3A3C3B",
+"U+	c #5D5D5C",
+"V+	c #848484",
+"W+	c #9C9C9C",
+"X+	c #B2B2B2",
+"Y+	c #BDBDBD",
+"Z+	c #ADADAD",
+"`+	c #A0A0A0",
+" @	c #8E8E8E",
+".@	c #7E7E7E",
+"+@	c #797979",
+"@@	c #808080",
+"#@	c #8F8F8F",
+"$@	c #9B9B9B",
+"%@	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# # # # # # # # # # # # # # # # # # # # ",
+"# # # # # # # # # # # # # # # # # # # # ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"+ + + + + $ % & * = - ; > , ' ) + + + + ",
+"! ! ! ~ { ] ^ / ( _ : < [ } | 1 2 ! ! ! ",
+"3 3 4 5 6 7 8 9 0 a b c d e f g h i 3 3 ",
+"! ! j k l m n o p q r s t u v w x y z ! ",
+"3 A B C D E F G G H I J K L M N O P 3 3 ",
+"~ Q R S T U G V W X Y Z `  ...+.@.#.$.! ",
+"%.&.*.=.-.;.>.,.+ '.).!.+ ~.{.].^./.(._.",
+":.<.[.}.|.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.t.u.v.w.+ + + x.y.z.A.B.C.D.E.",
+"F.G.H.I.J.K.L.M.+ + + + + N.O.O.P.Q.R.S.",
+"T.U.V.W.X.Y.Z.+ + + z.+ + + `. +.+++@+#+",
+"$+%+&+*+=+-+;+>++ ,+'+)++ )+)+!+~+{+]+^+",
+"/++ (+_+:+<+[+}+|+1+)+)+)+)+2+3+4+5++ + ",
+"+ + + 6+7+8+9+0+!+)+)+)+a+b+c+d+e+f++ + ",
+"g+g+h+i+j+k+l+m+n+!+o+'+p+q+r+s+t+u+v+g+",
+"g+g+w+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+g+g+",
+"g+g+g+h+v+M+N+O+P+Q+R+S+T+U+V+W+X+Y+g+g+",
+"g+g+g+g+h+x+Z+`+ @.@+@@@#@$@@ %@g+g+g+g+"};
diff --git a/themes/gorilla/close-pressed.xpm b/themes/gorilla/close-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..48458e77810209394bb275f8a173b7f1ffa400b0
--- /dev/null
+++ b/themes/gorilla/close-pressed.xpm
@@ -0,0 +1,324 @@
+/* XPM */
+static char * close_pressed_xpm[] = {
+"20 26 295 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #A9A9A9",
+"@ 	c #D3D3D3",
+"# 	c #0D0D0D",
+"$ 	c #343434",
+"% 	c #5F5F5F",
+"& 	c #858585",
+"* 	c #929292",
+"= 	c #8D8D8D",
+"- 	c #777777",
+"; 	c #565656",
+"> 	c #323232",
+", 	c #161616",
+"' 	c #050505",
+") 	c #494D59",
+"! 	c #4A4E5A",
+"~ 	c #696C76",
+"{ 	c #9B9DA4",
+"] 	c #C2C3C8",
+"^ 	c #C3C4C5",
+"/ 	c #ACACAB",
+"( 	c #959693",
+"_ 	c #8B8B8A",
+": 	c #8D8E8D",
+"< 	c #949598",
+"[ 	c #8D8F96",
+"} 	c #787B83",
+"| 	c #61656F",
+"1 	c #505460",
+"2 	c #515961",
+"3 	c #545C64",
+"4 	c #7B8187",
+"5 	c #B6B9BD",
+"6 	c #C9CACB",
+"7 	c #949490",
+"8 	c #5B5B51",
+"9 	c #525241",
+"0 	c #595947",
+"a 	c #5B5B46",
+"b 	c #525240",
+"c 	c #45453A",
+"d 	c #535450",
+"e 	c #76797A",
+"f 	c #71787D",
+"g 	c #636A71",
+"h 	c #575E66",
+"i 	c #70737C",
+"j 	c #B4B5BA",
+"k 	c #BABBBA",
+"l 	c #66665C",
+"m 	c #565643",
+"n 	c #9A9A8A",
+"o 	c #D3D4C7",
+"p 	c #F0F0DD",
+"q 	c #F5F6D4",
+"r 	c #E6E7B4",
+"s 	c #C0C085",
+"t 	c #76754F",
+"u 	c #36362B",
+"v 	c #4D4E4E",
+"w 	c #575A63",
+"x 	c #4E525E",
+"y 	c #4B4F5A",
+"z 	c #656C73",
+"A 	c #A6AAAE",
+"B 	c #B9BABA",
+"C 	c #5C5C53",
+"D 	c #6E6E5A",
+"E 	c #DFDFD6",
+"F 	c #FFFFFF",
+"G 	c #FFFFFD",
+"H 	c #FFFFE5",
+"I 	c #FFFDCF",
+"J 	c #FFFFBA",
+"K 	c #FFFFA6",
+"L 	c #FEFA8A",
+"M 	c #B3AD5E",
+"N 	c #3B3B2B",
+"O 	c #373B39",
+"P 	c #525961",
+"Q 	c #7F828A",
+"R 	c #B3B5B8",
+"S 	c #6C6D67",
+"T 	c #62624D",
+"U 	c #EDEDDC",
+"V 	c #FFFFFC",
+"W 	c #FFF6DC",
+"X 	c #FFE9B3",
+"Y 	c #FFDF90",
+"Z 	c #FFDC7D",
+"` 	c #FFE076",
+" .	c #FFE874",
+"..	c #FFF16C",
+"+.	c #FFF95D",
+"@.	c #B5AB4F",
+"#.	c #313129",
+"$.	c #383B3F",
+"%.	c #484C58",
+"&.	c #5D656C",
+"*.	c #9A9FA3",
+"=.	c #979999",
+"-.	c #454636",
+";.	c #C6C7A7",
+">.	c #FFFFEB",
+",.	c #FFF0C1",
+"'.	c #FFDA83",
+").	c #FFC443",
+"!.	c #FFC33F",
+"~.	c #FFC943",
+"{.	c #FFDF4D",
+"].	c #FFE94C",
+"^.	c #FEE851",
+"/.	c #7C7645",
+"(.	c #2B2E2B",
+"_.	c #495057",
+":.	c #505860",
+"<.	c #60646E",
+"[.	c #999BA1",
+"}.	c #6A6A67",
+"|.	c #68684E",
+"1.	c #FCFCCA",
+"2.	c #FFF6BA",
+"3.	c #FFD877",
+"4.	c #FFCA3E",
+"5.	c #FFE54C",
+"6.	c #FFE94E",
+"7.	c #C7B250",
+"8.	c #33342A",
+"9.	c #383B41",
+"0.	c #464A56",
+"a.	c #676E75",
+"b.	c #929699",
+"c.	c #4B4C46",
+"d.	c #97976B",
+"e.	c #FFFFB5",
+"f.	c #FFE887",
+"g.	c #FFCC4D",
+"h.	c #FFC63C",
+"i.	c #FFED4F",
+"j.	c #FFED53",
+"k.	c #FFE654",
+"l.	c #ECCA54",
+"m.	c #4D4B35",
+"n.	c #313637",
+"o.	c #4C545B",
+"p.	c #5C606B",
+"q.	c #7F8187",
+"r.	c #3C3D37",
+"s.	c #ACA96B",
+"t.	c #FFFF93",
+"u.	c #FFE168",
+"v.	c #FFCF46",
+"w.	c #FFD142",
+"x.	c #FFD846",
+"y.	c #FFF262",
+"z.	c #FFF46E",
+"A.	c #FFF374",
+"B.	c #FFE667",
+"C.	c #F8CE56",
+"D.	c #58543A",
+"E.	c #2A2C2D",
+"F.	c #434651",
+"G.	c #5E666D",
+"H.	c #757A7F",
+"I.	c #363834",
+"J.	c #A7A25C",
+"K.	c #FFFB72",
+"L.	c #FFE256",
+"M.	c #FFDD48",
+"N.	c #FFF79A",
+"O.	c #FFF496",
+"P.	c #FFE477",
+"Q.	c #F4C758",
+"R.	c #545138",
+"S.	c #2D3030",
+"T.	c #515560",
+"U.	c #5E626B",
+"V.	c #353735",
+"W.	c #858147",
+"X.	c #FFF255",
+"Y.	c #FFE64C",
+"Z.	c #FFE24A",
+"`.	c #FFF898",
+" +	c #FFF3AA",
+".+	c #FFDE78",
+"++	c #DFB657",
+"@+	c #434231",
+"#+	c #2D3033",
+"$+	c #424550",
+"%+	c #555C64",
+"&+	c #545C63",
+"*+	c #3C403F",
+"=+	c #4D4C34",
+"-+	c #EED952",
+";+	c #FFE94D",
+">+	c #FFE74E",
+",+	c #FFEF5A",
+"'+	c #FFF89E",
+")+	c #FFFAB8",
+"!+	c #FFFCCB",
+"~+	c #FFF9CC",
+"{+	c #FFE8A0",
+"]+	c #FFD667",
+"^+	c #A9904D",
+"/+	c #2A2C26",
+"(+	c #393E42",
+"_+	c #4A5259",
+":+	c #020202",
+"<+	c #050503",
+"[+	c #24251F",
+"}+	c #9C924C",
+"|+	c #FFE650",
+"1+	c #FFE050",
+"2+	c #FFE767",
+"3+	c #FFF18C",
+"4+	c #FFF6AC",
+"5+	c #FFF9C3",
+"6+	c #FFF9CF",
+"7+	c #FFF4CA",
+"8+	c #FFE7A8",
+"9+	c #FFD772",
+"0+	c #EABC57",
+"a+	c #565239",
+"b+	c #13130F",
+"c+	c #010101",
+"d+	c #12130E",
+"e+	c #3C3C2E",
+"f+	c #BDA850",
+"g+	c #FFDC52",
+"h+	c #FFD858",
+"i+	c #FFDA6D",
+"j+	c #FFDF86",
+"k+	c #FFE495",
+"l+	c #FFE295",
+"m+	c #FFD366",
+"n+	c #F2C257",
+"o+	c #7A6E45",
+"p+	c #1F211A",
+"q+	c #060604",
+"r+	c #BEBEBE",
+"s+	c #BBBBBB",
+"t+	c #A9A9A8",
+"u+	c #585853",
+"v+	c #3D3E2F",
+"w+	c #A08D4C",
+"x+	c #EDC252",
+"y+	c #FFCB53",
+"z+	c #FFCE56",
+"A+	c #FFD059",
+"B+	c #FFCF58",
+"C+	c #FFC854",
+"D+	c #D2AB52",
+"E+	c #6E6541",
+"F+	c #33352E",
+"G+	c #6D6D6B",
+"H+	c #999999",
+"I+	c #B4B4B4",
+"J+	c #BCBCBC",
+"K+	c #B6B6B6",
+"L+	c #A3A3A3",
+"M+	c #62625E",
+"N+	c #33362E",
+"O+	c #555139",
+"P+	c #8A7947",
+"Q+	c #A98E4A",
+"R+	c #AF924A",
+"S+	c #9F8849",
+"T+	c #736942",
+"U+	c #3D3E30",
+"V+	c #3D3F39",
+"W+	c #727270",
+"X+	c #969696",
+"Y+	c #AFAFAF",
+"Z+	c #A6A6A6",
+"`+	c #828280",
+" @	c #555551",
+".@	c #3B3D39",
+"+@	c #303430",
+"@@	c #30342E",
+"#@	c #444541",
+"$@	c #61615E",
+"%@	c #858584",
+"&@	c #9D9D9D",
+"*@	c #B2B2B2",
+"=@	c #BDBDBD",
+"-@	c #ADADAD",
+";@	c #A0A0A0",
+">@	c #8E8E8D",
+",@	c #7E7E7E",
+"'@	c #797979",
+")@	c #80807F",
+"!@	c #8E8E8E",
+"~@	c #9B9B9B",
+"{@	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . # $ % & * = - ; > , ' . . . . ",
+") ) ) ! ~ { ] ^ / ( _ : < [ } | 1 ) ) ) ",
+"2 2 3 4 5 6 7 8 9 0 a b c d e f g h 2 2 ",
+") ) i j k l m n o p q r s t u v w x y ) ",
+"2 z A B C D E F G H I J K L M N O P 2 2 ",
+"y Q R S T U V W X Y Z `  ...+.@.#.$.%.) ",
+"&.*.=.-.;.>.,.'.. ).!.~.. {.].^./.(._.:.",
+"<.[.}.|.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.t.u.v.w.x.. . . y.z.A.B.C.D.E.F.",
+"G.H.I.J.K.L.x.M.. . . . . N.O.P.Q.R.S._.",
+"T.U.V.W.X.Y.Z.. . . `.. . .  +.+++@+#+$+",
+"%+&+*+=+-+;+>+,+. '+)+!+. ~+{+]+^+/+(+_+",
+":+. <+[+}+|+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+r+s+t+u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+r+",
+"r+r+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+r+r+",
+"r+r+r+s+I+Z+`+ @.@+@@@I.#@$@%@&@*@=@r+r+",
+"r+r+r+r+s+K+-@;@>@,@'@)@!@~@+ {@r+r+r+r+"};
diff --git a/themes/gorilla/hide-active.xpm b/themes/gorilla/hide-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..9fa3834865aaafec513775a2fda9241233505ef8
--- /dev/null
+++ b/themes/gorilla/hide-active.xpm
@@ -0,0 +1,320 @@
+/* XPM */
+static char * hide_active_xpm[] = {
+"20 26 291 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #A9A9A9",
+"@ 	c #D3D3D3",
+"# 	c #0D0D0D",
+"$ 	c #343434",
+"% 	c #5F5F5F",
+"& 	c #858585",
+"* 	c #929292",
+"= 	c #8D8D8D",
+"- 	c #777777",
+"; 	c #565656",
+"> 	c #323232",
+", 	c #161616",
+"' 	c #050505",
+") 	c #494D59",
+"! 	c #4A4E5A",
+"~ 	c #696C76",
+"{ 	c #9B9DA4",
+"] 	c #C3C4C8",
+"^ 	c #C4C5C6",
+"/ 	c #AAAAAB",
+"( 	c #919292",
+"_ 	c #878888",
+": 	c #8A8B8C",
+"< 	c #929397",
+"[ 	c #8C8F95",
+"} 	c #787B83",
+"| 	c #61656F",
+"1 	c #505460",
+"2 	c #515961",
+"3 	c #545C64",
+"4 	c #7B8187",
+"5 	c #B6B9BD",
+"6 	c #CACBCC",
+"7 	c #90908E",
+"8 	c #4D4D47",
+"9 	c #39382F",
+"0 	c #3D3D31",
+"a 	c #3E3D2F",
+"b 	c #37362A",
+"c 	c #2F302B",
+"d 	c #484A4B",
+"e 	c #737679",
+"f 	c #70767C",
+"g 	c #636A71",
+"h 	c #575E66",
+"i 	c #70737C",
+"j 	c #B4B5BA",
+"k 	c #B9B9BA",
+"l 	c #5A5A56",
+"m 	c #39392D",
+"n 	c #817F6D",
+"o 	c #C3C0A7",
+"p 	c #E9E0BA",
+"q 	c #F0E3AD",
+"r 	c #DCCD88",
+"s 	c #AC9D59",
+"t 	c #59522D",
+"u 	c #1D1E1B",
+"v 	c #47494B",
+"w 	c #555962",
+"x 	c #4E525E",
+"y 	c #4B4F5A",
+"z 	c #656C73",
+"A 	c #A5A9AD",
+"B 	c #B9BABA",
+"C 	c #4F504B",
+"D 	c #4F4E3F",
+"E 	c #D2D0B7",
+"F 	c #FFFFEB",
+"G 	c #FFFFE6",
+"H 	c #FFF9D2",
+"I 	c #FFF4B7",
+"J 	c #FFEF96",
+"K 	c #FFED72",
+"L 	c #FADA4D",
+"M 	c #9B872B",
+"N 	c #202016",
+"O 	c #2E3232",
+"P 	c #515960",
+"Q 	c #7F828A",
+"R 	c #B3B4B8",
+"S 	c #646462",
+"T 	c #434333",
+"U 	c #E3DDBB",
+"V 	c #FFFFE5",
+"W 	c #FFF9DE",
+"X 	c #FFF8DA",
+"Y 	c #FFF5C9",
+"Z 	c #FFEFAC",
+"` 	c #FFE783",
+" .	c #FFDE58",
+"..	c #FFD931",
+"+.	c #FFD910",
+"@.	c #9E8317",
+"#.	c #171918",
+"$.	c #33363B",
+"%.	c #484C58",
+"&.	c #5E666D",
+"*.	c #9A9EA3",
+"=.	c #959798",
+"-.	c #2D2D25",
+";.	c #B4AB82",
+">.	c #FFFFD0",
+",.	c #FFF5CF",
+"'.	c #FFF7D4",
+").	c #FFF6D1",
+"!.	c #FFF2BF",
+"~.	c #FFEC9D",
+"{.	c #FFE36D",
+"].	c #FFD83B",
+"^.	c #FFD011",
+"/.	c #FFCB00",
+"(.	c #FCC203",
+"_.	c #5E501E",
+":.	c #1D2124",
+"<.	c #484F55",
+"[.	c #646872",
+"}.	c #989AA1",
+"|.	c #636363",
+"1.	c #4A4731",
+"2.	c #F9E8A1",
+"3.	c #FFF2B3",
+"4.	c #FFF1BA",
+"5.	c #FFF3C1",
+"6.	c #FFF3BF",
+"7.	c #FFE787",
+"8.	c #FFDC4F",
+"9.	c #FFD115",
+"0.	c #FFC800",
+"a.	c #FFBF00",
+"b.	c #FFC000",
+"c.	c #B38513",
+"d.	c #191C1B",
+"e.	c #34373E",
+"f.	c #71777E",
+"g.	c #909598",
+"h.	c #3D3E3E",
+"i.	c #7E7444",
+"j.	c #FFEE8A",
+"k.	c #FFE98F",
+"l.	c #FFEA96",
+"m.	c #FFEB9B",
+"n.	c #FFEB98",
+"o.	c #FFE683",
+"p.	c #FFDE56",
+"q.	c #FFD21A",
+"r.	c #FFC500",
+"s.	c #FFBB00",
+"t.	c #FFB300",
+"u.	c #FFB000",
+"v.	c #E1990A",
+"w.	c #2F2C1E",
+"x.	c #2A2F32",
+"y.	c #4D555D",
+"z.	c #686B75",
+"A.	c #7D7F86",
+"B.	c #292B2D",
+"C.	c #96863F",
+"D.	c #FFEA62",
+"E.	c #FFDF60",
+"F.	c #FFE061",
+"G.	c #FFDF5F",
+"H.	c #FFDE54",
+"I.	c #FFD836",
+"J.	c #FFCF0F",
+"K.	c #FFC100",
+"L.	c #FFB400",
+"M.	c #FFAC00",
+"N.	c #FFA500",
+"O.	c #FFA200",
+"P.	c #F39905",
+"Q.	c #38331F",
+"R.	c #212327",
+"S.	c #444752",
+"T.	c #666D74",
+"U.	c #73797E",
+"V.	c #24282A",
+"W.	c #907E2D",
+"X.	c #FFE032",
+"Y.	c #FFD528",
+"Z.	c #FFD320",
+"`.	c #FFD017",
+" +	c #FFCD0C",
+".+	c #FFBA00",
+"++	c #FFAD00",
+"@+	c #FF9C00",
+"#+	c #FF9800",
+"$+	c #FF9700",
+"%+	c #EE8F06",
+"&+	c #36311F",
+"*+	c #23282A",
+"=+	c #4A5259",
+"-+	c #565A65",
+";+	c #5D606A",
+">+	c #282B2F",
+",+	c #685C1E",
+"'+	c #FFD108",
+")+	c #FFCA00",
+"!+	c #FF9000",
+"~+	c #FF8F00",
+"{+	c #FF9300",
+"]+	c #D17E0E",
+"^+	c #26261D",
+"/+	c #27292E",
+"(+	c #434752",
+"_+	c #535B63",
+":+	c #34383A",
+"<+	c #2F2D1B",
+"[+	c #E5B108",
+"}+	c #FFC300",
+"|+	c #FFB800",
+"1+	c #FF9600",
+"2+	c #906019",
+"3+	c #151B1B",
+"4+	c #363B3F",
+"5+	c #4B535A",
+"6+	c #020202",
+"7+	c #010100",
+"8+	c #101314",
+"9+	c #81691B",
+"0+	c #FFBC01",
+"a+	c #FFA700",
+"b+	c #FF9F00",
+"c+	c #FF9500",
+"d+	c #FF9400",
+"e+	c #DF840B",
+"f+	c #373120",
+"g+	c #090B09",
+"h+	c #0A0A08",
+"i+	c #21211C",
+"j+	c #A87C17",
+"k+	c #FFAD01",
+"l+	c #FF9100",
+"m+	c #EB8B08",
+"n+	c #5C461F",
+"o+	c #0E1210",
+"p+	c #040402",
+"q+	c #BEBEBE",
+"r+	c #BBBBBB",
+"s+	c #AAAAA9",
+"t+	c #50504E",
+"u+	c #22231C",
+"v+	c #86611B",
+"w+	c #E48F09",
+"x+	c #FF9501",
+"y+	c #FC9103",
+"z+	c #C17811",
+"A+	c #4F3F20",
+"B+	c #202524",
+"C+	c #6B6B69",
+"D+	c #9A9A99",
+"E+	c #B4B4B4",
+"F+	c #BCBCBC",
+"G+	c #B6B6B6",
+"H+	c #A3A3A3",
+"I+	c #5C5D5B",
+"J+	c #1F2323",
+"K+	c #37311F",
+"L+	c #6F4F1D",
+"M+	c #936117",
+"N+	c #9A6316",
+"O+	c #865B1A",
+"P+	c #56421F",
+"Q+	c #21241C",
+"R+	c #303332",
+"S+	c #70706F",
+"T+	c #969696",
+"U+	c #AFAFAF",
+"V+	c #A7A7A6",
+"W+	c #818180",
+"X+	c #4E4F4E",
+"Y+	c #1E2425",
+"Z+	c #1C2325",
+"`+	c #242A2B",
+" @	c #3A3D3B",
+".@	c #5D5D5C",
+"+@	c #848484",
+"@@	c #9C9C9C",
+"#@	c #B2B2B2",
+"$@	c #BDBDBD",
+"%@	c #ADADAD",
+"&@	c #A0A0A0",
+"*@	c #8E8E8E",
+"=@	c #7E7E7E",
+"-@	c #797979",
+";@	c #808080",
+">@	c #8F8F8F",
+",@	c #9B9B9B",
+"'@	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . # $ % & * = - ; > , ' . . . . ",
+") ) ) ! ~ { ] ^ / ( _ : < [ } | 1 ) ) ) ",
+"2 2 3 4 5 6 7 8 9 0 a b c d e f g h 2 2 ",
+") ) i j k l m n o p q r s t u v w x y ) ",
+"2 z A B C D E F G H I J K L M N O P 2 2 ",
+"y Q R S T U V W X Y Z `  ...+.@.#.$.%.) ",
+"&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.2 ",
+"[.}.|.1.2.3.4.5.6.Z 7.8.9.0.a.b.c.d.e.%.",
+"f.g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.",
+"z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.",
+"T.U.V.W.X.Y.Z.`. +r..+++O.@+#+$+%+&+*+=+",
+"-+;+>+,+'+)+r.. . . . . . !+~+{+]+^+/+(+",
+"h _+:+<+[+}+|+. . . . . . !+!+1+2+3+4+5+",
+"6+. 7+8+9+0+u.a+b+c+!+!+!+!+d+e+f+g+. . ",
+". . . h+i+j+k+O.1+!+!+!+l+c+m+n+o+p+. . ",
+"q+q+r+s+t+u+v+w+x+1+1+c+y+z+A+B+C+D+E+q+",
+"q+q+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+q+q+",
+"q+q+q+r+E+V+W+X+O Y+Z+`+ @.@+@@@#@$@q+q+",
+"q+q+q+q+r+G+%@&@*@=@-@;@>@,@+ '@q+q+q+q+"};
diff --git a/themes/gorilla/hide-inactive.xpm b/themes/gorilla/hide-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..8f7b47bef2d00a2e9d0314b678ab630454b51327
--- /dev/null
+++ b/themes/gorilla/hide-inactive.xpm
@@ -0,0 +1,326 @@
+/* XPM */
+static char * hide_inactive_xpm[] = {
+"20 26 297 2",
+"  	c None",
+". 	c #D7D7CF",
+"+ 	c #000000",
+"@ 	c #A9A9A9",
+"# 	c #D3D3D3",
+"$ 	c #0D0D0D",
+"% 	c #343434",
+"& 	c #5F5F5F",
+"* 	c #858585",
+"= 	c #929292",
+"- 	c #8D8D8D",
+"; 	c #777777",
+"> 	c #565656",
+", 	c #323232",
+"' 	c #161616",
+") 	c #050505",
+"! 	c #494D59",
+"~ 	c #4A4E5A",
+"{ 	c #696C76",
+"] 	c #9B9DA4",
+"^ 	c #C3C4C8",
+"/ 	c #C4C5C6",
+"( 	c #AAAAAB",
+"_ 	c #919292",
+": 	c #878888",
+"< 	c #8A8B8C",
+"[ 	c #929397",
+"} 	c #8C8F95",
+"| 	c #787B83",
+"1 	c #61656F",
+"2 	c #505460",
+"3 	c #515961",
+"4 	c #545C64",
+"5 	c #7B8187",
+"6 	c #B6B9BD",
+"7 	c #CACBCC",
+"8 	c #90908D",
+"9 	c #4D4D46",
+"0 	c #39392F",
+"a 	c #3D3D32",
+"b 	c #3E3E31",
+"c 	c #37372B",
+"d 	c #2F2F2A",
+"e 	c #48494A",
+"f 	c #737679",
+"g 	c #70767C",
+"h 	c #636A71",
+"i 	c #575E66",
+"j 	c #70737C",
+"k 	c #B4B5BA",
+"l 	c #B9B9BA",
+"m 	c #5A5A55",
+"n 	c #39392E",
+"o 	c #818177",
+"p 	c #C3C3B9",
+"q 	c #E9E9D1",
+"r 	c #F0F0C4",
+"s 	c #DCDC9D",
+"t 	c #ACAB67",
+"u 	c #595732",
+"v 	c #1D1E1B",
+"w 	c #47484B",
+"x 	c #555962",
+"y 	c #4E525E",
+"z 	c #4B4F5A",
+"A 	c #656C73",
+"B 	c #A5A9AD",
+"C 	c #B9BABA",
+"D 	c #4F4F4A",
+"E 	c #4F4F43",
+"F 	c #D2D2CB",
+"G 	c #FFFFFF",
+"H 	c #FFFFEB",
+"I 	c #FFFFD1",
+"J 	c #FFFFB0",
+"K 	c #FFFF8D",
+"L 	c #FAF365",
+"M 	c #9B9337",
+"N 	c #202016",
+"O 	c #2E3232",
+"P 	c #515960",
+"Q 	c #7F828A",
+"R 	c #B3B4B8",
+"S 	c #646461",
+"T 	c #434336",
+"U 	c #E3E3D0",
+"V 	c #FFFFF8",
+"W 	c #FFFFF3",
+"X 	c #FFFFE2",
+"Y 	c #FFFFC5",
+"Z 	c #FFFF9C",
+"` 	c #FFF770",
+" .	c #FFF34B",
+"..	c #FFF32A",
+"+.	c #9E9024",
+"@.	c #171918",
+"#.	c #33363B",
+"$.	c #484C58",
+"%.	c #5D646C",
+"&.	c #9A9EA3",
+"*.	c #959797",
+"=.	c #2D2D25",
+"-.	c #B4B492",
+";.	c #FFFFEA",
+">.	c #FFFFE8",
+",.	c #FFFFED",
+"'.	c #FFFFD8",
+").	c #FFFFB6",
+"!.	c #FFFC86",
+"~.	c #FFF254",
+"{.	c #FFE92A",
+"].	c #FFE418",
+"^.	c #FCDB1B",
+"/.	c #5E5623",
+"(.	c #1D2123",
+"_.	c #484F56",
+":.	c #505860",
+"<.	c #62656F",
+"[.	c #9A9CA2",
+"}.	c #636363",
+"|.	c #4A4A35",
+"1.	c #F9F9B9",
+"2.	c #FFFFCD",
+"3.	c #FFFFD3",
+"4.	c #FFFFDA",
+"5.	c #FFFFA0",
+"6.	c #FFF568",
+"7.	c #FFEA2E",
+"8.	c #FFE117",
+"9.	c #FFD818",
+"0.	c #FFDB18",
+"a.	c #B39522",
+"b.	c #191C1B",
+"c.	c #36383F",
+"d.	c #464A56",
+"e.	c #6E747B",
+"f.	c #93979B",
+"g.	c #3D3D3D",
+"h.	c #7E7D4E",
+"i.	c #FFFFA4",
+"j.	c #FFFFA8",
+"k.	c #FFFFAF",
+"l.	c #FFFFB4",
+"m.	c #FFFFB1",
+"n.	c #FFFE9C",
+"o.	c #FFF76F",
+"p.	c #FFEB33",
+"q.	c #FFDE17",
+"r.	c #FFD418",
+"s.	c #FFCC19",
+"t.	c #FFCA18",
+"u.	c #E1AE1F",
+"v.	c #2F2D1F",
+"w.	c #2D3134",
+"x.	c #4C545B",
+"y.	c #666973",
+"z.	c #7F8188",
+"A.	c #29292C",
+"B.	c #96934B",
+"C.	c #FFFF7C",
+"D.	c #FFF979",
+"E.	c #FFF97A",
+"F.	c #FFF878",
+"G.	c #FFF76D",
+"H.	c #FFF24F",
+"I.	c #FFE828",
+"J.	c #FFDA16",
+"K.	c #FFCD19",
+"L.	c #FFC519",
+"M.	c #FFBE19",
+"N.	c #FFBB19",
+"O.	c #F3B01B",
+"P.	c #383420",
+"Q.	c #232529",
+"R.	c #424651",
+"S.	c #646B72",
+"T.	c #747A7F",
+"U.	c #242529",
+"V.	c #908A39",
+"W.	c #FFFB4D",
+"X.	c #FFEE42",
+"Y.	c #FFED39",
+"Z.	c #FFE930",
+"`.	c #FFE625",
+" +	c #FFDE19",
+".+	c #FFD316",
+"++	c #FFC619",
+"@+	c #FFB519",
+"#+	c #FFB119",
+"$+	c #EEA61C",
+"%+	c #363220",
+"&+	c #262A2C",
+"*+	c #495057",
+"=+	c #545863",
+"-+	c #5D616B",
+";+	c #282A2E",
+">+	c #686225",
+",+	c #FFEA21",
+"'+	c #FFE31A",
+")+	c #FFA919",
+"!+	c #FFA819",
+"~+	c #FFAE18",
+"{+	c #D19121",
+"]+	c #26261D",
+"^+	c #292B31",
+"/+	c #424550",
+"(+	c #555D65",
+"_+	c #535B63",
+":+	c #34383A",
+"<+	c #2F2E1C",
+"[+	c #E5C71D",
+"}+	c #FFDD18",
+"|+	c #FFD119",
+"1+	c #FFB019",
+"2+	c #906B24",
+"3+	c #151A1B",
+"4+	c #373C41",
+"5+	c #4A5259",
+"6+	c #010101",
+"7+	c #010100",
+"8+	c #101213",
+"9+	c #817225",
+"0+	c #FFD61A",
+"a+	c #FFC919",
+"b+	c #FFC019",
+"c+	c #FFB819",
+"d+	c #FFAE19",
+"e+	c #FFAF18",
+"f+	c #DF9920",
+"g+	c #373321",
+"h+	c #090A09",
+"i+	c #0A0A08",
+"j+	c #21211C",
+"k+	c #A88924",
+"l+	c #FFC71A",
+"m+	c #FFBC18",
+"n+	c #FFAA19",
+"o+	c #FFB018",
+"p+	c #EBA11E",
+"q+	c #5C4B24",
+"r+	c #0E1010",
+"s+	c #040402",
+"t+	c #BEBEBE",
+"u+	c #BBBBBB",
+"v+	c #AAAAA9",
+"w+	c #50504E",
+"x+	c #22231C",
+"y+	c #866C25",
+"z+	c #E4A51E",
+"A+	c #FFAE1A",
+"B+	c #FFB118",
+"C+	c #FFAF19",
+"D+	c #FCAA1C",
+"E+	c #C18922",
+"F+	c #4F4323",
+"G+	c #202423",
+"H+	c #6B6B69",
+"I+	c #9A9A99",
+"J+	c #B4B4B4",
+"K+	c #BCBCBC",
+"L+	c #B6B6B6",
+"M+	c #A3A3A3",
+"N+	c #5C5D5B",
+"O+	c #1F2222",
+"P+	c #373220",
+"Q+	c #6F5624",
+"R+	c #936C23",
+"S+	c #9A7022",
+"T+	c #866524",
+"U+	c #564724",
+"V+	c #21231C",
+"W+	c #303332",
+"X+	c #70706F",
+"Y+	c #969696",
+"Z+	c #AFAFAF",
+"`+	c #A7A7A6",
+" @	c #818180",
+".@	c #4E4F4E",
+"+@	c #2E3131",
+"@@	c #1E2324",
+"#@	c #1C2223",
+"$@	c #242829",
+"%@	c #3A3C3B",
+"&@	c #5D5D5C",
+"*@	c #848484",
+"=@	c #9C9C9C",
+"-@	c #B2B2B2",
+";@	c #BDBDBD",
+">@	c #ADADAD",
+",@	c #A0A0A0",
+"'@	c #8E8E8E",
+")@	c #7E7E7E",
+"!@	c #797979",
+"~@	c #808080",
+"{@	c #8F8F8F",
+"]@	c #9B9B9B",
+"^@	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# # # # # # # # # # # # # # # # # # # # ",
+"# # # # # # # # # # # # # # # # # # # # ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"+ + + + + $ % & * = - ; > , ' ) + + + + ",
+"! ! ! ~ { ] ^ / ( _ : < [ } | 1 2 ! ! ! ",
+"3 3 4 5 6 7 8 9 0 a b c d e f g h i 3 3 ",
+"! ! j k l m n o p q r s t u v w x y z ! ",
+"3 A B C D E F G G H I J K L M N O P 3 3 ",
+"~ Q R S T U G V W X Y Z `  ...+.@.#.$.! ",
+"%.&.*.=.-.;.>.,.;.'.).!.~.{.].^./.(._.:.",
+"<.[.}.|.1.2.3.4.'.Y 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.t.u.v.w.x.",
+"y.z.A.B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.",
+"S.T.U.V.W.X.Y.Z.`. +.+++N.@+#+#+$+%+&+*+",
+"=+-+;+>+,+'+q.+ + + + + + )+!+~+{+]+^+/+",
+"(+_+:+<+[+}+|++ + + + + + )+)+1+2+3+4+5+",
+"6++ 7+8+9+0+a+b+c+d+)+)+)+)+e+f+g+h++ + ",
+"+ + + i+j+k+l+m+1+)+)+)+n+o+p+q+r+s++ + ",
+"t+t+u+v+w+x+y+z+A+1+B+C+D+E+F+G+H+I+J+t+",
+"t+t+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+Z+t+t+",
+"t+t+t+u+J+`+ @.@+@@@#@$@%@&@*@=@-@;@t+t+",
+"t+t+t+t+u+L+>@,@'@)@!@~@{@]@@ ^@t+t+t+t+"};
diff --git a/themes/gorilla/hide-pressed.xpm b/themes/gorilla/hide-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..c6f016e66c7316e5cd75032c2b7072373ca96ab4
--- /dev/null
+++ b/themes/gorilla/hide-pressed.xpm
@@ -0,0 +1,340 @@
+/* XPM */
+static char * hide_pressed_xpm[] = {
+"20 26 311 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #A9A9A9",
+"@ 	c #D3D3D3",
+"# 	c #0D0D0D",
+"$ 	c #343434",
+"% 	c #5F5F5F",
+"& 	c #858585",
+"* 	c #929292",
+"= 	c #8D8D8D",
+"- 	c #777777",
+"; 	c #565656",
+"> 	c #323232",
+", 	c #161616",
+"' 	c #050505",
+") 	c #494D59",
+"! 	c #4A4E5A",
+"~ 	c #696C76",
+"{ 	c #9B9DA4",
+"] 	c #C2C3C8",
+"^ 	c #C3C4C5",
+"/ 	c #ACACAB",
+"( 	c #959693",
+"_ 	c #8B8B8A",
+": 	c #8D8E8D",
+"< 	c #949598",
+"[ 	c #8D8F96",
+"} 	c #787B83",
+"| 	c #61656F",
+"1 	c #505460",
+"2 	c #515961",
+"3 	c #545C64",
+"4 	c #7B8187",
+"5 	c #B6B9BD",
+"6 	c #C9CACB",
+"7 	c #949490",
+"8 	c #5B5B51",
+"9 	c #525241",
+"0 	c #595947",
+"a 	c #5B5B46",
+"b 	c #525240",
+"c 	c #45453A",
+"d 	c #535450",
+"e 	c #76797A",
+"f 	c #71787D",
+"g 	c #636A71",
+"h 	c #575E66",
+"i 	c #70737C",
+"j 	c #B4B5BA",
+"k 	c #BABBBA",
+"l 	c #66665C",
+"m 	c #565643",
+"n 	c #9A9A8A",
+"o 	c #D3D4C7",
+"p 	c #F0F0DD",
+"q 	c #F5F6D4",
+"r 	c #E6E7B4",
+"s 	c #C0C085",
+"t 	c #76754F",
+"u 	c #36362B",
+"v 	c #4D4E4E",
+"w 	c #575A63",
+"x 	c #4E525E",
+"y 	c #4B4F5A",
+"z 	c #656C73",
+"A 	c #A6AAAE",
+"B 	c #B9BABA",
+"C 	c #5C5C53",
+"D 	c #6E6E5A",
+"E 	c #DFDFD6",
+"F 	c #FFFFFF",
+"G 	c #FFFFFD",
+"H 	c #FFFFE5",
+"I 	c #FFFDCF",
+"J 	c #FFFFBA",
+"K 	c #FFFFA6",
+"L 	c #FEFA8A",
+"M 	c #B3AD5E",
+"N 	c #3B3B2B",
+"O 	c #373B39",
+"P 	c #525961",
+"Q 	c #7F828A",
+"R 	c #B3B5B8",
+"S 	c #6C6D67",
+"T 	c #62624D",
+"U 	c #EDEDDC",
+"V 	c #FFFFFC",
+"W 	c #FFF6DC",
+"X 	c #FFE9B3",
+"Y 	c #FFDF90",
+"Z 	c #FFDC7D",
+"` 	c #FFE076",
+" .	c #FFE874",
+"..	c #FFF16C",
+"+.	c #FFF95D",
+"@.	c #B5AB4F",
+"#.	c #313129",
+"$.	c #383B3F",
+"%.	c #484C58",
+"&.	c #5D656C",
+"*.	c #9A9FA3",
+"=.	c #979999",
+"-.	c #454636",
+";.	c #C6C7A7",
+">.	c #FFFFEB",
+",.	c #FFF0C1",
+"'.	c #FFDA83",
+").	c #FFCA55",
+"!.	c #FFC443",
+"~.	c #FFC33F",
+"{.	c #FFC943",
+"].	c #FFD34A",
+"^.	c #FFDF4D",
+"/.	c #FFE94C",
+"(.	c #FEE851",
+"_.	c #7C7645",
+":.	c #2B2E2B",
+"<.	c #495057",
+"[.	c #505860",
+"}.	c #60646E",
+"|.	c #999BA1",
+"1.	c #6A6A67",
+"2.	c #68684E",
+"3.	c #FCFCCA",
+"4.	c #FFF6BA",
+"5.	c #FFD877",
+"6.	c #FFC445",
+"7.	c #FFC13A",
+"8.	c #FFC43B",
+"9.	c #FFCA3E",
+"0.	c #FFD042",
+"a.	c #FFD845",
+"b.	c #FFE049",
+"c.	c #FFE54C",
+"d.	c #FFE94E",
+"e.	c #C7B250",
+"f.	c #33342A",
+"g.	c #383B41",
+"h.	c #464A56",
+"i.	c #676E75",
+"j.	c #929699",
+"k.	c #4B4C46",
+"l.	c #97976B",
+"m.	c #FFFFB5",
+"n.	c #FFE887",
+"o.	c #FFCC4D",
+"p.	c #FFC63C",
+"q.	c #FFCB3F",
+"r.	c #FFD143",
+"s.	c #FFD847",
+"t.	c #FFE74B",
+"u.	c #FFED4F",
+"v.	c #FFED53",
+"w.	c #FFE654",
+"x.	c #ECCA54",
+"y.	c #4D4B35",
+"z.	c #313637",
+"A.	c #4C545B",
+"B.	c #5C606B",
+"C.	c #7F8187",
+"D.	c #3C3D37",
+"E.	c #ACA96B",
+"F.	c #FFFF93",
+"G.	c #FFE168",
+"H.	c #FFCF46",
+"I.	c #FFD142",
+"J.	c #FFD846",
+"K.	c #FFE14A",
+"L.	c #FFEA4D",
+"M.	c #FFF055",
+"N.	c #FFF262",
+"O.	c #FFF46E",
+"P.	c #FFF374",
+"Q.	c #FFE667",
+"R.	c #F8CE56",
+"S.	c #58543A",
+"T.	c #2A2C2D",
+"U.	c #434651",
+"V.	c #5E666D",
+"W.	c #757A7F",
+"X.	c #363834",
+"Y.	c #A7A25C",
+"Z.	c #FFFB72",
+"`.	c #FFE256",
+" +	c #FFDD48",
+".+	c #FFE64B",
+"++	c #FFEF54",
+"@+	c #FFF46A",
+"#+	c #FFF584",
+"$+	c #FFF694",
+"%+	c #FFF79A",
+"&+	c #FFF496",
+"*+	c #FFE477",
+"=+	c #F4C758",
+"-+	c #545138",
+";+	c #2D3030",
+">+	c #515560",
+",+	c #5E626B",
+"'+	c #353735",
+")+	c #858147",
+"!+	c #FFF255",
+"~+	c #FFE64C",
+"{+	c #FFE24A",
+"]+	c #FFFABD",
+"^+	c #FFF3AA",
+"/+	c #FFDE78",
+"(+	c #DFB657",
+"_+	c #434231",
+":+	c #2D3033",
+"<+	c #424550",
+"[+	c #555C64",
+"}+	c #545C63",
+"|+	c #3C403F",
+"1+	c #4D4C34",
+"2+	c #EED952",
+"3+	c #FFE94D",
+"4+	c #FFE74E",
+"5+	c #FFF9CC",
+"6+	c #FFE8A0",
+"7+	c #FFD667",
+"8+	c #A9904D",
+"9+	c #2A2C26",
+"0+	c #393E42",
+"a+	c #4A5259",
+"b+	c #020202",
+"c+	c #050503",
+"d+	c #24251F",
+"e+	c #9C924C",
+"f+	c #FFE650",
+"g+	c #FFE050",
+"h+	c #FFE767",
+"i+	c #FFF18C",
+"j+	c #FFF6AC",
+"k+	c #FFF9C3",
+"l+	c #FFF9CF",
+"m+	c #FFF4CA",
+"n+	c #FFE7A8",
+"o+	c #FFD772",
+"p+	c #EABC57",
+"q+	c #565239",
+"r+	c #13130F",
+"s+	c #010101",
+"t+	c #12130E",
+"u+	c #3C3C2E",
+"v+	c #BDA850",
+"w+	c #FFDC52",
+"x+	c #FFD858",
+"y+	c #FFDA6D",
+"z+	c #FFDF86",
+"A+	c #FFE495",
+"B+	c #FFE295",
+"C+	c #FFD366",
+"D+	c #F2C257",
+"E+	c #7A6E45",
+"F+	c #1F211A",
+"G+	c #060604",
+"H+	c #BEBEBE",
+"I+	c #BBBBBB",
+"J+	c #A9A9A8",
+"K+	c #585853",
+"L+	c #3D3E2F",
+"M+	c #A08D4C",
+"N+	c #EDC252",
+"O+	c #FFCB53",
+"P+	c #FFCE56",
+"Q+	c #FFD059",
+"R+	c #FFCF58",
+"S+	c #FFC854",
+"T+	c #D2AB52",
+"U+	c #6E6541",
+"V+	c #33352E",
+"W+	c #6D6D6B",
+"X+	c #999999",
+"Y+	c #B4B4B4",
+"Z+	c #BCBCBC",
+"`+	c #B6B6B6",
+" @	c #A3A3A3",
+".@	c #62625E",
+"+@	c #33362E",
+"@@	c #555139",
+"#@	c #8A7947",
+"$@	c #A98E4A",
+"%@	c #AF924A",
+"&@	c #9F8849",
+"*@	c #736942",
+"=@	c #3D3E30",
+"-@	c #3D3F39",
+";@	c #727270",
+">@	c #969696",
+",@	c #AFAFAF",
+"'@	c #A6A6A6",
+")@	c #828280",
+"!@	c #555551",
+"~@	c #3B3D39",
+"{@	c #303430",
+"]@	c #30342E",
+"^@	c #444541",
+"/@	c #61615E",
+"(@	c #858584",
+"_@	c #9D9D9D",
+":@	c #B2B2B2",
+"<@	c #BDBDBD",
+"[@	c #ADADAD",
+"}@	c #A0A0A0",
+"|@	c #8E8E8D",
+"1@	c #7E7E7E",
+"2@	c #797979",
+"3@	c #80807F",
+"4@	c #8E8E8E",
+"5@	c #9B9B9B",
+"6@	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . # $ % & * = - ; > , ' . . . . ",
+") ) ) ! ~ { ] ^ / ( _ : < [ } | 1 ) ) ) ",
+"2 2 3 4 5 6 7 8 9 0 a b c d e f g h 2 2 ",
+") ) i j k l m n o p q r s t u v w x y ) ",
+"2 z A B C D E F G H I J K L M N O P 2 2 ",
+"y Q R S T U V W X Y Z `  ...+.@.#.$.%.) ",
+"&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.",
+"}.|.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.b.t.u.v.w.x.y.z.A.",
+"B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.R.S.T.U.",
+"V.W.X.Y.Z.`.J. +.+++@+#+$+%+&+*+=+-+;+<.",
+">+,+'+)+!+~+{+. . . . . . ]+^+/+(+_+:+<+",
+"[+}+|+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+. ",
+". . . t+u+v+w+x+y+z+A+B+'.C+D+E+F+G+. . ",
+"H+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+V+W+X+Y+H+",
+"H+H+Z+`+ @.@+@@@#@$@%@&@*@=@-@;@>@,@H+H+",
+"H+H+H+I+Y+'@)@!@~@{@]@X.^@/@(@_@:@<@H+H+",
+"H+H+H+H+I+`+[@}@|@1@2@3@4@5@+ 6@H+H+H+H+"};
diff --git a/themes/gorilla/left-active.xpm b/themes/gorilla/left-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..41d87595cc5085672668b76a96a870bc171685c6
--- /dev/null
+++ b/themes/gorilla/left-active.xpm
@@ -0,0 +1,135 @@
+/* XPM */
+static char * left_active_xpm[] = {
+"6 128 4 1",
+" 	c None",
+".	c #000000",
+"+	c #A9A9A9",
+"@	c #D3D3D3",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@",
+"...+@@"};
diff --git a/themes/gorilla/left-inactive.xpm b/themes/gorilla/left-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..6d20156f7d5f1f76dfe47087f05352dd4564158c
--- /dev/null
+++ b/themes/gorilla/left-inactive.xpm
@@ -0,0 +1,136 @@
+/* XPM */
+static char * left_inactive_xpm[] = {
+"6 128 5 1",
+" 	c None",
+".	c #D7D7CF",
+"+	c #000000",
+"@	c #A9A9A9",
+"#	c #D3D3D3",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##",
+".++@##"};
diff --git a/themes/gorilla/maximize-active.xpm b/themes/gorilla/maximize-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..d7860820dcda4f6e22cd53ca02b028c413ab2765
--- /dev/null
+++ b/themes/gorilla/maximize-active.xpm
@@ -0,0 +1,300 @@
+/* XPM */
+static char * maximize_active_xpm[] = {
+"20 26 271 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #A9A9A9",
+"@ 	c #D3D3D3",
+"# 	c #0D0D0D",
+"$ 	c #343434",
+"% 	c #5F5F5F",
+"& 	c #858585",
+"* 	c #929292",
+"= 	c #8D8D8D",
+"- 	c #777777",
+"; 	c #565656",
+"> 	c #323232",
+", 	c #161616",
+"' 	c #050505",
+") 	c #494D59",
+"! 	c #4A4E5A",
+"~ 	c #696C76",
+"{ 	c #9B9DA4",
+"] 	c #C3C4C8",
+"^ 	c #C4C5C6",
+"/ 	c #AAAAAB",
+"( 	c #919292",
+"_ 	c #878888",
+": 	c #8A8B8C",
+"< 	c #929397",
+"[ 	c #8C8F95",
+"} 	c #787B83",
+"| 	c #61656F",
+"1 	c #505460",
+"2 	c #515961",
+"3 	c #545C64",
+"4 	c #7B8187",
+"5 	c #B6B9BD",
+"6 	c #CACBCC",
+"7 	c #90908E",
+"8 	c #4D4D47",
+"9 	c #39382F",
+"0 	c #3D3D31",
+"a 	c #3E3D2F",
+"b 	c #37362A",
+"c 	c #2F302B",
+"d 	c #484A4B",
+"e 	c #737679",
+"f 	c #70767C",
+"g 	c #636A71",
+"h 	c #575E66",
+"i 	c #70737C",
+"j 	c #B4B5BA",
+"k 	c #B9B9BA",
+"l 	c #5A5A56",
+"m 	c #39392D",
+"n 	c #817F6D",
+"o 	c #C3C0A7",
+"p 	c #E9E0BA",
+"q 	c #F0E3AD",
+"r 	c #DCCD88",
+"s 	c #AC9D59",
+"t 	c #59522D",
+"u 	c #1D1E1B",
+"v 	c #47494B",
+"w 	c #555962",
+"x 	c #4E525E",
+"y 	c #4B4F5A",
+"z 	c #656C73",
+"A 	c #A5A9AD",
+"B 	c #B9BABA",
+"C 	c #4F504B",
+"D 	c #4F4E3F",
+"E 	c #D2D0B7",
+"F 	c #FFFFEB",
+"G 	c #FFFFE6",
+"H 	c #FFF9D2",
+"I 	c #FFF4B7",
+"J 	c #FFEF96",
+"K 	c #FFED72",
+"L 	c #FADA4D",
+"M 	c #9B872B",
+"N 	c #202016",
+"O 	c #2E3232",
+"P 	c #515960",
+"Q 	c #7F828A",
+"R 	c #B3B4B8",
+"S 	c #646462",
+"T 	c #434333",
+"U 	c #E3DDBB",
+"V 	c #FFFFE5",
+"W 	c #FFF9DE",
+"X 	c #FFF8DA",
+"Y 	c #FFF5C9",
+"Z 	c #FFEFAC",
+"` 	c #FFE783",
+" .	c #FFDE58",
+"..	c #FFD931",
+"+.	c #FFD910",
+"@.	c #9E8317",
+"#.	c #171918",
+"$.	c #33363B",
+"%.	c #484C58",
+"&.	c #5E666D",
+"*.	c #9A9EA3",
+"=.	c #959798",
+"-.	c #2D2D25",
+";.	c #B4AB82",
+">.	c #FFFFD0",
+",.	c #FFF5CF",
+"'.	c #FFCB00",
+").	c #FCC203",
+"!.	c #5E501E",
+"~.	c #1D2124",
+"{.	c #484F55",
+"].	c #646872",
+"^.	c #989AA1",
+"/.	c #636363",
+"(.	c #4A4731",
+"_.	c #F9E8A1",
+":.	c #FFF2B3",
+"<.	c #FFF1BA",
+"[.	c #FFBF00",
+"}.	c #FFC000",
+"|.	c #B38513",
+"1.	c #191C1B",
+"2.	c #34373E",
+"3.	c #71777E",
+"4.	c #909598",
+"5.	c #3D3E3E",
+"6.	c #7E7444",
+"7.	c #FFEE8A",
+"8.	c #FFE98F",
+"9.	c #FFEA96",
+"0.	c #FFB300",
+"a.	c #FFB000",
+"b.	c #E1990A",
+"c.	c #2F2C1E",
+"d.	c #2A2F32",
+"e.	c #4D555D",
+"f.	c #686B75",
+"g.	c #7D7F86",
+"h.	c #292B2D",
+"i.	c #96863F",
+"j.	c #FFEA62",
+"k.	c #FFDF60",
+"l.	c #FFE061",
+"m.	c #FFDE54",
+"n.	c #FFD836",
+"o.	c #FFCF0F",
+"p.	c #FFC100",
+"q.	c #FFB400",
+"r.	c #FFA500",
+"s.	c #FFA200",
+"t.	c #F39905",
+"u.	c #38331F",
+"v.	c #212327",
+"w.	c #444752",
+"x.	c #666D74",
+"y.	c #73797E",
+"z.	c #24282A",
+"A.	c #907E2D",
+"B.	c #FFE032",
+"C.	c #FFD528",
+"D.	c #FFD320",
+"E.	c #FFCD0C",
+"F.	c #FFC500",
+"G.	c #FFBA00",
+"H.	c #FFAD00",
+"I.	c #FF9800",
+"J.	c #FF9700",
+"K.	c #EE8F06",
+"L.	c #36311F",
+"M.	c #23282A",
+"N.	c #4A5259",
+"O.	c #565A65",
+"P.	c #5D606A",
+"Q.	c #282B2F",
+"R.	c #685C1E",
+"S.	c #FFD108",
+"T.	c #FFCA00",
+"U.	c #FFB900",
+"V.	c #FFAE00",
+"W.	c #FF9A00",
+"X.	c #FF9300",
+"Y.	c #FF8F00",
+"Z.	c #D17E0E",
+"`.	c #26261D",
+" +	c #27292E",
+".+	c #434752",
+"++	c #535B63",
+"@+	c #34383A",
+"#+	c #2F2D1B",
+"$+	c #E5B108",
+"%+	c #FFC300",
+"&+	c #FFB800",
+"*+	c #FF9000",
+"=+	c #FF9600",
+"-+	c #906019",
+";+	c #151B1B",
+">+	c #363B3F",
+",+	c #4B535A",
+"'+	c #020202",
+")+	c #010100",
+"!+	c #101314",
+"~+	c #81691B",
+"{+	c #FFBC01",
+"]+	c #FFA700",
+"^+	c #FF9F00",
+"/+	c #FF9500",
+"(+	c #FF9400",
+"_+	c #DF840B",
+":+	c #373120",
+"<+	c #090B09",
+"[+	c #0A0A08",
+"}+	c #21211C",
+"|+	c #A87C17",
+"1+	c #FFAD01",
+"2+	c #FF9100",
+"3+	c #EB8B08",
+"4+	c #5C461F",
+"5+	c #0E1210",
+"6+	c #040402",
+"7+	c #BEBEBE",
+"8+	c #BBBBBB",
+"9+	c #AAAAA9",
+"0+	c #50504E",
+"a+	c #22231C",
+"b+	c #86611B",
+"c+	c #E48F09",
+"d+	c #FF9501",
+"e+	c #FC9103",
+"f+	c #C17811",
+"g+	c #4F3F20",
+"h+	c #202524",
+"i+	c #6B6B69",
+"j+	c #9A9A99",
+"k+	c #B4B4B4",
+"l+	c #BCBCBC",
+"m+	c #B6B6B6",
+"n+	c #A3A3A3",
+"o+	c #5C5D5B",
+"p+	c #1F2323",
+"q+	c #37311F",
+"r+	c #6F4F1D",
+"s+	c #936117",
+"t+	c #9A6316",
+"u+	c #865B1A",
+"v+	c #56421F",
+"w+	c #21241C",
+"x+	c #303332",
+"y+	c #70706F",
+"z+	c #969696",
+"A+	c #AFAFAF",
+"B+	c #A7A7A6",
+"C+	c #818180",
+"D+	c #4E4F4E",
+"E+	c #1E2425",
+"F+	c #1C2325",
+"G+	c #242A2B",
+"H+	c #3A3D3B",
+"I+	c #5D5D5C",
+"J+	c #848484",
+"K+	c #9C9C9C",
+"L+	c #B2B2B2",
+"M+	c #BDBDBD",
+"N+	c #ADADAD",
+"O+	c #A0A0A0",
+"P+	c #8E8E8E",
+"Q+	c #7E7E7E",
+"R+	c #797979",
+"S+	c #808080",
+"T+	c #8F8F8F",
+"U+	c #9B9B9B",
+"V+	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . # $ % & * = - ; > , ' . . . . ",
+") ) ) ! ~ { ] ^ / ( _ : < [ } | 1 ) ) ) ",
+"2 2 3 4 5 6 7 8 9 0 a b c d e f g h 2 2 ",
+") ) i j k l m n o p q r s t u v w x y ) ",
+"2 z A B C D E F G H I J K L M N O P 2 2 ",
+"y Q R S T U V W X Y Z `  ...+.@.#.$.%.) ",
+"&.*.=.-.;.>.,.. . . . . . . '.).!.~.{.2 ",
+"].^./.(._.:.<.. . . . . . . [.}.|.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.t.u.v.w.",
+"x.y.z.A.B.C.D.. E.F.G.H.s.. I.J.K.L.M.N.",
+"O.P.Q.R.S.T.F.. U.V.r.W.X.. Y.X.Z.`. +.+",
+"h ++@+#+$+%+&+. . . . . . . *+=+-+;+>+,+",
+"'+. )+!+~+{+a.]+^+/+*+*+*+*+(+_+:+<+. . ",
+". . . [+}+|+1+s.=+*+*+*+2+/+3+4+5+6+. . ",
+"7+7+8+9+0+a+b+c+d+=+=+/+e+f+g+h+i+j+k+7+",
+"7+7+l+m+n+o+p+q+r+s+t+u+v+w+x+y+z+A+7+7+",
+"7+7+7+8+k+B+C+D+O E+F+G+H+I+J+K+L+M+7+7+",
+"7+7+7+7+8+m+N+O+P+Q+R+S+T+U++ V+7+7+7+7+"};
diff --git a/themes/gorilla/maximize-inactive.xpm b/themes/gorilla/maximize-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..f370659529e213bf820711188b05da94ab58eecf
--- /dev/null
+++ b/themes/gorilla/maximize-inactive.xpm
@@ -0,0 +1,309 @@
+/* XPM */
+static char * maximize_inactive_xpm[] = {
+"20 26 280 2",
+"  	c None",
+". 	c #D7D7CF",
+"+ 	c #000000",
+"@ 	c #A9A9A9",
+"# 	c #D3D3D3",
+"$ 	c #0D0D0D",
+"% 	c #343434",
+"& 	c #5F5F5F",
+"* 	c #858585",
+"= 	c #929292",
+"- 	c #8D8D8D",
+"; 	c #777777",
+"> 	c #565656",
+", 	c #323232",
+"' 	c #161616",
+") 	c #050505",
+"! 	c #494D59",
+"~ 	c #4A4E5A",
+"{ 	c #696C76",
+"] 	c #9B9DA4",
+"^ 	c #C3C4C8",
+"/ 	c #C4C5C6",
+"( 	c #AAAAAB",
+"_ 	c #919292",
+": 	c #878888",
+"< 	c #8A8B8C",
+"[ 	c #929397",
+"} 	c #8C8F95",
+"| 	c #787B83",
+"1 	c #61656F",
+"2 	c #505460",
+"3 	c #515961",
+"4 	c #545C64",
+"5 	c #7B8187",
+"6 	c #B6B9BD",
+"7 	c #CACBCC",
+"8 	c #90908D",
+"9 	c #4D4D46",
+"0 	c #39392F",
+"a 	c #3D3D32",
+"b 	c #3E3E31",
+"c 	c #37372B",
+"d 	c #2F2F2A",
+"e 	c #48494A",
+"f 	c #737679",
+"g 	c #70767C",
+"h 	c #636A71",
+"i 	c #575E66",
+"j 	c #70737C",
+"k 	c #B4B5BA",
+"l 	c #B9B9BA",
+"m 	c #5A5A55",
+"n 	c #39392E",
+"o 	c #818177",
+"p 	c #C3C3B9",
+"q 	c #E9E9D1",
+"r 	c #F0F0C4",
+"s 	c #DCDC9D",
+"t 	c #ACAB67",
+"u 	c #595732",
+"v 	c #1D1E1B",
+"w 	c #47484B",
+"x 	c #555962",
+"y 	c #4E525E",
+"z 	c #4B4F5A",
+"A 	c #656C73",
+"B 	c #A5A9AD",
+"C 	c #B9BABA",
+"D 	c #4F4F4A",
+"E 	c #4F4F43",
+"F 	c #D2D2CB",
+"G 	c #FFFFFF",
+"H 	c #FFFFEB",
+"I 	c #FFFFD1",
+"J 	c #FFFFB0",
+"K 	c #FFFF8D",
+"L 	c #FAF365",
+"M 	c #9B9337",
+"N 	c #202016",
+"O 	c #2E3232",
+"P 	c #515960",
+"Q 	c #7F828A",
+"R 	c #B3B4B8",
+"S 	c #646461",
+"T 	c #434336",
+"U 	c #E3E3D0",
+"V 	c #FFFFF8",
+"W 	c #FFFFF3",
+"X 	c #FFFFE2",
+"Y 	c #FFFFC5",
+"Z 	c #FFFF9C",
+"` 	c #FFF770",
+" .	c #FFF34B",
+"..	c #FFF32A",
+"+.	c #9E9024",
+"@.	c #171918",
+"#.	c #33363B",
+"$.	c #484C58",
+"%.	c #5D646C",
+"&.	c #9A9EA3",
+"*.	c #959797",
+"=.	c #2D2D25",
+"-.	c #B4B492",
+";.	c #FFFFEA",
+">.	c #FFFFE8",
+",.	c #FFE418",
+"'.	c #FCDB1B",
+").	c #5E5623",
+"!.	c #1D2123",
+"~.	c #484F56",
+"{.	c #505860",
+"].	c #62656F",
+"^.	c #9A9CA2",
+"/.	c #636363",
+"(.	c #4A4A35",
+"_.	c #F9F9B9",
+":.	c #FFFFCD",
+"<.	c #FFFFD3",
+"[.	c #FFD818",
+"}.	c #FFDB18",
+"|.	c #B39522",
+"1.	c #191C1B",
+"2.	c #36383F",
+"3.	c #464A56",
+"4.	c #6E747B",
+"5.	c #93979B",
+"6.	c #3D3D3D",
+"7.	c #7E7D4E",
+"8.	c #FFFFA4",
+"9.	c #FFFFA8",
+"0.	c #FFFFAF",
+"a.	c #FFCC19",
+"b.	c #FFCA18",
+"c.	c #E1AE1F",
+"d.	c #2F2D1F",
+"e.	c #2D3134",
+"f.	c #4C545B",
+"g.	c #666973",
+"h.	c #7F8188",
+"i.	c #29292C",
+"j.	c #96934B",
+"k.	c #FFFF7C",
+"l.	c #FFF979",
+"m.	c #FFF97A",
+"n.	c #FFF76D",
+"o.	c #FFF24F",
+"p.	c #FFE828",
+"q.	c #FFDA16",
+"r.	c #FFCD19",
+"s.	c #FFBE19",
+"t.	c #FFBB19",
+"u.	c #F3B01B",
+"v.	c #383420",
+"w.	c #232529",
+"x.	c #424651",
+"y.	c #646B72",
+"z.	c #747A7F",
+"A.	c #242529",
+"B.	c #908A39",
+"C.	c #FFFB4D",
+"D.	c #FFEE42",
+"E.	c #FFED39",
+"F.	c #FFE625",
+"G.	c #FFDE19",
+"H.	c #FFD316",
+"I.	c #FFC619",
+"J.	c #FFB119",
+"K.	c #EEA61C",
+"L.	c #363220",
+"M.	c #262A2C",
+"N.	c #495057",
+"O.	c #545863",
+"P.	c #5D616B",
+"Q.	c #282A2E",
+"R.	c #686225",
+"S.	c #FFEA21",
+"T.	c #FFE31A",
+"U.	c #FFDE17",
+"V.	c #FFD217",
+"W.	c #FFC718",
+"X.	c #FFB319",
+"Y.	c #FFAC19",
+"Z.	c #FFA819",
+"`.	c #FFAE18",
+" +	c #D19121",
+".+	c #26261D",
+"++	c #292B31",
+"@+	c #424550",
+"#+	c #555D65",
+"$+	c #535B63",
+"%+	c #34383A",
+"&+	c #2F2E1C",
+"*+	c #E5C71D",
+"=+	c #FFDD18",
+"-+	c #FFD119",
+";+	c #FFA919",
+">+	c #FFB019",
+",+	c #906B24",
+"'+	c #151A1B",
+")+	c #373C41",
+"!+	c #4A5259",
+"~+	c #010101",
+"{+	c #010100",
+"]+	c #101213",
+"^+	c #817225",
+"/+	c #FFD61A",
+"(+	c #FFC919",
+"_+	c #FFC019",
+":+	c #FFB819",
+"<+	c #FFAE19",
+"[+	c #FFAF18",
+"}+	c #DF9920",
+"|+	c #373321",
+"1+	c #090A09",
+"2+	c #0A0A08",
+"3+	c #21211C",
+"4+	c #A88924",
+"5+	c #FFC71A",
+"6+	c #FFBC18",
+"7+	c #FFAA19",
+"8+	c #FFB018",
+"9+	c #EBA11E",
+"0+	c #5C4B24",
+"a+	c #0E1010",
+"b+	c #040402",
+"c+	c #BEBEBE",
+"d+	c #BBBBBB",
+"e+	c #AAAAA9",
+"f+	c #50504E",
+"g+	c #22231C",
+"h+	c #866C25",
+"i+	c #E4A51E",
+"j+	c #FFAE1A",
+"k+	c #FFB118",
+"l+	c #FFAF19",
+"m+	c #FCAA1C",
+"n+	c #C18922",
+"o+	c #4F4323",
+"p+	c #202423",
+"q+	c #6B6B69",
+"r+	c #9A9A99",
+"s+	c #B4B4B4",
+"t+	c #BCBCBC",
+"u+	c #B6B6B6",
+"v+	c #A3A3A3",
+"w+	c #5C5D5B",
+"x+	c #1F2222",
+"y+	c #373220",
+"z+	c #6F5624",
+"A+	c #936C23",
+"B+	c #9A7022",
+"C+	c #866524",
+"D+	c #564724",
+"E+	c #21231C",
+"F+	c #303332",
+"G+	c #70706F",
+"H+	c #969696",
+"I+	c #AFAFAF",
+"J+	c #A7A7A6",
+"K+	c #818180",
+"L+	c #4E4F4E",
+"M+	c #2E3131",
+"N+	c #1E2324",
+"O+	c #1C2223",
+"P+	c #242829",
+"Q+	c #3A3C3B",
+"R+	c #5D5D5C",
+"S+	c #848484",
+"T+	c #9C9C9C",
+"U+	c #B2B2B2",
+"V+	c #BDBDBD",
+"W+	c #ADADAD",
+"X+	c #A0A0A0",
+"Y+	c #8E8E8E",
+"Z+	c #7E7E7E",
+"`+	c #797979",
+" @	c #808080",
+".@	c #8F8F8F",
+"+@	c #9B9B9B",
+"@@	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# # # # # # # # # # # # # # # # # # # # ",
+"# # # # # # # # # # # # # # # # # # # # ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"+ + + + + $ % & * = - ; > , ' ) + + + + ",
+"! ! ! ~ { ] ^ / ( _ : < [ } | 1 2 ! ! ! ",
+"3 3 4 5 6 7 8 9 0 a b c d e f g h i 3 3 ",
+"! ! j k l m n o p q r s t u v w x y z ! ",
+"3 A B C D E F G G H I J K L M N O P 3 3 ",
+"~ Q R S T U G V W X Y Z `  ...+.@.#.$.! ",
+"%.&.*.=.-.;.>.+ + + + + + + ,.'.).!.~.{.",
+"].^./.(._.:.<.+ + + + + + + [.}.|.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.t.u.v.w.x.",
+"y.z.A.B.C.D.E.+ F.G.H.I.t.+ J.J.K.L.M.N.",
+"O.P.Q.R.S.T.U.+ V.W.s.X.Y.+ Z.`. +.+++@+",
+"#+$+%+&+*+=+-++ + + + + + + ;+>+,+'+)+!+",
+"~++ {+]+^+/+(+_+:+<+;+;+;+;+[+}+|+1++ + ",
+"+ + + 2+3+4+5+6+>+;+;+;+7+8+9+0+a+b++ + ",
+"c+c+d+e+f+g+h+i+j+>+k+l+m+n+o+p+q+r+s+c+",
+"c+c+t+u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+c+c+",
+"c+c+c+d+s+J+K+L+M+N+O+P+Q+R+S+T+U+V+c+c+",
+"c+c+c+c+d+u+W+X+Y+Z+`+ @.@+@@ @@c+c+c+c+"};
diff --git a/themes/gorilla/maximize-pressed.xpm b/themes/gorilla/maximize-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..ca112be0a0286f1dd2d4b5e80e3b4b63fea54bca
--- /dev/null
+++ b/themes/gorilla/maximize-pressed.xpm
@@ -0,0 +1,320 @@
+/* XPM */
+static char * maximize_pressed_xpm[] = {
+"20 26 291 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #A9A9A9",
+"@ 	c #D3D3D3",
+"# 	c #0D0D0D",
+"$ 	c #343434",
+"% 	c #5F5F5F",
+"& 	c #858585",
+"* 	c #929292",
+"= 	c #8D8D8D",
+"- 	c #777777",
+"; 	c #565656",
+"> 	c #323232",
+", 	c #161616",
+"' 	c #050505",
+") 	c #494D59",
+"! 	c #4A4E5A",
+"~ 	c #696C76",
+"{ 	c #9B9DA4",
+"] 	c #C2C3C8",
+"^ 	c #C3C4C5",
+"/ 	c #ACACAB",
+"( 	c #959693",
+"_ 	c #8B8B8A",
+": 	c #8D8E8D",
+"< 	c #949598",
+"[ 	c #8D8F96",
+"} 	c #787B83",
+"| 	c #61656F",
+"1 	c #505460",
+"2 	c #515961",
+"3 	c #545C64",
+"4 	c #7B8187",
+"5 	c #B6B9BD",
+"6 	c #C9CACB",
+"7 	c #949490",
+"8 	c #5B5B51",
+"9 	c #525241",
+"0 	c #595947",
+"a 	c #5B5B46",
+"b 	c #525240",
+"c 	c #45453A",
+"d 	c #535450",
+"e 	c #76797A",
+"f 	c #71787D",
+"g 	c #636A71",
+"h 	c #575E66",
+"i 	c #70737C",
+"j 	c #B4B5BA",
+"k 	c #BABBBA",
+"l 	c #66665C",
+"m 	c #565643",
+"n 	c #9A9A8A",
+"o 	c #D3D4C7",
+"p 	c #F0F0DD",
+"q 	c #F5F6D4",
+"r 	c #E6E7B4",
+"s 	c #C0C085",
+"t 	c #76754F",
+"u 	c #36362B",
+"v 	c #4D4E4E",
+"w 	c #575A63",
+"x 	c #4E525E",
+"y 	c #4B4F5A",
+"z 	c #656C73",
+"A 	c #A6AAAE",
+"B 	c #B9BABA",
+"C 	c #5C5C53",
+"D 	c #6E6E5A",
+"E 	c #DFDFD6",
+"F 	c #FFFFFF",
+"G 	c #FFFFFD",
+"H 	c #FFFFE5",
+"I 	c #FFFDCF",
+"J 	c #FFFFBA",
+"K 	c #FFFFA6",
+"L 	c #FEFA8A",
+"M 	c #B3AD5E",
+"N 	c #3B3B2B",
+"O 	c #373B39",
+"P 	c #525961",
+"Q 	c #7F828A",
+"R 	c #B3B5B8",
+"S 	c #6C6D67",
+"T 	c #62624D",
+"U 	c #EDEDDC",
+"V 	c #FFFFFC",
+"W 	c #FFF6DC",
+"X 	c #FFE9B3",
+"Y 	c #FFDF90",
+"Z 	c #FFDC7D",
+"` 	c #FFE076",
+" .	c #FFE874",
+"..	c #FFF16C",
+"+.	c #FFF95D",
+"@.	c #B5AB4F",
+"#.	c #313129",
+"$.	c #383B3F",
+"%.	c #484C58",
+"&.	c #5D656C",
+"*.	c #9A9FA3",
+"=.	c #979999",
+"-.	c #454636",
+";.	c #C6C7A7",
+">.	c #FFFFEB",
+",.	c #FFF0C1",
+"'.	c #FFE94C",
+").	c #FEE851",
+"!.	c #7C7645",
+"~.	c #2B2E2B",
+"{.	c #495057",
+"].	c #505860",
+"^.	c #60646E",
+"/.	c #999BA1",
+"(.	c #6A6A67",
+"_.	c #68684E",
+":.	c #FCFCCA",
+"<.	c #FFF6BA",
+"[.	c #FFD877",
+"}.	c #FFE54C",
+"|.	c #FFE94E",
+"1.	c #C7B250",
+"2.	c #33342A",
+"3.	c #383B41",
+"4.	c #464A56",
+"5.	c #676E75",
+"6.	c #929699",
+"7.	c #4B4C46",
+"8.	c #97976B",
+"9.	c #FFFFB5",
+"0.	c #FFE887",
+"a.	c #FFCC4D",
+"b.	c #FFED53",
+"c.	c #FFE654",
+"d.	c #ECCA54",
+"e.	c #4D4B35",
+"f.	c #313637",
+"g.	c #4C545B",
+"h.	c #5C606B",
+"i.	c #7F8187",
+"j.	c #3C3D37",
+"k.	c #ACA96B",
+"l.	c #FFFF93",
+"m.	c #FFE168",
+"n.	c #FFCF46",
+"o.	c #FFD846",
+"p.	c #FFE14A",
+"q.	c #FFEA4D",
+"r.	c #FFF055",
+"s.	c #FFF262",
+"t.	c #FFF374",
+"u.	c #FFE667",
+"v.	c #F8CE56",
+"w.	c #58543A",
+"x.	c #2A2C2D",
+"y.	c #434651",
+"z.	c #5E666D",
+"A.	c #757A7F",
+"B.	c #363834",
+"C.	c #A7A25C",
+"D.	c #FFFB72",
+"E.	c #FFE256",
+"F.	c #FFE64B",
+"G.	c #FFEF54",
+"H.	c #FFF46A",
+"I.	c #FFF584",
+"J.	c #FFF694",
+"K.	c #FFF496",
+"L.	c #FFE477",
+"M.	c #F4C758",
+"N.	c #545138",
+"O.	c #2D3030",
+"P.	c #515560",
+"Q.	c #5E626B",
+"R.	c #353735",
+"S.	c #858147",
+"T.	c #FFF255",
+"U.	c #FFE64C",
+"V.	c #FFE24A",
+"W.	c #FFF158",
+"X.	c #FFF578",
+"Y.	c #FFF898",
+"Z.	c #FFF9B0",
+"`.	c #FFFABA",
+" +	c #FFF3AA",
+".+	c #FFDE78",
+"++	c #DFB657",
+"@+	c #434231",
+"#+	c #2D3033",
+"$+	c #424550",
+"%+	c #555C64",
+"&+	c #545C63",
+"*+	c #3C403F",
+"=+	c #4D4C34",
+"-+	c #EED952",
+";+	c #FFE94D",
+">+	c #FFE74E",
+",+	c #FFE8A0",
+"'+	c #FFD667",
+")+	c #A9904D",
+"!+	c #2A2C26",
+"~+	c #393E42",
+"{+	c #4A5259",
+"]+	c #020202",
+"^+	c #050503",
+"/+	c #24251F",
+"(+	c #9C924C",
+"_+	c #FFE650",
+":+	c #FFE050",
+"<+	c #FFE767",
+"[+	c #FFF18C",
+"}+	c #FFF6AC",
+"|+	c #FFF9C3",
+"1+	c #FFF9CF",
+"2+	c #FFF4CA",
+"3+	c #FFE7A8",
+"4+	c #FFD772",
+"5+	c #EABC57",
+"6+	c #565239",
+"7+	c #13130F",
+"8+	c #010101",
+"9+	c #12130E",
+"0+	c #3C3C2E",
+"a+	c #BDA850",
+"b+	c #FFDC52",
+"c+	c #FFD858",
+"d+	c #FFDA6D",
+"e+	c #FFDF86",
+"f+	c #FFE495",
+"g+	c #FFE295",
+"h+	c #FFDA83",
+"i+	c #FFD366",
+"j+	c #F2C257",
+"k+	c #7A6E45",
+"l+	c #1F211A",
+"m+	c #060604",
+"n+	c #BEBEBE",
+"o+	c #BBBBBB",
+"p+	c #A9A9A8",
+"q+	c #585853",
+"r+	c #3D3E2F",
+"s+	c #A08D4C",
+"t+	c #EDC252",
+"u+	c #FFCB53",
+"v+	c #FFCE56",
+"w+	c #FFD059",
+"x+	c #FFCF58",
+"y+	c #FFC854",
+"z+	c #D2AB52",
+"A+	c #6E6541",
+"B+	c #33352E",
+"C+	c #6D6D6B",
+"D+	c #999999",
+"E+	c #B4B4B4",
+"F+	c #BCBCBC",
+"G+	c #B6B6B6",
+"H+	c #A3A3A3",
+"I+	c #62625E",
+"J+	c #33362E",
+"K+	c #555139",
+"L+	c #8A7947",
+"M+	c #A98E4A",
+"N+	c #AF924A",
+"O+	c #9F8849",
+"P+	c #736942",
+"Q+	c #3D3E30",
+"R+	c #3D3F39",
+"S+	c #727270",
+"T+	c #969696",
+"U+	c #AFAFAF",
+"V+	c #A6A6A6",
+"W+	c #828280",
+"X+	c #555551",
+"Y+	c #3B3D39",
+"Z+	c #303430",
+"`+	c #30342E",
+" @	c #444541",
+".@	c #61615E",
+"+@	c #858584",
+"@@	c #9D9D9D",
+"#@	c #B2B2B2",
+"$@	c #BDBDBD",
+"%@	c #ADADAD",
+"&@	c #A0A0A0",
+"*@	c #8E8E8D",
+"=@	c #7E7E7E",
+"-@	c #797979",
+";@	c #80807F",
+">@	c #8E8E8E",
+",@	c #9B9B9B",
+"'@	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . # $ % & * = - ; > , ' . . . . ",
+") ) ) ! ~ { ] ^ / ( _ : < [ } | 1 ) ) ) ",
+"2 2 3 4 5 6 7 8 9 0 a b c d e f g h 2 2 ",
+") ) i j k l m n o p q r s t u v w x y ) ",
+"2 z A B C D E F G H I J K L M N O P 2 2 ",
+"y Q R S T U V W X Y Z `  ...+.@.#.$.%.) ",
+"&.*.=.-.;.>.,.. . . . . . . '.).!.~.{.].",
+"^./.(._.:.<.[.. . . . . . . }.|.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.. t.u.v.w.x.y.",
+"z.A.B.C.D.E.o.. F.G.H.I.J.. K.L.M.N.O.{.",
+"P.Q.R.S.T.U.V.. W.X.Y.Z.`..  +.+++@+#+$+",
+"%+&+*+=+-+;+>+. . . . . . . ,+'+)+!+~+{+",
+"]+. ^+/+(+_+:+<+[+}+|+1+2+3+4+5+6+7+8+. ",
+". . . 9+0+a+b+c+d+e+f+g+h+i+j+k+l+m+. . ",
+"n+n+o+p+q+r+s+t+u+v+w+x+y+z+A+B+C+D+E+n+",
+"n+n+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+n+n+",
+"n+n+n+o+E+V+W+X+Y+Z+`+B. @.@+@@@#@$@n+n+",
+"n+n+n+n+o+G+%@&@*@=@-@;@>@,@+ '@n+n+n+n+"};
diff --git a/themes/gorilla/menu-active.xpm b/themes/gorilla/menu-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..65f629ae147bea538554788601cfac84c3118dc0
--- /dev/null
+++ b/themes/gorilla/menu-active.xpm
@@ -0,0 +1,311 @@
+/* XPM */
+static char * menu_active_xpm[] = {
+"20 26 282 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #A9A9A9",
+"@ 	c #D3D3D3",
+"# 	c #0D0D0D",
+"$ 	c #343434",
+"% 	c #5F5F5F",
+"& 	c #858585",
+"* 	c #929292",
+"= 	c #8D8D8D",
+"- 	c #777777",
+"; 	c #565656",
+"> 	c #323232",
+", 	c #161616",
+"' 	c #050505",
+") 	c #494D59",
+"! 	c #4A4E5A",
+"~ 	c #696C76",
+"{ 	c #9B9DA4",
+"] 	c #C3C4C8",
+"^ 	c #C4C5C6",
+"/ 	c #AAAAAB",
+"( 	c #919292",
+"_ 	c #878888",
+": 	c #8A8B8C",
+"< 	c #929397",
+"[ 	c #8C8F95",
+"} 	c #787B83",
+"| 	c #61656F",
+"1 	c #505460",
+"2 	c #515961",
+"3 	c #545C64",
+"4 	c #7B8187",
+"5 	c #B6B9BD",
+"6 	c #CACBCC",
+"7 	c #90908E",
+"8 	c #4D4D47",
+"9 	c #39382F",
+"0 	c #3D3D31",
+"a 	c #3E3D2F",
+"b 	c #37362A",
+"c 	c #2F302B",
+"d 	c #484A4B",
+"e 	c #737679",
+"f 	c #70767C",
+"g 	c #636A71",
+"h 	c #575E66",
+"i 	c #70737C",
+"j 	c #B4B5BA",
+"k 	c #B9B9BA",
+"l 	c #5A5A56",
+"m 	c #39392D",
+"n 	c #817F6D",
+"o 	c #C3C0A7",
+"p 	c #E9E0BA",
+"q 	c #F0E3AD",
+"r 	c #DCCD88",
+"s 	c #AC9D59",
+"t 	c #59522D",
+"u 	c #1D1E1B",
+"v 	c #47494B",
+"w 	c #555962",
+"x 	c #4E525E",
+"y 	c #4B4F5A",
+"z 	c #656C73",
+"A 	c #A5A9AD",
+"B 	c #B9BABA",
+"C 	c #4F504B",
+"D 	c #4F4E3F",
+"E 	c #D2D0B7",
+"F 	c #FFFFEB",
+"G 	c #FFFFE6",
+"H 	c #FFF9D2",
+"I 	c #FFF4B7",
+"J 	c #FFEF96",
+"K 	c #FFED72",
+"L 	c #FADA4D",
+"M 	c #9B872B",
+"N 	c #202016",
+"O 	c #2E3232",
+"P 	c #515960",
+"Q 	c #7F828A",
+"R 	c #B3B4B8",
+"S 	c #646462",
+"T 	c #434333",
+"U 	c #E3DDBB",
+"V 	c #FFFFE5",
+"W 	c #FFF9DE",
+"X 	c #FFF8DA",
+"Y 	c #FFF5C9",
+"Z 	c #FFEFAC",
+"` 	c #FFE783",
+" .	c #FFDE58",
+"..	c #FFD931",
+"+.	c #FFD910",
+"@.	c #9E8317",
+"#.	c #171918",
+"$.	c #33363B",
+"%.	c #484C58",
+"&.	c #5E666D",
+"*.	c #9A9EA3",
+"=.	c #959798",
+"-.	c #2D2D25",
+";.	c #B4AB82",
+">.	c #FFFFD0",
+",.	c #FFF5CF",
+"'.	c #FFF7D4",
+").	c #FFF6D1",
+"!.	c #FFF2BF",
+"~.	c #FFEC9D",
+"{.	c #FFE36D",
+"].	c #FFD83B",
+"^.	c #FFD011",
+"/.	c #FFCB00",
+"(.	c #FCC203",
+"_.	c #5E501E",
+":.	c #1D2124",
+"<.	c #484F55",
+"[.	c #646872",
+"}.	c #989AA1",
+"|.	c #636363",
+"1.	c #4A4731",
+"2.	c #F9E8A1",
+"3.	c #FFF2B3",
+"4.	c #FFF1BA",
+"5.	c #FFF3C1",
+"6.	c #FFF3BF",
+"7.	c #FFE787",
+"8.	c #FFDC4F",
+"9.	c #FFD115",
+"0.	c #FFC800",
+"a.	c #FFBF00",
+"b.	c #FFC000",
+"c.	c #B38513",
+"d.	c #191C1B",
+"e.	c #34373E",
+"f.	c #71777E",
+"g.	c #909598",
+"h.	c #3D3E3E",
+"i.	c #7E7444",
+"j.	c #FFEE8A",
+"k.	c #FFE98F",
+"l.	c #FFEA96",
+"m.	c #FFBB00",
+"n.	c #FFB300",
+"o.	c #FFB000",
+"p.	c #E1990A",
+"q.	c #2F2C1E",
+"r.	c #2A2F32",
+"s.	c #4D555D",
+"t.	c #686B75",
+"u.	c #7D7F86",
+"v.	c #292B2D",
+"w.	c #96863F",
+"x.	c #FFEA62",
+"y.	c #FFDF60",
+"z.	c #FFE061",
+"A.	c #FFAC00",
+"B.	c #FFA500",
+"C.	c #FFA200",
+"D.	c #F39905",
+"E.	c #38331F",
+"F.	c #212327",
+"G.	c #444752",
+"H.	c #666D74",
+"I.	c #73797E",
+"J.	c #24282A",
+"K.	c #907E2D",
+"L.	c #FFE032",
+"M.	c #FFD528",
+"N.	c #FFD320",
+"O.	c #FFD017",
+"P.	c #FF9C00",
+"Q.	c #FF9800",
+"R.	c #FF9700",
+"S.	c #EE8F06",
+"T.	c #36311F",
+"U.	c #23282A",
+"V.	c #4A5259",
+"W.	c #565A65",
+"X.	c #5D606A",
+"Y.	c #282B2F",
+"Z.	c #685C1E",
+"`.	c #FFD108",
+" +	c #FFCA00",
+".+	c #FFC500",
+"++	c #FFB900",
+"@+	c #FF9A00",
+"#+	c #FF9300",
+"$+	c #FF9000",
+"%+	c #FF8F00",
+"&+	c #D17E0E",
+"*+	c #26261D",
+"=+	c #27292E",
+"-+	c #434752",
+";+	c #535B63",
+">+	c #34383A",
+",+	c #2F2D1B",
+"'+	c #E5B108",
+")+	c #FFC300",
+"!+	c #FFB800",
+"~+	c #FFB200",
+"{+	c #FFAA00",
+"]+	c #FFA000",
+"^+	c #FF9600",
+"/+	c #906019",
+"(+	c #151B1B",
+"_+	c #363B3F",
+":+	c #4B535A",
+"<+	c #020202",
+"[+	c #010100",
+"}+	c #101314",
+"|+	c #81691B",
+"1+	c #FFBC01",
+"2+	c #FFA700",
+"3+	c #FF9F00",
+"4+	c #FF9500",
+"5+	c #FF9400",
+"6+	c #DF840B",
+"7+	c #373120",
+"8+	c #090B09",
+"9+	c #0A0A08",
+"0+	c #21211C",
+"a+	c #A87C17",
+"b+	c #FFAD01",
+"c+	c #FF9100",
+"d+	c #EB8B08",
+"e+	c #5C461F",
+"f+	c #0E1210",
+"g+	c #040402",
+"h+	c #BEBEBE",
+"i+	c #BBBBBB",
+"j+	c #AAAAA9",
+"k+	c #50504E",
+"l+	c #22231C",
+"m+	c #86611B",
+"n+	c #E48F09",
+"o+	c #FF9501",
+"p+	c #FC9103",
+"q+	c #C17811",
+"r+	c #4F3F20",
+"s+	c #202524",
+"t+	c #6B6B69",
+"u+	c #9A9A99",
+"v+	c #B4B4B4",
+"w+	c #BCBCBC",
+"x+	c #B6B6B6",
+"y+	c #A3A3A3",
+"z+	c #5C5D5B",
+"A+	c #1F2323",
+"B+	c #37311F",
+"C+	c #6F4F1D",
+"D+	c #936117",
+"E+	c #9A6316",
+"F+	c #865B1A",
+"G+	c #56421F",
+"H+	c #21241C",
+"I+	c #303332",
+"J+	c #70706F",
+"K+	c #969696",
+"L+	c #AFAFAF",
+"M+	c #A7A7A6",
+"N+	c #818180",
+"O+	c #4E4F4E",
+"P+	c #1E2425",
+"Q+	c #1C2325",
+"R+	c #242A2B",
+"S+	c #3A3D3B",
+"T+	c #5D5D5C",
+"U+	c #848484",
+"V+	c #9C9C9C",
+"W+	c #B2B2B2",
+"X+	c #BDBDBD",
+"Y+	c #ADADAD",
+"Z+	c #A0A0A0",
+"`+	c #8E8E8E",
+" @	c #7E7E7E",
+".@	c #797979",
+"+@	c #808080",
+"@@	c #8F8F8F",
+"#@	c #9B9B9B",
+"$@	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . # $ % & * = - ; > , ' . . . . ",
+") ) ) ! ~ { ] ^ / ( _ : < [ } | 1 ) ) ) ",
+"2 2 3 4 5 6 7 8 9 0 a b c d e f g h 2 2 ",
+") ) i j k l m n o p q r s t u v w x y ) ",
+"2 z A B C D E F G H I J K L M N O P 2 2 ",
+"y Q R S T U V W X Y Z `  ...+.@.#.$.%.) ",
+"&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.2 ",
+"[.}.|.1.2.3.4.5.6.Z 7.8.9.0.a.b.c.d.e.%.",
+"f.g.h.i.j.k.l.. . . . . . m.n.o.p.q.r.s.",
+"t.u.v.w.x.y.z.. . . . . . A.B.C.D.E.F.G.",
+"H.I.J.K.L.M.N.O.. . . . C.P.Q.R.S.T.U.V.",
+"W.X.Y.Z.`. +.+a.++. . @+#+$+%+#+&+*+=+-+",
+"h ;+>+,+'+)+!+~+{+]+^+$+%+$+$+^+/+(+_+:+",
+"<+. [+}+|+1+o.2+3+4+$+$+$+$+5+6+7+8+. . ",
+". . . 9+0+a+b+C.^+$+$+$+c+4+d+e+f+g+. . ",
+"h+h+i+j+k+l+m+n+o+^+^+4+p+q+r+s+t+u+v+h+",
+"h+h+w+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+h+h+",
+"h+h+h+i+v+M+N+O+O P+Q+R+S+T+U+V+W+X+h+h+",
+"h+h+h+h+i+x+Y+Z+`+ @.@+@@@#@+ $@h+h+h+h+"};
diff --git a/themes/gorilla/menu-inactive.xpm b/themes/gorilla/menu-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..cd81607d1f4d141652b433d99beb64c748e809d6
--- /dev/null
+++ b/themes/gorilla/menu-inactive.xpm
@@ -0,0 +1,318 @@
+/* XPM */
+static char * menu_inactive_xpm[] = {
+"20 26 289 2",
+"  	c None",
+". 	c #D7D7CF",
+"+ 	c #000000",
+"@ 	c #A9A9A9",
+"# 	c #D3D3D3",
+"$ 	c #0D0D0D",
+"% 	c #343434",
+"& 	c #5F5F5F",
+"* 	c #858585",
+"= 	c #929292",
+"- 	c #8D8D8D",
+"; 	c #777777",
+"> 	c #565656",
+", 	c #323232",
+"' 	c #161616",
+") 	c #050505",
+"! 	c #494D59",
+"~ 	c #4A4E5A",
+"{ 	c #696C76",
+"] 	c #9B9DA4",
+"^ 	c #C3C4C8",
+"/ 	c #C4C5C6",
+"( 	c #AAAAAB",
+"_ 	c #919292",
+": 	c #878888",
+"< 	c #8A8B8C",
+"[ 	c #929397",
+"} 	c #8C8F95",
+"| 	c #787B83",
+"1 	c #61656F",
+"2 	c #505460",
+"3 	c #515961",
+"4 	c #545C64",
+"5 	c #7B8187",
+"6 	c #B6B9BD",
+"7 	c #CACBCC",
+"8 	c #90908D",
+"9 	c #4D4D46",
+"0 	c #39392F",
+"a 	c #3D3D32",
+"b 	c #3E3E31",
+"c 	c #37372B",
+"d 	c #2F2F2A",
+"e 	c #48494A",
+"f 	c #737679",
+"g 	c #70767C",
+"h 	c #636A71",
+"i 	c #575E66",
+"j 	c #70737C",
+"k 	c #B4B5BA",
+"l 	c #B9B9BA",
+"m 	c #5A5A55",
+"n 	c #39392E",
+"o 	c #818177",
+"p 	c #C3C3B9",
+"q 	c #E9E9D1",
+"r 	c #F0F0C4",
+"s 	c #DCDC9D",
+"t 	c #ACAB67",
+"u 	c #595732",
+"v 	c #1D1E1B",
+"w 	c #47484B",
+"x 	c #555962",
+"y 	c #4E525E",
+"z 	c #4B4F5A",
+"A 	c #656C73",
+"B 	c #A5A9AD",
+"C 	c #B9BABA",
+"D 	c #4F4F4A",
+"E 	c #4F4F43",
+"F 	c #D2D2CB",
+"G 	c #FFFFFF",
+"H 	c #FFFFEB",
+"I 	c #FFFFD1",
+"J 	c #FFFFB0",
+"K 	c #FFFF8D",
+"L 	c #FAF365",
+"M 	c #9B9337",
+"N 	c #202016",
+"O 	c #2E3232",
+"P 	c #515960",
+"Q 	c #7F828A",
+"R 	c #B3B4B8",
+"S 	c #646461",
+"T 	c #434336",
+"U 	c #E3E3D0",
+"V 	c #FFFFF8",
+"W 	c #FFFFF3",
+"X 	c #FFFFE2",
+"Y 	c #FFFFC5",
+"Z 	c #FFFF9C",
+"` 	c #FFF770",
+" .	c #FFF34B",
+"..	c #FFF32A",
+"+.	c #9E9024",
+"@.	c #171918",
+"#.	c #33363B",
+"$.	c #484C58",
+"%.	c #5D646C",
+"&.	c #9A9EA3",
+"*.	c #959797",
+"=.	c #2D2D25",
+"-.	c #B4B492",
+";.	c #FFFFEA",
+">.	c #FFFFE8",
+",.	c #FFFFED",
+"'.	c #FFFFD8",
+").	c #FFFFB6",
+"!.	c #FFFC86",
+"~.	c #FFF254",
+"{.	c #FFE92A",
+"].	c #FFE418",
+"^.	c #FCDB1B",
+"/.	c #5E5623",
+"(.	c #1D2123",
+"_.	c #484F56",
+":.	c #505860",
+"<.	c #62656F",
+"[.	c #9A9CA2",
+"}.	c #636363",
+"|.	c #4A4A35",
+"1.	c #F9F9B9",
+"2.	c #FFFFCD",
+"3.	c #FFFFD3",
+"4.	c #FFFFDA",
+"5.	c #FFFFA0",
+"6.	c #FFF568",
+"7.	c #FFEA2E",
+"8.	c #FFE117",
+"9.	c #FFD818",
+"0.	c #FFDB18",
+"a.	c #B39522",
+"b.	c #191C1B",
+"c.	c #36383F",
+"d.	c #464A56",
+"e.	c #6E747B",
+"f.	c #93979B",
+"g.	c #3D3D3D",
+"h.	c #7E7D4E",
+"i.	c #FFFFA4",
+"j.	c #FFFFA8",
+"k.	c #FFFFAF",
+"l.	c #FFD418",
+"m.	c #FFCC19",
+"n.	c #FFCA18",
+"o.	c #E1AE1F",
+"p.	c #2F2D1F",
+"q.	c #2D3134",
+"r.	c #4C545B",
+"s.	c #666973",
+"t.	c #7F8188",
+"u.	c #29292C",
+"v.	c #96934B",
+"w.	c #FFFF7C",
+"x.	c #FFF979",
+"y.	c #FFF97A",
+"z.	c #FFC519",
+"A.	c #FFBE19",
+"B.	c #FFBB19",
+"C.	c #F3B01B",
+"D.	c #383420",
+"E.	c #232529",
+"F.	c #424651",
+"G.	c #646B72",
+"H.	c #747A7F",
+"I.	c #242529",
+"J.	c #908A39",
+"K.	c #FFFB4D",
+"L.	c #FFEE42",
+"M.	c #FFED39",
+"N.	c #FFE930",
+"O.	c #FFB519",
+"P.	c #FFB119",
+"Q.	c #EEA61C",
+"R.	c #363220",
+"S.	c #262A2C",
+"T.	c #495057",
+"U.	c #545863",
+"V.	c #5D616B",
+"W.	c #282A2E",
+"X.	c #686225",
+"Y.	c #FFEA21",
+"Z.	c #FFE31A",
+"`.	c #FFDE17",
+" +	c #FFD816",
+".+	c #FFD217",
+"++	c #FFB319",
+"@+	c #FFAC19",
+"#+	c #FFA919",
+"$+	c #FFA819",
+"%+	c #FFAE18",
+"&+	c #D19121",
+"*+	c #26261D",
+"=+	c #292B31",
+"-+	c #424550",
+";+	c #555D65",
+">+	c #535B63",
+",+	c #34383A",
+"'+	c #2F2E1C",
+")+	c #E5C71D",
+"!+	c #FFDD18",
+"~+	c #FFD119",
+"{+	c #FFCB19",
+"]+	c #FFC319",
+"^+	c #FFB919",
+"/+	c #FFAF19",
+"(+	c #FFB019",
+"_+	c #906B24",
+":+	c #151A1B",
+"<+	c #373C41",
+"[+	c #4A5259",
+"}+	c #010101",
+"|+	c #010100",
+"1+	c #101213",
+"2+	c #817225",
+"3+	c #FFD61A",
+"4+	c #FFC919",
+"5+	c #FFC019",
+"6+	c #FFB819",
+"7+	c #FFAE19",
+"8+	c #FFAF18",
+"9+	c #DF9920",
+"0+	c #373321",
+"a+	c #090A09",
+"b+	c #0A0A08",
+"c+	c #21211C",
+"d+	c #A88924",
+"e+	c #FFC71A",
+"f+	c #FFBC18",
+"g+	c #FFAA19",
+"h+	c #FFB018",
+"i+	c #EBA11E",
+"j+	c #5C4B24",
+"k+	c #0E1010",
+"l+	c #040402",
+"m+	c #BEBEBE",
+"n+	c #BBBBBB",
+"o+	c #AAAAA9",
+"p+	c #50504E",
+"q+	c #22231C",
+"r+	c #866C25",
+"s+	c #E4A51E",
+"t+	c #FFAE1A",
+"u+	c #FFB118",
+"v+	c #FCAA1C",
+"w+	c #C18922",
+"x+	c #4F4323",
+"y+	c #202423",
+"z+	c #6B6B69",
+"A+	c #9A9A99",
+"B+	c #B4B4B4",
+"C+	c #BCBCBC",
+"D+	c #B6B6B6",
+"E+	c #A3A3A3",
+"F+	c #5C5D5B",
+"G+	c #1F2222",
+"H+	c #373220",
+"I+	c #6F5624",
+"J+	c #936C23",
+"K+	c #9A7022",
+"L+	c #866524",
+"M+	c #564724",
+"N+	c #21231C",
+"O+	c #303332",
+"P+	c #70706F",
+"Q+	c #969696",
+"R+	c #AFAFAF",
+"S+	c #A7A7A6",
+"T+	c #818180",
+"U+	c #4E4F4E",
+"V+	c #2E3131",
+"W+	c #1E2324",
+"X+	c #1C2223",
+"Y+	c #242829",
+"Z+	c #3A3C3B",
+"`+	c #5D5D5C",
+" @	c #848484",
+".@	c #9C9C9C",
+"+@	c #B2B2B2",
+"@@	c #BDBDBD",
+"#@	c #ADADAD",
+"$@	c #A0A0A0",
+"%@	c #8E8E8E",
+"&@	c #7E7E7E",
+"*@	c #797979",
+"=@	c #808080",
+"-@	c #8F8F8F",
+";@	c #9B9B9B",
+">@	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# # # # # # # # # # # # # # # # # # # # ",
+"# # # # # # # # # # # # # # # # # # # # ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"+ + + + + $ % & * = - ; > , ' ) + + + + ",
+"! ! ! ~ { ] ^ / ( _ : < [ } | 1 2 ! ! ! ",
+"3 3 4 5 6 7 8 9 0 a b c d e f g h i 3 3 ",
+"! ! j k l m n o p q r s t u v w x y z ! ",
+"3 A B C D E F G G H I J K L M N O P 3 3 ",
+"~ Q R S T U G V W X Y Z `  ...+.@.#.$.! ",
+"%.&.*.=.-.;.>.,.;.'.).!.~.{.].^./.(._.:.",
+"<.[.}.|.1.2.3.4.'.Y 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.t.u.v.w.x.y.+ + + + + + z.A.B.C.D.E.F.",
+"G.H.I.J.K.L.M.N.+ + + + B.O.P.P.Q.R.S.T.",
+"U.V.W.X.Y.Z.`. +.++ + ++@+#+$+%+&+*+=+-+",
+";+>+,+'+)+!+~+{+]+^+/+#+$+#+#+(+_+:+<+[+",
+"}++ |+1+2+3+4+5+6+7+#+#+#+#+8+9+0+a++ + ",
+"+ + + b+c+d+e+f+(+#+#+#+g+h+i+j+k+l++ + ",
+"m+m+n+o+p+q+r+s+t+(+u+/+v+w+x+y+z+A+B+m+",
+"m+m+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+m+m+",
+"m+m+m+n+B+S+T+U+V+W+X+Y+Z+`+ @.@+@@@m+m+",
+"m+m+m+m+n+D+#@$@%@&@*@=@-@;@@ >@m+m+m+m+"};
diff --git a/themes/gorilla/menu-pressed.xpm b/themes/gorilla/menu-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..109ff8abd0928b2b364e3d7bf93738522978d872
--- /dev/null
+++ b/themes/gorilla/menu-pressed.xpm
@@ -0,0 +1,336 @@
+/* XPM */
+static char * menu_pressed_xpm[] = {
+"20 26 307 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #A9A9A9",
+"@ 	c #D3D3D3",
+"# 	c #0D0D0D",
+"$ 	c #343434",
+"% 	c #5F5F5F",
+"& 	c #858585",
+"* 	c #929292",
+"= 	c #8D8D8D",
+"- 	c #777777",
+"; 	c #565656",
+"> 	c #323232",
+", 	c #161616",
+"' 	c #050505",
+") 	c #494D59",
+"! 	c #4A4E5A",
+"~ 	c #696C76",
+"{ 	c #9B9DA4",
+"] 	c #C2C3C8",
+"^ 	c #C3C4C5",
+"/ 	c #ACACAB",
+"( 	c #959693",
+"_ 	c #8B8B8A",
+": 	c #8D8E8D",
+"< 	c #949598",
+"[ 	c #8D8F96",
+"} 	c #787B83",
+"| 	c #61656F",
+"1 	c #505460",
+"2 	c #515961",
+"3 	c #545C64",
+"4 	c #7B8187",
+"5 	c #B6B9BD",
+"6 	c #C9CACB",
+"7 	c #949490",
+"8 	c #5B5B51",
+"9 	c #525241",
+"0 	c #595947",
+"a 	c #5B5B46",
+"b 	c #525240",
+"c 	c #45453A",
+"d 	c #535450",
+"e 	c #76797A",
+"f 	c #71787D",
+"g 	c #636A71",
+"h 	c #575E66",
+"i 	c #70737C",
+"j 	c #B4B5BA",
+"k 	c #BABBBA",
+"l 	c #66665C",
+"m 	c #565643",
+"n 	c #9A9A8A",
+"o 	c #D3D4C7",
+"p 	c #F0F0DD",
+"q 	c #F5F6D4",
+"r 	c #E6E7B4",
+"s 	c #C0C085",
+"t 	c #76754F",
+"u 	c #36362B",
+"v 	c #4D4E4E",
+"w 	c #575A63",
+"x 	c #4E525E",
+"y 	c #4B4F5A",
+"z 	c #656C73",
+"A 	c #A6AAAE",
+"B 	c #B9BABA",
+"C 	c #5C5C53",
+"D 	c #6E6E5A",
+"E 	c #DFDFD6",
+"F 	c #FFFFFF",
+"G 	c #FFFFFD",
+"H 	c #FFFFE5",
+"I 	c #FFFDCF",
+"J 	c #FFFFBA",
+"K 	c #FFFFA6",
+"L 	c #FEFA8A",
+"M 	c #B3AD5E",
+"N 	c #3B3B2B",
+"O 	c #373B39",
+"P 	c #525961",
+"Q 	c #7F828A",
+"R 	c #B3B5B8",
+"S 	c #6C6D67",
+"T 	c #62624D",
+"U 	c #EDEDDC",
+"V 	c #FFFFFC",
+"W 	c #FFF6DC",
+"X 	c #FFE9B3",
+"Y 	c #FFDF90",
+"Z 	c #FFDC7D",
+"` 	c #FFE076",
+" .	c #FFE874",
+"..	c #FFF16C",
+"+.	c #FFF95D",
+"@.	c #B5AB4F",
+"#.	c #313129",
+"$.	c #383B3F",
+"%.	c #484C58",
+"&.	c #5D656C",
+"*.	c #9A9FA3",
+"=.	c #979999",
+"-.	c #454636",
+";.	c #C6C7A7",
+">.	c #FFFFEB",
+",.	c #FFF0C1",
+"'.	c #FFDA83",
+").	c #FFCA55",
+"!.	c #FFC443",
+"~.	c #FFC33F",
+"{.	c #FFC943",
+"].	c #FFD34A",
+"^.	c #FFDF4D",
+"/.	c #FFE94C",
+"(.	c #FEE851",
+"_.	c #7C7645",
+":.	c #2B2E2B",
+"<.	c #495057",
+"[.	c #505860",
+"}.	c #60646E",
+"|.	c #999BA1",
+"1.	c #6A6A67",
+"2.	c #68684E",
+"3.	c #FCFCCA",
+"4.	c #FFF6BA",
+"5.	c #FFD877",
+"6.	c #FFC445",
+"7.	c #FFC13A",
+"8.	c #FFC43B",
+"9.	c #FFCA3E",
+"0.	c #FFD042",
+"a.	c #FFD845",
+"b.	c #FFE049",
+"c.	c #FFE54C",
+"d.	c #FFE94E",
+"e.	c #C7B250",
+"f.	c #33342A",
+"g.	c #383B41",
+"h.	c #464A56",
+"i.	c #676E75",
+"j.	c #929699",
+"k.	c #4B4C46",
+"l.	c #97976B",
+"m.	c #FFFFB5",
+"n.	c #FFE887",
+"o.	c #FFCC4D",
+"p.	c #FFED4F",
+"q.	c #FFED53",
+"r.	c #FFE654",
+"s.	c #ECCA54",
+"t.	c #4D4B35",
+"u.	c #313637",
+"v.	c #4C545B",
+"w.	c #5C606B",
+"x.	c #7F8187",
+"y.	c #3C3D37",
+"z.	c #ACA96B",
+"A.	c #FFFF93",
+"B.	c #FFE168",
+"C.	c #FFCF46",
+"D.	c #FFF46E",
+"E.	c #FFF374",
+"F.	c #FFE667",
+"G.	c #F8CE56",
+"H.	c #58543A",
+"I.	c #2A2C2D",
+"J.	c #434651",
+"K.	c #5E666D",
+"L.	c #757A7F",
+"M.	c #363834",
+"N.	c #A7A25C",
+"O.	c #FFFB72",
+"P.	c #FFE256",
+"Q.	c #FFD846",
+"R.	c #FFDD48",
+"S.	c #FFF694",
+"T.	c #FFF79A",
+"U.	c #FFF496",
+"V.	c #FFE477",
+"W.	c #F4C758",
+"X.	c #545138",
+"Y.	c #2D3030",
+"Z.	c #515560",
+"`.	c #5E626B",
+" +	c #353735",
+".+	c #858147",
+"++	c #FFF255",
+"@+	c #FFE64C",
+"#+	c #FFE24A",
+"$+	c #FFE84C",
+"%+	c #FFF158",
+"&+	c #FFF9B0",
+"*+	c #FFFABA",
+"=+	c #FFFABD",
+"-+	c #FFF3AA",
+";+	c #FFDE78",
+">+	c #DFB657",
+",+	c #434231",
+"'+	c #2D3033",
+")+	c #424550",
+"!+	c #555C64",
+"~+	c #545C63",
+"{+	c #3C403F",
+"]+	c #4D4C34",
+"^+	c #EED952",
+"/+	c #FFE94D",
+"(+	c #FFE74E",
+"_+	c #FFEF5A",
+":+	c #FFF57B",
+"<+	c #FFF89E",
+"[+	c #FFFAB8",
+"}+	c #FFFCCB",
+"|+	c #FFFDD5",
+"1+	c #FFF9CC",
+"2+	c #FFE8A0",
+"3+	c #FFD667",
+"4+	c #A9904D",
+"5+	c #2A2C26",
+"6+	c #393E42",
+"7+	c #4A5259",
+"8+	c #020202",
+"9+	c #050503",
+"0+	c #24251F",
+"a+	c #9C924C",
+"b+	c #FFE650",
+"c+	c #FFE050",
+"d+	c #FFE767",
+"e+	c #FFF18C",
+"f+	c #FFF6AC",
+"g+	c #FFF9C3",
+"h+	c #FFF9CF",
+"i+	c #FFF4CA",
+"j+	c #FFE7A8",
+"k+	c #FFD772",
+"l+	c #EABC57",
+"m+	c #565239",
+"n+	c #13130F",
+"o+	c #010101",
+"p+	c #12130E",
+"q+	c #3C3C2E",
+"r+	c #BDA850",
+"s+	c #FFDC52",
+"t+	c #FFD858",
+"u+	c #FFDA6D",
+"v+	c #FFDF86",
+"w+	c #FFE495",
+"x+	c #FFE295",
+"y+	c #FFD366",
+"z+	c #F2C257",
+"A+	c #7A6E45",
+"B+	c #1F211A",
+"C+	c #060604",
+"D+	c #BEBEBE",
+"E+	c #BBBBBB",
+"F+	c #A9A9A8",
+"G+	c #585853",
+"H+	c #3D3E2F",
+"I+	c #A08D4C",
+"J+	c #EDC252",
+"K+	c #FFCB53",
+"L+	c #FFCE56",
+"M+	c #FFD059",
+"N+	c #FFCF58",
+"O+	c #FFC854",
+"P+	c #D2AB52",
+"Q+	c #6E6541",
+"R+	c #33352E",
+"S+	c #6D6D6B",
+"T+	c #999999",
+"U+	c #B4B4B4",
+"V+	c #BCBCBC",
+"W+	c #B6B6B6",
+"X+	c #A3A3A3",
+"Y+	c #62625E",
+"Z+	c #33362E",
+"`+	c #555139",
+" @	c #8A7947",
+".@	c #A98E4A",
+"+@	c #AF924A",
+"@@	c #9F8849",
+"#@	c #736942",
+"$@	c #3D3E30",
+"%@	c #3D3F39",
+"&@	c #727270",
+"*@	c #969696",
+"=@	c #AFAFAF",
+"-@	c #A6A6A6",
+";@	c #828280",
+">@	c #555551",
+",@	c #3B3D39",
+"'@	c #303430",
+")@	c #30342E",
+"!@	c #444541",
+"~@	c #61615E",
+"{@	c #858584",
+"]@	c #9D9D9D",
+"^@	c #B2B2B2",
+"/@	c #BDBDBD",
+"(@	c #ADADAD",
+"_@	c #A0A0A0",
+":@	c #8E8E8D",
+"<@	c #7E7E7E",
+"[@	c #797979",
+"}@	c #80807F",
+"|@	c #8E8E8E",
+"1@	c #9B9B9B",
+"2@	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . # $ % & * = - ; > , ' . . . . ",
+") ) ) ! ~ { ] ^ / ( _ : < [ } | 1 ) ) ) ",
+"2 2 3 4 5 6 7 8 9 0 a b c d e f g h 2 2 ",
+") ) i j k l m n o p q r s t u v w x y ) ",
+"2 z A B C D E F G H I J K L M N O P 2 2 ",
+"y Q R S T U V W X Y Z `  ...+.@.#.$.%.) ",
+"&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.",
+"}.|.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.t.u.v.",
+"w.x.y.z.A.B.C.. . . . . . D.E.F.G.H.I.J.",
+"K.L.M.N.O.P.Q.R.. . . . S.T.U.V.W.X.Y.<.",
+"Z.`. +.+++@+#+$+%+. . &+*+=+-+;+>+,+'+)+",
+"!+~+{+]+^+/+(+_+:+<+[+}+|+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+t+u+v+w+x+'.y+z+A+B+C+. . ",
+"D+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+D+",
+"D+D+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@D+D+",
+"D+D+D+E+U+-@;@>@,@'@)@M.!@~@{@]@^@/@D+D+",
+"D+D+D+D+E+W+(@_@:@<@[@}@|@1@+ 2@D+D+D+D+"};
diff --git a/themes/gorilla/right-active.xpm b/themes/gorilla/right-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..5132ce3c6e3c951394ce5f0bf5b2c842a6c323c3
--- /dev/null
+++ b/themes/gorilla/right-active.xpm
@@ -0,0 +1,134 @@
+/* XPM */
+static char * right_active_xpm[] = {
+"6 128 3 1",
+" 	c None",
+".	c #D3D3D3",
+"+	c #000000",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++",
+"..++++"};
diff --git a/themes/gorilla/right-inactive.xpm b/themes/gorilla/right-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..3335437a9d8313d7f528fafaffd45ccf7ff96374
--- /dev/null
+++ b/themes/gorilla/right-inactive.xpm
@@ -0,0 +1,135 @@
+/* XPM */
+static char * right_inactive_xpm[] = {
+"6 128 4 1",
+" 	c None",
+".	c #D3D3D3",
+"+	c #000000",
+"@	c #D7D7CF",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@",
+"..+++@"};
diff --git a/themes/gorilla/shade-active.xpm b/themes/gorilla/shade-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..87f8cb8c73bb610ff9633fcfd937fd96e8e4bf12
--- /dev/null
+++ b/themes/gorilla/shade-active.xpm
@@ -0,0 +1,311 @@
+/* XPM */
+static char * shade_active_xpm[] = {
+"20 26 282 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #A9A9A9",
+"@ 	c #D3D3D3",
+"# 	c #0D0D0D",
+"$ 	c #343434",
+"% 	c #5F5F5F",
+"& 	c #858585",
+"* 	c #929292",
+"= 	c #8D8D8D",
+"- 	c #777777",
+"; 	c #565656",
+"> 	c #323232",
+", 	c #161616",
+"' 	c #050505",
+") 	c #494D59",
+"! 	c #4A4E5A",
+"~ 	c #696C76",
+"{ 	c #9B9DA4",
+"] 	c #C3C4C8",
+"^ 	c #C4C5C6",
+"/ 	c #AAAAAB",
+"( 	c #919292",
+"_ 	c #878888",
+": 	c #8A8B8C",
+"< 	c #929397",
+"[ 	c #8C8F95",
+"} 	c #787B83",
+"| 	c #61656F",
+"1 	c #505460",
+"2 	c #515961",
+"3 	c #545C64",
+"4 	c #7B8187",
+"5 	c #B6B9BD",
+"6 	c #CACBCC",
+"7 	c #90908E",
+"8 	c #4D4D47",
+"9 	c #39382F",
+"0 	c #3D3D31",
+"a 	c #3E3D2F",
+"b 	c #37362A",
+"c 	c #2F302B",
+"d 	c #484A4B",
+"e 	c #737679",
+"f 	c #70767C",
+"g 	c #636A71",
+"h 	c #575E66",
+"i 	c #70737C",
+"j 	c #B4B5BA",
+"k 	c #B9B9BA",
+"l 	c #5A5A56",
+"m 	c #39392D",
+"n 	c #817F6D",
+"o 	c #C3C0A7",
+"p 	c #E9E0BA",
+"q 	c #F0E3AD",
+"r 	c #DCCD88",
+"s 	c #AC9D59",
+"t 	c #59522D",
+"u 	c #1D1E1B",
+"v 	c #47494B",
+"w 	c #555962",
+"x 	c #4E525E",
+"y 	c #4B4F5A",
+"z 	c #656C73",
+"A 	c #A5A9AD",
+"B 	c #B9BABA",
+"C 	c #4F504B",
+"D 	c #4F4E3F",
+"E 	c #D2D0B7",
+"F 	c #FFFFEB",
+"G 	c #FFFFE6",
+"H 	c #FFF9D2",
+"I 	c #FFF4B7",
+"J 	c #FFEF96",
+"K 	c #FFED72",
+"L 	c #FADA4D",
+"M 	c #9B872B",
+"N 	c #202016",
+"O 	c #2E3232",
+"P 	c #515960",
+"Q 	c #7F828A",
+"R 	c #B3B4B8",
+"S 	c #646462",
+"T 	c #434333",
+"U 	c #E3DDBB",
+"V 	c #FFFFE5",
+"W 	c #FFF9DE",
+"X 	c #FFF8DA",
+"Y 	c #FFF5C9",
+"Z 	c #FFEFAC",
+"` 	c #FFE783",
+" .	c #FFDE58",
+"..	c #FFD931",
+"+.	c #FFD910",
+"@.	c #9E8317",
+"#.	c #171918",
+"$.	c #33363B",
+"%.	c #484C58",
+"&.	c #5E666D",
+"*.	c #9A9EA3",
+"=.	c #959798",
+"-.	c #2D2D25",
+";.	c #B4AB82",
+">.	c #FFFFD0",
+",.	c #FFF5CF",
+"'.	c #FFF7D4",
+").	c #FFF6D1",
+"!.	c #FFF2BF",
+"~.	c #FFEC9D",
+"{.	c #FFE36D",
+"].	c #FFD83B",
+"^.	c #FFD011",
+"/.	c #FFCB00",
+"(.	c #FCC203",
+"_.	c #5E501E",
+":.	c #1D2124",
+"<.	c #484F55",
+"[.	c #646872",
+"}.	c #989AA1",
+"|.	c #636363",
+"1.	c #4A4731",
+"2.	c #F9E8A1",
+"3.	c #FFF2B3",
+"4.	c #FFF1BA",
+"5.	c #FFF3C1",
+"6.	c #FFF3BF",
+"7.	c #FFDC4F",
+"8.	c #FFD115",
+"9.	c #FFC800",
+"0.	c #FFBF00",
+"a.	c #FFC000",
+"b.	c #B38513",
+"c.	c #191C1B",
+"d.	c #34373E",
+"e.	c #71777E",
+"f.	c #909598",
+"g.	c #3D3E3E",
+"h.	c #7E7444",
+"i.	c #FFEE8A",
+"j.	c #FFE98F",
+"k.	c #FFEA96",
+"l.	c #FFEB9B",
+"m.	c #FFC500",
+"n.	c #FFBB00",
+"o.	c #FFB300",
+"p.	c #FFB000",
+"q.	c #E1990A",
+"r.	c #2F2C1E",
+"s.	c #2A2F32",
+"t.	c #4D555D",
+"u.	c #686B75",
+"v.	c #7D7F86",
+"w.	c #292B2D",
+"x.	c #96863F",
+"y.	c #FFEA62",
+"z.	c #FFDF60",
+"A.	c #FFE061",
+"B.	c #FFAC00",
+"C.	c #FFA500",
+"D.	c #FFA200",
+"E.	c #F39905",
+"F.	c #38331F",
+"G.	c #212327",
+"H.	c #444752",
+"I.	c #666D74",
+"J.	c #73797E",
+"K.	c #24282A",
+"L.	c #907E2D",
+"M.	c #FFE032",
+"N.	c #FFD528",
+"O.	c #FFD320",
+"P.	c #FF9C00",
+"Q.	c #FF9800",
+"R.	c #FF9700",
+"S.	c #EE8F06",
+"T.	c #36311F",
+"U.	c #23282A",
+"V.	c #4A5259",
+"W.	c #565A65",
+"X.	c #5D606A",
+"Y.	c #282B2F",
+"Z.	c #685C1E",
+"`.	c #FFD108",
+" +	c #FFCA00",
+".+	c #FFB900",
+"++	c #FFAE00",
+"@+	c #FF9A00",
+"#+	c #FF9300",
+"$+	c #FF9000",
+"%+	c #FF8F00",
+"&+	c #D17E0E",
+"*+	c #26261D",
+"=+	c #27292E",
+"-+	c #434752",
+";+	c #535B63",
+">+	c #34383A",
+",+	c #2F2D1B",
+"'+	c #E5B108",
+")+	c #FFC300",
+"!+	c #FFB800",
+"~+	c #FFB200",
+"{+	c #FFAA00",
+"]+	c #FFA000",
+"^+	c #FF9600",
+"/+	c #906019",
+"(+	c #151B1B",
+"_+	c #363B3F",
+":+	c #4B535A",
+"<+	c #020202",
+"[+	c #010100",
+"}+	c #101314",
+"|+	c #81691B",
+"1+	c #FFBC01",
+"2+	c #FFA700",
+"3+	c #FF9F00",
+"4+	c #FF9500",
+"5+	c #FF9400",
+"6+	c #DF840B",
+"7+	c #373120",
+"8+	c #090B09",
+"9+	c #0A0A08",
+"0+	c #21211C",
+"a+	c #A87C17",
+"b+	c #FFAD01",
+"c+	c #FF9100",
+"d+	c #EB8B08",
+"e+	c #5C461F",
+"f+	c #0E1210",
+"g+	c #040402",
+"h+	c #BEBEBE",
+"i+	c #BBBBBB",
+"j+	c #AAAAA9",
+"k+	c #50504E",
+"l+	c #22231C",
+"m+	c #86611B",
+"n+	c #E48F09",
+"o+	c #FF9501",
+"p+	c #FC9103",
+"q+	c #C17811",
+"r+	c #4F3F20",
+"s+	c #202524",
+"t+	c #6B6B69",
+"u+	c #9A9A99",
+"v+	c #B4B4B4",
+"w+	c #BCBCBC",
+"x+	c #B6B6B6",
+"y+	c #A3A3A3",
+"z+	c #5C5D5B",
+"A+	c #1F2323",
+"B+	c #37311F",
+"C+	c #6F4F1D",
+"D+	c #936117",
+"E+	c #9A6316",
+"F+	c #865B1A",
+"G+	c #56421F",
+"H+	c #21241C",
+"I+	c #303332",
+"J+	c #70706F",
+"K+	c #969696",
+"L+	c #AFAFAF",
+"M+	c #A7A7A6",
+"N+	c #818180",
+"O+	c #4E4F4E",
+"P+	c #1E2425",
+"Q+	c #1C2325",
+"R+	c #242A2B",
+"S+	c #3A3D3B",
+"T+	c #5D5D5C",
+"U+	c #848484",
+"V+	c #9C9C9C",
+"W+	c #B2B2B2",
+"X+	c #BDBDBD",
+"Y+	c #ADADAD",
+"Z+	c #A0A0A0",
+"`+	c #8E8E8E",
+" @	c #7E7E7E",
+".@	c #797979",
+"+@	c #808080",
+"@@	c #8F8F8F",
+"#@	c #9B9B9B",
+"$@	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . # $ % & * = - ; > , ' . . . . ",
+") ) ) ! ~ { ] ^ / ( _ : < [ } | 1 ) ) ) ",
+"2 2 3 4 5 6 7 8 9 0 a b c d e f g h 2 2 ",
+") ) i j k l m n o p q r s t u v w x y ) ",
+"2 z A B C D E F G H I J K L M N O P 2 2 ",
+"y Q R S T U V W X Y Z `  ...+.@.#.$.%.) ",
+"&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.2 ",
+"[.}.|.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.t.",
+"u.v.w.x.y.z.A.. . . . . . B.C.D.E.F.G.H.",
+"I.J.K.L.M.N.O.. . . . . . P.Q.R.S.T.U.V.",
+"W.X.Y.Z.`. +m.0..+++C.@+#+$+%+#+&+*+=+-+",
+"h ;+>+,+'+)+!+~+{+]+^+$+%+$+$+^+/+(+_+:+",
+"<+. [+}+|+1+p.2+3+4+$+$+$+$+5+6+7+8+. . ",
+". . . 9+0+a+b+D.^+$+$+$+c+4+d+e+f+g+. . ",
+"h+h+i+j+k+l+m+n+o+^+^+4+p+q+r+s+t+u+v+h+",
+"h+h+w+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+h+h+",
+"h+h+h+i+v+M+N+O+O P+Q+R+S+T+U+V+W+X+h+h+",
+"h+h+h+h+i+x+Y+Z+`+ @.@+@@@#@+ $@h+h+h+h+"};
diff --git a/themes/gorilla/shade-inactive.xpm b/themes/gorilla/shade-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..5156e00f60fc8367ec4f1a017ea8f7b72c240dc0
--- /dev/null
+++ b/themes/gorilla/shade-inactive.xpm
@@ -0,0 +1,318 @@
+/* XPM */
+static char * shade_inactive_xpm[] = {
+"20 26 289 2",
+"  	c None",
+". 	c #D7D7CF",
+"+ 	c #000000",
+"@ 	c #A9A9A9",
+"# 	c #D3D3D3",
+"$ 	c #0D0D0D",
+"% 	c #343434",
+"& 	c #5F5F5F",
+"* 	c #858585",
+"= 	c #929292",
+"- 	c #8D8D8D",
+"; 	c #777777",
+"> 	c #565656",
+", 	c #323232",
+"' 	c #161616",
+") 	c #050505",
+"! 	c #494D59",
+"~ 	c #4A4E5A",
+"{ 	c #696C76",
+"] 	c #9B9DA4",
+"^ 	c #C3C4C8",
+"/ 	c #C4C5C6",
+"( 	c #AAAAAB",
+"_ 	c #919292",
+": 	c #878888",
+"< 	c #8A8B8C",
+"[ 	c #929397",
+"} 	c #8C8F95",
+"| 	c #787B83",
+"1 	c #61656F",
+"2 	c #505460",
+"3 	c #515961",
+"4 	c #545C64",
+"5 	c #7B8187",
+"6 	c #B6B9BD",
+"7 	c #CACBCC",
+"8 	c #90908D",
+"9 	c #4D4D46",
+"0 	c #39392F",
+"a 	c #3D3D32",
+"b 	c #3E3E31",
+"c 	c #37372B",
+"d 	c #2F2F2A",
+"e 	c #48494A",
+"f 	c #737679",
+"g 	c #70767C",
+"h 	c #636A71",
+"i 	c #575E66",
+"j 	c #70737C",
+"k 	c #B4B5BA",
+"l 	c #B9B9BA",
+"m 	c #5A5A55",
+"n 	c #39392E",
+"o 	c #818177",
+"p 	c #C3C3B9",
+"q 	c #E9E9D1",
+"r 	c #F0F0C4",
+"s 	c #DCDC9D",
+"t 	c #ACAB67",
+"u 	c #595732",
+"v 	c #1D1E1B",
+"w 	c #47484B",
+"x 	c #555962",
+"y 	c #4E525E",
+"z 	c #4B4F5A",
+"A 	c #656C73",
+"B 	c #A5A9AD",
+"C 	c #B9BABA",
+"D 	c #4F4F4A",
+"E 	c #4F4F43",
+"F 	c #D2D2CB",
+"G 	c #FFFFFF",
+"H 	c #FFFFEB",
+"I 	c #FFFFD1",
+"J 	c #FFFFB0",
+"K 	c #FFFF8D",
+"L 	c #FAF365",
+"M 	c #9B9337",
+"N 	c #202016",
+"O 	c #2E3232",
+"P 	c #515960",
+"Q 	c #7F828A",
+"R 	c #B3B4B8",
+"S 	c #646461",
+"T 	c #434336",
+"U 	c #E3E3D0",
+"V 	c #FFFFF8",
+"W 	c #FFFFF3",
+"X 	c #FFFFE2",
+"Y 	c #FFFFC5",
+"Z 	c #FFFF9C",
+"` 	c #FFF770",
+" .	c #FFF34B",
+"..	c #FFF32A",
+"+.	c #9E9024",
+"@.	c #171918",
+"#.	c #33363B",
+"$.	c #484C58",
+"%.	c #5D646C",
+"&.	c #9A9EA3",
+"*.	c #959797",
+"=.	c #2D2D25",
+"-.	c #B4B492",
+";.	c #FFFFEA",
+">.	c #FFFFE8",
+",.	c #FFFFED",
+"'.	c #FFFFD8",
+").	c #FFFFB6",
+"!.	c #FFFC86",
+"~.	c #FFF254",
+"{.	c #FFE92A",
+"].	c #FFE418",
+"^.	c #FCDB1B",
+"/.	c #5E5623",
+"(.	c #1D2123",
+"_.	c #484F56",
+":.	c #505860",
+"<.	c #62656F",
+"[.	c #9A9CA2",
+"}.	c #636363",
+"|.	c #4A4A35",
+"1.	c #F9F9B9",
+"2.	c #FFFFCD",
+"3.	c #FFFFD3",
+"4.	c #FFFFDA",
+"5.	c #FFF568",
+"6.	c #FFEA2E",
+"7.	c #FFE117",
+"8.	c #FFD818",
+"9.	c #FFDB18",
+"0.	c #B39522",
+"a.	c #191C1B",
+"b.	c #36383F",
+"c.	c #464A56",
+"d.	c #6E747B",
+"e.	c #93979B",
+"f.	c #3D3D3D",
+"g.	c #7E7D4E",
+"h.	c #FFFFA4",
+"i.	c #FFFFA8",
+"j.	c #FFFFAF",
+"k.	c #FFFFB4",
+"l.	c #FFDE17",
+"m.	c #FFD418",
+"n.	c #FFCC19",
+"o.	c #FFCA18",
+"p.	c #E1AE1F",
+"q.	c #2F2D1F",
+"r.	c #2D3134",
+"s.	c #4C545B",
+"t.	c #666973",
+"u.	c #7F8188",
+"v.	c #29292C",
+"w.	c #96934B",
+"x.	c #FFFF7C",
+"y.	c #FFF979",
+"z.	c #FFF97A",
+"A.	c #FFC519",
+"B.	c #FFBE19",
+"C.	c #FFBB19",
+"D.	c #F3B01B",
+"E.	c #383420",
+"F.	c #232529",
+"G.	c #424651",
+"H.	c #646B72",
+"I.	c #747A7F",
+"J.	c #242529",
+"K.	c #908A39",
+"L.	c #FFFB4D",
+"M.	c #FFEE42",
+"N.	c #FFED39",
+"O.	c #FFB519",
+"P.	c #FFB119",
+"Q.	c #EEA61C",
+"R.	c #363220",
+"S.	c #262A2C",
+"T.	c #495057",
+"U.	c #545863",
+"V.	c #5D616B",
+"W.	c #282A2E",
+"X.	c #686225",
+"Y.	c #FFEA21",
+"Z.	c #FFE31A",
+"`.	c #FFD816",
+" +	c #FFD217",
+".+	c #FFC718",
+"++	c #FFB319",
+"@+	c #FFAC19",
+"#+	c #FFA919",
+"$+	c #FFA819",
+"%+	c #FFAE18",
+"&+	c #D19121",
+"*+	c #26261D",
+"=+	c #292B31",
+"-+	c #424550",
+";+	c #555D65",
+">+	c #535B63",
+",+	c #34383A",
+"'+	c #2F2E1C",
+")+	c #E5C71D",
+"!+	c #FFDD18",
+"~+	c #FFD119",
+"{+	c #FFCB19",
+"]+	c #FFC319",
+"^+	c #FFB919",
+"/+	c #FFAF19",
+"(+	c #FFB019",
+"_+	c #906B24",
+":+	c #151A1B",
+"<+	c #373C41",
+"[+	c #4A5259",
+"}+	c #010101",
+"|+	c #010100",
+"1+	c #101213",
+"2+	c #817225",
+"3+	c #FFD61A",
+"4+	c #FFC919",
+"5+	c #FFC019",
+"6+	c #FFB819",
+"7+	c #FFAE19",
+"8+	c #FFAF18",
+"9+	c #DF9920",
+"0+	c #373321",
+"a+	c #090A09",
+"b+	c #0A0A08",
+"c+	c #21211C",
+"d+	c #A88924",
+"e+	c #FFC71A",
+"f+	c #FFBC18",
+"g+	c #FFAA19",
+"h+	c #FFB018",
+"i+	c #EBA11E",
+"j+	c #5C4B24",
+"k+	c #0E1010",
+"l+	c #040402",
+"m+	c #BEBEBE",
+"n+	c #BBBBBB",
+"o+	c #AAAAA9",
+"p+	c #50504E",
+"q+	c #22231C",
+"r+	c #866C25",
+"s+	c #E4A51E",
+"t+	c #FFAE1A",
+"u+	c #FFB118",
+"v+	c #FCAA1C",
+"w+	c #C18922",
+"x+	c #4F4323",
+"y+	c #202423",
+"z+	c #6B6B69",
+"A+	c #9A9A99",
+"B+	c #B4B4B4",
+"C+	c #BCBCBC",
+"D+	c #B6B6B6",
+"E+	c #A3A3A3",
+"F+	c #5C5D5B",
+"G+	c #1F2222",
+"H+	c #373220",
+"I+	c #6F5624",
+"J+	c #936C23",
+"K+	c #9A7022",
+"L+	c #866524",
+"M+	c #564724",
+"N+	c #21231C",
+"O+	c #303332",
+"P+	c #70706F",
+"Q+	c #969696",
+"R+	c #AFAFAF",
+"S+	c #A7A7A6",
+"T+	c #818180",
+"U+	c #4E4F4E",
+"V+	c #2E3131",
+"W+	c #1E2324",
+"X+	c #1C2223",
+"Y+	c #242829",
+"Z+	c #3A3C3B",
+"`+	c #5D5D5C",
+" @	c #848484",
+".@	c #9C9C9C",
+"+@	c #B2B2B2",
+"@@	c #BDBDBD",
+"#@	c #ADADAD",
+"$@	c #A0A0A0",
+"%@	c #8E8E8E",
+"&@	c #7E7E7E",
+"*@	c #797979",
+"=@	c #808080",
+"-@	c #8F8F8F",
+";@	c #9B9B9B",
+">@	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# # # # # # # # # # # # # # # # # # # # ",
+"# # # # # # # # # # # # # # # # # # # # ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"+ + + + + $ % & * = - ; > , ' ) + + + + ",
+"! ! ! ~ { ] ^ / ( _ : < [ } | 1 2 ! ! ! ",
+"3 3 4 5 6 7 8 9 0 a b c d e f g h i 3 3 ",
+"! ! j k l m n o p q r s t u v w x y z ! ",
+"3 A B C D E F G G H I J K L M N O P 3 3 ",
+"~ Q R S T U G V W X Y Z `  ...+.@.#.$.! ",
+"%.&.*.=.-.;.>.,.;.'.).!.~.{.].^./.(._.:.",
+"<.[.}.|.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.",
+"t.u.v.w.x.y.z.+ + + + + + A.B.C.D.E.F.G.",
+"H.I.J.K.L.M.N.+ + + + + + O.P.P.Q.R.S.T.",
+"U.V.W.X.Y.Z.l.`. +.+B.++@+#+$+%+&+*+=+-+",
+";+>+,+'+)+!+~+{+]+^+/+#+$+#+#+(+_+:+<+[+",
+"}++ |+1+2+3+4+5+6+7+#+#+#+#+8+9+0+a++ + ",
+"+ + + b+c+d+e+f+(+#+#+#+g+h+i+j+k+l++ + ",
+"m+m+n+o+p+q+r+s+t+(+u+/+v+w+x+y+z+A+B+m+",
+"m+m+C+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+m+m+",
+"m+m+m+n+B+S+T+U+V+W+X+Y+Z+`+ @.@+@@@m+m+",
+"m+m+m+m+n+D+#@$@%@&@*@=@-@;@@ >@m+m+m+m+"};
diff --git a/themes/gorilla/shade-pressed.xpm b/themes/gorilla/shade-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..73a17c28353a32a788e9036eb919d4babd8b2552
--- /dev/null
+++ b/themes/gorilla/shade-pressed.xpm
@@ -0,0 +1,336 @@
+/* XPM */
+static char * shade_pressed_xpm[] = {
+"20 26 307 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #A9A9A9",
+"@ 	c #D3D3D3",
+"# 	c #0D0D0D",
+"$ 	c #343434",
+"% 	c #5F5F5F",
+"& 	c #858585",
+"* 	c #929292",
+"= 	c #8D8D8D",
+"- 	c #777777",
+"; 	c #565656",
+"> 	c #323232",
+", 	c #161616",
+"' 	c #050505",
+") 	c #494D59",
+"! 	c #4A4E5A",
+"~ 	c #696C76",
+"{ 	c #9B9DA4",
+"] 	c #C2C3C8",
+"^ 	c #C3C4C5",
+"/ 	c #ACACAB",
+"( 	c #959693",
+"_ 	c #8B8B8A",
+": 	c #8D8E8D",
+"< 	c #949598",
+"[ 	c #8D8F96",
+"} 	c #787B83",
+"| 	c #61656F",
+"1 	c #505460",
+"2 	c #515961",
+"3 	c #545C64",
+"4 	c #7B8187",
+"5 	c #B6B9BD",
+"6 	c #C9CACB",
+"7 	c #949490",
+"8 	c #5B5B51",
+"9 	c #525241",
+"0 	c #595947",
+"a 	c #5B5B46",
+"b 	c #525240",
+"c 	c #45453A",
+"d 	c #535450",
+"e 	c #76797A",
+"f 	c #71787D",
+"g 	c #636A71",
+"h 	c #575E66",
+"i 	c #70737C",
+"j 	c #B4B5BA",
+"k 	c #BABBBA",
+"l 	c #66665C",
+"m 	c #565643",
+"n 	c #9A9A8A",
+"o 	c #D3D4C7",
+"p 	c #F0F0DD",
+"q 	c #F5F6D4",
+"r 	c #E6E7B4",
+"s 	c #C0C085",
+"t 	c #76754F",
+"u 	c #36362B",
+"v 	c #4D4E4E",
+"w 	c #575A63",
+"x 	c #4E525E",
+"y 	c #4B4F5A",
+"z 	c #656C73",
+"A 	c #A6AAAE",
+"B 	c #B9BABA",
+"C 	c #5C5C53",
+"D 	c #6E6E5A",
+"E 	c #DFDFD6",
+"F 	c #FFFFFF",
+"G 	c #FFFFFD",
+"H 	c #FFFFE5",
+"I 	c #FFFDCF",
+"J 	c #FFFFBA",
+"K 	c #FFFFA6",
+"L 	c #FEFA8A",
+"M 	c #B3AD5E",
+"N 	c #3B3B2B",
+"O 	c #373B39",
+"P 	c #525961",
+"Q 	c #7F828A",
+"R 	c #B3B5B8",
+"S 	c #6C6D67",
+"T 	c #62624D",
+"U 	c #EDEDDC",
+"V 	c #FFFFFC",
+"W 	c #FFF6DC",
+"X 	c #FFE9B3",
+"Y 	c #FFDF90",
+"Z 	c #FFDC7D",
+"` 	c #FFE076",
+" .	c #FFE874",
+"..	c #FFF16C",
+"+.	c #FFF95D",
+"@.	c #B5AB4F",
+"#.	c #313129",
+"$.	c #383B3F",
+"%.	c #484C58",
+"&.	c #5D656C",
+"*.	c #9A9FA3",
+"=.	c #979999",
+"-.	c #454636",
+";.	c #C6C7A7",
+">.	c #FFFFEB",
+",.	c #FFF0C1",
+"'.	c #FFDA83",
+").	c #FFCA55",
+"!.	c #FFC443",
+"~.	c #FFC33F",
+"{.	c #FFC943",
+"].	c #FFD34A",
+"^.	c #FFDF4D",
+"/.	c #FFE94C",
+"(.	c #FEE851",
+"_.	c #7C7645",
+":.	c #2B2E2B",
+"<.	c #495057",
+"[.	c #505860",
+"}.	c #60646E",
+"|.	c #999BA1",
+"1.	c #6A6A67",
+"2.	c #68684E",
+"3.	c #FCFCCA",
+"4.	c #FFF6BA",
+"5.	c #FFD877",
+"6.	c #FFC445",
+"7.	c #FFC13A",
+"8.	c #FFD042",
+"9.	c #FFD845",
+"0.	c #FFE049",
+"a.	c #FFE54C",
+"b.	c #FFE94E",
+"c.	c #C7B250",
+"d.	c #33342A",
+"e.	c #383B41",
+"f.	c #464A56",
+"g.	c #676E75",
+"h.	c #929699",
+"i.	c #4B4C46",
+"j.	c #97976B",
+"k.	c #FFFFB5",
+"l.	c #FFE887",
+"m.	c #FFCC4D",
+"n.	c #FFC63C",
+"o.	c #FFE74B",
+"p.	c #FFED4F",
+"q.	c #FFED53",
+"r.	c #FFE654",
+"s.	c #ECCA54",
+"t.	c #4D4B35",
+"u.	c #313637",
+"v.	c #4C545B",
+"w.	c #5C606B",
+"x.	c #7F8187",
+"y.	c #3C3D37",
+"z.	c #ACA96B",
+"A.	c #FFFF93",
+"B.	c #FFE168",
+"C.	c #FFCF46",
+"D.	c #FFF46E",
+"E.	c #FFF374",
+"F.	c #FFE667",
+"G.	c #F8CE56",
+"H.	c #58543A",
+"I.	c #2A2C2D",
+"J.	c #434651",
+"K.	c #5E666D",
+"L.	c #757A7F",
+"M.	c #363834",
+"N.	c #A7A25C",
+"O.	c #FFFB72",
+"P.	c #FFE256",
+"Q.	c #FFD846",
+"R.	c #FFF79A",
+"S.	c #FFF496",
+"T.	c #FFE477",
+"U.	c #F4C758",
+"V.	c #545138",
+"W.	c #2D3030",
+"X.	c #515560",
+"Y.	c #5E626B",
+"Z.	c #353735",
+"`.	c #858147",
+" +	c #FFF255",
+".+	c #FFE64C",
+"++	c #FFE24A",
+"@+	c #FFE84C",
+"#+	c #FFF158",
+"$+	c #FFF578",
+"%+	c #FFF898",
+"&+	c #FFF9B0",
+"*+	c #FFFABA",
+"=+	c #FFFABD",
+"-+	c #FFF3AA",
+";+	c #FFDE78",
+">+	c #DFB657",
+",+	c #434231",
+"'+	c #2D3033",
+")+	c #424550",
+"!+	c #555C64",
+"~+	c #545C63",
+"{+	c #3C403F",
+"]+	c #4D4C34",
+"^+	c #EED952",
+"/+	c #FFE94D",
+"(+	c #FFE74E",
+"_+	c #FFEF5A",
+":+	c #FFF57B",
+"<+	c #FFF89E",
+"[+	c #FFFAB8",
+"}+	c #FFFCCB",
+"|+	c #FFFDD5",
+"1+	c #FFF9CC",
+"2+	c #FFE8A0",
+"3+	c #FFD667",
+"4+	c #A9904D",
+"5+	c #2A2C26",
+"6+	c #393E42",
+"7+	c #4A5259",
+"8+	c #020202",
+"9+	c #050503",
+"0+	c #24251F",
+"a+	c #9C924C",
+"b+	c #FFE650",
+"c+	c #FFE050",
+"d+	c #FFE767",
+"e+	c #FFF18C",
+"f+	c #FFF6AC",
+"g+	c #FFF9C3",
+"h+	c #FFF9CF",
+"i+	c #FFF4CA",
+"j+	c #FFE7A8",
+"k+	c #FFD772",
+"l+	c #EABC57",
+"m+	c #565239",
+"n+	c #13130F",
+"o+	c #010101",
+"p+	c #12130E",
+"q+	c #3C3C2E",
+"r+	c #BDA850",
+"s+	c #FFDC52",
+"t+	c #FFD858",
+"u+	c #FFDA6D",
+"v+	c #FFDF86",
+"w+	c #FFE495",
+"x+	c #FFE295",
+"y+	c #FFD366",
+"z+	c #F2C257",
+"A+	c #7A6E45",
+"B+	c #1F211A",
+"C+	c #060604",
+"D+	c #BEBEBE",
+"E+	c #BBBBBB",
+"F+	c #A9A9A8",
+"G+	c #585853",
+"H+	c #3D3E2F",
+"I+	c #A08D4C",
+"J+	c #EDC252",
+"K+	c #FFCB53",
+"L+	c #FFCE56",
+"M+	c #FFD059",
+"N+	c #FFCF58",
+"O+	c #FFC854",
+"P+	c #D2AB52",
+"Q+	c #6E6541",
+"R+	c #33352E",
+"S+	c #6D6D6B",
+"T+	c #999999",
+"U+	c #B4B4B4",
+"V+	c #BCBCBC",
+"W+	c #B6B6B6",
+"X+	c #A3A3A3",
+"Y+	c #62625E",
+"Z+	c #33362E",
+"`+	c #555139",
+" @	c #8A7947",
+".@	c #A98E4A",
+"+@	c #AF924A",
+"@@	c #9F8849",
+"#@	c #736942",
+"$@	c #3D3E30",
+"%@	c #3D3F39",
+"&@	c #727270",
+"*@	c #969696",
+"=@	c #AFAFAF",
+"-@	c #A6A6A6",
+";@	c #828280",
+">@	c #555551",
+",@	c #3B3D39",
+"'@	c #303430",
+")@	c #30342E",
+"!@	c #444541",
+"~@	c #61615E",
+"{@	c #858584",
+"]@	c #9D9D9D",
+"^@	c #B2B2B2",
+"/@	c #BDBDBD",
+"(@	c #ADADAD",
+"_@	c #A0A0A0",
+":@	c #8E8E8D",
+"<@	c #7E7E7E",
+"[@	c #797979",
+"}@	c #80807F",
+"|@	c #8E8E8E",
+"1@	c #9B9B9B",
+"2@	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . # $ % & * = - ; > , ' . . . . ",
+") ) ) ! ~ { ] ^ / ( _ : < [ } | 1 ) ) ) ",
+"2 2 3 4 5 6 7 8 9 0 a b c d e f g h 2 2 ",
+") ) i j k l m n o p q r s t u v w x y ) ",
+"2 z A B C D E F G H I J K L M N O P 2 2 ",
+"y Q R S T U V W X Y Z `  ...+.@.#.$.%.) ",
+"&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.",
+"}.|.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.t.u.v.",
+"w.x.y.z.A.B.C.. . . . . . D.E.F.G.H.I.J.",
+"K.L.M.N.O.P.Q.. . . . . . R.S.T.U.V.W.<.",
+"X.Y.Z.`. +.+++@+#+$+%+&+*+=+-+;+>+,+'+)+",
+"!+~+{+]+^+/+(+_+:+<+[+}+|+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+t+u+v+w+x+'.y+z+A+B+C+. . ",
+"D+D+E+F+G+H+I+J+K+L+M+N+O+P+Q+R+S+T+U+D+",
+"D+D+V+W+X+Y+Z+`+ @.@+@@@#@$@%@&@*@=@D+D+",
+"D+D+D+E+U+-@;@>@,@'@)@M.!@~@{@]@^@/@D+D+",
+"D+D+D+D+E+W+(@_@:@<@[@}@|@1@+ 2@D+D+D+D+"};
diff --git a/themes/gorilla/stick-active.xpm b/themes/gorilla/stick-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..78052d8dc59f41bfad8cb33f2cb4326f10abcd14
--- /dev/null
+++ b/themes/gorilla/stick-active.xpm
@@ -0,0 +1,309 @@
+/* XPM */
+static char * stick_active_xpm[] = {
+"20 26 280 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #A9A9A9",
+"@ 	c #D3D3D3",
+"# 	c #0D0D0D",
+"$ 	c #343434",
+"% 	c #5F5F5F",
+"& 	c #858585",
+"* 	c #929292",
+"= 	c #8D8D8D",
+"- 	c #777777",
+"; 	c #565656",
+"> 	c #323232",
+", 	c #161616",
+"' 	c #050505",
+") 	c #494D59",
+"! 	c #4A4E5A",
+"~ 	c #696C76",
+"{ 	c #9B9DA4",
+"] 	c #C3C4C8",
+"^ 	c #C4C5C6",
+"/ 	c #AAAAAB",
+"( 	c #919292",
+"_ 	c #878888",
+": 	c #8A8B8C",
+"< 	c #929397",
+"[ 	c #8C8F95",
+"} 	c #787B83",
+"| 	c #61656F",
+"1 	c #505460",
+"2 	c #515961",
+"3 	c #545C64",
+"4 	c #7B8187",
+"5 	c #B6B9BD",
+"6 	c #CACBCC",
+"7 	c #90908E",
+"8 	c #4D4D47",
+"9 	c #39382F",
+"0 	c #3D3D31",
+"a 	c #3E3D2F",
+"b 	c #37362A",
+"c 	c #2F302B",
+"d 	c #484A4B",
+"e 	c #737679",
+"f 	c #70767C",
+"g 	c #636A71",
+"h 	c #575E66",
+"i 	c #70737C",
+"j 	c #B4B5BA",
+"k 	c #B9B9BA",
+"l 	c #5A5A56",
+"m 	c #39392D",
+"n 	c #817F6D",
+"o 	c #C3C0A7",
+"p 	c #E9E0BA",
+"q 	c #F0E3AD",
+"r 	c #DCCD88",
+"s 	c #AC9D59",
+"t 	c #59522D",
+"u 	c #1D1E1B",
+"v 	c #47494B",
+"w 	c #555962",
+"x 	c #4E525E",
+"y 	c #4B4F5A",
+"z 	c #656C73",
+"A 	c #A5A9AD",
+"B 	c #B9BABA",
+"C 	c #4F504B",
+"D 	c #4F4E3F",
+"E 	c #D2D0B7",
+"F 	c #FFFFEB",
+"G 	c #FFFFE6",
+"H 	c #FFF9D2",
+"I 	c #FFF4B7",
+"J 	c #FFEF96",
+"K 	c #FFED72",
+"L 	c #FADA4D",
+"M 	c #9B872B",
+"N 	c #202016",
+"O 	c #2E3232",
+"P 	c #515960",
+"Q 	c #7F828A",
+"R 	c #B3B4B8",
+"S 	c #646462",
+"T 	c #434333",
+"U 	c #E3DDBB",
+"V 	c #FFFFE5",
+"W 	c #FFF9DE",
+"X 	c #FFF8DA",
+"Y 	c #FFF5C9",
+"Z 	c #FFEFAC",
+"` 	c #FFE783",
+" .	c #FFDE58",
+"..	c #FFD931",
+"+.	c #FFD910",
+"@.	c #9E8317",
+"#.	c #171918",
+"$.	c #33363B",
+"%.	c #484C58",
+"&.	c #5E666D",
+"*.	c #9A9EA3",
+"=.	c #959798",
+"-.	c #2D2D25",
+";.	c #B4AB82",
+">.	c #FFFFD0",
+",.	c #FFF5CF",
+"'.	c #FFF7D4",
+").	c #FFF6D1",
+"!.	c #FFF2BF",
+"~.	c #FFEC9D",
+"{.	c #FFE36D",
+"].	c #FFD83B",
+"^.	c #FFD011",
+"/.	c #FFCB00",
+"(.	c #FCC203",
+"_.	c #5E501E",
+":.	c #1D2124",
+"<.	c #484F55",
+"[.	c #646872",
+"}.	c #989AA1",
+"|.	c #636363",
+"1.	c #4A4731",
+"2.	c #F9E8A1",
+"3.	c #FFF2B3",
+"4.	c #FFF1BA",
+"5.	c #FFF3C1",
+"6.	c #FFF3BF",
+"7.	c #FFE787",
+"8.	c #FFDC4F",
+"9.	c #FFC800",
+"0.	c #FFBF00",
+"a.	c #FFC000",
+"b.	c #B38513",
+"c.	c #191C1B",
+"d.	c #34373E",
+"e.	c #71777E",
+"f.	c #909598",
+"g.	c #3D3E3E",
+"h.	c #7E7444",
+"i.	c #FFEE8A",
+"j.	c #FFE98F",
+"k.	c #FFEA96",
+"l.	c #FFEB9B",
+"m.	c #FFEB98",
+"n.	c #FFBB00",
+"o.	c #FFB300",
+"p.	c #FFB000",
+"q.	c #E1990A",
+"r.	c #2F2C1E",
+"s.	c #2A2F32",
+"t.	c #4D555D",
+"u.	c #686B75",
+"v.	c #7D7F86",
+"w.	c #292B2D",
+"x.	c #96863F",
+"y.	c #FFEA62",
+"z.	c #FFDF60",
+"A.	c #FFE061",
+"B.	c #FFAC00",
+"C.	c #FFA500",
+"D.	c #FFA200",
+"E.	c #F39905",
+"F.	c #38331F",
+"G.	c #212327",
+"H.	c #444752",
+"I.	c #666D74",
+"J.	c #73797E",
+"K.	c #24282A",
+"L.	c #907E2D",
+"M.	c #FFE032",
+"N.	c #FFD528",
+"O.	c #FFD320",
+"P.	c #FF9C00",
+"Q.	c #FF9800",
+"R.	c #FF9700",
+"S.	c #EE8F06",
+"T.	c #36311F",
+"U.	c #23282A",
+"V.	c #4A5259",
+"W.	c #565A65",
+"X.	c #5D606A",
+"Y.	c #282B2F",
+"Z.	c #685C1E",
+"`.	c #FFD108",
+" +	c #FFCA00",
+".+	c #FFC500",
+"++	c #FFB900",
+"@+	c #FF9000",
+"#+	c #FF8F00",
+"$+	c #FF9300",
+"%+	c #D17E0E",
+"&+	c #26261D",
+"*+	c #27292E",
+"=+	c #434752",
+"-+	c #535B63",
+";+	c #34383A",
+">+	c #2F2D1B",
+",+	c #E5B108",
+"'+	c #FFC300",
+")+	c #FFB800",
+"!+	c #FFB200",
+"~+	c #FFAA00",
+"{+	c #FF9600",
+"]+	c #906019",
+"^+	c #151B1B",
+"/+	c #363B3F",
+"(+	c #4B535A",
+"_+	c #020202",
+":+	c #010100",
+"<+	c #101314",
+"[+	c #81691B",
+"}+	c #FFBC01",
+"|+	c #FFA700",
+"1+	c #FF9F00",
+"2+	c #FF9500",
+"3+	c #FF9400",
+"4+	c #DF840B",
+"5+	c #373120",
+"6+	c #090B09",
+"7+	c #0A0A08",
+"8+	c #21211C",
+"9+	c #A87C17",
+"0+	c #FFAD01",
+"a+	c #FF9100",
+"b+	c #EB8B08",
+"c+	c #5C461F",
+"d+	c #0E1210",
+"e+	c #040402",
+"f+	c #BEBEBE",
+"g+	c #BBBBBB",
+"h+	c #AAAAA9",
+"i+	c #50504E",
+"j+	c #22231C",
+"k+	c #86611B",
+"l+	c #E48F09",
+"m+	c #FF9501",
+"n+	c #FC9103",
+"o+	c #C17811",
+"p+	c #4F3F20",
+"q+	c #202524",
+"r+	c #6B6B69",
+"s+	c #9A9A99",
+"t+	c #B4B4B4",
+"u+	c #BCBCBC",
+"v+	c #B6B6B6",
+"w+	c #A3A3A3",
+"x+	c #5C5D5B",
+"y+	c #1F2323",
+"z+	c #37311F",
+"A+	c #6F4F1D",
+"B+	c #936117",
+"C+	c #9A6316",
+"D+	c #865B1A",
+"E+	c #56421F",
+"F+	c #21241C",
+"G+	c #303332",
+"H+	c #70706F",
+"I+	c #969696",
+"J+	c #AFAFAF",
+"K+	c #A7A7A6",
+"L+	c #818180",
+"M+	c #4E4F4E",
+"N+	c #1E2425",
+"O+	c #1C2325",
+"P+	c #242A2B",
+"Q+	c #3A3D3B",
+"R+	c #5D5D5C",
+"S+	c #848484",
+"T+	c #9C9C9C",
+"U+	c #B2B2B2",
+"V+	c #BDBDBD",
+"W+	c #ADADAD",
+"X+	c #A0A0A0",
+"Y+	c #8E8E8E",
+"Z+	c #7E7E7E",
+"`+	c #797979",
+" @	c #808080",
+".@	c #8F8F8F",
+"+@	c #9B9B9B",
+"@@	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . # $ % & * = - ; > , ' . . . . ",
+") ) ) ! ~ { ] ^ / ( _ : < [ } | 1 ) ) ) ",
+"2 2 3 4 5 6 7 8 9 0 a b c d e f g h 2 2 ",
+") ) i j k l m n o p q r s t u v w x y ) ",
+"2 z A B C D E F G H I J K L M N O P 2 2 ",
+"y Q R S T U V W X Y Z `  ...+.@.#.$.%.) ",
+"&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.2 ",
+"[.}.|.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.t.",
+"u.v.w.x.y.z.A.. . . . . . B.C.D.E.F.G.H.",
+"I.J.K.L.M.N.O.. . . . . . P.Q.R.S.T.U.V.",
+"W.X.Y.Z.`. +.+0.++. . . . @+#+$+%+&+*+=+",
+"h -+;+>+,+'+)+!+~+. {+@+. @+@+{+]+^+/+(+",
+"_+. :+<+[+}+p.|+1+2+@+@+@+@+3+4+5+6+. . ",
+". . . 7+8+9+0+D.{+@+@+@+a+2+b+c+d+e+. . ",
+"f+f+g+h+i+j+k+l+m+{+{+2+n+o+p+q+r+s+t+f+",
+"f+f+u+v+w+x+y+z+A+B+C+D+E+F+G+H+I+J+f+f+",
+"f+f+f+g+t+K+L+M+O N+O+P+Q+R+S+T+U+V+f+f+",
+"f+f+f+f+g+v+W+X+Y+Z+`+ @.@+@+ @@f+f+f+f+"};
diff --git a/themes/gorilla/stick-inactive.xpm b/themes/gorilla/stick-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..ff2bf5a09adf4f1945b2662a119a6dc6a3a8a6c8
--- /dev/null
+++ b/themes/gorilla/stick-inactive.xpm
@@ -0,0 +1,315 @@
+/* XPM */
+static char * stick_inactive_xpm[] = {
+"20 26 286 2",
+"  	c None",
+". 	c #D7D7CF",
+"+ 	c #000000",
+"@ 	c #A9A9A9",
+"# 	c #D3D3D3",
+"$ 	c #0D0D0D",
+"% 	c #343434",
+"& 	c #5F5F5F",
+"* 	c #858585",
+"= 	c #929292",
+"- 	c #8D8D8D",
+"; 	c #777777",
+"> 	c #565656",
+", 	c #323232",
+"' 	c #161616",
+") 	c #050505",
+"! 	c #494D59",
+"~ 	c #4A4E5A",
+"{ 	c #696C76",
+"] 	c #9B9DA4",
+"^ 	c #C3C4C8",
+"/ 	c #C4C5C6",
+"( 	c #AAAAAB",
+"_ 	c #919292",
+": 	c #878888",
+"< 	c #8A8B8C",
+"[ 	c #929397",
+"} 	c #8C8F95",
+"| 	c #787B83",
+"1 	c #61656F",
+"2 	c #505460",
+"3 	c #515961",
+"4 	c #545C64",
+"5 	c #7B8187",
+"6 	c #B6B9BD",
+"7 	c #CACBCC",
+"8 	c #90908D",
+"9 	c #4D4D46",
+"0 	c #39392F",
+"a 	c #3D3D32",
+"b 	c #3E3E31",
+"c 	c #37372B",
+"d 	c #2F2F2A",
+"e 	c #48494A",
+"f 	c #737679",
+"g 	c #70767C",
+"h 	c #636A71",
+"i 	c #575E66",
+"j 	c #70737C",
+"k 	c #B4B5BA",
+"l 	c #B9B9BA",
+"m 	c #5A5A55",
+"n 	c #39392E",
+"o 	c #818177",
+"p 	c #C3C3B9",
+"q 	c #E9E9D1",
+"r 	c #F0F0C4",
+"s 	c #DCDC9D",
+"t 	c #ACAB67",
+"u 	c #595732",
+"v 	c #1D1E1B",
+"w 	c #47484B",
+"x 	c #555962",
+"y 	c #4E525E",
+"z 	c #4B4F5A",
+"A 	c #656C73",
+"B 	c #A5A9AD",
+"C 	c #B9BABA",
+"D 	c #4F4F4A",
+"E 	c #4F4F43",
+"F 	c #D2D2CB",
+"G 	c #FFFFFF",
+"H 	c #FFFFEB",
+"I 	c #FFFFD1",
+"J 	c #FFFFB0",
+"K 	c #FFFF8D",
+"L 	c #FAF365",
+"M 	c #9B9337",
+"N 	c #202016",
+"O 	c #2E3232",
+"P 	c #515960",
+"Q 	c #7F828A",
+"R 	c #B3B4B8",
+"S 	c #646461",
+"T 	c #434336",
+"U 	c #E3E3D0",
+"V 	c #FFFFF8",
+"W 	c #FFFFF3",
+"X 	c #FFFFE2",
+"Y 	c #FFFFC5",
+"Z 	c #FFFF9C",
+"` 	c #FFF770",
+" .	c #FFF34B",
+"..	c #FFF32A",
+"+.	c #9E9024",
+"@.	c #171918",
+"#.	c #33363B",
+"$.	c #484C58",
+"%.	c #5D646C",
+"&.	c #9A9EA3",
+"*.	c #959797",
+"=.	c #2D2D25",
+"-.	c #B4B492",
+";.	c #FFFFEA",
+">.	c #FFFFE8",
+",.	c #FFFFED",
+"'.	c #FFFFD8",
+").	c #FFFFB6",
+"!.	c #FFFC86",
+"~.	c #FFF254",
+"{.	c #FFE92A",
+"].	c #FFE418",
+"^.	c #FCDB1B",
+"/.	c #5E5623",
+"(.	c #1D2123",
+"_.	c #484F56",
+":.	c #505860",
+"<.	c #62656F",
+"[.	c #9A9CA2",
+"}.	c #636363",
+"|.	c #4A4A35",
+"1.	c #F9F9B9",
+"2.	c #FFFFCD",
+"3.	c #FFFFD3",
+"4.	c #FFFFDA",
+"5.	c #FFFFA0",
+"6.	c #FFF568",
+"7.	c #FFE117",
+"8.	c #FFD818",
+"9.	c #FFDB18",
+"0.	c #B39522",
+"a.	c #191C1B",
+"b.	c #36383F",
+"c.	c #464A56",
+"d.	c #6E747B",
+"e.	c #93979B",
+"f.	c #3D3D3D",
+"g.	c #7E7D4E",
+"h.	c #FFFFA4",
+"i.	c #FFFFA8",
+"j.	c #FFFFAF",
+"k.	c #FFFFB4",
+"l.	c #FFFFB1",
+"m.	c #FFD418",
+"n.	c #FFCC19",
+"o.	c #FFCA18",
+"p.	c #E1AE1F",
+"q.	c #2F2D1F",
+"r.	c #2D3134",
+"s.	c #4C545B",
+"t.	c #666973",
+"u.	c #7F8188",
+"v.	c #29292C",
+"w.	c #96934B",
+"x.	c #FFFF7C",
+"y.	c #FFF979",
+"z.	c #FFF97A",
+"A.	c #FFC519",
+"B.	c #FFBE19",
+"C.	c #FFBB19",
+"D.	c #F3B01B",
+"E.	c #383420",
+"F.	c #232529",
+"G.	c #424651",
+"H.	c #646B72",
+"I.	c #747A7F",
+"J.	c #242529",
+"K.	c #908A39",
+"L.	c #FFFB4D",
+"M.	c #FFEE42",
+"N.	c #FFED39",
+"O.	c #FFB519",
+"P.	c #FFB119",
+"Q.	c #EEA61C",
+"R.	c #363220",
+"S.	c #262A2C",
+"T.	c #495057",
+"U.	c #545863",
+"V.	c #5D616B",
+"W.	c #282A2E",
+"X.	c #686225",
+"Y.	c #FFEA21",
+"Z.	c #FFE31A",
+"`.	c #FFDE17",
+" +	c #FFD816",
+".+	c #FFD217",
+"++	c #FFA919",
+"@+	c #FFA819",
+"#+	c #FFAE18",
+"$+	c #D19121",
+"%+	c #26261D",
+"&+	c #292B31",
+"*+	c #424550",
+"=+	c #555D65",
+"-+	c #535B63",
+";+	c #34383A",
+">+	c #2F2E1C",
+",+	c #E5C71D",
+"'+	c #FFDD18",
+")+	c #FFD119",
+"!+	c #FFCB19",
+"~+	c #FFC319",
+"{+	c #FFAF19",
+"]+	c #FFB019",
+"^+	c #906B24",
+"/+	c #151A1B",
+"(+	c #373C41",
+"_+	c #4A5259",
+":+	c #010101",
+"<+	c #010100",
+"[+	c #101213",
+"}+	c #817225",
+"|+	c #FFD61A",
+"1+	c #FFC919",
+"2+	c #FFC019",
+"3+	c #FFB819",
+"4+	c #FFAE19",
+"5+	c #FFAF18",
+"6+	c #DF9920",
+"7+	c #373321",
+"8+	c #090A09",
+"9+	c #0A0A08",
+"0+	c #21211C",
+"a+	c #A88924",
+"b+	c #FFC71A",
+"c+	c #FFBC18",
+"d+	c #FFAA19",
+"e+	c #FFB018",
+"f+	c #EBA11E",
+"g+	c #5C4B24",
+"h+	c #0E1010",
+"i+	c #040402",
+"j+	c #BEBEBE",
+"k+	c #BBBBBB",
+"l+	c #AAAAA9",
+"m+	c #50504E",
+"n+	c #22231C",
+"o+	c #866C25",
+"p+	c #E4A51E",
+"q+	c #FFAE1A",
+"r+	c #FFB118",
+"s+	c #FCAA1C",
+"t+	c #C18922",
+"u+	c #4F4323",
+"v+	c #202423",
+"w+	c #6B6B69",
+"x+	c #9A9A99",
+"y+	c #B4B4B4",
+"z+	c #BCBCBC",
+"A+	c #B6B6B6",
+"B+	c #A3A3A3",
+"C+	c #5C5D5B",
+"D+	c #1F2222",
+"E+	c #373220",
+"F+	c #6F5624",
+"G+	c #936C23",
+"H+	c #9A7022",
+"I+	c #866524",
+"J+	c #564724",
+"K+	c #21231C",
+"L+	c #303332",
+"M+	c #70706F",
+"N+	c #969696",
+"O+	c #AFAFAF",
+"P+	c #A7A7A6",
+"Q+	c #818180",
+"R+	c #4E4F4E",
+"S+	c #2E3131",
+"T+	c #1E2324",
+"U+	c #1C2223",
+"V+	c #242829",
+"W+	c #3A3C3B",
+"X+	c #5D5D5C",
+"Y+	c #848484",
+"Z+	c #9C9C9C",
+"`+	c #B2B2B2",
+" @	c #BDBDBD",
+".@	c #ADADAD",
+"+@	c #A0A0A0",
+"@@	c #8E8E8E",
+"#@	c #7E7E7E",
+"$@	c #797979",
+"%@	c #808080",
+"&@	c #8F8F8F",
+"*@	c #9B9B9B",
+"=@	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"# # # # # # # # # # # # # # # # # # # # ",
+"# # # # # # # # # # # # # # # # # # # # ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"+ + + + + $ % & * = - ; > , ' ) + + + + ",
+"! ! ! ~ { ] ^ / ( _ : < [ } | 1 2 ! ! ! ",
+"3 3 4 5 6 7 8 9 0 a b c d e f g h i 3 3 ",
+"! ! j k l m n o p q r s t u v w x y z ! ",
+"3 A B C D E F G G H I J K L M N O P 3 3 ",
+"~ Q R S T U G V W X Y Z `  ...+.@.#.$.! ",
+"%.&.*.=.-.;.>.,.;.'.).!.~.{.].^./.(._.:.",
+"<.[.}.|.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.",
+"t.u.v.w.x.y.z.+ + + + + + A.B.C.D.E.F.G.",
+"H.I.J.K.L.M.N.+ + + + + + O.P.P.Q.R.S.T.",
+"U.V.W.X.Y.Z.`. +.++ + + + ++@+#+$+%+&+*+",
+"=+-+;+>+,+'+)+!+~++ {++++ ++++]+^+/+(+_+",
+":++ <+[+}+|+1+2+3+4+++++++++5+6+7+8++ + ",
+"+ + + 9+0+a+b+c+]+++++++d+e+f+g+h+i++ + ",
+"j+j+k+l+m+n+o+p+q+]+r+{+s+t+u+v+w+x+y+j+",
+"j+j+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+j+j+",
+"j+j+j+k+y+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @j+j+",
+"j+j+j+j+k+A+.@+@@@#@$@%@&@*@@ =@j+j+j+j+"};
diff --git a/themes/gorilla/stick-pressed.xpm b/themes/gorilla/stick-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..64bbc19bbbd59fd6cef7a18fd34d1c310df9058a
--- /dev/null
+++ b/themes/gorilla/stick-pressed.xpm
@@ -0,0 +1,330 @@
+/* XPM */
+static char * stick_pressed_xpm[] = {
+"20 26 301 2",
+"  	c None",
+". 	c #000000",
+"+ 	c #A9A9A9",
+"@ 	c #D3D3D3",
+"# 	c #0D0D0D",
+"$ 	c #343434",
+"% 	c #5F5F5F",
+"& 	c #858585",
+"* 	c #929292",
+"= 	c #8D8D8D",
+"- 	c #777777",
+"; 	c #565656",
+"> 	c #323232",
+", 	c #161616",
+"' 	c #050505",
+") 	c #494D59",
+"! 	c #4A4E5A",
+"~ 	c #696C76",
+"{ 	c #9B9DA4",
+"] 	c #C2C3C8",
+"^ 	c #C3C4C5",
+"/ 	c #ACACAB",
+"( 	c #959693",
+"_ 	c #8B8B8A",
+": 	c #8D8E8D",
+"< 	c #949598",
+"[ 	c #8D8F96",
+"} 	c #787B83",
+"| 	c #61656F",
+"1 	c #505460",
+"2 	c #515961",
+"3 	c #545C64",
+"4 	c #7B8187",
+"5 	c #B6B9BD",
+"6 	c #C9CACB",
+"7 	c #949490",
+"8 	c #5B5B51",
+"9 	c #525241",
+"0 	c #595947",
+"a 	c #5B5B46",
+"b 	c #525240",
+"c 	c #45453A",
+"d 	c #535450",
+"e 	c #76797A",
+"f 	c #71787D",
+"g 	c #636A71",
+"h 	c #575E66",
+"i 	c #70737C",
+"j 	c #B4B5BA",
+"k 	c #BABBBA",
+"l 	c #66665C",
+"m 	c #565643",
+"n 	c #9A9A8A",
+"o 	c #D3D4C7",
+"p 	c #F0F0DD",
+"q 	c #F5F6D4",
+"r 	c #E6E7B4",
+"s 	c #C0C085",
+"t 	c #76754F",
+"u 	c #36362B",
+"v 	c #4D4E4E",
+"w 	c #575A63",
+"x 	c #4E525E",
+"y 	c #4B4F5A",
+"z 	c #656C73",
+"A 	c #A6AAAE",
+"B 	c #B9BABA",
+"C 	c #5C5C53",
+"D 	c #6E6E5A",
+"E 	c #DFDFD6",
+"F 	c #FFFFFF",
+"G 	c #FFFFFD",
+"H 	c #FFFFE5",
+"I 	c #FFFDCF",
+"J 	c #FFFFBA",
+"K 	c #FFFFA6",
+"L 	c #FEFA8A",
+"M 	c #B3AD5E",
+"N 	c #3B3B2B",
+"O 	c #373B39",
+"P 	c #525961",
+"Q 	c #7F828A",
+"R 	c #B3B5B8",
+"S 	c #6C6D67",
+"T 	c #62624D",
+"U 	c #EDEDDC",
+"V 	c #FFFFFC",
+"W 	c #FFF6DC",
+"X 	c #FFE9B3",
+"Y 	c #FFDF90",
+"Z 	c #FFDC7D",
+"` 	c #FFE076",
+" .	c #FFE874",
+"..	c #FFF16C",
+"+.	c #FFF95D",
+"@.	c #B5AB4F",
+"#.	c #313129",
+"$.	c #383B3F",
+"%.	c #484C58",
+"&.	c #5D656C",
+"*.	c #9A9FA3",
+"=.	c #979999",
+"-.	c #454636",
+";.	c #C6C7A7",
+">.	c #FFFFEB",
+",.	c #FFF0C1",
+"'.	c #FFDA83",
+").	c #FFCA55",
+"!.	c #FFC443",
+"~.	c #FFC33F",
+"{.	c #FFC943",
+"].	c #FFD34A",
+"^.	c #FFDF4D",
+"/.	c #FFE94C",
+"(.	c #FEE851",
+"_.	c #7C7645",
+":.	c #2B2E2B",
+"<.	c #495057",
+"[.	c #505860",
+"}.	c #60646E",
+"|.	c #999BA1",
+"1.	c #6A6A67",
+"2.	c #68684E",
+"3.	c #FCFCCA",
+"4.	c #FFF6BA",
+"5.	c #FFD877",
+"6.	c #FFC445",
+"7.	c #FFC13A",
+"8.	c #FFCA3E",
+"9.	c #FFD042",
+"0.	c #FFE049",
+"a.	c #FFE54C",
+"b.	c #FFE94E",
+"c.	c #C7B250",
+"d.	c #33342A",
+"e.	c #383B41",
+"f.	c #464A56",
+"g.	c #676E75",
+"h.	c #929699",
+"i.	c #4B4C46",
+"j.	c #97976B",
+"k.	c #FFFFB5",
+"l.	c #FFE887",
+"m.	c #FFCC4D",
+"n.	c #FFC63C",
+"o.	c #FFCB3F",
+"p.	c #FFED4F",
+"q.	c #FFED53",
+"r.	c #FFE654",
+"s.	c #ECCA54",
+"t.	c #4D4B35",
+"u.	c #313637",
+"v.	c #4C545B",
+"w.	c #5C606B",
+"x.	c #7F8187",
+"y.	c #3C3D37",
+"z.	c #ACA96B",
+"A.	c #FFFF93",
+"B.	c #FFE168",
+"C.	c #FFCF46",
+"D.	c #FFF46E",
+"E.	c #FFF374",
+"F.	c #FFE667",
+"G.	c #F8CE56",
+"H.	c #58543A",
+"I.	c #2A2C2D",
+"J.	c #434651",
+"K.	c #5E666D",
+"L.	c #757A7F",
+"M.	c #363834",
+"N.	c #A7A25C",
+"O.	c #FFFB72",
+"P.	c #FFE256",
+"Q.	c #FFD846",
+"R.	c #FFF79A",
+"S.	c #FFF496",
+"T.	c #FFE477",
+"U.	c #F4C758",
+"V.	c #545138",
+"W.	c #2D3030",
+"X.	c #515560",
+"Y.	c #5E626B",
+"Z.	c #353735",
+"`.	c #858147",
+" +	c #FFF255",
+".+	c #FFE64C",
+"++	c #FFE24A",
+"@+	c #FFE84C",
+"#+	c #FFF158",
+"$+	c #FFFABD",
+"%+	c #FFF3AA",
+"&+	c #FFDE78",
+"*+	c #DFB657",
+"=+	c #434231",
+"-+	c #2D3033",
+";+	c #424550",
+">+	c #555C64",
+",+	c #545C63",
+"'+	c #3C403F",
+")+	c #4D4C34",
+"!+	c #EED952",
+"~+	c #FFE94D",
+"{+	c #FFE74E",
+"]+	c #FFEF5A",
+"^+	c #FFF57B",
+"/+	c #FFFAB8",
+"(+	c #FFFCCB",
+"_+	c #FFF9CC",
+":+	c #FFE8A0",
+"<+	c #FFD667",
+"[+	c #A9904D",
+"}+	c #2A2C26",
+"|+	c #393E42",
+"1+	c #4A5259",
+"2+	c #020202",
+"3+	c #050503",
+"4+	c #24251F",
+"5+	c #9C924C",
+"6+	c #FFE650",
+"7+	c #FFE050",
+"8+	c #FFE767",
+"9+	c #FFF18C",
+"0+	c #FFF6AC",
+"a+	c #FFF9C3",
+"b+	c #FFF9CF",
+"c+	c #FFF4CA",
+"d+	c #FFE7A8",
+"e+	c #FFD772",
+"f+	c #EABC57",
+"g+	c #565239",
+"h+	c #13130F",
+"i+	c #010101",
+"j+	c #12130E",
+"k+	c #3C3C2E",
+"l+	c #BDA850",
+"m+	c #FFDC52",
+"n+	c #FFD858",
+"o+	c #FFDA6D",
+"p+	c #FFDF86",
+"q+	c #FFE495",
+"r+	c #FFE295",
+"s+	c #FFD366",
+"t+	c #F2C257",
+"u+	c #7A6E45",
+"v+	c #1F211A",
+"w+	c #060604",
+"x+	c #BEBEBE",
+"y+	c #BBBBBB",
+"z+	c #A9A9A8",
+"A+	c #585853",
+"B+	c #3D3E2F",
+"C+	c #A08D4C",
+"D+	c #EDC252",
+"E+	c #FFCB53",
+"F+	c #FFCE56",
+"G+	c #FFD059",
+"H+	c #FFCF58",
+"I+	c #FFC854",
+"J+	c #D2AB52",
+"K+	c #6E6541",
+"L+	c #33352E",
+"M+	c #6D6D6B",
+"N+	c #999999",
+"O+	c #B4B4B4",
+"P+	c #BCBCBC",
+"Q+	c #B6B6B6",
+"R+	c #A3A3A3",
+"S+	c #62625E",
+"T+	c #33362E",
+"U+	c #555139",
+"V+	c #8A7947",
+"W+	c #A98E4A",
+"X+	c #AF924A",
+"Y+	c #9F8849",
+"Z+	c #736942",
+"`+	c #3D3E30",
+" @	c #3D3F39",
+".@	c #727270",
+"+@	c #969696",
+"@@	c #AFAFAF",
+"#@	c #A6A6A6",
+"$@	c #828280",
+"%@	c #555551",
+"&@	c #3B3D39",
+"*@	c #303430",
+"=@	c #30342E",
+"-@	c #444541",
+";@	c #61615E",
+">@	c #858584",
+",@	c #9D9D9D",
+"'@	c #B2B2B2",
+")@	c #BDBDBD",
+"!@	c #ADADAD",
+"~@	c #A0A0A0",
+"{@	c #8E8E8D",
+"]@	c #7E7E7E",
+"^@	c #797979",
+"/@	c #80807F",
+"(@	c #8E8E8E",
+"_@	c #9B9B9B",
+":@	c #B8B8B8",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . . . . . . . . . . . . . . . . ",
+"+ + + + + + + + + + + + + + + + + + + + ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+"@ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ @ ",
+". . . . . . . . . . . . . . . . . . . . ",
+". . . . . # $ % & * = - ; > , ' . . . . ",
+") ) ) ! ~ { ] ^ / ( _ : < [ } | 1 ) ) ) ",
+"2 2 3 4 5 6 7 8 9 0 a b c d e f g h 2 2 ",
+") ) i j k l m n o p q r s t u v w x y ) ",
+"2 z A B C D E F G H I J K L M N O P 2 2 ",
+"y Q R S T U V W X Y Z `  ...+.@.#.$.%.) ",
+"&.*.=.-.;.>.,.'.).!.~.{.].^./.(._.:.<.[.",
+"}.|.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.t.u.v.",
+"w.x.y.z.A.B.C.. . . . . . D.E.F.G.H.I.J.",
+"K.L.M.N.O.P.Q.. . . . . . R.S.T.U.V.W.<.",
+"X.Y.Z.`. +.+++@+#+. . . . $+%+&+*+=+-+;+",
+">+,+'+)+!+~+{+]+^+. /+(+. _+:+<+[+}+|+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+t+u+v+w+. . ",
+"x+x+y+z+A+B+C+D+E+F+G+H+I+J+K+L+M+N+O+x+",
+"x+x+P+Q+R+S+T+U+V+W+X+Y+Z+`+ @.@+@@@x+x+",
+"x+x+x+y+O+#@$@%@&@*@=@M.-@;@>@,@'@)@x+x+",
+"x+x+x+x+y+Q+!@~@{@]@^@/@(@_@+ :@x+x+x+x+"};
diff --git a/themes/gorilla/themerc b/themes/gorilla/themerc
new file mode 100644
index 0000000000000000000000000000000000000000..06048d497e000b5186b4aa97237f2017a28d45db
--- /dev/null
+++ b/themes/gorilla/themerc
@@ -0,0 +1,6 @@
+full_width_title=true
+button_offset=2
+button_spacing=2
+title_vertical_offset=2
+active_text_color=#FFFFFF
+inactive_text_color=#d3d3d3
diff --git a/themes/gorilla/title-1-active.xpm b/themes/gorilla/title-1-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..d1a05b4202f00c5eecac76688d03040faa369c59
--- /dev/null
+++ b/themes/gorilla/title-1-active.xpm
@@ -0,0 +1,36 @@
+/* XPM */
+static char * title_1_active_xpm[] = {
+"8 26 7 1",
+" 	c None",
+".	c #000000",
+"+	c #A9A9A9",
+"@	c #D3D3D3",
+"#	c #494D59",
+"$	c #515961",
+"%	c #BEBEBE",
+"........",
+"........",
+"........",
+"++++++++",
+"@@@@@@@@",
+"@@@@@@@@",
+"........",
+"........",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"........",
+"........",
+"%%%%%%%%",
+"%%%%%%%%",
+"%%%%%%%%",
+"%%%%%%%%"};
diff --git a/themes/gorilla/title-1-inactive.xpm b/themes/gorilla/title-1-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..df878405e494e304214b8ee333c80d4842d11f17
--- /dev/null
+++ b/themes/gorilla/title-1-inactive.xpm
@@ -0,0 +1,37 @@
+/* XPM */
+static char * title_1_inactive_xpm[] = {
+"8 26 8 1",
+" 	c None",
+".	c #D7D7CF",
+"+	c #000000",
+"@	c #A9A9A9",
+"#	c #D3D3D3",
+"$	c #494D59",
+"%	c #515961",
+"&	c #BEBEBE",
+"........",
+"++++++++",
+"++++++++",
+"@@@@@@@@",
+"########",
+"########",
+"++++++++",
+"++++++++",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"++++++++",
+"++++++++",
+"&&&&&&&&",
+"&&&&&&&&",
+"&&&&&&&&",
+"&&&&&&&&"};
diff --git a/themes/gorilla/title-2-active.xpm b/themes/gorilla/title-2-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..82232e08bd427ba695411dce2706561721508259
--- /dev/null
+++ b/themes/gorilla/title-2-active.xpm
@@ -0,0 +1,36 @@
+/* XPM */
+static char * title_2_active_xpm[] = {
+"8 26 7 1",
+" 	c None",
+".	c #000000",
+"+	c #A9A9A9",
+"@	c #D3D3D3",
+"#	c #494D59",
+"$	c #515961",
+"%	c #BEBEBE",
+"........",
+"........",
+"........",
+"++++++++",
+"@@@@@@@@",
+"@@@@@@@@",
+"........",
+"........",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"........",
+"........",
+"%%%%%%%%",
+"%%%%%%%%",
+"%%%%%%%%",
+"%%%%%%%%"};
diff --git a/themes/gorilla/title-2-inactive.xpm b/themes/gorilla/title-2-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..e02682e8b3479bab35c7ef24c85e6196e48d20f3
--- /dev/null
+++ b/themes/gorilla/title-2-inactive.xpm
@@ -0,0 +1,37 @@
+/* XPM */
+static char * title_2_inactive_xpm[] = {
+"8 26 8 1",
+" 	c None",
+".	c #D7D7CF",
+"+	c #000000",
+"@	c #A9A9A9",
+"#	c #D3D3D3",
+"$	c #494D59",
+"%	c #515961",
+"&	c #BEBEBE",
+"........",
+"++++++++",
+"++++++++",
+"@@@@@@@@",
+"########",
+"########",
+"++++++++",
+"++++++++",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"++++++++",
+"++++++++",
+"&&&&&&&&",
+"&&&&&&&&",
+"&&&&&&&&",
+"&&&&&&&&"};
diff --git a/themes/gorilla/title-3-active.xpm b/themes/gorilla/title-3-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..8c596aa3af54753eced23f3580b56dbcf86ebda4
--- /dev/null
+++ b/themes/gorilla/title-3-active.xpm
@@ -0,0 +1,36 @@
+/* XPM */
+static char * title_3_active_xpm[] = {
+"128 26 7 1",
+" 	c None",
+".	c #000000",
+"+	c #A9A9A9",
+"@	c #D3D3D3",
+"#	c #494D59",
+"$	c #515961",
+"%	c #BEBEBE",
+"................................................................................................................................",
+"................................................................................................................................",
+"................................................................................................................................",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"................................................................................................................................",
+"................................................................................................................................",
+"################################################################################################################################",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"################################################################################################################################",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"################################################################################################################################",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"################################################################################################################################",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"################################################################################################################################",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"################################################################################################################################",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"................................................................................................................................",
+"................................................................................................................................",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%"};
diff --git a/themes/gorilla/title-3-inactive.xpm b/themes/gorilla/title-3-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..2a6de65d1910f74e781663407941eb3b54b296d3
--- /dev/null
+++ b/themes/gorilla/title-3-inactive.xpm
@@ -0,0 +1,37 @@
+/* XPM */
+static char * title_3_inactive_xpm[] = {
+"128 26 8 1",
+" 	c None",
+".	c #D7D7CF",
+"+	c #000000",
+"@	c #A9A9A9",
+"#	c #D3D3D3",
+"$	c #494D59",
+"%	c #515961",
+"&	c #BEBEBE",
+"................................................................................................................................",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"################################################################################################################################",
+"################################################################################################################################",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
+"++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&"};
diff --git a/themes/gorilla/title-4-active.xpm b/themes/gorilla/title-4-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..7bade83f3e77ac5756db9e4e306270afdce38fde
--- /dev/null
+++ b/themes/gorilla/title-4-active.xpm
@@ -0,0 +1,36 @@
+/* XPM */
+static char * title_4_active_xpm[] = {
+"8 26 7 1",
+" 	c None",
+".	c #000000",
+"+	c #A9A9A9",
+"@	c #D3D3D3",
+"#	c #494D59",
+"$	c #515961",
+"%	c #BEBEBE",
+"........",
+"........",
+"........",
+"++++++++",
+"@@@@@@@@",
+"@@@@@@@@",
+"........",
+"........",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"........",
+"........",
+"%%%%%%%%",
+"%%%%%%%%",
+"%%%%%%%%",
+"%%%%%%%%"};
diff --git a/themes/gorilla/title-4-inactive.xpm b/themes/gorilla/title-4-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..3a35ad99c41b999837b4f5020b49a299fae98601
--- /dev/null
+++ b/themes/gorilla/title-4-inactive.xpm
@@ -0,0 +1,37 @@
+/* XPM */
+static char * title_4_inactive_xpm[] = {
+"8 26 8 1",
+" 	c None",
+".	c #D7D7CF",
+"+	c #000000",
+"@	c #A9A9A9",
+"#	c #D3D3D3",
+"$	c #494D59",
+"%	c #515961",
+"&	c #BEBEBE",
+"........",
+"++++++++",
+"++++++++",
+"@@@@@@@@",
+"########",
+"########",
+"++++++++",
+"++++++++",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"++++++++",
+"++++++++",
+"&&&&&&&&",
+"&&&&&&&&",
+"&&&&&&&&",
+"&&&&&&&&"};
diff --git a/themes/gorilla/title-5-active.xpm b/themes/gorilla/title-5-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..8dccec507a4ea55040a4721a8a9f08688cd62fc9
--- /dev/null
+++ b/themes/gorilla/title-5-active.xpm
@@ -0,0 +1,36 @@
+/* XPM */
+static char * title_5_active_xpm[] = {
+"8 26 7 1",
+" 	c None",
+".	c #000000",
+"+	c #A9A9A9",
+"@	c #D3D3D3",
+"#	c #494D59",
+"$	c #515961",
+"%	c #BEBEBE",
+"........",
+"........",
+"........",
+"++++++++",
+"@@@@@@@@",
+"@@@@@@@@",
+"........",
+"........",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"########",
+"$$$$$$$$",
+"........",
+"........",
+"%%%%%%%%",
+"%%%%%%%%",
+"%%%%%%%%",
+"%%%%%%%%"};
diff --git a/themes/gorilla/title-5-inactive.xpm b/themes/gorilla/title-5-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..c87c5bb470398730ead9fe31e78fe224159b4c36
--- /dev/null
+++ b/themes/gorilla/title-5-inactive.xpm
@@ -0,0 +1,37 @@
+/* XPM */
+static char * title_5_inactive_xpm[] = {
+"8 26 8 1",
+" 	c None",
+".	c #D7D7CF",
+"+	c #000000",
+"@	c #A9A9A9",
+"#	c #D3D3D3",
+"$	c #494D59",
+"%	c #515961",
+"&	c #BEBEBE",
+"........",
+"++++++++",
+"++++++++",
+"@@@@@@@@",
+"########",
+"########",
+"++++++++",
+"++++++++",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"$$$$$$$$",
+"%%%%%%%%",
+"++++++++",
+"++++++++",
+"&&&&&&&&",
+"&&&&&&&&",
+"&&&&&&&&",
+"&&&&&&&&"};
diff --git a/themes/gorilla/top-left-active.xpm b/themes/gorilla/top-left-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..d3350e66911c9b5b43d9816ac34bb4d0291519cf
--- /dev/null
+++ b/themes/gorilla/top-left-active.xpm
@@ -0,0 +1,36 @@
+/* XPM */
+static char * top_left_active_xpm[] = {
+"9 26 7 1",
+" 	c None",
+".	c #000000",
+"+	c #A9A9A9",
+"@	c #D3D3D3",
+"#	c #494D59",
+"$	c #515961",
+"%	c #BEBEBE",
+".........",
+".........",
+".........",
+"...++++++",
+"...+@@@@@",
+"...+@@@@@",
+"...+@@...",
+"...+@@...",
+"...+@@..#",
+"...+@@..$",
+"...+@@..#",
+"...+@@..$",
+"...+@@..#",
+"...+@@..$",
+"...+@@..#",
+"...+@@..$",
+"...+@@..#",
+"...+@@..$",
+"...+@@..#",
+"...+@@..$",
+"...+@@...",
+"...+@@...",
+"...+@@%%%",
+"...+@@%%%",
+"...+@@%%%",
+"...+@@%%%"};
diff --git a/themes/gorilla/top-left-inactive.xpm b/themes/gorilla/top-left-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..ee59b53ad572b62ad7cd64ca7853677028924376
--- /dev/null
+++ b/themes/gorilla/top-left-inactive.xpm
@@ -0,0 +1,37 @@
+/* XPM */
+static char * top_left_inactive_xpm[] = {
+"9 26 8 1",
+" 	c None",
+".	c #D7D7CF",
+"+	c #000000",
+"@	c #A9A9A9",
+"#	c #D3D3D3",
+"$	c #494D59",
+"%	c #515961",
+"&	c #BEBEBE",
+".........",
+".++++++++",
+".++++++++",
+".++@@@@@@",
+".++@#####",
+".++@#####",
+".++@##+++",
+".++@##+++",
+".++@##++$",
+".++@##++%",
+".++@##++$",
+".++@##++%",
+".++@##++$",
+".++@##++%",
+".++@##++$",
+".++@##++%",
+".++@##++$",
+".++@##++%",
+".++@##++$",
+".++@##++%",
+".++@##+++",
+".++@##+++",
+".++@##&&&",
+".++@##&&&",
+".++@##&&&",
+".++@##&&&"};
diff --git a/themes/gorilla/top-right-active.xpm b/themes/gorilla/top-right-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..962b352b2036f3cdf919c3fa5eaba62e561d1aad
--- /dev/null
+++ b/themes/gorilla/top-right-active.xpm
@@ -0,0 +1,36 @@
+/* XPM */
+static char * top_right_active_xpm[] = {
+"9 26 7 1",
+" 	c None",
+".	c #000000",
+"+	c #A9A9A9",
+"@	c #D3D3D3",
+"#	c #494D59",
+"$	c #515961",
+"%	c #BEBEBE",
+".........",
+".........",
+".........",
+"+++++....",
+"@@@@@....",
+"@@@@@....",
+"...@@....",
+"...@@....",
+"#..@@....",
+"$..@@....",
+"#..@@....",
+"$..@@....",
+"#..@@....",
+"$..@@....",
+"#..@@....",
+"$..@@....",
+"#..@@....",
+"$..@@....",
+"#..@@....",
+"$..@@....",
+"...@@....",
+"...@@....",
+"%%%@@....",
+"%%%@@....",
+"%%%@@....",
+"%%%@@...."};
diff --git a/themes/gorilla/top-right-inactive.xpm b/themes/gorilla/top-right-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..8a28c741d7f4213615402dd359f9c522289502f5
--- /dev/null
+++ b/themes/gorilla/top-right-inactive.xpm
@@ -0,0 +1,37 @@
+/* XPM */
+static char * top_right_inactive_xpm[] = {
+"9 26 8 1",
+" 	c None",
+".	c #D7D7CF",
+"+	c #000000",
+"@	c #A9A9A9",
+"#	c #D3D3D3",
+"$	c #494D59",
+"%	c #515961",
+"&	c #BEBEBE",
+".........",
+"++++++++.",
+"++++++++.",
+"@@@@@+++.",
+"#####+++.",
+"#####+++.",
+"+++##+++.",
+"+++##+++.",
+"$++##+++.",
+"%++##+++.",
+"$++##+++.",
+"%++##+++.",
+"$++##+++.",
+"%++##+++.",
+"$++##+++.",
+"%++##+++.",
+"$++##+++.",
+"%++##+++.",
+"$++##+++.",
+"%++##+++.",
+"+++##+++.",
+"+++##+++.",
+"&&&##+++.",
+"&&&##+++.",
+"&&&##+++.",
+"&&&##+++."};
diff --git a/themes/gtk/Makefile.in b/themes/gtk/Makefile.in
index 20bb0e26b38e6bdb58fa73a79f0b767c70c2d9ec..d3ca7af3820286f0132374d0db66bff7797c9e1d 100644
--- a/themes/gtk/Makefile.in
+++ b/themes/gtk/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/gtk
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/gtk
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/gtk/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/gtk/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/gtk
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/kde/Makefile.in b/themes/kde/Makefile.in
index e3f32b7f4fb629aa7280192347ebcae74538b1fa..df9cdaedefaceaa957af1ee92bd4beb308ddb632 100644
--- a/themes/kde/Makefile.in
+++ b/themes/kde/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/kde
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/kde
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/kde/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/kde/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/kde
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/kindaker/Makefile.in b/themes/kindaker/Makefile.in
index 315f40b858e49eae086bcbc36be7379f8ca529c6..c27738da261b2e0356a8404112e0914e29bc789c 100644
--- a/themes/kindaker/Makefile.in
+++ b/themes/kindaker/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/kindaker
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/kindaker
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/kindaker/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/kindaker/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/kindaker
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/linea/Makefile.in b/themes/linea/Makefile.in
index 820f6eb2314c15b5b123a29b5f38d1f28194fd2e..f055d4b816c83f712ac6a28f44e8b9890351235d 100644
--- a/themes/linea/Makefile.in
+++ b/themes/linea/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/linea
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/linea
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/linea/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/linea/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/linea
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/mofit/Makefile.in b/themes/mofit/Makefile.in
index 8eb630171bd92d84be432b8ff4dde699b5a1cacd..88583e0f4c7946c1b194d3833c04c12a27bd1c12 100644
--- a/themes/mofit/Makefile.in
+++ b/themes/mofit/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/mofit
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/mofit
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/mofit/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/mofit/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/mofit
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/next/Makefile.in b/themes/next/Makefile.in
index 5d00c509f3a99088a3ed0aaf7f306a0f2caadd73..7ddb5adcd230cf1ae49bbd8a4ec823de3a76273c 100644
--- a/themes/next/Makefile.in
+++ b/themes/next/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/next
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/next
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/next/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/next/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/next
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/oroborus/Makefile.in b/themes/oroborus/Makefile.in
index 7f0bb5fabe8789e1b675852cf7a2fdce69d6c0e3..261deb6c0e44cd16c212bc68c2042f9fa898ae29 100644
--- a/themes/oroborus/Makefile.in
+++ b/themes/oroborus/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/oroborus
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/oroborus
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/oroborus/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/oroborus/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/oroborus
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/platinum/Makefile.in b/themes/platinum/Makefile.in
index d5d782d916a0d22a1c43400741ecef9e52a3e10f..1233c78f774e351819c556af59184dd437c1709f 100644
--- a/themes/platinum/Makefile.in
+++ b/themes/platinum/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/platinum
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/platinum
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/platinum/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/platinum/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/platinum
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/redmond/Makefile.in b/themes/redmond/Makefile.in
index 0d7555a6ddcf817f83e79fa26c1bdbd791106911..9116ee8daf6ca8c14abc209ec3bec4422755c539 100644
--- a/themes/redmond/Makefile.in
+++ b/themes/redmond/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/redmond
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/redmond
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/redmond/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/redmond/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/redmond
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/redmondxp/Makefile.in b/themes/redmondxp/Makefile.in
index 145d78993919f8e0ec93aca8fafce5197cdca6e3..5442c7f39e83acddb1eaaf66eb1182c6bad14d9e 100644
--- a/themes/redmondxp/Makefile.in
+++ b/themes/redmondxp/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/redmondxp
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/redmondxp
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/redmondxp/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/redmondxp/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/redmondxp
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/slick/Makefile.in b/themes/slick/Makefile.in
index 186d599d4f328c255cfdec05643ce8e242e5fb0c..fba078f8b44d3137ab8c50423b570f4f2c662fc2 100644
--- a/themes/slick/Makefile.in
+++ b/themes/slick/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/slick
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/slick
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/slick/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/slick/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/slick
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/slimline/Makefile.in b/themes/slimline/Makefile.in
index 6cc275b2e30a0404ac7fc6f23b8435356283e0e4..c07ac616a6fd5e4ecea7a5f091ed37c9e1f2b77b 100644
--- a/themes/slimline/Makefile.in
+++ b/themes/slimline/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/slimline
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/slimline
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/slimline/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/slimline/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/slimline
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/trench/Makefile.in b/themes/trench/Makefile.in
index 1e92b9cc79a06a0c6198398056fcc1271b43f42b..57b3a47cf8d9ff80d92e23f735dcee279fdacfdd 100644
--- a/themes/trench/Makefile.in
+++ b/themes/trench/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/trench
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/trench
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/trench/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/trench/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/trench
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/themes/xfce/Makefile.in b/themes/xfce/Makefile.in
index 2eb18925507413f0acb8d17c03fd7184072d0ae8..31e12c2b8f575af80eeaf3282636cacb5eb53a73 100644
--- a/themes/xfce/Makefile.in
+++ b/themes/xfce/Makefile.in
@@ -1,6 +1,8 @@
-# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
 
-# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc.
+# 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.
@@ -10,7 +12,7 @@
 # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
 # PARTICULAR PURPOSE.
 
-
+@SET_MAKE@
 SHELL = @SHELL@
 
 srcdir = @srcdir@
@@ -31,13 +33,9 @@ infodir = @infodir@
 mandir = @mandir@
 includedir = @includedir@
 oldincludedir = /usr/include
-
-DESTDIR =
-
 pkgdatadir = $(datadir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
-
 top_builddir = ../..
 
 ACLOCAL = @ACLOCAL@
@@ -45,148 +43,227 @@ AUTOCONF = @AUTOCONF@
 AUTOMAKE = @AUTOMAKE@
 AUTOHEADER = @AUTOHEADER@
 
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
 INSTALL = @INSTALL@
-INSTALL_PROGRAM = @INSTALL_PROGRAM@ $(AM_INSTALL_PROGRAM_FLAGS)
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(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@
-MAKEINFO = @MAKEINFO@
+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/xfce
-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 	shade-active.xpm 	shade-inactive.xpm 	shade-pressed.xpm 	stick-active.xpm 	stick-inactive.xpm 	stick-pressed.xpm 	themerc 	title-1-active.xpm 	title-1-inactive.xpm 	title-2-active.xpm 	title-2-inactive.xpm 	title-3-active.xpm 	title-3-inactive.xpm 	title-4-active.xpm 	title-4-inactive.xpm 	title-5-active.xpm 	title-5-inactive.xpm 	top-left-active.xpm 	top-left-inactive.xpm 	top-right-active.xpm 	top-right-inactive.xpm
+theme_DATA = 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 \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
 
 EXTRA_DIST = $(theme_DATA)
+subdir = themes/xfce
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = ../../config.h
-CONFIG_CLEAN_FILES = 
-DATA =  $(theme_DATA)
-
-DIST_COMMON =  README Makefile.am Makefile.in
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+DIST_SOURCES =
+DATA = $(theme_DATA)
 
+DIST_COMMON = README Makefile.am Makefile.in
+all: all-am
 
-DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
-
-TAR = gtar
-GZIP_ENV = --best
-all: all-redirect
 .SUFFIXES:
-$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) 
-	cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps themes/xfce/Makefile
-
-Makefile: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-	cd $(top_builddir) \
-	  && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
-
-
+$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  themes/xfce/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 $(srcdir)/$$p; then \
-	    echo " $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $(srcdir)/$$p $(DESTDIR)$(themedir)/$$p; \
-	  else if test -f $$p; then \
-	    echo " $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p"; \
-	    $(INSTALL_DATA) $$p $(DESTDIR)$(themedir)/$$p; \
-	  fi; fi; \
+	  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 \
-	  rm -f $(DESTDIR)$(themedir)/$$p; \
+	@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)
 
-distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir)
-
-subdir = themes/xfce
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
 
 distdir: $(DISTFILES)
 	@for file in $(DISTFILES); do \
-	  d=$(srcdir); \
+	  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 \
-	    cp -pr $$d/$$file $(distdir)/$$file; \
+	    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 \
-	    || ln $$d/$$file $(distdir)/$$file 2> /dev/null \
-	    || cp -p $$d/$$file $(distdir)/$$file || :; \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
 	  fi; \
 	done
-info-am:
-info: info-am
-dvi-am:
-dvi: dvi-am
 check-am: all-am
 check: check-am
-installcheck-am:
-installcheck: installcheck-am
-install-exec-am:
-install-exec: install-exec-am
+all-am: Makefile $(DATA)
 
-install-data-am: install-themeDATA
-install-data: install-data-am
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
 
-install-am: all-am
-	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
 install: install-am
-uninstall-am: uninstall-themeDATA
+install-exec: install-exec-am
+install-data: install-data-am
 uninstall: uninstall-am
-all-am: Makefile $(DATA)
-all-redirect: all-am
-install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install
-installdirs:
-	$(mkinstalldirs)  $(DESTDIR)$(themedir)
 
+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)
-	-rm -f config.cache config.log stamp-h stamp-h[0-9]*
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
 
 maintainer-clean-generic:
-mostlyclean-am:  mostlyclean-generic
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
 
-mostlyclean: mostlyclean-am
+clean-am: clean-generic mostlyclean-am
 
-clean-am:  clean-generic mostlyclean-am
+distclean: distclean-am
 
-clean: clean-am
+distclean-am: clean-am distclean-generic
 
-distclean-am:  distclean-generic clean-am
+dvi: dvi-am
 
-distclean: distclean-am
+dvi-am:
 
-maintainer-clean-am:  maintainer-clean-generic distclean-am
-	@echo "This command is intended for maintainers to use;"
-	@echo "it deletes files that may require special tools to rebuild."
+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
 
-.PHONY: uninstall-themeDATA install-themeDATA tags distdir info-am info \
-dvi-am dvi check check-am installcheck-am installcheck install-exec-am \
-install-exec install-data-am install-data install-am install \
-uninstall-am uninstall all-redirect all-am all installdirs \
-mostlyclean-generic distclean-generic clean-generic \
-maintainer-clean-generic clean mostlyclean distclean maintainer-clean
+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.
diff --git a/xfwm4.spec.in b/xfwm4.spec.in
index 24e1e25bcbd91c0ba124beb8679af853d15b5307..b6a7a9174e6ac4c4f2a69eb52dd09c4dc3c9fc30 100644
--- a/xfwm4.spec.in
+++ b/xfwm4.spec.in
@@ -56,6 +56,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfwm4/themes/crux
 %{_datadir}/xfwm4/themes/cruxish
 %{_datadir}/xfwm4/themes/eazel-blue
+%{_datadir}/xfwm4/themes/gorilla
 %{_datadir}/xfwm4/themes/gtk
 %{_datadir}/xfwm4/themes/kde
 %{_datadir}/xfwm4/themes/linea