218 files changed, 68 insertions, 71 deletions

diff --git a/crawl-ref/source/rltiles/UNUSED/armour/boots_iron2.png b/crawl-ref/source/rltiles/UNUSED/armour/boots_iron2.png
new file mode 100644
index 0000000000..e6c7a9ae6f
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/armour/boots_iron2.png
diff --git a/crawl-ref/source/rltiles/UNUSED/armour/cap1.png b/crawl-ref/source/rltiles/UNUSED/armour/cap1.png
new file mode 100644
index 0000000000..e263bd8777
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/armour/cap1.png
diff --git a/crawl-ref/source/rltiles/UNUSED/armour/cap2.png b/crawl-ref/source/rltiles/UNUSED/armour/cap2.png
new file mode 100644
index 0000000000..3aafc44b2f
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/armour/cap2.png
diff --git a/crawl-ref/source/rltiles/UNUSED/armour/cornuthaum.png b/crawl-ref/source/rltiles/UNUSED/armour/cornuthaum.png
new file mode 100644
index 0000000000..4b78e3c9e2
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/armour/cornuthaum.png
diff --git a/crawl-ref/source/rltiles/UNUSED/armour/crested_helmet.png b/crawl-ref/source/rltiles/UNUSED/armour/crested_helmet.png
new file mode 100644
index 0000000000..1b4a5a9f70
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/armour/crested_helmet.png
diff --git a/crawl-ref/source/rltiles/UNUSED/armour/gauntlet1.png b/crawl-ref/source/rltiles/UNUSED/armour/gauntlet1.png
new file mode 100644
index 0000000000..21b1b1a141
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/armour/gauntlet1.png
diff --git a/crawl-ref/source/rltiles/UNUSED/armour/glove4.png b/crawl-ref/source/rltiles/UNUSED/armour/glove4.png
new file mode 100644
index 0000000000..99af250f0f
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/armour/glove4.png
diff --git a/crawl-ref/source/rltiles/UNUSED/armour/green_mask.png b/crawl-ref/source/rltiles/UNUSED/armour/green_mask.png
new file mode 100644
index 0000000000..4acd7d06b2
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/armour/green_mask.png
diff --git a/crawl-ref/source/rltiles/UNUSED/armour/low_boots.png b/crawl-ref/source/rltiles/UNUSED/armour/low_boots.png
new file mode 100644
index 0000000000..02e2427e40
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/armour/low_boots.png
diff --git a/crawl-ref/source/rltiles/UNUSED/armour/plumed_helmet.png b/crawl-ref/source/rltiles/UNUSED/armour/plumed_helmet.png
new file mode 100644
index 0000000000..0812acfd4f
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/armour/plumed_helmet.png
diff --git a/crawl-ref/source/rltiles/UNUSED/armour/shield2.png b/crawl-ref/source/rltiles/UNUSED/armour/shield2.png
new file mode 100644
index 0000000000..24f4d38290
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/armour/shield2.png
diff --git a/crawl-ref/source/rltiles/UNUSED/armour/shield_of_reflection.png b/crawl-ref/source/rltiles/UNUSED/armour/shield_of_reflection.png
new file mode 100644
index 0000000000..cdad6655f2
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/armour/shield_of_reflection.png
diff --git a/crawl-ref/source/rltiles/UNUSED/armour/shimmering_dragon_scale_mail.png b/crawl-ref/source/rltiles/UNUSED/armour/shimmering_dragon_scale_mail.png
new file mode 100644
index 0000000000..7701a4b66f
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/armour/shimmering_dragon_scale_mail.png
diff --git a/crawl-ref/source/rltiles/UNUSED/armour/shimmering_dragon_scales.png b/crawl-ref/source/rltiles/UNUSED/armour/shimmering_dragon_scales.png
new file mode 100644
index 0000000000..d2bae4b8c4
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/armour/shimmering_dragon_scales.png
diff --git a/crawl-ref/source/rltiles/UNUSED/armour/studded_leather_armor.png b/crawl-ref/source/rltiles/UNUSED/armour/studded_leather_armor.png
new file mode 100644
index 0000000000..6886e53bc3
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/armour/studded_leather_armor.png
diff --git a/crawl-ref/source/rltiles/UNUSED/books/book_dog_eared.png b/crawl-ref/source/rltiles/UNUSED/books/book_dog_eared.png
new file mode 100644
index 0000000000..03ce69018f
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/books/book_dog_eared.png
diff --git a/crawl-ref/source/rltiles/UNUSED/books/book_gray.png b/crawl-ref/source/rltiles/UNUSED/books/book_gray.png
new file mode 100644
index 0000000000..48360ef37d
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/books/book_gray.png
diff --git a/crawl-ref/source/rltiles/UNUSED/books/book_indigo.png b/crawl-ref/source/rltiles/UNUSED/books/book_indigo.png
new file mode 100644
index 0000000000..b60a35b89d
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/books/book_indigo.png
diff --git a/crawl-ref/source/rltiles/UNUSED/books/book_orange.png b/crawl-ref/source/rltiles/UNUSED/books/book_orange.png
new file mode 100644
index 0000000000..0b3d2db35b
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/books/book_orange.png
diff --git a/crawl-ref/source/rltiles/UNUSED/books/book_vellum.png b/crawl-ref/source/rltiles/UNUSED/books/book_vellum.png
new file mode 100644
index 0000000000..5b75d44faf
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/books/book_vellum.png
diff --git a/crawl-ref/source/rltiles/UNUSED/books/book_velvet.png b/crawl-ref/source/rltiles/UNUSED/books/book_velvet.png
new file mode 100644
index 0000000000..28bcd734ac
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/books/book_velvet.png
diff --git a/crawl-ref/source/rltiles/UNUSED/books/book_wrinkled.png b/crawl-ref/source/rltiles/UNUSED/books/book_wrinkled.png
new file mode 100644
index 0000000000..f3812133ba
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/books/book_wrinkled.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/acid_venom.png b/crawl-ref/source/rltiles/UNUSED/other/acid_venom.png
new file mode 100644
index 0000000000..68d89f0556
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/acid_venom.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/boulder.png b/crawl-ref/source/rltiles/UNUSED/other/boulder.png
new file mode 100644
index 0000000000..372b4bef59
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/boulder.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/centaur_warrior.png b/crawl-ref/source/rltiles/UNUSED/other/centaur_warrior.png
new file mode 100644
index 0000000000..0c40b60623
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/centaur_warrior.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/chest.png b/crawl-ref/source/rltiles/UNUSED/other/chest.png
new file mode 100644
index 0000000000..3c208848d6
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/chest.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/dngn_lava.png b/crawl-ref/source/rltiles/UNUSED/other/dngn_lava.png
new file mode 100644
index 0000000000..5644348970
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/dngn_lava.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/dngn_trap_magical.png b/crawl-ref/source/rltiles/UNUSED/other/dngn_trap_magical.png
new file mode 100644
index 0000000000..580598bfb3
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/dngn_trap_magical.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/dngn_trap_mechanical.png b/crawl-ref/source/rltiles/UNUSED/other/dngn_trap_mechanical.png
new file mode 100644
index 0000000000..eec5769e13
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/dngn_trap_mechanical.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/i-heal-wounds.png b/crawl-ref/source/rltiles/UNUSED/other/i-heal-wounds.png
new file mode 100644
index 0000000000..badcc1eecc
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/i-heal-wounds.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/i-levitation.png b/crawl-ref/source/rltiles/UNUSED/other/i-levitation.png
new file mode 100644
index 0000000000..5e9adfb480
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/i-levitation.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/key.png b/crawl-ref/source/rltiles/UNUSED/other/key.png
new file mode 100644
index 0000000000..0532eebc13
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/key.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/large_box.png b/crawl-ref/source/rltiles/UNUSED/other/large_box.png
new file mode 100644
index 0000000000..c382c9f238
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/large_box.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/magic_lamp.png b/crawl-ref/source/rltiles/UNUSED/other/magic_lamp.png
new file mode 100644
index 0000000000..866600bf14
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/magic_lamp.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/mirror.png b/crawl-ref/source/rltiles/UNUSED/other/mirror.png
new file mode 100644
index 0000000000..106b3de4be
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/mirror.png
diff --git a/crawl-ref/source/rltiles/item/misc/misc_altar.png b/crawl-ref/source/rltiles/UNUSED/other/misc_altar.png
index b0f66026c3..b0f66026c3 100644
--- a/crawl-ref/source/rltiles/item/misc/misc_altar.png
+++ b/crawl-ref/source/rltiles/UNUSED/other/misc_altar.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/rod_forked.png b/crawl-ref/source/rltiles/UNUSED/other/rod_forked.png
new file mode 100644
index 0000000000..3fa1b25d34
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/rod_forked.png
diff --git a/crawl-ref/source/rltiles/dc-misc/slot_melded.png b/crawl-ref/source/rltiles/UNUSED/other/slot_melded.png
index 716b7cc2b2..716b7cc2b2 100644
--- a/crawl-ref/source/rltiles/dc-misc/slot_melded.png
+++ b/crawl-ref/source/rltiles/UNUSED/other/slot_melded.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/spwpn_sceptre_of_asmodeus2.png b/crawl-ref/source/rltiles/UNUSED/other/spwpn_sceptre_of_asmodeus2.png
new file mode 100644
index 0000000000..cfd068f63d
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/spwpn_sceptre_of_asmodeus2.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/spwpn_sceptre_of_torment2.png b/crawl-ref/source/rltiles/UNUSED/other/spwpn_sceptre_of_torment2.png
new file mode 100644
index 0000000000..7b8788399c
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/spwpn_sceptre_of_torment2.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/spwpn_staff_of_dispater2.png b/crawl-ref/source/rltiles/UNUSED/other/spwpn_staff_of_dispater2.png
new file mode 100644
index 0000000000..56229ce838
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/spwpn_staff_of_dispater2.png
diff --git a/crawl-ref/source/rltiles/dc-misc/txt1.png b/crawl-ref/source/rltiles/UNUSED/other/txt1.png
index 15d5df0ace..15d5df0ace 100644
--- a/crawl-ref/source/rltiles/dc-misc/txt1.png
+++ b/crawl-ref/source/rltiles/UNUSED/other/txt1.png
diff --git a/crawl-ref/source/rltiles/dc-misc/txt2.png b/crawl-ref/source/rltiles/UNUSED/other/txt2.png
index 98c21cea6f..98c21cea6f 100644
--- a/crawl-ref/source/rltiles/dc-misc/txt2.png
+++ b/crawl-ref/source/rltiles/UNUSED/other/txt2.png
diff --git a/crawl-ref/source/rltiles/dc-misc/txt3.png b/crawl-ref/source/rltiles/UNUSED/other/txt3.png
index a1adf3cc36..a1adf3cc36 100644
--- a/crawl-ref/source/rltiles/dc-misc/txt3.png
+++ b/crawl-ref/source/rltiles/UNUSED/other/txt3.png
diff --git a/crawl-ref/source/rltiles/dc-misc/txt4.png b/crawl-ref/source/rltiles/UNUSED/other/txt4.png
index fa9800869a..fa9800869a 100644
--- a/crawl-ref/source/rltiles/dc-misc/txt4.png
+++ b/crawl-ref/source/rltiles/UNUSED/other/txt4.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/wand_brass.png b/crawl-ref/source/rltiles/UNUSED/other/wand_brass.png
new file mode 100644
index 0000000000..0e3ed72945
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/wand_brass.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/wand_copper.png b/crawl-ref/source/rltiles/UNUSED/other/wand_copper.png
new file mode 100644
index 0000000000..086e1c2213
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/wand_copper.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/wand_silver.png b/crawl-ref/source/rltiles/UNUSED/other/wand_silver.png
new file mode 100644
index 0000000000..0e25becb11
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/wand_silver.png
diff --git a/crawl-ref/source/rltiles/UNUSED/other/zombie_small.png b/crawl-ref/source/rltiles/UNUSED/other/zombie_small.png
new file mode 100644
index 0000000000..fdb52d5b89
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/other/zombie_small.png
diff --git a/crawl-ref/source/rltiles/UNUSED/potions/potion_bubbly.png b/crawl-ref/source/rltiles/UNUSED/potions/potion_bubbly.png
new file mode 100644
index 0000000000..17531301f9
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/potions/potion_bubbly.png
diff --git a/crawl-ref/source/rltiles/UNUSED/potions/potion_cloudy.png b/crawl-ref/source/rltiles/UNUSED/potions/potion_cloudy.png
new file mode 100644
index 0000000000..06b86fbec5
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/potions/potion_cloudy.png
diff --git a/crawl-ref/source/rltiles/UNUSED/potions/potion_effervescent.png b/crawl-ref/source/rltiles/UNUSED/potions/potion_effervescent.png
new file mode 100644
index 0000000000..dd670ce73e
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/potions/potion_effervescent.png
diff --git a/crawl-ref/source/rltiles/UNUSED/potions/potion_fizzy.png b/crawl-ref/source/rltiles/UNUSED/potions/potion_fizzy.png
new file mode 100644
index 0000000000..74078af97b
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/potions/potion_fizzy.png
diff --git a/crawl-ref/source/rltiles/UNUSED/potions/potion_golden.png b/crawl-ref/source/rltiles/UNUSED/potions/potion_golden.png
new file mode 100644
index 0000000000..90de2ac5b4
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/potions/potion_golden.png
diff --git a/crawl-ref/source/rltiles/UNUSED/potions/potion_murky.png b/crawl-ref/source/rltiles/UNUSED/potions/potion_murky.png
new file mode 100644
index 0000000000..fd694e4884
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/potions/potion_murky.png
diff --git a/crawl-ref/source/rltiles/UNUSED/potions/potion_puce.png b/crawl-ref/source/rltiles/UNUSED/potions/potion_puce.png
new file mode 100644
index 0000000000..4b68d3ca57
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/potions/potion_puce.png
diff --git a/crawl-ref/source/rltiles/UNUSED/potions/potion_purple_red.png b/crawl-ref/source/rltiles/UNUSED/potions/potion_purple_red.png
new file mode 100644
index 0000000000..dc4ebef82e
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/potions/potion_purple_red.png
diff --git a/crawl-ref/source/rltiles/UNUSED/potions/potion_sky_blue.png b/crawl-ref/source/rltiles/UNUSED/potions/potion_sky_blue.png
new file mode 100644
index 0000000000..cf4aebaaaa
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/potions/potion_sky_blue.png
diff --git a/crawl-ref/source/rltiles/UNUSED/rings/ring_black_onyx.png b/crawl-ref/source/rltiles/UNUSED/rings/ring_black_onyx.png
new file mode 100644
index 0000000000..c590b34679
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/rings/ring_black_onyx.png
diff --git a/crawl-ref/source/rltiles/UNUSED/rings/ring_engagement.png b/crawl-ref/source/rltiles/UNUSED/rings/ring_engagement.png
new file mode 100644
index 0000000000..1736f7ffa7
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/rings/ring_engagement.png
diff --git a/crawl-ref/source/rltiles/UNUSED/rings/ring_gold_cyan.png b/crawl-ref/source/rltiles/UNUSED/rings/ring_gold_cyan.png
new file mode 100644
index 0000000000..fbb8f7e6af
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/rings/ring_gold_cyan.png
diff --git a/crawl-ref/source/rltiles/UNUSED/rings/ring_gold_magenta.png b/crawl-ref/source/rltiles/UNUSED/rings/ring_gold_magenta.png
new file mode 100644
index 0000000000..6cf3cdc977
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/rings/ring_gold_magenta.png
diff --git a/crawl-ref/source/rltiles/UNUSED/rings/ring_gold_white.png b/crawl-ref/source/rltiles/UNUSED/rings/ring_gold_white.png
new file mode 100644
index 0000000000..dcb8a61e3b
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/rings/ring_gold_white.png
diff --git a/crawl-ref/source/rltiles/UNUSED/rings/ring_gold_yellow.png b/crawl-ref/source/rltiles/UNUSED/rings/ring_gold_yellow.png
new file mode 100644
index 0000000000..19dd996489
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/rings/ring_gold_yellow.png
diff --git a/crawl-ref/source/rltiles/UNUSED/rings/ring_ivory.png b/crawl-ref/source/rltiles/UNUSED/rings/ring_ivory.png
new file mode 100644
index 0000000000..c37fcad452
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/rings/ring_ivory.png
diff --git a/crawl-ref/source/rltiles/UNUSED/rings/ring_plain_blue.png b/crawl-ref/source/rltiles/UNUSED/rings/ring_plain_blue.png
new file mode 100644
index 0000000000..9cf594f670
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/rings/ring_plain_blue.png
diff --git a/crawl-ref/source/rltiles/UNUSED/rings/ring_plain_green.png b/crawl-ref/source/rltiles/UNUSED/rings/ring_plain_green.png
new file mode 100644
index 0000000000..43c783fedd
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/rings/ring_plain_green.png
diff --git a/crawl-ref/source/rltiles/UNUSED/rings/ring_plain_magenta.png b/crawl-ref/source/rltiles/UNUSED/rings/ring_plain_magenta.png
new file mode 100644
index 0000000000..b3c84204db
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/rings/ring_plain_magenta.png
diff --git a/crawl-ref/source/rltiles/UNUSED/rings/ring_ruby.png b/crawl-ref/source/rltiles/UNUSED/rings/ring_ruby.png
new file mode 100644
index 0000000000..771748acec
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/rings/ring_ruby.png
diff --git a/crawl-ref/source/rltiles/UNUSED/rings/ring_sapphire.png b/crawl-ref/source/rltiles/UNUSED/rings/ring_sapphire.png
new file mode 100644
index 0000000000..66cc7a684f
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/rings/ring_sapphire.png
diff --git a/crawl-ref/source/rltiles/UNUSED/rings/ring_shiny.png b/crawl-ref/source/rltiles/UNUSED/rings/ring_shiny.png
new file mode 100644
index 0000000000..04b2420dc1
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/rings/ring_shiny.png
diff --git a/crawl-ref/source/rltiles/UNUSED/rings/ring_topaz.png b/crawl-ref/source/rltiles/UNUSED/rings/ring_topaz.png
new file mode 100644
index 0000000000..c50b589d29
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/rings/ring_topaz.png
diff --git a/crawl-ref/source/rltiles/UNUSED/rings/ring_twisted.png b/crawl-ref/source/rltiles/UNUSED/rings/ring_twisted.png
new file mode 100644
index 0000000000..013c1b30b9
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/rings/ring_twisted.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/ancient_sword.png b/crawl-ref/source/rltiles/UNUSED/weapons/ancient_sword.png
new file mode 100644
index 0000000000..573f514bf9
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/ancient_sword.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/axe.png b/crawl-ref/source/rltiles/UNUSED/weapons/axe.png
new file mode 100644
index 0000000000..f81581328a
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/axe.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/elven_arrow.png b/crawl-ref/source/rltiles/UNUSED/weapons/elven_arrow.png
new file mode 100644
index 0000000000..a2e8d8db87
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/elven_arrow.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/elven_broadsword.png b/crawl-ref/source/rltiles/UNUSED/weapons/elven_broadsword.png
new file mode 100644
index 0000000000..dd2adc1c76
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/elven_broadsword.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/executioner_axe.png b/crawl-ref/source/rltiles/UNUSED/weapons/executioner_axe.png
new file mode 100644
index 0000000000..409615960b
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/executioner_axe.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/executioner_axe2.png b/crawl-ref/source/rltiles/UNUSED/weapons/executioner_axe2.png
new file mode 100644
index 0000000000..9cdcaf3c2f
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/executioner_axe2.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/golden_sword.png b/crawl-ref/source/rltiles/UNUSED/weapons/golden_sword.png
new file mode 100644
index 0000000000..1eed59ba22
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/golden_sword.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/katana.png b/crawl-ref/source/rltiles/UNUSED/weapons/katana.png
new file mode 100644
index 0000000000..2119240062
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/katana.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/lucern_hammer.png b/crawl-ref/source/rltiles/UNUSED/weapons/lucern_hammer.png
new file mode 100644
index 0000000000..9503aec2d2
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/lucern_hammer.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/mace3.png b/crawl-ref/source/rltiles/UNUSED/weapons/mace3.png
new file mode 100644
index 0000000000..d29c44400a
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/mace3.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/orcish_arrow.png b/crawl-ref/source/rltiles/UNUSED/weapons/orcish_arrow.png
new file mode 100644
index 0000000000..8de38c8d72
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/orcish_arrow.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/silver_arrow.png b/crawl-ref/source/rltiles/UNUSED/weapons/silver_arrow.png
new file mode 100644
index 0000000000..743dc8556a
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/silver_arrow.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/spear.png b/crawl-ref/source/rltiles/UNUSED/weapons/spear.png
new file mode 100644
index 0000000000..d12db167d9
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/spear.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/spwpn_sword_of_zonguldrok2.png b/crawl-ref/source/rltiles/UNUSED/weapons/spwpn_sword_of_zonguldrok2.png
new file mode 100644
index 0000000000..6c9fd52256
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/spwpn_sword_of_zonguldrok2.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/spwpn_wrath_of_trog2.png b/crawl-ref/source/rltiles/UNUSED/weapons/spwpn_wrath_of_trog2.png
new file mode 100644
index 0000000000..5ff5444fa5
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/spwpn_wrath_of_trog2.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/tsurugi.png b/crawl-ref/source/rltiles/UNUSED/weapons/tsurugi.png
new file mode 100644
index 0000000000..f4d57a024c
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/tsurugi.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/two_handed_sword.png b/crawl-ref/source/rltiles/UNUSED/weapons/two_handed_sword.png
new file mode 100644
index 0000000000..71fa4cec89
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/two_handed_sword.png
diff --git a/crawl-ref/source/rltiles/UNUSED/weapons/war_hammer.png b/crawl-ref/source/rltiles/UNUSED/weapons/war_hammer.png
new file mode 100644
index 0000000000..01d540b99b
--- /dev/null
+++ b/crawl-ref/source/rltiles/UNUSED/weapons/war_hammer.png
diff --git a/crawl-ref/source/rltiles/dc-demon.txt b/crawl-ref/source/rltiles/dc-demon.txt
index 340860ac09..5214bc6ec6 100644
--- a/crawl-ref/source/rltiles/dc-demon.txt
+++ b/crawl-ref/source/rltiles/dc-demon.txt
@@ -1,5 +1,5 @@
 %rim 1
