diff --git a/configure b/configure
index 3a9a452eedc94ea2abcee6b936623d4bf95d4d18..b69b68b4f9f0802182a136a76c50b2f1fccc6191 100755
--- a/configure
+++ b/configure
@@ -8980,7 +8980,7 @@ echo "${ECHO_T}no" >&6
   fi
 
 
-                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files xfwm4.spec Makefile common/Makefile defaults/Makefile mcs-plugin/Makefile po/Makefile.in src/Makefile themes/Makefile themes/adept/Makefile themes/agua/Makefile themes/atlanta/Makefile themes/atlanta2/Makefile themes/b5/Makefile themes/b6/Makefile themes/bbs/Makefile themes/beastie/Makefile themes/biz/Makefile themes/coldsteel/Makefile themes/coolclean/Makefile themes/crux/Makefile themes/cruxish/Makefile themes/curve/Makefile themes/default.keys/Makefile themes/eazel-blue/Makefile themes/elberg/Makefile themes/exocet/Makefile themes/fbx/Makefile themes/g2/Makefile themes/gaudy/Makefile themes/gnububble/Makefile themes/gorilla/Makefile themes/gtk/Makefile themes/iceg/Makefile themes/kde/Makefile themes/keramik/Makefile themes/kindaker/Makefile themes/koynacity/Makefile themes/linea/Makefile themes/meenee/Makefile themes/metabox/Makefile themes/microcurve/Makefile themes/microdeck/Makefile themes/microdeck2/Makefile themes/microdeck3/Makefile themes/microgui/Makefile themes/mofit/Makefile themes/next/Makefile themes/ops/Makefile themes/oroborus/Makefile themes/pills/Makefile themes/piranha/Makefile themes/platinum/Makefile themes/quiet-purple/Makefile themes/quinx/Makefile themes/r9x/Makefile themes/redmond/Makefile themes/redmondxp/Makefile themes/retro/Makefile themes/silverado/Makefile themes/slick/Makefile themes/slimline/Makefile themes/tabs/Makefile themes/tgc/Makefile themes/totem/Makefile themes/trench/Makefile themes/tux/Makefile themes/variation/Makefile themes/xfce/Makefile"
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                  ac_config_files="$ac_config_files xfwm4.spec Makefile common/Makefile defaults/Makefile mcs-plugin/Makefile po/Makefile.in src/Makefile themes/Makefile themes/adept/Makefile themes/agua/Makefile themes/atlanta/Makefile themes/atlanta2/Makefile themes/b5/Makefile themes/b6/Makefile themes/bbs/Makefile themes/beastie/Makefile themes/biz/Makefile themes/coldsteel/Makefile themes/coolclean/Makefile themes/crux/Makefile themes/cruxish/Makefile themes/curve/Makefile themes/default/Makefile themes/default.keys/Makefile themes/eazel-blue/Makefile themes/elberg/Makefile themes/exocet/Makefile themes/fbx/Makefile themes/g2/Makefile themes/gaudy/Makefile themes/gnububble/Makefile themes/gorilla/Makefile themes/gtk/Makefile themes/iceg/Makefile themes/kde/Makefile themes/keramik/Makefile themes/kindaker/Makefile themes/koynacity/Makefile themes/linea/Makefile themes/meenee/Makefile themes/metabox/Makefile themes/microcurve/Makefile themes/microdeck/Makefile themes/microdeck2/Makefile themes/microdeck3/Makefile themes/microgui/Makefile themes/mofit/Makefile themes/next/Makefile themes/ops/Makefile themes/oroborus/Makefile themes/pills/Makefile themes/piranha/Makefile themes/platinum/Makefile themes/quiet-purple/Makefile themes/quinx/Makefile themes/r9x/Makefile themes/redmond/Makefile themes/redmondxp/Makefile themes/retro/Makefile themes/silverado/Makefile themes/slick/Makefile themes/slimline/Makefile themes/tabs/Makefile themes/tgc/Makefile themes/totem/Makefile themes/trench/Makefile themes/tux/Makefile themes/variation/Makefile themes/xfce/Makefile"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -9566,6 +9566,7 @@ do
   "themes/crux/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/crux/Makefile" ;;
   "themes/cruxish/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/cruxish/Makefile" ;;
   "themes/curve/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/curve/Makefile" ;;
+  "themes/default/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/default/Makefile" ;;
   "themes/default.keys/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/default.keys/Makefile" ;;
   "themes/eazel-blue/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/eazel-blue/Makefile" ;;
   "themes/elberg/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/elberg/Makefile" ;;
diff --git a/configure.ac b/configure.ac
index a2370727346a28295fd851fc7264f2b23565c748..1c5538bc6cecc40e46acf2f2a9f722742b335775 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,6 +73,7 @@ themes/coolclean/Makefile
 themes/crux/Makefile
 themes/cruxish/Makefile
 themes/curve/Makefile
+themes/default/Makefile
 themes/default.keys/Makefile
 themes/eazel-blue/Makefile
 themes/elberg/Makefile
diff --git a/defaults/defaults.in b/defaults/defaults.in
index fb179f1916f869ca5a2bf40080d1a4965e6aba34..7458252afce0342b2edba975d5c8c792828dabf3 100644
--- a/defaults/defaults.in
+++ b/defaults/defaults.in
@@ -1,4 +1,4 @@
-theme=microdeck
+theme=default
 keytheme=default.keys
 title_alignment=left
 full_width_title=true
diff --git a/src/parserc.c b/src/parserc.c
index a11a7f5c9fdd321774ce5236c7ae31aec4badca7..08d575955043aa1d4e9fd1279f8ef0d1a50cef91 100644
--- a/src/parserc.c
+++ b/src/parserc.c
@@ -32,7 +32,7 @@
 #include "debug.h"
 
 #ifndef DEFAULT_THEME
-#define DEFAULT_THEME "microdeck"
+#define DEFAULT_THEME "default"
 #endif
 
 gboolean parseRc(const gchar * file, const gchar * dir, Settings rc[])
diff --git a/themes/Makefile.am b/themes/Makefile.am
index d3e1c632c2423ce14502cff98d9a4522636f8a6d..6bc8ba38d757a8c24a998906d1c2a10aa3fc942f 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -16,6 +16,7 @@ SUBDIRS =								\
 	crux 								\
 	cruxish 							\
 	curve 								\
+	default 							\
 	default.keys 							\
 	eazel-blue 							\
 	elberg 								\
diff --git a/themes/Makefile.in b/themes/Makefile.in
index 495f4dc4b88d673af8f9e847f214e481a99c77a3..021063d235711dccc16fb5247d07bef8c7cd760f 100644
--- a/themes/Makefile.in
+++ b/themes/Makefile.in
@@ -189,6 +189,7 @@ SUBDIRS = \
 	crux 								\
 	cruxish 							\
 	curve 								\
+	default 							\
 	default.keys 							\
 	eazel-blue 							\
 	elberg 								\
