15 files changed, 2 insertions, 15 deletions
diff --git a/themes/Makefile.am b/themes/Makefile.am
index 2a4e6b7a..9bcd07c9 100644
--- a/themes/Makefile.am
+++ b/themes/Makefile.am
@@ -1,5 +1,7 @@
 themedir=$(datadir)/openbox/themes
 
+SUBDIRS=ebox_data fieron_data fieron2_data
+
 theme_DATA=artwiz bbs bluebox cthulhain deep ebox fieron fieron2 flux frobozz \
            frobust mbdtex miklos nyz nyzclone ob20 operation outcomes paper \
            purplehaaze shade steelblue steelblue2 the_orange trisb twice \
diff --git a/themes/ebox_buttons/bulletbc.xbm b/themes/ebox_buttons/bulletbc.xbm
deleted file mode 100644
index f74daa69..00000000
--- a/themes/ebox_buttons/bulletbc.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Created with The GIMP */
-#define bulletbc_width 8
-#define bulletbc_height 8
-static unsigned char bulletbc_bits[] = {
-   0x00, 0x04, 0x0e, 0x1c, 0x3c, 0x1c, 0x0e, 0x04 };
diff --git a/themes/ebox_buttons/bulletl.xbm b/themes/ebox_buttons/bulletl.xbm
deleted file mode 100644
index b136694e..00000000
--- a/themes/ebox_buttons/bulletl.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Created with The GIMP */
-#define bulletl_width 8
-#define bulletl_height 8
-static unsigned char bulletl_bits[] = {
-   0x00, 0x20, 0x70, 0x38, 0x3c, 0x38, 0x70, 0x20 };
diff --git a/themes/ebox_buttons/bulletr.xbm b/themes/ebox_buttons/bulletr.xbm
deleted file mode 100644
index 5b2d6fd3..00000000
--- a/themes/ebox_buttons/bulletr.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-/* Created with The GIMP */
-#define bulletr_width 8
-#define bulletr_height 8
-static unsigned char bulletr_bits[] = {
-   0x00, 0x04, 0x0e, 0x1c, 0x3c, 0x1c, 0x0e, 0x04 };
diff --git a/themes/ebox_buttons/close.xbm b/themes/ebox_data/close.xbm
index a97c5334..a97c5334 100644
--- a/themes/ebox_buttons/close.xbm
+++ b/themes/ebox_data/close.xbm
diff --git a/themes/ebox_buttons/icon.xbm b/themes/ebox_data/iconify.xbm
index 38d8f73a..38d8f73a 100644
--- a/themes/ebox_buttons/icon.xbm
+++ b/themes/ebox_data/iconify.xbm
diff --git a/themes/ebox_buttons/max.xbm b/themes/ebox_data/max.xbm
index f143a223..f143a223 100644
--- a/themes/ebox_buttons/max.xbm
+++ b/themes/ebox_data/max.xbm
diff --git a/themes/fieron2_buttons/close.xbm b/themes/fieron2_data/close.xbm
index aea54882..aea54882 100644
--- a/themes/fieron2_buttons/close.xbm
+++ b/themes/fieron2_data/close.xbm
diff --git a/themes/fieron2_buttons/icon.xbm b/themes/fieron2_data/iconify.xbm
index 1cd40fcd..1cd40fcd 100644
--- a/themes/fieron2_buttons/icon.xbm
+++ b/themes/fieron2_data/iconify.xbm
diff --git a/themes/fieron2_buttons/max.xbm b/themes/fieron2_data/max.xbm
index 2cd94e84..2cd94e84 100644
--- a/themes/fieron2_buttons/max.xbm
+++ b/themes/fieron2_data/max.xbm
diff --git a/themes/fieron2_buttons/stick.xbm b/themes/fieron2_data/stick.xbm
index 4345dfab..4345dfab 100644
--- a/themes/fieron2_buttons/stick.xbm
+++ b/themes/fieron2_data/stick.xbm
diff --git a/themes/fieron_buttons/close.xbm b/themes/fieron_data/close.xbm
index aea54882..aea54882 100644
--- a/themes/fieron_buttons/close.xbm
+++ b/themes/fieron_data/close.xbm
diff --git a/themes/fieron_buttons/icon.xbm b/themes/fieron_data/iconify.xbm
index 1cd40fcd..1cd40fcd 100644
--- a/themes/fieron_buttons/icon.xbm
+++ b/themes/fieron_data/iconify.xbm
diff --git a/themes/fieron_buttons/max.xbm b/themes/fieron_data/max.xbm
index 2cd94e84..2cd94e84 100644
--- a/themes/fieron_buttons/max.xbm
+++ b/themes/fieron_data/max.xbm
diff --git a/themes/fieron_buttons/stick.xbm b/themes/fieron_data/stick.xbm
index 4345dfab..4345dfab 100644
--- a/themes/fieron_buttons/stick.xbm
+++ b/themes/fieron_data/stick.xbm