-%sdir dc-mon/demon
+%sdir dc-mon/panlord
 
 demon_body_fat DEMON_BODY
 demon_body_fatter
diff --git a/crawl-ref/source/rltiles/dc-item.txt b/crawl-ref/source/rltiles/dc-item.txt
index c3eaf36ae3..c33626c9de 100644
--- a/crawl-ref/source/rltiles/dc-item.txt
+++ b/crawl-ref/source/rltiles/dc-item.txt
@@ -187,7 +187,7 @@ item/gem/stone MI_STONE
 effect/stone0 MI_STONE0

 sling_bullet MI_SLING_BULLET

 effect/sling_bullet0 MI_SLING_BULLET0

-ya MI_ARROW

+arrow MI_ARROW

 effect/arrow0 MI_ARROW0

 effect/arrow1 MI_ARROW1

 effect/arrow2 MI_ARROW2

@@ -308,6 +308,12 @@ gold_dragon_armour ARM_GOLD_DRAGON_ARMOUR
 swamp_dragon_hide ARM_SWAMP_DRAGON_HIDE

 swamp_dragon_armour ARM_SWAMP_DRAGON_ARMOUR

 

+leather_cloak ARM_CLOAK

+cloak2

+cloak3

+cloak4

+

+%sdir item/armour/bardings

 naga_barding_blue ARM_NAGA_BARDING

 naga_barding_metal

 naga_barding_magenta

