From 3d96f44c4d8b135a7f16a258e8dacff1d325ea21 Mon Sep 17 00:00:00 2001
From: Olivier Fourdan <fourdan.olivier@wanadoo.fr>
Date: Fri, 27 Feb 2004 21:31:19 +0000
Subject: [PATCH] Use standard location for xfwm4 themes (breaking backward
compat, older themes won't show anymore)
(Old svn revision: 11598)
---
config.h.in | 3 +
configure | 105 ++++-
configure.ac | 2 +-
defaults/defaults.in | 4 +-
mcs-plugin/Makefile.am | 3 +-
mcs-plugin/Makefile.in | 3 +-
mcs-plugin/xfwm4_plugin.c | 73 ++-
src/Makefile.am | 3 +-
src/Makefile.in | 3 +-
src/parserc.c | 97 +++-
src/parserc.h | 2 +-
src/settings.c | 22 +-
themes/Makefile.am | 1 -
themes/Makefile.in | 1 -
themes/default-4.0/Makefile.am | 2 +-
themes/default-4.0/Makefile.in | 2 +-
themes/default.keys/Makefile.am | 2 +-
themes/default.keys/Makefile.in | 2 +-
themes/default/Makefile.am | 2 +-
themes/default/Makefile.in | 2 +-
themes/default/bottom-active.xpm | 23 +-
themes/default/bottom-inactive.xpm | 23 +-
themes/default/bottom-left-active.xpm | 44 +-
themes/default/bottom-left-inactive.xpm | 44 +-
themes/default/bottom-right-active.xpm | 44 +-
themes/default/bottom-right-inactive.xpm | 44 +-
themes/default/close-active.xpm | 4 +-
themes/default/close-inactive.xpm | 4 +-
themes/default/close-pressed.xpm | 4 +-
themes/default/hide-active.xpm | 8 +-
themes/default/hide-inactive.xpm | 8 +-
themes/default/hide-pressed.xpm | 8 +-
themes/default/left-active.xpm | 78 ++--
themes/default/left-inactive.xpm | 78 ++--
themes/default/maximize-active.xpm | 12 +-
themes/default/maximize-inactive.xpm | 12 +-
themes/default/maximize-pressed.xpm | 12 +-
themes/default/maximize-toggled-active.xpm | 16 +-
themes/default/maximize-toggled-inactive.xpm | 16 +-
themes/default/maximize-toggled-pressed.xpm | 16 +-
themes/default/right-active.xpm | 78 ++--
themes/default/right-inactive.xpm | 78 ++--
themes/default/themerc | 2 +-
themes/default/title-1-active.xpm | 54 +--
themes/default/title-1-inactive.xpm | 56 +--
themes/default/title-2-active.xpm | 54 +--
themes/default/title-2-inactive.xpm | 56 +--
themes/default/title-3-active.xpm | 54 +--
themes/default/title-3-inactive.xpm | 56 +--
themes/default/title-4-active.xpm | 54 +--
themes/default/title-4-inactive.xpm | 56 +--
themes/default/title-5-active.xpm | 54 +--
themes/default/title-5-inactive.xpm | 56 +--
themes/default/top-left-active.xpm | 60 +--
themes/default/top-left-inactive.xpm | 60 +--
themes/default/top-right-active.xpm | 60 +--
themes/default/top-right-inactive.xpm | 60 +--
themes/opta/Makefile.am | 2 +-
themes/opta/Makefile.in | 2 +-
themes/softwall/Makefile.am | 55 ---
themes/softwall/Makefile.in | 436 ------------------
themes/softwall/README | 4 -
themes/softwall/bottom-active.xpm | 15 -
themes/softwall/bottom-inactive.xpm | 15 -
themes/softwall/bottom-left-active.xpm | 26 --
themes/softwall/bottom-left-inactive.xpm | 26 --
themes/softwall/bottom-right-active.xpm | 26 --
themes/softwall/bottom-right-inactive.xpm | 26 --
themes/softwall/close-active.xpm | 29 --
themes/softwall/close-inactive.xpm | 29 --
themes/softwall/close-pressed.xpm | 29 --
themes/softwall/hide-active.xpm | 29 --
themes/softwall/hide-inactive.xpm | 29 --
themes/softwall/hide-pressed.xpm | 29 --
themes/softwall/left-active.xpm | 42 --
themes/softwall/left-inactive.xpm | 42 --
themes/softwall/maximize-active.xpm | 29 --
themes/softwall/maximize-inactive.xpm | 29 --
themes/softwall/maximize-pressed.xpm | 29 --
themes/softwall/maximize-toggled-active.xpm | 29 --
themes/softwall/maximize-toggled-inactive.xpm | 29 --
themes/softwall/maximize-toggled-pressed.xpm | 29 --
themes/softwall/menu-active.xpm | 29 --
themes/softwall/menu-inactive.xpm | 29 --
themes/softwall/menu-pressed.xpm | 29 --
themes/softwall/right-active.xpm | 42 --
themes/softwall/right-inactive.xpm | 42 --
themes/softwall/shade-active.xpm | 29 --
themes/softwall/shade-inactive.xpm | 29 --
themes/softwall/shade-pressed.xpm | 29 --
themes/softwall/shade-toggled-active.xpm | 29 --
themes/softwall/shade-toggled-inactive.xpm | 29 --
themes/softwall/shade-toggled-pressed.xpm | 29 --
themes/softwall/stick-active.xpm | 29 --
themes/softwall/stick-inactive.xpm | 30 --
themes/softwall/stick-pressed.xpm | 30 --
themes/softwall/stick-toggled-active.xpm | 29 --
themes/softwall/stick-toggled-inactive.xpm | 30 --
themes/softwall/stick-toggled-pressed.xpm | 30 --
themes/softwall/themerc | 10 -
themes/softwall/title-1-active.xpm | 34 --
themes/softwall/title-1-inactive.xpm | 34 --
themes/softwall/title-2-active.xpm | 34 --
themes/softwall/title-2-inactive.xpm | 34 --
themes/softwall/title-3-active.xpm | 34 --
themes/softwall/title-3-inactive.xpm | 34 --
themes/softwall/title-4-active.xpm | 34 --
themes/softwall/title-4-inactive.xpm | 34 --
themes/softwall/title-5-active.xpm | 34 --
themes/softwall/title-5-inactive.xpm | 34 --
themes/softwall/top-left-active.xpm | 34 --
themes/softwall/top-left-inactive.xpm | 34 --
themes/softwall/top-right-active.xpm | 34 --
themes/softwall/top-right-inactive.xpm | 34 --
themes/synthetic/Makefile.am | 2 +-
themes/synthetic/Makefile.in | 2 +-
116 files changed, 980 insertions(+), 2878 deletions(-)
delete mode 100644 themes/softwall/Makefile.am
delete mode 100644 themes/softwall/Makefile.in
delete mode 100644 themes/softwall/README
delete mode 100644 themes/softwall/bottom-active.xpm
delete mode 100644 themes/softwall/bottom-inactive.xpm
delete mode 100644 themes/softwall/bottom-left-active.xpm
delete mode 100644 themes/softwall/bottom-left-inactive.xpm
delete mode 100644 themes/softwall/bottom-right-active.xpm
delete mode 100644 themes/softwall/bottom-right-inactive.xpm
delete mode 100644 themes/softwall/close-active.xpm
delete mode 100644 themes/softwall/close-inactive.xpm
delete mode 100644 themes/softwall/close-pressed.xpm
delete mode 100644 themes/softwall/hide-active.xpm
delete mode 100644 themes/softwall/hide-inactive.xpm
delete mode 100644 themes/softwall/hide-pressed.xpm
delete mode 100644 themes/softwall/left-active.xpm
delete mode 100644 themes/softwall/left-inactive.xpm
delete mode 100644 themes/softwall/maximize-active.xpm
delete mode 100644 themes/softwall/maximize-inactive.xpm
delete mode 100644 themes/softwall/maximize-pressed.xpm
delete mode 100644 themes/softwall/maximize-toggled-active.xpm
delete mode 100644 themes/softwall/maximize-toggled-inactive.xpm
delete mode 100644 themes/softwall/maximize-toggled-pressed.xpm
delete mode 100644 themes/softwall/menu-active.xpm
delete mode 100644 themes/softwall/menu-inactive.xpm
delete mode 100644 themes/softwall/menu-pressed.xpm
delete mode 100644 themes/softwall/right-active.xpm
delete mode 100644 themes/softwall/right-inactive.xpm
delete mode 100644 themes/softwall/shade-active.xpm
delete mode 100644 themes/softwall/shade-inactive.xpm
delete mode 100644 themes/softwall/shade-pressed.xpm
delete mode 100644 themes/softwall/shade-toggled-active.xpm
delete mode 100644 themes/softwall/shade-toggled-inactive.xpm
delete mode 100644 themes/softwall/shade-toggled-pressed.xpm
delete mode 100644 themes/softwall/stick-active.xpm
delete mode 100644 themes/softwall/stick-inactive.xpm
delete mode 100644 themes/softwall/stick-pressed.xpm
delete mode 100644 themes/softwall/stick-toggled-active.xpm
delete mode 100644 themes/softwall/stick-toggled-inactive.xpm
delete mode 100644 themes/softwall/stick-toggled-pressed.xpm
delete mode 100644 themes/softwall/themerc
delete mode 100644 themes/softwall/title-1-active.xpm
delete mode 100644 themes/softwall/title-1-inactive.xpm
delete mode 100644 themes/softwall/title-2-active.xpm
delete mode 100644 themes/softwall/title-2-inactive.xpm
delete mode 100644 themes/softwall/title-3-active.xpm
delete mode 100644 themes/softwall/title-3-inactive.xpm
delete mode 100644 themes/softwall/title-4-active.xpm
delete mode 100644 themes/softwall/title-4-inactive.xpm
delete mode 100644 themes/softwall/title-5-active.xpm
delete mode 100644 themes/softwall/title-5-inactive.xpm
delete mode 100644 themes/softwall/top-left-active.xpm
delete mode 100644 themes/softwall/top-left-inactive.xpm
delete mode 100644 themes/softwall/top-right-active.xpm
delete mode 100644 themes/softwall/top-right-inactive.xpm
diff --git a/config.h.in b/config.h.in
index 3e1acb4f2..e2e726061 100644
--- a/config.h.in
+++ b/config.h.in
@@ -48,6 +48,9 @@
/* Define to 1 if you have the <memory.h> header file. */
#undef HAVE_MEMORY_H
+/* Define to 1 if you have the `opendir' function. */
+#undef HAVE_OPENDIR
+
/* Define to 1 if you have the `setsid' function. */
#undef HAVE_SETSID
diff --git a/configure b/configure
index c02529766..8fdb71cb3 100755
--- a/configure
+++ b/configure
@@ -20669,6 +20669,108 @@ fi
done
+for ac_func in opendir
+do
+as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
+echo "$as_me:$LINENO: 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
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define $ac_func innocuous_$ac_func
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char $ac_func (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef $ac_func
+
+/* Override any gcc2 internal prototype to avoid an error. */
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+/* We use char because int might match the return type of a gcc2
+ builtin and then its argument prototype would still apply. */
+char $ac_func ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
+choke me
+#else
+char (*f) () = $ac_func;
+#endif
+#ifdef __cplusplus
+}
+#endif
+
+int
+main ()
+{
+return f != $ac_func;
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
+ (eval $ac_link) 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } &&
+ { ac_try='test -z "$ac_c_werror_flag"
+ || test ! -s conftest.err'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; } &&
+ { ac_try='test -s conftest$ac_exeext'
+ { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
+ (eval $ac_try) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; }; then
+ eval "$as_ac_var=yes"
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+eval "$as_ac_var=no"
+fi
+rm -f conftest.err conftest.$ac_objext \
+ conftest$ac_exeext conftest.$ac_ext
+fi
+echo "$as_me:$LINENO: 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 <<_ACEOF
+#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
+_ACEOF
+
+fi
+done
+
+
GETTEXT_PACKAGE=xfwm4
@@ -24671,7 +24773,7 @@ echo "${ECHO_T}yes" >&6
fi
- ac_config_files="$ac_config_files xfwm4.spec Makefile doc/Makefile doc/C/Makefile doc/C/images/Makefile doc/fr/Makefile doc/fr/images/Makefile defaults/Makefile mcs-plugin/Makefile po/Makefile.in src/Makefile themes/Makefile themes/default/Makefile themes/default.keys/Makefile themes/default-4.0/Makefile themes/opta/Makefile themes/softwall/Makefile themes/synthetic/Makefile"
+ ac_config_files="$ac_config_files xfwm4.spec Makefile doc/Makefile doc/C/Makefile doc/C/images/Makefile doc/fr/Makefile doc/fr/images/Makefile defaults/Makefile mcs-plugin/Makefile po/Makefile.in src/Makefile themes/Makefile themes/default/Makefile themes/default.keys/Makefile themes/default-4.0/Makefile themes/opta/Makefile themes/synthetic/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
@@ -25259,7 +25361,6 @@ do
"themes/default.keys/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/default.keys/Makefile" ;;
"themes/default-4.0/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/default-4.0/Makefile" ;;
"themes/opta/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/opta/Makefile" ;;
- "themes/softwall/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/softwall/Makefile" ;;
"themes/synthetic/Makefile" ) CONFIG_FILES="$CONFIG_FILES themes/synthetic/Makefile" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
diff --git a/configure.ac b/configure.ac
index 270498bb6..9977bd910 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,6 +30,7 @@ AC_C_INLINE
dnl check for standard header files
AC_HEADER_STDC
AC_CHECK_FUNCS([daemon setsid])
+AC_CHECK_FUNCS(opendir)
dnl Check for i18n support
BM_I18N([xfwm4], [ar az ca cs de es es_MX eu fa_IR fi fr hi hu ja ko lt ms nl
@@ -94,6 +95,5 @@ themes/default/Makefile
themes/default.keys/Makefile
themes/default-4.0/Makefile
themes/opta/Makefile
-themes/softwall/Makefile
themes/synthetic/Makefile
])
diff --git a/defaults/defaults.in b/defaults/defaults.in
index cd7c45b19..6238db1c8 100644
--- a/defaults/defaults.in
+++ b/defaults/defaults.in
@@ -1,5 +1,5 @@
-theme=default
-keytheme=default.keys
+theme=Default
+keytheme=Default
box_move=false
box_resize=false
button_layout=OTS|HMC
diff --git a/mcs-plugin/Makefile.am b/mcs-plugin/Makefile.am
index 0b547e466..3434f160d 100644
--- a/mcs-plugin/Makefile.am
+++ b/mcs-plugin/Makefile.am
@@ -22,7 +22,8 @@ xfwm4_plugin_la_CFLAGS = \
-I$(top_builddir)/common \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
- -DDATADIR=\"$(pkgdatadir)\"
+ -DDATADIR=\"$(datadir)\" \
+ -DPACKAGE_DATADIR=\"$(pkgdatadir)\"
xfwm4_plugin_la_LIBADD = \
@LIBS@
diff --git a/mcs-plugin/Makefile.in b/mcs-plugin/Makefile.in
index bab6ad990..6bed3dba4 100644
--- a/mcs-plugin/Makefile.in
+++ b/mcs-plugin/Makefile.in
@@ -251,7 +251,8 @@ xfwm4_plugin_la_CFLAGS = \
-I$(top_builddir)/common \
-DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \
-DSYSCONFDIR=\"$(sysconfdir)\" \
- -DDATADIR=\"$(pkgdatadir)\"
+ -DDATADIR=\"$(datadir)\" \
+ -DPACKAGE_DATADIR=\"$(pkgdatadir)\"
xfwm4_plugin_la_LIBADD = \
@LIBS@
diff --git a/mcs-plugin/xfwm4_plugin.c b/mcs-plugin/xfwm4_plugin.c
index 3308ef3f2..209dd28f6 100644
--- a/mcs-plugin/xfwm4_plugin.c
+++ b/mcs-plugin/xfwm4_plugin.c
@@ -48,8 +48,8 @@
#define CHANNEL "xfwm4"
#define PLUGIN_NAME "xfwm4"
-#define DEFAULT_THEME "default"
-#define DEFAULT_KEY_THEME "default.keys"
+#define DEFAULT_THEME "Default"
+#define DEFAULT_KEY_THEME "Default"
#define DEFAULT_LAYOUT "OTS|HMC"
#define DEFAULT_ACTION "maximize"
#define DEFAULT_ALIGN "center"
@@ -58,6 +58,11 @@
#define DEFAULT_ICON_SIZE 48
#define MAX_ELEMENTS_BEFORE_SCROLLING 6
+#define SUFFIX "xfwm4"
+#define KEY_SUFFIX "xfwm4"
+#define KEYTHEMERC "keythemerc"
+#define THEMERC "themerc"
+
#define STATES 8
#define STATE_HIDDEN (STATES - 1)
@@ -588,27 +593,22 @@ update_theme_dir (const gchar * theme_dir, GList * theme_list)
gboolean set_font = FALSE;
gchar *tmp;
-
- if (glib22_str_has_suffix (theme_dir, ".keys"))
+
+ tmp = g_build_filename (theme_dir, G_DIR_SEPARATOR_S, KEY_SUFFIX, G_DIR_SEPARATOR_S, KEYTHEMERC, NULL);
+ if (g_file_test (tmp, G_FILE_TEST_IS_REGULAR)
+ && parserc (tmp, &set_layout, &set_align, &set_font))
{
- tmp = g_build_filename (theme_dir, "keythemerc", NULL);
- if (g_file_test (tmp, G_FILE_TEST_IS_REGULAR)
- && parserc (tmp, &set_layout, &set_align, &set_font))
- {
- has_keybinding = TRUE;
- }
- g_free (tmp);
+ has_keybinding = TRUE;
}
- else
+ g_free (tmp);
+
+ tmp = g_build_filename (theme_dir, G_DIR_SEPARATOR_S, SUFFIX, G_DIR_SEPARATOR_S, THEMERC, NULL);
+ if (g_file_test (tmp, G_FILE_TEST_IS_REGULAR)
+ && parserc (tmp, &set_layout, &set_align, &set_font))
{
- tmp = g_build_filename (theme_dir, "themerc", NULL);
- if (g_file_test (tmp, G_FILE_TEST_IS_REGULAR)
- && parserc (tmp, &set_layout, &set_align, &set_font))
- {
- has_decoration = TRUE;
- }
- g_free (tmp);
+ has_decoration = TRUE;
}
+ g_free (tmp);
theme_name = g_strdup (strrchr (theme_dir, G_DIR_SEPARATOR) + 1);
info = find_theme_info_by_name (theme_name, list);
@@ -657,31 +657,30 @@ update_theme_dir (const gchar * theme_dir, GList * theme_list)
static GList *
themes_common_list_add_dir (const char *dirname, GList * theme_list)
{
- DIR *dir;
+#ifdef HAVE_OPENDIR
struct dirent *de;
- GList *list = theme_list;
-
- g_return_val_if_fail (dirname != NULL, list);
-
- dir = opendir (dirname);
+ gchar *tmp;
+ DIR *dir;
- if (!dir)
- return list;
+ g_return_val_if_fail(dirname != NULL, theme_list);
- while ((de = readdir (dir)))
+ if ((dir = opendir(dirname)) != NULL)
{
- char *tmp;
+ while((de = readdir(dir)))
+ {
+ if (de->d_name[0] == '.')
+ continue;
- if (de->d_name[0] == '.')
- continue;
+ tmp = g_build_filename(dirname, de->d_name, NULL);
+ theme_list = update_theme_dir(tmp, theme_list);
+ g_free(tmp);
+ }
- tmp = g_build_filename (dirname, de->d_name, NULL);
- list = update_theme_dir (tmp, list);
- g_free (tmp);
+ closedir(dir);
}
- closedir (dir);
+#endif
- return list;
+ return(theme_list);
}
@@ -691,7 +690,7 @@ theme_common_init (GList * theme_list)
gchar *dir;
GList *list = theme_list;
- dir = xfce_get_homefile (".themes", "xfwm4", NULL);
+ dir = xfce_get_homefile (".themes", NULL);
list = themes_common_list_add_dir (dir, list);
g_free (dir);
diff --git a/src/Makefile.am b/src/Makefile.am
index 43588a362..bc09ca479 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -44,7 +44,8 @@ xfwm4_CFLAGS = \
@LIBXPM_CFLAGS@ \
-I$(top_builddir)/common \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- -DDATADIR=\"$(pkgdatadir)\"
+ -DDATADIR=\"$(datadir)\" \
+ -DPACKAGE_DATADIR=\"$(pkgdatadir)\"
xfwm4_LDADD = \
@LIBSTARTUP_NOTIFICATION_LIBS@ \
diff --git a/src/Makefile.in b/src/Makefile.in
index 664e56910..100f08af7 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -287,7 +287,8 @@ xfwm4_CFLAGS = \
@LIBXPM_CFLAGS@ \
-I$(top_builddir)/common \
-DPACKAGE_LOCALE_DIR=\"$(localedir)\" \
- -DDATADIR=\"$(pkgdatadir)\"
+ -DDATADIR=\"$(datadir)\" \
+ -DPACKAGE_DATADIR=\"$(pkgdatadir)\"
xfwm4_LDADD = \
@LIBSTARTUP_NOTIFICATION_LIBS@ \
diff --git a/src/parserc.c b/src/parserc.c
index 73edcc588..c905014a0 100644
--- a/src/parserc.c
+++ b/src/parserc.c
@@ -32,7 +32,7 @@
#include "settings.h"
#ifndef DEFAULT_THEME
-#define DEFAULT_THEME "default"
+#define DEFAULT_THEME "Default"
#endif
gboolean
@@ -162,7 +162,7 @@ setIntValueFromInt (const gchar * lvalue, int value, Settings rc[])
}
gchar *
-getThemeDir (const gchar * theme)
+getThemeDir (const gchar * theme, const gchar * file)
{
if (!theme)
{
@@ -183,25 +183,92 @@ getThemeDir (const gchar * theme)
}
else
{
- gchar *test = g_build_filename (g_get_home_dir (), G_DIR_SEPARATOR_S,
- ".themes",
+ /* First try, $HOME/.themes/<theme_name>/xfwm4/ */
+
+ gchar *test_dir = g_build_filename (g_get_home_dir (),
+ G_DIR_SEPARATOR_S, ".themes",
+ G_DIR_SEPARATOR_S, theme,
G_DIR_SEPARATOR_S, "xfwm4",
- G_DIR_SEPARATOR_S,
- theme, NULL);
- if (g_file_test (test, G_FILE_TEST_IS_DIR))
+ NULL);
+
+ gchar *test_file = g_build_filename (test_dir,
+ G_DIR_SEPARATOR_S, file,
+ NULL);
+
+ if (g_file_test (test_file, G_FILE_TEST_IS_REGULAR))
+ {
+ g_free (test_file);
+ return test_dir;
+ }
+
+#if 0
+ /* Second try, $HOME/.themes/xfwm4/<theme_name>/ */
+ g_free (test_file);
+ g_free (test_dir);
+
+ test_dir = g_build_filename (g_get_home_dir (),
+ G_DIR_SEPARATOR_S, ".themes",
+ G_DIR_SEPARATOR_S, "xfwm4",
+ G_DIR_SEPARATOR_S, theme,
+ NULL);
+
+ test_file = g_build_filename (test_dir,
+ G_DIR_SEPARATOR_S, file,
+ NULL);
+
+ if (g_file_test (test_file, G_FILE_TEST_IS_REGULAR))
+ {
+ g_free (test_file);
+ return test_dir;
+ }
+#endif
+
+ /* Third try, /usr/share/themes/<theme_name>/xfwm4/ */
+ g_free (test_file);
+ g_free (test_dir);
+
+ test_dir = g_build_filename (DATADIR,
+ G_DIR_SEPARATOR_S, "themes",
+ G_DIR_SEPARATOR_S, theme,
+ G_DIR_SEPARATOR_S, "xfwm4",
+ NULL);
+
+ test_file = g_build_filename (test_dir,
+ G_DIR_SEPARATOR_S, file,
+ NULL);
+
+ if (g_file_test (test_file, G_FILE_TEST_IS_REGULAR))
{
- return test;
+ g_free (test_file);
+ return test_dir;
}
- g_free (test);
- test =
- g_build_filename (DATADIR, G_DIR_SEPARATOR_S, "themes",
- G_DIR_SEPARATOR_S, theme, NULL);
- if (g_file_test (test, G_FILE_TEST_IS_DIR))
+
+#if 0
+ /* Fourth try, /usr/share/themes/xfwm4/<theme_name>/ */
+ g_free (test_file);
+ g_free (test_dir);
+
+ test_dir = g_build_filename (DATADIR,
+ G_DIR_SEPARATOR_S, "themes",
+ G_DIR_SEPARATOR_S, theme,
+ NULL);
+
+ test_file = g_build_filename (test_dir,
+ G_DIR_SEPARATOR_S, file,
+ NULL);
+
+ if (g_file_test (test_file, G_FILE_TEST_IS_REGULAR))
{
- return test;
+ g_free (test_file);
+ return test_dir;
}
- g_free (test);
+#endif
+
+ /* Pfew, really can't find that theme nowhere! */
+ g_free (test_file);
+ g_free (test_dir);
}
+
return g_build_filename (DATADIR, G_DIR_SEPARATOR_S, "themes",
G_DIR_SEPARATOR_S, DEFAULT_THEME, NULL);
}
diff --git a/src/parserc.h b/src/parserc.h
index 1171dab80..0f948cffe 100644
--- a/src/parserc.h
+++ b/src/parserc.h
@@ -34,7 +34,7 @@ gchar *getValue (const gchar *, Settings rc[]);
gboolean setValue (const gchar *, const gchar *, Settings rc[]);
gboolean setBooleanValueFromInt (const gchar *, int, Settings rc[]);
gboolean setIntValueFromInt (const gchar *, int, Settings rc[]);
-gchar *getThemeDir (const gchar *);
+gchar *getThemeDir (const gchar *, const gchar *);
void freeRc (Settings rc[]);
#endif /* INC_PARSERC_H */
diff --git a/src/settings.c b/src/settings.c
index dc48fa501..6af865d83 100644
--- a/src/settings.c
+++ b/src/settings.c
@@ -45,7 +45,9 @@
#define CHANNEL2 "margins"
#define CHANNEL3 "workspaces"
#define TOINT(x) (x ? atoi(x) : 0)
-#define DEFAULT_KEYTHEME "default.keys"
+#define DEFAULT_KEYTHEME "Default"
+#define KEYTHEMERC "keythemerc"
+#define THEMERC "themerc"
#define WS_SEP ';'
#define WS_SEP_S ";"
@@ -311,7 +313,7 @@ loadRcData (Settings rc[])
gchar *keytheme;
gchar *keythemevalue;
- if (!parseRc ("defaults", DATADIR, rc))
+ if (!parseRc ("defaults", PACKAGE_DATADIR, rc))
{
g_warning (_("%s: Missing defaults file"), progname);
exit (1);
@@ -319,8 +321,8 @@ loadRcData (Settings rc[])
keythemevalue = getValue ("keytheme", rc);
if (keythemevalue)
{
- keytheme = getThemeDir (keythemevalue);
- parseRc ("keythemerc", keytheme, rc);
+ keytheme = getThemeDir (keythemevalue, KEYTHEMERC);
+ parseRc (KEYTHEMERC, keytheme, rc);
g_free (keytheme);
}
parseRc ("xfwm4rc", homedir, rc);
@@ -511,8 +513,8 @@ loadTheme (Settings rc[])
rc[18].value = get_style (widget, "dark", "normal");
rc[19].value = get_style (widget, "mid", "normal");
- theme = getThemeDir (getValue ("theme", rc));
- parseRc ("themerc", theme, rc);
+ theme = getThemeDir (getValue ("theme", rc), THEMERC);
+ parseRc (THEMERC, theme, rc);
for (i = 0; i < 20; i++)
{
@@ -788,14 +790,14 @@ loadKeyBindings (Settings rc[])
keythemevalue = getValue ("keytheme", rc);
if (keythemevalue)
{
- keytheme = getThemeDir (keythemevalue);
- if (!parseRc ("keythemerc", keytheme, rc))
+ keytheme = getThemeDir (keythemevalue, KEYTHEMERC);
+ if (!parseRc (KEYTHEMERC, keytheme, rc))
{
g_warning (_("%s: specified key theme \"%s\" missing, using default"),
progname, keythemevalue);
g_free (keytheme);
- keytheme = getThemeDir (DEFAULT_KEYTHEME);
- parseRc ("keythemerc", keytheme, rc);
+ keytheme = getThemeDir (DEFAULT_KEYTHEME, KEYTHEMERC);
+ parseRc (KEYTHEMERC, keytheme, rc);
}
g_free (keytheme);
diff --git a/themes/Makefile.am b/themes/Makefile.am
index 0cb2b5060..461f1a4ea 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -6,5 +6,4 @@ SUBDIRS = \
default.keys \
default-4.0 \
opta \
- softwall \
synthetic
diff --git a/themes/Makefile.in b/themes/Makefile.in
index e1cd2ef81..974c15d64 100644
--- a/themes/Makefile.in
+++ b/themes/Makefile.in
@@ -210,7 +210,6 @@ SUBDIRS = \
default.keys \
default-4.0 \
opta \
- softwall \
synthetic
all: all-recursive
diff --git a/themes/default-4.0/Makefile.am b/themes/default-4.0/Makefile.am
index c86130f58..14d836510 100644
--- a/themes/default-4.0/Makefile.am
+++ b/themes/default-4.0/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(pkgdatadir)/themes/default-4.0
+themedir = $(datadir)/themes/Default-4.0/xfwm4
theme_DATA = README \
bottom-active.xpm \
bottom-inactive.xpm \
diff --git a/themes/default-4.0/Makefile.in b/themes/default-4.0/Makefile.in
index 45b72d257..1450dca42 100644
--- a/themes/default-4.0/Makefile.in
+++ b/themes/default-4.0/Makefile.in
@@ -197,7 +197,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-themedir = $(pkgdatadir)/themes/default-4.0
+themedir = $(datadir)/themes/Default-4.0/xfwm4
theme_DATA = README \
bottom-active.xpm \
bottom-inactive.xpm \
diff --git a/themes/default.keys/Makefile.am b/themes/default.keys/Makefile.am
index 2224f7f7d..8c5d4e91f 100644
--- a/themes/default.keys/Makefile.am
+++ b/themes/default.keys/Makefile.am
@@ -1,3 +1,3 @@
-themedir = $(pkgdatadir)/themes/default.keys
+themedir = $(datadir)/themes/Default/xfwm4
theme_DATA = keythemerc
EXTRA_DIST = $(theme_DATA)
diff --git a/themes/default.keys/Makefile.in b/themes/default.keys/Makefile.in
index ebc21f635..2bc5fadd8 100644
--- a/themes/default.keys/Makefile.in
+++ b/themes/default.keys/Makefile.in
@@ -197,7 +197,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-themedir = $(pkgdatadir)/themes/default.keys
+themedir = $(datadir)/themes/Default/xfwm4
theme_DATA = keythemerc
EXTRA_DIST = $(theme_DATA)
all: all-am
diff --git a/themes/default/Makefile.am b/themes/default/Makefile.am
index d1d58093d..e38e2a094 100644
--- a/themes/default/Makefile.am
+++ b/themes/default/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(pkgdatadir)/themes/default
+themedir = $(datadir)/themes/Default/xfwm4
theme_DATA = README \
bottom-active.xpm \
bottom-inactive.xpm \
diff --git a/themes/default/Makefile.in b/themes/default/Makefile.in
index 68d83ad05..9401d949b 100644
--- a/themes/default/Makefile.in
+++ b/themes/default/Makefile.in
@@ -197,7 +197,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-themedir = $(pkgdatadir)/themes/default
+themedir = $(datadir)/themes/Default/xfwm4
theme_DATA = README \
bottom-active.xpm \
bottom-inactive.xpm \
diff --git a/themes/default/bottom-active.xpm b/themes/default/bottom-active.xpm
index 463f05298..19a887c49 100644
--- a/themes/default/bottom-active.xpm
+++ b/themes/default/bottom-active.xpm
@@ -1,14 +1,13 @@
/* 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",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"};
+"32 4 6 1",
+" c None",
+". c #000000",
+"+ c #6EA0CD s active_hilight_2",
+"@ c #3E566B s active_shadow_2",
+"$ c #567B9C s active_mid_2",
+"# c #4C7BA6 s active_color_2",
+"################################",
+"################################",
+"################################",
+"................................"};
diff --git a/themes/default/bottom-inactive.xpm b/themes/default/bottom-inactive.xpm
index acac072dc..158b22b3d 100644
--- a/themes/default/bottom-inactive.xpm
+++ b/themes/default/bottom-inactive.xpm
@@ -1,14 +1,13 @@
/* 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",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$",
-"$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$"};
+"32 4 6 1",
+" c None",
+". c #000000",
+"+ c #6EA0CD s inactive_hilight_2",
+"@ c #3E566B s inactive_shadow_2",
+"$ c #567B9C s inactive_mid_2",
+"# c #4C7BA6 s inactive_color_2",
+"################################",
+"################################",
+"################################",
+"................................"};
diff --git a/themes/default/bottom-left-active.xpm b/themes/default/bottom-left-active.xpm
index 7464fa8ee..65731d2df 100644
--- a/themes/default/bottom-left-active.xpm
+++ b/themes/default/bottom-left-active.xpm
@@ -1,25 +1,25 @@
/* XPM */
static char * bottom_left_active_xpm[] = {
"16 16 6 1",
-" c None",
-"@ c #000000",
-". c #4B58A2 s active_shadow_2",
-"+ c #525FAB s active_color_2",
-"# c #FFFFFF s active_hilight_2",
-"$ c #848FD6 s active_mid_2",
-"@@+++ ",
-"@@+++ ",
-"@@+++ ",
-"@@+++ ",
-"@@+++ ",
-"@@+++ ",
-"@@+++ ",
-"@@+++ ",
-"@@+++ ",
-"@@+++ ",
-"@@$+++ ",
-"@@.+++++++++++++",
-" @@$++++++++++++",
-" @@@.$++++++++++",
-" @@@@@@@@@@@@@@",
-" @@@@@@@@@@@@"};
+" c None",
+". c #000000",
+"+ c #6EA0CD s active_hilight_2",
+"@ c #3E566B s active_shadow_2",
+"$ c #567B9C s active_mid_2",
+"# c #4C7BA6 s active_color_2",
+".### ",
+".### ",
+".### ",
+".### ",
+".### ",
+".### ",
+".### ",
+".### ",
+".### ",
+".### ",
+".### ",
+".@### ",
+" .##############",
+" .$#############",
+" ..@###########",
+" ............"};
diff --git a/themes/default/bottom-left-inactive.xpm b/themes/default/bottom-left-inactive.xpm
index b9b8edd09..052d357ea 100644
--- a/themes/default/bottom-left-inactive.xpm
+++ b/themes/default/bottom-left-inactive.xpm
@@ -1,25 +1,25 @@
/* XPM */
static char * bottom_left_inactive_xpm[] = {
"16 16 6 1",
-" c None",
-"@ c #000000",
-". c #4B58A2 s inactive_shadow_2",
-"+ c #525FAB s inactive_color_2",
-"# c #FFFFFF s inactive_hilight_2",
-"$ c #848FD6 s inactive_mid_2",
-"@@+++ ",
-"@@+++ ",
-"@@+++ ",
-"@@+++ ",
-"@@+++ ",
-"@@+++ ",
-"@@+++ ",
-"@@+++ ",
-"@@+++ ",
-"@@+++ ",
-"@@$+++ ",
-"@@.+++++++++++++",
-" @@$++++++++++++",
-" @@@.$++++++++++",
-" @@@@@@@@@@@@@@",
-" @@@@@@@@@@@@"};
+" c None",
+". c #000000",
+"+ c #6EA0CD s inactive_hilight_2",
+"@ c #3E566B s inactive_shadow_2",
+"$ c #567B9C s inactive_mid_2",
+"# c #4C7BA6 s inactive_color_2",
+".### ",
+".### ",
+".### ",
+".### ",
+".### ",
+".### ",
+".### ",
+".### ",
+".### ",
+".### ",
+".### ",
+".@### ",
+" .##############",
+" .$#############",
+" ..@###########",
+" ............"};
diff --git a/themes/default/bottom-right-active.xpm b/themes/default/bottom-right-active.xpm
index 8c8790498..c596ea8ee 100644
--- a/themes/default/bottom-right-active.xpm
+++ b/themes/default/bottom-right-active.xpm
@@ -1,25 +1,25 @@
/* XPM */
static char * bottom_right_active_xpm[] = {
"16 16 6 1",
-" c None",
-"@ c #000000",
-". c #4B58A2 s active_shadow_2",
-"+ c #525FAB s active_color_2",
-"# c #FFFFFF s active_hilight_2",
-"$ c #848FD6 s active_mid_2",
-" +++@@",
-" +++@@",
-" +++@@",
-" +++@@",
-" +++@@",
-" +++@@",
-" +++@@",
-" +++@@",
-" +++@@",
-" +++@@",
-" +++$@@",
-"+++++++++++++.@@",
-"++++++++++++$@@ ",
-"++++++++++$.@@@ ",
-"@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@ "};
+" c None",
+". c #000000",
+"+ c #6EA0CD s active_hilight_2",
+"@ c #3E566B s active_shadow_2",
+"$ c #567B9C s active_mid_2",
+"# c #4C7BA6 s active_color_2",
+" ###.",
+" ###.",
+" ###.",
+" ###.",
+" ###.",
+" ###.",
+" ###.",
+" ###.",
+" ###.",
+" ###.",
+" ###.",
+" ###@.",
+"##############. ",
+"#############$. ",
+"###########@.. ",
+"............ "};
diff --git a/themes/default/bottom-right-inactive.xpm b/themes/default/bottom-right-inactive.xpm
index b42b2d795..a6e825761 100644
--- a/themes/default/bottom-right-inactive.xpm
+++ b/themes/default/bottom-right-inactive.xpm
@@ -1,25 +1,25 @@
/* XPM */
static char * bottom_right_inactive_xpm[] = {
"16 16 6 1",
-" c None",
-"@ c #000000",
-". c #4B58A2 s inactive_shadow_2",
-"+ c #525FAB s inactive_color_2",
-"# c #FFFFFF s inactive_hilight_2",
-"$ c #848FD6 s inactive_mid_2",
-" +++@@",
-" +++@@",
-" +++@@",
-" +++@@",
-" +++@@",
-" +++@@",
-" +++@@",
-" +++@@",
-" +++@@",
-" +++@@",
-" +++$@@",
-"+++++++++++++.@@",
-"++++++++++++$@@ ",
-"++++++++++$.@@@ ",
-"@@@@@@@@@@@@@@ ",
-"@@@@@@@@@@@@ "};
+" c None",
+". c #000000",
+"+ c #6EA0CD s inactive_hilight_2",
+"@ c #3E566B s inactive_shadow_2",
+"$ c #567B9C s inactive_mid_2",
+"# c #4C7BA6 s inactive_color_2",
+" ###.",
+" ###.",
+" ###.",
+" ###.",
+" ###.",
+" ###.",
+" ###.",
+" ###.",
+" ###.",
+" ###.",
+" ###.",
+" ###@.",
+"##############. ",
+"#############$. ",
+"###########@.. ",
+"............ "};
diff --git a/themes/default/close-active.xpm b/themes/default/close-active.xpm
index 529306194..11095a325 100644
--- a/themes/default/close-active.xpm
+++ b/themes/default/close-active.xpm
@@ -13,14 +13,14 @@ static char * close_active_xpm[] = {
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
-"+@@@@##@@@@##@@@@+",
+"+@@@@.#@@@@#.@@@@+",
"+@@@@###@@###@@@@+",
"+@@@@@######@@@@@+",
"+@@@@@@####@@@@@@+",
"+@@@@@@####@@@@@@+",
"+@@@@@######@@@@@+",
"+@@@@###@@###@@@@+",
-"+@@@@##@@@@##@@@@+",
+"+@@@@.#@@@@#.@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
diff --git a/themes/default/close-inactive.xpm b/themes/default/close-inactive.xpm
index 91a055cfb..30fab764a 100644
--- a/themes/default/close-inactive.xpm
+++ b/themes/default/close-inactive.xpm
@@ -13,14 +13,14 @@ static char * close_inactive_xpm[] = {
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
-"+@@@@##@@@@##@@@@+",
+"+@@@@.#@@@@#.@@@@+",
"+@@@@###@@###@@@@+",
"+@@@@@######@@@@@+",
"+@@@@@@####@@@@@@+",
"+@@@@@@####@@@@@@+",
"+@@@@@######@@@@@+",
"+@@@@###@@###@@@@+",
-"+@@@@##@@@@##@@@@+",
+"+@@@@.#@@@@#.@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
diff --git a/themes/default/close-pressed.xpm b/themes/default/close-pressed.xpm
index b4695e445..76e672a2f 100644
--- a/themes/default/close-pressed.xpm
+++ b/themes/default/close-pressed.xpm
@@ -13,14 +13,14 @@ static char * close_pressed_xpm[] = {
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
-"+@@@@##@@@@##@@@@+",
+"+@@@@+#@@@@#+@@@@+",
"+@@@@###@@###@@@@+",
"+@@@@@######@@@@@+",
"+@@@@@@####@@@@@@+",
"+@@@@@@####@@@@@@+",
"+@@@@@######@@@@@+",
"+@@@@###@@###@@@@+",
-"+@@@@##@@@@##@@@@+",
+"+@@@@+#@@@@#+@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
diff --git a/themes/default/hide-active.xpm b/themes/default/hide-active.xpm
index d02b9cc68..255e843a1 100644
--- a/themes/default/hide-active.xpm
+++ b/themes/default/hide-active.xpm
@@ -15,13 +15,13 @@ static char * hide_active_xpm[] = {
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@.##.@@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@.##.@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
".+@@@@@@@@@@@@@@+.",
diff --git a/themes/default/hide-inactive.xpm b/themes/default/hide-inactive.xpm
index fe6ba7b81..b210513d3 100644
--- a/themes/default/hide-inactive.xpm
+++ b/themes/default/hide-inactive.xpm
@@ -15,13 +15,13 @@ static char * hide_inactive_xpm[] = {
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@.##.@@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@.##.@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
".+@@@@@@@@@@@@@@+.",
diff --git a/themes/default/hide-pressed.xpm b/themes/default/hide-pressed.xpm
index 2bde0c28b..25e118d8b 100644
--- a/themes/default/hide-pressed.xpm
+++ b/themes/default/hide-pressed.xpm
@@ -15,13 +15,13 @@ static char * hide_pressed_xpm[] = {
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@+##+@@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@####@@@@@@+",
+"+@@@@@@+##+@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
".+@@@@@@@@@@@@@@+.",
diff --git a/themes/default/left-active.xpm b/themes/default/left-active.xpm
index d6bc2654f..aead8bf71 100644
--- a/themes/default/left-active.xpm
+++ b/themes/default/left-active.xpm
@@ -1,41 +1,41 @@
/* XPM */
static char * left_active_xpm[] = {
-"5 32 6 1",
-" c None",
-". c #949595 s active_shadow_2",
-"+ c #FFFFFF s active_hilight_2",
-"# c #D5D6D5 s active_color_2",
-"* c #B4BAB5 s active_mid_2",
-"@ c #000000",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###"};
+"4 32 6 1",
+" c None",
+". c #000000",
+"+ c #6EA0CD s active_hilight_2",
+"@ c #3E566B s active_shadow_2",
+"$ c #567B9C s active_mid_2",
+"# c #4C7BA6 s active_color_2",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###"};
diff --git a/themes/default/left-inactive.xpm b/themes/default/left-inactive.xpm
index ae47b7a24..ae5b17081 100644
--- a/themes/default/left-inactive.xpm
+++ b/themes/default/left-inactive.xpm
@@ -1,41 +1,41 @@
/* XPM */
static char * left_inactive_xpm[] = {
-"5 32 6 1",
-" c None",
-". c #949595 s inactive_shadow_2",
-"+ c #FFFFFF s inactive_hilight_2",
-"# c #D5D6D5 s inactive_color_2",
-"* c #B4BAB5 s inactive_mid_2",
-"@ c #000000",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###",
-"@@###"};
+"4 32 6 1",
+" c None",
+". c #000000",
+"+ c #6EA0CD s inactive_hilight_2",
+"@ c #3E566B s inactive_shadow_2",
+"$ c #567B9C s inactive_mid_2",
+"# c #4C7BA6 s inactive_color_2",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###",
+".###"};
diff --git a/themes/default/maximize-active.xpm b/themes/default/maximize-active.xpm
index acf260aee..3614e2986 100644
--- a/themes/default/maximize-active.xpm
+++ b/themes/default/maximize-active.xpm
@@ -13,14 +13,14 @@ static char * maximize_active_xpm[] = {
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
+"+@@@@+######+@@@@+",
"+@@@@########@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
"+@@@@########@@@@+",
-"+@@@@########@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@########@@@@+",
+"+@@@@+######+@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
diff --git a/themes/default/maximize-inactive.xpm b/themes/default/maximize-inactive.xpm
index f97ecaf16..f55c59165 100644
--- a/themes/default/maximize-inactive.xpm
+++ b/themes/default/maximize-inactive.xpm
@@ -13,14 +13,14 @@ static char * maximize_inactive_xpm[] = {
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
+"+@@@@+######+@@@@+",
"+@@@@########@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
"+@@@@########@@@@+",
-"+@@@@########@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@########@@@@+",
+"+@@@@+######+@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
diff --git a/themes/default/maximize-pressed.xpm b/themes/default/maximize-pressed.xpm
index d7c3dc13a..118196bc8 100644
--- a/themes/default/maximize-pressed.xpm
+++ b/themes/default/maximize-pressed.xpm
@@ -13,14 +13,14 @@ static char * maximize_pressed_xpm[] = {
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
+"+@@@@+######+@@@@+",
"+@@@@########@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
+"+@@@@##@@@@##@@@@+",
"+@@@@########@@@@+",
-"+@@@@########@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@########@@@@+",
+"+@@@@+######+@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
diff --git a/themes/default/maximize-toggled-active.xpm b/themes/default/maximize-toggled-active.xpm
index 5eadc24af..cc05835c5 100644
--- a/themes/default/maximize-toggled-active.xpm
+++ b/themes/default/maximize-toggled-active.xpm
@@ -12,16 +12,16 @@ static char * maximize_toggled_active_xpm[] = {
".+@@@@@@@@@@@@@@+.",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@+#####+@@@+",
"+@@@@@@#######@@@+",
-"+@@@@@@#######@@@+",
-"+@@@@@@@@@@@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#@@@@@#@##@@@+",
-"+@@@#@@@@@#@@@@@@+",
-"+@@@#@@@@@#@@@@@@+",
+"+@@@@@@@@@@@##@@@+",
+"+@@@+#####+@##@@@+",
+"+@@@#######@##@@@+",
+"+@@@##@@@##@##@@@+",
+"+@@@##@@@##@#+@@@+",
+"+@@@##@@@##@@@@@@+",
"+@@@#######@@@@@@+",
+"+@@@+#####+@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
".+@@@@@@@@@@@@@@+.",
diff --git a/themes/default/maximize-toggled-inactive.xpm b/themes/default/maximize-toggled-inactive.xpm
index 3a4e7cd74..2216d843c 100644
--- a/themes/default/maximize-toggled-inactive.xpm
+++ b/themes/default/maximize-toggled-inactive.xpm
@@ -12,16 +12,16 @@ static char * maximize_toggled_inactive_xpm[] = {
".+@@@@@@@@@@@@@@+.",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@+#####+@@@+",
"+@@@@@@#######@@@+",
-"+@@@@@@#######@@@+",
-"+@@@@@@@@@@@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#@@@@@#@##@@@+",
-"+@@@#@@@@@#@@@@@@+",
-"+@@@#@@@@@#@@@@@@+",
+"+@@@@@@@@@@@##@@@+",
+"+@@@+#####+@##@@@+",
+"+@@@#######@##@@@+",
+"+@@@##@@@##@##@@@+",
+"+@@@##@@@##@#+@@@+",
+"+@@@##@@@##@@@@@@+",
"+@@@#######@@@@@@+",
+"+@@@+#####+@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
".+@@@@@@@@@@@@@@+.",
diff --git a/themes/default/maximize-toggled-pressed.xpm b/themes/default/maximize-toggled-pressed.xpm
index 3c32a00d7..aea656d35 100644
--- a/themes/default/maximize-toggled-pressed.xpm
+++ b/themes/default/maximize-toggled-pressed.xpm
@@ -12,16 +12,16 @@ static char * maximize_toggled_pressed_xpm[] = {
".+@@@@@@@@@@@@@@+.",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
+"+@@@@@@+#####+@@@+",
"+@@@@@@#######@@@+",
-"+@@@@@@#######@@@+",
-"+@@@@@@@@@@@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#@@@@@#@##@@@+",
-"+@@@#@@@@@#@@@@@@+",
-"+@@@#@@@@@#@@@@@@+",
+"+@@@@@@@@@@@##@@@+",
+"+@@@+#####+@##@@@+",
+"+@@@#######@##@@@+",
+"+@@@##@@@##@##@@@+",
+"+@@@##@@@##@#+@@@+",
+"+@@@##@@@##@@@@@@+",
"+@@@#######@@@@@@+",
+"+@@@+#####+@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
"+@@@@@@@@@@@@@@@@+",
".+@@@@@@@@@@@@@@+.",
diff --git a/themes/default/right-active.xpm b/themes/default/right-active.xpm
index 3433a6806..4a111ad3b 100644
--- a/themes/default/right-active.xpm
+++ b/themes/default/right-active.xpm
@@ -1,41 +1,41 @@
/* XPM */
static char * right_active_xpm[] = {
-"5 32 6 1",
-" c None",
-". c #949595 s active_shadow_2",
-"+ c #FFFFFF s active_hilight_2",
-"# c #D5D6D5 s active_color_2",
-"* c #B4BAB5 s active_mid_2",
-"@ c #000000",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@"};
+"4 32 6 1",
+" c None",
+". c #000000",
+"+ c #6EA0CD s active_hilight_2",
+"@ c #3E566B s active_shadow_2",
+"$ c #567B9C s active_mid_2",
+"# c #4C7BA6 s active_color_2",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###."};
diff --git a/themes/default/right-inactive.xpm b/themes/default/right-inactive.xpm
index 6dbac73d0..5ea30b720 100644
--- a/themes/default/right-inactive.xpm
+++ b/themes/default/right-inactive.xpm
@@ -1,41 +1,41 @@
/* XPM */
static char * right_inactive_xpm[] = {
-"5 32 6 1",
-" c None",
-". c #949595 s inactive_shadow_2",
-"+ c #FFFFFF s inactive_hilight_2",
-"# c #D5D6D5 s inactive_color_2",
-"* c #B4BAB5 s inactive_mid_2",
-"@ c #000000",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@",
-"###@@"};
+"4 32 6 1",
+" c None",
+". c #000000",
+"+ c #6EA0CD s inactive_hilight_2",
+"@ c #3E566B s inactive_shadow_2",
+"$ c #567B9C s inactive_mid_2",
+"# c #4C7BA6 s inactive_color_2",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###.",
+"###."};
diff --git a/themes/default/themerc b/themes/default/themerc
index 89b61f7da..1168c0f4b 100644
--- a/themes/default/themerc
+++ b/themes/default/themerc
@@ -1,5 +1,5 @@
button_offset=1
-button_spacing=1
+button_spacing=2
full_width_title=true
title_horizontal_offset=0
title_vertical_offset_active=3
diff --git a/themes/default/title-1-active.xpm b/themes/default/title-1-active.xpm
index 075679bbc..da72c70c9 100644
--- a/themes/default/title-1-active.xpm
+++ b/themes/default/title-1-active.xpm
@@ -2,32 +2,32 @@
static char * title_active_xpm[] = {
"8 24 6 1",
" c None",
-". c #4B58A2 s active_shadow_1",
+". c #000000",
"+ c #6EA0CD s active_hilight_1",
-"@ c #4C7BA6 s active_color_1",
-"# c #567B9C s active_mid_1",
-"$ c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
+"@ c #3E566B s active_shadow_1",
+"$ c #567B9C s active_mid_1",
+"# c #4C7BA6 s active_color_1",
+"........",
"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"########"};
+"++++++++",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"$$$$$$$$"};
diff --git a/themes/default/title-1-inactive.xpm b/themes/default/title-1-inactive.xpm
index 67f5035fb..638eff39b 100644
--- a/themes/default/title-1-inactive.xpm
+++ b/themes/default/title-1-inactive.xpm
@@ -2,32 +2,32 @@
static char * title_inactive_xpm[] = {
"8 24 6 1",
" c None",
-". c #4B58A2 s inactive_shadow_1",
-"+ c #FFFFFF s inactive_hilight_1",
-"@ c #4C7BA6 s inactive_color_1",
-"# c #567B9C s inactive_mid_1",
-"$ c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
+". c #000000",
+"+ c #6EA0CD s inactive_hilight_1",
+"@ c #3E566B s inactive_shadow_1",
+"$ c #567B9C s inactive_mid_1",
+"# c #4C7BA6 s inactive_color_1",
+"........",
"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"########"};
+"++++++++",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"$$$$$$$$"};
diff --git a/themes/default/title-2-active.xpm b/themes/default/title-2-active.xpm
index 075679bbc..da72c70c9 100644
--- a/themes/default/title-2-active.xpm
+++ b/themes/default/title-2-active.xpm
@@ -2,32 +2,32 @@
static char * title_active_xpm[] = {
"8 24 6 1",
" c None",
-". c #4B58A2 s active_shadow_1",
+". c #000000",
"+ c #6EA0CD s active_hilight_1",
-"@ c #4C7BA6 s active_color_1",
-"# c #567B9C s active_mid_1",
-"$ c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
+"@ c #3E566B s active_shadow_1",
+"$ c #567B9C s active_mid_1",
+"# c #4C7BA6 s active_color_1",
+"........",
"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"########"};
+"++++++++",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"$$$$$$$$"};
diff --git a/themes/default/title-2-inactive.xpm b/themes/default/title-2-inactive.xpm
index 67f5035fb..638eff39b 100644
--- a/themes/default/title-2-inactive.xpm
+++ b/themes/default/title-2-inactive.xpm
@@ -2,32 +2,32 @@
static char * title_inactive_xpm[] = {
"8 24 6 1",
" c None",
-". c #4B58A2 s inactive_shadow_1",
-"+ c #FFFFFF s inactive_hilight_1",
-"@ c #4C7BA6 s inactive_color_1",
-"# c #567B9C s inactive_mid_1",
-"$ c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
+". c #000000",
+"+ c #6EA0CD s inactive_hilight_1",
+"@ c #3E566B s inactive_shadow_1",
+"$ c #567B9C s inactive_mid_1",
+"# c #4C7BA6 s inactive_color_1",
+"........",
"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"########"};
+"++++++++",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"$$$$$$$$"};
diff --git a/themes/default/title-3-active.xpm b/themes/default/title-3-active.xpm
index 075679bbc..da72c70c9 100644
--- a/themes/default/title-3-active.xpm
+++ b/themes/default/title-3-active.xpm
@@ -2,32 +2,32 @@
static char * title_active_xpm[] = {
"8 24 6 1",
" c None",
-". c #4B58A2 s active_shadow_1",
+". c #000000",
"+ c #6EA0CD s active_hilight_1",
-"@ c #4C7BA6 s active_color_1",
-"# c #567B9C s active_mid_1",
-"$ c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
+"@ c #3E566B s active_shadow_1",
+"$ c #567B9C s active_mid_1",
+"# c #4C7BA6 s active_color_1",
+"........",
"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"########"};
+"++++++++",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"$$$$$$$$"};
diff --git a/themes/default/title-3-inactive.xpm b/themes/default/title-3-inactive.xpm
index 67f5035fb..638eff39b 100644
--- a/themes/default/title-3-inactive.xpm
+++ b/themes/default/title-3-inactive.xpm
@@ -2,32 +2,32 @@
static char * title_inactive_xpm[] = {
"8 24 6 1",
" c None",
-". c #4B58A2 s inactive_shadow_1",
-"+ c #FFFFFF s inactive_hilight_1",
-"@ c #4C7BA6 s inactive_color_1",
-"# c #567B9C s inactive_mid_1",
-"$ c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
+". c #000000",
+"+ c #6EA0CD s inactive_hilight_1",
+"@ c #3E566B s inactive_shadow_1",
+"$ c #567B9C s inactive_mid_1",
+"# c #4C7BA6 s inactive_color_1",
+"........",
"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"########"};
+"++++++++",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"$$$$$$$$"};
diff --git a/themes/default/title-4-active.xpm b/themes/default/title-4-active.xpm
index 075679bbc..da72c70c9 100644
--- a/themes/default/title-4-active.xpm
+++ b/themes/default/title-4-active.xpm
@@ -2,32 +2,32 @@
static char * title_active_xpm[] = {
"8 24 6 1",
" c None",
-". c #4B58A2 s active_shadow_1",
+". c #000000",
"+ c #6EA0CD s active_hilight_1",
-"@ c #4C7BA6 s active_color_1",
-"# c #567B9C s active_mid_1",
-"$ c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
+"@ c #3E566B s active_shadow_1",
+"$ c #567B9C s active_mid_1",
+"# c #4C7BA6 s active_color_1",
+"........",
"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"########"};
+"++++++++",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"$$$$$$$$"};
diff --git a/themes/default/title-4-inactive.xpm b/themes/default/title-4-inactive.xpm
index 67f5035fb..638eff39b 100644
--- a/themes/default/title-4-inactive.xpm
+++ b/themes/default/title-4-inactive.xpm
@@ -2,32 +2,32 @@
static char * title_inactive_xpm[] = {
"8 24 6 1",
" c None",
-". c #4B58A2 s inactive_shadow_1",
-"+ c #FFFFFF s inactive_hilight_1",
-"@ c #4C7BA6 s inactive_color_1",
-"# c #567B9C s inactive_mid_1",
-"$ c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
+". c #000000",
+"+ c #6EA0CD s inactive_hilight_1",
+"@ c #3E566B s inactive_shadow_1",
+"$ c #567B9C s inactive_mid_1",
+"# c #4C7BA6 s inactive_color_1",
+"........",
"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"########"};
+"++++++++",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"$$$$$$$$"};
diff --git a/themes/default/title-5-active.xpm b/themes/default/title-5-active.xpm
index 075679bbc..da72c70c9 100644
--- a/themes/default/title-5-active.xpm
+++ b/themes/default/title-5-active.xpm
@@ -2,32 +2,32 @@
static char * title_active_xpm[] = {
"8 24 6 1",
" c None",
-". c #4B58A2 s active_shadow_1",
+". c #000000",
"+ c #6EA0CD s active_hilight_1",
-"@ c #4C7BA6 s active_color_1",
-"# c #567B9C s active_mid_1",
-"$ c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
+"@ c #3E566B s active_shadow_1",
+"$ c #567B9C s active_mid_1",
+"# c #4C7BA6 s active_color_1",
+"........",
"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"########"};
+"++++++++",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"$$$$$$$$"};
diff --git a/themes/default/title-5-inactive.xpm b/themes/default/title-5-inactive.xpm
index 67f5035fb..638eff39b 100644
--- a/themes/default/title-5-inactive.xpm
+++ b/themes/default/title-5-inactive.xpm
@@ -2,32 +2,32 @@
static char * title_inactive_xpm[] = {
"8 24 6 1",
" c None",
-". c #4B58A2 s inactive_shadow_1",
-"+ c #FFFFFF s inactive_hilight_1",
-"@ c #4C7BA6 s inactive_color_1",
-"# c #567B9C s inactive_mid_1",
-"$ c #000000",
-"$$$$$$$$",
-"$$$$$$$$",
+". c #000000",
+"+ c #6EA0CD s inactive_hilight_1",
+"@ c #3E566B s inactive_shadow_1",
+"$ c #567B9C s inactive_mid_1",
+"# c #4C7BA6 s inactive_color_1",
+"........",
"++++++++",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"@@@@@@@@",
-"########"};
+"++++++++",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"########",
+"$$$$$$$$"};
diff --git a/themes/default/top-left-active.xpm b/themes/default/top-left-active.xpm
index ea26811ef..8740bdeef 100644
--- a/themes/default/top-left-active.xpm
+++ b/themes/default/top-left-active.xpm
@@ -1,33 +1,33 @@
/* XPM */
static char * top_left_active_xpm[] = {
-"7 24 6 1",
+"8 24 6 1",
" c None",
-". c #4B58A2 s active_shadow_1",
-"+ c #6EA0CD s active_hilight_1",
-"@ c #567B9C s active_mid_1",
-"# c #4C7BA6 s active_color_1",
-"$ c #000000",
-" $$$",
-" $$$$$",
-" $$$.++",
-" $$@+##",
-"$$.####",
-"$$@####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$@@@@@"};
+". c #000000",
+"+ c #6EA0CD s active_hilight_1",
+"@ c #3E566B s active_shadow_1",
+"# c #567B9C s active_mid_1",
+"$ c #4C7BA6 s active_color_1",
+" ....",
+" ..@+++",
+" .#$++++",
+" .$+$$$$",
+".@$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#######"};
diff --git a/themes/default/top-left-inactive.xpm b/themes/default/top-left-inactive.xpm
index 9b936ec37..f8db97308 100644
--- a/themes/default/top-left-inactive.xpm
+++ b/themes/default/top-left-inactive.xpm
@@ -1,33 +1,33 @@
/* XPM */
static char * top_left_inactive_xpm[] = {
-"7 24 6 1",
+"8 24 6 1",
" c None",
-". c #4B58A2 s inactive_shadow_1",
-"+ c #FFFFFF s inactive_hilight_1",
-"@ c #567B9C s inactive_mid_1",
-"# c #4C7BA6 s inactive_color_1",
-"$ c #000000",
-" $$$",
-" $$$$$",
-" $$$.++",
-" $$@+##",
-"$$.####",
-"$$@####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$#####",
-"$$@@@@@"};
+". c #000000",
+"+ c #6EA0CD s inactive_hilight_1",
+"@ c #3E566B s inactive_shadow_1",
+"# c #567B9C s inactive_mid_1",
+"$ c #4C7BA6 s inactive_color_1",
+" ....",
+" ..@+++",
+" .#$++++",
+" .$+$$$$",
+".@$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#$$$$$$",
+".#######"};
diff --git a/themes/default/top-right-active.xpm b/themes/default/top-right-active.xpm
index 1d9ce4fc2..495dbacf3 100644
--- a/themes/default/top-right-active.xpm
+++ b/themes/default/top-right-active.xpm
@@ -1,33 +1,33 @@
/* XPM */
static char * top_right_active_xpm[] = {
-"7 24 6 1",
+"8 24 6 1",
" c None",
-". c #4B58A2 s active_shadow_1",
-"+ c #6EA0CD s active_hilight_1",
-"@ c #567B9C s active_mid_1",
-"# c #4C7BA6 s active_color_1",
-"$ c #000000",
-"$$$ ",
-"$$$$$ ",
-"++.$$$ ",
-"##+@$$ ",
-"####.$$",
-"####@$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"@@@@@$$"};
+". c #000000",
+"+ c #6EA0CD s active_hilight_1",
+"@ c #3E566B s active_shadow_1",
+"# c #567B9C s active_mid_1",
+"$ c #4C7BA6 s active_color_1",
+".... ",
+"+++@.. ",
+"++++$#. ",
+"$$$$+$. ",
+"$$$$$$@.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"#######."};
diff --git a/themes/default/top-right-inactive.xpm b/themes/default/top-right-inactive.xpm
index 46e7bbe90..2e89d85bd 100644
--- a/themes/default/top-right-inactive.xpm
+++ b/themes/default/top-right-inactive.xpm
@@ -1,33 +1,33 @@
/* XPM */
static char * top_right_inactive_xpm[] = {
-"7 24 6 1",
+"8 24 6 1",
" c None",
-". c #4B58A2 s inactive_shadow_1",
-"+ c #FFFFFF s inactive_hilight_1",
-"@ c #567B9C s inactive_mid_1",
-"# c #4C7BA6 s inactive_color_1",
-"$ c #000000",
-"$$$ ",
-"$$$$$ ",
-"++.$$$ ",
-"##+@$$ ",
-"####.$$",
-"####@$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"#####$$",
-"@@@@@$$"};
+". c #000000",
+"+ c #6EA0CD s inactive_hilight_1",
+"@ c #3E566B s inactive_shadow_1",
+"# c #567B9C s inactive_mid_1",
+"$ c #4C7BA6 s inactive_color_1",
+".... ",
+"+++@.. ",
+"++++$#. ",
+"$$$$+$. ",
+"$$$$$$@.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"$$$$$$#.",
+"#######."};
diff --git a/themes/opta/Makefile.am b/themes/opta/Makefile.am
index b9a79962d..52467595c 100644
--- a/themes/opta/Makefile.am
+++ b/themes/opta/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(pkgdatadir)/themes/opta
+themedir = $(datadir)/themes/Opta/xfwm4
theme_DATA = README \
bottom-active.xpm \
bottom-inactive.xpm \
diff --git a/themes/opta/Makefile.in b/themes/opta/Makefile.in
index 58559b39e..c831a1ab3 100644
--- a/themes/opta/Makefile.in
+++ b/themes/opta/Makefile.in
@@ -197,7 +197,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-themedir = $(pkgdatadir)/themes/opta
+themedir = $(datadir)/themes/Opta/xfwm4
theme_DATA = README \
bottom-active.xpm \
bottom-inactive.xpm \
diff --git a/themes/softwall/Makefile.am b/themes/softwall/Makefile.am
deleted file mode 100644
index 05c8a6eb6..000000000
--- a/themes/softwall/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-themedir = $(pkgdatadir)/themes/softwall
-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/softwall/Makefile.in b/themes/softwall/Makefile.in
deleted file mode 100644
index 73b5c8632..000000000
--- a/themes/softwall/Makefile.in
+++ /dev/null
@@ -1,436 +0,0 @@
-# Makefile.in generated by automake 1.8.2 from Makefile.am.
-# @configure_input@
-
-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004 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@
-subdir = themes/softwall
-DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/X11.m4 \
- $(top_srcdir)/m4/debug.m4 $(top_srcdir)/m4/depends.m4 \
- $(top_srcdir)/m4/i18n.m4 $(top_srcdir)/configure.ac
-am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
- $(ACLOCAL_M4)
-mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-CONFIG_HEADER = $(top_builddir)/config.h
-CONFIG_CLEAN_FILES =
-SOURCES =
-DIST_SOURCES =
-am__installdirs = $(DESTDIR)$(themedir)
-themeDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(theme_DATA)
-DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-ACLOCAL = @ACLOCAL@
-AMDEP_FALSE = @AMDEP_FALSE@
-AMDEP_TRUE = @AMDEP_TRUE@
-AMTAR = @AMTAR@
-AR = @AR@
-AUTOCONF = @AUTOCONF@
-AUTOHEADER = @AUTOHEADER@
-AUTOMAKE = @AUTOMAKE@
-AWK = @AWK@
-CATALOGS = @CATALOGS@
-CATOBJEXT = @CATOBJEXT@
-CC = @CC@
-CCDEPMODE = @CCDEPMODE@
-CFLAGS = @CFLAGS@
-CPP = @CPP@
-CPPFLAGS = @CPPFLAGS@
-CXX = @CXX@
-CXXCPP = @CXXCPP@
-CXXDEPMODE = @CXXDEPMODE@
-CXXFLAGS = @CXXFLAGS@
-CYGPATH_W = @CYGPATH_W@
-DATADIRNAME = @DATADIRNAME@
-DEFS = @DEFS@
-DEPDIR = @DEPDIR@
-ECHO = @ECHO@
-ECHO_C = @ECHO_C@
-ECHO_N = @ECHO_N@
-ECHO_T = @ECHO_T@
-EGREP = @EGREP@
-EXEEXT = @EXEEXT@
-F77 = @F77@
-FFLAGS = @FFLAGS@
-GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
-GMOFILES = @GMOFILES@
-GMSGFMT = @GMSGFMT@
-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@
-RANDR_LIBS = @RANDR_LIBS@
-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_PLUGINSDIR = @XFCE_MCS_MANAGER_PLUGINSDIR@
-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_AR = @ac_ct_AR@
-ac_ct_CC = @ac_ct_CC@
-ac_ct_CXX = @ac_ct_CXX@
-ac_ct_F77 = @ac_ct_F77@
-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__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
-am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
-am__include = @am__include@
-am__leading_dot = @am__leading_dot@
-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@
-mkdir_p = @mkdir_p@
-oldincludedir = @oldincludedir@
-prefix = @prefix@
-program_transform_name = @program_transform_name@
-sbindir = @sbindir@
-sharedstatedir = @sharedstatedir@
-sysconfdir = @sysconfdir@
-target_alias = @target_alias@
-themedir = $(pkgdatadir)/themes/softwall
-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)
-all: all-am
-
-.SUFFIXES:
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
- @for dep in $?; do \
- case '$(am__configure_deps)' in \
- *$$dep*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
- && exit 0; \
- exit 1;; \
- esac; \
- done; \
- echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign themes/softwall/Makefile'; \
- cd $(top_srcdir) && \
- $(AUTOMAKE) --foreign themes/softwall/Makefile
-.PRECIOUS: Makefile
-Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
- @case '$?' in \
- *config.status*) \
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
- *) \
- echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
- cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
- esac;
-
-$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
- cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-
-mostlyclean-libtool:
- -rm -f *.lo
-
-clean-libtool:
- -rm -rf .libs _libs
-
-distclean-libtool:
- -rm -f libtool
-uninstall-info-am:
-install-themeDATA: $(theme_DATA)
- @$(NORMAL_INSTALL)
- $(mkdir_p) $(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:
-
-
-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"; \
- $(mkdir_p) "$(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:
- $(mkdir_p) $(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_sh_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 $(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
- -rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
-
-dvi: dvi-am
-
-dvi-am:
-
-html: html-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
- -rm -f Makefile
-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 html html-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/softwall/README b/themes/softwall/README
deleted file mode 100644
index 738999659..000000000
--- a/themes/softwall/README
+++ /dev/null
@@ -1,4 +0,0 @@
-softwall
---------
-
-A theme for xfwm4 that looks quite a lot like KDE plastik theme
diff --git a/themes/softwall/bottom-active.xpm b/themes/softwall/bottom-active.xpm
deleted file mode 100644
index d46f75c9f..000000000
--- a/themes/softwall/bottom-active.xpm
+++ /dev/null
@@ -1,15 +0,0 @@
-/* XPM */
-static char * bottom_active_xpm[] = {
-"32 5 7 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s active_hilight_1",
-"@ c #3E566B s active_shadow_1",
-"$ c #567B9C s active_mid_1",
-"# c #D5D6D5 s active_color_2",
-"% c #567B9C s active_mid_1",
-"################################",
-"################################",
-"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"................................"};
diff --git a/themes/softwall/bottom-inactive.xpm b/themes/softwall/bottom-inactive.xpm
deleted file mode 100644
index 43c3c9678..000000000
--- a/themes/softwall/bottom-inactive.xpm
+++ /dev/null
@@ -1,15 +0,0 @@
-/* XPM */
-static char * bottom_inactive_xpm[] = {
-"32 5 7 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s inactive_hilight_1",
-"@ c #3E566B s inactive_shadow_1",
-"$ c #567B9C s inactive_mid_1",
-"# c #D5D6D5 s inactive_color_2",
-"% c #567B9C s inactive_mid_1",
-"################################",
-"################################",
-"%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%",
-"@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@@",
-"................................"};
diff --git a/themes/softwall/bottom-left-active.xpm b/themes/softwall/bottom-left-active.xpm
deleted file mode 100644
index c7e17663a..000000000
--- a/themes/softwall/bottom-left-active.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * bottom_left_active_xpm[] = {
-"16 16 7 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s active_hilight_1",
-"@ c #3E566B s active_shadow_1",
-"$ c #567B9C s active_mid_1",
-"# c #D5D6D5 s active_color_2",
-"% c #567B9C s active_mid_1",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%#############",
-".@%#############",
-".@%%%%%%%%%%%%%%",
-".@@@@@@@@@@@@@@@",
-" ..............."};
diff --git a/themes/softwall/bottom-left-inactive.xpm b/themes/softwall/bottom-left-inactive.xpm
deleted file mode 100644
index cba63ff36..000000000
--- a/themes/softwall/bottom-left-inactive.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * bottom_left_inactive_xpm[] = {
-"16 16 7 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s inactive_hilight_1",
-"@ c #3E566B s inactive_shadow_1",
-"$ c #567B9C s inactive_mid_1",
-"# c #D5D6D5 s inactive_color_2",
-"% c #567B9C s inactive_mid_1",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%## ",
-".@%#############",
-".@%#############",
-".@%%%%%%%%%%%%%%",
-".@@@@@@@@@@@@@@@",
-" ..............."};
diff --git a/themes/softwall/bottom-right-active.xpm b/themes/softwall/bottom-right-active.xpm
deleted file mode 100644
index d1791fa9d..000000000
--- a/themes/softwall/bottom-right-active.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * bottom_right_active_xpm[] = {
-"16 16 7 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s active_hilight_1",
-"@ c #3E566B s active_shadow_1",
-"$ c #567B9C s active_mid_1",
-"# c #D5D6D5 s active_color_2",
-"% c #567B9C s active_mid_1",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-"#############%@.",
-"#############%@.",
-"%%%%%%%%%%%%%%@.",
-"@@@@@@@@@@@@@@@.",
-"............... "};
diff --git a/themes/softwall/bottom-right-inactive.xpm b/themes/softwall/bottom-right-inactive.xpm
deleted file mode 100644
index 9c94b1e35..000000000
--- a/themes/softwall/bottom-right-inactive.xpm
+++ /dev/null
@@ -1,26 +0,0 @@
-/* XPM */
-static char * bottom_right_inactive_xpm[] = {
-"16 16 7 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s inactive_hilight_1",
-"@ c #3E566B s inactive_shadow_1",
-"$ c #567B9C s inactive_mid_1",
-"# c #D5D6D5 s inactive_color_2",
-"% c #567B9C s inactive_mid_1",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-" ##%@.",
-"#############%@.",
-"#############%@.",
-"%%%%%%%%%%%%%%@.",
-"@@@@@@@@@@@@@@@.",
-"............... "};
diff --git a/themes/softwall/close-active.xpm b/themes/softwall/close-active.xpm
deleted file mode 100644
index 2dce7b2f1..000000000
--- a/themes/softwall/close-active.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * close_active_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #FFFFFF s active_hilight_1",
-"# c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/close-inactive.xpm b/themes/softwall/close-inactive.xpm
deleted file mode 100644
index fa6186496..000000000
--- a/themes/softwall/close-inactive.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * close_inactive_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s inactive_mid_1",
-"+ c #4B58A2 s inactive_shadow_1",
-"@ c #FFFFFF s inactive_hilight_1",
-"# c #949595 s inactive_shadow_1",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/close-pressed.xpm b/themes/softwall/close-pressed.xpm
deleted file mode 100644
index 8203b5ca2..000000000
--- a/themes/softwall/close-pressed.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * close_pressed_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #B4BAB5 s active_mid_1",
-"# c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@##@@@@##@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/hide-active.xpm b/themes/softwall/hide-active.xpm
deleted file mode 100644
index a7fdbd496..000000000
--- a/themes/softwall/hide-active.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * hide_active_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #FFFFFF s active_hilight_1",
-"# c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/hide-inactive.xpm b/themes/softwall/hide-inactive.xpm
deleted file mode 100644
index 8389ac4a6..000000000
--- a/themes/softwall/hide-inactive.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * hide_inactive_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s inactive_mid_1",
-"+ c #4B58A2 s inactive_shadow_1",
-"@ c #FFFFFF s inactive_hilight_1",
-"# c #949595 s inactive_shadow_1",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/hide-pressed.xpm b/themes/softwall/hide-pressed.xpm
deleted file mode 100644
index 53f452626..000000000
--- a/themes/softwall/hide-pressed.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * hide_pressed_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #B4BAB5 s active_mid_1",
-"# c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/left-active.xpm b/themes/softwall/left-active.xpm
deleted file mode 100644
index f061110b0..000000000
--- a/themes/softwall/left-active.xpm
+++ /dev/null
@@ -1,42 +0,0 @@
-/* XPM */
-static char * left_active_xpm[] = {
-"5 32 7 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s active_hilight_1",
-"@ c #3E566B s active_shadow_1",
-"$ c #567B9C s active_mid_1",
-"# c #D5D6D5 s active_color_2",
-"% c #567B9C s active_mid_1",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##"};
diff --git a/themes/softwall/left-inactive.xpm b/themes/softwall/left-inactive.xpm
deleted file mode 100644
index e06db260f..000000000
--- a/themes/softwall/left-inactive.xpm
+++ /dev/null
@@ -1,42 +0,0 @@
-/* XPM */
-static char * left_inactive_xpm[] = {
-"5 32 7 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s inactive_hilight_1",
-"@ c #3E566B s inactive_shadow_1",
-"$ c #567B9C s inactive_mid_1",
-"# c #D5D6D5 s inactive_color_2",
-"% c #567B9C s inactive_mid_1",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##",
-".@%##"};
diff --git a/themes/softwall/maximize-active.xpm b/themes/softwall/maximize-active.xpm
deleted file mode 100644
index 9e0bb5d75..000000000
--- a/themes/softwall/maximize-active.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * maximize_active_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #FFFFFF s active_hilight_1",
-"# c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@########@@@@+",
-"+@@@@########@@@@+",
-"+@@@@########@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@########@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/maximize-inactive.xpm b/themes/softwall/maximize-inactive.xpm
deleted file mode 100644
index 0f01bcb46..000000000
--- a/themes/softwall/maximize-inactive.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * maximize_inactive_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s inactive_mid_1",
-"+ c #4B58A2 s inactive_shadow_1",
-"@ c #FFFFFF s inactive_hilight_1",
-"# c #949595 s inactive_shadow_1",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@########@@@@+",
-"+@@@@########@@@@+",
-"+@@@@########@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@########@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/maximize-pressed.xpm b/themes/softwall/maximize-pressed.xpm
deleted file mode 100644
index 535efa972..000000000
--- a/themes/softwall/maximize-pressed.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * maximize_pressed_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #B4BAB5 s active_mid_1",
-"# c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@########@@@@+",
-"+@@@@########@@@@+",
-"+@@@@########@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@#@@@@@@#@@@@+",
-"+@@@@########@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/maximize-toggled-active.xpm b/themes/softwall/maximize-toggled-active.xpm
deleted file mode 100644
index 8503ea4f2..000000000
--- a/themes/softwall/maximize-toggled-active.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * maximize_toggled_active_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #FFFFFF s active_hilight_1",
-"# c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@#######@@@+",
-"+@@@@@@#######@@@+",
-"+@@@@@@@@@@@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#@@@@@#@##@@@+",
-"+@@@#@@@@@#@@@@@@+",
-"+@@@#@@@@@#@@@@@@+",
-"+@@@#######@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/maximize-toggled-inactive.xpm b/themes/softwall/maximize-toggled-inactive.xpm
deleted file mode 100644
index 475cf4caf..000000000
--- a/themes/softwall/maximize-toggled-inactive.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * maximize_toggled_inactive_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s inactive_mid_1",
-"+ c #4B58A2 s inactive_shadow_1",
-"@ c #FFFFFF s inactive_hilight_1",
-"# c #949595 s inactive_shadow_1",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@#######@@@+",
-"+@@@@@@#######@@@+",
-"+@@@@@@@@@@@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#@@@@@#@##@@@+",
-"+@@@#@@@@@#@@@@@@+",
-"+@@@#@@@@@#@@@@@@+",
-"+@@@#######@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/maximize-toggled-pressed.xpm b/themes/softwall/maximize-toggled-pressed.xpm
deleted file mode 100644
index 692f3a2fa..000000000
--- a/themes/softwall/maximize-toggled-pressed.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * maximize_toggled_pressed_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #B4BAB5 s active_mid_1",
-"# c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@#######@@@+",
-"+@@@@@@#######@@@+",
-"+@@@@@@@@@@@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#######@@#@@@+",
-"+@@@#@@@@@#@##@@@+",
-"+@@@#@@@@@#@@@@@@+",
-"+@@@#@@@@@#@@@@@@+",
-"+@@@#######@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/menu-active.xpm b/themes/softwall/menu-active.xpm
deleted file mode 100644
index b6d79fd2c..000000000
--- a/themes/softwall/menu-active.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * menu_active_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #FFFFFF s active_hilight_1",
-"# c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@#@@@@#@@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@########@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/menu-inactive.xpm b/themes/softwall/menu-inactive.xpm
deleted file mode 100644
index 90931f978..000000000
--- a/themes/softwall/menu-inactive.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * menu_inactive_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s inactive_mid_1",
-"+ c #4B58A2 s inactive_shadow_1",
-"@ c #FFFFFF s inactive_hilight_1",
-"# c #949595 s inactive_shadow_1",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@#@@@@#@@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@########@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/menu-pressed.xpm b/themes/softwall/menu-pressed.xpm
deleted file mode 100644
index 8692ea1fe..000000000
--- a/themes/softwall/menu-pressed.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * menu_pressed_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #B4BAB5 s active_mid_1",
-"# c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@#@@@@#@@@@@+",
-"+@@@@###@@###@@@@+",
-"+@@@@########@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/right-active.xpm b/themes/softwall/right-active.xpm
deleted file mode 100644
index d0178a49c..000000000
--- a/themes/softwall/right-active.xpm
+++ /dev/null
@@ -1,42 +0,0 @@
-/* XPM */
-static char * right_active_xpm[] = {
-"5 32 7 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s active_hilight_1",
-"@ c #3E566B s active_shadow_1",
-"$ c #567B9C s active_mid_1",
-"# c #D5D6D5 s active_color_2",
-"% c #567B9C s active_mid_1",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@."};
diff --git a/themes/softwall/right-inactive.xpm b/themes/softwall/right-inactive.xpm
deleted file mode 100644
index 7574cd684..000000000
--- a/themes/softwall/right-inactive.xpm
+++ /dev/null
@@ -1,42 +0,0 @@
-/* XPM */
-static char * right_inactive_xpm[] = {
-"5 32 7 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s inactive_hilight_1",
-"@ c #3E566B s inactive_shadow_1",
-"$ c #567B9C s inactive_mid_1",
-"# c #D5D6D5 s inactive_color_2",
-"% c #567B9C s inactive_mid_1",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@.",
-"##%@."};
diff --git a/themes/softwall/shade-active.xpm b/themes/softwall/shade-active.xpm
deleted file mode 100644
index 9fdfe04ed..000000000
--- a/themes/softwall/shade-active.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * shade_active_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #FFFFFF s active_hilight_1",
-"# c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@########@@@@+",
-"+@@@@##@##@##@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/shade-inactive.xpm b/themes/softwall/shade-inactive.xpm
deleted file mode 100644
index 96dff3710..000000000
--- a/themes/softwall/shade-inactive.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * shade_inactive_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s inactive_mid_1",
-"+ c #4B58A2 s inactive_shadow_1",
-"@ c #FFFFFF s inactive_hilight_1",
-"# c #949595 s inactive_shadow_1",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@########@@@@+",
-"+@@@@##@##@##@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/shade-pressed.xpm b/themes/softwall/shade-pressed.xpm
deleted file mode 100644
index 5304a3de9..000000000
--- a/themes/softwall/shade-pressed.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * shade_pressed_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #B4BAB5 s active_mid_1",
-"# c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@########@@@@+",
-"+@@@@##@##@##@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/shade-toggled-active.xpm b/themes/softwall/shade-toggled-active.xpm
deleted file mode 100644
index c63da1a76..000000000
--- a/themes/softwall/shade-toggled-active.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * shade_toggled_active_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #FFFFFF s active_hilight_1",
-"# c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@##@##@##@@@@+",
-"+@@@@########@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/shade-toggled-inactive.xpm b/themes/softwall/shade-toggled-inactive.xpm
deleted file mode 100644
index b0984863c..000000000
--- a/themes/softwall/shade-toggled-inactive.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * shade_toggled_inactive_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s inactive_mid_1",
-"+ c #4B58A2 s inactive_shadow_1",
-"@ c #FFFFFF s inactive_hilight_1",
-"# c #949595 s inactive_shadow_1",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@##@##@##@@@@+",
-"+@@@@########@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/shade-toggled-pressed.xpm b/themes/softwall/shade-toggled-pressed.xpm
deleted file mode 100644
index 51498ff4d..000000000
--- a/themes/softwall/shade-toggled-pressed.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * shade_toggled_pressed_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #B4BAB5 s active_mid_1",
-"# c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@##@##@##@@@@+",
-"+@@@@########@@@@+",
-"+@@@@@######@@@@@+",
-"+@@@@@@####@@@@@@+",
-"+@@@@@@@##@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/stick-active.xpm b/themes/softwall/stick-active.xpm
deleted file mode 100644
index 5041b5a1d..000000000
--- a/themes/softwall/stick-active.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * stick_active_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #FFFFFF s active_hilight_1",
-"$ c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@.$$$$.@@@@@+",
-"+@@@@.$$$$$$.@@@@+",
-"+@@@@$$.@@.$$@@@@+",
-"+@@@@$$@@@@$$@@@@+",
-"+@@@@$$@@@@$$@@@@+",
-"+@@@@$$.@@.$$@@@@+",
-"+@@@@.$$$$$$.@@@@+",
-"+@@@@@.$$$$.@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/stick-inactive.xpm b/themes/softwall/stick-inactive.xpm
deleted file mode 100644
index fc053594d..000000000
--- a/themes/softwall/stick-inactive.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * stick_inactive_xpm[] = {
-"18 21 6 1",
-" c None",
-". c #567B9C s inactive_mid_1",
-"+ c #4B58A2 s inactive_shadow_1",
-"@ c #FFFFFF s inactive_hilight_1",
-"# c #B4BAB5 s inactive_mid_1",
-"$ c #949595 s inactive_shadow_1",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@$$#@@#$$@@@@+",
-"+@@@@$$@@@@$$@@@@+",
-"+@@@@$$@@@@$$@@@@+",
-"+@@@@$$#@@#$$@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/stick-pressed.xpm b/themes/softwall/stick-pressed.xpm
deleted file mode 100644
index af5fe9767..000000000
--- a/themes/softwall/stick-pressed.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * stick_pressed_xpm[] = {
-"18 21 6 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #B4BAB5 s active_mid_1",
-"# c #949595 s active_shadow_1",
-"$ c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@$$#@@#$$@@@@+",
-"+@@@@$$@@@@$$@@@@+",
-"+@@@@$$@@@@$$@@@@+",
-"+@@@@$$#@@#$$@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/stick-toggled-active.xpm b/themes/softwall/stick-toggled-active.xpm
deleted file mode 100644
index 43b024553..000000000
--- a/themes/softwall/stick-toggled-active.xpm
+++ /dev/null
@@ -1,29 +0,0 @@
-/* XPM */
-static char * stick_toggled_active_xpm[] = {
-"18 21 5 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #FFFFFF s active_hilight_1",
-"$ c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@.$$$$.@@@@@+",
-"+@@@@.$$$$$$.@@@@+",
-"+@@@@$$.@@.$$@@@@+",
-"+@@@@$$@$$@$$@@@@+",
-"+@@@@$$@$$@$$@@@@+",
-"+@@@@$$.@@.$$@@@@+",
-"+@@@@.$$$$$$.@@@@+",
-"+@@@@@.$$$$.@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/stick-toggled-inactive.xpm b/themes/softwall/stick-toggled-inactive.xpm
deleted file mode 100644
index ac4bf51ef..000000000
--- a/themes/softwall/stick-toggled-inactive.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * stick_toggled_inactive_xpm[] = {
-"18 21 6 1",
-" c None",
-". c #567B9C s inactive_mid_1",
-"+ c #4B58A2 s inactive_shadow_1",
-"@ c #FFFFFF s inactive_hilight_1",
-"# c #B4BAB5 s inactive_mid_1",
-"$ c #949595 s inactive_shadow_1",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@$$#@@#$$@@@@+",
-"+@@@@$$@$$@$$@@@@+",
-"+@@@@$$@$$@$$@@@@+",
-"+@@@@$$#@@#$$@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/stick-toggled-pressed.xpm b/themes/softwall/stick-toggled-pressed.xpm
deleted file mode 100644
index e1fab3371..000000000
--- a/themes/softwall/stick-toggled-pressed.xpm
+++ /dev/null
@@ -1,30 +0,0 @@
-/* XPM */
-static char * stick_toggled_pressed_xpm[] = {
-"18 21 6 1",
-" c None",
-". c #567B9C s active_mid_1",
-"+ c #4B58A2 s active_shadow_1",
-"@ c #B4BAB5 s active_mid_1",
-"# c #949595 s active_shadow_1",
-"$ c #000000",
-" ",
-" ",
-" ",
-" .++++++++++++++. ",
-".+@@@@@@@@@@@@@@+.",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@$$#@@#$$@@@@+",
-"+@@@@$$@$$@$$@@@@+",
-"+@@@@$$@$$@$$@@@@+",
-"+@@@@$$#@@#$$@@@@+",
-"+@@@@#$$$$$$#@@@@+",
-"+@@@@@#$$$$#@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-"+@@@@@@@@@@@@@@@@+",
-".+@@@@@@@@@@@@@@+.",
-" .++++++++++++++. "};
diff --git a/themes/softwall/themerc b/themes/softwall/themerc
deleted file mode 100644
index 09205da9c..000000000
--- a/themes/softwall/themerc
+++ /dev/null
@@ -1,10 +0,0 @@
-#active_text_color=#FFFFFF
-button_offset=2
-button_spacing=2
-full_width_title=true
-title_horizontal_offset=0
-title_vertical_offset_active=3
-title_vertical_offset_inactive=3
-#title_shadow_active=true
-title_shadow_active=false
-title_shadow_inactive=false
diff --git a/themes/softwall/title-1-active.xpm b/themes/softwall/title-1-active.xpm
deleted file mode 100644
index 6b5cbc09d..000000000
--- a/themes/softwall/title-1-active.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * title_active_xpm[] = {
-"8 25 6 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s active_hilight_1",
-"@ c #3E566B s active_shadow_1",
-"$ c #567B9C s active_mid_1",
-"# c #4C7BA6 s active_color_1",
-"........",
-"++++++++",
-"++++++++",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########"};
diff --git a/themes/softwall/title-1-inactive.xpm b/themes/softwall/title-1-inactive.xpm
deleted file mode 100644
index 816d1daf4..000000000
--- a/themes/softwall/title-1-inactive.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * title_inactive_xpm[] = {
-"8 25 6 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s inactive_hilight_1",
-"@ c #3E566B s inactive_shadow_1",
-"$ c #567B9C s inactive_mid_1",
-"# c #4C7BA6 s inactive_color_1",
-"........",
-"++++++++",
-"++++++++",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########"};
diff --git a/themes/softwall/title-2-active.xpm b/themes/softwall/title-2-active.xpm
deleted file mode 100644
index 6b5cbc09d..000000000
--- a/themes/softwall/title-2-active.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * title_active_xpm[] = {
-"8 25 6 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s active_hilight_1",
-"@ c #3E566B s active_shadow_1",
-"$ c #567B9C s active_mid_1",
-"# c #4C7BA6 s active_color_1",
-"........",
-"++++++++",
-"++++++++",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########"};
diff --git a/themes/softwall/title-2-inactive.xpm b/themes/softwall/title-2-inactive.xpm
deleted file mode 100644
index 816d1daf4..000000000
--- a/themes/softwall/title-2-inactive.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * title_inactive_xpm[] = {
-"8 25 6 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s inactive_hilight_1",
-"@ c #3E566B s inactive_shadow_1",
-"$ c #567B9C s inactive_mid_1",
-"# c #4C7BA6 s inactive_color_1",
-"........",
-"++++++++",
-"++++++++",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########"};
diff --git a/themes/softwall/title-3-active.xpm b/themes/softwall/title-3-active.xpm
deleted file mode 100644
index 6b5cbc09d..000000000
--- a/themes/softwall/title-3-active.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * title_active_xpm[] = {
-"8 25 6 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s active_hilight_1",
-"@ c #3E566B s active_shadow_1",
-"$ c #567B9C s active_mid_1",
-"# c #4C7BA6 s active_color_1",
-"........",
-"++++++++",
-"++++++++",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########"};
diff --git a/themes/softwall/title-3-inactive.xpm b/themes/softwall/title-3-inactive.xpm
deleted file mode 100644
index 816d1daf4..000000000
--- a/themes/softwall/title-3-inactive.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * title_inactive_xpm[] = {
-"8 25 6 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s inactive_hilight_1",
-"@ c #3E566B s inactive_shadow_1",
-"$ c #567B9C s inactive_mid_1",
-"# c #4C7BA6 s inactive_color_1",
-"........",
-"++++++++",
-"++++++++",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########"};
diff --git a/themes/softwall/title-4-active.xpm b/themes/softwall/title-4-active.xpm
deleted file mode 100644
index 6b5cbc09d..000000000
--- a/themes/softwall/title-4-active.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * title_active_xpm[] = {
-"8 25 6 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s active_hilight_1",
-"@ c #3E566B s active_shadow_1",
-"$ c #567B9C s active_mid_1",
-"# c #4C7BA6 s active_color_1",
-"........",
-"++++++++",
-"++++++++",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########"};
diff --git a/themes/softwall/title-4-inactive.xpm b/themes/softwall/title-4-inactive.xpm
deleted file mode 100644
index 816d1daf4..000000000
--- a/themes/softwall/title-4-inactive.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * title_inactive_xpm[] = {
-"8 25 6 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s inactive_hilight_1",
-"@ c #3E566B s inactive_shadow_1",
-"$ c #567B9C s inactive_mid_1",
-"# c #4C7BA6 s inactive_color_1",
-"........",
-"++++++++",
-"++++++++",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########"};
diff --git a/themes/softwall/title-5-active.xpm b/themes/softwall/title-5-active.xpm
deleted file mode 100644
index 6b5cbc09d..000000000
--- a/themes/softwall/title-5-active.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * title_active_xpm[] = {
-"8 25 6 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s active_hilight_1",
-"@ c #3E566B s active_shadow_1",
-"$ c #567B9C s active_mid_1",
-"# c #4C7BA6 s active_color_1",
-"........",
-"++++++++",
-"++++++++",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########"};
diff --git a/themes/softwall/title-5-inactive.xpm b/themes/softwall/title-5-inactive.xpm
deleted file mode 100644
index 816d1daf4..000000000
--- a/themes/softwall/title-5-inactive.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * title_inactive_xpm[] = {
-"8 25 6 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s inactive_hilight_1",
-"@ c #3E566B s inactive_shadow_1",
-"$ c #567B9C s inactive_mid_1",
-"# c #4C7BA6 s inactive_color_1",
-"........",
-"++++++++",
-"++++++++",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########",
-"########"};
diff --git a/themes/softwall/top-left-active.xpm b/themes/softwall/top-left-active.xpm
deleted file mode 100644
index efad61b15..000000000
--- a/themes/softwall/top-left-active.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * top_left_active_xpm[] = {
-"8 25 6 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s active_hilight_1",
-"@ c #3E566B s active_shadow_1",
-"# c #567B9C s active_mid_1",
-"$ c #4C7BA6 s active_color_1",
-" ....",
-" ..#$++",
-" .@+++++",
-" .##$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$"};
diff --git a/themes/softwall/top-left-inactive.xpm b/themes/softwall/top-left-inactive.xpm
deleted file mode 100644
index 1d62f65e2..000000000
--- a/themes/softwall/top-left-inactive.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * top_left_inactive_xpm[] = {
-"8 25 6 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s inactive_hilight_1",
-"@ c #3E566B s inactive_shadow_1",
-"# c #567B9C s inactive_mid_1",
-"$ c #4C7BA6 s inactive_color_1",
-" ....",
-" ..#$++",
-" .@+++++",
-" .##$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$",
-".@#$$$$$"};
diff --git a/themes/softwall/top-right-active.xpm b/themes/softwall/top-right-active.xpm
deleted file mode 100644
index 3480f7835..000000000
--- a/themes/softwall/top-right-active.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * top_right_active_xpm[] = {
-"8 25 6 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s active_hilight_1",
-"@ c #3E566B s active_shadow_1",
-"# c #567B9C s active_mid_1",
-"$ c #4C7BA6 s active_color_1",
-".... ",
-"++$#.. ",
-"+++++@. ",
-"$$$$##. ",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@."};
diff --git a/themes/softwall/top-right-inactive.xpm b/themes/softwall/top-right-inactive.xpm
deleted file mode 100644
index b1eed0c04..000000000
--- a/themes/softwall/top-right-inactive.xpm
+++ /dev/null
@@ -1,34 +0,0 @@
-/* XPM */
-static char * top_right_inactive_xpm[] = {
-"8 25 6 1",
-" c None",
-". c #000000",
-"+ c #6EA0CD s inactive_hilight_1",
-"@ c #3E566B s inactive_shadow_1",
-"# c #567B9C s inactive_mid_1",
-"$ c #4C7BA6 s inactive_color_1",
-".... ",
-"++$#.. ",
-"+++++@. ",
-"$$$$##. ",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@.",
-"$$$$$#@."};
diff --git a/themes/synthetic/Makefile.am b/themes/synthetic/Makefile.am
index 2465d37b0..e2daaf24a 100644
--- a/themes/synthetic/Makefile.am
+++ b/themes/synthetic/Makefile.am
@@ -1,4 +1,4 @@
-themedir = $(pkgdatadir)/themes/synthetic
+themedir = $(datadir)/themes/Synthetic/xfwm4
theme_DATA = README \
bottom-active.xpm \
bottom-inactive.xpm \
diff --git a/themes/synthetic/Makefile.in b/themes/synthetic/Makefile.in
index b3bf8ff47..24aa681a7 100644
--- a/themes/synthetic/Makefile.in
+++ b/themes/synthetic/Makefile.in
@@ -197,7 +197,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
-themedir = $(pkgdatadir)/themes/synthetic
+themedir = $(datadir)/themes/Synthetic/xfwm4
theme_DATA = README \
bottom-active.xpm \
bottom-inactive.xpm \
--
GitLab