diff --git a/themes/default/Makefile.am b/themes/default/Makefile.am
new file mode 100644
index 0000000000000000000000000000000000000000..d1d58093d69ee90a0981d2e7dd9093713d787d2a
--- /dev/null
+++ b/themes/default/Makefile.am
@@ -0,0 +1,55 @@
+themedir = $(pkgdatadir)/themes/default
+theme_DATA = README \
+	bottom-active.xpm \
+	bottom-inactive.xpm \
+	bottom-left-active.xpm \
+	bottom-left-inactive.xpm \
+	bottom-right-active.xpm \
+	bottom-right-inactive.xpm \
+	close-active.xpm \
+	close-inactive.xpm \
+	close-pressed.xpm \
+	hide-active.xpm \
+	hide-inactive.xpm \
+	hide-pressed.xpm \
+	left-active.xpm \
+	left-inactive.xpm \
+	maximize-active.xpm \
+	maximize-inactive.xpm \
+	maximize-pressed.xpm \
+        maximize-toggled-active.xpm \
+        maximize-toggled-inactive.xpm \
+        maximize-toggled-pressed.xpm \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+        shade-toggled-active.xpm \
+        shade-toggled-inactive.xpm \
+        shade-toggled-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+        stick-toggled-active.xpm \
+        stick-toggled-inactive.xpm \
+        stick-toggled-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
+EXTRA_DIST = $(theme_DATA)
diff --git a/themes/default/Makefile.in b/themes/default/Makefile.in
new file mode 100644
index 0000000000000000000000000000000000000000..4b628780f1c7494d698eaaf66635c087b8259781
--- /dev/null
+++ b/themes/default/Makefile.in
@@ -0,0 +1,398 @@
+# Makefile.in generated by automake 1.7.2 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@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_triplet = @host@
+ACLOCAL = @ACLOCAL@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GLIB_CFLAGS = @GLIB_CFLAGS@
+GLIB_LIBS = @GLIB_LIBS@
+GLIB_REQUIRED_VERSION = @GLIB_REQUIRED_VERSION@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GTK_CFLAGS = @GTK_CFLAGS@
+GTK_LIBS = @GTK_LIBS@
+GTK_REQUIRED_VERSION = @GTK_REQUIRED_VERSION@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBSTARTUP_NOTIFICATION_CFLAGS = @LIBSTARTUP_NOTIFICATION_CFLAGS@
+LIBSTARTUP_NOTIFICATION_LIBS = @LIBSTARTUP_NOTIFICATION_LIBS@
+LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION = @LIBSTARTUP_NOTIFICATION_REQUIRED_VERSION@
+LIBTOOL = @LIBTOOL@
+LIBX11_CFLAGS = @LIBX11_CFLAGS@
+LIBX11_LDFLAGS = @LIBX11_LDFLAGS@
+LIBX11_LIBS = @LIBX11_LIBS@
+LIBXFCE4MCS_CLIENT_CFLAGS = @LIBXFCE4MCS_CLIENT_CFLAGS@
+LIBXFCE4MCS_CLIENT_LIBS = @LIBXFCE4MCS_CLIENT_LIBS@
+LIBXFCE4MCS_CLIENT_REQUIRED_VERSION = @LIBXFCE4MCS_CLIENT_REQUIRED_VERSION@
+LIBXFCE4MCS_MANAGER_CFLAGS = @LIBXFCE4MCS_MANAGER_CFLAGS@
+LIBXFCE4MCS_MANAGER_LIBS = @LIBXFCE4MCS_MANAGER_LIBS@
+LIBXFCE4MCS_MANAGER_REQUIRED_VERSION = @LIBXFCE4MCS_MANAGER_REQUIRED_VERSION@
+LIBXFCE4UTIL_CFLAGS = @LIBXFCE4UTIL_CFLAGS@
+LIBXFCE4UTIL_LIBS = @LIBXFCE4UTIL_LIBS@
+LIBXFCE4UTIL_REQUIRED_VERSION = @LIBXFCE4UTIL_REQUIRED_VERSION@
+LIBXFCEGUI4_CFLAGS = @LIBXFCEGUI4_CFLAGS@
+LIBXFCEGUI4_LIBS = @LIBXFCEGUI4_LIBS@
+LIBXFCEGUI4_REQUIRED_VERSION = @LIBXFCEGUI4_REQUIRED_VERSION@
+LIBXPM_CFLAGS = @LIBXPM_CFLAGS@
+LIBXPM_LDFLAGS = @LIBXPM_LDFLAGS@
+LIBXPM_LIBS = @LIBXPM_LIBS@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+OBJEXT = @OBJEXT@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+XFCE_MCS_MANAGER_CFLAGS = @XFCE_MCS_MANAGER_CFLAGS@
+XFCE_MCS_MANAGER_LIBS = @XFCE_MCS_MANAGER_LIBS@
+XFCE_MCS_MANAGER_REQUIRED_VERSION = @XFCE_MCS_MANAGER_REQUIRED_VERSION@
+XGETTEXT = @XGETTEXT@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_RANLIB = @ac_ct_RANLIB@
+ac_ct_STRIP = @ac_ct_STRIP@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__include = @am__include@
+am__quote = @am__quote@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+oldincludedir = @oldincludedir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+themedir = $(pkgdatadir)/themes/default
+theme_DATA = README \
+	bottom-active.xpm \
+	bottom-inactive.xpm \
+	bottom-left-active.xpm \
+	bottom-left-inactive.xpm \
+	bottom-right-active.xpm \
+	bottom-right-inactive.xpm \
+	close-active.xpm \
+	close-inactive.xpm \
+	close-pressed.xpm \
+	hide-active.xpm \
+	hide-inactive.xpm \
+	hide-pressed.xpm \
+	left-active.xpm \
+	left-inactive.xpm \
+	maximize-active.xpm \
+	maximize-inactive.xpm \
+	maximize-pressed.xpm \
+        maximize-toggled-active.xpm \
+        maximize-toggled-inactive.xpm \
+        maximize-toggled-pressed.xpm \
+	menu-active.xpm \
+	menu-inactive.xpm \
+	menu-pressed.xpm \
+	right-active.xpm \
+	right-inactive.xpm \
+	shade-active.xpm \
+	shade-inactive.xpm \
+	shade-pressed.xpm \
+        shade-toggled-active.xpm \
+        shade-toggled-inactive.xpm \
+        shade-toggled-pressed.xpm \
+	stick-active.xpm \
+	stick-inactive.xpm \
+	stick-pressed.xpm \
+        stick-toggled-active.xpm \
+        stick-toggled-inactive.xpm \
+        stick-toggled-pressed.xpm \
+	themerc \
+	title-1-active.xpm \
+	title-1-inactive.xpm \
+	title-2-active.xpm \
+	title-2-inactive.xpm \
+	title-3-active.xpm \
+	title-3-inactive.xpm \
+	title-4-active.xpm \
+	title-4-inactive.xpm \
+	title-5-active.xpm \
+	title-5-inactive.xpm \
+	top-left-active.xpm \
+	top-left-inactive.xpm \
+	top-right-active.xpm \
+	top-right-inactive.xpm
+
+EXTRA_DIST = $(theme_DATA)
+subdir = themes/default
+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: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.ac $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign  themes/default/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+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:
+
+ctags: CTAGS
+CTAGS:
+
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
+	list='$(DISTFILES)'; for file in $$list; do \
+	  case $$file in \
+	    $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
+	    $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
+	  esac; \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(themedir)
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-generic distclean-libtool
+
+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 mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-info-am uninstall-themeDATA
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool 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 \
+	mostlyclean-libtool pdf pdf-am ps ps-am 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/default/README b/themes/default/README
new file mode 100644
index 0000000000000000000000000000000000000000..5fe7ef34364cacd536c355eaba2aa1cb48df794d
--- /dev/null
+++ b/themes/default/README
@@ -0,0 +1,5 @@
+default
+-------
+
+Default xfwm4 theme. Not very sexy, but I guess the default theme doesn't have
+to be anyway...
diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..a16d8578ec35f4447c270603599146858ac413b4
--- /dev/null
+++ b/themes/default/bottom-active.xpm
@@ -0,0 +1,14 @@
+/* XPM */
+static char * bottom_active_xpm[] = {
+"32 5 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #FFFFFF s active_hilight_2",
+"@      c #D5D6D5 s active_color_2",
+"#      c #B4BAB4 s active_mid_2",
+"$      c #000000",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"################################",
+"................................",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"};
diff --git a/themes/default/bottom-inactive.xpm b/themes/default/bottom-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..485650bc07e22249055a2556af6ae284d708f987
--- /dev/null
+++ b/themes/default/bottom-inactive.xpm
@@ -0,0 +1,14 @@
+/* XPM */
+static char * bottom_inactive_xpm[] = {
+"32 5 6 1",
+"       c None",
+".      c #949594 s inactive_shadow_2",
+"+      c #FFFFFF s inactive_hilight_2",
+"@      c #D5D6D5 s inactive_color_2",
+"#      c #B4BAB4 s inactive_mid_2",
+"$      c #000000",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
+"################################",
+"................................",
+"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"};
diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..30d7b3d6e43e1a005c25ce08b74d1e2560732245
--- /dev/null
+++ b/themes/default/bottom-left-active.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * bottom_left_active_xpm[] = {
+"26 16 6 1",
+"       c None",
+"@      c #000000",
+"&      c #949594 s active_shadow_2",
+"=      c #FFFFFF s active_hilight_2",
+"-      c #D5D6D5 s active_color_2",
+"*      c #B4BAB4 s active_mid_2",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=------------------------",
+"&=------------------------",
+"&-************************",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&",
+" @@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-left-inactive.xpm b/themes/default/bottom-left-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..05b69822134af280a830648eb557bdbf1f08896b
--- /dev/null
+++ b/themes/default/bottom-left-inactive.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * bottom_left_inactive_xpm[] = {
+"26 16 6 1",
+"       c None",
+"@      c #000000",
+"&      c #949594 s inactive_shadow_2",
+"=      c #FFFFFF s inactive_hilight_2",
+"-      c #D5D6D5 s inactive_color_2",
+"*      c #B4BAB4 s inactive_mid_2",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=---                     ",
+"&=------------------------",
+"&=------------------------",
+"&-************************",
+"&&&&&&&&&&&&&&&&&&&&&&&&&&",
+" @@@@@@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..315918cf8412ac41f999b504283b7021ae2cf368
--- /dev/null
+++ b/themes/default/bottom-right-active.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * bottom_right_active_xpm[] = {
+"26 16 6 1",
+"       c None",
+"@      c #000000",
+"&      c #949594 s active_shadow_2",
+"=      c #FFFFFF s active_hilight_2",
+"-      c #D5D6D5 s active_color_2",
+"*      c #B4BAB4 s active_mid_2",
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"-----------------------*&@",     
+"-----------------------*&@",     
+"************************&@",     
+"&&&&&&&&&&&&&&&&&&&&&&&&&@",     
+"@@@@@@@@@@@@@@@@@@@@@@@@@ "};    
diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..b0ae1cc157839486a4c2853658e1d7899f1b550c
--- /dev/null
+++ b/themes/default/bottom-right-inactive.xpm
@@ -0,0 +1,25 @@
+/* XPM */
+static char * bottom_right_inactive_xpm[] = {
+"26 16 6 1",
+"       c None",
+"@      c #000000",
+"&      c #949594 s inactive_shadow_2",
+"=      c #FFFFFF s inactive_hilight_2",
+"-      c #D5D6D5 s inactive_color_2",
+"*      c #B4BAB4 s inactive_mid_2",
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"                     --*&@",     
+"-----------------------*&@",     
+"-----------------------*&@",     
+"************************&@",     
+"&&&&&&&&&&&&&&&&&&&&&&&&&@",     
+"@@@@@@@@@@@@@@@@@@@@@@@@@ "};    
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..c98ba7fbe8d8ba4d7506e740b7ce902b9cf46e13
--- /dev/null
+++ b/themes/default/close-active.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * close_active_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"++++@#$+++++$#@++++",
+"++++###$+++$###++++",
+"++++$###$+$###$++++",
+"+++++$###$###$+++++",
+"++++++$#####$++++++",
+"+++++++$###$+++++++",
+"++++++$#####$++++++",
+"+++++$###$###$+++++",
+"++++$###$+$###$++++",
+"++++###$+++$###++++",
+"++++@#$+++++$#@++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..73627cda6b00700b2b3e387b2d208ea78cd5a2d4
--- /dev/null
+++ b/themes/default/close-inactive.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * close_inactive_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"++++@#$+++++$#@++++",
+"++++###$+++$###++++",
+"++++$###$+$###$++++",
+"+++++$###$###$+++++",
+"++++++$#####$++++++",
+"+++++++$###$+++++++",
+"++++++$#####$++++++",
+"+++++$###$###$+++++",
+"++++$###$+$###$++++",
+"++++###$+++$###++++",
+"++++@#$+++++$#@++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..a6d2b91c3d55ba6f25b01e1bd74a15c8eae46b5f
--- /dev/null
+++ b/themes/default/close-pressed.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * close_pressed_xpm[] = {
+"19 19 5 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"#      c #000000",
+"                   ",
+"                   ",
+"...................",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@.#.@@@@@.#.@@@+",
+".@@@###.@@@.###@@@+",
+".@@@.###.@.###.@@@+",
+".@@@@.###.###.@@@@+",
+".@@@@@.#####.@@@@@+",
+".@@@@@@.###.@@@@@@+",
+".@@@@@.#####.@@@@@+",
+".@@@@.###.###.@@@@+",
+".@@@.###.@.###.@@@+",
+".@@@###.@@@.###@@@+",
+".@@@.#.@@@@@.#.@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..0d26f1cd44da7749dfc4eb204e831aa530439138
--- /dev/null
+++ b/themes/default/hide-active.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * hide_active_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"++++###########++++",
+"++++###########++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..2970c306f5dab67e9f12c1f5f5fac53f8a8cb569
--- /dev/null
+++ b/themes/default/hide-inactive.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * hide_inactive_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"++++###########++++",
+"++++###########++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..7131277ba6793319fbcbb7e17e4bce8d4a777800
--- /dev/null
+++ b/themes/default/hide-pressed.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * hide_pressed_xpm[] = {
+"19 19 5 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"#      c #000000",
+"                   ",
+"                   ",
+"...................",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@###########@@@+",
+".@@@###########@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/left-active.xpm b/themes/default/left-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..acbd67d35b8092548c0311e486a506708ff89a3d
--- /dev/null
+++ b/themes/default/left-active.xpm
@@ -0,0 +1,40 @@
+/* XPM */
+static char * left_active_xpm[] = {
+"5 32 5 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #FFFFFF s active_hilight_2",
+"#      c #D5D6D5 s active_color_2",
+"@      c #000000",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###"};
diff --git a/themes/default/left-inactive.xpm b/themes/default/left-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..1ff4f687e29ec15a5270f10c45b363672c2065e1
--- /dev/null
+++ b/themes/default/left-inactive.xpm
@@ -0,0 +1,40 @@
+/* XPM */
+static char * left_inactive_xpm[] = {
+"5 32 5 1",
+"       c None",
+".      c #949594 s inactive_shadow_2",
+"+      c #FFFFFF s inactive_hilight_2",
+"#      c #D5D6D5 s inactive_color_2",
+"@      c #000000",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###",
+".+###"};
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..6e3e6b121038de9675ee9607d1079cfa0283a1d0
--- /dev/null
+++ b/themes/default/maximize-active.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * maximize_active_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"++++###########++++",
+"++++###########++++",
+"++++###########++++",
+"++++#+++++++++#++++",
+"++++#+++++++++#++++",
+"++++#+++++++++#++++",
+"++++#+++++++++#++++",
+"++++#+++++++++#++++",
+"++++#+++++++++#++++",
+"++++#+++++++++#++++",
+"++++###########++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..fd9feac30d9d3b5e2837f1d92b1364388e49f57f
--- /dev/null
+++ b/themes/default/maximize-inactive.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * maximize_inactive_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"++++###########++++",
+"++++###########++++",
+"++++###########++++",
+"++++#+++++++++#++++",
+"++++#+++++++++#++++",
+"++++#+++++++++#++++",
+"++++#+++++++++#++++",
+"++++#+++++++++#++++",
+"++++#+++++++++#++++",
+"++++#+++++++++#++++",
+"++++###########++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..1c1b27486fc1564a4a2232126457e736dcc082a7
--- /dev/null
+++ b/themes/default/maximize-pressed.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * maximize_pressed_xpm[] = {
+"19 19 5 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"#      c #000000",
+"                   ",
+"                   ",
+"...................",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@###########@@@+",
+".@@@###########@@@+",
+".@@@###########@@@+",
+".@@@#@@@@@@@@@#@@@+",
+".@@@#@@@@@@@@@#@@@+",
+".@@@#@@@@@@@@@#@@@+",
+".@@@#@@@@@@@@@#@@@+",
+".@@@#@@@@@@@@@#@@@+",
+".@@@#@@@@@@@@@#@@@+",
+".@@@#@@@@@@@@@#@@@+",
+".@@@###########@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..11e93602dd707a693748c74b68f8070e3566e2fa
--- /dev/null
+++ b/themes/default/maximize-toggled-active.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * maximize_toggled_active_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"++++########+++++++",
+"++++########+++++++",
+"++++########+++++++",
+"++++#++++++####++++",
+"++++#++++++####++++",
+"++++#++++++####++++",
+"++++#++++++#++#++++",
+"++++########++#++++",
+"+++++++#++++++#++++",
+"+++++++#++++++#++++",
+"+++++++########++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..0d3f47139db211f9bd569726f932337f241f7e41
--- /dev/null
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * maximize_toggled_inactive_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"++++########+++++++",
+"++++########+++++++",
+"++++########+++++++",
+"++++#++++++####++++",
+"++++#++++++####++++",
+"++++#++++++####++++",
+"++++#++++++#++#++++",
+"++++########++#++++",
+"+++++++#++++++#++++",
+"+++++++#++++++#++++",
+"+++++++########++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..6d21c984d51cd6eb223b18b597ac0ea5a30ea8c2
--- /dev/null
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * maximize_toggled_pressed_xpm[] = {
+"19 19 5 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"#      c #000000",
+"                   ",
+"                   ",
+"...................",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@########@@@@@@+",
+".@@@########@@@@@@+",
+".@@@########@@@@@@+",
+".@@@#@@@@@@####@@@+",
+".@@@#@@@@@@####@@@+",
+".@@@#@@@@@@####@@@+",
+".@@@#@@@@@@#@@#@@@+",
+".@@@########@@#@@@+",
+".@@@@@@#@@@@@@#@@@+",
+".@@@@@@#@@@@@@#@@@+",
+".@@@@@@########@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/menu-active.xpm b/themes/default/menu-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..e1be8d568b88b361f0e21f84672ca1ba4eb166a6
--- /dev/null
+++ b/themes/default/menu-active.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * menu_active_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++#########+++++",
+"+++++#########+++++",
+"+++++++++++++++++++",
+"+++++#########+++++",
+"+++++##@$$$@##+++++",
+"+++++$##$+$##$+++++",
+"++++++$##@##$++++++",
+"+++++++$###$+++++++",
+"++++++++$#$++++++++",
+"+++++++++$+++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/menu-inactive.xpm b/themes/default/menu-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..f9c25148ee68d1f47c38327cc94d386e13f171ae
--- /dev/null
+++ b/themes/default/menu-inactive.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * menu_inactive_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++#########+++++",
+"+++++#########+++++",
+"+++++++++++++++++++",
+"+++++#########+++++",
+"+++++##@$$$@##+++++",
+"+++++$##$+$##$+++++",
+"++++++$##@##$++++++",
+"+++++++$###$+++++++",
+"++++++++$#$++++++++",
+"+++++++++$+++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/menu-pressed.xpm b/themes/default/menu-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..491dc645ef7d809c5e2489b55b4c1a4a572c4785
--- /dev/null
+++ b/themes/default/menu-pressed.xpm
@@ -0,0 +1,27 @@
+/* XPM */
+static char * menu_pressed_xpm[] = {
+"19 19 5 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"#      c #000000",
+"                   ",
+"                   ",
+"...................",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@#########@@@@+",
+".@@@@#########@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@#########@@@@+",
+".@@@@##.....##@@@@+",
+".@@@@.##.@.##.@@@@+",
+".@@@@@.##.##.@@@@@+",
+".@@@@@@.###.@@@@@@+",
+".@@@@@@@.#.@@@@@@@+",
+".@@@@@@@@.@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+"+++++++++++++++++++"};
diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..faf849b7f0f1e141ea4338bf1c0331e953bef3b0
--- /dev/null
+++ b/themes/default/right-active.xpm
@@ -0,0 +1,41 @@
+/* XPM */
+static char * right_active_xpm[] = {
+"5 32 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #FFFFFF s active_hilight_2",
+"#      c #D5D6D5 s active_color_2",
+"*      c #B4BAB4 s active_mid_2",
+"@      c #000000",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@"};
diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..8d5e86e8c8b14aa3d33b1c03d1167e9f59348edf
--- /dev/null
+++ b/themes/default/right-inactive.xpm
@@ -0,0 +1,41 @@
+/* XPM */
+static char * right_inactive_xpm[] = {
+"5 32 6 1",
+"       c None",
+".      c #949594 s inactive_shadow_2",
+"+      c #FFFFFF s inactive_hilight_2",
+"#      c #D5D6D5 s inactive_color_2",
+"*      c #B4BAB4 s inactive_mid_2",
+"@      c #000000",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@",
+"##*.@"};
diff --git a/themes/default/shade-active.xpm b/themes/default/shade-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..ee8ae0e310e294067bd8539bccc86b530d4d9cf1
--- /dev/null
+++ b/themes/default/shade-active.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * shade_active_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #B4BAB4 s active_mid_2",
+"$      c #000000",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++#+++++++++",
+"++++++++#$#++++++++",
+"+++++++#$$$#+++++++",
+"++++++#$$@$$#++++++",
+"+++++#$$#+#$$#+++++",
+"+++++$$@###@$$+++++",
+"+++++$$$$$$$$$+++++",
+"+++++++++++++++++++",
+"+++++$$$$$$$$$+++++",
+"+++++$$$$$$$$$+++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/shade-inactive.xpm b/themes/default/shade-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..bb78a6088b271e0a747d4dd2dac1a5ff32901847
--- /dev/null
+++ b/themes/default/shade-inactive.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * shade_inactive_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #B4BAB4 s inactive_mid_2",
+"$      c #000000",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++#+++++++++",
+"++++++++#$#++++++++",
+"+++++++#$$$#+++++++",
+"++++++#$$@$$#++++++",
+"+++++#$$#+#$$#+++++",
+"+++++$$@###@$$+++++",
+"+++++$$$$$$$$$+++++",
+"+++++++++++++++++++",
+"+++++$$$$$$$$$+++++",
+"+++++$$$$$$$$$+++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/shade-pressed.xpm b/themes/default/shade-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..51451a3a065f70de3a62a3c19a65df110142df5b
--- /dev/null
+++ b/themes/default/shade-pressed.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * shade_pressed_xpm[] = {
+"19 19 5 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"#      c #000000",
+"                   ",
+"                   ",
+"...................",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@.@@@@@@@@+",
+".@@@@@@@.#.@@@@@@@+",
+".@@@@@@.###.@@@@@@+",
+".@@@@@.##.##.@@@@@+",
+".@@@@.##.@.##.@@@@+",
+".@@@@##.....##@@@@+",
+".@@@@#########@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@#########@@@@+",
+".@@@@#########@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/shade-toggled-active.xpm b/themes/default/shade-toggled-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..ed84f97701b33d5a679c6296b376a2b3b5ed68cf
--- /dev/null
+++ b/themes/default/shade-toggled-active.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * shade_toggled_active_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #B4BAB4 s active_mid_2",
+"$      c #000000",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++$$$$$$$$$+++++",
+"+++++$$@###@$$+++++",
+"+++++#$$#+#$$#+++++",
+"++++++#$$@$$#++++++",
+"+++++++#$$$#+++++++",
+"++++++++#$#++++++++",
+"+++++++++#+++++++++",
+"+++++$$$$$$$$$+++++",
+"+++++$$$$$$$$$+++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/shade-toggled-inactive.xpm b/themes/default/shade-toggled-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..edb9c1f31694fec14f7bd9425e5a679163efd5e7
--- /dev/null
+++ b/themes/default/shade-toggled-inactive.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * shade_toggled_inactive_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #B4BAB4 s inactive_mid_2",
+"$      c #000000",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++$$$$$$$$$+++++",
+"+++++$$@###@$$+++++",
+"+++++#$$#+#$$#+++++",
+"++++++#$$@$$#++++++",
+"+++++++#$$$#+++++++",
+"++++++++#$#++++++++",
+"+++++++++#+++++++++",
+"+++++$$$$$$$$$+++++",
+"+++++$$$$$$$$$+++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/shade-toggled-pressed.xpm b/themes/default/shade-toggled-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..d910eb74ccc9d4d9fd3011e5788796236db5dded
--- /dev/null
+++ b/themes/default/shade-toggled-pressed.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * shade_toggled_pressed_xpm[] = {
+"19 19 5 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"#      c #000000",
+"                   ",
+"                   ",
+"...................",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@#########@@@@+",
+".@@@@##.....##@@@@+",
+".@@@@.##.@.##.@@@@+",
+".@@@@@.##.##.@@@@@+",
+".@@@@@@.###.@@@@@@+",
+".@@@@@@@.#.@@@@@@@+",
+".@@@@@@@@.@@@@@@@@+",
+".@@@@#########@@@@+",
+".@@@@#########@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/stick-active.xpm b/themes/default/stick-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..b4b462f6d0d1b3271e6133ba4152fa28cf3ef147
--- /dev/null
+++ b/themes/default/stick-active.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * stick_active_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s active_mid_2",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"++++++++++#+++#++++",
+"++++++++++#####++++",
+"++++@######++##++++",
+"++++#$$$$$#$$##++++",
+"++++@######@@##++++",
+"++++++++++#####++++",
+"++++++++++#+++#++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/stick-inactive.xpm b/themes/default/stick-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..670404c152b267b0203041a30c04a9565e361c1a
--- /dev/null
+++ b/themes/default/stick-inactive.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * stick_inactive_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #000000",
+"$      c #B4BAB4 s inactive_mid_2",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"++++++++++#+++#++++",
+"++++++++++#####++++",
+"++++@######++##++++",
+"++++#$$$$$#$$##++++",
+"++++@######@@##++++",
+"++++++++++#####++++",
+"++++++++++#+++#++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/stick-pressed.xpm b/themes/default/stick-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..1382b07f20249564192575c222224200783b1b11
--- /dev/null
+++ b/themes/default/stick-pressed.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * stick_pressed_xpm[] = {
+"19 19 5 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #B4BAB4 s active_mid_2",
+"#      c #000000",
+"                   ",
+"                   ",
+"...................",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@#@@@#@@@+",
+".@@@@@@@@@#####@@@+",
+".@@@.######@@##@@@+",
+".@@@#.....#..##@@@+",
+".@@@.######..##@@@+",
+".@@@@@@@@@#####@@@+",
+".@@@@@@@@@#@@@#@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+".@@@@@@@@@@@@@@@@@+",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/stick-toggled-active.xpm b/themes/default/stick-toggled-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..7cd05459a21770a83f4467cd60ca146980425402
--- /dev/null
+++ b/themes/default/stick-toggled-active.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * stick_toggled_active_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s active_hilight_2",
+"+      c #D5D6D5 s active_color_2",
+"@      c #949594 s active_shadow_2",
+"#      c #B4BAB4 s active_mid_2",
+"$      c #000000",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++#$$$#+++++++",
+"++++++#$++@$#++++++",
+"++++++$+++#@$#+++++",
+"++++++$++$#@$@+++++",
+"++++++$@###@$@#++++",
+"++++++#$@@@$@@#++++",
+"+++++++#$$$@@##++++",
+"++++++++#@@@##+++++",
+"++++++++++###++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/stick-toggled-inactive.xpm b/themes/default/stick-toggled-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..948be1d3c1f242031c4ae9494e5c43feffa5a8d2
--- /dev/null
+++ b/themes/default/stick-toggled-inactive.xpm
@@ -0,0 +1,29 @@
+/* XPM */
+static char * stick_toggled_inactive_xpm[] = {
+"19 19 6 1",
+"       c None",
+".      c #FFFFFF s inactive_hilight_2",
+"+      c #D5D6D5 s inactive_color_2",
+"@      c #949594 s inactive_shadow_2",
+"#      c #B4BAB4 s inactive_mid_2",
+"$      c #000000",
+"                   ",
+"                   ",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++#$$$#+++++++",
+"++++++#$++@$#++++++",
+"++++++$+++#@$#+++++",
+"++++++$++$#@$@+++++",
+"++++++$@###@$@#++++",
+"++++++#$@@@$@@#++++",
+"+++++++#$$$@@##++++",
+"++++++++#@@@##+++++",
+"++++++++++###++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++",
+"+++++++++++++++++++"};
+
diff --git a/themes/default/stick-toggled-pressed.xpm b/themes/default/stick-toggled-pressed.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..3b2153c949e40f0b45b97f12d892b962f04c5c82
--- /dev/null
+++ b/themes/default/stick-toggled-pressed.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * stick_toggled_pressed_xpm[] = {
+"19 19 5 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #B4BAB4 s active_mid_2",
+"@      c #D5D6D5 s active_color_2",
+"#      c #000000",
+"                   ",
+"                   ",
+"...................",
+".+++++++++++++++++@",
+".+++++++++++++++++@",
+".+++++++++++++++++@",
+".+++++++++++++++++@",
+".++++++.###.++++++@",
+".+++++.#@@.#.+++++@",
+".+++++#@@@+.#.++++@",
+".+++++#@@#+.#.++++@",
+".+++++#.+++.#..+++@",
+".+++++.#...#...+++@",
+".++++++.###....+++@",
+".+++++++......++++@",
+".+++++++++...+++++@",
+".+++++++++++++++++@",
+".+++++++++++++++++@",
+"@@@@@@@@@@@@@@@@@@@"};
+
diff --git a/themes/default/themerc b/themes/default/themerc
new file mode 100644
index 0000000000000000000000000000000000000000..ff1ab61510a1c461feb99e7dd955e546f380da62
--- /dev/null
+++ b/themes/default/themerc
@@ -0,0 +1,9 @@
+active_text_color=#FFFFFF
+button_offset=1
+button_spacing=0
+full_width_title=true
+title_horizontal_offset=0
+title_vertical_offset_active=1
+title_vertical_offset_inactive=1
+title_shadow_active=true
+title_shadow_inactive=false
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..5f5e58bbfcd25acdffdfd14563e3b1390ee89591
--- /dev/null
+++ b/themes/default/title-1-active.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * title_2_active_xpm[] = {
+"8 19 6 1",
+" 	c None",
+".	c #949594 s active_shadow_2",
+"+	c #FFFFFF s active_hilight_2",
+"@	c #D5D6D5 s active_color_2",
+"#	c #B4BAB4 s active_mid_2",
+"$	c #000000",
+"........",
+"++++++++",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@"};
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..126c43cdf43ba56d7f674dc1e36974b41879a41a
--- /dev/null
+++ b/themes/default/title-1-inactive.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * title_2_inactive_xpm[] = {
+"8 19 6 1",
+"       c None",
+".      c #949594 s inactive_shadow_2",
+"+      c #FFFFFF s inactive_hilight_2",
+"@      c #D5D6D5 s inactive_color_2",
+"#      c #B4BAB4 s inactive_mid_2",
+"$      c #000000",
+"........",
+"++++++++",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@"};
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..7be67fa53384a7505a794480262c5816535e6a43
--- /dev/null
+++ b/themes/default/title-2-active.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * title_2_active_xpm[] = {
+"16 19 9 1",
+" 	c None",
+".	c #000000",
+"+	c #FFFFFF s active_hilight_2",
+"@	c #D5D6D5 s active_color_2",
+"#	c #4B58A2 s active_shadow_1",
+"$	c #525FAB s active_color_1",
+"%	c #848FD6 s active_mid_1",
+"&	c #B4BAB4 s active_mid_2",
+"*	c #949594 s active_shadow_2",
+"****************",
+"++++++++++++++++",
+"@@@@@@##########",
+"@@@@@#%%%%%%%%%%",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#%%%%%%%%%%",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#%%%%%%%%%%",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#%%%%%%%%%%",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#%%%%%%%%%%",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#%%%%%%%%%%",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#%%%%%%%%%%",
+"@@@@@#$$$$$$$$$$",
+"@@@@@@##########",
+"@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..e7cc0dfe2f20229aad03e7d75b66e77a0c744971
--- /dev/null
+++ b/themes/default/title-2-inactive.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * title_2_inactive_xpm[] = {
+"16 19 9 1",
+"       c None",
+".      c #000000",
+"+      c #FFFFFF s inactive_hilight_2",
+"@      c #D5D6D5 s inactive_color_2",
+"#      c #4B58A2 s inactive_shadow_1",
+"$      c #525FAB s inactive_color_1",
+"%      c #848FD6 s inactive_mid_1",
+"&      c #B4BAB4 s inactive_mid_2",
+"*      c #949594 s inactive_shadow_2",
+"****************",
+"++++++++++++++++",
+"@@@@@@##########",
+"@@@@@#%%%%%%%%%%",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#%%%%%%%%%%",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#%%%%%%%%%%",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#%%%%%%%%%%",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#%%%%%%%%%%",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#%%%%%%%%%%",
+"@@@@@#$$$$$$$$$$",
+"@@@@@#%%%%%%%%%%",
+"@@@@@#$$$$$$$$$$",
+"@@@@@@##########",
+"@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..a09c0ba565c6582ea4cc043bc0e44b94ffdc390a
--- /dev/null
+++ b/themes/default/title-3-active.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * title_3_active_xpm[] = {
+"20 19 9 1",
+" 	c None",
+".	c #000000",
+"+	c #FFFFFF s active_hilight_2",
+"@	c #D5D6D5 s active_color_2",
+"#	c #4B58A2 s active_shadow_1",
+"$	c #848FD6 s active_mid_1",
+"%	c #525FAB s active_color_1",
+"&	c #B4BAB4 s active_mid_2",
+"*	c #949594 s active_shadow_2",
+"********************",
+"++++++++++++++++++++",
+"####################",
+"$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%",
+"####################",
+"@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..4e2899286b5857c6bab5aa9e71725217aa3d5af3
--- /dev/null
+++ b/themes/default/title-3-inactive.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * title_3_inactive_xpm[] = {
+"20 19 9 1",
+"       c None",
+".      c #000000",
+"+      c #FFFFFF s inactive_hilight_2",
+"@      c #D5D6D5 s inactive_color_2",
+"#      c #4B58A2 s inactive_shadow_1",
+"$      c #848FD6 s inactive_mid_1",
+"%      c #525FAB s inactive_color_1",
+"&      c #B4BAB4 s inactive_mid_2",
+"*      c #949594 s inactive_shadow_2",
+"********************",
+"++++++++++++++++++++",
+"####################",
+"$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%",
+"$$$$$$$$$$$$$$$$$$$$",
+"%%%%%%%%%%%%%%%%%%%%",
+"####################",
+"@@@@@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..547bbca021e9c0cefb033311b2d3cda9df85a5be
--- /dev/null
+++ b/themes/default/title-4-active.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * title_4_active_xpm[] = {
+"16 19 9 1",
+"       c None",
+".      c #000000",
+"+      c #FFFFFF s active_hilight_2",
+"@      c #D5D6D5 s active_color_2",
+"#      c #949594 s active_shadow_2",
+"$      c #4B58A2 s active_shadow_1",
+"%      c #848FD6 s active_mid_1",
+"&      c #525FAB s active_color_1",
+"*      c #B4BAB4 s active_mid_2",
+"################",
+"++++++++++++++++",
+"$$$$$$$$$$@@@@@@",
+"%%%%%%%%%%$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"%%%%%%%%%%$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"%%%%%%%%%%$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"%%%%%%%%%%$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"%%%%%%%%%%$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"%%%%%%%%%%$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"%%%%%%%%%%$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"$$$$$$$$$$@@@@@@",
+"@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..c18e3e1c25c487079fff51ef0667cce081e8d03e
--- /dev/null
+++ b/themes/default/title-4-inactive.xpm
@@ -0,0 +1,31 @@
+/* XPM */
+static char * title_4_inactive_xpm[] = {
+"16 19 9 1",
+"       c None",
+".      c #000000",
+"+      c #FFFFFF s inactive_hilight_2",
+"@      c #D5D6D5 s inactive_color_2",
+"#      c #949594 s inactive_shadow_2",
+"$      c #4B58A2 s inactive_shadow_1",
+"%      c #848FD6 s inactive_mid_1",
+"&      c #525FAB s inactive_color_1",
+"*      c #B4BAB4 s inactive_mid_2",
+"################",
+"++++++++++++++++",
+"$$$$$$$$$$@@@@@@",
+"%%%%%%%%%%$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"%%%%%%%%%%$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"%%%%%%%%%%$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"%%%%%%%%%%$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"%%%%%%%%%%$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"%%%%%%%%%%$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"%%%%%%%%%%$@@@@@",
+"&&&&&&&&&&$@@@@@",
+"$$$$$$$$$$@@@@@@",
+"@@@@@@@@@@@@@@@@"};
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..7ae85f2f630872362f67fd419d66d0008f4fcc20
--- /dev/null
+++ b/themes/default/title-5-active.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * title_5_active_xpm[] = {
+"8 19 6 1",
+" 	c None",
+".	c #949594 s active_shadow_2",
+"+	c #FFFFFF s active_hilight_2",
+"@	c #D5D6D5 s active_color_2",
+"#	c #B4BAB4 s active_mid_2",
+"$	c #000000",
+"........",
+"++++++++",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@"};
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..64e79ee193ab2b6d20cccb4b445ed6edd968e2e8
--- /dev/null
+++ b/themes/default/title-5-inactive.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * title_5_inactive_xpm[] = {
+"8 19 6 1",
+"       c None",
+".      c #949594 s inactive_shadow_2",
+"+      c #FFFFFF s inactive_hilight_2",
+"@      c #D5D6D5 s inactive_color_2",
+"#      c #B4BAB4 s inactive_mid_2",
+"$      c #000000",
+"........",
+"++++++++",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@",
+"@@@@@@@@"};
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..dc85320db225b583001a221efe9a41fe978a8d9e
--- /dev/null
+++ b/themes/default/top-left-active.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * top_left_active_xpm[] = {
+"6 19 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #B4BAB4 s active_mid_2",
+"@      c #FFFFFF s active_hilight_2",
+"#      c #D5D6D5 s active_color_2",
+"$      c #000000",
+"     .",
+"   ..@",
+"  .@@#",
+" .@###",
+" .@###",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####"};
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..476b4fe5ccb5ceb5893b81b03eae2e78ef52960b
--- /dev/null
+++ b/themes/default/top-left-inactive.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * top_left_inactive_xpm[] = {
+"6 19 6 1",
+"       c None",
+".      c #949594 s inactive_shadow_2",
+"+      c #B4BAB4 s inactive_mid_2",
+"@      c #FFFFFF s inactive_hilight_2",
+"#      c #D5D6D5 s inactive_color_2",
+"$      c #000000",
+"     .",
+"   ..@",
+"  .@@#",
+" .@###",
+" .@###",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####",
+".@####"};
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..1f6560a5c4503991d5ec4586f575c6c3f5b8889b
--- /dev/null
+++ b/themes/default/top-right-active.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * top_right_active_xpm[] = {
+"6 19 6 1",
+"       c None",
+".      c #949594 s active_shadow_2",
+"+      c #FFFFFF s active_hilight_2",
+"@      c #B4BAB4 s active_mid_2",
+"#      c #D5D6D5 s active_color_2",
+"$      c #000000",
+".     ",
+"+..   ",
+"++@$  ",
+"###.$ ",
+"###.$ ",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$"};
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
new file mode 100644
index 0000000000000000000000000000000000000000..c9ebd9f3f0a43580cf1362992c2f6cee3ff39f97
--- /dev/null
+++ b/themes/default/top-right-inactive.xpm
@@ -0,0 +1,28 @@
+/* XPM */
+static char * top_right_inactive_xpm[] = {
+"6 19 6 1",
+"       c None",
+".      c #949594 s inactive_shadow_2",
+"+      c #FFFFFF s inactive_hilight_2",
+"@      c #B4BAB4 s inactive_mid_2",
+"#      c #D5D6D5 s inactive_color_2",
+"$      c #000000",
+".     ",
+"+..   ",
+"++@$  ",
+"###.$ ",
+"###.$ ",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$",
+"###@.$"};
diff --git a/themes/microdeck/close-active.xpm b/themes/microdeck/close-active.xpm
index 8fe58c594d11132f391f22306663e89f4da6e152..59d5d9d3b2d2f13c93efb5576fc3c54feed20db0 100644
--- a/themes/microdeck/close-active.xpm
+++ b/themes/microdeck/close-active.xpm
@@ -22,7 +22,7 @@ static char * close_active_xpm[] = {
 ".+++$###$+$###$+++@",
 ".+++###$+++$###+++@",
 ".+++@#$+++++$#@+++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".$$$$$$$$$$$$$$$$$@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck/close-inactive.xpm b/themes/microdeck/close-inactive.xpm
index a30231e45890559f8bdddadc17111ad71c965d4e..1fbc4c117e48f10f020ad55365d61b732a71a130 100644
--- a/themes/microdeck/close-inactive.xpm
+++ b/themes/microdeck/close-inactive.xpm
@@ -22,7 +22,7 @@ static char * close_inactive_xpm[] = {
 ".+++$###$+$###$+++@",
 ".+++###$+++$###+++@",
 ".+++@#$+++++$#@+++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".$$$$$$$$$$$$$$$$$@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck/hide-active.xpm b/themes/microdeck/hide-active.xpm
index fb2d9c9febfc02259ac95f6dfd69501ddc00030a..580cf95048fb2873d884ae65f9d745902997722a 100644
--- a/themes/microdeck/hide-active.xpm
+++ b/themes/microdeck/hide-active.xpm
@@ -22,7 +22,7 @@ static char * hide_active_xpm[] = {
 ".+++###########+++@",
 ".+++###########+++@",
 ".+++++++++++++++++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".$$$$$$$$$$$$$$$$$@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck/hide-inactive.xpm b/themes/microdeck/hide-inactive.xpm
index 817da31cb0b5c8196be528201291afb102f73e11..e0fd06ba21da2ca935494f95df034a7f1d5ff6bd 100644
--- a/themes/microdeck/hide-inactive.xpm
+++ b/themes/microdeck/hide-inactive.xpm
@@ -22,7 +22,7 @@ static char * hide_inactive_xpm[] = {
 ".+++###########+++@",
 ".+++###########+++@",
 ".+++++++++++++++++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".$$$$$$$$$$$$$$$$$@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck/maximize-active.xpm b/themes/microdeck/maximize-active.xpm
index 21ef36de26b80876b1d8c1ad42c723cde1726a17..bbeac20fbeccd571e0b157fde4ac24221e26b8e5 100644
--- a/themes/microdeck/maximize-active.xpm
+++ b/themes/microdeck/maximize-active.xpm
@@ -22,7 +22,7 @@ static char * maximize_active_xpm[] = {
 ".+++#+++++++++#+++@",
 ".+++#+++++++++#+++@",
 ".+++###########+++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".$$$$$$$$$$$$$$$$$@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck/maximize-inactive.xpm b/themes/microdeck/maximize-inactive.xpm
index b0936b89b09444ee4b4e403e9e76ce4b3b677607..a0fcd7ba4cb58ddfe398fc98c40059cd63c2dbfa 100644
--- a/themes/microdeck/maximize-inactive.xpm
+++ b/themes/microdeck/maximize-inactive.xpm
@@ -22,7 +22,7 @@ static char * maximize_inactive_xpm[] = {
 ".+++#+++++++++#+++@",
 ".+++#+++++++++#+++@",
 ".+++###########+++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".$$$$$$$$$$$$$$$$$@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck/maximize-toggled-active.xpm b/themes/microdeck/maximize-toggled-active.xpm
index 63277948dd1ea96400168ff7f26859f66d7c0fd8..14f39a1e81e5cdd4153ac47cb4c7b2962d45b7f0 100644
--- a/themes/microdeck/maximize-toggled-active.xpm
+++ b/themes/microdeck/maximize-toggled-active.xpm
@@ -22,7 +22,7 @@ static char * maximize_toggled_active_xpm[] = {
 ".++++++#++++++#+++@",
 ".++++++#++++++#+++@",
 ".++++++########+++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".$$$$$$$$$$$$$$$$$@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck/maximize-toggled-inactive.xpm b/themes/microdeck/maximize-toggled-inactive.xpm
index 8b681711ce3b6573114af0aa05e1b16cd49837a4..a0421d5c311a3bae50263dfbee2d145603408b08 100644
--- a/themes/microdeck/maximize-toggled-inactive.xpm
+++ b/themes/microdeck/maximize-toggled-inactive.xpm
@@ -22,7 +22,7 @@ static char * maximize_toggled_inactive_xpm[] = {
 ".++++++#++++++#+++@",
 ".++++++#++++++#+++@",
 ".++++++########+++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".$$$$$$$$$$$$$$$$$@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck/menu-active.xpm b/themes/microdeck/menu-active.xpm
index 98e98b945fcf77d883a7de58434537fa48bc2ecf..f018ac974856f08bf2bfee66b70ec2d9a027b68b 100644
--- a/themes/microdeck/menu-active.xpm
+++ b/themes/microdeck/menu-active.xpm
@@ -22,7 +22,7 @@ static char * menu_active_xpm[] = {
 ".++++++$###$++++++@",
 ".+++++++$#$+++++++@",
 ".++++++++$++++++++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".$$$$$$$$$$$$$$$$$@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck/menu-inactive.xpm b/themes/microdeck/menu-inactive.xpm
index e929b2053cbd215bef57c4f1fdcc3d6f6ccf86c2..74af90ec997d7a3e648ef0c6d951f26990a0f9d6 100644
--- a/themes/microdeck/menu-inactive.xpm
+++ b/themes/microdeck/menu-inactive.xpm
@@ -22,7 +22,7 @@ static char * menu_inactive_xpm[] = {
 ".++++++$###$++++++@",
 ".+++++++$#$+++++++@",
 ".++++++++$++++++++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".$$$$$$$$$$$$$$$$$@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck/stick-active.xpm b/themes/microdeck/stick-active.xpm
index 0f17083554e4213bf49f820964f6b263e9c03985..c043e95f17eb14a2681dc67f79ed162f5bc21022 100644
--- a/themes/microdeck/stick-active.xpm
+++ b/themes/microdeck/stick-active.xpm
@@ -22,7 +22,7 @@ static char * stick_active_xpm[] = {
 ".+++++++++#+++#+++@",
 ".+++++++++++++++++@",
 ".+++++++++++++++++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".$$$$$$$$$$$$$$$$$@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck/stick-inactive.xpm b/themes/microdeck/stick-inactive.xpm
index 9e95af4cb95c2c507d61beb7f10d8e156e29a3ff..4ef255ea4b875a3f4c8f8d446151ef89231410f7 100644
--- a/themes/microdeck/stick-inactive.xpm
+++ b/themes/microdeck/stick-inactive.xpm
@@ -22,7 +22,7 @@ static char * stick_inactive_xpm[] = {
 ".+++++++++#+++#+++@",
 ".+++++++++++++++++@",
 ".+++++++++++++++++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".$$$$$$$$$$$$$$$$$@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck2/close-active.xpm b/themes/microdeck2/close-active.xpm
index 947468a774a8756d4f6afa3b27d7c64830c869c3..fa2c196cf53b146ac963a5a31b89d05cd62d6a8c 100644
--- a/themes/microdeck2/close-active.xpm
+++ b/themes/microdeck2/close-active.xpm
@@ -22,7 +22,7 @@ static char * close_active_xpm[] = {
 ".+++$###$+$###$+++@",
 ".+++###$+++$###+++@",
 ".+++@#$+++++$#@+++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".+++++++++++++++++@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck2/close-inactive.xpm b/themes/microdeck2/close-inactive.xpm
index 4d7335b2e69319dff94e9ffda3c759aaa6fa0c5a..71e8f116831ddc430331525930113ca7fce741b2 100644
--- a/themes/microdeck2/close-inactive.xpm
+++ b/themes/microdeck2/close-inactive.xpm
@@ -22,7 +22,7 @@ static char * close_inactive_xpm[] = {
 ".+++$###$+$###$+++@",
 ".+++###$+++$###+++@",
 ".+++@#$+++++$#@+++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".+++++++++++++++++@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck2/hide-active.xpm b/themes/microdeck2/hide-active.xpm
index 422f27add8f6110d9a99e483ac2334389de4b7e8..2cfb107830580fe384372f7fe0475d68566d6aa9 100644
--- a/themes/microdeck2/hide-active.xpm
+++ b/themes/microdeck2/hide-active.xpm
@@ -22,7 +22,7 @@ static char * hide_active_xpm[] = {
 ".+++###########+++@",
 ".+++###########+++@",
 ".+++++++++++++++++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".+++++++++++++++++@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck2/hide-inactive.xpm b/themes/microdeck2/hide-inactive.xpm
index 47ce5e4aa265846af6e7bcff68a140dff1751524..206da165de60d1115776b362858f80e574e18eb4 100644
--- a/themes/microdeck2/hide-inactive.xpm
+++ b/themes/microdeck2/hide-inactive.xpm
@@ -22,7 +22,7 @@ static char * hide_inactive_xpm[] = {
 ".+++###########+++@",
 ".+++###########+++@",
 ".+++++++++++++++++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".+++++++++++++++++@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck2/maximize-active.xpm b/themes/microdeck2/maximize-active.xpm
index 697789198a87f758e5b084ddcd451a457d4ec9bf..ed86582891eb5859513054add0a8522c7fb33ec4 100644
--- a/themes/microdeck2/maximize-active.xpm
+++ b/themes/microdeck2/maximize-active.xpm
@@ -22,7 +22,7 @@ static char * maximize_active_xpm[] = {
 ".+++#+++++++++#+++@",
 ".+++#+++++++++#+++@",
 ".+++###########+++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".+++++++++++++++++@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck2/maximize-inactive.xpm b/themes/microdeck2/maximize-inactive.xpm
index e86c88250395ddf5111a205c1f598c25029a00d0..e1fa1b8fdf743424c3587767f25e11c6200da6c0 100644
--- a/themes/microdeck2/maximize-inactive.xpm
+++ b/themes/microdeck2/maximize-inactive.xpm
@@ -22,7 +22,7 @@ static char * maximize_inactive_xpm[] = {
 ".+++#+++++++++#+++@",
 ".+++#+++++++++#+++@",
 ".+++###########+++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".+++++++++++++++++@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck2/menu-active.xpm b/themes/microdeck2/menu-active.xpm
index a3d4790ba0efc5f0fab39d85c1313757fe50f846..1ae98ddd71d0bc6b2babd302ab1cac355f551f9d 100644
--- a/themes/microdeck2/menu-active.xpm
+++ b/themes/microdeck2/menu-active.xpm
@@ -22,7 +22,7 @@ static char * menu_active_xpm[] = {
 ".++++++$###$++++++@",
 ".+++++++$#$+++++++@",
 ".++++++++$++++++++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".+++++++++++++++++@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck2/menu-inactive.xpm b/themes/microdeck2/menu-inactive.xpm
index d30d13964ac64933d26c67a1eec1882e4f16a273..6c67eee1398d62892c7d337432cb74c4f5d0944e 100644
--- a/themes/microdeck2/menu-inactive.xpm
+++ b/themes/microdeck2/menu-inactive.xpm
@@ -22,7 +22,7 @@ static char * menu_inactive_xpm[] = {
 ".++++++$###$++++++@",
 ".+++++++$#$+++++++@",
 ".++++++++$++++++++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".+++++++++++++++++@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck2/stick-active.xpm b/themes/microdeck2/stick-active.xpm
index 7748f964f0cad6f5ec84e2e8d539485367b0e3d4..1cda6e45abb2dc526b7c80f985f98ff3ec621b94 100644
--- a/themes/microdeck2/stick-active.xpm
+++ b/themes/microdeck2/stick-active.xpm
@@ -22,7 +22,7 @@ static char * stick_active_xpm[] = {
 ".+++++++++#+++#+++@",
 ".+++++++++++++++++@",
 ".+++++++++++++++++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".+++++++++++++++++@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck2/stick-inactive.xpm b/themes/microdeck2/stick-inactive.xpm
index ea42c9f6f9ee24fbca5b7b0a1411e119bf83cb4f..e2819e02f4c16558b429f80a3b4f23787e612b08 100644
--- a/themes/microdeck2/stick-inactive.xpm
+++ b/themes/microdeck2/stick-inactive.xpm
@@ -22,7 +22,7 @@ static char * stick_inactive_xpm[] = {
 ".+++++++++#+++#+++@",
 ".+++++++++++++++++@",
 ".+++++++++++++++++@",
-".+++++++++++++++++@",,
+".+++++++++++++++++@",
 ".+++++++++++++++++@",
 "@@@@@@@@@@@@@@@@@@@",
 "                   "};
diff --git a/themes/microdeck2/title-3-active.xpm b/themes/microdeck2/title-3-active.xpm
index 1274bbff963e3c5b529fc7281dd1d4ad73a75e19..4754e92398cb45a8afbfbe5658c94ea6d149f384 100644
--- a/themes/microdeck2/title-3-active.xpm
+++ b/themes/microdeck2/title-3-active.xpm
@@ -1,23 +1,23 @@
 /* XPM */
 static char * title_3_active_xpm[] = {
 "20 19 17 1",
-" 	c None",
-".	c #000000",
-"+	c #BEBFCA",
-"@	c #666A82",
-"#	c #9195A6",
-"$	c #6C7088",
-"%	c #72768D",
-"&	c #787C92",
-"*	c #7F8297",
-"=	c #85889C",
-"-	c #8B8EA1",
-";	c #989BAC",
-">	c #9EA1B1",
-",	c #A4A7B6",
-"'	c #ABADBB",
-")	c #B1B3C0",
-"!	c #B7B9C5",
+"       c None",
+".      c #000000",
+"+      c #BEBFCA",
+"@      c #666A82",
+"#      c #9195A6",
+"$      c #6C7088",
+"%      c #72768D",
+"&      c #787C92",
+"*      c #7F8297",
+"=      c #85889C",
+"-      c #8B8EA1",
+";      c #989BAC",
+">      c #9EA1B1",
+",      c #A4A7B6",
+"'      c #ABADBB",
+")      c #B1B3C0",
+"!      c #B7B9C5",
 "....................",
 "++++++++++++++++++++",
 "@@#@@@#@@@#@@@#@@@#@",
@@ -30,7 +30,7 @@ static char * title_3_active_xpm[] = {
 "####################",
 ";;#;;;#;;;#;;;#;;;#;",
 ">#>>>#>>>#>>>#>>>#>>",
-"#,,,#,,,#,,,#,,,#,,,",
+"#,,#,,#,,#,,#,,",
 "'''#'''#'''#'''#'''#",
 "))#)))#)))#)))#)))#)",
 "!#!!!#!!!#!!!#!!!#!!",
diff --git a/themes/microdeck2/title-3-inactive.xpm b/themes/microdeck2/title-3-inactive.xpm
index 8fa5e3369a8bda452a9f926da5d0f1d0fb5989f5..f5a6a14f8dc03b52bb501b54e7bc2070b269ce5e 100644
--- a/themes/microdeck2/title-3-inactive.xpm
+++ b/themes/microdeck2/title-3-inactive.xpm
@@ -1,23 +1,23 @@
 /* XPM */
 static char * title_3_inactive_xpm[] = {
 "20 19 17 1",
-" 	c None",
-".	c #000000",
-"+	c #D9D9D9",
-"@	c #B6B6B6",
-"#	c #FFFFFF s inactive_color_1",
-"$	c #BABABA",
-"%	c #BCBCBC",
-"&	c #BEBEBE",
-"*	c #C0C0C0",
-"=	c #C2C2C2",
-"-	c #C5C5C5",
-";	c #C7C7C7",
-">	c #C9C9C9",
-",	c #CBCBCB",
-"'	c #CECECE",
-")	c #D0D0D0",
-"!	c #D4D4D4",
+"       c None",
+".      c #000000",
+"+      c #D9D9D9",
+"@      c #B6B6B6",
+"#      c #FFFFFF s inactive_color_1",
+"$      c #BABABA",
+"%      c #BCBCBC",
+"&      c #BEBEBE",
+"*      c #C0C0C0",
+"=      c #C2C2C2",
+"-      c #C5C5C5",
+";      c #C7C7C7",
+">      c #C9C9C9",
+",      c #CBCBCB",
+"'      c #CECECE",
+")      c #D0D0D0",
+"!      c #D4D4D4",
 "....................",
 "++++++++++++++++++++",
 "@@#@@@#@@@#@@@#@@@#@",
@@ -30,7 +30,7 @@ static char * title_3_inactive_xpm[] = {
 "---#---#---#---#---#",
 ";;#;;;#;;;#;;;#;;;#;",
 ">#>>>#>>>#>>>#>>>#>>",
-"#,,,#,,,#,,,#,,,#,,,",
+"#,,#,,#,,#,,#,,",
 "'''#'''#'''#'''#'''#",
 "))#)))#)))#)))#)))#)",
 "!#!!!#!!!#!!!#!!!#!!",
diff --git a/xfwm4.spec.in b/xfwm4.spec.in
index 4575a6e9f7e54be669e6845ee5ffaf9a104fd9af..f16c4daf78e3515b5af1c35a85c3ba66a879d0be 100644
--- a/xfwm4.spec.in
+++ b/xfwm4.spec.in
@@ -58,6 +58,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/xfwm4/themes/atlanta
 %{_datadir}/xfwm4/themes/bbs
 %{_datadir}/xfwm4/themes/curve
+%{_datadir}/xfwm4/themes/default
 %{_datadir}/xfwm4/themes/default.keys
 %{_datadir}/xfwm4/themes/elberg
 %{_datadir}/xfwm4/themes/exocet