@@ -317,10 +323,7 @@ centaur_barding_metal
 centaur_barding_magenta

 centaur_barding_red

 

-elven_shield ARM_SHIELD

-shield_kite2

-shield_round2

-

+%sdir item/armour/shields

 #dwarvish_roundshield ARM_BUCKLER

 %rim 0

 buckler ARM_BUCKLER

@@ -328,15 +331,15 @@ buckler2
 buckler3

 %rim 1

 

+elven_shield ARM_SHIELD

+shield_kite2

+shield_round2

+

 large_shield ARM_LARGE_SHIELD

 shield_large2

 shield_kite3

 

-leather_cloak ARM_CLOAK

-cloak2

-cloak3

-cloak4

-

+%sdir item/armour/headgear

 #####ARM_HELMET

 elven_leather_helm THELM_CAP

 wizard_hat THELM_WIZARD_HAT

@@ -347,6 +350,7 @@ etched_helmet
 helm3

 helm_visor1

 

+%sdir item/armour

 ###### GLOVES

 glove1 ARM_GLOVES

 glove3

@@ -402,7 +406,7 @@ i-disintegration WAND_DISINTEGRATION
 %back none

 #################OBJ_FOOD

 %sdir item/food

-tripe_ration FOOD_MEAT_RATION

+meat_ration FOOD_MEAT_RATION

 bread_ration FOOD_BREAD_RATION

 pear FOOD_PEAR

 apple FOOD_APPLE

@@ -728,13 +732,17 @@ misc_orb ORB
 

 #OBJ_MISCELLANY

 misc_bottle MISC_BOTTLED_EFREET

+misc_crystal MISC_CRYSTAL_BALL_OF_ENERGY

+misc_crystal MISC_CRYSTAL_BALL_OF_FIXATION

 misc_crystal MISC_CRYSTAL_BALL_OF_SEEING

 misc_fan MISC_AIR_ELEMENTAL_FAN

 misc_lamp MISC_LAMP_OF_FIRE

 misc_stone MISC_STONE_OF_EARTH_ELEMENTALS

 misc_lantern MISC_LANTERN_OF_SHADOWS

 misc_horn MISC_HORN_OF_GERYON

+misc_box MISC_EMPTY_EBONY_CASKET

 misc_box MISC_BOX_OF_BEASTS

+misc_disc MISC_DISC_OF_STORMS

 misc_deck MISC_DECK

 %start

 %compose misc_deck

@@ -846,11 +854,6 @@ misc_deck_legendary MISC_DECK_LEGENDARY
 %compose misc_deck_legendary

 %compose i-deck_defense

 %finish

-misc_crystal MISC_CRYSTAL_BALL_OF_ENERGY

-misc_box MISC_EMPTY_EBONY_CASKET

-misc_crystal MISC_CRYSTAL_BALL_OF_FIXATION

-misc_disc MISC_DISC_OF_STORMS

-misc_altar MISC_PORTABLE_ALTAR_OF_NEMELEX

 misc_rune MISC_RUNE_OF_ZOT

 runes/rune_tartarus MISC_RUNE_TARTARUS

 runes/rune_cocytus MISC_RUNE_COCYTUS

diff --git a/crawl-ref/source/rltiles/dc-misc.txt b/crawl-ref/source/rltiles/dc-misc.txt
index f806ae23e1..30bfe5fb9e 100644
--- a/crawl-ref/source/rltiles/dc-misc.txt
+++ b/crawl-ref/source/rltiles/dc-misc.txt
@@ -83,7 +83,6 @@ num9 NUM9
 tried TRIED

 

 slot_eq ITEM_SLOT_EQUIP

-slot_melded ITEM_SLOT_MELDED

 slot_cursed ITEM_SLOT_CURSED

 slot_eq_cursed ITEM_SLOT_EQUIP_CURSED

 ray ITEM_SLOT_SELECTED

diff --git a/crawl-ref/source/rltiles/dc-mon.txt b/crawl-ref/source/rltiles/dc-mon.txt
index 16767dabc2..6998d41d73 100644
--- a/crawl-ref/source/rltiles/dc-mon.txt
+++ b/crawl-ref/source/rltiles/dc-mon.txt
@@ -1,3 +1,6 @@
+## used for Detect Creatures

+dc-mon/panlord/pandemonium_demon MONS_PANDEMONIUM_DEMON

+

 dc-misc/error MONS_PROGRAM_BUG

 

 ### Animals

@@ -118,11 +121,8 @@ sheep MONS_SHEEP /*'Y'*/
 yak MONS_YAK /*'Y'*/

 death_yak MONS_DEATH_YAK /*'Y'*/

 

