deleting duplicate subtle config

466 files changed, 0 insertions, 4259 deletions

diff --git a/subtle/icons/COPYING b/subtle/icons/COPYING
deleted file mode 100644
index 92c6b0d..0000000
--- a/subtle/icons/COPYING
+++ /dev/null
@@ -1,9 +0,0 @@
-This work is licensed under the Creative Commons Attribution-ShareAlike 3.0 Unported License.
-
-To view a copy of this license, visit http://creativecommons.org/licenses/by-sa/3.0/ or send a letter to
-
-Creative Commons
-171 Second Street
-Suite 300
-San Francisco, California
-94105, USA
diff --git a/subtle/icons/ac.xbm b/subtle/icons/ac.xbm
deleted file mode 100755
index b6dacef..0000000
--- a/subtle/icons/ac.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define ac_width 8
-#define ac_height 8
-static unsigned char ac_bits[] = {
- 0xFF, 0xF8, 0xF0, 0xF6, 0x6F, 0x0F, 0x1F, 0xFF };
diff --git a/subtle/icons/ac1.xbm b/subtle/icons/ac1.xbm
deleted file mode 100644
index 1d20383..0000000
--- a/subtle/icons/ac1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define ac_width 9
-#define ac_height 9
-static unsigned char ac_bits[] = {
-   0x30, 0x00, 0x28, 0x00, 0xe4, 0x00, 0x24, 0x00, 0x27, 0x00, 0x24, 0x00,
-   0xe4, 0x00, 0x28, 0x00, 0x30, 0x00 };
diff --git a/subtle/icons/ac2.xbm b/subtle/icons/ac2.xbm
deleted file mode 100644
index e13d3d4..0000000
--- a/subtle/icons/ac2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define ac2_width 9
-#define ac2_height 9
-static unsigned char ac2_bits[] = {
-   0x40, 0x00, 0x20, 0x00, 0x1c, 0x01, 0xa4, 0x00, 0x44, 0x00, 0x46, 0x00,
-   0x7a, 0x00, 0x0e, 0x00, 0x01, 0x00 };
diff --git a/subtle/icons/ac_01.xbm b/subtle/icons/ac_01.xbm
deleted file mode 100755
index 66592d7..0000000
--- a/subtle/icons/ac_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define ac_01_width 8
-#define ac_01_height 8
-static unsigned char ac_01_bits[] = {
- 0x30, 0x28, 0xE4, 0x27, 0x27, 0xE4, 0x28, 0x30 };
diff --git a/subtle/icons/arch.xbm b/subtle/icons/arch.xbm
deleted file mode 100755
index 11cfe5a..0000000
--- a/subtle/icons/arch.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define arch_width 8
-#define arch_height 8
-static unsigned char arch_bits[] = {
- 0x08, 0x08, 0x1C, 0x1C, 0x36, 0x22, 0x77, 0x41 };
diff --git a/subtle/icons/arch1.xbm b/subtle/icons/arch1.xbm
deleted file mode 100644
index 881db11..0000000
--- a/subtle/icons/arch1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arch_width 9
-#define arch_height 9
-static unsigned char arch_bits[] = {
-   0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x38, 0x00, 0x38, 0x00, 0x6c, 0x00,
-   0x44, 0x00, 0xee, 0x00, 0x82, 0x00 };
diff --git a/subtle/icons/arch2.xbm b/subtle/icons/arch2.xbm
deleted file mode 100644
index 65f7c5d..0000000
--- a/subtle/icons/arch2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arch2_width 9
-#define arch2_height 9
-static unsigned char arch2_bits[] = {
-   0x10, 0x00, 0x10, 0x00, 0x38, 0x00, 0x7c, 0x00, 0x7c, 0x00, 0xee, 0x00,
-   0xc6, 0x00, 0xc7, 0x01, 0x01, 0x01 };
diff --git a/subtle/icons/arch_10x10.xbm b/subtle/icons/arch_10x10.xbm
deleted file mode 100755
index c3ee46d..0000000
--- a/subtle/icons/arch_10x10.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arch_10x10_width 10
-#define arch_10x10_height 10
-static unsigned char arch_10x10_bits[] = {
- 0x10, 0x00, 0x10, 0x00, 0x38, 0x00, 0x38, 0x00, 0x7C, 0x00, 0x7C, 0x00,
- 0xEE, 0x00, 0xC6, 0x00, 0xC7, 0x01, 0x01, 0x01 };
diff --git a/subtle/icons/arrow_down1.xbm b/subtle/icons/arrow_down1.xbm
deleted file mode 100644
index 1987cc2..0000000
--- a/subtle/icons/arrow_down1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_down_width 9
-#define arrow_down_height 9
-static unsigned char arrow_down_bits[] = {
-   0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x92, 0x00,
-   0x54, 0x00, 0x38, 0x00, 0x10, 0x00 };
diff --git a/subtle/icons/arrow_down2.xbm b/subtle/icons/arrow_down2.xbm
deleted file mode 100644
index 6d46e42..0000000
--- a/subtle/icons/arrow_down2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_down2_width 9
-#define arrow_down2_height 9
-static unsigned char arrow_down2_bits[] = {
-   0x00, 0x00, 0x38, 0x00, 0x38, 0x00, 0x38, 0x00, 0x38, 0x00, 0xfe, 0x00,
-   0x7c, 0x00, 0x38, 0x00, 0x10, 0x00 };
diff --git a/subtle/icons/arrow_left1.xbm b/subtle/icons/arrow_left1.xbm
deleted file mode 100644
index e55cdd2..0000000
--- a/subtle/icons/arrow_left1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_left_width 9
-#define arrow_left_height 9
-static unsigned char arrow_left_bits[] = {
-   0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x02, 0x00, 0xff, 0x01, 0x02, 0x00,
-   0x04, 0x00, 0x08, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/arrow_left2.xbm b/subtle/icons/arrow_left2.xbm
deleted file mode 100644
index 7b3b18d..0000000
--- a/subtle/icons/arrow_left2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_left2_width 9
-#define arrow_left2_height 9
-static unsigned char arrow_left2_bits[] = {
-   0x00, 0x00, 0x08, 0x00, 0x0c, 0x00, 0xfe, 0x00, 0xff, 0x00, 0xfe, 0x00,
-   0x0c, 0x00, 0x08, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/arrow_right1.xbm b/subtle/icons/arrow_right1.xbm
deleted file mode 100644
index 94d6333..0000000
--- a/subtle/icons/arrow_right1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_right_width 9
-#define arrow_right_height 9
-static unsigned char arrow_right_bits[] = {
-   0x00, 0x00, 0x20, 0x00, 0x40, 0x00, 0x80, 0x00, 0xff, 0x01, 0x80, 0x00,
-   0x40, 0x00, 0x20, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/arrow_right2.xbm b/subtle/icons/arrow_right2.xbm
deleted file mode 100644
index c3f2ddd..0000000
--- a/subtle/icons/arrow_right2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_right2_width 9
-#define arrow_right2_height 9
-static unsigned char arrow_right2_bits[] = {
-   0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0xfe, 0x00, 0xfe, 0x01, 0xfe, 0x00,
-   0x60, 0x00, 0x20, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/arrow_up1.xbm b/subtle/icons/arrow_up1.xbm
deleted file mode 100644
index 479faf4..0000000
--- a/subtle/icons/arrow_up1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_up_width 9
-#define arrow_up_height 9
-static unsigned char arrow_up_bits[] = {
-   0x10, 0x00, 0x38, 0x00, 0x54, 0x00, 0x92, 0x00, 0x10, 0x00, 0x10, 0x00,
-   0x10, 0x00, 0x10, 0x00, 0x10, 0x00 };
diff --git a/subtle/icons/arrow_up2.xbm b/subtle/icons/arrow_up2.xbm
deleted file mode 100644
index b1e5409..0000000
--- a/subtle/icons/arrow_up2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_up2_width 9
-#define arrow_up2_height 9
-static unsigned char arrow_up2_bits[] = {
-   0x10, 0x00, 0x38, 0x00, 0x7c, 0x00, 0xfe, 0x00, 0x38, 0x00, 0x38, 0x00,
-   0x38, 0x00, 0x38, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/bag.xbm b/subtle/icons/bag.xbm
deleted file mode 100644
index f5cee5a..0000000
--- a/subtle/icons/bag.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define bag_width 9
-#define bag_height 9
-static unsigned char bag_bits[] = {
-   0x00, 0x00, 0x38, 0x00, 0x28, 0x00, 0xff, 0x01, 0x45, 0x01, 0x45, 0x01,
-   0x45, 0x01, 0x45, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/bail.xbm b/subtle/icons/bail.xbm
deleted file mode 100644
index 804cd1d..0000000
--- a/subtle/icons/bail.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define bail_width 9
-#define bail_height 9
-static unsigned char bail_bits[] = {
-   0x38, 0x00, 0x44, 0x00, 0x44, 0x00, 0x44, 0x00, 0x38, 0x00, 0x44, 0x00,
-   0x82, 0x00, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/balloon.xbm b/subtle/icons/balloon.xbm
deleted file mode 100644
index e9e368c..0000000
--- a/subtle/icons/balloon.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define balloon_width 9
-#define balloon_height 9
-static unsigned char balloon_bits[] = {
-   0xfe, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x9e, 0x00,
-   0xa0, 0x00, 0xc0, 0x00, 0x80, 0x00 };
diff --git a/subtle/icons/bat_empty_01.xbm b/subtle/icons/bat_empty_01.xbm
deleted file mode 100755
index cb916db..0000000
--- a/subtle/icons/bat_empty_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_empty_01_width 8
-#define bat_empty_01_height 8
-static unsigned char bat_empty_01_bits[] = {
- 0x18, 0x7E, 0x42, 0x42, 0x42, 0x42, 0x42, 0x7E };
diff --git a/subtle/icons/bat_empty_02.xbm b/subtle/icons/bat_empty_02.xbm
deleted file mode 100755
index e26be8c..0000000
--- a/subtle/icons/bat_empty_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_empty_02_width 8
-#define bat_empty_02_height 8
-static unsigned char bat_empty_02_bits[] = {
- 0x00, 0x7F, 0x41, 0xC1, 0xC1, 0x41, 0x7F, 0x00 };
diff --git a/subtle/icons/bat_full_01.xbm b/subtle/icons/bat_full_01.xbm
deleted file mode 100755
index 701149e..0000000
--- a/subtle/icons/bat_full_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_full_width 8
-#define bat_full_height 8
-static unsigned char bat_full_bits[] = {
- 0x18, 0x7E, 0x42, 0x5A, 0x5A, 0x5A, 0x42, 0x7E };
diff --git a/subtle/icons/bat_full_02.xbm b/subtle/icons/bat_full_02.xbm
deleted file mode 100755
index 93d2327..0000000
--- a/subtle/icons/bat_full_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_full_02_width 8
-#define bat_full_02_height 8
-static unsigned char bat_full_02_bits[] = {
- 0x00, 0x7F, 0x41, 0xDD, 0xDD, 0x41, 0x7F, 0x00 };
diff --git a/subtle/icons/bat_low_01.xbm b/subtle/icons/bat_low_01.xbm
deleted file mode 100755
index 29e974d..0000000
--- a/subtle/icons/bat_low_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_low_01_width 8
-#define bat_low_01_height 8
-static unsigned char bat_low_01_bits[] = {
- 0x18, 0x7E, 0x42, 0x42, 0x42, 0x5A, 0x42, 0x7E };
diff --git a/subtle/icons/bat_low_02.xbm b/subtle/icons/bat_low_02.xbm
deleted file mode 100755
index d80a464..0000000
--- a/subtle/icons/bat_low_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_low_02_width 8
-#define bat_low_02_height 8
-static unsigned char bat_low_02_bits[] = {
- 0x00, 0x7F, 0x41, 0xC5, 0xC5, 0x41, 0x7F, 0x00 };
diff --git a/subtle/icons/battery_horz1.xbm b/subtle/icons/battery_horz1.xbm
deleted file mode 100644
index 1b45e28..0000000
--- a/subtle/icons/battery_horz1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define battery_horz1_width 9
-#define battery_horz1_height 9
-static unsigned char battery_horz1_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x81, 0x00, 0x81, 0x01, 0x81, 0x00,
-   0xff, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/battery_horz2.xbm b/subtle/icons/battery_horz2.xbm
deleted file mode 100644
index 35321de..0000000
--- a/subtle/icons/battery_horz2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define battery_horz2_width 9
-#define battery_horz2_height 9
-static unsigned char battery_horz2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x81, 0x00, 0x8d, 0x01, 0x81, 0x00,
-   0xff, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/battery_horz3.xbm b/subtle/icons/battery_horz3.xbm
deleted file mode 100644
index 688a9ae..0000000
--- a/subtle/icons/battery_horz3.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define battery_horz3_width 9
-#define battery_horz3_height 9
-static unsigned char battery_horz3_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x81, 0x00, 0xbd, 0x01, 0x81, 0x00,
-   0xff, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/battery_vert1.xbm b/subtle/icons/battery_vert1.xbm
deleted file mode 100644
index edc828d..0000000
--- a/subtle/icons/battery_vert1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define battery_vert1_width 9
-#define battery_vert1_height 9
-static unsigned char battery_vert1_bits[] = {
-   0x10, 0x00, 0x7c, 0x00, 0x44, 0x00, 0x44, 0x00, 0x44, 0x00, 0x44, 0x00,
-   0x44, 0x00, 0x44, 0x00, 0x7c, 0x00 };
diff --git a/subtle/icons/battery_vert2.xbm b/subtle/icons/battery_vert2.xbm
deleted file mode 100644
index e4d318e..0000000
--- a/subtle/icons/battery_vert2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define battery_vert2_width 9
-#define battery_vert2_height 9
-static unsigned char battery_vert2_bits[] = {
-   0x10, 0x00, 0x7c, 0x00, 0x44, 0x00, 0x44, 0x00, 0x44, 0x00, 0x54, 0x00,
-   0x54, 0x00, 0x44, 0x00, 0x7c, 0x00 };
diff --git a/subtle/icons/battery_vert3.xbm b/subtle/icons/battery_vert3.xbm
deleted file mode 100644
index 5c90fac..0000000
--- a/subtle/icons/battery_vert3.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define battery_vert3_width 9
-#define battery_vert3_height 9
-static unsigned char battery_vert3_bits[] = {
-   0x10, 0x00, 0x7c, 0x00, 0x44, 0x00, 0x54, 0x00, 0x54, 0x00, 0x54, 0x00,
-   0x54, 0x00, 0x44, 0x00, 0x7c, 0x00 };
diff --git a/subtle/icons/bell1.xbm b/subtle/icons/bell1.xbm
deleted file mode 100644
index 05343c5..0000000
--- a/subtle/icons/bell1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define bell_width 9
-#define bell_height 9
-static unsigned char bell_bits[] = {
-   0x00, 0x00, 0x1e, 0x00, 0xa2, 0x00, 0xc2, 0x00, 0x42, 0x00, 0x24, 0x00,
-   0xd8, 0x00, 0xcc, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/bell2.xbm b/subtle/icons/bell2.xbm
deleted file mode 100644
index b17232c..0000000
--- a/subtle/icons/bell2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define bell2_width 9
-#define bell2_height 9
-static unsigned char bell2_bits[] = {
-   0x10, 0x00, 0x28, 0x00, 0x44, 0x00, 0x44, 0x00, 0x82, 0x00, 0x82, 0x00,
-   0x01, 0x01, 0xff, 0x01, 0x38, 0x00 };
diff --git a/subtle/icons/binder.xbm b/subtle/icons/binder.xbm
deleted file mode 100644
index 3b80fc1..0000000
--- a/subtle/icons/binder.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define binder_width 9
-#define binder_height 9
-static unsigned char binder_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x72, 0x01, 0x01, 0x01, 0x72, 0x01, 0x01, 0x01,
-   0x72, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/bluetooth.xbm b/subtle/icons/bluetooth.xbm
deleted file mode 100755
index 3cc42d5..0000000
--- a/subtle/icons/bluetooth.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bluetooth_width 8
-#define bluetooth_height 8
-static unsigned char bluetooth_bits[] = {
- 0x18, 0x2A, 0x6C, 0x38, 0x38, 0x6C, 0x2A, 0x18 };
diff --git a/subtle/icons/box.xbm b/subtle/icons/box.xbm
deleted file mode 100644
index 1602d54..0000000
--- a/subtle/icons/box.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define box_width 9
-#define box_height 9
-static unsigned char box_bits[] = {
-   0xf8, 0x01, 0x84, 0x01, 0x42, 0x01, 0x3f, 0x01, 0x21, 0x01, 0x21, 0x01,
-   0x21, 0x01, 0xa1, 0x00, 0x7f, 0x00 };
diff --git a/subtle/icons/box_in.xbm b/subtle/icons/box_in.xbm
deleted file mode 100644
index 3f7d9da..0000000
--- a/subtle/icons/box_in.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_box_width 9
-#define arrow_box_height 9
-static unsigned char arrow_box_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x11, 0x01, 0x20, 0x01, 0x7f, 0x01, 0x20, 0x01,
-   0x11, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/box_minus.xbm b/subtle/icons/box_minus.xbm
deleted file mode 100644
index a144da3..0000000
--- a/subtle/icons/box_minus.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define box_minus_width 9
-#define box_minus_height 9
-static unsigned char box_minus_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x7d, 0x01, 0x01, 0x01,
-   0x01, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/box_out.xbm b/subtle/icons/box_out.xbm
deleted file mode 100644
index 1ea1d0b..0000000
--- a/subtle/icons/box_out.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define box_out_width 9
-#define box_out_height 9
-static unsigned char box_out_bits[] = {
-   0x0f, 0x00, 0x08, 0x00, 0x48, 0x00, 0x80, 0x00, 0xff, 0x01, 0x80, 0x00,
-   0x48, 0x00, 0x08, 0x00, 0x0f, 0x00 };
diff --git a/subtle/icons/box_plus.xbm b/subtle/icons/box_plus.xbm
deleted file mode 100644
index 18cfb60..0000000
--- a/subtle/icons/box_plus.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define box_plus_width 9
-#define box_plus_height 9
-static unsigned char box_plus_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x11, 0x01, 0x11, 0x01, 0x7d, 0x01, 0x11, 0x01,
-   0x11, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/brightness.xbm b/subtle/icons/brightness.xbm
deleted file mode 100644
index ea6b202..0000000
--- a/subtle/icons/brightness.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define brightness_width 9
-#define brightness_height 9
-static unsigned char brightness_bits[] = {
-   0x7c, 0x00, 0x9e, 0x00, 0x1f, 0x01, 0x1f, 0x01, 0x1f, 0x01, 0x1f, 0x01,
-   0x1f, 0x01, 0x9e, 0x00, 0x7c, 0x00 };
diff --git a/subtle/icons/bug.xbm b/subtle/icons/bug.xbm
deleted file mode 100644
index f0238bb..0000000
--- a/subtle/icons/bug.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define bug_width 9
-#define bug_height 9
-static unsigned char bug_bits[] = {
-   0x83, 0x01, 0x44, 0x00, 0x38, 0x00, 0x38, 0x00, 0xbb, 0x01, 0x7c, 0x00,
-   0xfe, 0x00, 0x7d, 0x01, 0x39, 0x01 };
diff --git a/subtle/icons/bug_01.xbm b/subtle/icons/bug_01.xbm
deleted file mode 100755
index 8974034..0000000
--- a/subtle/icons/bug_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bug_width 8
-#define bug_height 8
-static unsigned char bug_bits[] = {
- 0xC3, 0x24, 0x18, 0xDB, 0x3C, 0x7E, 0xBD, 0x99 };
diff --git a/subtle/icons/bug_02.xbm b/subtle/icons/bug_02.xbm
deleted file mode 100755
index 051f2f5..0000000
--- a/subtle/icons/bug_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bug_02_width 8
-#define bug_02_height 8
-static unsigned char bug_02_bits[] = {
- 0xC3, 0x24, 0x24, 0xDB, 0x3C, 0x7E, 0x99, 0x42 };
diff --git a/subtle/icons/calculator.xbm b/subtle/icons/calculator.xbm
deleted file mode 100644
index 2322c54..0000000
--- a/subtle/icons/calculator.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define calculator_width 9
-#define calculator_height 9
-static unsigned char calculator_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x7d, 0x01, 0x01, 0x01, 0x55, 0x01, 0x01, 0x01,
-   0x55, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/cannon.xbm b/subtle/icons/cannon.xbm
deleted file mode 100644
index 3309123..0000000
--- a/subtle/icons/cannon.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define cannon_width 13
-#define cannon_height 8
-static unsigned char cannon_bits[] = {
-   0x00, 0x00, 0x40, 0x00, 0xe0, 0x00, 0xe0, 0x00, 0xfc, 0x07, 0xfe, 0x0f,
-   0xfe, 0x0f, 0xfe, 0x0f };
diff --git a/subtle/icons/card.xbm b/subtle/icons/card.xbm
deleted file mode 100644
index 283fa90..0000000
--- a/subtle/icons/card.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define card_width 9
-#define card_height 9
-static unsigned char card_bits[] = {
-   0x00, 0x00, 0xff, 0x01, 0x01, 0x01, 0x75, 0x01, 0x05, 0x01, 0x75, 0x01,
-   0x01, 0x01, 0x45, 0x01, 0xbb, 0x01 };
diff --git a/subtle/icons/cart.xbm b/subtle/icons/cart.xbm
deleted file mode 100644
index c61deea..0000000
--- a/subtle/icons/cart.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define cart_width 9
-#define cart_height 9
-static unsigned char cart_bits[] = {
-   0x01, 0x00, 0x02, 0x00, 0xfc, 0x01, 0x54, 0x01, 0x54, 0x01, 0xfc, 0x00,
-   0x00, 0x00, 0x86, 0x01, 0x86, 0x01 };
diff --git a/subtle/icons/cart_plus.xbm b/subtle/icons/cart_plus.xbm
deleted file mode 100644
index 8543173..0000000
--- a/subtle/icons/cart_plus.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define cart_plus_width 9
-#define cart_plus_height 9
-static unsigned char cart_plus_bits[] = {
-   0x21, 0x00, 0x72, 0x00, 0x24, 0x01, 0x04, 0x01, 0x54, 0x01, 0xfc, 0x00,
-   0x00, 0x00, 0x86, 0x01, 0x86, 0x01 };
diff --git a/subtle/icons/cat.xbm b/subtle/icons/cat.xbm
deleted file mode 100755
index d0bc6ab..0000000
--- a/subtle/icons/cat.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define cat_width 8
-#define cat_height 8
-static unsigned char cat_bits[] = {
- 0x81, 0xC3, 0xBD, 0xFF, 0x99, 0xFF, 0x7E, 0xBD };
diff --git a/subtle/icons/cd.xbm b/subtle/icons/cd.xbm
deleted file mode 100644
index fc6ab12..0000000
--- a/subtle/icons/cd.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define cd_width 9
-#define cd_height 9
-static unsigned char cd_bits[] = {
-   0x38, 0x00, 0x44, 0x00, 0x82, 0x00, 0x11, 0x01, 0x29, 0x01, 0x11, 0x01,
-   0x82, 0x00, 0x44, 0x00, 0x38, 0x00 };
diff --git a/subtle/icons/cert.xbm b/subtle/icons/cert.xbm
deleted file mode 100644
index 6d743e8..0000000
--- a/subtle/icons/cert.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define cert_width 9
-#define cert_height 9
-static unsigned char cert_bits[] = {
-   0xff, 0x01, 0x7d, 0x01, 0x7d, 0x01, 0x7d, 0x01, 0x55, 0x01, 0x01, 0x01,
-   0x61, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/chain.xbm b/subtle/icons/chain.xbm
deleted file mode 100644
index 7d48c96..0000000
--- a/subtle/icons/chain.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define chain_width 9
-#define chain_height 9
-static unsigned char chain_bits[] = {
-   0xe0, 0x00, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0xee, 0x00, 0x11, 0x00,
-   0x11, 0x00, 0x11, 0x00, 0x0e, 0x00 };
diff --git a/subtle/icons/check.xbm b/subtle/icons/check.xbm
deleted file mode 100644
index ad02f56..0000000
--- a/subtle/icons/check.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define check_width 9
-#define check_height 9
-static unsigned char check_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x00, 0x41, 0x00,
-   0x22, 0x00, 0x14, 0x00, 0x08, 0x00 };
diff --git a/subtle/icons/clip.xbm b/subtle/icons/clip.xbm
deleted file mode 100644
index 6c40497..0000000
--- a/subtle/icons/clip.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define clip_width 9
-#define clip_height 9
-static unsigned char clip_bits[] = {
-   0x3e, 0x00, 0x22, 0x00, 0x2a, 0x00, 0xaa, 0x00, 0xaa, 0x00, 0xaa, 0x00,
-   0xba, 0x00, 0x82, 0x00, 0xfe, 0x00 };
diff --git a/subtle/icons/clock.xbm b/subtle/icons/clock.xbm
deleted file mode 100755
index cd2fad2..0000000
--- a/subtle/icons/clock.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define clock_width 8
-#define clock_height 8
-static unsigned char clock_bits[] = {
- 0x3C, 0x5E, 0xEF, 0xF7, 0x87, 0xFF, 0x7E, 0x3C };
diff --git a/subtle/icons/clock1.xbm b/subtle/icons/clock1.xbm
deleted file mode 100644
index 8b0f70c..0000000
--- a/subtle/icons/clock1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define clock_width 9
-#define clock_height 9
-static unsigned char clock_bits[] = {
-   0x7c, 0x00, 0xbe, 0x00, 0xdf, 0x01, 0xef, 0x01, 0x0f, 0x01, 0xff, 0x01,
-   0xff, 0x01, 0xfe, 0x00, 0x7c, 0x00 };
diff --git a/subtle/icons/clock2.xbm b/subtle/icons/clock2.xbm
deleted file mode 100644
index 78b552f..0000000
--- a/subtle/icons/clock2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define clock2_width 9
-#define clock2_height 9
-static unsigned char clock2_bits[] = {
-   0x7c, 0x00, 0x82, 0x00, 0x11, 0x01, 0x11, 0x01, 0x71, 0x01, 0x01, 0x01,
-   0x01, 0x01, 0x82, 0x00, 0x7c, 0x00 };
diff --git a/subtle/icons/clockwise.xbm b/subtle/icons/clockwise.xbm
deleted file mode 100644
index 6c70a26..0000000
--- a/subtle/icons/clockwise.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define clockwise_width 9
-#define clockwise_height 9
-static unsigned char clockwise_bits[] = {
-   0x38, 0x01, 0x44, 0x01, 0x82, 0x01, 0xe1, 0x01, 0x01, 0x00, 0x01, 0x01,
-   0x82, 0x00, 0x44, 0x00, 0x38, 0x00 };
diff --git a/subtle/icons/cpu.xbm b/subtle/icons/cpu.xbm
deleted file mode 100644
index 620237b..0000000
--- a/subtle/icons/cpu.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define cpu_width 9
-#define cpu_height 9
-static unsigned char cpu_bits[] = {
-   0xbb, 0x01, 0x01, 0x01, 0x7c, 0x00, 0x7d, 0x01, 0x7d, 0x01, 0x7d, 0x01,
-   0x7c, 0x00, 0x01, 0x01, 0xbb, 0x01 };
diff --git a/subtle/icons/cpu_1.xbm b/subtle/icons/cpu_1.xbm
deleted file mode 100644
index 1b2768d..0000000
--- a/subtle/icons/cpu_1.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define load_cpu_width 16
-#define load_cpu_height 16
-static unsigned char load_cpu_bits[] = {
-   0x00, 0x00, 0x48, 0x12, 0x48, 0x12, 0xfc, 0x3f, 0xfc, 0x3f, 0xfe, 0x7f,
-   0x1c, 0x38, 0x1c, 0x38, 0x1e, 0x78, 0x1c, 0x38, 0xfc, 0x3f, 0xfe, 0x7f,
-   0xfc, 0x3f, 0x48, 0x12, 0x48, 0x12, 0x00, 0x00 };
diff --git a/subtle/icons/delete.xbm b/subtle/icons/delete.xbm
deleted file mode 100644
index 2ff00d8..0000000
--- a/subtle/icons/delete.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define delete_width 9
-#define delete_height 9
-static unsigned char delete_bits[] = {
-   0x01, 0x01, 0x82, 0x00, 0x44, 0x00, 0x28, 0x00, 0x10, 0x00, 0x28, 0x00,
-   0x44, 0x00, 0x82, 0x00, 0x01, 0x01 };
diff --git a/subtle/icons/denied1.xbm b/subtle/icons/denied1.xbm
deleted file mode 100644
index 3c80237..0000000
--- a/subtle/icons/denied1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define denied_width 9
-#define denied_height 9
-static unsigned char denied_bits[] = {
-   0x38, 0x00, 0x44, 0x00, 0x82, 0x00, 0x01, 0x01, 0x7d, 0x01, 0x01, 0x01,
-   0x82, 0x00, 0x44, 0x00, 0x38, 0x00 };
diff --git a/subtle/icons/denied2.xbm b/subtle/icons/denied2.xbm
deleted file mode 100644
index 29e70f3..0000000
--- a/subtle/icons/denied2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define denied2_width 9
-#define denied2_height 9
-static unsigned char denied2_bits[] = {
-   0x38, 0x00, 0x44, 0x00, 0x92, 0x00, 0x11, 0x01, 0x11, 0x01, 0x11, 0x01,
-   0x92, 0x00, 0x44, 0x00, 0x38, 0x00 };
diff --git a/subtle/icons/diagram.xbm b/subtle/icons/diagram.xbm
deleted file mode 100644
index 825c7ec..0000000
--- a/subtle/icons/diagram.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define diagram_width 9
-#define diagram_height 9
-static unsigned char diagram_bits[] = {
-   0xfe, 0x00, 0x82, 0x00, 0xfe, 0x00, 0x44, 0x00, 0x44, 0x00, 0xef, 0x01,
-   0x29, 0x01, 0xef, 0x01, 0x00, 0x00 };
diff --git a/subtle/icons/dish.xbm b/subtle/icons/dish.xbm
deleted file mode 100755
index 75e9f88..0000000
--- a/subtle/icons/dish.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define dish_width 8
-#define dish_height 8
-static unsigned char dish_bits[] = {
- 0x81, 0x7B, 0x46, 0x4E, 0x5C, 0x3E, 0x77, 0xC3 };
diff --git a/subtle/icons/diskette.xbm b/subtle/icons/diskette.xbm
deleted file mode 100644
index abfe3b0..0000000
--- a/subtle/icons/diskette.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define diskette_width 9
-#define diskette_height 9
-static unsigned char diskette_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x7d, 0x01,
-   0x75, 0x01, 0x75, 0x01, 0xfe, 0x01 };
diff --git a/subtle/icons/dotbox.xbm b/subtle/icons/dotbox.xbm
deleted file mode 100644
index e51f8f5..0000000
--- a/subtle/icons/dotbox.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define dotbox_width 9
-#define dotbox_height 9
-static unsigned char dotbox_bits[] = {
-   0xfe, 0x00, 0x82, 0x00, 0x82, 0x00, 0x82, 0x00, 0x82, 0x00, 0x82, 0x00,
-   0x92, 0x00, 0x82, 0x00, 0xfe, 0x00 };
diff --git a/subtle/icons/down.xbm b/subtle/icons/down.xbm
deleted file mode 100644
index bc350dd..0000000
--- a/subtle/icons/down.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define down_width 16
-#define down_height 16
-static unsigned char down_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xe0, 0x03, 0xc0, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/empty.xbm b/subtle/icons/empty.xbm
deleted file mode 100755
index 1086137..0000000
--- a/subtle/icons/empty.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define empty_width 8
-#define empty_height 8
-static unsigned char empty_bits[] = {
- 0x3C, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x3C };
diff --git a/subtle/icons/exclamation1.xbm b/subtle/icons/exclamation1.xbm
deleted file mode 100644
index 70213c5..0000000
--- a/subtle/icons/exclamation1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define exclamation_width 9
-#define exclamation_height 9
-static unsigned char exclamation_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x11, 0x01, 0x11, 0x01, 0x11, 0x01, 0x01, 0x01,
-   0x11, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/exclamation2.xbm b/subtle/icons/exclamation2.xbm
deleted file mode 100644
index a0a7571..0000000
--- a/subtle/icons/exclamation2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define exclamation2_width 9
-#define exclamation2_height 9
-static unsigned char exclamation2_bits[] = {
-   0x10, 0x00, 0x28, 0x00, 0x28, 0x00, 0x54, 0x00, 0x54, 0x00, 0x82, 0x00,
-   0x92, 0x00, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/eye_l.xbm b/subtle/icons/eye_l.xbm
deleted file mode 100755
index 3de8e26..0000000
--- a/subtle/icons/eye_l.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define eye_l_width 8
-#define eye_l_height 8
-static unsigned char eye_l_bits[] = {
- 0x00, 0x00, 0x1B, 0x02, 0x02, 0x84, 0xF9, 0x02 };
diff --git a/subtle/icons/eye_r.xbm b/subtle/icons/eye_r.xbm
deleted file mode 100755
index 7a04951..0000000
--- a/subtle/icons/eye_r.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define eye_r_width 8
-#define eye_r_height 8
-static unsigned char eye_r_bits[] = {
- 0x00, 0x00, 0xD8, 0x40, 0x40, 0x21, 0x9F, 0x40 };
diff --git a/subtle/icons/fan.xbm b/subtle/icons/fan.xbm
deleted file mode 100644
index 5159e74..0000000
--- a/subtle/icons/fan.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define fan_width 9
-#define fan_height 9
-static unsigned char fan_bits[] = {
-   0x86, 0x00, 0x39, 0x01, 0x7c, 0x01, 0xc6, 0x00, 0xc6, 0x00, 0xc6, 0x00,
-   0x7d, 0x00, 0x39, 0x01, 0xc2, 0x00 };
diff --git a/subtle/icons/file1.xbm b/subtle/icons/file1.xbm
deleted file mode 100644
index 82b656f..0000000
--- a/subtle/icons/file1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define file_width 9
-#define file_height 9
-static unsigned char file_bits[] = {
-   0x1f, 0x00, 0x11, 0x00, 0xf1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-   0x01, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/file2.xbm b/subtle/icons/file2.xbm
deleted file mode 100644
index 43e9cbe..0000000
--- a/subtle/icons/file2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define file2_width 9
-#define file2_height 9
-static unsigned char file2_bits[] = {
-   0x7f, 0x00, 0xc1, 0x00, 0xc1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-   0x01, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/flag.xbm b/subtle/icons/flag.xbm
deleted file mode 100644
index c587fc4..0000000
--- a/subtle/icons/flag.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define flag_width 9
-#define flag_height 9
-static unsigned char flag_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xff, 0x01, 0x01, 0x00,
-   0x01, 0x00, 0x01, 0x00, 0x01, 0x00 };
diff --git a/subtle/icons/flask1.xbm b/subtle/icons/flask1.xbm
deleted file mode 100644
index b7165f6..0000000
--- a/subtle/icons/flask1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define flask1_width 9
-#define flask1_height 9
-static unsigned char flask1_bits[] = {
-   0x00, 0x00, 0x38, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x44, 0x00,
-   0x82, 0x00, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/flask2.xbm b/subtle/icons/flask2.xbm
deleted file mode 100644
index aa623a6..0000000
--- a/subtle/icons/flask2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define flask2_width 9
-#define flask2_height 9
-static unsigned char flask2_bits[] = {
-   0x00, 0x00, 0x38, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x44, 0x00,
-   0xba, 0x00, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/fox.xbm b/subtle/icons/fox.xbm
deleted file mode 100644
index 87c9714..0000000
--- a/subtle/icons/fox.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define fox_width 9
-#define fox_height 9
-static unsigned char fox_bits[] = {
-   0x01, 0x01, 0x83, 0x01, 0x7d, 0x01, 0x7d, 0x01, 0xff, 0x01, 0x39, 0x01,
-   0xff, 0x01, 0xfe, 0x00, 0x7d, 0x01 };
diff --git a/subtle/icons/fox_1.xbm b/subtle/icons/fox_1.xbm
deleted file mode 100644
index 87c9714..0000000
--- a/subtle/icons/fox_1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define fox_width 9
-#define fox_height 9
-static unsigned char fox_bits[] = {
-   0x01, 0x01, 0x83, 0x01, 0x7d, 0x01, 0x7d, 0x01, 0xff, 0x01, 0x39, 0x01,
-   0xff, 0x01, 0xfe, 0x00, 0x7d, 0x01 };
diff --git a/subtle/icons/fs_01.xbm b/subtle/icons/fs_01.xbm
deleted file mode 100755
index 1d012d2..0000000
--- a/subtle/icons/fs_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define fs_01_width 8
-#define fs_01_height 8
-static unsigned char fs_01_bits[] = {
- 0x46, 0x99, 0xBC, 0x66, 0x66, 0x3D, 0x99, 0x62 };
diff --git a/subtle/icons/fs_02.xbm b/subtle/icons/fs_02.xbm
deleted file mode 100755
index 603e3a7..0000000
--- a/subtle/icons/fs_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define fs_02_width 8
-#define fs_02_height 8
-static unsigned char fs_02_bits[] = {
- 0xF1, 0x5B, 0x3D, 0x67, 0xE6, 0xBC, 0xDA, 0x8F };
diff --git a/subtle/icons/full.xbm b/subtle/icons/full.xbm
deleted file mode 100755
index b5a026f..0000000
--- a/subtle/icons/full.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define full_width 8
-#define full_height 8
-static unsigned char full_bits[] = {
- 0x3C, 0x7E, 0xFF, 0xFF, 0xFF, 0xFF, 0x7E, 0x3C };
diff --git a/subtle/icons/fwd.xbm b/subtle/icons/fwd.xbm
deleted file mode 100755
index 3f52ea9..0000000
--- a/subtle/icons/fwd.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define fwd_width 8
-#define fwd_height 8
-static unsigned char fwd_bits[] = {
- 0x00, 0x12, 0x36, 0x7E, 0x7E, 0x36, 0x12, 0x00 };
diff --git a/subtle/icons/game.xbm b/subtle/icons/game.xbm
deleted file mode 100644
index d4b7954..0000000
--- a/subtle/icons/game.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define game_width 9
-#define game_height 9
-static unsigned char game_bits[] = {
-   0x44, 0x00, 0x28, 0x00, 0x7c, 0x00, 0xfe, 0x00, 0xd7, 0x01, 0x7d, 0x01,
-   0x7c, 0x00, 0x44, 0x00, 0x28, 0x00 };
diff --git a/subtle/icons/ghost.xbm b/subtle/icons/ghost.xbm
deleted file mode 100644
index a0f6432..0000000
--- a/subtle/icons/ghost.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define ghost_width 9
-#define ghost_height 9
-static unsigned char ghost_bits[] = {
-   0x38, 0x00, 0x7c, 0x00, 0xfe, 0x00, 0xd6, 0x00, 0xfe, 0x00, 0xfe, 0x00,
-   0xfe, 0x00, 0xfe, 0x00, 0xaa, 0x00 };
diff --git a/subtle/icons/half.xbm b/subtle/icons/half.xbm
deleted file mode 100755
index 874323b..0000000
--- a/subtle/icons/half.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define half_width 8
-#define half_height 8
-static unsigned char half_bits[] = {
- 0x3C, 0x4E, 0x8F, 0x8F, 0x8F, 0x8F, 0x4E, 0x3C };
diff --git a/subtle/icons/headphones.xbm b/subtle/icons/headphones.xbm
deleted file mode 100644
index 5d85395..0000000
--- a/subtle/icons/headphones.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define headphones_width 9
-#define headphones_height 9
-static unsigned char headphones_bits[] = {
-   0x7c, 0x00, 0x82, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x45, 0x01,
-   0xc7, 0x01, 0xc6, 0x00, 0xc6, 0x00 };
diff --git a/subtle/icons/heart.xbm b/subtle/icons/heart.xbm
deleted file mode 100644
index 9deca37..0000000
--- a/subtle/icons/heart.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define heart_width 9
-#define heart_height 9
-static unsigned char heart_bits[] = {
-   0xee, 0x00, 0x11, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x82, 0x00,
-   0x44, 0x00, 0x28, 0x00, 0x10, 0x00 };
diff --git a/subtle/icons/heart_plus.xbm b/subtle/icons/heart_plus.xbm
deleted file mode 100644
index 1e08edb..0000000
--- a/subtle/icons/heart_plus.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define heart_plus_width 9
-#define heart_plus_height 9
-static unsigned char heart_plus_bits[] = {
-   0xee, 0x00, 0x11, 0x01, 0x00, 0x01, 0x02, 0x01, 0x07, 0x01, 0x82, 0x00,
-   0x40, 0x00, 0x28, 0x00, 0x10, 0x00 };
diff --git a/subtle/icons/house.xbm b/subtle/icons/house.xbm
deleted file mode 100644
index 656ee57..0000000
--- a/subtle/icons/house.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define house_width 9
-#define house_height 9
-static unsigned char house_bits[] = {
-   0x90, 0x00, 0xa8, 0x00, 0x44, 0x00, 0x82, 0x00, 0x01, 0x01, 0xba, 0x00,
-   0xaa, 0x00, 0xaa, 0x00, 0xfe, 0x00 };
diff --git a/subtle/icons/info.xbm b/subtle/icons/info.xbm
deleted file mode 100644
index 6153d97..0000000
--- a/subtle/icons/info.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define info_width 9
-#define info_height 9
-static unsigned char info_bits[] = {
-   0x38, 0x00, 0x38, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x38, 0x00, 0x38, 0x00,
-   0x38, 0x00, 0x38, 0x00, 0x7c, 0x00 };
diff --git a/subtle/icons/info_01.xbm b/subtle/icons/info_01.xbm
deleted file mode 100755
index f08c2fd..0000000
--- a/subtle/icons/info_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define info_01_width 8
-#define info_01_height 8
-static unsigned char info_01_bits[] = {
- 0x3C, 0x66, 0xFF, 0xE7, 0xE7, 0xE7, 0x66, 0x3C };
diff --git a/subtle/icons/info_02.xbm b/subtle/icons/info_02.xbm
deleted file mode 100755
index 00b4df0..0000000
--- a/subtle/icons/info_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define info_02_width 8
-#define info_02_height 8
-static unsigned char info_02_bits[] = {
- 0xFF, 0xE7, 0xFF, 0xE7, 0xE7, 0xE7, 0xE7, 0xFF };
diff --git a/subtle/icons/info_03.xbm b/subtle/icons/info_03.xbm
deleted file mode 100755
index 50103f8..0000000
--- a/subtle/icons/info_03.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define info_width 8
-#define info_height 8
-static unsigned char info_bits[] = {
- 0x38, 0x38, 0x00, 0x3C, 0x38, 0x38, 0x38, 0x7C };
diff --git a/subtle/icons/invader1.xbm b/subtle/icons/invader1.xbm
deleted file mode 100644
index 3eeb2e1..0000000
--- a/subtle/icons/invader1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define invader1_width 13
-#define invader1_height 8
-static unsigned char invader1_bits[] = {
-   0x60, 0x00, 0xf8, 0x01, 0xfc, 0x03, 0x6c, 0x03, 0xfc, 0x03, 0x98, 0x01,
-   0x64, 0x02, 0x08, 0x01 };
diff --git a/subtle/icons/invader2.xbm b/subtle/icons/invader2.xbm
deleted file mode 100644
index 062f59b..0000000
--- a/subtle/icons/invader2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define invader2_width 13
-#define invader2_height 8
-static unsigned char invader2_bits[] = {
-   0x60, 0x00, 0xf8, 0x01, 0xfc, 0x03, 0x6c, 0x03, 0xfc, 0x03, 0x90, 0x00,
-   0x68, 0x01, 0x04, 0x02 };
diff --git a/subtle/icons/invader3.xbm b/subtle/icons/invader3.xbm
deleted file mode 100644
index 3d8d4d0..0000000
--- a/subtle/icons/invader3.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define invader3_width 13
-#define invader3_height 8
-static unsigned char invader3_bits[] = {
-   0x08, 0x02, 0x10, 0x01, 0xf8, 0x03, 0xec, 0x06, 0xfe, 0x0f, 0xfa, 0x0b,
-   0x0a, 0x0a, 0xb0, 0x01 };
diff --git a/subtle/icons/invader4.xbm b/subtle/icons/invader4.xbm
deleted file mode 100644
index 920d057..0000000
--- a/subtle/icons/invader4.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define invader4_width 13
-#define invader4_height 8
-static unsigned char invader4_bits[] = {
-   0x08, 0x02, 0x12, 0x09, 0xfa, 0x0b, 0xee, 0x0e, 0xfe, 0x0f, 0xfc, 0x07,
-   0x08, 0x02, 0x04, 0x04 };
diff --git a/subtle/icons/invader5.xbm b/subtle/icons/invader5.xbm
deleted file mode 100644
index 9b16b5d..0000000
--- a/subtle/icons/invader5.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define invader5_width 13
-#define invader5_height 8
-static unsigned char invader5_bits[] = {
-   0x60, 0x00, 0xf0, 0x00, 0xf8, 0x01, 0x6c, 0x03, 0xfc, 0x03, 0x90, 0x00,
-   0x68, 0x01, 0x94, 0x02 };
diff --git a/subtle/icons/invader6.xbm b/subtle/icons/invader6.xbm
deleted file mode 100644
index 4c79052..0000000
--- a/subtle/icons/invader6.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define invader6_width 13
-#define invader6_height 8
-static unsigned char invader6_bits[] = {
-   0x60, 0x00, 0xf0, 0x00, 0xf8, 0x01, 0x6c, 0x03, 0xfc, 0x03, 0x68, 0x01,
-   0x04, 0x02, 0x08, 0x01 };
diff --git a/subtle/icons/jar1.xbm b/subtle/icons/jar1.xbm
deleted file mode 100644
index 29c65cb..0000000
--- a/subtle/icons/jar1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define jar1_width 9
-#define jar1_height 9
-static unsigned char jar1_bits[] = {
-   0x7c, 0x00, 0x7c, 0x00, 0x82, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-   0x01, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/jar2.xbm b/subtle/icons/jar2.xbm
deleted file mode 100644
index 45ba61a..0000000
--- a/subtle/icons/jar2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define jar2_width 9
-#define jar2_height 9
-static unsigned char jar2_bits[] = {
-   0x7c, 0x00, 0x7c, 0x00, 0x82, 0x00, 0x01, 0x01, 0x01, 0x01, 0x7d, 0x01,
-   0x7d, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/jar3.xbm b/subtle/icons/jar3.xbm
deleted file mode 100644
index 806955d..0000000
--- a/subtle/icons/jar3.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define jar3_width 9
-#define jar3_height 9
-static unsigned char jar3_bits[] = {
-   0x7c, 0x00, 0x7c, 0x00, 0x82, 0x00, 0x39, 0x01, 0x39, 0x01, 0x7d, 0x01,
-   0x7d, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/key.xbm b/subtle/icons/key.xbm
deleted file mode 100644
index 53193d2..0000000
--- a/subtle/icons/key.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define key_width 9
-#define key_height 9
-static unsigned char key_bits[] = {
-   0xfe, 0x00, 0x82, 0x00, 0x82, 0x00, 0x82, 0x00, 0xfe, 0x00, 0x10, 0x00,
-   0x1c, 0x00, 0x10, 0x00, 0x1c, 0x00 };
diff --git a/subtle/icons/light1.xbm b/subtle/icons/light1.xbm
deleted file mode 100644
index e01cc3f..0000000
--- a/subtle/icons/light1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define light1_width 9
-#define light1_height 9
-static unsigned char light1_bits[] = {
-   0x38, 0x00, 0x44, 0x00, 0x82, 0x00, 0x82, 0x00, 0x44, 0x00, 0x28, 0x00,
-   0x38, 0x00, 0x38, 0x00, 0x10, 0x00 };
diff --git a/subtle/icons/light2.xbm b/subtle/icons/light2.xbm
deleted file mode 100644
index aa039ae..0000000
--- a/subtle/icons/light2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define light2_width 9
-#define light2_height 9
-static unsigned char light2_bits[] = {
-   0x39, 0x01, 0x44, 0x00, 0x82, 0x00, 0x82, 0x00, 0x44, 0x00, 0x28, 0x00,
-   0x39, 0x01, 0x38, 0x00, 0x10, 0x00 };
diff --git a/subtle/icons/list.xbm b/subtle/icons/list.xbm
deleted file mode 100644
index 599075d..0000000
--- a/subtle/icons/list.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define list_width 9
-#define list_height 9
-static unsigned char list_bits[] = {
-   0xfb, 0x00, 0x03, 0x00, 0x00, 0x00, 0xfb, 0x00, 0x03, 0x00, 0x00, 0x00,
-   0xfb, 0x00, 0x03, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/load.xbm b/subtle/icons/load.xbm
deleted file mode 100644
index b9a1061..0000000
--- a/subtle/icons/load.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define load_width 16
-#define load_height 16
-static unsigned char load_bits[] = {
-   0x00, 0x00, 0xfe, 0x7f, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40,
-   0x02, 0x44, 0x02, 0x4a, 0x02, 0x71, 0x8e, 0x40, 0x52, 0x40, 0x22, 0x40,
-   0x02, 0x40, 0x02, 0x40, 0xfe, 0x7f, 0x00, 0x00 };
diff --git a/subtle/icons/lock.xbm b/subtle/icons/lock.xbm
deleted file mode 100644
index dd171b5..0000000
--- a/subtle/icons/lock.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define lock_width 9
-#define lock_height 9
-static unsigned char lock_bits[] = {
-   0x7c, 0x00, 0x82, 0x00, 0x82, 0x00, 0xff, 0x01, 0x01, 0x01, 0x11, 0x01,
-   0x11, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/magnifier.xbm b/subtle/icons/magnifier.xbm
deleted file mode 100644
index bf7df83..0000000
--- a/subtle/icons/magnifier.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define magnifier_width 9
-#define magnifier_height 9
-static unsigned char magnifier_bits[] = {
-   0x1c, 0x00, 0x22, 0x00, 0x41, 0x00, 0x41, 0x00, 0x41, 0x00, 0x22, 0x00,
-   0x5c, 0x00, 0x80, 0x00, 0x00, 0x01 };
diff --git a/subtle/icons/mail.xbm b/subtle/icons/mail.xbm
deleted file mode 100644
index 4a2eb36..0000000
--- a/subtle/icons/mail.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define mail_width 9
-#define mail_height 9
-static unsigned char mail_bits[] = {
-   0x00, 0x00, 0xff, 0x01, 0x01, 0x01, 0x45, 0x01, 0x29, 0x01, 0x11, 0x01,
-   0x01, 0x01, 0xff, 0x01, 0x00, 0x00 };
diff --git a/subtle/icons/mail_1.xbm b/subtle/icons/mail_1.xbm
deleted file mode 100644
index 4a2eb36..0000000
--- a/subtle/icons/mail_1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define mail_width 9
-#define mail_height 9
-static unsigned char mail_bits[] = {
-   0x00, 0x00, 0xff, 0x01, 0x01, 0x01, 0x45, 0x01, 0x29, 0x01, 0x11, 0x01,
-   0x01, 0x01, 0xff, 0x01, 0x00, 0x00 };
diff --git a/subtle/icons/man.xbm b/subtle/icons/man.xbm
deleted file mode 100644
index 3848cc2..0000000
--- a/subtle/icons/man.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define man_width 9
-#define man_height 9
-static unsigned char man_bits[] = {
-   0x10, 0x00, 0x28, 0x00, 0x10, 0x00, 0x7c, 0x00, 0x92, 0x00, 0xaa, 0x00,
-   0x28, 0x00, 0x28, 0x00, 0x28, 0x00 };
diff --git a/subtle/icons/mem.xbm b/subtle/icons/mem.xbm
deleted file mode 100644
index 5c5bc8e..0000000
--- a/subtle/icons/mem.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define load_mem_width 16
-#define load_mem_height 16
-static unsigned char load_mem_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x12, 0x48, 0x12, 0xfc, 0x3f,
-   0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0x48, 0x12,
-   0x48, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/mem_1.xbm b/subtle/icons/mem_1.xbm
deleted file mode 100644
index 5c5bc8e..0000000
--- a/subtle/icons/mem_1.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define load_mem_width 16
-#define load_mem_height 16
-static unsigned char load_mem_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x12, 0x48, 0x12, 0xfc, 0x3f,
-   0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0x48, 0x12,
-   0x48, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/memory.xbm b/subtle/icons/memory.xbm
deleted file mode 100644
index f9821ea..0000000
--- a/subtle/icons/memory.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define memory_width 9
-#define memory_height 9
-static unsigned char memory_bits[] = {
-   0xaa, 0x00, 0x00, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0xfe, 0x00,
-   0xfe, 0x00, 0x00, 0x00, 0xaa, 0x00 };
diff --git a/subtle/icons/minus.xbm b/subtle/icons/minus.xbm
deleted file mode 100644
index 072ef07..0000000
--- a/subtle/icons/minus.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define minus_width 9
-#define minus_height 9
-static unsigned char minus_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x01, 0x01, 0x01, 0xff, 0x01,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/mouse.xbm b/subtle/icons/mouse.xbm
deleted file mode 100644
index 28a6528..0000000
--- a/subtle/icons/mouse.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define mouse_width 9
-#define mouse_height 9
-static unsigned char mouse_bits[] = {
-   0xee, 0x00, 0xee, 0x00, 0xee, 0x00, 0x82, 0x00, 0xfe, 0x00, 0xfe, 0x00,
-   0xfe, 0x00, 0xfe, 0x00, 0x7c, 0x00 };
diff --git a/subtle/icons/mouse_01.xbm b/subtle/icons/mouse_01.xbm
deleted file mode 100755
index 05e91b5..0000000
--- a/subtle/icons/mouse_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define mouse_01_width 8
-#define mouse_01_height 8
-static unsigned char mouse_01_bits[] = {
- 0xEE, 0xEE, 0xEE, 0x82, 0xFE, 0xFE, 0xFE, 0x7C };
diff --git a/subtle/icons/movie.xbm b/subtle/icons/movie.xbm
deleted file mode 100644
index 29bc622..0000000
--- a/subtle/icons/movie.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define movie_width 9
-#define movie_height 9
-static unsigned char movie_bits[] = {
-   0xff, 0x01, 0x55, 0x01, 0xff, 0x01, 0x21, 0x01, 0x21, 0x01, 0x21, 0x01,
-   0xff, 0x01, 0x55, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/mpd.xbm b/subtle/icons/mpd.xbm
deleted file mode 100644
index 8211667..0000000
--- a/subtle/icons/mpd.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define mpd_width 16
-#define mpd_height 16
-static unsigned char mpd_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x1f, 0x40, 0x10,
-   0x40, 0x10, 0x40, 0x10, 0x40, 0x10, 0x40, 0x10, 0x70, 0x1c, 0x78, 0x1e,
-   0x30, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/net-wifi.xbm b/subtle/icons/net-wifi.xbm
deleted file mode 100644
index 0b3a4a1..0000000
--- a/subtle/icons/net-wifi.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define net_wifi4_width 16
-#define net_wifi4_height 16
-static unsigned char net_wifi4_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x08, 0x10, 0xe4, 0x27, 0x10, 0x08,
-   0xc0, 0x03, 0x20, 0x04, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01,
-   0xc0, 0x03, 0xc0, 0x03, 0x80, 0x01, 0x00, 0x00 };
diff --git a/subtle/icons/net-wifi3.xbm b/subtle/icons/net-wifi3.xbm
deleted file mode 100644
index 7ebb55d..0000000
--- a/subtle/icons/net-wifi3.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define wireless3_full_width 16
-#define wireless3_full_height 16
-static unsigned char wireless3_full_bits[] = {
-   0x00, 0x00, 0xf0, 0x0f, 0x08, 0x10, 0xe4, 0x27, 0x10, 0x08, 0x00, 0x00,
-   0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f,
-   0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/net-wifi4.xbm b/subtle/icons/net-wifi4.xbm
deleted file mode 100644
index 8179eb4..0000000
--- a/subtle/icons/net-wifi4.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define net_wifi4_width 16
-#define net_wifi4_height 16
-static unsigned char net_wifi4_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x7f, 0xfe, 0x7f, 0x00, 0x00,
-   0xfc, 0x3f, 0xfc, 0x3f, 0x00, 0x00, 0xf8, 0x1f, 0xf8, 0x1f, 0x00, 0x00,
-   0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/net-wifi5.xbm b/subtle/icons/net-wifi5.xbm
deleted file mode 100644
index 8a097ef..0000000
--- a/subtle/icons/net-wifi5.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define wireless_full_width 16
-#define wireless_full_height 16
-static unsigned char wireless_full_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfe, 0x7f, 0x00, 0x00,
-   0xfc, 0x3f, 0xf8, 0x1f, 0x00, 0x00, 0xf0, 0x0f, 0xe0, 0x07, 0x00, 0x00,
-   0xc0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/net-wired.xbm b/subtle/icons/net-wired.xbm
deleted file mode 100644
index d9655d7..0000000
--- a/subtle/icons/net-wired.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define network_eth2_width 16
-#define network_eth2_height 16
-static unsigned char network_eth2_bits[] = {
-   0x00, 0x00, 0xfe, 0x7f, 0x02, 0x40, 0x02, 0x40, 0xc2, 0x43, 0xc2, 0x43,
-   0xc2, 0x43, 0xf2, 0x4f, 0xf2, 0x4f, 0xf2, 0x4f, 0xf2, 0x4f, 0xf2, 0x4f,
-   0x02, 0x40, 0x02, 0x40, 0xfe, 0x7f, 0x00, 0x00 };
diff --git a/subtle/icons/net-wired2.xbm b/subtle/icons/net-wired2.xbm
deleted file mode 100644
index fb7276a..0000000
--- a/subtle/icons/net-wired2.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define network_eth1_width 16
-#define network_eth1_height 16
-static unsigned char network_eth1_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0x60, 0x03, 0x70, 0x07,
-   0x78, 0x0f, 0x7f, 0x7f, 0x7f, 0x7f, 0x78, 0x0f, 0x70, 0x07, 0x60, 0x03,
-   0x40, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/net_down_01.xbm b/subtle/icons/net_down_01.xbm
deleted file mode 100755
index 0940355..0000000
--- a/subtle/icons/net_down_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_down_01_width 8
-#define net_down_01_height 8
-static unsigned char net_down_01_bits[] = {
- 0x1E, 0x3C, 0x3C, 0x3C, 0xFF, 0x7E, 0x3C, 0x18 };
diff --git a/subtle/icons/net_down_02.xbm b/subtle/icons/net_down_02.xbm
deleted file mode 100755
index 750ada5..0000000
--- a/subtle/icons/net_down_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_down_02_width 8
-#define net_down_02_height 8
-static unsigned char net_down_02_bits[] = {
- 0x78, 0x3C, 0x3C, 0x3C, 0xFF, 0x7E, 0x3C, 0x18 };
diff --git a/subtle/icons/net_down_03.xbm b/subtle/icons/net_down_03.xbm
deleted file mode 100755
index 0502235..0000000
--- a/subtle/icons/net_down_03.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_down_03_width 8
-#define net_down_03_height 8
-static unsigned char net_down_03_bits[] = {
- 0x38, 0x38, 0x38, 0x38, 0xFE, 0x7C, 0x38, 0x10 };
diff --git a/subtle/icons/net_up_01.xbm b/subtle/icons/net_up_01.xbm
deleted file mode 100755
index aac47a3..0000000
--- a/subtle/icons/net_up_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_up_01_width 8
-#define net_up_01_height 8
-static unsigned char net_up_01_bits[] = {
- 0x18, 0x3C, 0x7E, 0xFF, 0x3C, 0x3C, 0x3C, 0x78 };
diff --git a/subtle/icons/net_up_02.xbm b/subtle/icons/net_up_02.xbm
deleted file mode 100755
index 9a53392..0000000
--- a/subtle/icons/net_up_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_up_02_width 8
-#define net_up_02_height 8
-static unsigned char net_up_02_bits[] = {
- 0x18, 0x3C, 0x7E, 0xFF, 0x3C, 0x3C, 0x3C, 0x1E };
diff --git a/subtle/icons/net_up_03.xbm b/subtle/icons/net_up_03.xbm
deleted file mode 100755
index b21c007..0000000
--- a/subtle/icons/net_up_03.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_up_03_width 8
-#define net_up_03_height 8
-static unsigned char net_up_03_bits[] = {
- 0x10, 0x38, 0x7C, 0xFE, 0x38, 0x38, 0x38, 0x38 };
diff --git a/subtle/icons/net_wired.xbm b/subtle/icons/net_wired.xbm
deleted file mode 100755
index 25cd20b..0000000
--- a/subtle/icons/net_wired.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_wired_width 8
-#define net_wired_height 8
-static unsigned char net_wired_bits[] = {
- 0x00, 0x1C, 0x1C, 0x7F, 0x7F, 0x7F, 0x55, 0x7F };
diff --git a/subtle/icons/next.xbm b/subtle/icons/next.xbm
deleted file mode 100755
index 3937532..0000000
--- a/subtle/icons/next.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define next_width 8
-#define next_height 8
-static unsigned char next_bits[] = {
- 0x00, 0x42, 0x4E, 0x7E, 0x7E, 0x4E, 0x42, 0x00 };
diff --git a/subtle/icons/note.xbm b/subtle/icons/note.xbm
deleted file mode 100755
index 21ba22b..0000000
--- a/subtle/icons/note.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define note_width 8
-#define note_height 8
-static unsigned char note_bits[] = {
- 0xFC, 0xFC, 0x84, 0x84, 0x84, 0x84, 0xE7, 0xE7 };
diff --git a/subtle/icons/note1.xbm b/subtle/icons/note1.xbm
deleted file mode 100644
index c81297e..0000000
--- a/subtle/icons/note1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define note_width 9
-#define note_height 9
-static unsigned char note_bits[] = {
-   0x00, 0x00, 0xfc, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01,
-   0x04, 0x01, 0xc7, 0x01, 0xc7, 0x01 };
diff --git a/subtle/icons/note2.xbm b/subtle/icons/note2.xbm
deleted file mode 100644
index 0e74538..0000000
--- a/subtle/icons/note2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define note2_width 9
-#define note2_height 9
-static unsigned char note2_bits[] = {
-   0x80, 0x01, 0x60, 0x01, 0x18, 0x01, 0x08, 0x01, 0x08, 0x01, 0x08, 0x01,
-   0xc8, 0x01, 0xce, 0x01, 0x0e, 0x00 };
diff --git a/subtle/icons/notepad.xbm b/subtle/icons/notepad.xbm
deleted file mode 100644
index 4d6cb8e..0000000
--- a/subtle/icons/notepad.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define notepad_width 9
-#define notepad_height 9
-static unsigned char notepad_bits[] = {
-   0xaa, 0x00, 0x55, 0x01, 0x01, 0x01, 0x01, 0x01, 0x55, 0x01, 0x01, 0x01,
-   0x55, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/off.xbm b/subtle/icons/off.xbm
deleted file mode 100644
index ca3d7f8..0000000
--- a/subtle/icons/off.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define off_width 9
-#define off_height 9
-static unsigned char off_bits[] = {
-   0x10, 0x00, 0x54, 0x00, 0x92, 0x00, 0x11, 0x01, 0x11, 0x01, 0x11, 0x01,
-   0x82, 0x00, 0x44, 0x00, 0x38, 0x00 };
diff --git a/subtle/icons/omega.xbm b/subtle/icons/omega.xbm
deleted file mode 100644
index a4469e8..0000000
--- a/subtle/icons/omega.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define omega_width 9
-#define omega_height 9
-static unsigned char omega_bits[] = {
-   0x00, 0x00, 0x38, 0x00, 0x44, 0x00, 0x82, 0x00, 0x82, 0x00, 0x82, 0x00,
-   0x44, 0x00, 0xaa, 0x00, 0xee, 0x00 };
diff --git a/subtle/icons/on.xbm b/subtle/icons/on.xbm
deleted file mode 100644
index b123fa3..0000000
--- a/subtle/icons/on.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define on_width 9
-#define on_height 9
-static unsigned char on_bits[] = {
-   0x38, 0x00, 0x44, 0x00, 0x82, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-   0x82, 0x00, 0x44, 0x00, 0x38, 0x00 };
diff --git a/subtle/icons/overview.png b/subtle/icons/overview.png
deleted file mode 100644
index a2073f1..0000000
--- a/subtle/icons/overview.png
+++ /dev/null
diff --git a/subtle/icons/pacman.xbm b/subtle/icons/pacman.xbm
deleted file mode 100644
index ff19fef..0000000
--- a/subtle/icons/pacman.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define pacman_width 9
-#define pacman_height 9
-static unsigned char pacman_bits[] = {
-   0x7c, 0x00, 0xf6, 0x00, 0xf3, 0x01, 0xff, 0x00, 0x1f, 0x00, 0x0f, 0x00,
-   0x7f, 0x00, 0xfe, 0x00, 0x7c, 0x00 };
diff --git a/subtle/icons/pacman_1.xbm b/subtle/icons/pacman_1.xbm
deleted file mode 100644
index ff19fef..0000000
--- a/subtle/icons/pacman_1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define pacman_width 9
-#define pacman_height 9
-static unsigned char pacman_bits[] = {
-   0x7c, 0x00, 0xf6, 0x00, 0xf3, 0x01, 0xff, 0x00, 0x1f, 0x00, 0x0f, 0x00,
-   0x7f, 0x00, 0xfe, 0x00, 0x7c, 0x00 };
diff --git a/subtle/icons/paint.xbm b/subtle/icons/paint.xbm
deleted file mode 100644
index f336352..0000000
--- a/subtle/icons/paint.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define paint_width 9
-#define paint_height 9
-static unsigned char paint_bits[] = {
-   0x04, 0x00, 0x1a, 0x00, 0xea, 0x00, 0xce, 0x01, 0x8a, 0x01, 0x41, 0x01,
-   0x22, 0x01, 0x14, 0x01, 0x08, 0x00 };
diff --git a/subtle/icons/pause.xbm b/subtle/icons/pause.xbm
deleted file mode 100755
index 6bb2251..0000000
--- a/subtle/icons/pause.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define pause_width 8
-#define pause_height 8
-static unsigned char pause_bits[] = {
- 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00 };
diff --git a/subtle/icons/pc.xbm b/subtle/icons/pc.xbm
deleted file mode 100644
index e341227..0000000
--- a/subtle/icons/pc.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define pc_width 9
-#define pc_height 9
-static unsigned char pc_bits[] = {
-   0x07, 0x00, 0x05, 0x00, 0xf5, 0x01, 0x15, 0x01, 0x15, 0x01, 0x15, 0x01,
-   0xf5, 0x01, 0x45, 0x00, 0xf7, 0x01 };
diff --git a/subtle/icons/pencil.xbm b/subtle/icons/pencil.xbm
deleted file mode 100644
index b2d43a7..0000000
--- a/subtle/icons/pencil.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define pencil_width 9
-#define pencil_height 9
-static unsigned char pencil_bits[] = {
-   0xc0, 0x00, 0x20, 0x01, 0x50, 0x01, 0x88, 0x00, 0x44, 0x00, 0x22, 0x00,
-   0x11, 0x00, 0x09, 0x00, 0x07, 0x00 };
diff --git a/subtle/icons/phone1.xbm b/subtle/icons/phone1.xbm
deleted file mode 100644
index 94b38ed..0000000
--- a/subtle/icons/phone1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define phone_width 9
-#define phone_height 9
-static unsigned char phone_bits[] = {
-   0x78, 0x00, 0x44, 0x00, 0x74, 0x00, 0x14, 0x00, 0x14, 0x00, 0x14, 0x00,
-   0x74, 0x00, 0x44, 0x00, 0x78, 0x00 };
diff --git a/subtle/icons/phone2.xbm b/subtle/icons/phone2.xbm
deleted file mode 100644
index f130aac..0000000
--- a/subtle/icons/phone2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define phone2_width 9
-#define phone2_height 9
-static unsigned char phone2_bits[] = {
-   0xfe, 0x00, 0x01, 0x01, 0x7d, 0x01, 0x45, 0x01, 0xc7, 0x01, 0x10, 0x00,
-   0x01, 0x01, 0xff, 0x01, 0x00, 0x00 };
diff --git a/subtle/icons/phones.xbm b/subtle/icons/phones.xbm
deleted file mode 100755
index cab8c58..0000000
--- a/subtle/icons/phones.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define phones_width 8
-#define phones_height 8
-static unsigned char phones_bits[] = {
- 0x3C, 0x42, 0x81, 0x81, 0xA5, 0xE7, 0xE7, 0x66 };
diff --git a/subtle/icons/pin.xbm b/subtle/icons/pin.xbm
deleted file mode 100644
index 17413fd..0000000
--- a/subtle/icons/pin.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define pin_width 9
-#define pin_height 9
-static unsigned char pin_bits[] = {
-   0xf0, 0x00, 0x90, 0x01, 0x10, 0x01, 0x0e, 0x01, 0xc1, 0x01, 0x22, 0x00,
-   0x24, 0x00, 0x2a, 0x00, 0x11, 0x00 };
diff --git a/subtle/icons/play.xbm b/subtle/icons/play.xbm
deleted file mode 100755
index d42ad52..0000000
--- a/subtle/icons/play.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define play_width 8
-#define play_height 8
-static unsigned char play_bits[] = {
- 0x00, 0x06, 0x1E, 0x7E, 0x7E, 0x1E, 0x06, 0x00 };
diff --git a/subtle/icons/player_bwd1.xbm b/subtle/icons/player_bwd1.xbm
deleted file mode 100644
index eb4e616..0000000
--- a/subtle/icons/player_bwd1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define backward_width 9
-#define backward_height 9
-static unsigned char backward_bits[] = {
-   0x00, 0x00, 0x90, 0x00, 0xd8, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0xfc, 0x00,
-   0xd8, 0x00, 0x90, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/player_bwd2.xbm b/subtle/icons/player_bwd2.xbm
deleted file mode 100644
index d3743aa..0000000
--- a/subtle/icons/player_bwd2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_bwd2_width 9
-#define player_bwd2_height 9
-static unsigned char player_bwd2_bits[] = {
-   0x00, 0x00, 0x90, 0x00, 0x48, 0x00, 0x24, 0x00, 0x12, 0x00, 0x24, 0x00,
-   0x48, 0x00, 0x90, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/player_fwd1.xbm b/subtle/icons/player_fwd1.xbm
deleted file mode 100644
index 274e6f9..0000000
--- a/subtle/icons/player_fwd1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define foward_width 9
-#define foward_height 9
-static unsigned char foward_bits[] = {
-   0x00, 0x00, 0x12, 0x00, 0x36, 0x00, 0x7e, 0x00, 0x7e, 0x00, 0x7e, 0x00,
-   0x36, 0x00, 0x12, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/player_fwd2.xbm b/subtle/icons/player_fwd2.xbm
deleted file mode 100644
index ddcd9c6..0000000
--- a/subtle/icons/player_fwd2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_fwd2_width 9
-#define player_fwd2_height 9
-static unsigned char player_fwd2_bits[] = {
-   0x00, 0x00, 0x12, 0x00, 0x24, 0x00, 0x48, 0x00, 0x90, 0x00, 0x48, 0x00,
-   0x24, 0x00, 0x12, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/player_next1.xbm b/subtle/icons/player_next1.xbm
deleted file mode 100644
index 9fb26fb..0000000
--- a/subtle/icons/player_next1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_next_width 9
-#define player_next_height 9
-static unsigned char player_next_bits[] = {
-   0x00, 0x00, 0x42, 0x00, 0x4e, 0x00, 0x7e, 0x00, 0x7e, 0x00, 0x7e, 0x00,
-   0x4e, 0x00, 0x42, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/player_next2.xbm b/subtle/icons/player_next2.xbm
deleted file mode 100644
index d86b44a..0000000
--- a/subtle/icons/player_next2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_next2_width 9
-#define player_next2_height 9
-static unsigned char player_next2_bits[] = {
-   0x00, 0x00, 0x44, 0x00, 0x48, 0x00, 0x50, 0x00, 0x60, 0x00, 0x50, 0x00,
-   0x48, 0x00, 0x44, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/player_pause1.xbm b/subtle/icons/player_pause1.xbm
deleted file mode 100644
index ed6757e..0000000
--- a/subtle/icons/player_pause1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_pause_width 9
-#define player_pause_height 9
-static unsigned char player_pause_bits[] = {
-   0x00, 0x00, 0xc6, 0x00, 0xc6, 0x00, 0xc6, 0x00, 0xc6, 0x00, 0xc6, 0x00,
-   0xc6, 0x00, 0xc6, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/player_pause2.xbm b/subtle/icons/player_pause2.xbm
deleted file mode 100644
index 0f0cb87..0000000
--- a/subtle/icons/player_pause2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_pause2_width 9
-#define player_pause2_height 9
-static unsigned char player_pause2_bits[] = {
-   0x00, 0x00, 0x44, 0x00, 0x44, 0x00, 0x44, 0x00, 0x44, 0x00, 0x44, 0x00,
-   0x44, 0x00, 0x44, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/player_play1.xbm b/subtle/icons/player_play1.xbm
deleted file mode 100644
index a0109ed..0000000
--- a/subtle/icons/player_play1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_play_width 9
-#define player_play_height 9
-static unsigned char player_play_bits[] = {
-   0x00, 0x00, 0x06, 0x00, 0x1e, 0x00, 0x7e, 0x00, 0xfe, 0x00, 0x7e, 0x00,
-   0x1e, 0x00, 0x06, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/player_play2.xbm b/subtle/icons/player_play2.xbm
deleted file mode 100644
index 9ee7163..0000000
--- a/subtle/icons/player_play2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_play2_width 9
-#define player_play2_height 9
-static unsigned char player_play2_bits[] = {
-   0x00, 0x00, 0x08, 0x00, 0x10, 0x00, 0x20, 0x00, 0x40, 0x00, 0x20, 0x00,
-   0x10, 0x00, 0x08, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/player_prev1.xbm b/subtle/icons/player_prev1.xbm
deleted file mode 100644
index 48465f7..0000000
--- a/subtle/icons/player_prev1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_prev_width 9
-#define player_prev_height 9
-static unsigned char player_prev_bits[] = {
-   0x00, 0x00, 0x84, 0x00, 0xe4, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0xfc, 0x00,
-   0xe4, 0x00, 0x84, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/player_prev2.xbm b/subtle/icons/player_prev2.xbm
deleted file mode 100644
index 55347b9..0000000
--- a/subtle/icons/player_prev2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_prev2_width 9
-#define player_prev2_height 9
-static unsigned char player_prev2_bits[] = {
-   0x00, 0x00, 0x44, 0x00, 0x24, 0x00, 0x14, 0x00, 0x0c, 0x00, 0x14, 0x00,
-   0x24, 0x00, 0x44, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/player_repeat1.xbm b/subtle/icons/player_repeat1.xbm
deleted file mode 100644
index e4c805d..0000000
--- a/subtle/icons/player_repeat1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_repeat1_width 9
-#define player_repeat1_height 9
-static unsigned char player_repeat1_bits[] = {
-   0x38, 0x00, 0x44, 0x00, 0x82, 0x00, 0x82, 0x00, 0x8a, 0x00, 0x5c, 0x00,
-   0x38, 0x00, 0x18, 0x00, 0x08, 0x00 };
diff --git a/subtle/icons/player_repeat2.xbm b/subtle/icons/player_repeat2.xbm
deleted file mode 100644
index e801bc3..0000000
--- a/subtle/icons/player_repeat2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_repeat2_width 9
-#define player_repeat2_height 9
-static unsigned char player_repeat2_bits[] = {
-   0x00, 0x00, 0xfe, 0x00, 0x82, 0x00, 0x82, 0x00, 0x8a, 0x00, 0x92, 0x00,
-   0xfe, 0x00, 0x10, 0x00, 0x08, 0x00 };
diff --git a/subtle/icons/player_shuffle1.xbm b/subtle/icons/player_shuffle1.xbm
deleted file mode 100644
index 9a26178..0000000
--- a/subtle/icons/player_shuffle1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_shuffle1_width 9
-#define player_shuffle1_height 9
-static unsigned char player_shuffle1_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xe3, 0x01, 0x14, 0x00, 0x48, 0x00, 0xd4, 0x00,
-   0xe3, 0x01, 0xc0, 0x00, 0x40, 0x00 };
diff --git a/subtle/icons/player_shuffle2.xbm b/subtle/icons/player_shuffle2.xbm
deleted file mode 100644
index 3a6ed8b..0000000
--- a/subtle/icons/player_shuffle2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_shuffle2_width 9
-#define player_shuffle2_height 9
-static unsigned char player_shuffle2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xe3, 0x01, 0x14, 0x00, 0x48, 0x00, 0x94, 0x00,
-   0xe3, 0x01, 0x80, 0x00, 0x40, 0x00 };
diff --git a/subtle/icons/player_stop1.xbm b/subtle/icons/player_stop1.xbm
deleted file mode 100644
index 1d08e72..0000000
--- a/subtle/icons/player_stop1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_stop_width 9
-#define player_stop_height 9
-static unsigned char player_stop_bits[] = {
-   0x00, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0xfe, 0x00,
-   0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/player_stop2.xbm b/subtle/icons/player_stop2.xbm
deleted file mode 100644
index 6f018bb..0000000
--- a/subtle/icons/player_stop2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_stop2_width 9
-#define player_stop2_height 9
-static unsigned char player_stop2_bits[] = {
-   0x00, 0x00, 0xfe, 0x00, 0x82, 0x00, 0x82, 0x00, 0x82, 0x00, 0x82, 0x00,
-   0x82, 0x00, 0xfe, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/plug.xbm b/subtle/icons/plug.xbm
deleted file mode 100644
index e1e35f7..0000000
--- a/subtle/icons/plug.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define plug_width 9
-#define plug_height 9
-static unsigned char plug_bits[] = {
-   0x03, 0x00, 0x0f, 0x00, 0x1e, 0x00, 0x3e, 0x00, 0x7c, 0x00, 0x78, 0x00,
-   0xb0, 0x00, 0x40, 0x01, 0x80, 0x01 };
diff --git a/subtle/icons/plus.xbm b/subtle/icons/plus.xbm
deleted file mode 100644
index 151c87b..0000000
--- a/subtle/icons/plus.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define plus_width 9
-#define plus_height 9
-static unsigned char plus_bits[] = {
-   0x38, 0x00, 0x28, 0x00, 0x28, 0x00, 0xef, 0x01, 0x01, 0x01, 0xef, 0x01,
-   0x28, 0x00, 0x28, 0x00, 0x38, 0x00 };
diff --git a/subtle/icons/plus_1.xbm b/subtle/icons/plus_1.xbm
deleted file mode 100644
index f8e5f8a..0000000
--- a/subtle/icons/plus_1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define occupied_width 8
-#define occupied_height 16
-static unsigned char occupied_bits[] = {
-   0x00, 0x00, 0x08, 0x08, 0x3e, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/power-ac.xbm b/subtle/icons/power-ac.xbm
deleted file mode 100644
index 45ed243..0000000
--- a/subtle/icons/power-ac.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define power_ac_width 16
-#define power_ac_height 16
-static unsigned char power_ac_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x07, 0xc0, 0x3f,
-   0xe0, 0x07, 0xfc, 0x07, 0xfc, 0x07, 0xe0, 0x07, 0xc0, 0x3f, 0x80, 0x07,
-   0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/power-bat.xbm b/subtle/icons/power-bat.xbm
deleted file mode 100644
index c450bbc..0000000
--- a/subtle/icons/power-bat.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define battery_width 16
-#define battery_height 16
-static unsigned char battery_bits[] = {
-   0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f, 0x10, 0x08,
-   0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f,
-   0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0x00, 0x00 };
diff --git a/subtle/icons/power-bat2.xbm b/subtle/icons/power-bat2.xbm
deleted file mode 100644
index e7be632..0000000
--- a/subtle/icons/power-bat2.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define power_bat2_width 16
-#define power_bat2_height 16
-static unsigned char power_bat2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x1f, 0x7e, 0x18,
-   0x7e, 0x78, 0x7e, 0x78, 0x7e, 0x78, 0x7e, 0x78, 0x7e, 0x18, 0xfe, 0x1f,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/prev.xbm b/subtle/icons/prev.xbm
deleted file mode 100755
index 8774315..0000000
--- a/subtle/icons/prev.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define prev_width 8
-#define prev_height 8
-static unsigned char prev_bits[] = {
- 0x00, 0x42, 0x72, 0x7E, 0x7E, 0x72, 0x42, 0x00 };
diff --git a/subtle/icons/puzzle.xbm b/subtle/icons/puzzle.xbm
deleted file mode 100644
index 9455111..0000000
--- a/subtle/icons/puzzle.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define puzzle_width 9
-#define puzzle_height 9
-static unsigned char puzzle_bits[] = {
-   0xe0, 0x00, 0xa0, 0x00, 0xbc, 0x01, 0x04, 0x01, 0x07, 0x01, 0x01, 0x01,
-   0x77, 0x01, 0x54, 0x01, 0xdc, 0x01 };
diff --git a/subtle/icons/question.xbm b/subtle/icons/question.xbm
deleted file mode 100644
index 122f2a5..0000000
--- a/subtle/icons/question.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define question_width 9
-#define question_height 9
-static unsigned char question_bits[] = {
-   0x00, 0x00, 0x38, 0x00, 0x44, 0x00, 0x44, 0x00, 0x20, 0x00, 0x10, 0x00,
-   0x10, 0x00, 0x00, 0x00, 0x10, 0x00 };
diff --git a/subtle/icons/quote.xbm b/subtle/icons/quote.xbm
deleted file mode 100644
index 9816868..0000000
--- a/subtle/icons/quote.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define quote_width 9
-#define quote_height 9
-static unsigned char quote_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x42, 0x00, 0x42, 0x00,
-   0xc6, 0x00, 0xc6, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/radio.xbm b/subtle/icons/radio.xbm
deleted file mode 100644
index f764f6f..0000000
--- a/subtle/icons/radio.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define radio_width 9
-#define radio_height 9
-static unsigned char radio_bits[] = {
-   0x80, 0x00, 0xfe, 0x00, 0x82, 0x00, 0xba, 0x00, 0xaa, 0x00, 0xba, 0x00,
-   0x82, 0x00, 0x82, 0x00, 0xfe, 0x00 };
diff --git a/subtle/icons/rss.xbm b/subtle/icons/rss.xbm
deleted file mode 100644
index 1b5937d..0000000
--- a/subtle/icons/rss.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define rss_width 9
-#define rss_height 9
-static unsigned char rss_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x7d, 0x01, 0x41, 0x01, 0x5d, 0x01, 0x51, 0x01,
-   0x55, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/ruby.xbm b/subtle/icons/ruby.xbm
deleted file mode 100644
index f64820a..0000000
--- a/subtle/icons/ruby.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define ruby_width 9
-#define ruby_height 9
-static unsigned char ruby_bits[] = {
-   0xe0, 0x01, 0xb0, 0x01, 0x58, 0x01, 0x2c, 0x01, 0x16, 0x01, 0x0b, 0x01,
-   0x45, 0x01, 0x23, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/ruler.xbm b/subtle/icons/ruler.xbm
deleted file mode 100644
index 4eaa6b4..0000000
--- a/subtle/icons/ruler.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define ruler_width 9
-#define ruler_height 9
-static unsigned char ruler_bits[] = {
-   0x0e, 0x00, 0xff, 0x01, 0x0b, 0x01, 0xff, 0x01, 0x0a, 0x00, 0x0a, 0x00,
-   0x0a, 0x00, 0x0a, 0x00, 0x0e, 0x00 };
diff --git a/subtle/icons/rwd.xbm b/subtle/icons/rwd.xbm
deleted file mode 100755
index 5170b21..0000000
--- a/subtle/icons/rwd.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define rwd_width 8
-#define rwd_height 8
-static unsigned char rwd_bits[] = {
- 0x00, 0x48, 0x6C, 0x7E, 0x7E, 0x6C, 0x48, 0x00 };
diff --git a/subtle/icons/scorpio.xbm b/subtle/icons/scorpio.xbm
deleted file mode 100755
index befc2ca..0000000
--- a/subtle/icons/scorpio.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define scorpio_width 8
-#define scorpio_height 8
-static unsigned char scorpio_bits[] = {
- 0x42, 0x81, 0xDB, 0x3C, 0xDB, 0x5A, 0x99, 0x30 };
diff --git a/subtle/icons/screen.xbm b/subtle/icons/screen.xbm
deleted file mode 100644
index 8964209..0000000
--- a/subtle/icons/screen.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define screen_width 9
-#define screen_height 9
-static unsigned char screen_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-   0xff, 0x01, 0x10, 0x00, 0x7c, 0x00 };
diff --git a/subtle/icons/screw.xbm b/subtle/icons/screw.xbm
deleted file mode 100644
index e3aa8bf..0000000
--- a/subtle/icons/screw.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define screw_width 9
-#define screw_height 9
-static unsigned char screw_bits[] = {
-   0x70, 0x00, 0x48, 0x00, 0xa8, 0x01, 0x48, 0x01, 0x14, 0x01, 0xe2, 0x00,
-   0x11, 0x00, 0x09, 0x00, 0x07, 0x00 };
diff --git a/subtle/icons/scroll.xbm b/subtle/icons/scroll.xbm
deleted file mode 100644
index 647d2a9..0000000
--- a/subtle/icons/scroll.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define scroll_width 9
-#define scroll_height 9
-static unsigned char scroll_bits[] = {
-   0xfc, 0x00, 0x42, 0x01, 0x21, 0x00, 0x21, 0x00, 0x42, 0x00, 0x84, 0x00,
-   0x84, 0x00, 0x42, 0x00, 0x3f, 0x00 };
diff --git a/subtle/icons/selection.xbm b/subtle/icons/selection.xbm
deleted file mode 100644
index 832ef82..0000000
--- a/subtle/icons/selection.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define selection_width 9
-#define selection_height 9
-static unsigned char selection_bits[] = {
-   0x55, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
-   0x01, 0x01, 0x00, 0x00, 0x55, 0x01 };
diff --git a/subtle/icons/shelf.xbm b/subtle/icons/shelf.xbm
deleted file mode 100644
index a883cf0..0000000
--- a/subtle/icons/shelf.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define shelf_width 9
-#define shelf_height 9
-static unsigned char shelf_bits[] = {
-   0xfe, 0x00, 0x82, 0x00, 0xba, 0x00, 0x82, 0x00, 0xfe, 0x00, 0x82, 0x00,
-   0xba, 0x00, 0x82, 0x00, 0xfe, 0x00 };
diff --git a/subtle/icons/shelter.xbm b/subtle/icons/shelter.xbm
deleted file mode 100644
index 7f5f59c..0000000
--- a/subtle/icons/shelter.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define shelter_width 13
-#define shelter_height 8
-static unsigned char shelter_bits[] = {
-   0xff, 0x1f, 0xff, 0x1f, 0xff, 0x1f, 0xff, 0x1f, 0xff, 0x1f, 0x1f, 0x1f,
-   0x0f, 0x1e, 0x0f, 0x1e };
diff --git a/subtle/icons/shift_down.xbm b/subtle/icons/shift_down.xbm
deleted file mode 100644
index 34e1643..0000000
--- a/subtle/icons/shift_down.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define shift_down_width 9
-#define shift_down_height 9
-static unsigned char shift_down_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x82, 0x00, 0x44, 0x00, 0x28, 0x00,
-   0x10, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/shift_left.xbm b/subtle/icons/shift_left.xbm
deleted file mode 100644
index 956b15f..0000000
--- a/subtle/icons/shift_left.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define shift_left_width 9
-#define shift_left_height 9
-static unsigned char shift_left_bits[] = {
-   0x40, 0x00, 0x20, 0x00, 0x10, 0x00, 0x08, 0x00, 0x04, 0x00, 0x08, 0x00,
-   0x10, 0x00, 0x20, 0x00, 0x40, 0x00 };
diff --git a/subtle/icons/shift_right.xbm b/subtle/icons/shift_right.xbm
deleted file mode 100644
index a527f81..0000000
--- a/subtle/icons/shift_right.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define shift_right_width 9
-#define shift_right_height 9
-static unsigned char shift_right_bits[] = {
-   0x04, 0x00, 0x08, 0x00, 0x10, 0x00, 0x20, 0x00, 0x40, 0x00, 0x20, 0x00,
-   0x10, 0x00, 0x08, 0x00, 0x04, 0x00 };
diff --git a/subtle/icons/shift_up.xbm b/subtle/icons/shift_up.xbm
deleted file mode 100644
index 6447c44..0000000
--- a/subtle/icons/shift_up.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define shift_up_width 9
-#define shift_up_height 9
-static unsigned char shift_up_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x28, 0x00, 0x44, 0x00, 0x82, 0x00,
-   0x01, 0x01, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/shroom.xbm b/subtle/icons/shroom.xbm
deleted file mode 100755
index 62df79f..0000000
--- a/subtle/icons/shroom.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define shroom_width 8
-#define shroom_height 8
-static unsigned char shroom_bits[] = {
- 0x3C, 0x42, 0x81, 0x81, 0xFF, 0x3C, 0x3C, 0x3C };
diff --git a/subtle/icons/shuffle.xbm b/subtle/icons/shuffle.xbm
deleted file mode 100644
index 9037722..0000000
--- a/subtle/icons/shuffle.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define shuffle_width 9
-#define shuffle_height 9
-static unsigned char shuffle_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xe3, 0x01, 0x14, 0x00, 0x48, 0x00, 0xd4, 0x00,
-   0xe3, 0x01, 0xc0, 0x00, 0x40, 0x00 };
diff --git a/subtle/icons/spkr_01.xbm b/subtle/icons/spkr_01.xbm
deleted file mode 100755
index 7c2ffc4..0000000
--- a/subtle/icons/spkr_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define spkr_01_width 8
-#define spkr_01_height 8
-static unsigned char spkr_01_bits[] = {
- 0x08, 0x4C, 0x8F, 0xAF, 0xAF, 0x8F, 0x4C, 0x08 };
diff --git a/subtle/icons/spkr_02.xbm b/subtle/icons/spkr_02.xbm
deleted file mode 100755
index 8265bf8..0000000
--- a/subtle/icons/spkr_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define spkr_02_width 8
-#define spkr_02_height 8
-static unsigned char spkr_02_bits[] = {
- 0x08, 0x0C, 0x0F, 0x1F, 0x1F, 0x0F, 0x0C, 0x08 };
diff --git a/subtle/icons/spkr_03.xbm b/subtle/icons/spkr_03.xbm
deleted file mode 100755
index fd45a6c..0000000
--- a/subtle/icons/spkr_03.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define ysick_width 8
-#define ysick_height 8
-static unsigned char ysick_bits[] = {
- 0x4C, 0x93, 0x93, 0x97, 0x97, 0x93, 0x93, 0x4C };
diff --git a/subtle/icons/stop.xbm b/subtle/icons/stop.xbm
deleted file mode 100755
index f92b64d..0000000
--- a/subtle/icons/stop.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define stop_width 8
-#define stop_height 8
-static unsigned char stop_bits[] = {
- 0x00, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x00 };
diff --git a/subtle/icons/tag.xbm b/subtle/icons/tag.xbm
deleted file mode 100644
index c829f60..0000000
--- a/subtle/icons/tag.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define tag_width 9
-#define tag_height 9
-static unsigned char tag_bits[] = {
-   0xe0, 0x01, 0x10, 0x01, 0x08, 0x01, 0x24, 0x01, 0x82, 0x00, 0x41, 0x00,
-   0x22, 0x00, 0x14, 0x00, 0x08, 0x00 };
diff --git a/subtle/icons/temp.xbm b/subtle/icons/temp.xbm
deleted file mode 100644
index 9d83a5f..0000000
--- a/subtle/icons/temp.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define temp_width 9
-#define temp_height 9
-static unsigned char temp_bits[] = {
-   0x80, 0x01, 0xc8, 0x01, 0xe0, 0x00, 0x52, 0x00, 0x28, 0x00, 0x16, 0x00,
-   0x09, 0x00, 0x09, 0x00, 0x06, 0x00 };
diff --git a/subtle/icons/temp_1.xbm b/subtle/icons/temp_1.xbm
deleted file mode 100644
index f37932b..0000000
--- a/subtle/icons/temp_1.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define temp_width 16
-#define temp_height 16
-static unsigned char temp_bits[] = {
-   0x00, 0x00, 0x80, 0x01, 0xc0, 0x0b, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x0b,
-   0x40, 0x02, 0x40, 0x02, 0x40, 0x0a, 0x40, 0x02, 0x40, 0x02, 0x60, 0x06,
-   0x20, 0x04, 0x60, 0x06, 0xc0, 0x03, 0x00, 0x00 };
diff --git a/subtle/icons/terminal.xbm b/subtle/icons/terminal.xbm
deleted file mode 100644
index d346810..0000000
--- a/subtle/icons/terminal.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define terminal_width 9
-#define terminal_height 9
-static unsigned char terminal_bits[] = {
-   0x00, 0x00, 0xff, 0x01, 0x01, 0x01, 0x05, 0x01, 0x09, 0x01, 0x35, 0x01,
-   0x01, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/test.xbm b/subtle/icons/test.xbm
deleted file mode 100755
index 756e899..0000000
--- a/subtle/icons/test.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define test_width 8
-#define test_height 8
-static unsigned char test_bits[] = {
- 0x0E, 0x13, 0x21, 0x41, 0x82, 0x84, 0xC8, 0x70 };
diff --git a/subtle/icons/thumb_down.xbm b/subtle/icons/thumb_down.xbm
deleted file mode 100644
index 9931862..0000000
--- a/subtle/icons/thumb_down.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define thumb_down_width 9
-#define thumb_down_height 9
-static unsigned char thumb_down_bits[] = {
-   0xff, 0x00, 0x01, 0x01, 0x1f, 0x00, 0x01, 0x00, 0x1f, 0x00, 0x01, 0x01,
-   0x9f, 0x00, 0x50, 0x00, 0x30, 0x00 };
diff --git a/subtle/icons/thumb_up.xbm b/subtle/icons/thumb_up.xbm
deleted file mode 100644
index 1e53767..0000000
--- a/subtle/icons/thumb_up.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define thumb_up_width 9
-#define thumb_up_height 9
-static unsigned char thumb_up_bits[] = {
-   0x18, 0x00, 0x14, 0x00, 0xf2, 0x01, 0x01, 0x01, 0xf0, 0x01, 0x00, 0x01,
-   0xf0, 0x01, 0x01, 0x01, 0xfe, 0x01 };
diff --git a/subtle/icons/tile1.xbm b/subtle/icons/tile1.xbm
deleted file mode 100644
index 128cc84..0000000
--- a/subtle/icons/tile1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define tile_width 9
-#define tile_height 9
-static unsigned char tile_bits[] = {
-   0xfe, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x1f, 0x01, 0x11, 0x01,
-   0x11, 0x01, 0xf1, 0x01, 0x1f, 0x00 };
diff --git a/subtle/icons/tile2.xbm b/subtle/icons/tile2.xbm
deleted file mode 100644
index 9dc05a6..0000000
--- a/subtle/icons/tile2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define tile2_width 9
-#define tile2_height 9
-static unsigned char tile2_bits[] = {
-   0xf8, 0x01, 0x08, 0x01, 0x08, 0x01, 0x3f, 0x01, 0x21, 0x01, 0xe1, 0x01,
-   0x21, 0x00, 0x21, 0x00, 0x3f, 0x00 };
diff --git a/subtle/icons/tile3.xbm b/subtle/icons/tile3.xbm
deleted file mode 100644
index 0cb4b43..0000000
--- a/subtle/icons/tile3.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define tile3_width 9
-#define tile3_height 9
-static unsigned char tile3_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x1f, 0x01, 0x11, 0x01,
-   0x11, 0x01, 0x11, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/trash.xbm b/subtle/icons/trash.xbm
deleted file mode 100644
index 8ba3b3d..0000000
--- a/subtle/icons/trash.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define trash_width 9
-#define trash_height 9
-static unsigned char trash_bits[] = {
-   0x38, 0x00, 0xef, 0x01, 0x01, 0x01, 0xff, 0x01, 0x82, 0x00, 0xaa, 0x00,
-   0xaa, 0x00, 0x82, 0x00, 0xfe, 0x00 };
diff --git a/subtle/icons/tv.xbm b/subtle/icons/tv.xbm
deleted file mode 100644
index 5b4fcb0..0000000
--- a/subtle/icons/tv.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define tv_width 9
-#define tv_height 9
-static unsigned char tv_bits[] = {
-   0x44, 0x00, 0x28, 0x00, 0xff, 0x01, 0x01, 0x01, 0x7d, 0x01, 0x7d, 0x01,
-   0x7d, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/icons/ufo.xbm b/subtle/icons/ufo.xbm
deleted file mode 100644
index 80345e3..0000000
--- a/subtle/icons/ufo.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define ufo_width 13
-#define ufo_height 8
-static unsigned char ufo_bits[] = {
-   0xf0, 0x01, 0xf8, 0x03, 0xfc, 0x07, 0xae, 0x0e, 0xff, 0x1f, 0xee, 0x0e,
-   0x04, 0x04, 0x00, 0x00 };
diff --git a/subtle/icons/up.xbm b/subtle/icons/up.xbm
deleted file mode 100644
index 2fb6f25..0000000
--- a/subtle/icons/up.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define up_width 16
-#define up_height 16
-static unsigned char up_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x80, 0x00, 0xc0, 0x01, 0xe0, 0x03, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/usb.xbm b/subtle/icons/usb.xbm
deleted file mode 100644
index 6d17f9d..0000000
--- a/subtle/icons/usb.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define usb_width 9
-#define usb_height 9
-static unsigned char usb_bits[] = {
-   0x10, 0x00, 0x50, 0x00, 0x54, 0x00, 0x54, 0x00, 0x54, 0x00, 0x34, 0x00,
-   0x18, 0x00, 0x10, 0x00, 0x10, 0x00 };
diff --git a/subtle/icons/usb_02.xbm b/subtle/icons/usb_02.xbm
deleted file mode 100755
index 77eeda0..0000000
--- a/subtle/icons/usb_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define usb_02_width 8
-#define usb_02_height 8
-static unsigned char usb_02_bits[] = {
- 0x10, 0x50, 0x54, 0x54, 0x34, 0x18, 0x10, 0x10 };
diff --git a/subtle/icons/usb_1.xbm b/subtle/icons/usb_1.xbm
deleted file mode 100644
index 6d17f9d..0000000
--- a/subtle/icons/usb_1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define usb_width 9
-#define usb_height 9
-static unsigned char usb_bits[] = {
-   0x10, 0x00, 0x50, 0x00, 0x54, 0x00, 0x54, 0x00, 0x54, 0x00, 0x34, 0x00,
-   0x18, 0x00, 0x10, 0x00, 0x10, 0x00 };
diff --git a/subtle/icons/vol-hi.xbm b/subtle/icons/vol-hi.xbm
deleted file mode 100644
index 7c4a849..0000000
--- a/subtle/icons/vol-hi.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define vol_hi2_width 16
-#define vol_hi2_height 16
-static unsigned char vol_hi2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x80, 0x21, 0xc0, 0x49, 0xfc, 0x51,
-   0xfc, 0x55, 0xfc, 0x55, 0xfc, 0x55, 0xfc, 0x55, 0xfc, 0x51, 0xc0, 0x49,
-   0x80, 0x21, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/vol-mute.xbm b/subtle/icons/vol-mute.xbm
deleted file mode 100644
index 2d01f7b..0000000
--- a/subtle/icons/vol-mute.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define vol_mute2_width 16
-#define vol_mute2_height 16
-static unsigned char vol_mute2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x01, 0xc0, 0x01, 0xfc, 0x01,
-   0xfc, 0x01, 0xfc, 0x29, 0xfc, 0x11, 0xfc, 0x29, 0xfc, 0x01, 0xc0, 0x01,
-   0x80, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/volume.xbm b/subtle/icons/volume.xbm
deleted file mode 100644
index 7c4a849..0000000
--- a/subtle/icons/volume.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define vol_hi2_width 16
-#define vol_hi2_height 16
-static unsigned char vol_hi2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x80, 0x21, 0xc0, 0x49, 0xfc, 0x51,
-   0xfc, 0x55, 0xfc, 0x55, 0xfc, 0x55, 0xfc, 0x55, 0xfc, 0x51, 0xc0, 0x49,
-   0x80, 0x21, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/volume_minus.xbm b/subtle/icons/volume_minus.xbm
deleted file mode 100644
index cee69a0..0000000
--- a/subtle/icons/volume_minus.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define volume_minus_width 9
-#define volume_minus_height 9
-static unsigned char volume_minus_bits[] = {
-   0x10, 0x00, 0x18, 0x00, 0x14, 0x00, 0x13, 0x00, 0xd1, 0x01, 0x13, 0x00,
-   0x14, 0x00, 0x18, 0x00, 0x10, 0x00 };
diff --git a/subtle/icons/volume_off.xbm b/subtle/icons/volume_off.xbm
deleted file mode 100644
index ae8f85c..0000000
--- a/subtle/icons/volume_off.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define volume_off_width 9
-#define volume_off_height 9
-static unsigned char volume_off_bits[] = {
-   0x10, 0x00, 0x18, 0x00, 0x14, 0x00, 0x13, 0x00, 0x11, 0x00, 0x13, 0x00,
-   0x14, 0x00, 0x18, 0x00, 0x10, 0x00 };
diff --git a/subtle/icons/volume_on.xbm b/subtle/icons/volume_on.xbm
deleted file mode 100644
index 47176c2..0000000
--- a/subtle/icons/volume_on.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define volume_on_width 9
-#define volume_on_height 9
-static unsigned char volume_on_bits[] = {
-   0x10, 0x00, 0x98, 0x00, 0x14, 0x01, 0x53, 0x01, 0x51, 0x01, 0x53, 0x01,
-   0x14, 0x01, 0x98, 0x00, 0x10, 0x00 };
diff --git a/subtle/icons/volume_plus.xbm b/subtle/icons/volume_plus.xbm
deleted file mode 100644
index bba8b82..0000000
--- a/subtle/icons/volume_plus.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define volume_plus_width 9
-#define volume_plus_height 9
-static unsigned char volume_plus_bits[] = {
-   0x10, 0x00, 0x18, 0x00, 0x14, 0x00, 0x93, 0x00, 0xd1, 0x01, 0x93, 0x00,
-   0x14, 0x00, 0x18, 0x00, 0x10, 0x00 };
diff --git a/subtle/icons/wait.xbm b/subtle/icons/wait.xbm
deleted file mode 100644
index 76e8c9c..0000000
--- a/subtle/icons/wait.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define wait_width 9
-#define wait_height 9
-static unsigned char wait_bits[] = {
-   0xfe, 0x00, 0x82, 0x00, 0x44, 0x00, 0x28, 0x00, 0x10, 0x00, 0x28, 0x00,
-   0x54, 0x00, 0xba, 0x00, 0xfe, 0x00 };
diff --git a/subtle/icons/wand.xbm b/subtle/icons/wand.xbm
deleted file mode 100644
index f6a24ea..0000000
--- a/subtle/icons/wand.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define wand_width 9
-#define wand_height 9
-static unsigned char wand_bits[] = {
-   0x88, 0x00, 0x5c, 0x01, 0xe8, 0x00, 0x74, 0x00, 0x38, 0x00, 0x1c, 0x00,
-   0x0e, 0x00, 0x07, 0x00, 0x02, 0x00 };
diff --git a/subtle/icons/water.xbm b/subtle/icons/water.xbm
deleted file mode 100644
index 0e54682..0000000
--- a/subtle/icons/water.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define water_width 9
-#define water_height 9
-static unsigned char water_bits[] = {
-   0x10, 0x00, 0x10, 0x00, 0x28, 0x00, 0x44, 0x00, 0x82, 0x00, 0x82, 0x00,
-   0x82, 0x00, 0x44, 0x00, 0x38, 0x00 };
diff --git a/subtle/icons/wifi.xbm b/subtle/icons/wifi.xbm
deleted file mode 100644
index 7947e04..0000000
--- a/subtle/icons/wifi.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define wifi_width 9
-#define wifi_height 9
-static unsigned char wifi_bits[] = {
-   0x00, 0x00, 0x40, 0x00, 0x90, 0x00, 0xa4, 0x00, 0xa9, 0x00, 0xa4, 0x00,
-   0x90, 0x00, 0x40, 0x00, 0x00, 0x00 };
diff --git a/subtle/icons/wifi_01.xbm b/subtle/icons/wifi_01.xbm
deleted file mode 100755
index 315d0f7..0000000
--- a/subtle/icons/wifi_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define wifi_01_width 8
-#define wifi_01_height 8
-static unsigned char wifi_01_bits[] = {
- 0x80, 0xA0, 0xA8, 0xAB, 0xAB, 0xA8, 0xA0, 0x80 };
diff --git a/subtle/icons/wifi_02.xbm b/subtle/icons/wifi_02.xbm
deleted file mode 100755
index bd2b3ee..0000000
--- a/subtle/icons/wifi_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define wifi_02_width 8
-#define wifi_02_height 8
-static unsigned char wifi_02_bits[] = {
- 0x40, 0x90, 0xA4, 0xA9, 0xA9, 0xA4, 0x90, 0x40 };
diff --git a/subtle/icons/world.xbm b/subtle/icons/world.xbm
deleted file mode 100644
index 50b8383..0000000
--- a/subtle/icons/world.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define earth_width 9
-#define earth_height 9
-static unsigned char earth_bits[] = {
-   0x38, 0x00, 0x44, 0x00, 0xb2, 0x00, 0x65, 0x01, 0x65, 0x01, 0x01, 0x01,
-   0x9a, 0x00, 0x44, 0x00, 0x38, 0x00 };
diff --git a/subtle/icons/wrench.xbm b/subtle/icons/wrench.xbm
deleted file mode 100644
index f0b07eb..0000000
--- a/subtle/icons/wrench.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define wrench_width 9
-#define wrench_height 9
-static unsigned char wrench_bits[] = {
-   0x60, 0x00, 0x20, 0x00, 0x20, 0x01, 0xf0, 0x01, 0x38, 0x00, 0x1e, 0x00,
-   0x09, 0x00, 0x09, 0x00, 0x06, 0x00 };
diff --git a/subtle/subtle.bak b/subtle/subtle.bak
deleted file mode 100644
index 53bd0c8..0000000
--- a/subtle/subtle.bak
+++ /dev/null
@@ -1,571 +0,0 @@
-#
-# This program can be distributed under the terms of the GNU GPL.
-# See the file COPYING.
-#
-# $Id: .config/subtle/subtle.rb,v 390 2011/10/02 09:06:16 unexist $
-#
-
-require "socket"
-
-# Contrib {{{
-begin
-  require "#{ENV["HOME"]}/bin/subtle-contrib/ruby/launcher.rb"
-  require "#{ENV["HOME"]}/bin/subtle-contrib/ruby/selector.rb"
-
-  Subtle::Contrib::Selector.font  = "xft:Envy Code R:pixelsize=13"
-  Subtle::Contrib::Launcher.fonts = [
-    "xft:Envy Code R:pixelsize=80",
-    "xft:Envy Code R:pixelsize=13"
-  ]
-
-  Subtle::Contrib::Launcher.browser_screen_num = 0
-rescue LoadError
-end # }}}
-
-# Options {{{
-set :step,      5
-set :snap,      10
-set :gravity,   :center
-set :urgent,    false
-set :resize,    false
-set :tiling,    false
-set :separator, "∞"
-# }}}
-
-# Screens {{{
-screen 1 do
-  stipple false
-  top     [:title, :spacer, :views, :center, :clock, :fuzzytime, :separator, :tray, :center]
-  bottom  [:mpd]
-  view    1
-end
-
-# }}}
-
-# Styles {{{
-style :all do
-  padding    2, 6, 2, 6
-  background "#1a1a1a"
-  font       "xft:Envy Code R:pixelsize=13"
-end
-
-style :title do
-  foreground "#FFFFFF"
-end
-
-style :views do
-  style :focus do
-    foreground    "#ffffff"
-    border_bottom "#acaa53", 2
-  end
-
-  style :occupied do
-    foreground    "#7c7c72"
-    border_bottom "#949269", 2
-  end
-
-  style :unoccupied do
-    foreground "#7c7c72"
-  end
-
-  style :urgent do
-    foreground "#c0bd5c"
-    icon       "#c0bd5c"
-  end
-
-  style :visible do
-    padding_top 0
-    border_top  "#494948", 2
-  end
-end
-
-style :sublets do
-  foreground "#7c7c72"
-  icon       "#7c7c72"
-end
-
-style :separator do
-  foreground "#acaa53"
-end
-
-style :clients do
-  active   "#7c7c72", 2
-  inactive "#494948", 2
-  margin   2
-end
-
-style :subtle do
-  panel      "#1a1a1a"
-  background "#595959"
-  stipple    "#595959"
-end # }}}
-
-# Gravities {{{
-gravity :top_left,       [   0,   0,  50,  50 ]
-gravity :top_left66,     [   0,   0,  50,  66 ]
-gravity :top_left33,     [   0,   0,  50,  34 ]
-
-gravity :top,            [   0,   0, 100,  50 ]
-gravity :top75,          [   0,   0, 100,  75 ]
-gravity :top66,          [   0,   0, 100,  66 ]
-gravity :top33,          [   0,   0, 100,  34 ]
-
-gravity :top_right,      [  50,   0,  50,  50 ]
-gravity :top_right66,    [  50,   0,  50,  66 ]
-gravity :top_right33,    [  50,   0,  50,  33 ]
-
-gravity :left,           [   0,   0,  50, 100 ]
-gravity :left66,         [   0,   0,  66, 100 ]
-gravity :left33,         [   0,   0,  33, 100 ]
-
-gravity :center,         [   0,   0, 100, 100 ]
-gravity :center66,       [  17,  17,  66,  66 ]
-gravity :center33,       [  33,  33,  33,  33 ]
-
-gravity :right,          [  50,   0,  50, 100 ]
-gravity :right66,        [  34,   0,  66, 100 ]
-gravity :right33,        [  67,  50,  33, 100 ]
-
-gravity :bottom_left,    [   0,  50,  50,  50 ]
-gravity :bottom_left66,  [   0,  34,  50,  66 ]
-gravity :bottom_left33,  [   0,  67,  50,  33 ]
-gravity :bottom_left25,  [   0,  75,  50,  25 ]
-
-gravity :bottom,         [   0,  50, 100,  50 ]
-gravity :bottom66,       [   0,  34, 100,  66 ]
-gravity :bottom33,       [   0,  67, 100,  33 ]
-
-gravity :bottom_right,   [  50,  50,  50,  50 ], :vert
-gravity :bottom_right66, [  50,  34,  50,  66 ]
-gravity :bottom_right33, [  50,  67,  50,  33 ]
-gravity :bottom_right25, [  50,  75,  50,  25 ]
-
-gravity :gimp_image,     [  10,   0,  80, 100 ]
-gravity :gimp_toolbox,   [   0,   0,  10, 100 ]
-gravity :gimp_dock,      [  90,   0,  10, 100 ]
-
-gravity :dia_toolbox,    [   0,   0,  15, 100 ]
-gravity :dia_window,     [  15,   0,  85, 100 ]
-# }}}
-
-# Grabs {{{
-# Host specific
-host     = Socket.gethostname
-modkey   = "W"
-gravkeys = [ "KP_7", "KP_8", "KP_9", "KP_4", "KP_5", "KP_6", "KP_1", "KP_2", "KP_3" ]
-
-if("telas" == host || "mockra" == host) #< Netbooks
-  gravkeys = [ "q", "w", "e", "a", "s", "d", "y", "x", "c" ]
-elsif("test" == host) #< Usually VMs
-  modkey = "A"
-end
-
-# Views and screens
-(1..6).each do |i|
-  grab modkey + "-#{i}",   "ViewSwitch#{i}".to_sym
-  grab modkey + "-S-#{i}", "ViewJump#{i}".to_sym
-  grab modkey + "-F#{i}",  "ScreenJump#{i}".to_sym
-end
-
-# Windows
-grab modkey + "-B1",      :WindowMove
-grab modkey + "-B3",      :WindowResize
-grab modkey + "-S-f",     :WindowFloat
-grab modkey + "-S-space", :WindowFull
-grab modkey + "-S-s",     :WindowStick
-grab modkey + "-S-equal", :WindowZaphod
-grab modkey + "-r",       :WindowRaise
-grab modkey + "-l",       :WindowLower
-grab modkey + "-Left",    :WindowLeft
-grab modkey + "-Down",    :WindowDown
-grab modkey + "-Up",      :WindowUp
-grab modkey + "-Right",   :WindowRight
-grab modkey + "-k",       :WindowKill
-grab modkey + "-h", lambda { |c| c.retag }
-
-# Reload/restart
-grab modkey + "-C-q",     :SubtleQuit
-grab modkey + "-C-r",     :SubtleReload
-grab modkey + "-C-A-r",   :SubtleRestart
-
-# Gravity keys and focus
-gravities = [
-  [:top_left, :top_left33, :top_left66],
-  [:top, :top33, :top66, :top75],
-  [:top_right, :top_right33, :top_right66],
-  [:left, :left33, :left66],
-  [:center, :center33, :center66],
-  [:right, :right33, :right66],
-  [:bottom_left, :bottom_left25, :bottom_left33, :bottom_left66],
-  [:bottom, :bottom33, :bottom66],
-  [:bottom_right, :bottom_right25, :bottom_right33, :bottom_right66]
-]
-
-gravities.each_index do |i|
-  grab "%s-%s" % [ modkey, gravkeys[i] ], gravities[i]
-
-  grab "%s-C-%s" % [ modkey, gravkeys[i] ], lambda {
-    c = Subtlext::Client.visible.select { |c|
-      gravities[i].include?(c.gravity.name.to_sym)
-    }
-
-    c.first.focus unless(c.empty?)
-  }
-end
-
-# Multimedia keys
-grab "XF86AudioMute",        :VolumeToggle
-grab "XF86AudioRaiseVolume", :VolumeRaise
-grab "XF86AudioLowerVolume", :VolumeLower
-grab "XF86AudioPlay",        :MpdToggle
-grab "XF86AudioStop",        :MpdStop
-grab "XF86AudioNext",        :MpdNext
-grab "XF86AudioPrev",        :MpdPrevious
-
-grab modkey + "-m", "mpc current | tr -d '\n' | xclip"
-
-# Programs
-grab modkey + "-Return", "urxvt"
-grab modkey + "-g", "gvim"
-grab modkey + "-f", "firefox -no-remote -ProfileManager"
-grab modkey + "-F11", "#{ENV["HOME"]}/bin/albumbler.py"
-
-
-# Contrib
-grab "W-x" do
-  Subtle::Contrib::Launcher.run
-end
-
-grab "W-z" do
-  Subtle::Contrib::Selector.run
-end
-
-# Scratchpad
-grab "W-y" do
-  if((c = Subtlext::Client["scratch"]))
-    c.toggle_stick
-    c.focus
-  elsif((c = Subtlext::Subtle.spawn("urxvt -name scratch")))
-    c.tags  = []
-    c.flags = [ :stick ]
-  end
-end
-
-# Pychrom
-grab modkey + "-p" do
-  if((t = Subtlext::Tray[:pychrom]))
-    t.click
-  else
-    Subtlext::Subtle.spawn("pychrom")
-  end
-end
-
-# Tabbing
-grab modkey + "-Tab" do
-  Subtlext::Client.recent[1].focus
-end
-
-# Set layout
-grab modkey + "-numbersign" do
-  # Find stuff
-  view   = Subtlext::View.current
-  tag    = view.tags.first
-  client = view.clients.first
-  urxvt1 = Subtlext::Client['urxvt1']
-  urxvt2 = Subtlext::Client['urxvt2']
-
-  # Update tags
-  urxvt1 + tag
-  urxvt2 + tag
-
-  # Update gravities
-  sym = view.name.to_sym
-  client.gravity = { sym => :top75 }
-  urxvt1.gravity = { sym => :bottom_right25 }
-  urxvt2.gravity = { sym => :bottom_left25 }
-end
-# }}}
-
-# Tags {{{
-tag "terms" do
-  match    instance: "xterm|urxvt"
-  gravity  :center
-  resize   true
-end
-
-tag "test" do
-  match instance: "test", class: "urxvt"
-  geometry [ 943, 548, 640, 480 ]
-end
-
-tag "browser" do
-  match "navigator|(google\-)?chrom[e|ium]|dwb"
-
-  if("proteus" == host or "pc03112" == host)
-    gravity :top75
-  else
-    gravity :center
-  end
-end
-
-tag "pdf" do
-  match "apvlv|evince"
-  stick true
-end
-
-tag "pidgin" do
-  match "pidgin"
-  float true
-end
-
-tag "editor" do
-  match  "[g]?vim|eclipse"
-  resize true
-
-  if("mockra" == host or "proteus" == host or "pc03112" == host)
-    gravity :top75
-  else
-    gravity :center
-  end
-end
-
-tag "xeph640" do
-  match    "xeph640"
-  geometry [ 943, 548, 640, 480 ]
-end
-
-tag "xeph800" do
-  match    "xeph800"
-  geometry [ 855, 172, 800, 800 ]
-end
-
-
-tag "android" do
-  match "SDL_App"
-end
-
-tag "mplayer" do
-  match   "mplayer"
-  float   true
-  stick   true
-  #urgent  true
-  position [ 2650, 50 ]
-end
-
-tag "stick" do
-  match  "dialog|subtly|python|gtk.rb|display|pychrom|skype|xev|pinentry-gtk-2"
-  stick  true
-  float  true
-end
-
-tag "urgent" do
-  match  "sun-awt-X11-XDialogPeer"
-  type   :dialog
-  stick  true
-  urgent true
-  float  true
-end
-
-tag "void" do
-  match "jd-Main|Virtualbox"
-end
-
-tag "powerfolder" do
-  match "de-dal33t-powerfolder-PowerFolder"
-  float true
-  stick true
-end
-
-tag "pms" do
-  match "net-pms-PMS"
-  resize true
-end
-
-tag "dialogs" do
-  match type: [ :dialog, :splash ]
-  stick true
-end
-
-tag "flash" do
-  match "exe|<unknown>|plugin-container"
-  stick true
-end
-
-tag "one" do
-  match    "urxvt2"
-  gravity  :bottom_left
-end
-
-tag "one25" do
-  match    "urxvt2"
-  gravity  :bottom_left25
-end
-
-tag "two" do
-  match    "urxvt2"
-  gravity  :bottom
-end
-
-tag "three25" do
-  match    "urxvt1"
-  gravity  :bottom_right25
-end
-
-tag "seven" do
-  match    "urxvt1"
-  gravity  :top_left
-end
-
-tag "eight" do
-  match    "urxvt1"
-  gravity  :top
-end
-
-tag "gimp_image" do
-  match    role: "gimp-image-window"
-  gravity  :gimp_image
-end
-
-tag "gimp_toolbox" do
-  match    role: "gimp-toolbox$"
-  gravity  :gimp_toolbox
-end
-
-tag "gimp_dock" do
-  match    role: "gimp-dock"
-  gravity  :gimp_dock
-end
-
-tag "gimp_scum" do
-  match role: "gimp-.*|screenshot"
-end
-
-tag "dia_window" do
-  match   role: "diagram_window"
-  gravity :dia_window
-end
-
-tag "dia_toolbox" do
-  match   role: "toolbox_window"
-  gravity :dia_toolbox
-end
-
-tag "inkscape" do
-  match "inkscape"
-end
-
-tag "xfontsel" do
-  match    "xfontsel"
-  geometry [464, 433, 676, 113]
-  stick    true
-end
-
-tag "xev" do
-  match    name: "Event[ ]Tester"
-  geometry [1213, 98, 377, 321]
-  float    true
-  stick    true
-end
-# }}}
-
-# Views {{{
-if("mockra" == host or "proteus" == host or "pc03112" == host)
-  www_re    = "browser|one25|three25"
-  test_re   = "xeph[0-9]+|android|three25"
-  editor_re = "editor|one25|three25"
-  icons     = true
-else
-  www_re    = "browser"
-  test_re   = "android|xeph[0-9]+|eight|one$|test"
-  editor_re = "editor"
-  icons     = true
-end
-
-iconpath = "#{ENV["HOME"]}/.config/subtle/icons"
-
-space = {
-  :cannon  => Subtlext::Icon.new("#{iconpath}/cannon.xbm"),
-  :ufo     => Subtlext::Icon.new("#{iconpath}/ufo.xbm"),
-  :shelter => Subtlext::Icon.new("#{iconpath}/shelter.xbm"),
-  :terms   => Subtlext::Icon.new("#{iconpath}/invader1.xbm"),
-  :www     => Subtlext::Icon.new("#{iconpath}/invader2.xbm"),
-  :void    => Subtlext::Icon.new("#{iconpath}/invader3.xbm"),
-  :sketch  => Subtlext::Icon.new("#{iconpath}/invader4.xbm"),
-  :test    => Subtlext::Icon.new("#{iconpath}/invader5.xbm"),
-  :editor  => Subtlext::Icon.new("#{iconpath}/invader6.xbm")
-}
-
-view "terms" do
-  match     "terms|eight|two"
-  #icon      "#{iconpath}/terminal.xbm"
-  icon      Subtlext::Icon.new("~/.config/subtle/icons/cannon.xbm")
-  icon_only icons
-end
-
-view "www" do
-  match     www_re
-  #icon      "#{iconpath}/world.xbm"
-  icon      Subtlext::Icon.new("~/.config/subtle/icons/ufo.xbm")
-  icon_only icons
-end
-
-view "void" do
-  match     "default|void|powerfolder|pms"
-  #icon      "#{iconpath}/quote.xbm"
-  icon      Subtlext::Icon.new("~/.config/subtle/icons/invader3.xbm")
-  icon_only icons
-end
-
-view "sketch" do
-  match     "inkscape|dia_*|gimp_.*"
-  #icon      "#{iconpath}/paint.xbm"
-  icon      Subtlext::Icon.new("~/.config/subtle/icons/invader4.xbm")
-  icon_only icons
-end
-
-view "test" do
-  match     test_re
-  #icon      "#{iconpath}/bug.xbm"
-  icon      Subtlext::Icon.new("~/.config/subtle/icons/invader5.xbm")
-  icon_only icons
-end
-
-view "editor" do
-  match     editor_re
-  #icon      "#{iconpath}/ruby.xbm"
-  icon      Subtlext::Icon.new("~/.config/subtle/icons/invader6.xbm")
-  icon_only icons
-end
-
-on :view_jump do |v|
-  views = Hash[*Subtlext::Screen.all.map { |s|
-    [ s.view.name.to_sym, space[space.keys[s.id]] ] }.flatten
-  ]
-
-  Subtlext::View.all.each do |va|
-    sym = va.name.to_sym
-
-    if(views.keys.include?(sym))
-      va.icon.copy_area(views[sym])
-    else
-      va.icon.copy_area(space[va.name.to_sym])
-    end
-  end
-
-  Subtlext::Subtle.render
-end
-# }}}
-
-# Sublets {{{
-sublet :clock do
-  format_string "%a %b %d,"
-end
-# }}}
-
-# Commands {{{
-def xbmc
-  Subtlext::Screen[0].view = :terms
-  Subtlext::Screen[1].view = :browser
-
-  Subtlext::Subtle.spawn("xinit xbmc -- :#{rand(10)}")
-end # }}}
diff --git a/subtle/subtle.rb b/subtle/subtle.rb
deleted file mode 100644
index 204cdb3..0000000
--- a/subtle/subtle.rb
+++ /dev/null
@@ -1,893 +0,0 @@
-#
-# This program can be distributed under the terms of the GNU GPL.
-# See the file COPYING.
-#
-# $Id: .config/subtle/subtle.rb,v 390 2011/10/02 09:06:16 unexist $
-#
-
-require "socket"
-
-# Contrib {{{
-begin
-  require "#{ENV["HOME"]}/bin/subtle-contrib/ruby/launcher.rb"
-  require "#{ENV["HOME"]}/bin/subtle-contrib/ruby/selector.rb"
-
-  Subtle::Contrib::Selector.font  = "xft:Envy Code R:pixelsize=13"
-#  Subtle::Contrib::Selector.font  = "xft:Terminus2"
-  Subtle::Contrib::Launcher.fonts = [
-    "xft:Envy Code R:pixelsize=80",
-    "xft:Envy Code R:pixelsize=13"
-#     "xft:Terminus2:pixelsize=10"
-  ]
-
-  Subtle::Contrib::Launcher.browser_screen_num = 0
-rescue LoadError
-end # }}}
-
-# Options {{{
-set :step,      5
-set :snap,      10
-set :gravity,   :center
-set :urgent,    false
-set :resize,    false
-set :tiling,    false
-#set :separator, "∞"
-# }}}
-
-
-# Screens {{{
-screen 1 do
-  stipple false
-  top     [:spacer, :mpd, :separator, :clock]
-  bottom  [:title, :spacer, :views, :tray]
-  view    1
-end
-
-# }}}
-
-# Styles {{{
-style :all do
-  padding    2, 6, 2, 6
-  background "#1a1a1a"
-  font       "xft:Envy Code R:pixelsize=13"
-end
-
-style :separator do
-  separator "//"
-  foreground "#ff0000"
-end
-
-style :title do
-  foreground "#FFFFFF"
-end
-
-style :views do
-  foreground "#7c7c72"
-  icon       "#7c7c72"
-
-  style :focus do
-    foreground    "#ffffff"
-    icon          "#ffffff"
-    border_bottom "#acaa53", 2
-  end
-
-  style :occupied do
-    foreground    "#7c7c72"
-    border_bottom "#949269", 2
-  end
-
-  style :urgent do
-    foreground "#c0bd5c"
-    icon       "#c0bd5c"
-  end
-
-  style :visible do
-    padding_top 0
-    border_top  "#494948", 2
-  end
-end
-
-style :sublets do
-  foreground "#7c7c72"
-  icon       "#7c7c72"
-end
-
-style :clients do
-  active   "#7c7c72", 2
-  inactive "#494948", 2
-  margin   10
-end
-
-style :subtle do
-  panel      "#1a1a1a"
-#  background "#595959"
-  stipple    "#595959"
-end # }}}
-
-#
-# == Gravities
-#
-# Gravities are predefined sizes a window can be set to. There are several ways
-# to set a certain gravity, most convenient is to define a gravity via a tag or
-# change them during runtime via grab. Subtler and subtlext can also modify
-# gravities.
-#
-# A gravity consists of four values which are a percentage value of the screen
-# size. The first two values are x and y starting at the center of the screen
-# and he last two values are the width and height.
-#
-# === Example
-#
-# Following defines a gravity for a window with 100% width and height:
-#
-#   gravity :example, [ 0, 0, 100, 100 ]
-#
-# === Link
-#
-# http://subforge.org/projects/subtle/wiki/Gravity
-#
-
-# Top left
-gravity :top_left,       [   0,   0,  50,  50 ]
-gravity :top_left66,     [   0,   0,  50,  66 ]
-gravity :top_left33,     [   0,   0,  50,  34 ]
-
-# Top
-gravity :top,            [   0,   0, 100,  50 ]
-gravity :top66,          [   0,   0, 100,  66 ]
-gravity :top33,          [   0,   0, 100,  34 ]
-
-# Top right
-gravity :top_right,      [  50,   0,  50,  50 ]
-gravity :top_right66,    [  50,   0,  50,  66 ]
-gravity :top_right33,    [  50,   0,  50,  33 ]
-
-# Left
-gravity :left,           [   0,   0,  50, 100 ]
-gravity :left66,         [   0,   0,  66, 100 ]
-gravity :left33,         [   0,   0,  33, 100 ]
-
-# Center
-gravity :center,         [   0,   0, 100, 100 ]
-gravity :center66,       [  17,  17,  66,  66 ]
-gravity :center33,       [  33,  33,  33,  33 ]
-
-# Right
-gravity :right,          [  50,   0,  50, 100 ]
-gravity :right66,        [  34,   0,  66, 100 ]
-gravity :right33,        [  67,  50,  33, 100 ]
-
-# Bottom left
-gravity :bottom_left,    [   0,  50,  50,  50 ]
-gravity :bottom_left66,  [   0,  34,  50,  66 ]
-gravity :bottom_left33,  [   0,  67,  50,  33 ]
-
-# Bottom
-gravity :bottom,         [   0,  50, 100,  50 ]
-gravity :bottom66,       [   0,  34, 100,  66 ]
-gravity :bottom33,       [   0,  67, 100,  33 ]
-
-# Bottom right
-gravity :bottom_right,   [  50,  50,  50,  50 ]
-gravity :bottom_right66, [  50,  34,  50,  66 ]
-gravity :bottom_right33, [  50,  67,  50,  33 ]
-
-# Gimp
-#gravity :gimp_image,     [  10,   0,  80, 100 ]
-#gravity :gimp_toolbox,   [   0,   0,  10, 100 ]
-#gravity :gimp_dock,      [  90,   0,  10, 100 ]
-
-# Pidgin
-gravity :pidgin_buddylist,    [  80,  50,  20,  100 ]
-gravity :pidgin_conv,         [ 0,  0,  80,  100 ]
-
-#
-# == Grabs
-#
-# Grabs are keyboard and mouse actions within subtle, every grab can be
-# assigned either to a key and/or to a mouse button combination. A grab
-# consists of a chain and an action.
-#
-# === Finding keys
-#
-# The best resource for getting the correct key names is
-# */usr/include/X11/keysymdef.h*, but to make life easier here are some hints
-# about it:
-#
-# * Numbers and letters keep their names, so *a* is *a* and *0* is *0*
-# * Keypad keys need *KP_* as prefix, so *KP_1* is *1* on the keypad
-# * Strip the *XK_* from the key names if looked up in
-#   /usr/include/X11/keysymdef.h
-# * Keys usually have meaningful english names
-# * Modifier keys have special meaning (Alt (A), Control (C), Meta (M),
-#   Shift (S), Super (W))
-#
-# === Chaining
-#
-# Chains are a combination of keys and modifiers to one or a list of keys
-# and can be used in various ways to trigger an action. In subtle, there are
-# two ways to define chains for grabs:
-#
-#   1. *Default*: Add modifiers to a key and use it for a grab
-#
-#      *Example*: grab "W-Return", "urxvt"
-#
-#   2. *Chain*: Define a list of grabs that need to be pressed in order
-#
-#      *Example*: grab "C-y Return", "urxvt"
-#
-# ==== Mouse buttons
-#
-# [*B1*]  = Button1 (Left mouse button)
-# [*B2*]  = Button2 (Middle mouse button)
-# [*B3*]  = Button3 (Right mouse button)
-# [*B4*]  = Button4 (Mouse wheel up)
-# [*B5*]  = Button5 (Mouse wheel down)
-# [*...*]
-# [*B20*] = Button20 (Are you sure that this is a mouse and not a keyboard?)
-#
-# ==== Modifiers
-#
-# [*A*] = Alt key (Mod1)
-# [*C*] = Control key
-# [*M*] = Meta key (Mod3)
-# [*S*] = Shift key
-# [*W*] = Super/Windows key (Mod4)
-# [*G*] = Alt Gr (Mod5)
-#
-# === Action
-#
-# An action is something that happens when a grab is activated, this can be one
-# of the following:
-#
-# [*symbol*] Run a subtle action
-# [*string*] Start a certain program
-# [*array*]  Cycle through gravities
-# [*lambda*] Run a Ruby proc
-#
-# === Example
-#
-# This will create a grab that starts a urxvt when Alt+Enter are pressed:
-#
-#   grab "A-Return", "urxvt"
-#   grab "C-a c",    "urxvt"
-#
-# === Link
-#
-# http://subforge.org/projects/subtle/wiki/Grabs
-#
-
-# Jump to view1, view2, ...
-grab "W-S-1", :ViewJump1
-grab "W-S-2", :ViewJump2
-grab "W-S-3", :ViewJump3
-grab "W-S-4", :ViewJump4
-grab "W-S-5", :ViewJump5
-grab "W-S-6", :ViewJump6
-grab "W-S-7", :ViewJump7
-grab "W-S-8", :ViewJump8
-grab "W-S-9", :ViewJump9
-
-# Switch current view
-grab "W-1", :ViewSwitch1
-grab "W-2", :ViewSwitch2
-grab "W-3", :ViewSwitch3
-grab "W-4", :ViewSwitch4
-grab "W-5", :ViewSwitch5
-grab "W-6", :ViewSwitch6
-grab "W-7", :ViewSwitch7
-grab "W-8", :ViewSwitch8
-grab "W-9", :ViewSwitch9
-
-
-# Select next and prev view */
-grab "KP_Add",      :ViewNext
-grab "KP_Subtract", :ViewPrev
-
-# Move mouse to screen1, screen2, ...
-grab "W-A-1", :ScreenJump1
-grab "W-A-2", :ScreenJump2
-grab "W-A-3", :ScreenJump3
-grab "W-A-4", :ScreenJump4
-
-# Force reload of config and sublets
-grab "W-C-r", :SubtleReload
-
-# Force restart of subtle
-grab "W-C-S-r", :SubtleRestart
-
-# Quit subtle
-grab "W-C-q", :SubtleQuit
-
-# Move current window
-grab "W-B1", :WindowMove
-
-# Resize current window
-grab "W-B3", :WindowResize
-
-# Toggle floating mode of window
-grab "W-f", :WindowFloat
-
-# Toggle fullscreen mode of window
-grab "W-space", :WindowFull
-
-# Toggle sticky mode of window (will be visible on all views)
-grab "W-s", :WindowStick
-
-# Toggle zaphod mode of window (will span across all screens)
-grab "W-equal", :WindowZaphod
-
-# Raise window
-grab "W-r", :WindowRaise
-
-# Lower window
-grab "W-l", :WindowLower
-
-# Select next windows
-grab "W-Left",  :WindowLeft
-grab "W-Down",  :WindowDown
-grab "W-Up",    :WindowUp
-grab "W-Right", :WindowRight
-
-# Kill current window
-grab "W-k", :WindowKill
-
-# Cycle between given gravities
-grab "W-KP_7", [ :top_left,     :top_left66,     :top_left33     ]
-grab "W-KP_8", [ :top,          :top66,          :top33          ]
-grab "W-KP_9", [ :top_right,    :top_right66,    :top_right33    ]
-grab "W-KP_4", [ :left,         :left66,         :left33         ]
-grab "W-KP_5", [ :center,       :center66,       :center33       ]
-grab "W-KP_6", [ :right,        :right66,        :right33        ]
-grab "W-KP_1", [ :bottom_left,  :bottom_left66,  :bottom_left33  ]
-grab "W-KP_2", [ :bottom,       :bottom66,       :bottom33       ]
-grab "W-KP_3", [ :bottom_right, :bottom_right66, :bottom_right33 ]
-
-# In case no numpad is available e.g. on notebooks
-#grab "W-q", [ :top_left,     :top_left66,     :top_left33     ]
-#grab "W-w", [ :top,          :top66,          :top33          ]
-#grab "W-e", [ :top_right,    :top_right66,    :top_right33    ]
-#grab "W-a", [ :left,         :left66,         :left33         ]
-#grab "W-s", [ :center,       :center66,       :center33       ]
-#grab "W-d", [ :right,        :right66,        :right33        ]
-#
-# QUERTZ
-#grab "W-y", [ :bottom_left,  :bottom_left66,  :bottom_left33  ]
-#
-# QWERTY
-#grab "W-z", [ :bottom_left,  :bottom_left66,  :bottom_left33  ]
-#
-#grab "W-x", [ :bottom,       :bottom66,       :bottom33       ]
-#grab "W-c", [ :bottom_right, :bottom_right66, :bottom_right33 ]
-
-# Exec programs
-grab "W-Return", "terminal"
-grab "W-p", "/usr/bin/dmenu_run -b -fn 'Envy Code R-10' -nf '#999' -nb '#000' -sf '#eee' -sb '#0077bb' -p 'run:'"
-grab "W-S-n", "urxvtc -name ncmpc -e ncmpcpp"
-grab "W-S-r", "urxvtc -name ranger -e ranger"
-grab "W-S-l", "xlock"
-grab "W-S-s", "urxvtc -name ssh -e /home/carnager/bin/ssh"
-grab "W-S-F12", "/home/carnager/bin/lastfm.sh"
-grab "W-S-F11", "/home/carnager/bin/love"
-grab "W-Insert", "/usr/lib/perl5/vendor_perl/bin/dmenuclip"
-grab "W-C-Insert", "/usr/lib/perl5/vendor_perl/bin/dmenurl"
-grab "Print", "/home/carnager/bin/scrotmenu.sh"
-grab "W-F1", "/home/carnager/bin/mpdmenu.sh"
-grab "W-F2", "/home/carnager/bin/appmenu.sh"
-grab "W-S-m", "urxvtc -name newsbeuter -e newsbeuter"
-grab "XF86Mail", "urxvtc -name newsbeuter -e mutt"
-grab "XF86HomePage", "firefox-beta-bin"
-grab "XF86AudioPlay", "mpc toggle" 
-grab "XF86AudioStop", "mpc stop"
-grab "XF86AudioNext", "mpc next"
-grab "XF86AudioPrev", "mpc prev"
-grab "XF86AudioRaiseVolume", "mpc volume +1"
-grab "XF86AudioLowerVolume", "mpc volume -1"
-grab "XF86Back", "mpc seek -5"
-grab "XF86Forward", "mpc seek +5"
-grab "XF86Reload", "/home/carnager/bin/mpdscrobble"
-grab "Cancel", "/home/carnager/bin/love"
-grab "XF86Tools", "urxvtc -name ncmpc -e ncmpcpp"
-grab "W-S-Escape", "/home/carnager/bin/power.sh"
-
-
-# Contrib
-grab "W-x" do
-  Subtle::Contrib::Launcher.run
-end
-
-grab "W-z" do
-  Subtle::Contrib::Selector.run
-end
-
-# Scratchpad
-grab "W-y" do
-  if((c = Subtlext::Client["scratch"]))
-    c.toggle_stick
-    c.focus
-  elsif((c = Subtlext::Subtle.spawn("urxvt -name scratch")))
-    c.tags  = []
-    c.flags = [ :stick ]
-  end
-end
-
-
-# Run Ruby lambdas
-grab "S-F2" do |c|
-  puts c.name
-end
-
-grab "S-F3" do
-  puts Subtlext::VERSION
-end
-
-#
-# == Tags
-#
-# Tags are generally used in subtle for placement of windows. This placement is
-# strict, that means that - aside from other tiling window managers - windows
-# must have a matching tag to be on a certain view. This also includes that
-# windows that are started on a certain view will not automatically be placed
-# there.
-#
-# There are to ways to define a tag:
-#
-# === Simple
-#
-# The simple way just needs a name and a regular expression to just handle the
-# placement:
-#
-# Example:
-#
-#  tag "terms", "terms"
-#
-# === Extended
-#
-# Additionally tags can do a lot more then just control the placement - they
-# also have properties than can define and control some aspects of a window
-# like the default gravity or the default screen per view.
-#
-# Example:
-#
-#  tag "terms" do
-#    match   "xterm|[u]?rxvt"
-#    gravity :center
-#  end
-#
-# === Default
-#
-# Whenever a window has no tag it will get the default tag and be placed on the
-# default view. The default view can either be set by the user with adding the
-# default tag to a view by choice or otherwise the first defined view will be
-# chosen automatically.
-#
-# === Properties
-#
-# [*borderless*] This property enables the borderless mode for tagged clients.
-#
-#                Example: borderless true
-#                Links:    http://subforge.org/projects/subtle/wiki/Tagging#Borderless
-#                          http://subforge.org/projects/subtle/wiki/Clients#Borderless
-#
-# [*fixed*]      This property enables the fixed mode for tagged clients.
-#
-#                Example: fixed true
-#                Links:   http://subforge.org/projects/subtle/wiki/Tagging#Fixed
-#                         http://subforge.org/projects/subtle/wiki/Clients#Fixed
-#
-# [*float*]      This property enables the float mode for tagged clients.
-#
-#                Example: float true
-#                Links:   http://subforge.org/projects/subtle/wiki/Tagging#Float
-#                         http://subforge.org/projects/subtle/wiki/Clients#Float
-#
-# [*full*]       This property enables the fullscreen mode for tagged clients.
-#
-#                Example: full true
-#                Links:   http://subforge.org/projects/subtle/wiki/Tagging#Fullscreen
-#                         http://subforge.org/projects/subtle/wiki/Clients#Fullscreen
-#
-# [*geometry*]   This property sets a certain geometry as well as floating mode
-#                to the tagged client, but only on views that have this tag too.
-#                It expects an array with x, y, width and height values whereas
-#                width and height must be >0.
-#
-#                Example: geometry [100, 100, 50, 50]
-#                Link:    http://subforge.org/projects/subtle/wiki/Tagging#Geometry
-#
-# [*gravity*]    This property sets a certain to gravity to the tagged client,
-#                but only on views that have this tag too.
-#
-#                Example: gravity :center
-#                Link:    http://subforge.org/projects/subtle/wiki/Tagging#Gravity
-#
-# [*match*]      This property adds matching patterns to a tag, a tag can have
-#                more than one. Matching works either via plaintext, regex
-#                (see man regex(7)) or window id. Per default tags will only
-#                match the WM_NAME and the WM_CLASS portion of a client, this
-#                can be changed with following possible values:
-#
-#                [*:name*]      Match the WM_NAME
-#                [*:instance*]  Match the first (instance) part from WM_CLASS
-#                [*:class*]     Match the second (class) part from WM_CLASS
-#                [*:role*]      Match the window role
-#                [*:type*]      Match the window type
-#
-#                Examples: match instance: "urxvt"
-#                          match [:role, :class] => "test"
-#                          match "[xa]+term"
-#                Link:     http://subforge.org/projects/subtle/wiki/Tagging#Match
-#
-# [*position*]   Similar to the geometry property, this property just sets the
-#                x/y coordinates of the tagged client, but only on views that
-#                have this tag, too. It expects an array with x and y values.
-#
-#                Example: position [ 10, 10 ]
-#                Link:    http://subforge.org/projects/subtle/wiki/Tagging#Position
-#
-# [*resize*]     This property enables the float mode for tagged clients.
-#
-#                Example: resize true
-#                Links:   http://subforge.org/projects/subtle/wiki/Tagging#Resize
-#                         http://subforge.org/projects/subtle/wiki/Clients#Resize
-#
-# [*stick*]      This property enables the float mode for tagged clients.
-#
-#                Example: stick true
-#                Links:   http://subforge.org/projects/subtle/wiki/Tagging#Stick
-#                         http://subforge.org/projects/subtle/wiki/Clients#Stick
-#
-# [*type*]       This property sets the tagged client to be treated as a specific
-#                window type though as the window sets the type itself. Following
-#                types are possible:
-#
-#                [*:desktop*]  Treat as desktop window (_NET_WM_WINDOW_TYPE_DESKTOP)
-#                              Link: http://subforge.org/projects/subtle/wiki/Clients#Desktop
-#                [*:dock*]     Treat as dock window (_NET_WM_WINDOW_TYPE_DOCK)
-#                              Link: http://subforge.org/projects/subtle/wiki/Clients#Dock
-#                [*:toolbar*]  Treat as toolbar windows (_NET_WM_WINDOW_TYPE_TOOLBAR)
-#                              Link: http://subforge.org/projects/subtle/wiki/Clients#Toolbar
-#                [*:splash*]   Treat as splash window (_NET_WM_WINDOW_TYPE_SPLASH)
-#                              Link: http://subforge.org/projects/subtle/wiki/Clients#Splash
-#                [*:dialog*]   Treat as dialog window (_NET_WM_WINDOW_TYPE_DIALOG)
-#                              Link: http://subforge.org/projects/subtle/wiki/Clients#Dialog
-#
-#                Example: type :desktop
-#                Link:    http://subforge.org/projects/subtle/wiki/Tagging#Type
-#
-# [*urgent*]     This property enables the urgent mode for tagged clients.
-#
-#                Example: stick true
-#                Links:   http://subforge.org/projects/subtle/wiki/Tagging#Stick
-#                         http://subforge.org/projects/subtle/wiki/Clients#Urgent
-#
-# [*zaphod*]     This property enables the zaphod mode for tagged clients.
-#
-#                Example: zaphod true
-#                Links:   http://subforge.org/projects/subtle/wiki/Tagging#Zaphod
-#                         http://subforge.org/projects/subtle/wiki/Clients#Zaphod
-#
-#
-# === Link
-#
-# http://subforge.org/projects/subtle/wiki/Tagging
-#
-
-# Simple tags
-tag "terms" do match "xterm|[u]?rxvt|terminal"; exclude "ncmpc|ssh|newsbeuter"; end
-tag "browser", "uzbl|opera|firefox|navigator|chromium|Browser|Minefield|Navigator|<unknown>|gnome-mplayer|Exe|jumanji|dwb|<unknown>|plugin-container|exe|operapluginwrapper|npviewer.bin"
-
-tag "gmpc" do
-    match "gmpc"
-end
-
-tag "mail" do
-    match "Mail|Lanikai"
-    match :instance => "newsbeuter";
-    gravity :center33
-end
-
-tag "mail2" do
-    match "Mail|Lanikai"
-end
-
-tag "chat" do
-    match :instance => "ssh";
-    gravity :center33
-end
-
- tag "ranger" do
-     match :instance => "ranger"
-     gravity :center33
-end
-
-tag "DL", "jd.Main|transmission-qt"
-
-# Placement
-tag "editor" do
-  match  "[g]?vim"
-  resize true
-end
-
-tag "thunar" do
-  match "thunar"
-end
-
-tag "thunar2" do
-  match :name => "File.Operation.Progress"
-  float true
-end
-
-
-tag "TeamSpeak" do
-match "Ts3client_linux_amd64"
-end
-
-tag "fixed" do
-  geometry [ 10, 10, 100, 100 ]
-  stick    true
-end
-
-tag "resize" do
-  match  "sakura|gvim"
-  resize true
-end
-
-tag "gravity" do
-  gravity :center
-end
-
-# Modes
-tag "stick" do
-  match "mplayer|feh|mupdf|pinentry-gtk-2|pdfshuffler"
-  float true
-  stick true
-  urgent true
-end
-
-
-
-tag "float" do
-  match "awt|ccgo"
-  float true
-end
-
-# Pidgin
-tag "conversations" do
-  match  :role => "conversation"
-  gravity :pidgin_conv
-end
-
-tag "buddylist" do
-  match  :role => "buddy_list"
-  gravity :pidgin_buddylist
-end
-
-tag "filetransfer" do
-  match "Pidgin"
-  match :role => "transfer"
-  float true
-end  
-
-# Gimp
-#tag "gimp_image" do
-#
-#  match   :role => "gimp-image-window"
-#  gravity :gimp_image
-#end
-
-#tag "gimp_toolbox" do
-#  match   :role => "gimp-toolbox$"
-#  gravity :gimp_toolbox
-#end
-
-#tag "gimp_dock" do
-#  match   :role => "gimp-dock"
-#  gravity :gimp_dock
-#end
-
-tag "gfx" do
-  match "gthumb|Gthumb|Shotwell|shotwell|digikam|Digikam"
-end
-
-tag "wine" do
-  match "Wine"
-  gravity :center
-  float true
-end
-
-tag "gimp_splash" do
- match "Gimp"
-end
-
-#
-# == Views
-#
-# Views are the virtual desktops in subtle, they show all windows that share a
-# tag with them. Windows that have no tag will be visible on the default view
-# which is the view with the default tag or the first defined view when this
-# tag isn't set.
-#
-
-view "terms" do
-  match "terms|ranger"
-#  icon "/home/carnager/.config/subtle/icons/arch.xbm"
-  icon_only false
-end
-
-view "www" do
-  match "browser"
-#  icon "/home/carnager/.config/subtle/icons/fox.xbm"
-  icon_only false
-end
-
-view "stuff" do
-  match "thunar|TeamSpeak|thunar2"
-#  icon "/home/carnager/.config/subtle/icons/dish.xbm"
-  icon_only false
-end
-
-view "media" do
-  match "Musicbrainz|gmpc"
-#  icon "/home/carnager/.config/subtle/icons/note.xbm"
-  icon_only false
-end
-
-view "dl" do 
-  match "DL"
-#  icon "/home/carnager/.config/subtle/icons/net_down_02.xbm"
-  icon_only false
-end
-
-view "gfx" do
-  match "gimp_.*|gfx"
-#  icon "/home/carnager/.config/subtle/icons/fs_01.xbm"
-  icon_only false
-end
-
-view "mail" do
-  match "mail|mail2|buddylist|conversations|filetransfer"
-#  icon "/home/carnager/.config/subtle/icons/mail.xbm"
-  icon_only false
-end
-
-view "notag" do
-  match "default|kgs_room"
-#  icon "/home/carnager/.config/subtle/icons/empty.xbm"
-  icon_only false
-end
-
-#
-# == Sublets
-#
-# Sublets are Ruby scripts that provide data for the panel and can be managed
-# with the sur script that comes with subtle. Configuration of sublets can
-# either be done inside of the sublet or when supported in the config.
-#
-# === Example
-#
-#  sublet :clock do
-#    interval      30
-#    format_string "%H:%M:%S"
-#  end
-#
-
-#
-# == Hooks
-#
-# And finally hooks are a way to bind Ruby scripts to a certain event.
-#
-# Following hooks exist so far:
-#
-# [*:client_create*]    Called whenever a window is created
-# [*:client_configure*] Called whenever a window is configured
-# [*:client_focus*]     Called whenever a window gets focus
-# [*:client_kill*]      Called whenever a window is killed
-#
-# [*:tag_create*]       Called whenever a tag is created
-# [*:tag_kill*]         Called whenever a tag is killed
-#
-# [*:view_create*]      Called whenever a view is created
-# [*:view_configure*]   Called whenever a view is configured
-# [*:view_jump*]        Called whenever the view is switched
-# [*:view_kill*]        Called whenever a view is killed
-#
-# [*:tile*]             Called on whenever tiling would be needed
-# [*:reload*]           Called on reload
-# [*:start*]            Called on start
-# [*:exit*]             Called on exit
-#
-# === Example
-#
-# This hook will print the name of the window that gets the focus:
-#
-#   on :client_focus do |c|
-#     puts c.name
-#   end
-#
-# === Link
-#
-# http://subforge.org/wiki/subtle/Hooks
-on :start do
-   # Create missing tags
-   views = Subtlext::View.all.map { |v| v.name }
-   tags  = Subtlext::Tag.all.map { |t| t.name }
- 
-   views.each do |v|
-     unless(tags.include?(v))
-       t = Subtlext::Tag.new(v)
-       t.save
-     end
-   end
- end
- 
- # Add nine C-< number> grabs
- (1..9).each do |i|
-  grab "C-%d" % [ i ] do |c|
-    views = Subtlext::View.all
-    names = views.map { |v| v.name }
- 
-    # Sanity check
-    if(i <= views.size)
-      # Tag client
-      tags = c.tags.reject { |t| names.include?(t.name) or "default" == t.name }
-      tags << names[i - 1]
- 
-      c.tags = tags
- 
-      # Tag view
-      views[i - 1].tag(names[i - 1])
-    end
-  end
- end
-grab "A-Tab" do |c|
-    sel     = 0
-    clients = Subtlext::Client.visible
- 
-    clients.each_index do |idx|
-      if(clients[idx].id == c.id)
-        sel = idx + 1 if(idx < clients.size - 1)
-      end
-    end
- 
-   clients[sel].focus
- end
-
-sublet :mpd do
- host "192.168.1.100"
- show_icons false
-end
-
-on :start do
-   # Create missing tags
-   views = Subtlext::View.all.map { |v| v.name }
-   tags  = Subtlext::Tag.all.map { |t| t.name }
- 
-   views.each do |v|
-     unless tags.include?(v)
-       t = Subtlext::Tag.new(v)
-       t.save
-     end
-   end
- end
- 
- # Add nine C-< number> grabs
- (1..9).each do |i|
-  grab "C-%d" % [ i ] do |c|
-    views = Subtlext::View.all
-    names = views.map { |v| v.name }
- 
-    # Sanity check
-    if i <= views.size
-      # Tag client
-      tags = c.tags.reject { |t| names.include?(t.name) or "default" == t.name }
-      tags << names[i - 1]
- 
-      c.tags = tags
- 
-      # Tag view
-      views[i - 1].tag(names[i - 1])
-    end
-  end
- end
-
diff --git a/subtle/subtle.rb~ b/subtle/subtle.rb~
deleted file mode 100644
index 4db244a..0000000
--- a/subtle/subtle.rb~
+++ /dev/null
@@ -1,547 +0,0 @@
-#
-# This program can be distributed under the terms of the GNU GPL.
-# See the file COPYING.
-#
-# $Id: .config/subtle/subtle.rb,v 330 2011/03/29 11:56:06 unexist $
-#
-
-require "socket"
-
-# Contrib {{{
-begin
-  require "#{ENV["HOME"]}/bin/subtle-contrib/launcher.rb"
-  require "#{ENV["HOME"]}/bin/subtle-contrib/selector.rb"
-  require "#{ENV["HOME"]}/bin/subtle-contrib/merger.rb"
-
-  Subtle::Contrib::Launcher.fonts = [
-    "xft:Envy Code R:pixelsize=80",
-    "xft:Envy Code R:pixelsize=13"
-  ]
-
-  Subtle::Contrib::Selector.font = "xft:Envy Code R:pixelsize=13"
-  Subtle::Contrib::Merger.font   = "xft:Envy Code R:pixelsize=13"
-rescue LoadError
-end # }}}
-
-# Options {{{
-set :border,     2
-set :step,       5
-set :snap,       10
-set :gravity,    :center
-set :urgent,     false
-set :resize,     false
-set :strut,      [0, 0, 0, 0]
-set :padding,    [4, 4, 2, 2]
-set :font,       "xft:Envy Code R:pixelsize=13"
-#set :font,       "xft:Ubuntu R:pixelsize=13"
-#set :font,       "xft:DejaVu Sans Mono:pixelsize=12:antialias=true"
-set :separator,  "·"
-set :outline,    0
-set :gap,        3
-#set :wmname,     "LG3D"
-# }}}
-
-# Screens {{{
-screen 1 do
-  stipple false
-  top     [:title, :spacer, :views, :center, :clock, :fuzzytime, :separator, :sublets, :center]
-  bottom  [:mpd, :spacer, :cpu]
-  view    1
-end
-
-screen 2 do
-  stipple false
-  top     [:views, :spacer, :title, :tray, :center, :mpd, :separator, :volume, :center]
-  bottom  []
-  view    0
-end
-# }}}
-
-# Colors {{{
-color :title_fg,        "#ffffff"
-color :title_bg,        "#1a1a1a"
-color :title_border,    "#1a1a1a"
-
-color :focus_fg,        "#ffffff"
-color :focus_bg,        "#595959"
-color :focus_border,    "#1a1a1a"
-
-color :urgent_fg,       "#DF8787"
-#color :urgent_bg,       "#404040"
-#color :urgent_border,   "#1a1a1a"
-
-color :occupied_fg,     "#777777"
-color :occupied_bg,     "#404040"
-color :occupied_border, "#1a1a1a"
-
-color :views_fg,        "#a8a8a8"
-color :views_bg,        "#1a1a1a"
-color :views_border,    "#1a1a1a"
-
-#color :sublets_fg,      "#595959"
-color :sublets_fg,      "#a8a8a8"
-color :sublets_bg,      "#1a1a1a"
-color :sublets_border,  "#1a1a1a"
-
-color :client_active,   "#a8a8a8"
-color :client_inactive, "#404040"
-
-color :panel,           "#1a1a1a"
-#color :background,     "#404040"
-
-color :stipple,         "#595959"
-color :separator,       "#DF8787"
-
-=begin
-color :title_fg,        "#e9e9e9"
-color :title_bg,        "#424242"
-color :title_border,    "#424242"
-
-color :focus_fg,        "#e9e9e9"
-color :focus_bg,        "#424242"
-color :focus_border,    "#424242"
-
-color :urgent_fg,       "#ff9900"
-#color :urgent_bg,       "#424242"
-#color :urgent_border,   "#424242"
-
-color :occupied_fg,     "#3299bb"
-color :occupied_bg,     "#424242"
-color :occupied_border, "#424242"
-
-color :views_fg,        "#bcbcbc"
-color :views_bg,        "#424242"
-color :views_border,    "#424242"
-
-color :sublets_fg,      "#bcbcbc"
-color :sublets_bg,      "#424242"
-color :sublets_border,  "#424242"
-
-color :client_active,   "#bcbcbc"
-color :client_inactive, "#424242"
-
-color :panel,           "#424242"
-
-color :background,      "#424242"
-
-color :stipple,         "#595959"
-
-color :separator,       "#ff9900"
-=end
-# }}}
-
-# Gravities {{{
-gravity :top_left,       [0, 0, 50, 50]
-gravity :top_left33,     [0, 0, 50, 33]
-gravity :top_left66,     [0, 0, 50, 66]
-gravity :top_left75,     [0, 0, 50, 75]
-gravity :top,            [0, 0, 100, 50]
-gravity :top66,          [0, 0, 100, 67]
-gravity :top33,          [0, 0, 100, 33]
-gravity :top75,          [0, 0, 100, 75]
-gravity :top_right,      [100, 0, 50, 50]
-gravity :top_right33,    [100, 0, 50, 33]
-gravity :top_right66,    [100, 0, 50, 66]
-gravity :top_right75,    [100, 0, 50, 75]
-gravity :left,           [0, 0, 50, 100]
-gravity :left33,         [0, 50, 25, 33]
-gravity :left66,         [0, 50, 50, 33]
-gravity :center,         [0, 0, 100, 100]
-gravity :center33,       [50, 50, 50, 33]
-gravity :center66,       [0, 50, 100, 33]
-gravity :right,          [100, 0, 50, 100]
-gravity :right33,        [100, 50, 25, 100]
-gravity :right66,        [100, 50, 50, 33]
-gravity :bottom_left,    [0, 100, 50, 50]
-gravity :bottom_left25,  [0, 100, 50, 25]
-gravity :bottom_left33,  [0, 100, 50, 33]
-gravity :bottom_left66,  [0, 100, 50, 66]
-gravity :bottom,         [0, 100, 100, 50]
-gravity :bottom66,       [0, 100, 100, 66]
-gravity :bottom33,       [0, 100, 100, 33]
-gravity :bottom_right,   [100, 100, 50, 50]
-gravity :bottom_right25, [100, 100, 50, 25]
-gravity :bottom_right33, [100, 100, 50, 33]
-gravity :bottom_right66, [100, 100, 50, 66]
-gravity :gimp_image,     [50, 50, 80, 100]
-gravity :gimp_toolbox,   [0, 0, 10, 100]
-gravity :gimp_dock,      [100, 0, 10, 100]
-gravity :dia_toolbox,    [0, 0, 100, 15]
-gravity :dia_window,     [0, 18, 100, 84]
-# }}}
-
-# Grabs {{{
-# Host specific
-host     = Socket.gethostname
-modkey   = "W"
-gravkeys = [ "KP_7", "KP_8", "KP_9", "KP_4", "KP_5", "KP_6", "KP_1", "KP_2", "KP_3" ]
-
-if("telas" == host || "mockra" == host) #< Netbooks
-  gravkeys = [ "q", "w", "e", "a", "s", "d", "y", "x", "c" ]
-elsif("test" == host) #< Usually VMs
-  modkey = "A"
-end
-
-# Views and screens
-(1..6).each do |i|
-  grab modkey + "-#{i}",   "ViewSwitch#{i}".to_sym
-  grab modkey + "-S-#{i}", "ViewJump#{i}".to_sym
-  grab modkey + "-F#{i}",  "ScreenJump#{i}".to_sym
-end
-
-# Windows
-grab modkey + "-B1",      :WindowMove
-grab modkey + "-B3",      :WindowResize
-grab modkey + "-S-f",     :WindowFloat
-grab modkey + "-S-space", :WindowFull
-grab modkey + "-S-s",     :WindowStick
-grab modkey + "-r",       :WindowRaise
-grab modkey + "-l",       :WindowLower
-grab modkey + "-Left",    :WindowLeft
-grab modkey + "-Down",    :WindowDown
-grab modkey + "-Up",      :WindowUp
-grab modkey + "-Right",   :WindowRight
-grab modkey + "-k",       :WindowKill
-grab modkey + "-h", lambda { |c| c.retag }
-
-# Reload/restart
-grab modkey + "-C-q",     :SubtleQuit
-grab modkey + "-C-r",     :SubtleReload
-grab modkey + "-C-A-r",   :SubtleRestart
-
-# Gravity keys and focus
-gravities = [
-  [:top_left, :top_left33, :top_left66, :top_left75],
-  [:top, :top33, :top66, :top75],
-  [:top_right, :top_right33, :top_right66, :top_right75],
-  [:left, :left33, :left66],
-  [:center, :center33, :center66],
-  [:right, :right33, :right66],
-  [:bottom_left, :bottom_left25, :bottom_left33, :bottom_left66],
-  [:bottom, :bottom33, :bottom66],
-  [:bottom_right, :bottom_right25, :bottom_right33, :bottom_right66]
-]
-
-gravities.each_index do |i|
-  grab "%s-%s" % [ modkey, gravkeys[i] ], gravities[i]
-
-  grab "%s-C-%s" % [ modkey, gravkeys[i] ], lambda {
-    c = Subtlext::Client.visible.select { |c|
-      gravities[i].include?(c.gravity.name.to_sym)
-    }
-
-    c.first.focus unless(c.empty?)
-  }
-end
-
-# Multimedia keys
-grab modkey + "-m", "mpc current | tr -d '\n' | xclip"
-grab "XF86Mail", "urxvtc -name newsbeuter -e mutt"
-grab "XF86HomePage", "firefox"
-grab "XF86AudioPlay", "mpc toggle" 
-grab "XF86AudioStop", "mpc stop"
-grab "XF86AudioNext", "mpc next"
-grab "XF86AudioPrev", "mpc prev"
-grab "XF86AudioRaiseVolume", "mpc volume +1"
-grab "XF86AudioLowerVolume", "mpc volume -1"
-grab "XF86Back", "mpc seek -5"
-grab "XF86Forward", "mpc seek +5"
-grab "XF86Reload", "/home/carnager/bin/lastfm.sh"
-grab "Cancel", "/home/carnager/bin/love"
-grab "XF86Tools", "urxvtc -name ncmpc -e ncmpcpp"
-
-grab "W-d" do
-  current = Subtlext::View.current
-  Subtlext::View.all.each do |v|
-    if(current == v)
-      v.tag "default"
-    else
-      v.untag "default"
-    end
-  end
-end
-
-# Programs
-grab modkey + "-Return", "urxvt"
-grab modkey + "-g", "gvim"
-
-# Contrib
-grab "W-x" do
-  Subtle::Contrib::Launcher.run
-end
-
-grab "W-Tab" do
-  Subtle::Contrib::Selector.run
-end
-
-grab "W-u" do
-  Subtle::Contrib::Merger.run
-end
-
-# Scratchpad
-grab "W-y" do
-  if((c = Subtlext::Client["scratch"]))
-    c.toggle_stick
-    c.focus
-  elsif((c = Subtlext::Subtle.spawn("urxvt -name scratch")))
-    c.tags  = [] 
-    c.flags = [ :stick ]
-  end
-end 
-
-# Switch views
-{
-  "S-F1" => [ :www,    :terms ],
-  "S-F2" => [ :editor, :terms ],
-  "S-F3" => [ :www,    :test  ],
-  "S-F4" => [ :editor, :test  ]
-}.each do |k, v|
-  grab k do
-    screens = Subtlext::Screen.all
-
-    v.each_with_index do |view, i|
-      screens[i].view = view
-    end
-  end
-end
-
-# Pychrom
-grab modkey + "-p" do
-  if((t = Subtlext::Tray[:pychrom]))
-    t.click(1)
-  else
-    Subtlext::Subtle.spawn("pychrom")
-  end
-end
-# }}}
-
-# Tags {{{
-tag "terms" do
-  match    "xterm|urxvt"
-  gravity  :center
-  resize   true
-end
-
-tag "browser" do
-  match "navigator|(google\-)?chrom[e|ium]|opera"
-
-  if("proteus" == host or "pc03112" == host)
-    gravity :top75
-  else
-    gravity :center
-  end
-end
-
-tag "pdf" do
-  match    "apvlv|evince"
-  stick    true
-end
-
-tag "editor" do
-  match   "[g]?vim"
-  resize  true
-
-  if("mockra" == host or "proteus" == host or "pc03112" == host)
-    gravity :top75
-  else
-    gravity :center
-  end
-end
-
-tag "xephyr" do
-  match    "xeph640"
-  urgent   false
-
-  if("mockra" == host)
-    gravity  :center
-  else
-    geometry [ 943, 548, 640, 480 ]
-  end
-end
-
-tag "android" do
-  match    :name => "5554:AVD"
-  geometry [ 873, 47, 791, 534 ]
-end
-
-tag "mplayer" do
-  match   "mplayer|vlc"
-  float   true
-  stick   true
-  urgent  true
-end
-
-tag "stick" do
-  match  "dialog|subtly|python|gtk.rb|display|pychrom|skype|xev"
-  stick  true
-  float  true
-end
-
-tag "urgent" do
-  match  "sun-awt-X11-XDialogPeer"
-  type   :dialog
-  stick  true
-  urgent true
-end
-
-tag "void" do
-  match   "jd-Main|Virtualbox"
-  float true
-end
-
-tag "powerfolder" do
-  match "de-dal33t-powerfolder-PowerFolder"
-  float true
-end
-
-tag "dialogs" do
-  match :type => [ :dialog, :splash ]
-  stick true
-end
-
-tag "flash" do
-  match "exe|<unknown>"
-  stick true
-end
-
-tag "one" do
-  match    "urxvt2"
-  gravity  :bottom_left
-end
-
-tag "one25" do
-  match    "urxvt2"
-  gravity  :bottom_left25
-end
-
-tag "two" do
-  match    "urxvt2"
-  gravity  :bottom
-end
-
-tag "three25" do
-  match    "urxvt1"
-  gravity  :bottom_right25
-end
-
-tag "seven" do
-  match    "urxvt1"
-  gravity  :top_left
-end
-
-tag "eight" do
-  match    "urxvt1"
-  gravity  :top
-end
-
-tag "gimp_image" do
-  match    :role => "gimp-image-window"
-  gravity  :gimp_image
-end
-
-tag "gimp_toolbox" do
-  match    :role => "gimp-toolbox$"
-  gravity  :gimp_toolbox
-end
-
-tag "gimp_dock" do
-  match    :role => "gimp-dock"
-  gravity  :gimp_dock
-end
-
-tag "gimp_scum" do
-  match :role => "gimp-.*|screenshot"
-end
-
-tag "dia_window" do
-  match   :role => "diagram_window"
-  gravity :dia_window
-end
-
-tag "dia_toolbox" do
-  match   :role => "toolbox_window"
-  gravity :dia_toolbox
-end
-
-tag "inkscape" do
-  match "inkscape"
-end
-
-tag "xfontsel" do
-  match    "xfontsel"
-  geometry [464, 433, 676, 113]
-  stick    true
-end
-
-tag "xev" do
-  match    :name => "Event[ ]Tester"
-  geometry [1213, 98, 377, 321]
-  float    true
-  stick    true
-end
-# }}}
-
-# Views {{{
-if("mockra" == host or "proteus" == host or "pc03112" == host)
-  www_re    = "browser|one25|three25"
-  test_re   = "xephyr|android|one25|three25"
-  editor_re = "android|editor|one25|three25"
-  icons     = true
-else
-  www_re    = "browser"
-  test_re   = "android|xephyr|seven$|one$"
-  editor_re = "editor"
-  icons     = true
-end
-
-iconpath = "#{ENV["HOME"]}/.config/subtle/icons"
-
-view "terms" do
-  match     "terms|eight|two"
-  icon      "#{iconpath}/terminal.xbm"
-  icon_only icons
-end
-
-view "www" do
-  match     www_re
-  icon      "#{iconpath}/world.xbm"
-  icon_only icons
-end
-
-view "void" do
-  match     "default|void|powerfolder"
-  icon      "#{iconpath}/quote.xbm"
-  icon_only icons
-end
-
-view "sketch" do
-  match     "inkscape|dia_*|gimp_.*"
-  icon      "#{iconpath}/paint.xbm"
-  icon_only icons
-end
-
-view "test" do
-  match     test_re
-  icon      "#{iconpath}/bug.xbm"
-  icon_only icons
-end
-
-view "editor" do
-  match     editor_re
-  icon      "#{iconpath}/pencil.xbm"
-  icon_only icons
-end
-# }}}
-
-# Sublets {{{
-sublet :clock do
-  format_string "%a %b %d,"
-  icon_fg "#777777"
-end
-
-[ :cpu, :jdownloader, :wifi, :mpd, :volume ].each do |sublet|
-  sublet sublet do
-    icon_fg "#777777"
-  end
-end
-# }}}
diff --git a/subtle/xbm/ac.xbm b/subtle/xbm/ac.xbm
deleted file mode 100755
index b6dacef..0000000
--- a/subtle/xbm/ac.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define ac_width 8
-#define ac_height 8
-static unsigned char ac_bits[] = {
- 0xFF, 0xF8, 0xF0, 0xF6, 0x6F, 0x0F, 0x1F, 0xFF };
diff --git a/subtle/xbm/ac1.xbm b/subtle/xbm/ac1.xbm
deleted file mode 100644
index 1d20383..0000000
--- a/subtle/xbm/ac1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define ac_width 9
-#define ac_height 9
-static unsigned char ac_bits[] = {
-   0x30, 0x00, 0x28, 0x00, 0xe4, 0x00, 0x24, 0x00, 0x27, 0x00, 0x24, 0x00,
-   0xe4, 0x00, 0x28, 0x00, 0x30, 0x00 };
diff --git a/subtle/xbm/ac2.xbm b/subtle/xbm/ac2.xbm
deleted file mode 100644
index e13d3d4..0000000
--- a/subtle/xbm/ac2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define ac2_width 9
-#define ac2_height 9
-static unsigned char ac2_bits[] = {
-   0x40, 0x00, 0x20, 0x00, 0x1c, 0x01, 0xa4, 0x00, 0x44, 0x00, 0x46, 0x00,
-   0x7a, 0x00, 0x0e, 0x00, 0x01, 0x00 };
diff --git a/subtle/xbm/ac_01.xbm b/subtle/xbm/ac_01.xbm
deleted file mode 100755
index 66592d7..0000000
--- a/subtle/xbm/ac_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define ac_01_width 8
-#define ac_01_height 8
-static unsigned char ac_01_bits[] = {
- 0x30, 0x28, 0xE4, 0x27, 0x27, 0xE4, 0x28, 0x30 };
diff --git a/subtle/xbm/arch.xbm b/subtle/xbm/arch.xbm
deleted file mode 100755
index 11cfe5a..0000000
--- a/subtle/xbm/arch.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define arch_width 8
-#define arch_height 8
-static unsigned char arch_bits[] = {
- 0x08, 0x08, 0x1C, 0x1C, 0x36, 0x22, 0x77, 0x41 };
diff --git a/subtle/xbm/arch1.xbm b/subtle/xbm/arch1.xbm
deleted file mode 100644
index 881db11..0000000
--- a/subtle/xbm/arch1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arch_width 9
-#define arch_height 9
-static unsigned char arch_bits[] = {
-   0x00, 0x00, 0x10, 0x00, 0x10, 0x00, 0x38, 0x00, 0x38, 0x00, 0x6c, 0x00,
-   0x44, 0x00, 0xee, 0x00, 0x82, 0x00 };
diff --git a/subtle/xbm/arch2.xbm b/subtle/xbm/arch2.xbm
deleted file mode 100644
index 65f7c5d..0000000
--- a/subtle/xbm/arch2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arch2_width 9
-#define arch2_height 9
-static unsigned char arch2_bits[] = {
-   0x10, 0x00, 0x10, 0x00, 0x38, 0x00, 0x7c, 0x00, 0x7c, 0x00, 0xee, 0x00,
-   0xc6, 0x00, 0xc7, 0x01, 0x01, 0x01 };
diff --git a/subtle/xbm/arch_10x10.xbm b/subtle/xbm/arch_10x10.xbm
deleted file mode 100755
index c3ee46d..0000000
--- a/subtle/xbm/arch_10x10.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arch_10x10_width 10
-#define arch_10x10_height 10
-static unsigned char arch_10x10_bits[] = {
- 0x10, 0x00, 0x10, 0x00, 0x38, 0x00, 0x38, 0x00, 0x7C, 0x00, 0x7C, 0x00,
- 0xEE, 0x00, 0xC6, 0x00, 0xC7, 0x01, 0x01, 0x01 };
diff --git a/subtle/xbm/arrow_down1.xbm b/subtle/xbm/arrow_down1.xbm
deleted file mode 100644
index 1987cc2..0000000
--- a/subtle/xbm/arrow_down1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_down_width 9
-#define arrow_down_height 9
-static unsigned char arrow_down_bits[] = {
-   0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x10, 0x00, 0x92, 0x00,
-   0x54, 0x00, 0x38, 0x00, 0x10, 0x00 };
diff --git a/subtle/xbm/arrow_down2.xbm b/subtle/xbm/arrow_down2.xbm
deleted file mode 100644
index 6d46e42..0000000
--- a/subtle/xbm/arrow_down2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_down2_width 9
-#define arrow_down2_height 9
-static unsigned char arrow_down2_bits[] = {
-   0x00, 0x00, 0x38, 0x00, 0x38, 0x00, 0x38, 0x00, 0x38, 0x00, 0xfe, 0x00,
-   0x7c, 0x00, 0x38, 0x00, 0x10, 0x00 };
diff --git a/subtle/xbm/arrow_left1.xbm b/subtle/xbm/arrow_left1.xbm
deleted file mode 100644
index e55cdd2..0000000
--- a/subtle/xbm/arrow_left1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_left_width 9
-#define arrow_left_height 9
-static unsigned char arrow_left_bits[] = {
-   0x00, 0x00, 0x08, 0x00, 0x04, 0x00, 0x02, 0x00, 0xff, 0x01, 0x02, 0x00,
-   0x04, 0x00, 0x08, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/arrow_left2.xbm b/subtle/xbm/arrow_left2.xbm
deleted file mode 100644
index 7b3b18d..0000000
--- a/subtle/xbm/arrow_left2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_left2_width 9
-#define arrow_left2_height 9
-static unsigned char arrow_left2_bits[] = {
-   0x00, 0x00, 0x08, 0x00, 0x0c, 0x00, 0xfe, 0x00, 0xff, 0x00, 0xfe, 0x00,
-   0x0c, 0x00, 0x08, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/arrow_right1.xbm b/subtle/xbm/arrow_right1.xbm
deleted file mode 100644
index 94d6333..0000000
--- a/subtle/xbm/arrow_right1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_right_width 9
-#define arrow_right_height 9
-static unsigned char arrow_right_bits[] = {
-   0x00, 0x00, 0x20, 0x00, 0x40, 0x00, 0x80, 0x00, 0xff, 0x01, 0x80, 0x00,
-   0x40, 0x00, 0x20, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/arrow_right2.xbm b/subtle/xbm/arrow_right2.xbm
deleted file mode 100644
index c3f2ddd..0000000
--- a/subtle/xbm/arrow_right2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_right2_width 9
-#define arrow_right2_height 9
-static unsigned char arrow_right2_bits[] = {
-   0x00, 0x00, 0x20, 0x00, 0x60, 0x00, 0xfe, 0x00, 0xfe, 0x01, 0xfe, 0x00,
-   0x60, 0x00, 0x20, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/arrow_up1.xbm b/subtle/xbm/arrow_up1.xbm
deleted file mode 100644
index 479faf4..0000000
--- a/subtle/xbm/arrow_up1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_up_width 9
-#define arrow_up_height 9
-static unsigned char arrow_up_bits[] = {
-   0x10, 0x00, 0x38, 0x00, 0x54, 0x00, 0x92, 0x00, 0x10, 0x00, 0x10, 0x00,
-   0x10, 0x00, 0x10, 0x00, 0x10, 0x00 };
diff --git a/subtle/xbm/arrow_up2.xbm b/subtle/xbm/arrow_up2.xbm
deleted file mode 100644
index b1e5409..0000000
--- a/subtle/xbm/arrow_up2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_up2_width 9
-#define arrow_up2_height 9
-static unsigned char arrow_up2_bits[] = {
-   0x10, 0x00, 0x38, 0x00, 0x7c, 0x00, 0xfe, 0x00, 0x38, 0x00, 0x38, 0x00,
-   0x38, 0x00, 0x38, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/bag.xbm b/subtle/xbm/bag.xbm
deleted file mode 100644
index f5cee5a..0000000
--- a/subtle/xbm/bag.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define bag_width 9
-#define bag_height 9
-static unsigned char bag_bits[] = {
-   0x00, 0x00, 0x38, 0x00, 0x28, 0x00, 0xff, 0x01, 0x45, 0x01, 0x45, 0x01,
-   0x45, 0x01, 0x45, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/bail.xbm b/subtle/xbm/bail.xbm
deleted file mode 100644
index 804cd1d..0000000
--- a/subtle/xbm/bail.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define bail_width 9
-#define bail_height 9
-static unsigned char bail_bits[] = {
-   0x38, 0x00, 0x44, 0x00, 0x44, 0x00, 0x44, 0x00, 0x38, 0x00, 0x44, 0x00,
-   0x82, 0x00, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/balloon.xbm b/subtle/xbm/balloon.xbm
deleted file mode 100644
index e9e368c..0000000
--- a/subtle/xbm/balloon.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define balloon_width 9
-#define balloon_height 9
-static unsigned char balloon_bits[] = {
-   0xfe, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x9e, 0x00,
-   0xa0, 0x00, 0xc0, 0x00, 0x80, 0x00 };
diff --git a/subtle/xbm/bat_empty_01.xbm b/subtle/xbm/bat_empty_01.xbm
deleted file mode 100755
index cb916db..0000000
--- a/subtle/xbm/bat_empty_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_empty_01_width 8
-#define bat_empty_01_height 8
-static unsigned char bat_empty_01_bits[] = {
- 0x18, 0x7E, 0x42, 0x42, 0x42, 0x42, 0x42, 0x7E };
diff --git a/subtle/xbm/bat_empty_02.xbm b/subtle/xbm/bat_empty_02.xbm
deleted file mode 100755
index e26be8c..0000000
--- a/subtle/xbm/bat_empty_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_empty_02_width 8
-#define bat_empty_02_height 8
-static unsigned char bat_empty_02_bits[] = {
- 0x00, 0x7F, 0x41, 0xC1, 0xC1, 0x41, 0x7F, 0x00 };
diff --git a/subtle/xbm/bat_full_01.xbm b/subtle/xbm/bat_full_01.xbm
deleted file mode 100755
index 701149e..0000000
--- a/subtle/xbm/bat_full_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_full_width 8
-#define bat_full_height 8
-static unsigned char bat_full_bits[] = {
- 0x18, 0x7E, 0x42, 0x5A, 0x5A, 0x5A, 0x42, 0x7E };
diff --git a/subtle/xbm/bat_full_02.xbm b/subtle/xbm/bat_full_02.xbm
deleted file mode 100755
index 93d2327..0000000
--- a/subtle/xbm/bat_full_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_full_02_width 8
-#define bat_full_02_height 8
-static unsigned char bat_full_02_bits[] = {
- 0x00, 0x7F, 0x41, 0xDD, 0xDD, 0x41, 0x7F, 0x00 };
diff --git a/subtle/xbm/bat_low_01.xbm b/subtle/xbm/bat_low_01.xbm
deleted file mode 100755
index 29e974d..0000000
--- a/subtle/xbm/bat_low_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_low_01_width 8
-#define bat_low_01_height 8
-static unsigned char bat_low_01_bits[] = {
- 0x18, 0x7E, 0x42, 0x42, 0x42, 0x5A, 0x42, 0x7E };
diff --git a/subtle/xbm/bat_low_02.xbm b/subtle/xbm/bat_low_02.xbm
deleted file mode 100755
index d80a464..0000000
--- a/subtle/xbm/bat_low_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bat_low_02_width 8
-#define bat_low_02_height 8
-static unsigned char bat_low_02_bits[] = {
- 0x00, 0x7F, 0x41, 0xC5, 0xC5, 0x41, 0x7F, 0x00 };
diff --git a/subtle/xbm/battery_horz1.xbm b/subtle/xbm/battery_horz1.xbm
deleted file mode 100644
index 1b45e28..0000000
--- a/subtle/xbm/battery_horz1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define battery_horz1_width 9
-#define battery_horz1_height 9
-static unsigned char battery_horz1_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x81, 0x00, 0x81, 0x01, 0x81, 0x00,
-   0xff, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/battery_horz2.xbm b/subtle/xbm/battery_horz2.xbm
deleted file mode 100644
index 35321de..0000000
--- a/subtle/xbm/battery_horz2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define battery_horz2_width 9
-#define battery_horz2_height 9
-static unsigned char battery_horz2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x81, 0x00, 0x8d, 0x01, 0x81, 0x00,
-   0xff, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/battery_horz3.xbm b/subtle/xbm/battery_horz3.xbm
deleted file mode 100644
index 688a9ae..0000000
--- a/subtle/xbm/battery_horz3.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define battery_horz3_width 9
-#define battery_horz3_height 9
-static unsigned char battery_horz3_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xff, 0x00, 0x81, 0x00, 0xbd, 0x01, 0x81, 0x00,
-   0xff, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/battery_vert1.xbm b/subtle/xbm/battery_vert1.xbm
deleted file mode 100644
index edc828d..0000000
--- a/subtle/xbm/battery_vert1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define battery_vert1_width 9
-#define battery_vert1_height 9
-static unsigned char battery_vert1_bits[] = {
-   0x10, 0x00, 0x7c, 0x00, 0x44, 0x00, 0x44, 0x00, 0x44, 0x00, 0x44, 0x00,
-   0x44, 0x00, 0x44, 0x00, 0x7c, 0x00 };
diff --git a/subtle/xbm/battery_vert2.xbm b/subtle/xbm/battery_vert2.xbm
deleted file mode 100644
index e4d318e..0000000
--- a/subtle/xbm/battery_vert2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define battery_vert2_width 9
-#define battery_vert2_height 9
-static unsigned char battery_vert2_bits[] = {
-   0x10, 0x00, 0x7c, 0x00, 0x44, 0x00, 0x44, 0x00, 0x44, 0x00, 0x54, 0x00,
-   0x54, 0x00, 0x44, 0x00, 0x7c, 0x00 };
diff --git a/subtle/xbm/battery_vert3.xbm b/subtle/xbm/battery_vert3.xbm
deleted file mode 100644
index 5c90fac..0000000
--- a/subtle/xbm/battery_vert3.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define battery_vert3_width 9
-#define battery_vert3_height 9
-static unsigned char battery_vert3_bits[] = {
-   0x10, 0x00, 0x7c, 0x00, 0x44, 0x00, 0x54, 0x00, 0x54, 0x00, 0x54, 0x00,
-   0x54, 0x00, 0x44, 0x00, 0x7c, 0x00 };
diff --git a/subtle/xbm/bell1.xbm b/subtle/xbm/bell1.xbm
deleted file mode 100644
index 05343c5..0000000
--- a/subtle/xbm/bell1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define bell_width 9
-#define bell_height 9
-static unsigned char bell_bits[] = {
-   0x00, 0x00, 0x1e, 0x00, 0xa2, 0x00, 0xc2, 0x00, 0x42, 0x00, 0x24, 0x00,
-   0xd8, 0x00, 0xcc, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/bell2.xbm b/subtle/xbm/bell2.xbm
deleted file mode 100644
index b17232c..0000000
--- a/subtle/xbm/bell2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define bell2_width 9
-#define bell2_height 9
-static unsigned char bell2_bits[] = {
-   0x10, 0x00, 0x28, 0x00, 0x44, 0x00, 0x44, 0x00, 0x82, 0x00, 0x82, 0x00,
-   0x01, 0x01, 0xff, 0x01, 0x38, 0x00 };
diff --git a/subtle/xbm/binder.xbm b/subtle/xbm/binder.xbm
deleted file mode 100644
index 3b80fc1..0000000
--- a/subtle/xbm/binder.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define binder_width 9
-#define binder_height 9
-static unsigned char binder_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x72, 0x01, 0x01, 0x01, 0x72, 0x01, 0x01, 0x01,
-   0x72, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/bluetooth.xbm b/subtle/xbm/bluetooth.xbm
deleted file mode 100755
index 3cc42d5..0000000
--- a/subtle/xbm/bluetooth.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bluetooth_width 8
-#define bluetooth_height 8
-static unsigned char bluetooth_bits[] = {
- 0x18, 0x2A, 0x6C, 0x38, 0x38, 0x6C, 0x2A, 0x18 };
diff --git a/subtle/xbm/box.xbm b/subtle/xbm/box.xbm
deleted file mode 100644
index 1602d54..0000000
--- a/subtle/xbm/box.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define box_width 9
-#define box_height 9
-static unsigned char box_bits[] = {
-   0xf8, 0x01, 0x84, 0x01, 0x42, 0x01, 0x3f, 0x01, 0x21, 0x01, 0x21, 0x01,
-   0x21, 0x01, 0xa1, 0x00, 0x7f, 0x00 };
diff --git a/subtle/xbm/box_in.xbm b/subtle/xbm/box_in.xbm
deleted file mode 100644
index 3f7d9da..0000000
--- a/subtle/xbm/box_in.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define arrow_box_width 9
-#define arrow_box_height 9
-static unsigned char arrow_box_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x11, 0x01, 0x20, 0x01, 0x7f, 0x01, 0x20, 0x01,
-   0x11, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/box_minus.xbm b/subtle/xbm/box_minus.xbm
deleted file mode 100644
index a144da3..0000000
--- a/subtle/xbm/box_minus.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define box_minus_width 9
-#define box_minus_height 9
-static unsigned char box_minus_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x7d, 0x01, 0x01, 0x01,
-   0x01, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/box_out.xbm b/subtle/xbm/box_out.xbm
deleted file mode 100644
index 1ea1d0b..0000000
--- a/subtle/xbm/box_out.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define box_out_width 9
-#define box_out_height 9
-static unsigned char box_out_bits[] = {
-   0x0f, 0x00, 0x08, 0x00, 0x48, 0x00, 0x80, 0x00, 0xff, 0x01, 0x80, 0x00,
-   0x48, 0x00, 0x08, 0x00, 0x0f, 0x00 };
diff --git a/subtle/xbm/box_plus.xbm b/subtle/xbm/box_plus.xbm
deleted file mode 100644
index 18cfb60..0000000
--- a/subtle/xbm/box_plus.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define box_plus_width 9
-#define box_plus_height 9
-static unsigned char box_plus_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x11, 0x01, 0x11, 0x01, 0x7d, 0x01, 0x11, 0x01,
-   0x11, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/brightness.xbm b/subtle/xbm/brightness.xbm
deleted file mode 100644
index ea6b202..0000000
--- a/subtle/xbm/brightness.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define brightness_width 9
-#define brightness_height 9
-static unsigned char brightness_bits[] = {
-   0x7c, 0x00, 0x9e, 0x00, 0x1f, 0x01, 0x1f, 0x01, 0x1f, 0x01, 0x1f, 0x01,
-   0x1f, 0x01, 0x9e, 0x00, 0x7c, 0x00 };
diff --git a/subtle/xbm/bug.xbm b/subtle/xbm/bug.xbm
deleted file mode 100644
index f0238bb..0000000
--- a/subtle/xbm/bug.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define bug_width 9
-#define bug_height 9
-static unsigned char bug_bits[] = {
-   0x83, 0x01, 0x44, 0x00, 0x38, 0x00, 0x38, 0x00, 0xbb, 0x01, 0x7c, 0x00,
-   0xfe, 0x00, 0x7d, 0x01, 0x39, 0x01 };
diff --git a/subtle/xbm/bug_01.xbm b/subtle/xbm/bug_01.xbm
deleted file mode 100755
index 8974034..0000000
--- a/subtle/xbm/bug_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bug_width 8
-#define bug_height 8
-static unsigned char bug_bits[] = {
- 0xC3, 0x24, 0x18, 0xDB, 0x3C, 0x7E, 0xBD, 0x99 };
diff --git a/subtle/xbm/bug_02.xbm b/subtle/xbm/bug_02.xbm
deleted file mode 100755
index 051f2f5..0000000
--- a/subtle/xbm/bug_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define bug_02_width 8
-#define bug_02_height 8
-static unsigned char bug_02_bits[] = {
- 0xC3, 0x24, 0x24, 0xDB, 0x3C, 0x7E, 0x99, 0x42 };
diff --git a/subtle/xbm/calculator.xbm b/subtle/xbm/calculator.xbm
deleted file mode 100644
index 2322c54..0000000
--- a/subtle/xbm/calculator.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define calculator_width 9
-#define calculator_height 9
-static unsigned char calculator_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x7d, 0x01, 0x01, 0x01, 0x55, 0x01, 0x01, 0x01,
-   0x55, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/card.xbm b/subtle/xbm/card.xbm
deleted file mode 100644
index 283fa90..0000000
--- a/subtle/xbm/card.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define card_width 9
-#define card_height 9
-static unsigned char card_bits[] = {
-   0x00, 0x00, 0xff, 0x01, 0x01, 0x01, 0x75, 0x01, 0x05, 0x01, 0x75, 0x01,
-   0x01, 0x01, 0x45, 0x01, 0xbb, 0x01 };
diff --git a/subtle/xbm/cart.xbm b/subtle/xbm/cart.xbm
deleted file mode 100644
index c61deea..0000000
--- a/subtle/xbm/cart.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define cart_width 9
-#define cart_height 9
-static unsigned char cart_bits[] = {
-   0x01, 0x00, 0x02, 0x00, 0xfc, 0x01, 0x54, 0x01, 0x54, 0x01, 0xfc, 0x00,
-   0x00, 0x00, 0x86, 0x01, 0x86, 0x01 };
diff --git a/subtle/xbm/cart_plus.xbm b/subtle/xbm/cart_plus.xbm
deleted file mode 100644
index 8543173..0000000
--- a/subtle/xbm/cart_plus.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define cart_plus_width 9
-#define cart_plus_height 9
-static unsigned char cart_plus_bits[] = {
-   0x21, 0x00, 0x72, 0x00, 0x24, 0x01, 0x04, 0x01, 0x54, 0x01, 0xfc, 0x00,
-   0x00, 0x00, 0x86, 0x01, 0x86, 0x01 };
diff --git a/subtle/xbm/cat.xbm b/subtle/xbm/cat.xbm
deleted file mode 100755
index d0bc6ab..0000000
--- a/subtle/xbm/cat.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define cat_width 8
-#define cat_height 8
-static unsigned char cat_bits[] = {
- 0x81, 0xC3, 0xBD, 0xFF, 0x99, 0xFF, 0x7E, 0xBD };
diff --git a/subtle/xbm/cd.xbm b/subtle/xbm/cd.xbm
deleted file mode 100644
index fc6ab12..0000000
--- a/subtle/xbm/cd.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define cd_width 9
-#define cd_height 9
-static unsigned char cd_bits[] = {
-   0x38, 0x00, 0x44, 0x00, 0x82, 0x00, 0x11, 0x01, 0x29, 0x01, 0x11, 0x01,
-   0x82, 0x00, 0x44, 0x00, 0x38, 0x00 };
diff --git a/subtle/xbm/cert.xbm b/subtle/xbm/cert.xbm
deleted file mode 100644
index 6d743e8..0000000
--- a/subtle/xbm/cert.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define cert_width 9
-#define cert_height 9
-static unsigned char cert_bits[] = {
-   0xff, 0x01, 0x7d, 0x01, 0x7d, 0x01, 0x7d, 0x01, 0x55, 0x01, 0x01, 0x01,
-   0x61, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/chain.xbm b/subtle/xbm/chain.xbm
deleted file mode 100644
index 7d48c96..0000000
--- a/subtle/xbm/chain.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define chain_width 9
-#define chain_height 9
-static unsigned char chain_bits[] = {
-   0xe0, 0x00, 0x10, 0x01, 0x10, 0x01, 0x10, 0x01, 0xee, 0x00, 0x11, 0x00,
-   0x11, 0x00, 0x11, 0x00, 0x0e, 0x00 };
diff --git a/subtle/xbm/check.xbm b/subtle/xbm/check.xbm
deleted file mode 100644
index ad02f56..0000000
--- a/subtle/xbm/check.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define check_width 9
-#define check_height 9
-static unsigned char check_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x00, 0x41, 0x00,
-   0x22, 0x00, 0x14, 0x00, 0x08, 0x00 };
diff --git a/subtle/xbm/clip.xbm b/subtle/xbm/clip.xbm
deleted file mode 100644
index 6c40497..0000000
--- a/subtle/xbm/clip.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define clip_width 9
-#define clip_height 9
-static unsigned char clip_bits[] = {
-   0x3e, 0x00, 0x22, 0x00, 0x2a, 0x00, 0xaa, 0x00, 0xaa, 0x00, 0xaa, 0x00,
-   0xba, 0x00, 0x82, 0x00, 0xfe, 0x00 };
diff --git a/subtle/xbm/clock.xbm b/subtle/xbm/clock.xbm
deleted file mode 100755
index cd2fad2..0000000
--- a/subtle/xbm/clock.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define clock_width 8
-#define clock_height 8
-static unsigned char clock_bits[] = {
- 0x3C, 0x5E, 0xEF, 0xF7, 0x87, 0xFF, 0x7E, 0x3C };
diff --git a/subtle/xbm/clock1.xbm b/subtle/xbm/clock1.xbm
deleted file mode 100644
index 8b0f70c..0000000
--- a/subtle/xbm/clock1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define clock_width 9
-#define clock_height 9
-static unsigned char clock_bits[] = {
-   0x7c, 0x00, 0xbe, 0x00, 0xdf, 0x01, 0xef, 0x01, 0x0f, 0x01, 0xff, 0x01,
-   0xff, 0x01, 0xfe, 0x00, 0x7c, 0x00 };
diff --git a/subtle/xbm/clock2.xbm b/subtle/xbm/clock2.xbm
deleted file mode 100644
index 78b552f..0000000
--- a/subtle/xbm/clock2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define clock2_width 9
-#define clock2_height 9
-static unsigned char clock2_bits[] = {
-   0x7c, 0x00, 0x82, 0x00, 0x11, 0x01, 0x11, 0x01, 0x71, 0x01, 0x01, 0x01,
-   0x01, 0x01, 0x82, 0x00, 0x7c, 0x00 };
diff --git a/subtle/xbm/clockwise.xbm b/subtle/xbm/clockwise.xbm
deleted file mode 100644
index 6c70a26..0000000
--- a/subtle/xbm/clockwise.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define clockwise_width 9
-#define clockwise_height 9
-static unsigned char clockwise_bits[] = {
-   0x38, 0x01, 0x44, 0x01, 0x82, 0x01, 0xe1, 0x01, 0x01, 0x00, 0x01, 0x01,
-   0x82, 0x00, 0x44, 0x00, 0x38, 0x00 };
diff --git a/subtle/xbm/cpu.xbm b/subtle/xbm/cpu.xbm
deleted file mode 100644
index 620237b..0000000
--- a/subtle/xbm/cpu.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define cpu_width 9
-#define cpu_height 9
-static unsigned char cpu_bits[] = {
-   0xbb, 0x01, 0x01, 0x01, 0x7c, 0x00, 0x7d, 0x01, 0x7d, 0x01, 0x7d, 0x01,
-   0x7c, 0x00, 0x01, 0x01, 0xbb, 0x01 };
diff --git a/subtle/xbm/cpu_1.xbm b/subtle/xbm/cpu_1.xbm
deleted file mode 100644
index 1b2768d..0000000
--- a/subtle/xbm/cpu_1.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define load_cpu_width 16
-#define load_cpu_height 16
-static unsigned char load_cpu_bits[] = {
-   0x00, 0x00, 0x48, 0x12, 0x48, 0x12, 0xfc, 0x3f, 0xfc, 0x3f, 0xfe, 0x7f,
-   0x1c, 0x38, 0x1c, 0x38, 0x1e, 0x78, 0x1c, 0x38, 0xfc, 0x3f, 0xfe, 0x7f,
-   0xfc, 0x3f, 0x48, 0x12, 0x48, 0x12, 0x00, 0x00 };
diff --git a/subtle/xbm/delete.xbm b/subtle/xbm/delete.xbm
deleted file mode 100644
index 2ff00d8..0000000
--- a/subtle/xbm/delete.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define delete_width 9
-#define delete_height 9
-static unsigned char delete_bits[] = {
-   0x01, 0x01, 0x82, 0x00, 0x44, 0x00, 0x28, 0x00, 0x10, 0x00, 0x28, 0x00,
-   0x44, 0x00, 0x82, 0x00, 0x01, 0x01 };
diff --git a/subtle/xbm/denied1.xbm b/subtle/xbm/denied1.xbm
deleted file mode 100644
index 3c80237..0000000
--- a/subtle/xbm/denied1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define denied_width 9
-#define denied_height 9
-static unsigned char denied_bits[] = {
-   0x38, 0x00, 0x44, 0x00, 0x82, 0x00, 0x01, 0x01, 0x7d, 0x01, 0x01, 0x01,
-   0x82, 0x00, 0x44, 0x00, 0x38, 0x00 };
diff --git a/subtle/xbm/denied2.xbm b/subtle/xbm/denied2.xbm
deleted file mode 100644
index 29e70f3..0000000
--- a/subtle/xbm/denied2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define denied2_width 9
-#define denied2_height 9
-static unsigned char denied2_bits[] = {
-   0x38, 0x00, 0x44, 0x00, 0x92, 0x00, 0x11, 0x01, 0x11, 0x01, 0x11, 0x01,
-   0x92, 0x00, 0x44, 0x00, 0x38, 0x00 };
diff --git a/subtle/xbm/diagram.xbm b/subtle/xbm/diagram.xbm
deleted file mode 100644
index 825c7ec..0000000
--- a/subtle/xbm/diagram.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define diagram_width 9
-#define diagram_height 9
-static unsigned char diagram_bits[] = {
-   0xfe, 0x00, 0x82, 0x00, 0xfe, 0x00, 0x44, 0x00, 0x44, 0x00, 0xef, 0x01,
-   0x29, 0x01, 0xef, 0x01, 0x00, 0x00 };
diff --git a/subtle/xbm/dish.xbm b/subtle/xbm/dish.xbm
deleted file mode 100755
index 75e9f88..0000000
--- a/subtle/xbm/dish.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define dish_width 8
-#define dish_height 8
-static unsigned char dish_bits[] = {
- 0x81, 0x7B, 0x46, 0x4E, 0x5C, 0x3E, 0x77, 0xC3 };
diff --git a/subtle/xbm/diskette.xbm b/subtle/xbm/diskette.xbm
deleted file mode 100644
index abfe3b0..0000000
--- a/subtle/xbm/diskette.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define diskette_width 9
-#define diskette_height 9
-static unsigned char diskette_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x7d, 0x01,
-   0x75, 0x01, 0x75, 0x01, 0xfe, 0x01 };
diff --git a/subtle/xbm/dotbox.xbm b/subtle/xbm/dotbox.xbm
deleted file mode 100644
index e51f8f5..0000000
--- a/subtle/xbm/dotbox.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define dotbox_width 9
-#define dotbox_height 9
-static unsigned char dotbox_bits[] = {
-   0xfe, 0x00, 0x82, 0x00, 0x82, 0x00, 0x82, 0x00, 0x82, 0x00, 0x82, 0x00,
-   0x92, 0x00, 0x82, 0x00, 0xfe, 0x00 };
diff --git a/subtle/xbm/down.xbm b/subtle/xbm/down.xbm
deleted file mode 100644
index bc350dd..0000000
--- a/subtle/xbm/down.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define down_width 16
-#define down_height 16
-static unsigned char down_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0xe0, 0x03, 0xc0, 0x01, 0x80, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/empty.xbm b/subtle/xbm/empty.xbm
deleted file mode 100755
index 1086137..0000000
--- a/subtle/xbm/empty.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define empty_width 8
-#define empty_height 8
-static unsigned char empty_bits[] = {
- 0x3C, 0x42, 0x81, 0x81, 0x81, 0x81, 0x42, 0x3C };
diff --git a/subtle/xbm/exclamation1.xbm b/subtle/xbm/exclamation1.xbm
deleted file mode 100644
index 70213c5..0000000
--- a/subtle/xbm/exclamation1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define exclamation_width 9
-#define exclamation_height 9
-static unsigned char exclamation_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x11, 0x01, 0x11, 0x01, 0x11, 0x01, 0x01, 0x01,
-   0x11, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/exclamation2.xbm b/subtle/xbm/exclamation2.xbm
deleted file mode 100644
index a0a7571..0000000
--- a/subtle/xbm/exclamation2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define exclamation2_width 9
-#define exclamation2_height 9
-static unsigned char exclamation2_bits[] = {
-   0x10, 0x00, 0x28, 0x00, 0x28, 0x00, 0x54, 0x00, 0x54, 0x00, 0x82, 0x00,
-   0x92, 0x00, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/eye_l.xbm b/subtle/xbm/eye_l.xbm
deleted file mode 100755
index 3de8e26..0000000
--- a/subtle/xbm/eye_l.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define eye_l_width 8
-#define eye_l_height 8
-static unsigned char eye_l_bits[] = {
- 0x00, 0x00, 0x1B, 0x02, 0x02, 0x84, 0xF9, 0x02 };
diff --git a/subtle/xbm/eye_r.xbm b/subtle/xbm/eye_r.xbm
deleted file mode 100755
index 7a04951..0000000
--- a/subtle/xbm/eye_r.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define eye_r_width 8
-#define eye_r_height 8
-static unsigned char eye_r_bits[] = {
- 0x00, 0x00, 0xD8, 0x40, 0x40, 0x21, 0x9F, 0x40 };
diff --git a/subtle/xbm/fan.xbm b/subtle/xbm/fan.xbm
deleted file mode 100644
index 5159e74..0000000
--- a/subtle/xbm/fan.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define fan_width 9
-#define fan_height 9
-static unsigned char fan_bits[] = {
-   0x86, 0x00, 0x39, 0x01, 0x7c, 0x01, 0xc6, 0x00, 0xc6, 0x00, 0xc6, 0x00,
-   0x7d, 0x00, 0x39, 0x01, 0xc2, 0x00 };
diff --git a/subtle/xbm/file1.xbm b/subtle/xbm/file1.xbm
deleted file mode 100644
index 82b656f..0000000
--- a/subtle/xbm/file1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define file_width 9
-#define file_height 9
-static unsigned char file_bits[] = {
-   0x1f, 0x00, 0x11, 0x00, 0xf1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-   0x01, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/file2.xbm b/subtle/xbm/file2.xbm
deleted file mode 100644
index 43e9cbe..0000000
--- a/subtle/xbm/file2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define file2_width 9
-#define file2_height 9
-static unsigned char file2_bits[] = {
-   0x7f, 0x00, 0xc1, 0x00, 0xc1, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-   0x01, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/flag.xbm b/subtle/xbm/flag.xbm
deleted file mode 100644
index c587fc4..0000000
--- a/subtle/xbm/flag.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define flag_width 9
-#define flag_height 9
-static unsigned char flag_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0xff, 0x01, 0x01, 0x00,
-   0x01, 0x00, 0x01, 0x00, 0x01, 0x00 };
diff --git a/subtle/xbm/flask1.xbm b/subtle/xbm/flask1.xbm
deleted file mode 100644
index b7165f6..0000000
--- a/subtle/xbm/flask1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define flask1_width 9
-#define flask1_height 9
-static unsigned char flask1_bits[] = {
-   0x00, 0x00, 0x38, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x44, 0x00,
-   0x82, 0x00, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/flask2.xbm b/subtle/xbm/flask2.xbm
deleted file mode 100644
index aa623a6..0000000
--- a/subtle/xbm/flask2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define flask2_width 9
-#define flask2_height 9
-static unsigned char flask2_bits[] = {
-   0x00, 0x00, 0x38, 0x00, 0x28, 0x00, 0x28, 0x00, 0x28, 0x00, 0x44, 0x00,
-   0xba, 0x00, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/fox.xbm b/subtle/xbm/fox.xbm
deleted file mode 100755
index 46735c3..0000000
--- a/subtle/xbm/fox.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define fox_width 8
-#define fox_height 8
-static unsigned char fox_bits[] = {
- 0x81, 0xC3, 0xBD, 0xFF, 0x99, 0xDB, 0x7E, 0x18 };
diff --git a/subtle/xbm/fox_1.xbm b/subtle/xbm/fox_1.xbm
deleted file mode 100644
index 87c9714..0000000
--- a/subtle/xbm/fox_1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define fox_width 9
-#define fox_height 9
-static unsigned char fox_bits[] = {
-   0x01, 0x01, 0x83, 0x01, 0x7d, 0x01, 0x7d, 0x01, 0xff, 0x01, 0x39, 0x01,
-   0xff, 0x01, 0xfe, 0x00, 0x7d, 0x01 };
diff --git a/subtle/xbm/fs_01.xbm b/subtle/xbm/fs_01.xbm
deleted file mode 100755
index 1d012d2..0000000
--- a/subtle/xbm/fs_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define fs_01_width 8
-#define fs_01_height 8
-static unsigned char fs_01_bits[] = {
- 0x46, 0x99, 0xBC, 0x66, 0x66, 0x3D, 0x99, 0x62 };
diff --git a/subtle/xbm/fs_02.xbm b/subtle/xbm/fs_02.xbm
deleted file mode 100755
index 603e3a7..0000000
--- a/subtle/xbm/fs_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define fs_02_width 8
-#define fs_02_height 8
-static unsigned char fs_02_bits[] = {
- 0xF1, 0x5B, 0x3D, 0x67, 0xE6, 0xBC, 0xDA, 0x8F };
diff --git a/subtle/xbm/full.xbm b/subtle/xbm/full.xbm
deleted file mode 100755
index b5a026f..0000000
--- a/subtle/xbm/full.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define full_width 8
-#define full_height 8
-static unsigned char full_bits[] = {
- 0x3C, 0x7E, 0xFF, 0xFF, 0xFF, 0xFF, 0x7E, 0x3C };
diff --git a/subtle/xbm/fwd.xbm b/subtle/xbm/fwd.xbm
deleted file mode 100755
index 3f52ea9..0000000
--- a/subtle/xbm/fwd.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define fwd_width 8
-#define fwd_height 8
-static unsigned char fwd_bits[] = {
- 0x00, 0x12, 0x36, 0x7E, 0x7E, 0x36, 0x12, 0x00 };
diff --git a/subtle/xbm/game.xbm b/subtle/xbm/game.xbm
deleted file mode 100644
index d4b7954..0000000
--- a/subtle/xbm/game.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define game_width 9
-#define game_height 9
-static unsigned char game_bits[] = {
-   0x44, 0x00, 0x28, 0x00, 0x7c, 0x00, 0xfe, 0x00, 0xd7, 0x01, 0x7d, 0x01,
-   0x7c, 0x00, 0x44, 0x00, 0x28, 0x00 };
diff --git a/subtle/xbm/ghost.xbm b/subtle/xbm/ghost.xbm
deleted file mode 100644
index a0f6432..0000000
--- a/subtle/xbm/ghost.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define ghost_width 9
-#define ghost_height 9
-static unsigned char ghost_bits[] = {
-   0x38, 0x00, 0x7c, 0x00, 0xfe, 0x00, 0xd6, 0x00, 0xfe, 0x00, 0xfe, 0x00,
-   0xfe, 0x00, 0xfe, 0x00, 0xaa, 0x00 };
diff --git a/subtle/xbm/half.xbm b/subtle/xbm/half.xbm
deleted file mode 100755
index 874323b..0000000
--- a/subtle/xbm/half.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define half_width 8
-#define half_height 8
-static unsigned char half_bits[] = {
- 0x3C, 0x4E, 0x8F, 0x8F, 0x8F, 0x8F, 0x4E, 0x3C };
diff --git a/subtle/xbm/headphones.xbm b/subtle/xbm/headphones.xbm
deleted file mode 100644
index 5d85395..0000000
--- a/subtle/xbm/headphones.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define headphones_width 9
-#define headphones_height 9
-static unsigned char headphones_bits[] = {
-   0x7c, 0x00, 0x82, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x45, 0x01,
-   0xc7, 0x01, 0xc6, 0x00, 0xc6, 0x00 };
diff --git a/subtle/xbm/heart.xbm b/subtle/xbm/heart.xbm
deleted file mode 100644
index 9deca37..0000000
--- a/subtle/xbm/heart.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define heart_width 9
-#define heart_height 9
-static unsigned char heart_bits[] = {
-   0xee, 0x00, 0x11, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x82, 0x00,
-   0x44, 0x00, 0x28, 0x00, 0x10, 0x00 };
diff --git a/subtle/xbm/heart_plus.xbm b/subtle/xbm/heart_plus.xbm
deleted file mode 100644
index 1e08edb..0000000
--- a/subtle/xbm/heart_plus.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define heart_plus_width 9
-#define heart_plus_height 9
-static unsigned char heart_plus_bits[] = {
-   0xee, 0x00, 0x11, 0x01, 0x00, 0x01, 0x02, 0x01, 0x07, 0x01, 0x82, 0x00,
-   0x40, 0x00, 0x28, 0x00, 0x10, 0x00 };
diff --git a/subtle/xbm/house.xbm b/subtle/xbm/house.xbm
deleted file mode 100644
index 656ee57..0000000
--- a/subtle/xbm/house.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define house_width 9
-#define house_height 9
-static unsigned char house_bits[] = {
-   0x90, 0x00, 0xa8, 0x00, 0x44, 0x00, 0x82, 0x00, 0x01, 0x01, 0xba, 0x00,
-   0xaa, 0x00, 0xaa, 0x00, 0xfe, 0x00 };
diff --git a/subtle/xbm/info.xbm b/subtle/xbm/info.xbm
deleted file mode 100644
index 6153d97..0000000
--- a/subtle/xbm/info.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define info_width 9
-#define info_height 9
-static unsigned char info_bits[] = {
-   0x38, 0x00, 0x38, 0x00, 0x00, 0x00, 0x3c, 0x00, 0x38, 0x00, 0x38, 0x00,
-   0x38, 0x00, 0x38, 0x00, 0x7c, 0x00 };
diff --git a/subtle/xbm/info_01.xbm b/subtle/xbm/info_01.xbm
deleted file mode 100755
index f08c2fd..0000000
--- a/subtle/xbm/info_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define info_01_width 8
-#define info_01_height 8
-static unsigned char info_01_bits[] = {
- 0x3C, 0x66, 0xFF, 0xE7, 0xE7, 0xE7, 0x66, 0x3C };
diff --git a/subtle/xbm/info_02.xbm b/subtle/xbm/info_02.xbm
deleted file mode 100755
index 00b4df0..0000000
--- a/subtle/xbm/info_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define info_02_width 8
-#define info_02_height 8
-static unsigned char info_02_bits[] = {
- 0xFF, 0xE7, 0xFF, 0xE7, 0xE7, 0xE7, 0xE7, 0xFF };
diff --git a/subtle/xbm/info_03.xbm b/subtle/xbm/info_03.xbm
deleted file mode 100755
index 50103f8..0000000
--- a/subtle/xbm/info_03.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define info_width 8
-#define info_height 8
-static unsigned char info_bits[] = {
- 0x38, 0x38, 0x00, 0x3C, 0x38, 0x38, 0x38, 0x7C };
diff --git a/subtle/xbm/jar1.xbm b/subtle/xbm/jar1.xbm
deleted file mode 100644
index 29c65cb..0000000
--- a/subtle/xbm/jar1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define jar1_width 9
-#define jar1_height 9
-static unsigned char jar1_bits[] = {
-   0x7c, 0x00, 0x7c, 0x00, 0x82, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-   0x01, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/jar2.xbm b/subtle/xbm/jar2.xbm
deleted file mode 100644
index 45ba61a..0000000
--- a/subtle/xbm/jar2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define jar2_width 9
-#define jar2_height 9
-static unsigned char jar2_bits[] = {
-   0x7c, 0x00, 0x7c, 0x00, 0x82, 0x00, 0x01, 0x01, 0x01, 0x01, 0x7d, 0x01,
-   0x7d, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/jar3.xbm b/subtle/xbm/jar3.xbm
deleted file mode 100644
index 806955d..0000000
--- a/subtle/xbm/jar3.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define jar3_width 9
-#define jar3_height 9
-static unsigned char jar3_bits[] = {
-   0x7c, 0x00, 0x7c, 0x00, 0x82, 0x00, 0x39, 0x01, 0x39, 0x01, 0x7d, 0x01,
-   0x7d, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/key.xbm b/subtle/xbm/key.xbm
deleted file mode 100644
index 53193d2..0000000
--- a/subtle/xbm/key.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define key_width 9
-#define key_height 9
-static unsigned char key_bits[] = {
-   0xfe, 0x00, 0x82, 0x00, 0x82, 0x00, 0x82, 0x00, 0xfe, 0x00, 0x10, 0x00,
-   0x1c, 0x00, 0x10, 0x00, 0x1c, 0x00 };
diff --git a/subtle/xbm/light1.xbm b/subtle/xbm/light1.xbm
deleted file mode 100644
index e01cc3f..0000000
--- a/subtle/xbm/light1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define light1_width 9
-#define light1_height 9
-static unsigned char light1_bits[] = {
-   0x38, 0x00, 0x44, 0x00, 0x82, 0x00, 0x82, 0x00, 0x44, 0x00, 0x28, 0x00,
-   0x38, 0x00, 0x38, 0x00, 0x10, 0x00 };
diff --git a/subtle/xbm/light2.xbm b/subtle/xbm/light2.xbm
deleted file mode 100644
index aa039ae..0000000
--- a/subtle/xbm/light2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define light2_width 9
-#define light2_height 9
-static unsigned char light2_bits[] = {
-   0x39, 0x01, 0x44, 0x00, 0x82, 0x00, 0x82, 0x00, 0x44, 0x00, 0x28, 0x00,
-   0x39, 0x01, 0x38, 0x00, 0x10, 0x00 };
diff --git a/subtle/xbm/list.xbm b/subtle/xbm/list.xbm
deleted file mode 100644
index 599075d..0000000
--- a/subtle/xbm/list.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define list_width 9
-#define list_height 9
-static unsigned char list_bits[] = {
-   0xfb, 0x00, 0x03, 0x00, 0x00, 0x00, 0xfb, 0x00, 0x03, 0x00, 0x00, 0x00,
-   0xfb, 0x00, 0x03, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/load.xbm b/subtle/xbm/load.xbm
deleted file mode 100644
index b9a1061..0000000
--- a/subtle/xbm/load.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define load_width 16
-#define load_height 16
-static unsigned char load_bits[] = {
-   0x00, 0x00, 0xfe, 0x7f, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40, 0x02, 0x40,
-   0x02, 0x44, 0x02, 0x4a, 0x02, 0x71, 0x8e, 0x40, 0x52, 0x40, 0x22, 0x40,
-   0x02, 0x40, 0x02, 0x40, 0xfe, 0x7f, 0x00, 0x00 };
diff --git a/subtle/xbm/lock.xbm b/subtle/xbm/lock.xbm
deleted file mode 100644
index dd171b5..0000000
--- a/subtle/xbm/lock.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define lock_width 9
-#define lock_height 9
-static unsigned char lock_bits[] = {
-   0x7c, 0x00, 0x82, 0x00, 0x82, 0x00, 0xff, 0x01, 0x01, 0x01, 0x11, 0x01,
-   0x11, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/magnifier.xbm b/subtle/xbm/magnifier.xbm
deleted file mode 100644
index bf7df83..0000000
--- a/subtle/xbm/magnifier.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define magnifier_width 9
-#define magnifier_height 9
-static unsigned char magnifier_bits[] = {
-   0x1c, 0x00, 0x22, 0x00, 0x41, 0x00, 0x41, 0x00, 0x41, 0x00, 0x22, 0x00,
-   0x5c, 0x00, 0x80, 0x00, 0x00, 0x01 };
diff --git a/subtle/xbm/mail.xbm b/subtle/xbm/mail.xbm
deleted file mode 100755
index 295eb73..0000000
--- a/subtle/xbm/mail.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define mail_width 8
-#define mail_height 8
-static unsigned char mail_bits[] = {
- 0x00, 0xFF, 0x7E, 0xBD, 0xDB, 0xE7, 0xFF, 0x00 };
diff --git a/subtle/xbm/mail_1.xbm b/subtle/xbm/mail_1.xbm
deleted file mode 100644
index 4a2eb36..0000000
--- a/subtle/xbm/mail_1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define mail_width 9
-#define mail_height 9
-static unsigned char mail_bits[] = {
-   0x00, 0x00, 0xff, 0x01, 0x01, 0x01, 0x45, 0x01, 0x29, 0x01, 0x11, 0x01,
-   0x01, 0x01, 0xff, 0x01, 0x00, 0x00 };
diff --git a/subtle/xbm/man.xbm b/subtle/xbm/man.xbm
deleted file mode 100644
index 3848cc2..0000000
--- a/subtle/xbm/man.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define man_width 9
-#define man_height 9
-static unsigned char man_bits[] = {
-   0x10, 0x00, 0x28, 0x00, 0x10, 0x00, 0x7c, 0x00, 0x92, 0x00, 0xaa, 0x00,
-   0x28, 0x00, 0x28, 0x00, 0x28, 0x00 };
diff --git a/subtle/xbm/mem.xbm b/subtle/xbm/mem.xbm
deleted file mode 100644
index 5c5bc8e..0000000
--- a/subtle/xbm/mem.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define load_mem_width 16
-#define load_mem_height 16
-static unsigned char load_mem_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x12, 0x48, 0x12, 0xfc, 0x3f,
-   0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0x48, 0x12,
-   0x48, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/mem_1.xbm b/subtle/xbm/mem_1.xbm
deleted file mode 100644
index 5c5bc8e..0000000
--- a/subtle/xbm/mem_1.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define load_mem_width 16
-#define load_mem_height 16
-static unsigned char load_mem_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x48, 0x12, 0x48, 0x12, 0xfc, 0x3f,
-   0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0xfc, 0x3f, 0x48, 0x12,
-   0x48, 0x12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/memory.xbm b/subtle/xbm/memory.xbm
deleted file mode 100644
index f9821ea..0000000
--- a/subtle/xbm/memory.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define memory_width 9
-#define memory_height 9
-static unsigned char memory_bits[] = {
-   0xaa, 0x00, 0x00, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0xfe, 0x00,
-   0xfe, 0x00, 0x00, 0x00, 0xaa, 0x00 };
diff --git a/subtle/xbm/minus.xbm b/subtle/xbm/minus.xbm
deleted file mode 100644
index 072ef07..0000000
--- a/subtle/xbm/minus.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define minus_width 9
-#define minus_height 9
-static unsigned char minus_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0x01, 0x01, 0x01, 0xff, 0x01,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/mouse.xbm b/subtle/xbm/mouse.xbm
deleted file mode 100644
index 28a6528..0000000
--- a/subtle/xbm/mouse.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define mouse_width 9
-#define mouse_height 9
-static unsigned char mouse_bits[] = {
-   0xee, 0x00, 0xee, 0x00, 0xee, 0x00, 0x82, 0x00, 0xfe, 0x00, 0xfe, 0x00,
-   0xfe, 0x00, 0xfe, 0x00, 0x7c, 0x00 };
diff --git a/subtle/xbm/mouse_01.xbm b/subtle/xbm/mouse_01.xbm
deleted file mode 100755
index 05e91b5..0000000
--- a/subtle/xbm/mouse_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define mouse_01_width 8
-#define mouse_01_height 8
-static unsigned char mouse_01_bits[] = {
- 0xEE, 0xEE, 0xEE, 0x82, 0xFE, 0xFE, 0xFE, 0x7C };
diff --git a/subtle/xbm/movie.xbm b/subtle/xbm/movie.xbm
deleted file mode 100644
index 29bc622..0000000
--- a/subtle/xbm/movie.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define movie_width 9
-#define movie_height 9
-static unsigned char movie_bits[] = {
-   0xff, 0x01, 0x55, 0x01, 0xff, 0x01, 0x21, 0x01, 0x21, 0x01, 0x21, 0x01,
-   0xff, 0x01, 0x55, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/mpd.xbm b/subtle/xbm/mpd.xbm
deleted file mode 100644
index 8211667..0000000
--- a/subtle/xbm/mpd.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define mpd_width 16
-#define mpd_height 16
-static unsigned char mpd_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xc0, 0x1f, 0x40, 0x10,
-   0x40, 0x10, 0x40, 0x10, 0x40, 0x10, 0x40, 0x10, 0x70, 0x1c, 0x78, 0x1e,
-   0x30, 0x0c, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/net-wifi.xbm b/subtle/xbm/net-wifi.xbm
deleted file mode 100644
index 0b3a4a1..0000000
--- a/subtle/xbm/net-wifi.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define net_wifi4_width 16
-#define net_wifi4_height 16
-static unsigned char net_wifi4_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0xf0, 0x0f, 0x08, 0x10, 0xe4, 0x27, 0x10, 0x08,
-   0xc0, 0x03, 0x20, 0x04, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00, 0x80, 0x01,
-   0xc0, 0x03, 0xc0, 0x03, 0x80, 0x01, 0x00, 0x00 };
diff --git a/subtle/xbm/net-wifi3.xbm b/subtle/xbm/net-wifi3.xbm
deleted file mode 100644
index 7ebb55d..0000000
--- a/subtle/xbm/net-wifi3.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define wireless3_full_width 16
-#define wireless3_full_height 16
-static unsigned char wireless3_full_bits[] = {
-   0x00, 0x00, 0xf0, 0x0f, 0x08, 0x10, 0xe4, 0x27, 0x10, 0x08, 0x00, 0x00,
-   0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f,
-   0xf0, 0x0f, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/net-wifi4.xbm b/subtle/xbm/net-wifi4.xbm
deleted file mode 100644
index 8179eb4..0000000
--- a/subtle/xbm/net-wifi4.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define net_wifi4_width 16
-#define net_wifi4_height 16
-static unsigned char net_wifi4_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x7f, 0xfe, 0x7f, 0x00, 0x00,
-   0xfc, 0x3f, 0xfc, 0x3f, 0x00, 0x00, 0xf8, 0x1f, 0xf8, 0x1f, 0x00, 0x00,
-   0xe0, 0x07, 0xe0, 0x07, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/net-wifi5.xbm b/subtle/xbm/net-wifi5.xbm
deleted file mode 100644
index 8a097ef..0000000
--- a/subtle/xbm/net-wifi5.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define wireless_full_width 16
-#define wireless_full_height 16
-static unsigned char wireless_full_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfc, 0x3f, 0xfe, 0x7f, 0x00, 0x00,
-   0xfc, 0x3f, 0xf8, 0x1f, 0x00, 0x00, 0xf0, 0x0f, 0xe0, 0x07, 0x00, 0x00,
-   0xc0, 0x03, 0x80, 0x01, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/net-wired.xbm b/subtle/xbm/net-wired.xbm
deleted file mode 100644
index d9655d7..0000000
--- a/subtle/xbm/net-wired.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define network_eth2_width 16
-#define network_eth2_height 16
-static unsigned char network_eth2_bits[] = {
-   0x00, 0x00, 0xfe, 0x7f, 0x02, 0x40, 0x02, 0x40, 0xc2, 0x43, 0xc2, 0x43,
-   0xc2, 0x43, 0xf2, 0x4f, 0xf2, 0x4f, 0xf2, 0x4f, 0xf2, 0x4f, 0xf2, 0x4f,
-   0x02, 0x40, 0x02, 0x40, 0xfe, 0x7f, 0x00, 0x00 };
diff --git a/subtle/xbm/net-wired2.xbm b/subtle/xbm/net-wired2.xbm
deleted file mode 100644
index fb7276a..0000000
--- a/subtle/xbm/net-wired2.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define network_eth1_width 16
-#define network_eth1_height 16
-static unsigned char network_eth1_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x40, 0x01, 0x60, 0x03, 0x70, 0x07,
-   0x78, 0x0f, 0x7f, 0x7f, 0x7f, 0x7f, 0x78, 0x0f, 0x70, 0x07, 0x60, 0x03,
-   0x40, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/net_down_01.xbm b/subtle/xbm/net_down_01.xbm
deleted file mode 100755
index 0940355..0000000
--- a/subtle/xbm/net_down_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_down_01_width 8
-#define net_down_01_height 8
-static unsigned char net_down_01_bits[] = {
- 0x1E, 0x3C, 0x3C, 0x3C, 0xFF, 0x7E, 0x3C, 0x18 };
diff --git a/subtle/xbm/net_down_02.xbm b/subtle/xbm/net_down_02.xbm
deleted file mode 100755
index 750ada5..0000000
--- a/subtle/xbm/net_down_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_down_02_width 8
-#define net_down_02_height 8
-static unsigned char net_down_02_bits[] = {
- 0x78, 0x3C, 0x3C, 0x3C, 0xFF, 0x7E, 0x3C, 0x18 };
diff --git a/subtle/xbm/net_down_03.xbm b/subtle/xbm/net_down_03.xbm
deleted file mode 100755
index 0502235..0000000
--- a/subtle/xbm/net_down_03.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_down_03_width 8
-#define net_down_03_height 8
-static unsigned char net_down_03_bits[] = {
- 0x38, 0x38, 0x38, 0x38, 0xFE, 0x7C, 0x38, 0x10 };
diff --git a/subtle/xbm/net_up_01.xbm b/subtle/xbm/net_up_01.xbm
deleted file mode 100755
index aac47a3..0000000
--- a/subtle/xbm/net_up_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_up_01_width 8
-#define net_up_01_height 8
-static unsigned char net_up_01_bits[] = {
- 0x18, 0x3C, 0x7E, 0xFF, 0x3C, 0x3C, 0x3C, 0x78 };
diff --git a/subtle/xbm/net_up_02.xbm b/subtle/xbm/net_up_02.xbm
deleted file mode 100755
index 9a53392..0000000
--- a/subtle/xbm/net_up_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_up_02_width 8
-#define net_up_02_height 8
-static unsigned char net_up_02_bits[] = {
- 0x18, 0x3C, 0x7E, 0xFF, 0x3C, 0x3C, 0x3C, 0x1E };
diff --git a/subtle/xbm/net_up_03.xbm b/subtle/xbm/net_up_03.xbm
deleted file mode 100755
index b21c007..0000000
--- a/subtle/xbm/net_up_03.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_up_03_width 8
-#define net_up_03_height 8
-static unsigned char net_up_03_bits[] = {
- 0x10, 0x38, 0x7C, 0xFE, 0x38, 0x38, 0x38, 0x38 };
diff --git a/subtle/xbm/net_wired.xbm b/subtle/xbm/net_wired.xbm
deleted file mode 100755
index 25cd20b..0000000
--- a/subtle/xbm/net_wired.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define net_wired_width 8
-#define net_wired_height 8
-static unsigned char net_wired_bits[] = {
- 0x00, 0x1C, 0x1C, 0x7F, 0x7F, 0x7F, 0x55, 0x7F };
diff --git a/subtle/xbm/next.xbm b/subtle/xbm/next.xbm
deleted file mode 100755
index 3937532..0000000
--- a/subtle/xbm/next.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define next_width 8
-#define next_height 8
-static unsigned char next_bits[] = {
- 0x00, 0x42, 0x4E, 0x7E, 0x7E, 0x4E, 0x42, 0x00 };
diff --git a/subtle/xbm/note.xbm b/subtle/xbm/note.xbm
deleted file mode 100755
index 21ba22b..0000000
--- a/subtle/xbm/note.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define note_width 8
-#define note_height 8
-static unsigned char note_bits[] = {
- 0xFC, 0xFC, 0x84, 0x84, 0x84, 0x84, 0xE7, 0xE7 };
diff --git a/subtle/xbm/note1.xbm b/subtle/xbm/note1.xbm
deleted file mode 100644
index c81297e..0000000
--- a/subtle/xbm/note1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define note_width 9
-#define note_height 9
-static unsigned char note_bits[] = {
-   0x00, 0x00, 0xfc, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01, 0x04, 0x01,
-   0x04, 0x01, 0xc7, 0x01, 0xc7, 0x01 };
diff --git a/subtle/xbm/note2.xbm b/subtle/xbm/note2.xbm
deleted file mode 100644
index 0e74538..0000000
--- a/subtle/xbm/note2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define note2_width 9
-#define note2_height 9
-static unsigned char note2_bits[] = {
-   0x80, 0x01, 0x60, 0x01, 0x18, 0x01, 0x08, 0x01, 0x08, 0x01, 0x08, 0x01,
-   0xc8, 0x01, 0xce, 0x01, 0x0e, 0x00 };
diff --git a/subtle/xbm/notepad.xbm b/subtle/xbm/notepad.xbm
deleted file mode 100644
index 4d6cb8e..0000000
--- a/subtle/xbm/notepad.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define notepad_width 9
-#define notepad_height 9
-static unsigned char notepad_bits[] = {
-   0xaa, 0x00, 0x55, 0x01, 0x01, 0x01, 0x01, 0x01, 0x55, 0x01, 0x01, 0x01,
-   0x55, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/off.xbm b/subtle/xbm/off.xbm
deleted file mode 100644
index ca3d7f8..0000000
--- a/subtle/xbm/off.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define off_width 9
-#define off_height 9
-static unsigned char off_bits[] = {
-   0x10, 0x00, 0x54, 0x00, 0x92, 0x00, 0x11, 0x01, 0x11, 0x01, 0x11, 0x01,
-   0x82, 0x00, 0x44, 0x00, 0x38, 0x00 };
diff --git a/subtle/xbm/omega.xbm b/subtle/xbm/omega.xbm
deleted file mode 100644
index a4469e8..0000000
--- a/subtle/xbm/omega.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define omega_width 9
-#define omega_height 9
-static unsigned char omega_bits[] = {
-   0x00, 0x00, 0x38, 0x00, 0x44, 0x00, 0x82, 0x00, 0x82, 0x00, 0x82, 0x00,
-   0x44, 0x00, 0xaa, 0x00, 0xee, 0x00 };
diff --git a/subtle/xbm/on.xbm b/subtle/xbm/on.xbm
deleted file mode 100644
index b123fa3..0000000
--- a/subtle/xbm/on.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define on_width 9
-#define on_height 9
-static unsigned char on_bits[] = {
-   0x38, 0x00, 0x44, 0x00, 0x82, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-   0x82, 0x00, 0x44, 0x00, 0x38, 0x00 };
diff --git a/subtle/xbm/pacman.xbm b/subtle/xbm/pacman.xbm
deleted file mode 100755
index 0f4fd22..0000000
--- a/subtle/xbm/pacman.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define pacman_width 8
-#define pacman_height 8
-static unsigned char pacman_bits[] = {
- 0x3C, 0x6E, 0xE7, 0xFF, 0x07, 0x1F, 0x7E, 0x3C };
diff --git a/subtle/xbm/pacman_1.xbm b/subtle/xbm/pacman_1.xbm
deleted file mode 100644
index ff19fef..0000000
--- a/subtle/xbm/pacman_1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define pacman_width 9
-#define pacman_height 9
-static unsigned char pacman_bits[] = {
-   0x7c, 0x00, 0xf6, 0x00, 0xf3, 0x01, 0xff, 0x00, 0x1f, 0x00, 0x0f, 0x00,
-   0x7f, 0x00, 0xfe, 0x00, 0x7c, 0x00 };
diff --git a/subtle/xbm/paint.xbm b/subtle/xbm/paint.xbm
deleted file mode 100644
index f336352..0000000
--- a/subtle/xbm/paint.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define paint_width 9
-#define paint_height 9
-static unsigned char paint_bits[] = {
-   0x04, 0x00, 0x1a, 0x00, 0xea, 0x00, 0xce, 0x01, 0x8a, 0x01, 0x41, 0x01,
-   0x22, 0x01, 0x14, 0x01, 0x08, 0x00 };
diff --git a/subtle/xbm/pause.xbm b/subtle/xbm/pause.xbm
deleted file mode 100755
index 6bb2251..0000000
--- a/subtle/xbm/pause.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define pause_width 8
-#define pause_height 8
-static unsigned char pause_bits[] = {
- 0x00, 0x66, 0x66, 0x66, 0x66, 0x66, 0x66, 0x00 };
diff --git a/subtle/xbm/pc.xbm b/subtle/xbm/pc.xbm
deleted file mode 100644
index e341227..0000000
--- a/subtle/xbm/pc.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define pc_width 9
-#define pc_height 9
-static unsigned char pc_bits[] = {
-   0x07, 0x00, 0x05, 0x00, 0xf5, 0x01, 0x15, 0x01, 0x15, 0x01, 0x15, 0x01,
-   0xf5, 0x01, 0x45, 0x00, 0xf7, 0x01 };
diff --git a/subtle/xbm/pencil.xbm b/subtle/xbm/pencil.xbm
deleted file mode 100644
index b2d43a7..0000000
--- a/subtle/xbm/pencil.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define pencil_width 9
-#define pencil_height 9
-static unsigned char pencil_bits[] = {
-   0xc0, 0x00, 0x20, 0x01, 0x50, 0x01, 0x88, 0x00, 0x44, 0x00, 0x22, 0x00,
-   0x11, 0x00, 0x09, 0x00, 0x07, 0x00 };
diff --git a/subtle/xbm/phone1.xbm b/subtle/xbm/phone1.xbm
deleted file mode 100644
index 94b38ed..0000000
--- a/subtle/xbm/phone1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define phone_width 9
-#define phone_height 9
-static unsigned char phone_bits[] = {
-   0x78, 0x00, 0x44, 0x00, 0x74, 0x00, 0x14, 0x00, 0x14, 0x00, 0x14, 0x00,
-   0x74, 0x00, 0x44, 0x00, 0x78, 0x00 };
diff --git a/subtle/xbm/phone2.xbm b/subtle/xbm/phone2.xbm
deleted file mode 100644
index f130aac..0000000
--- a/subtle/xbm/phone2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define phone2_width 9
-#define phone2_height 9
-static unsigned char phone2_bits[] = {
-   0xfe, 0x00, 0x01, 0x01, 0x7d, 0x01, 0x45, 0x01, 0xc7, 0x01, 0x10, 0x00,
-   0x01, 0x01, 0xff, 0x01, 0x00, 0x00 };
diff --git a/subtle/xbm/phones.xbm b/subtle/xbm/phones.xbm
deleted file mode 100755
index cab8c58..0000000
--- a/subtle/xbm/phones.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define phones_width 8
-#define phones_height 8
-static unsigned char phones_bits[] = {
- 0x3C, 0x42, 0x81, 0x81, 0xA5, 0xE7, 0xE7, 0x66 };
diff --git a/subtle/xbm/pin.xbm b/subtle/xbm/pin.xbm
deleted file mode 100644
index 17413fd..0000000
--- a/subtle/xbm/pin.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define pin_width 9
-#define pin_height 9
-static unsigned char pin_bits[] = {
-   0xf0, 0x00, 0x90, 0x01, 0x10, 0x01, 0x0e, 0x01, 0xc1, 0x01, 0x22, 0x00,
-   0x24, 0x00, 0x2a, 0x00, 0x11, 0x00 };
diff --git a/subtle/xbm/play.xbm b/subtle/xbm/play.xbm
deleted file mode 100755
index d42ad52..0000000
--- a/subtle/xbm/play.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define play_width 8
-#define play_height 8
-static unsigned char play_bits[] = {
- 0x00, 0x06, 0x1E, 0x7E, 0x7E, 0x1E, 0x06, 0x00 };
diff --git a/subtle/xbm/player_bwd1.xbm b/subtle/xbm/player_bwd1.xbm
deleted file mode 100644
index eb4e616..0000000
--- a/subtle/xbm/player_bwd1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define backward_width 9
-#define backward_height 9
-static unsigned char backward_bits[] = {
-   0x00, 0x00, 0x90, 0x00, 0xd8, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0xfc, 0x00,
-   0xd8, 0x00, 0x90, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/player_bwd2.xbm b/subtle/xbm/player_bwd2.xbm
deleted file mode 100644
index d3743aa..0000000
--- a/subtle/xbm/player_bwd2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_bwd2_width 9
-#define player_bwd2_height 9
-static unsigned char player_bwd2_bits[] = {
-   0x00, 0x00, 0x90, 0x00, 0x48, 0x00, 0x24, 0x00, 0x12, 0x00, 0x24, 0x00,
-   0x48, 0x00, 0x90, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/player_fwd1.xbm b/subtle/xbm/player_fwd1.xbm
deleted file mode 100644
index 274e6f9..0000000
--- a/subtle/xbm/player_fwd1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define foward_width 9
-#define foward_height 9
-static unsigned char foward_bits[] = {
-   0x00, 0x00, 0x12, 0x00, 0x36, 0x00, 0x7e, 0x00, 0x7e, 0x00, 0x7e, 0x00,
-   0x36, 0x00, 0x12, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/player_fwd2.xbm b/subtle/xbm/player_fwd2.xbm
deleted file mode 100644
index ddcd9c6..0000000
--- a/subtle/xbm/player_fwd2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_fwd2_width 9
-#define player_fwd2_height 9
-static unsigned char player_fwd2_bits[] = {
-   0x00, 0x00, 0x12, 0x00, 0x24, 0x00, 0x48, 0x00, 0x90, 0x00, 0x48, 0x00,
-   0x24, 0x00, 0x12, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/player_next1.xbm b/subtle/xbm/player_next1.xbm
deleted file mode 100644
index 9fb26fb..0000000
--- a/subtle/xbm/player_next1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_next_width 9
-#define player_next_height 9
-static unsigned char player_next_bits[] = {
-   0x00, 0x00, 0x42, 0x00, 0x4e, 0x00, 0x7e, 0x00, 0x7e, 0x00, 0x7e, 0x00,
-   0x4e, 0x00, 0x42, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/player_next2.xbm b/subtle/xbm/player_next2.xbm
deleted file mode 100644
index d86b44a..0000000
--- a/subtle/xbm/player_next2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_next2_width 9
-#define player_next2_height 9
-static unsigned char player_next2_bits[] = {
-   0x00, 0x00, 0x44, 0x00, 0x48, 0x00, 0x50, 0x00, 0x60, 0x00, 0x50, 0x00,
-   0x48, 0x00, 0x44, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/player_pause1.xbm b/subtle/xbm/player_pause1.xbm
deleted file mode 100644
index ed6757e..0000000
--- a/subtle/xbm/player_pause1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_pause_width 9
-#define player_pause_height 9
-static unsigned char player_pause_bits[] = {
-   0x00, 0x00, 0xc6, 0x00, 0xc6, 0x00, 0xc6, 0x00, 0xc6, 0x00, 0xc6, 0x00,
-   0xc6, 0x00, 0xc6, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/player_pause2.xbm b/subtle/xbm/player_pause2.xbm
deleted file mode 100644
index 0f0cb87..0000000
--- a/subtle/xbm/player_pause2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_pause2_width 9
-#define player_pause2_height 9
-static unsigned char player_pause2_bits[] = {
-   0x00, 0x00, 0x44, 0x00, 0x44, 0x00, 0x44, 0x00, 0x44, 0x00, 0x44, 0x00,
-   0x44, 0x00, 0x44, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/player_play1.xbm b/subtle/xbm/player_play1.xbm
deleted file mode 100644
index a0109ed..0000000
--- a/subtle/xbm/player_play1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_play_width 9
-#define player_play_height 9
-static unsigned char player_play_bits[] = {
-   0x00, 0x00, 0x06, 0x00, 0x1e, 0x00, 0x7e, 0x00, 0xfe, 0x00, 0x7e, 0x00,
-   0x1e, 0x00, 0x06, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/player_play2.xbm b/subtle/xbm/player_play2.xbm
deleted file mode 100644
index 9ee7163..0000000
--- a/subtle/xbm/player_play2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_play2_width 9
-#define player_play2_height 9
-static unsigned char player_play2_bits[] = {
-   0x00, 0x00, 0x08, 0x00, 0x10, 0x00, 0x20, 0x00, 0x40, 0x00, 0x20, 0x00,
-   0x10, 0x00, 0x08, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/player_prev1.xbm b/subtle/xbm/player_prev1.xbm
deleted file mode 100644
index 48465f7..0000000
--- a/subtle/xbm/player_prev1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_prev_width 9
-#define player_prev_height 9
-static unsigned char player_prev_bits[] = {
-   0x00, 0x00, 0x84, 0x00, 0xe4, 0x00, 0xfc, 0x00, 0xfc, 0x00, 0xfc, 0x00,
-   0xe4, 0x00, 0x84, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/player_prev2.xbm b/subtle/xbm/player_prev2.xbm
deleted file mode 100644
index 55347b9..0000000
--- a/subtle/xbm/player_prev2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_prev2_width 9
-#define player_prev2_height 9
-static unsigned char player_prev2_bits[] = {
-   0x00, 0x00, 0x44, 0x00, 0x24, 0x00, 0x14, 0x00, 0x0c, 0x00, 0x14, 0x00,
-   0x24, 0x00, 0x44, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/player_stop1.xbm b/subtle/xbm/player_stop1.xbm
deleted file mode 100644
index 1d08e72..0000000
--- a/subtle/xbm/player_stop1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_stop_width 9
-#define player_stop_height 9
-static unsigned char player_stop_bits[] = {
-   0x00, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0xfe, 0x00, 0xfe, 0x00,
-   0xfe, 0x00, 0xfe, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/player_stop2.xbm b/subtle/xbm/player_stop2.xbm
deleted file mode 100644
index 6f018bb..0000000
--- a/subtle/xbm/player_stop2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define player_stop2_width 9
-#define player_stop2_height 9
-static unsigned char player_stop2_bits[] = {
-   0x00, 0x00, 0xfe, 0x00, 0x82, 0x00, 0x82, 0x00, 0x82, 0x00, 0x82, 0x00,
-   0x82, 0x00, 0xfe, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/plug.xbm b/subtle/xbm/plug.xbm
deleted file mode 100644
index e1e35f7..0000000
--- a/subtle/xbm/plug.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define plug_width 9
-#define plug_height 9
-static unsigned char plug_bits[] = {
-   0x03, 0x00, 0x0f, 0x00, 0x1e, 0x00, 0x3e, 0x00, 0x7c, 0x00, 0x78, 0x00,
-   0xb0, 0x00, 0x40, 0x01, 0x80, 0x01 };
diff --git a/subtle/xbm/plus.xbm b/subtle/xbm/plus.xbm
deleted file mode 100644
index f8e5f8a..0000000
--- a/subtle/xbm/plus.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define occupied_width 8
-#define occupied_height 16
-static unsigned char occupied_bits[] = {
-   0x00, 0x00, 0x08, 0x08, 0x3e, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/plus_1.xbm b/subtle/xbm/plus_1.xbm
deleted file mode 100644
index f8e5f8a..0000000
--- a/subtle/xbm/plus_1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define occupied_width 8
-#define occupied_height 16
-static unsigned char occupied_bits[] = {
-   0x00, 0x00, 0x08, 0x08, 0x3e, 0x08, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/power-ac.xbm b/subtle/xbm/power-ac.xbm
deleted file mode 100644
index 45ed243..0000000
--- a/subtle/xbm/power-ac.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define power_ac_width 16
-#define power_ac_height 16
-static unsigned char power_ac_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x07, 0x80, 0x07, 0xc0, 0x3f,
-   0xe0, 0x07, 0xfc, 0x07, 0xfc, 0x07, 0xe0, 0x07, 0xc0, 0x3f, 0x80, 0x07,
-   0x00, 0x07, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/power-bat.xbm b/subtle/xbm/power-bat.xbm
deleted file mode 100644
index c450bbc..0000000
--- a/subtle/xbm/power-bat.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define battery_width 16
-#define battery_height 16
-static unsigned char battery_bits[] = {
-   0x00, 0x00, 0xc0, 0x03, 0xc0, 0x03, 0xf0, 0x0f, 0xf0, 0x0f, 0x10, 0x08,
-   0x10, 0x08, 0x10, 0x08, 0x10, 0x08, 0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f,
-   0xf0, 0x0f, 0xf0, 0x0f, 0xf0, 0x0f, 0x00, 0x00 };
diff --git a/subtle/xbm/power-bat2.xbm b/subtle/xbm/power-bat2.xbm
deleted file mode 100644
index e7be632..0000000
--- a/subtle/xbm/power-bat2.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define power_bat2_width 16
-#define power_bat2_height 16
-static unsigned char power_bat2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xfe, 0x1f, 0x7e, 0x18,
-   0x7e, 0x78, 0x7e, 0x78, 0x7e, 0x78, 0x7e, 0x78, 0x7e, 0x18, 0xfe, 0x1f,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/prev.xbm b/subtle/xbm/prev.xbm
deleted file mode 100755
index 8774315..0000000
--- a/subtle/xbm/prev.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define prev_width 8
-#define prev_height 8
-static unsigned char prev_bits[] = {
- 0x00, 0x42, 0x72, 0x7E, 0x7E, 0x72, 0x42, 0x00 };
diff --git a/subtle/xbm/puzzle.xbm b/subtle/xbm/puzzle.xbm
deleted file mode 100644
index 9455111..0000000
--- a/subtle/xbm/puzzle.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define puzzle_width 9
-#define puzzle_height 9
-static unsigned char puzzle_bits[] = {
-   0xe0, 0x00, 0xa0, 0x00, 0xbc, 0x01, 0x04, 0x01, 0x07, 0x01, 0x01, 0x01,
-   0x77, 0x01, 0x54, 0x01, 0xdc, 0x01 };
diff --git a/subtle/xbm/question.xbm b/subtle/xbm/question.xbm
deleted file mode 100644
index 122f2a5..0000000
--- a/subtle/xbm/question.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define question_width 9
-#define question_height 9
-static unsigned char question_bits[] = {
-   0x00, 0x00, 0x38, 0x00, 0x44, 0x00, 0x44, 0x00, 0x20, 0x00, 0x10, 0x00,
-   0x10, 0x00, 0x00, 0x00, 0x10, 0x00 };
diff --git a/subtle/xbm/quote.xbm b/subtle/xbm/quote.xbm
deleted file mode 100644
index 9816868..0000000
--- a/subtle/xbm/quote.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define quote_width 9
-#define quote_height 9
-static unsigned char quote_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x84, 0x00, 0x42, 0x00, 0x42, 0x00,
-   0xc6, 0x00, 0xc6, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/radio.xbm b/subtle/xbm/radio.xbm
deleted file mode 100644
index f764f6f..0000000
--- a/subtle/xbm/radio.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define radio_width 9
-#define radio_height 9
-static unsigned char radio_bits[] = {
-   0x80, 0x00, 0xfe, 0x00, 0x82, 0x00, 0xba, 0x00, 0xaa, 0x00, 0xba, 0x00,
-   0x82, 0x00, 0x82, 0x00, 0xfe, 0x00 };
diff --git a/subtle/xbm/rss.xbm b/subtle/xbm/rss.xbm
deleted file mode 100644
index 1b5937d..0000000
--- a/subtle/xbm/rss.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define rss_width 9
-#define rss_height 9
-static unsigned char rss_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x7d, 0x01, 0x41, 0x01, 0x5d, 0x01, 0x51, 0x01,
-   0x55, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/ruler.xbm b/subtle/xbm/ruler.xbm
deleted file mode 100644
index 4eaa6b4..0000000
--- a/subtle/xbm/ruler.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define ruler_width 9
-#define ruler_height 9
-static unsigned char ruler_bits[] = {
-   0x0e, 0x00, 0xff, 0x01, 0x0b, 0x01, 0xff, 0x01, 0x0a, 0x00, 0x0a, 0x00,
-   0x0a, 0x00, 0x0a, 0x00, 0x0e, 0x00 };
diff --git a/subtle/xbm/rwd.xbm b/subtle/xbm/rwd.xbm
deleted file mode 100755
index 5170b21..0000000
--- a/subtle/xbm/rwd.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define rwd_width 8
-#define rwd_height 8
-static unsigned char rwd_bits[] = {
- 0x00, 0x48, 0x6C, 0x7E, 0x7E, 0x6C, 0x48, 0x00 };
diff --git a/subtle/xbm/scorpio.xbm b/subtle/xbm/scorpio.xbm
deleted file mode 100755
index befc2ca..0000000
--- a/subtle/xbm/scorpio.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define scorpio_width 8
-#define scorpio_height 8
-static unsigned char scorpio_bits[] = {
- 0x42, 0x81, 0xDB, 0x3C, 0xDB, 0x5A, 0x99, 0x30 };
diff --git a/subtle/xbm/screen.xbm b/subtle/xbm/screen.xbm
deleted file mode 100644
index 8964209..0000000
--- a/subtle/xbm/screen.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define screen_width 9
-#define screen_height 9
-static unsigned char screen_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,
-   0xff, 0x01, 0x10, 0x00, 0x7c, 0x00 };
diff --git a/subtle/xbm/screw.xbm b/subtle/xbm/screw.xbm
deleted file mode 100644
index e3aa8bf..0000000
--- a/subtle/xbm/screw.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define screw_width 9
-#define screw_height 9
-static unsigned char screw_bits[] = {
-   0x70, 0x00, 0x48, 0x00, 0xa8, 0x01, 0x48, 0x01, 0x14, 0x01, 0xe2, 0x00,
-   0x11, 0x00, 0x09, 0x00, 0x07, 0x00 };
diff --git a/subtle/xbm/scroll.xbm b/subtle/xbm/scroll.xbm
deleted file mode 100644
index 647d2a9..0000000
--- a/subtle/xbm/scroll.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define scroll_width 9
-#define scroll_height 9
-static unsigned char scroll_bits[] = {
-   0xfc, 0x00, 0x42, 0x01, 0x21, 0x00, 0x21, 0x00, 0x42, 0x00, 0x84, 0x00,
-   0x84, 0x00, 0x42, 0x00, 0x3f, 0x00 };
diff --git a/subtle/xbm/selection.xbm b/subtle/xbm/selection.xbm
deleted file mode 100644
index 832ef82..0000000
--- a/subtle/xbm/selection.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define selection_width 9
-#define selection_height 9
-static unsigned char selection_bits[] = {
-   0x55, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00, 0x01, 0x01, 0x00, 0x00,
-   0x01, 0x01, 0x00, 0x00, 0x55, 0x01 };
diff --git a/subtle/xbm/shelf.xbm b/subtle/xbm/shelf.xbm
deleted file mode 100644
index a883cf0..0000000
--- a/subtle/xbm/shelf.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define shelf_width 9
-#define shelf_height 9
-static unsigned char shelf_bits[] = {
-   0xfe, 0x00, 0x82, 0x00, 0xba, 0x00, 0x82, 0x00, 0xfe, 0x00, 0x82, 0x00,
-   0xba, 0x00, 0x82, 0x00, 0xfe, 0x00 };
diff --git a/subtle/xbm/shift_down.xbm b/subtle/xbm/shift_down.xbm
deleted file mode 100644
index 34e1643..0000000
--- a/subtle/xbm/shift_down.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define shift_down_width 9
-#define shift_down_height 9
-static unsigned char shift_down_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x82, 0x00, 0x44, 0x00, 0x28, 0x00,
-   0x10, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/shift_left.xbm b/subtle/xbm/shift_left.xbm
deleted file mode 100644
index 956b15f..0000000
--- a/subtle/xbm/shift_left.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define shift_left_width 9
-#define shift_left_height 9
-static unsigned char shift_left_bits[] = {
-   0x40, 0x00, 0x20, 0x00, 0x10, 0x00, 0x08, 0x00, 0x04, 0x00, 0x08, 0x00,
-   0x10, 0x00, 0x20, 0x00, 0x40, 0x00 };
diff --git a/subtle/xbm/shift_right.xbm b/subtle/xbm/shift_right.xbm
deleted file mode 100644
index a527f81..0000000
--- a/subtle/xbm/shift_right.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define shift_right_width 9
-#define shift_right_height 9
-static unsigned char shift_right_bits[] = {
-   0x04, 0x00, 0x08, 0x00, 0x10, 0x00, 0x20, 0x00, 0x40, 0x00, 0x20, 0x00,
-   0x10, 0x00, 0x08, 0x00, 0x04, 0x00 };
diff --git a/subtle/xbm/shift_up.xbm b/subtle/xbm/shift_up.xbm
deleted file mode 100644
index 6447c44..0000000
--- a/subtle/xbm/shift_up.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define shift_up_width 9
-#define shift_up_height 9
-static unsigned char shift_up_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x10, 0x00, 0x28, 0x00, 0x44, 0x00, 0x82, 0x00,
-   0x01, 0x01, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/shroom.xbm b/subtle/xbm/shroom.xbm
deleted file mode 100755
index 62df79f..0000000
--- a/subtle/xbm/shroom.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define shroom_width 8
-#define shroom_height 8
-static unsigned char shroom_bits[] = {
- 0x3C, 0x42, 0x81, 0x81, 0xFF, 0x3C, 0x3C, 0x3C };
diff --git a/subtle/xbm/spkr_01.xbm b/subtle/xbm/spkr_01.xbm
deleted file mode 100755
index 7c2ffc4..0000000
--- a/subtle/xbm/spkr_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define spkr_01_width 8
-#define spkr_01_height 8
-static unsigned char spkr_01_bits[] = {
- 0x08, 0x4C, 0x8F, 0xAF, 0xAF, 0x8F, 0x4C, 0x08 };
diff --git a/subtle/xbm/spkr_02.xbm b/subtle/xbm/spkr_02.xbm
deleted file mode 100755
index 8265bf8..0000000
--- a/subtle/xbm/spkr_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define spkr_02_width 8
-#define spkr_02_height 8
-static unsigned char spkr_02_bits[] = {
- 0x08, 0x0C, 0x0F, 0x1F, 0x1F, 0x0F, 0x0C, 0x08 };
diff --git a/subtle/xbm/spkr_03.xbm b/subtle/xbm/spkr_03.xbm
deleted file mode 100755
index fd45a6c..0000000
--- a/subtle/xbm/spkr_03.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define ysick_width 8
-#define ysick_height 8
-static unsigned char ysick_bits[] = {
- 0x4C, 0x93, 0x93, 0x97, 0x97, 0x93, 0x93, 0x4C };
diff --git a/subtle/xbm/stop.xbm b/subtle/xbm/stop.xbm
deleted file mode 100755
index f92b64d..0000000
--- a/subtle/xbm/stop.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define stop_width 8
-#define stop_height 8
-static unsigned char stop_bits[] = {
- 0x00, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x7E, 0x00 };
diff --git a/subtle/xbm/tag.xbm b/subtle/xbm/tag.xbm
deleted file mode 100644
index c829f60..0000000
--- a/subtle/xbm/tag.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define tag_width 9
-#define tag_height 9
-static unsigned char tag_bits[] = {
-   0xe0, 0x01, 0x10, 0x01, 0x08, 0x01, 0x24, 0x01, 0x82, 0x00, 0x41, 0x00,
-   0x22, 0x00, 0x14, 0x00, 0x08, 0x00 };
diff --git a/subtle/xbm/temp.xbm b/subtle/xbm/temp.xbm
deleted file mode 100644
index 9d83a5f..0000000
--- a/subtle/xbm/temp.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define temp_width 9
-#define temp_height 9
-static unsigned char temp_bits[] = {
-   0x80, 0x01, 0xc8, 0x01, 0xe0, 0x00, 0x52, 0x00, 0x28, 0x00, 0x16, 0x00,
-   0x09, 0x00, 0x09, 0x00, 0x06, 0x00 };
diff --git a/subtle/xbm/temp_1.xbm b/subtle/xbm/temp_1.xbm
deleted file mode 100644
index f37932b..0000000
--- a/subtle/xbm/temp_1.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define temp_width 16
-#define temp_height 16
-static unsigned char temp_bits[] = {
-   0x00, 0x00, 0x80, 0x01, 0xc0, 0x0b, 0xc0, 0x03, 0xc0, 0x03, 0xc0, 0x0b,
-   0x40, 0x02, 0x40, 0x02, 0x40, 0x0a, 0x40, 0x02, 0x40, 0x02, 0x60, 0x06,
-   0x20, 0x04, 0x60, 0x06, 0xc0, 0x03, 0x00, 0x00 };
diff --git a/subtle/xbm/terminal.xbm b/subtle/xbm/terminal.xbm
deleted file mode 100644
index d346810..0000000
--- a/subtle/xbm/terminal.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define terminal_width 9
-#define terminal_height 9
-static unsigned char terminal_bits[] = {
-   0x00, 0x00, 0xff, 0x01, 0x01, 0x01, 0x05, 0x01, 0x09, 0x01, 0x35, 0x01,
-   0x01, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/test.xbm b/subtle/xbm/test.xbm
deleted file mode 100755
index 756e899..0000000
--- a/subtle/xbm/test.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define test_width 8
-#define test_height 8
-static unsigned char test_bits[] = {
- 0x0E, 0x13, 0x21, 0x41, 0x82, 0x84, 0xC8, 0x70 };
diff --git a/subtle/xbm/thumb_down.xbm b/subtle/xbm/thumb_down.xbm
deleted file mode 100644
index 9931862..0000000
--- a/subtle/xbm/thumb_down.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define thumb_down_width 9
-#define thumb_down_height 9
-static unsigned char thumb_down_bits[] = {
-   0xff, 0x00, 0x01, 0x01, 0x1f, 0x00, 0x01, 0x00, 0x1f, 0x00, 0x01, 0x01,
-   0x9f, 0x00, 0x50, 0x00, 0x30, 0x00 };
diff --git a/subtle/xbm/thumb_up.xbm b/subtle/xbm/thumb_up.xbm
deleted file mode 100644
index 1e53767..0000000
--- a/subtle/xbm/thumb_up.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define thumb_up_width 9
-#define thumb_up_height 9
-static unsigned char thumb_up_bits[] = {
-   0x18, 0x00, 0x14, 0x00, 0xf2, 0x01, 0x01, 0x01, 0xf0, 0x01, 0x00, 0x01,
-   0xf0, 0x01, 0x01, 0x01, 0xfe, 0x01 };
diff --git a/subtle/xbm/tile1.xbm b/subtle/xbm/tile1.xbm
deleted file mode 100644
index 128cc84..0000000
--- a/subtle/xbm/tile1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define tile_width 9
-#define tile_height 9
-static unsigned char tile_bits[] = {
-   0xfe, 0x01, 0x02, 0x01, 0x02, 0x01, 0x02, 0x01, 0x1f, 0x01, 0x11, 0x01,
-   0x11, 0x01, 0xf1, 0x01, 0x1f, 0x00 };
diff --git a/subtle/xbm/tile2.xbm b/subtle/xbm/tile2.xbm
deleted file mode 100644
index 9dc05a6..0000000
--- a/subtle/xbm/tile2.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define tile2_width 9
-#define tile2_height 9
-static unsigned char tile2_bits[] = {
-   0xf8, 0x01, 0x08, 0x01, 0x08, 0x01, 0x3f, 0x01, 0x21, 0x01, 0xe1, 0x01,
-   0x21, 0x00, 0x21, 0x00, 0x3f, 0x00 };
diff --git a/subtle/xbm/tile3.xbm b/subtle/xbm/tile3.xbm
deleted file mode 100644
index 0cb4b43..0000000
--- a/subtle/xbm/tile3.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define tile3_width 9
-#define tile3_height 9
-static unsigned char tile3_bits[] = {
-   0xff, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x1f, 0x01, 0x11, 0x01,
-   0x11, 0x01, 0x11, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/trash.xbm b/subtle/xbm/trash.xbm
deleted file mode 100644
index 8ba3b3d..0000000
--- a/subtle/xbm/trash.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define trash_width 9
-#define trash_height 9
-static unsigned char trash_bits[] = {
-   0x38, 0x00, 0xef, 0x01, 0x01, 0x01, 0xff, 0x01, 0x82, 0x00, 0xaa, 0x00,
-   0xaa, 0x00, 0x82, 0x00, 0xfe, 0x00 };
diff --git a/subtle/xbm/tv.xbm b/subtle/xbm/tv.xbm
deleted file mode 100644
index 5b4fcb0..0000000
--- a/subtle/xbm/tv.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define tv_width 9
-#define tv_height 9
-static unsigned char tv_bits[] = {
-   0x44, 0x00, 0x28, 0x00, 0xff, 0x01, 0x01, 0x01, 0x7d, 0x01, 0x7d, 0x01,
-   0x7d, 0x01, 0x01, 0x01, 0xff, 0x01 };
diff --git a/subtle/xbm/up.xbm b/subtle/xbm/up.xbm
deleted file mode 100644
index 2fb6f25..0000000
--- a/subtle/xbm/up.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define up_width 16
-#define up_height 16
-static unsigned char up_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x80, 0x00, 0xc0, 0x01, 0xe0, 0x03, 0x00, 0x00, 0x00, 0x00,
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/usb.xbm b/subtle/xbm/usb.xbm
deleted file mode 100755
index 9b0eb08..0000000
--- a/subtle/xbm/usb.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define usb_width 8
-#define usb_height 8
-static unsigned char usb_bits[] = {
- 0x70, 0x88, 0xC4, 0xE2, 0x7E, 0x32, 0x09, 0x07 };
diff --git a/subtle/xbm/usb_02.xbm b/subtle/xbm/usb_02.xbm
deleted file mode 100755
index 77eeda0..0000000
--- a/subtle/xbm/usb_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define usb_02_width 8
-#define usb_02_height 8
-static unsigned char usb_02_bits[] = {
- 0x10, 0x50, 0x54, 0x54, 0x34, 0x18, 0x10, 0x10 };
diff --git a/subtle/xbm/usb_1.xbm b/subtle/xbm/usb_1.xbm
deleted file mode 100644
index 6d17f9d..0000000
--- a/subtle/xbm/usb_1.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define usb_width 9
-#define usb_height 9
-static unsigned char usb_bits[] = {
-   0x10, 0x00, 0x50, 0x00, 0x54, 0x00, 0x54, 0x00, 0x54, 0x00, 0x34, 0x00,
-   0x18, 0x00, 0x10, 0x00, 0x10, 0x00 };
diff --git a/subtle/xbm/vol-hi.xbm b/subtle/xbm/vol-hi.xbm
deleted file mode 100644
index 7c4a849..0000000
--- a/subtle/xbm/vol-hi.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define vol_hi2_width 16
-#define vol_hi2_height 16
-static unsigned char vol_hi2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x80, 0x21, 0xc0, 0x49, 0xfc, 0x51,
-   0xfc, 0x55, 0xfc, 0x55, 0xfc, 0x55, 0xfc, 0x55, 0xfc, 0x51, 0xc0, 0x49,
-   0x80, 0x21, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/vol-mute.xbm b/subtle/xbm/vol-mute.xbm
deleted file mode 100644
index 2d01f7b..0000000
--- a/subtle/xbm/vol-mute.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define vol_mute2_width 16
-#define vol_mute2_height 16
-static unsigned char vol_mute2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x80, 0x01, 0xc0, 0x01, 0xfc, 0x01,
-   0xfc, 0x01, 0xfc, 0x29, 0xfc, 0x11, 0xfc, 0x29, 0xfc, 0x01, 0xc0, 0x01,
-   0x80, 0x01, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/volume.xbm b/subtle/xbm/volume.xbm
deleted file mode 100644
index 7c4a849..0000000
--- a/subtle/xbm/volume.xbm
+++ /dev/null
@@ -1,6 +0,0 @@
-#define vol_hi2_width 16
-#define vol_hi2_height 16
-static unsigned char vol_hi2_bits[] = {
-   0x00, 0x00, 0x00, 0x00, 0x00, 0x11, 0x80, 0x21, 0xc0, 0x49, 0xfc, 0x51,
-   0xfc, 0x55, 0xfc, 0x55, 0xfc, 0x55, 0xfc, 0x55, 0xfc, 0x51, 0xc0, 0x49,
-   0x80, 0x21, 0x00, 0x11, 0x00, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/volume_minus.xbm b/subtle/xbm/volume_minus.xbm
deleted file mode 100644
index cee69a0..0000000
--- a/subtle/xbm/volume_minus.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define volume_minus_width 9
-#define volume_minus_height 9
-static unsigned char volume_minus_bits[] = {
-   0x10, 0x00, 0x18, 0x00, 0x14, 0x00, 0x13, 0x00, 0xd1, 0x01, 0x13, 0x00,
-   0x14, 0x00, 0x18, 0x00, 0x10, 0x00 };
diff --git a/subtle/xbm/volume_off.xbm b/subtle/xbm/volume_off.xbm
deleted file mode 100644
index ae8f85c..0000000
--- a/subtle/xbm/volume_off.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define volume_off_width 9
-#define volume_off_height 9
-static unsigned char volume_off_bits[] = {
-   0x10, 0x00, 0x18, 0x00, 0x14, 0x00, 0x13, 0x00, 0x11, 0x00, 0x13, 0x00,
-   0x14, 0x00, 0x18, 0x00, 0x10, 0x00 };
diff --git a/subtle/xbm/volume_on.xbm b/subtle/xbm/volume_on.xbm
deleted file mode 100644
index 47176c2..0000000
--- a/subtle/xbm/volume_on.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define volume_on_width 9
-#define volume_on_height 9
-static unsigned char volume_on_bits[] = {
-   0x10, 0x00, 0x98, 0x00, 0x14, 0x01, 0x53, 0x01, 0x51, 0x01, 0x53, 0x01,
-   0x14, 0x01, 0x98, 0x00, 0x10, 0x00 };
diff --git a/subtle/xbm/volume_plus.xbm b/subtle/xbm/volume_plus.xbm
deleted file mode 100644
index bba8b82..0000000
--- a/subtle/xbm/volume_plus.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define volume_plus_width 9
-#define volume_plus_height 9
-static unsigned char volume_plus_bits[] = {
-   0x10, 0x00, 0x18, 0x00, 0x14, 0x00, 0x93, 0x00, 0xd1, 0x01, 0x93, 0x00,
-   0x14, 0x00, 0x18, 0x00, 0x10, 0x00 };
diff --git a/subtle/xbm/wait.xbm b/subtle/xbm/wait.xbm
deleted file mode 100644
index 76e8c9c..0000000
--- a/subtle/xbm/wait.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define wait_width 9
-#define wait_height 9
-static unsigned char wait_bits[] = {
-   0xfe, 0x00, 0x82, 0x00, 0x44, 0x00, 0x28, 0x00, 0x10, 0x00, 0x28, 0x00,
-   0x54, 0x00, 0xba, 0x00, 0xfe, 0x00 };
diff --git a/subtle/xbm/wand.xbm b/subtle/xbm/wand.xbm
deleted file mode 100644
index f6a24ea..0000000
--- a/subtle/xbm/wand.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define wand_width 9
-#define wand_height 9
-static unsigned char wand_bits[] = {
-   0x88, 0x00, 0x5c, 0x01, 0xe8, 0x00, 0x74, 0x00, 0x38, 0x00, 0x1c, 0x00,
-   0x0e, 0x00, 0x07, 0x00, 0x02, 0x00 };
diff --git a/subtle/xbm/water.xbm b/subtle/xbm/water.xbm
deleted file mode 100644
index 0e54682..0000000
--- a/subtle/xbm/water.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define water_width 9
-#define water_height 9
-static unsigned char water_bits[] = {
-   0x10, 0x00, 0x10, 0x00, 0x28, 0x00, 0x44, 0x00, 0x82, 0x00, 0x82, 0x00,
-   0x82, 0x00, 0x44, 0x00, 0x38, 0x00 };
diff --git a/subtle/xbm/wifi.xbm b/subtle/xbm/wifi.xbm
deleted file mode 100644
index 7947e04..0000000
--- a/subtle/xbm/wifi.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define wifi_width 9
-#define wifi_height 9
-static unsigned char wifi_bits[] = {
-   0x00, 0x00, 0x40, 0x00, 0x90, 0x00, 0xa4, 0x00, 0xa9, 0x00, 0xa4, 0x00,
-   0x90, 0x00, 0x40, 0x00, 0x00, 0x00 };
diff --git a/subtle/xbm/wifi_01.xbm b/subtle/xbm/wifi_01.xbm
deleted file mode 100755
index 315d0f7..0000000
--- a/subtle/xbm/wifi_01.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define wifi_01_width 8
-#define wifi_01_height 8
-static unsigned char wifi_01_bits[] = {
- 0x80, 0xA0, 0xA8, 0xAB, 0xAB, 0xA8, 0xA0, 0x80 };
diff --git a/subtle/xbm/wifi_02.xbm b/subtle/xbm/wifi_02.xbm
deleted file mode 100755
index bd2b3ee..0000000
--- a/subtle/xbm/wifi_02.xbm
+++ /dev/null
@@ -1,4 +0,0 @@
-#define wifi_02_width 8
-#define wifi_02_height 8
-static unsigned char wifi_02_bits[] = {
- 0x40, 0x90, 0xA4, 0xA9, 0xA9, 0xA4, 0x90, 0x40 };
diff --git a/subtle/xbm/world.xbm b/subtle/xbm/world.xbm
deleted file mode 100644
index 50b8383..0000000
--- a/subtle/xbm/world.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define earth_width 9
-#define earth_height 9
-static unsigned char earth_bits[] = {
-   0x38, 0x00, 0x44, 0x00, 0xb2, 0x00, 0x65, 0x01, 0x65, 0x01, 0x01, 0x01,
-   0x9a, 0x00, 0x44, 0x00, 0x38, 0x00 };
diff --git a/subtle/xbm/wrench.xbm b/subtle/xbm/wrench.xbm
deleted file mode 100644
index f0b07eb..0000000
--- a/subtle/xbm/wrench.xbm
+++ /dev/null
@@ -1,5 +0,0 @@
-#define wrench_width 9
-#define wrench_height 9
-static unsigned char wrench_bits[] = {
-   0x60, 0x00, 0x20, 0x00, 0x20, 0x01, 0xf0, 0x01, 0x38, 0x00, 0x1e, 0x00,
-   0x09, 0x00, 0x09, 0x00, 0x06, 0x00 };