-### Non-animal monsters

+### Elemental monsters

 %sdir dc-mon

-%rim 0

-shadow MONS_SHADOW /*' '*/

-%rim 1

 earth_elemental MONS_EARTH_ELEMENTAL /*'#'*/

 fire_elemental MONS_FIRE_ELEMENTAL /*'#'*/

 water_elemental MONS_WATER_ELEMENTAL /*'{'*/

@@ -133,7 +133,12 @@ spatial_vortex MONS_SPATIAL_VORTEX /*'v'*/
 vapour MONS_VAPOUR /*'#'*/

 %rim 1

 death_cob MONS_DEATH_COB /*'%'*/

+ball_lightning MONS_BALL_LIGHTNING /*'*'*/

+%rim 0

+orb_of_fire MONS_ORB_OF_FIRE /*'*'*/

+%rim 1

 

+### Demonic monsters

 ## Arch demons

 %sdir dc-mon/unique

 asmodeus MONS_ASMODEUS /*'&'*/

@@ -144,14 +149,9 @@ geryon MONS_GERYON /*'&'*/
 gloorx_vloq MONS_GLOORX_VLOQ /*'&'*/

 lom_lobon MONS_LOM_LOBON /*'&'*/

 mnoleg MONS_MNOLEG /*'&'*/

-%sdir dc-mon

-pandemonium_demon MONS_PANDEMONIUM_DEMON /*'&'*/

-ball_lightning MONS_BALL_LIGHTNING /*'*'*/

-%rim 0

-orb_of_fire MONS_ORB_OF_FIRE /*'*'*/

-%rim 1

 

 ## Demons 1-5

+%sdir dc-mon/demons

 balrug MONS_BALRUG /*'1'*/

 blue_death MONS_BLUE_DEATH /*'1'*/

 cacodemon MONS_CACODEMON /*'1'*/

@@ -191,7 +191,29 @@ shadow_imp MONS_SHADOW_IMP /*'5'*/
 ufetubus MONS_UFETUBUS /*'5'*/

 white_imp MONS_WHITE_IMP /*'5'*/

 

+efreet MONS_EFREET /*'E'*/

+

+rakshasa MONS_RAKSHASA /*'R'*/

+rakshasa MONS_RAKSHASA_FAKE /*'R'*/

+

+## Abominations

+abomination_large MONS_ABOMINATION_LARGE /*'X'*/

+abomination_large1

+abomination_large2

+abomination_large3

+abomination_large4

+abomination_large5

+abomination_large6

+tentacled_monstrosity MONS_TENTACLED_MONSTROSITY /*'X'*/

+

+ugly_thing MONS_UGLY_THING /*'u'*/

+very_ugly_thing MONS_VERY_UGLY_THING /*'u'*/

+

+unseen_horror MONS_UNSEEN_HORROR /*'x'*/

+abomination_small MONS_ABOMINATION_SMALL /*'x'*/

+

 ## Golems

+%sdir dc-mon

 clay_golem MONS_CLAY_GOLEM /*'8'*/

 crystal_golem MONS_CRYSTAL_GOLEM /*'8'*/

 %rim 0

@@ -217,7 +239,7 @@ human MONS_HUMAN /*'@'*/
 hell_knight MONS_HELL_KNIGHT /*'@'*/

 necromancer MONS_NECROMANCER /*'@'*/

 wizard MONS_WIZARD /*'@'*/

-vault_guard0 MONS_VAULT_GUARD /*'@'*/

+vault_guard MONS_VAULT_GUARD /*'@'*/

 shapeshifter MONS_SHAPESHIFTER /*'@'*/

 glowing_shapeshifter MONS_GLOWING_SHAPESHIFTER /*'@'*/

 killer_klown MONS_KILLER_KLOWN /*'@'*/

@@ -298,9 +320,6 @@ shadow_dragon MONS_SHADOW_DRAGON /*'D'*/
 skeletal_dragon MONS_SKELETAL_DRAGON /*'D'*/

 serpent_of_hell MONS_SERPENT_OF_HELL /*'D'*/

 

-## Efreet only

-efreet MONS_EFREET /*'E'*/

-

 ## Eyes

 giant_spore MONS_GIANT_SPORE /*'G'*/

 giant_eyeball MONS_GIANT_EYEBALL /*'G'*/

@@ -351,11 +370,11 @@ greater_mummy MONS_GREATER_MUMMY /*'M'*/
 mummy_priest MONS_MUMMY_PRIEST /*'M'*/

 

 ## Nagas

-naga0 MONS_NAGA /*'N'*/

+naga MONS_NAGA /*'N'*/

 guardian_naga MONS_GUARDIAN_NAGA /*'N'*/

 naga_mage MONS_NAGA_MAGE /*'N'*/

-naga_warrior0 MONS_NAGA_WARRIOR /*'N'*/

-greater_naga0 MONS_GREATER_NAGA /*'N'*/

+naga_warrior MONS_NAGA_WARRIOR /*'N'*/

+greater_naga MONS_GREATER_NAGA /*'N'*/

 

 %sdir dc-mon/unique

 erolcha MONS_EROLCHA /*'O'*/

@@ -367,9 +386,6 @@ ogre_mage MONS_OGRE_MAGE /*'O'*/
 plant MONS_PLANT /*'P'*/

 oklob_plant MONS_OKLOB_PLANT /*'P'*/

 

-rakshasa MONS_RAKSHASA /*'R'*/

-rakshasa MONS_RAKSHASA_FAKE /*'R'*/

-

 %sdir dc-mon/unique

 snorg MONS_SNORG /*'T'*/

 %sdir dc-mon

@@ -389,14 +405,6 @@ freezing_wraith MONS_FREEZING_WRAITH /*'W'*/
 spectral_warrior MONS_SPECTRAL_WARRIOR /*'W'*/

 spectral_thing MONS_SPECTRAL_THING /*'W'*/

 

-abomination_large MONS_ABOMINATION_LARGE /*'X'*/

-abomination_large1

-abomination_large2

-abomination_large3

-abomination_large4

-abomination_large5

-abomination_large6

-tentacled_monstrosity MONS_TENTACLED_MONSTROSITY /*'X'*/

 orb_guardian MONS_ORB_GUARDIAN /*'X'*/

 

 zombie_large MONS_ZOMBIE_LARGE /*'Z'*/

@@ -413,9 +421,9 @@ yaktaur_captain MONS_YAKTAUR_CAPTAIN /*'c'*/
 yaktaur_captain-melee MONS_YAKTAUR_CAPTAIN_MELEE

 

 elf MONS_ELF /*'e'*/

-deep_elf_fighter0 MONS_DEEP_ELF_FIGHTER /*'e'*/

-deep_elf_soldier0 MONS_DEEP_ELF_SOLDIER /*'e'*/

-deep_elf_knight0 MONS_DEEP_ELF_KNIGHT /*'e'*/

+deep_elf_fighter MONS_DEEP_ELF_FIGHTER /*'e'*/

+deep_elf_soldier MONS_DEEP_ELF_SOLDIER /*'e'*/

+deep_elf_knight MONS_DEEP_ELF_KNIGHT /*'e'*/

 deep_elf_mage MONS_DEEP_ELF_MAGE /*'e'*/

 deep_elf_sorcerer MONS_DEEP_ELF_SORCERER /*'e'*/

 deep_elf_conjurer MONS_DEEP_ELF_CONJURER /*'e'*/

@@ -434,9 +442,9 @@ wandering_mushroom MONS_WANDERING_MUSHROOM /*'f'*/
 %sdir dc-mon/unique

 ijyb MONS_IJYB /*'g'*/

 %sdir dc-mon

-goblin0 MONS_GOBLIN /*'g'*/

-hobgoblin0 MONS_HOBGOBLIN /*'g'*/

-gnoll0 MONS_GNOLL /*'g'*/

+goblin MONS_GOBLIN /*'g'*/

+hobgoblin MONS_HOBGOBLIN /*'g'*/

+gnoll MONS_GNOLL /*'g'*/

 boggart MONS_BOGGART /*'g'*/

 

 merfolk_fighter MONS_MERFOLK_FIGHTER /*'m'*/

@@ -456,16 +464,17 @@ rotting_hulk MONS_ROTTING_HULK /*'n'*/
 blork_the_orc MONS_BLORK_THE_ORC /*'o'*/

 urug MONS_URUG /*'o'*/

 %sdir dc-mon

-orc0 MONS_ORC /*'o'*/

+orc MONS_ORC /*'o'*/

 orc_wizard MONS_ORC_WIZARD /*'o'*/

 orc_priest MONS_ORC_PRIEST /*'o'*/

-orc_warrior0 MONS_ORC_WARRIOR /*'o'*/

-orc_knight0 MONS_ORC_KNIGHT /*'o'*/

-orc_warlord0 MONS_ORC_WARLORD /*'o'*/

+orc_warrior MONS_ORC_WARRIOR /*'o'*/

+orc_knight MONS_ORC_KNIGHT /*'o'*/

+orc_warlord MONS_ORC_WARLORD /*'o'*/

 orc_sorcerer MONS_ORC_SORCERER /*'o'*/

 orc_high_priest MONS_ORC_HIGH_PRIEST /*'o'*/

 

 %rim 0

+shadow MONS_SHADOW /*' '*/

 insubstantial_wisp MONS_INSUBSTANTIAL_WISP /*'p'*/

 phantom MONS_PHANTOM /*'p'*/

 ghost MONS_PLAYER_GHOST /*'p'*/

@@ -473,16 +482,10 @@ ghost MONS_PLAYER_GHOST /*'p'*/
 flayed_ghost MONS_FLAYED_GHOST /*'p'*/

 hungry_ghost MONS_HUNGRY_GHOST /*'p'*/

 

-ugly_thing MONS_UGLY_THING /*'u'*/

-very_ugly_thing MONS_VERY_UGLY_THING /*'u'*/

-

-unseen_horror MONS_UNSEEN_HORROR /*'x'*/

-abomination_small MONS_ABOMINATION_SMALL /*'x'*/

-

 zombie_small MONS_ZOMBIE_SMALL /*'z'*/

 skeleton_small MONS_SKELETON_SMALL /*'z'*/

 simulacrum_small MONS_SIMULACRUM_SMALL /*'z'*/

-skeletal_warrior0 MONS_SKELETAL_WARRIOR /*'z'*/

+skeletal_warrior MONS_SKELETAL_WARRIOR /*'z'*/

 %rim 0

 flaming_corpse MONS_FLAMING_CORPSE /*'z'*/

 %rim 1

diff --git a/crawl-ref/source/rltiles/dc-mon/deep_elf_fighter0.png b/crawl-ref/source/rltiles/dc-mon/deep_elf_fighter.png
index 8b83fbfd81..8b83fbfd81 100644
--- a/crawl-ref/source/rltiles/dc-mon/deep_elf_fighter0.png
+++ b/crawl-ref/source/rltiles/dc-mon/deep_elf_fighter.png
diff --git a/crawl-ref/source/rltiles/dc-mon/deep_elf_knight0.png b/crawl-ref/source/rltiles/dc-mon/deep_elf_knight.png
index 6d88251d72..6d88251d72 100644
--- a/crawl-ref/source/rltiles/dc-mon/deep_elf_knight0.png
+++ b/crawl-ref/source/rltiles/dc-mon/deep_elf_knight.png
diff --git a/crawl-ref/source/rltiles/dc-mon/deep_elf_soldier0.png b/crawl-ref/source/rltiles/dc-mon/deep_elf_soldier.png
index 1ee27bce72..1ee27bce72 100644
--- a/crawl-ref/source/rltiles/dc-mon/deep_elf_soldier0.png
+++ b/crawl-ref/source/rltiles/dc-mon/deep_elf_soldier.png
diff --git a/crawl-ref/source/rltiles/dc-mon/abomination_large.png b/crawl-ref/source/rltiles/dc-mon/demons/abomination_large.png
index 6203339355..6203339355 100644
--- a/crawl-ref/source/rltiles/dc-mon/abomination_large.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/abomination_large.png
diff --git a/crawl-ref/source/rltiles/dc-mon/abomination_large1.png b/crawl-ref/source/rltiles/dc-mon/demons/abomination_large1.png
index 4581b7c9d0..4581b7c9d0 100644
--- a/crawl-ref/source/rltiles/dc-mon/abomination_large1.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/abomination_large1.png
diff --git a/crawl-ref/source/rltiles/dc-mon/abomination_large2.png b/crawl-ref/source/rltiles/dc-mon/demons/abomination_large2.png
index 243fe9e409..243fe9e409 100644
--- a/crawl-ref/source/rltiles/dc-mon/abomination_large2.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/abomination_large2.png
diff --git a/crawl-ref/source/rltiles/dc-mon/abomination_large3.png b/crawl-ref/source/rltiles/dc-mon/demons/abomination_large3.png
index ba18cbc439..ba18cbc439 100644
--- a/crawl-ref/source/rltiles/dc-mon/abomination_large3.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/abomination_large3.png
diff --git a/crawl-ref/source/rltiles/dc-mon/abomination_large4.png b/crawl-ref/source/rltiles/dc-mon/demons/abomination_large4.png
index c8adefa334..c8adefa334 100644
--- a/crawl-ref/source/rltiles/dc-mon/abomination_large4.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/abomination_large4.png
diff --git a/crawl-ref/source/rltiles/dc-mon/abomination_large5.png b/crawl-ref/source/rltiles/dc-mon/demons/abomination_large5.png
index df8ec10d92..df8ec10d92 100644
--- a/crawl-ref/source/rltiles/dc-mon/abomination_large5.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/abomination_large5.png
diff --git a/crawl-ref/source/rltiles/dc-mon/abomination_large6.png b/crawl-ref/source/rltiles/dc-mon/demons/abomination_large6.png
index 54891b0b25..54891b0b25 100644
--- a/crawl-ref/source/rltiles/dc-mon/abomination_large6.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/abomination_large6.png
diff --git a/crawl-ref/source/rltiles/dc-mon/abomination_small.png b/crawl-ref/source/rltiles/dc-mon/demons/abomination_small.png
index f51fd615e0..f51fd615e0 100644
--- a/crawl-ref/source/rltiles/dc-mon/abomination_small.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/abomination_small.png
diff --git a/crawl-ref/source/rltiles/dc-mon/balrug.png b/crawl-ref/source/rltiles/dc-mon/demons/balrug.png
index 6e0045ad93..6e0045ad93 100644
--- a/crawl-ref/source/rltiles/dc-mon/balrug.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/balrug.png
diff --git a/crawl-ref/source/rltiles/dc-mon/beast.png b/crawl-ref/source/rltiles/dc-mon/demons/beast.png
index 99b4a67c6f..99b4a67c6f 100644
--- a/crawl-ref/source/rltiles/dc-mon/beast.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/beast.png
diff --git a/crawl-ref/source/rltiles/dc-mon/blue_death.png b/crawl-ref/source/rltiles/dc-mon/demons/blue_death.png
index 9ef85c9186..9ef85c9186 100644
--- a/crawl-ref/source/rltiles/dc-mon/blue_death.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/blue_death.png
diff --git a/crawl-ref/source/rltiles/dc-mon/blue_devil.png b/crawl-ref/source/rltiles/dc-mon/demons/blue_devil.png
index 4f3f03583a..4f3f03583a 100644
--- a/crawl-ref/source/rltiles/dc-mon/blue_devil.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/blue_devil.png
diff --git a/crawl-ref/source/rltiles/dc-mon/cacodemon.png b/crawl-ref/source/rltiles/dc-mon/demons/cacodemon.png
index 554c0dc921..554c0dc921 100644
--- a/crawl-ref/source/rltiles/dc-mon/cacodemon.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/cacodemon.png
diff --git a/crawl-ref/source/rltiles/dc-mon/chaos_spawn.png b/crawl-ref/source/rltiles/dc-mon/demons/chaos_spawn.png
index 200da65905..200da65905 100644
--- a/crawl-ref/source/rltiles/dc-mon/chaos_spawn.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/chaos_spawn.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demonic_crawler.png b/crawl-ref/source/rltiles/dc-mon/demons/demonic_crawler.png
index 39fa185f49..39fa185f49 100644
--- a/crawl-ref/source/rltiles/dc-mon/demonic_crawler.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/demonic_crawler.png
diff --git a/crawl-ref/source/rltiles/dc-mon/efreet.png b/crawl-ref/source/rltiles/dc-mon/demons/efreet.png
index b198e91f36..b198e91f36 100644
--- a/crawl-ref/source/rltiles/dc-mon/efreet.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/efreet.png
diff --git a/crawl-ref/source/rltiles/dc-mon/executioner.png b/crawl-ref/source/rltiles/dc-mon/demons/executioner.png
index 22bee93763..22bee93763 100644
--- a/crawl-ref/source/rltiles/dc-mon/executioner.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/executioner.png
diff --git a/crawl-ref/source/rltiles/dc-mon/fiend.png b/crawl-ref/source/rltiles/dc-mon/demons/fiend.png
index 384307f363..384307f363 100644
--- a/crawl-ref/source/rltiles/dc-mon/fiend.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/fiend.png
diff --git a/crawl-ref/source/rltiles/dc-mon/green_death.png b/crawl-ref/source/rltiles/dc-mon/demons/green_death.png
index 3c5711a43c..3c5711a43c 100644
--- a/crawl-ref/source/rltiles/dc-mon/green_death.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/green_death.png
diff --git a/crawl-ref/source/rltiles/dc-mon/hairy_devil.png b/crawl-ref/source/rltiles/dc-mon/demons/hairy_devil.png
index f96bddf83f..f96bddf83f 100644
--- a/crawl-ref/source/rltiles/dc-mon/hairy_devil.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/hairy_devil.png
diff --git a/crawl-ref/source/rltiles/dc-mon/hellion.png b/crawl-ref/source/rltiles/dc-mon/demons/hellion.png
index 757445bbe6..757445bbe6 100644
--- a/crawl-ref/source/rltiles/dc-mon/hellion.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/hellion.png
diff --git a/crawl-ref/source/rltiles/dc-mon/hellwing.png b/crawl-ref/source/rltiles/dc-mon/demons/hellwing.png
index e153e1dc7a..e153e1dc7a 100644
--- a/crawl-ref/source/rltiles/dc-mon/hellwing.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/hellwing.png
diff --git a/crawl-ref/source/rltiles/dc-mon/ice_devil.png b/crawl-ref/source/rltiles/dc-mon/demons/ice_devil.png
index 7e34587030..7e34587030 100644
--- a/crawl-ref/source/rltiles/dc-mon/ice_devil.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/ice_devil.png
diff --git a/crawl-ref/source/rltiles/dc-mon/ice_fiend.png b/crawl-ref/source/rltiles/dc-mon/demons/ice_fiend.png
index ae572752e8..ae572752e8 100644
--- a/crawl-ref/source/rltiles/dc-mon/ice_fiend.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/ice_fiend.png
diff --git a/crawl-ref/source/rltiles/dc-mon/imp.png b/crawl-ref/source/rltiles/dc-mon/demons/imp.png
index df854f8d7e..df854f8d7e 100644
--- a/crawl-ref/source/rltiles/dc-mon/imp.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/imp.png
diff --git a/crawl-ref/source/rltiles/dc-mon/iron_devil.png b/crawl-ref/source/rltiles/dc-mon/demons/iron_devil.png
index edfddfc63b..edfddfc63b 100644
--- a/crawl-ref/source/rltiles/dc-mon/iron_devil.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/iron_devil.png
diff --git a/crawl-ref/source/rltiles/dc-mon/lemure.png b/crawl-ref/source/rltiles/dc-mon/demons/lemure.png
index 73cac3f5e5..73cac3f5e5 100644
--- a/crawl-ref/source/rltiles/dc-mon/lemure.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/lemure.png
diff --git a/crawl-ref/source/rltiles/dc-mon/lorocyproca.png b/crawl-ref/source/rltiles/dc-mon/demons/lorocyproca.png
index 33d82550df..33d82550df 100644
--- a/crawl-ref/source/rltiles/dc-mon/lorocyproca.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/lorocyproca.png
diff --git a/crawl-ref/source/rltiles/dc-mon/manes.png b/crawl-ref/source/rltiles/dc-mon/demons/manes.png
index bc13e09e8c..bc13e09e8c 100644
--- a/crawl-ref/source/rltiles/dc-mon/manes.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/manes.png
diff --git a/crawl-ref/source/rltiles/dc-mon/midge.png b/crawl-ref/source/rltiles/dc-mon/demons/midge.png
index d364f0c9ad..d364f0c9ad 100644
--- a/crawl-ref/source/rltiles/dc-mon/midge.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/midge.png
diff --git a/crawl-ref/source/rltiles/dc-mon/neqoxec.png b/crawl-ref/source/rltiles/dc-mon/demons/neqoxec.png
index b3d480ea93..b3d480ea93 100644
--- a/crawl-ref/source/rltiles/dc-mon/neqoxec.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/neqoxec.png
diff --git a/crawl-ref/source/rltiles/dc-mon/orange_demon.png b/crawl-ref/source/rltiles/dc-mon/demons/orange_demon.png
index 21cd5791d9..21cd5791d9 100644
--- a/crawl-ref/source/rltiles/dc-mon/orange_demon.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/orange_demon.png
diff --git a/crawl-ref/source/rltiles/dc-mon/pit_fiend.png b/crawl-ref/source/rltiles/dc-mon/demons/pit_fiend.png
index 335a8fa1a8..335a8fa1a8 100644
--- a/crawl-ref/source/rltiles/dc-mon/pit_fiend.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/pit_fiend.png
diff --git a/crawl-ref/source/rltiles/dc-mon/quasit.png b/crawl-ref/source/rltiles/dc-mon/demons/quasit.png
index 713a0fae4b..713a0fae4b 100644
--- a/crawl-ref/source/rltiles/dc-mon/quasit.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/quasit.png
diff --git a/crawl-ref/source/rltiles/dc-mon/rakshasa.png b/crawl-ref/source/rltiles/dc-mon/demons/rakshasa.png
index 412743caae..412743caae 100644
--- a/crawl-ref/source/rltiles/dc-mon/rakshasa.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/rakshasa.png
diff --git a/crawl-ref/source/rltiles/dc-mon/reaper.png b/crawl-ref/source/rltiles/dc-mon/demons/reaper.png
index e1424d2e60..e1424d2e60 100644
--- a/crawl-ref/source/rltiles/dc-mon/reaper.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/reaper.png
diff --git a/crawl-ref/source/rltiles/dc-mon/red_devil.png b/crawl-ref/source/rltiles/dc-mon/demons/red_devil.png
index 3b5952e3ac..3b5952e3ac 100644
--- a/crawl-ref/source/rltiles/dc-mon/red_devil.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/red_devil.png
diff --git a/crawl-ref/source/rltiles/dc-mon/rotting_devil.png b/crawl-ref/source/rltiles/dc-mon/demons/rotting_devil.png
index 1d68047ae2..1d68047ae2 100644
--- a/crawl-ref/source/rltiles/dc-mon/rotting_devil.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/rotting_devil.png
diff --git a/crawl-ref/source/rltiles/dc-mon/shadow_demon.png b/crawl-ref/source/rltiles/dc-mon/demons/shadow_demon.png
index 3706adeb1f..3706adeb1f 100644
--- a/crawl-ref/source/rltiles/dc-mon/shadow_demon.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/shadow_demon.png
diff --git a/crawl-ref/source/rltiles/dc-mon/shadow_fiend.png b/crawl-ref/source/rltiles/dc-mon/demons/shadow_fiend.png
index 3334c840d1..3334c840d1 100644
--- a/crawl-ref/source/rltiles/dc-mon/shadow_fiend.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/shadow_fiend.png
diff --git a/crawl-ref/source/rltiles/dc-mon/shadow_imp.png b/crawl-ref/source/rltiles/dc-mon/demons/shadow_imp.png
index 1b31229d86..1b31229d86 100644
--- a/crawl-ref/source/rltiles/dc-mon/shadow_imp.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/shadow_imp.png
diff --git a/crawl-ref/source/rltiles/dc-mon/smoke_demon.png b/crawl-ref/source/rltiles/dc-mon/demons/smoke_demon.png
index 37a5fb0756..37a5fb0756 100644
--- a/crawl-ref/source/rltiles/dc-mon/smoke_demon.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/smoke_demon.png
diff --git a/crawl-ref/source/rltiles/dc-mon/soul_eater.png b/crawl-ref/source/rltiles/dc-mon/demons/soul_eater.png
index 19aa3a3105..19aa3a3105 100644
--- a/crawl-ref/source/rltiles/dc-mon/soul_eater.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/soul_eater.png
diff --git a/crawl-ref/source/rltiles/dc-mon/sun_demon.png b/crawl-ref/source/rltiles/dc-mon/demons/sun_demon.png
index b27f7b9c45..b27f7b9c45 100644
--- a/crawl-ref/source/rltiles/dc-mon/sun_demon.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/sun_demon.png
diff --git a/crawl-ref/source/rltiles/dc-mon/tentacled_monstrosity.png b/crawl-ref/source/rltiles/dc-mon/demons/tentacled_monstrosity.png
index 4e97943c80..4e97943c80 100644
--- a/crawl-ref/source/rltiles/dc-mon/tentacled_monstrosity.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/tentacled_monstrosity.png
diff --git a/crawl-ref/source/rltiles/dc-mon/tormentor.png b/crawl-ref/source/rltiles/dc-mon/demons/tormentor.png
index e20b7fc841..e20b7fc841 100644
--- a/crawl-ref/source/rltiles/dc-mon/tormentor.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/tormentor.png
diff --git a/crawl-ref/source/rltiles/dc-mon/ufetubus.png b/crawl-ref/source/rltiles/dc-mon/demons/ufetubus.png
index 53b35dee53..53b35dee53 100644
--- a/crawl-ref/source/rltiles/dc-mon/ufetubus.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/ufetubus.png
diff --git a/crawl-ref/source/rltiles/dc-mon/ugly_thing.png b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing.png
index dcdfaa2c7b..dcdfaa2c7b 100644
--- a/crawl-ref/source/rltiles/dc-mon/ugly_thing.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/ugly_thing.png
diff --git a/crawl-ref/source/rltiles/dc-mon/unseen_horror.png b/crawl-ref/source/rltiles/dc-mon/demons/unseen_horror.png
index c3b1d92006..c3b1d92006 100644
--- a/crawl-ref/source/rltiles/dc-mon/unseen_horror.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/unseen_horror.png
diff --git a/crawl-ref/source/rltiles/dc-mon/very_ugly_thing.png b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing.png
index 16ae846ccc..16ae846ccc 100644
--- a/crawl-ref/source/rltiles/dc-mon/very_ugly_thing.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/very_ugly_thing.png
diff --git a/crawl-ref/source/rltiles/dc-mon/white_imp.png b/crawl-ref/source/rltiles/dc-mon/demons/white_imp.png
index 82dbeb6298..82dbeb6298 100644
--- a/crawl-ref/source/rltiles/dc-mon/white_imp.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/white_imp.png
diff --git a/crawl-ref/source/rltiles/dc-mon/ynoxinul.png b/crawl-ref/source/rltiles/dc-mon/demons/ynoxinul.png
index b2030f5be6..b2030f5be6 100644
--- a/crawl-ref/source/rltiles/dc-mon/ynoxinul.png
+++ b/crawl-ref/source/rltiles/dc-mon/demons/ynoxinul.png
diff --git a/crawl-ref/source/rltiles/dc-mon/gnoll0.png b/crawl-ref/source/rltiles/dc-mon/gnoll.png
index 560210c00e..560210c00e 100644
--- a/crawl-ref/source/rltiles/dc-mon/gnoll0.png
+++ b/crawl-ref/source/rltiles/dc-mon/gnoll.png
diff --git a/crawl-ref/source/rltiles/dc-mon/goblin0.png b/crawl-ref/source/rltiles/dc-mon/goblin.png
index db337ed608..db337ed608 100644
--- a/crawl-ref/source/rltiles/dc-mon/goblin0.png
+++ b/crawl-ref/source/rltiles/dc-mon/goblin.png
diff --git a/crawl-ref/source/rltiles/dc-mon/greater_naga0.png b/crawl-ref/source/rltiles/dc-mon/greater_naga.png
index 8a5492c72e..8a5492c72e 100644
--- a/crawl-ref/source/rltiles/dc-mon/greater_naga0.png
+++ b/crawl-ref/source/rltiles/dc-mon/greater_naga.png
diff --git a/crawl-ref/source/rltiles/dc-mon/hobgoblin0.png b/crawl-ref/source/rltiles/dc-mon/hobgoblin.png
index ae0e19655e..ae0e19655e 100644
--- a/crawl-ref/source/rltiles/dc-mon/hobgoblin0.png
+++ b/crawl-ref/source/rltiles/dc-mon/hobgoblin.png
diff --git a/crawl-ref/source/rltiles/dc-mon/naga0.png b/crawl-ref/source/rltiles/dc-mon/naga.png
index 25f8ef0f6b..25f8ef0f6b 100644
--- a/crawl-ref/source/rltiles/dc-mon/naga0.png
+++ b/crawl-ref/source/rltiles/dc-mon/naga.png
diff --git a/crawl-ref/source/rltiles/dc-mon/naga_warrior0.png b/crawl-ref/source/rltiles/dc-mon/naga_warrior.png
index e6ded3c265..e6ded3c265 100644
--- a/crawl-ref/source/rltiles/dc-mon/naga_warrior0.png
+++ b/crawl-ref/source/rltiles/dc-mon/naga_warrior.png
diff --git a/crawl-ref/source/rltiles/dc-mon/orc0.png b/crawl-ref/source/rltiles/dc-mon/orc.png
index f4fe7fb8e8..f4fe7fb8e8 100644
--- a/crawl-ref/source/rltiles/dc-mon/orc0.png
+++ b/crawl-ref/source/rltiles/dc-mon/orc.png
diff --git a/crawl-ref/source/rltiles/dc-mon/orc_knight0.png b/crawl-ref/source/rltiles/dc-mon/orc_knight.png
index ba62920d96..ba62920d96 100644
--- a/crawl-ref/source/rltiles/dc-mon/orc_knight0.png
+++ b/crawl-ref/source/rltiles/dc-mon/orc_knight.png
diff --git a/crawl-ref/source/rltiles/dc-mon/orc_warlord0.png b/crawl-ref/source/rltiles/dc-mon/orc_warlord.png
index 2c553279c3..2c553279c3 100644
--- a/crawl-ref/source/rltiles/dc-mon/orc_warlord0.png
+++ b/crawl-ref/source/rltiles/dc-mon/orc_warlord.png
diff --git a/crawl-ref/source/rltiles/dc-mon/orc_warrior0.png b/crawl-ref/source/rltiles/dc-mon/orc_warrior.png
index 000d05ee55..000d05ee55 100644
--- a/crawl-ref/source/rltiles/dc-mon/orc_warrior0.png
+++ b/crawl-ref/source/rltiles/dc-mon/orc_warrior.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_body_fat.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_body_fat.png
index 4007a59345..4007a59345 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_body_fat.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_body_fat.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_body_fatter.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_body_fatter.png
index f6f6943a8c..f6f6943a8c 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_body_fatter.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_body_fatter.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_body_normal.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_body_normal.png
index f4737c8a66..f4737c8a66 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_body_normal.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_body_normal.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_body_spiked.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_body_spiked.png
index f0a6e4d4c9..f0a6e4d4c9 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_body_spiked.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_body_spiked.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_body_spotty.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_body_spotty.png
index 7b25d402fa..7b25d402fa 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_body_spotty.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_body_spotty.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_body_thin.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_body_thin.png
index def9d4e66d..def9d4e66d 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_body_thin.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_body_thin.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_bird.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_bird.png
index 2084b15b9e..2084b15b9e 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_bird.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_bird.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_cthulhu.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_cthulhu.png
index 3ba3417172..3ba3417172 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_cthulhu.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_cthulhu.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_elephant.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_elephant.png
index e131dfd60f..e131dfd60f 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_elephant.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_elephant.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_eyeball.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_eyeball.png
index ec1f310909..ec1f310909 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_eyeball.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_eyeball.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_heads.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_heads.png
index 5d675aae80..5d675aae80 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_heads.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_heads.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_helmet.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_helmet.png
index da091c8969..da091c8969 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_helmet.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_helmet.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_horns.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_horns.png
index 6776fd32fb..6776fd32fb 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_horns.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_horns.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_horse.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_horse.png
index 75958bff26..75958bff26 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_horse.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_horse.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_medusa.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_medusa.png
index b017586fb8..b017586fb8 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_medusa.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_medusa.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_monkey.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_monkey.png
index 9d04c1e2e6..9d04c1e2e6 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_monkey.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_monkey.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_mouse.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_mouse.png
index 419aa5e311..419aa5e311 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_mouse.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_mouse.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_ram.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_ram.png
index 8eebd42772..8eebd42772 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_ram.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_ram.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_rhino.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_rhino.png
index 77d263b992..77d263b992 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_rhino.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_rhino.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_tentacles.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_tentacles.png
index e3dbc2e644..e3dbc2e644 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_head_tentacles.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_head_tentacles.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_wings_bones.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_wings_bones.png
index ed1aa219a7..ed1aa219a7 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_wings_bones.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_wings_bones.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_wings_butterfly.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_wings_butterfly.png
index dfe49aaf6c..dfe49aaf6c 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_wings_butterfly.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_wings_butterfly.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_wings_demonic.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_wings_demonic.png
index fca04bc114..fca04bc114 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_wings_demonic.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_wings_demonic.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_wings_large.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_wings_large.png
index 2ecf34e18e..2ecf34e18e 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_wings_large.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_wings_large.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_wings_medium.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_wings_medium.png
index 3736a940cd..3736a940cd 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_wings_medium.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_wings_medium.png
diff --git a/crawl-ref/source/rltiles/dc-mon/demon/demon_wings_red.png b/crawl-ref/source/rltiles/dc-mon/panlord/demon_wings_red.png
index 743c4540a1..743c4540a1 100644
--- a/crawl-ref/source/rltiles/dc-mon/demon/demon_wings_red.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/demon_wings_red.png
diff --git a/crawl-ref/source/rltiles/dc-mon/pandemonium_demon.png b/crawl-ref/source/rltiles/dc-mon/panlord/pandemonium_demon.png
index b455f5d01d..b455f5d01d 100644
--- a/crawl-ref/source/rltiles/dc-mon/pandemonium_demon.png
+++ b/crawl-ref/source/rltiles/dc-mon/panlord/pandemonium_demon.png
diff --git a/crawl-ref/source/rltiles/dc-mon/skeletal_warrior0.png b/crawl-ref/source/rltiles/dc-mon/skeletal_warrior.png
index 97e2c41804..97e2c41804 100644
--- a/crawl-ref/source/rltiles/dc-mon/skeletal_warrior0.png
+++ b/crawl-ref/source/rltiles/dc-mon/skeletal_warrior.png
diff --git a/crawl-ref/source/rltiles/dc-mon/vault_guard0.png b/crawl-ref/source/rltiles/dc-mon/vault_guard.png
index 0746bb2dec..0746bb2dec 100644
--- a/crawl-ref/source/rltiles/dc-mon/vault_guard0.png
+++ b/crawl-ref/source/rltiles/dc-mon/vault_guard.png
diff --git a/crawl-ref/source/rltiles/item/armour/centaur_barding_blue.png b/crawl-ref/source/rltiles/item/armour/bardings/centaur_barding_blue.png
index 6a37744b8d..6a37744b8d 100644
--- a/crawl-ref/source/rltiles/item/armour/centaur_barding_blue.png
+++ b/crawl-ref/source/rltiles/item/armour/bardings/centaur_barding_blue.png
diff --git a/crawl-ref/source/rltiles/item/armour/centaur_barding_magenta.png b/crawl-ref/source/rltiles/item/armour/bardings/centaur_barding_magenta.png
index afb44bb273..afb44bb273 100644
--- a/crawl-ref/source/rltiles/item/armour/centaur_barding_magenta.png
+++ b/crawl-ref/source/rltiles/item/armour/bardings/centaur_barding_magenta.png
diff --git a/crawl-ref/source/rltiles/item/armour/centaur_barding_metal.png b/crawl-ref/source/rltiles/item/armour/bardings/centaur_barding_metal.png
index 217af60128..217af60128 100644
--- a/crawl-ref/source/rltiles/item/armour/centaur_barding_metal.png
+++ b/crawl-ref/source/rltiles/item/armour/bardings/centaur_barding_metal.png
diff --git a/crawl-ref/source/rltiles/item/armour/centaur_barding_red.png b/crawl-ref/source/rltiles/item/armour/bardings/centaur_barding_red.png
index 461c7947c6..461c7947c6 100644
--- a/crawl-ref/source/rltiles/item/armour/centaur_barding_red.png
+++ b/crawl-ref/source/rltiles/item/armour/bardings/centaur_barding_red.png
diff --git a/crawl-ref/source/rltiles/item/armour/naga_barding_blue.png b/crawl-ref/source/rltiles/item/armour/bardings/naga_barding_blue.png
index af9c2976d0..af9c2976d0 100644
--- a/crawl-ref/source/rltiles/item/armour/naga_barding_blue.png
+++ b/crawl-ref/source/rltiles/item/armour/bardings/naga_barding_blue.png
diff --git a/crawl-ref/source/rltiles/item/armour/naga_barding_magenta.png b/crawl-ref/source/rltiles/item/armour/bardings/naga_barding_magenta.png
index 98e683a4a1..98e683a4a1 100644
--- a/crawl-ref/source/rltiles/item/armour/naga_barding_magenta.png
+++ b/crawl-ref/source/rltiles/item/armour/bardings/naga_barding_magenta.png
diff --git a/crawl-ref/source/rltiles/item/armour/naga_barding_metal.png b/crawl-ref/source/rltiles/item/armour/bardings/naga_barding_metal.png
index 71f01b7e5c..71f01b7e5c 100644
--- a/crawl-ref/source/rltiles/item/armour/naga_barding_metal.png
+++ b/crawl-ref/source/rltiles/item/armour/bardings/naga_barding_metal.png
diff --git a/crawl-ref/source/rltiles/item/armour/naga_barding_red.png b/crawl-ref/source/rltiles/item/armour/bardings/naga_barding_red.png
index b58c5521b2..b58c5521b2 100644
--- a/crawl-ref/source/rltiles/item/armour/naga_barding_red.png
+++ b/crawl-ref/source/rltiles/item/armour/bardings/naga_barding_red.png
diff --git a/crawl-ref/source/rltiles/item/armour/elven_leather_helm.png b/crawl-ref/source/rltiles/item/armour/headgear/elven_leather_helm.png
index 9f6fcaf475..9f6fcaf475 100644
--- a/crawl-ref/source/rltiles/item/armour/elven_leather_helm.png
+++ b/crawl-ref/source/rltiles/item/armour/headgear/elven_leather_helm.png
diff --git a/crawl-ref/source/rltiles/item/armour/etched_helmet.png b/crawl-ref/source/rltiles/item/armour/headgear/etched_helmet.png
index 7e1a9286ba..7e1a9286ba 100644
--- a/crawl-ref/source/rltiles/item/armour/etched_helmet.png
+++ b/crawl-ref/source/rltiles/item/armour/headgear/etched_helmet.png
diff --git a/crawl-ref/source/rltiles/item/armour/helm3.png b/crawl-ref/source/rltiles/item/armour/headgear/helm3.png
index 886bfe9909..886bfe9909 100644
--- a/crawl-ref/source/rltiles/item/armour/helm3.png
+++ b/crawl-ref/source/rltiles/item/armour/headgear/helm3.png
diff --git a/crawl-ref/source/rltiles/item/armour/helm_visor1.png b/crawl-ref/source/rltiles/item/armour/headgear/helm_visor1.png
index 4365622169..4365622169 100644
--- a/crawl-ref/source/rltiles/item/armour/helm_visor1.png
+++ b/crawl-ref/source/rltiles/item/armour/headgear/helm_visor1.png
diff --git a/crawl-ref/source/rltiles/item/armour/visored_helmet.png b/crawl-ref/source/rltiles/item/armour/headgear/visored_helmet.png
index 95c42bf332..95c42bf332 100644
--- a/crawl-ref/source/rltiles/item/armour/visored_helmet.png
+++ b/crawl-ref/source/rltiles/item/armour/headgear/visored_helmet.png
diff --git a/crawl-ref/source/rltiles/item/armour/wizard_hat.png b/crawl-ref/source/rltiles/item/armour/headgear/wizard_hat.png
index 2a3334f357..2a3334f357 100644
--- a/crawl-ref/source/rltiles/item/armour/wizard_hat.png
+++ b/crawl-ref/source/rltiles/item/armour/headgear/wizard_hat.png
diff --git a/crawl-ref/source/rltiles/item/armour/wizard_hat2.png b/crawl-ref/source/rltiles/item/armour/headgear/wizard_hat2.png
index 2a37b4d47b..2a37b4d47b 100644
--- a/crawl-ref/source/rltiles/item/armour/wizard_hat2.png
+++ b/crawl-ref/source/rltiles/item/armour/headgear/wizard_hat2.png
diff --git a/crawl-ref/source/rltiles/item/armour/buckler.png b/crawl-ref/source/rltiles/item/armour/shields/buckler.png
index b66db87c8e..b66db87c8e 100644
--- a/crawl-ref/source/rltiles/item/armour/buckler.png
+++ b/crawl-ref/source/rltiles/item/armour/shields/buckler.png
diff --git a/crawl-ref/source/rltiles/item/armour/buckler2.png b/crawl-ref/source/rltiles/item/armour/shields/buckler2.png
index 4dccc433ed..4dccc433ed 100644
--- a/crawl-ref/source/rltiles/item/armour/buckler2.png
+++ b/crawl-ref/source/rltiles/item/armour/shields/buckler2.png
diff --git a/crawl-ref/source/rltiles/item/armour/buckler3.png b/crawl-ref/source/rltiles/item/armour/shields/buckler3.png
index 79a2eec666..79a2eec666 100644
--- a/crawl-ref/source/rltiles/item/armour/buckler3.png
+++ b/crawl-ref/source/rltiles/item/armour/shields/buckler3.png
diff --git a/crawl-ref/source/rltiles/item/armour/elven_shield.png b/crawl-ref/source/rltiles/item/armour/shields/elven_shield.png
index 0c58604e12..0c58604e12 100644
--- a/crawl-ref/source/rltiles/item/armour/elven_shield.png
+++ b/crawl-ref/source/rltiles/item/armour/shields/elven_shield.png
diff --git a/crawl-ref/source/rltiles/item/armour/large_shield.png b/crawl-ref/source/rltiles/item/armour/shields/large_shield.png
index 6b09465f66..6b09465f66 100644
--- a/crawl-ref/source/rltiles/item/armour/large_shield.png
+++ b/crawl-ref/source/rltiles/item/armour/shields/large_shield.png
diff --git a/crawl-ref/source/rltiles/item/armour/shield_kite2.png b/crawl-ref/source/rltiles/item/armour/shields/shield_kite2.png
index 10945d6503..10945d6503 100644
--- a/crawl-ref/source/rltiles/item/armour/shield_kite2.png
+++ b/crawl-ref/source/rltiles/item/armour/shields/shield_kite2.png
diff --git a/crawl-ref/source/rltiles/item/armour/shield_kite3.png b/crawl-ref/source/rltiles/item/armour/shields/shield_kite3.png
index 51ce9eeafc..51ce9eeafc 100644
--- a/crawl-ref/source/rltiles/item/armour/shield_kite3.png
+++ b/crawl-ref/source/rltiles/item/armour/shields/shield_kite3.png
diff --git a/crawl-ref/source/rltiles/item/armour/shield_large2.png b/crawl-ref/source/rltiles/item/armour/shields/shield_large2.png
index 63f39f432c..63f39f432c 100644
--- a/crawl-ref/source/rltiles/item/armour/shield_large2.png
+++ b/crawl-ref/source/rltiles/item/armour/shields/shield_large2.png
diff --git a/crawl-ref/source/rltiles/item/armour/shield_round2.png b/crawl-ref/source/rltiles/item/armour/shields/shield_round2.png
index 512f1c5293..512f1c5293 100644
--- a/crawl-ref/source/rltiles/item/armour/shield_round2.png
+++ b/crawl-ref/source/rltiles/item/armour/shields/shield_round2.png
diff --git a/crawl-ref/source/rltiles/item/food/tripe_ration.png b/crawl-ref/source/rltiles/item/food/meat_ration.png
index 23f6af539b..23f6af539b 100644
--- a/crawl-ref/source/rltiles/item/food/tripe_ration.png
+++ b/crawl-ref/source/rltiles/item/food/meat_ration.png
diff --git a/crawl-ref/source/rltiles/item/potion/i-heal-wounds.bmp2 b/crawl-ref/source/rltiles/item/potion/i-heal-wounds.bmp2
deleted file mode 100755
index bddbcc4f74..0000000000
--- a/crawl-ref/source/rltiles/item/potion/i-heal-wounds.bmp2
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/potion/i-levitation.bmp2 b/crawl-ref/source/rltiles/item/potion/i-levitation.bmp2
deleted file mode 100755
index 6ea0fe7b06..0000000000
--- a/crawl-ref/source/rltiles/item/potion/i-levitation.bmp2
+++ /dev/null
diff --git a/crawl-ref/source/rltiles/item/weapon/ya.png b/crawl-ref/source/rltiles/item/weapon/arrow.png
index ac56cc0aba..ac56cc0aba 100644
--- a/crawl-ref/source/rltiles/item/weapon/ya.png
+++ b/crawl-ref/source/rltiles/item/weapon/arrow.png
diff --git a/crawl-ref/source/tilepick.cc b/crawl-ref/source/tilepick.cc
index 4078b8b118..ff9ff40bf8 100644
--- a/crawl-ref/source/tilepick.cc
+++ b/crawl-ref/source/tilepick.cc
@@ -998,21 +998,13 @@ int tileidx_monster(const monsters *mons, bool detected)
         ch |= TILE_FLAG_POISON;
 
     if (mons_friendly(mons))
-    {
         ch |= TILE_FLAG_PET;
-    }
     else if (mons_neutral(mons))
-    {
         ch |= TILE_FLAG_NEUTRAL;
-    }
     else if (mons_looks_stabbable(mons))
-    {
         ch |= TILE_FLAG_STAB;
-    }
     else if (mons_looks_distracted(mons))
-    {
         ch |= TILE_FLAG_MAY_STAB;
-    }
 
     std::string damage_desc;
     mon_dam_level_type damage_level;