diff --git a/editor/picks/TownStaff b/editor/picks/TownStaff
index 688525a8e..3881e680e 100644
--- a/editor/picks/TownStaff
+++ b/editor/picks/TownStaff
@@ -50,259 +50,62 @@ y 5
 end
 arch inn
 end
-More
-arch inn_2
-end
 arch house_long
 y 1
 end
-More
-arch house_long_2
-y 1
-end
 arch farmhouse
 y 2
 end
-More
-arch farmhouse_2
-y 2
-end
 arch barrack_long
 y 3
 end
-More
-arch barrack_long_2
-y 3
-end
 arch barn
 y 4
 end
-More
-arch barn_2
-y 4
-end
-More
-arch barn_3
-y 5
-end
-More
-arch barn_4
-y 5
-end
 arch church
 y 6
 end
-More
-arch church_2
-y 6
-end
-More
-arch church_3
-y 7
-end
-More
-arch church_4
-y 7
-end
 arch courthouse
 y 8
 end
-More
-arch courthouse_2
-y 8
-end
-More
-arch courthouse_3
-y 9
-end
-More
-arch courthouse_4
-y 9
-end
 arch store_general
 y 10
 end
-More
-arch store_general_2
-y 10
-end
-More
-arch store_general_3
-y 11
-end
-More
-arch store_general_4
-y 11
-end
 arch store_armour
 y 12
 end
-More
-arch store_armour_2
-y 12
-end
-More
-arch store_armour_3
-y 13
-end
-More
-arch store_armour_4
-y 13
-end
 arch big_galleon
 y 14
 end
-More
-arch big_galleon_2
-y 14
-end
-More
-arch big_galleon_3
-y 15
-end
-More
-arch big_galleon_4
-y 15
-end
 arch city_tower
 x 2
 y 4
 end
-More
-arch city_tower_2
-x 2
-y 5
-end
 arch guild
 x 2
 y 6
 end
-More
-arch guild_2
-x 3
-y 6
-end
-More
-arch guild_3
-x 2
-y 7
-end
-More
-arch guild_4
-x 3
-y 7
-end
 arch prison
 x 2
 y 8
 end
-More
-arch prison_2
-x 3
-y 8
-end
-More
-arch prison_3
-x 2
-y 9
-end
-More
-arch prison_4
-x 3
-y 9
-end
 arch store_weapons
 x 2
 y 10
 end
-More
-arch store_weapons_2
-x 3
-y 10
-end
-More
-arch store_weapons_3
-x 2
-y 11
-end
-More
-arch store_weapons_4
-x 3
-y 11
-end
 arch store_magic
 x 2
 y 12
 end
-More
-arch store_magic_2
-x 3
-y 12
-end
-More
-arch store_magic_3
-x 2
-y 13
-end
-More
-arch store_magic_4
-x 3
-y 13
-end
 arch fort
 x 4
 y 6
 end
-More
-arch fort_2
-x 5
-y 6
-end
-More
-arch fort_3
-x 4
-y 7
-end
-More
-arch fort_4
-x 5
-y 7
-end
 arch keep
 x 4
 y 8
 end
-More
-arch keep_2
-x 5
-y 8
-end
-More
-arch keep_3
-x 4
-y 9
-end
-More
-arch keep_4
-x 5
-y 9
-end
 arch store_alchemy
 x 4
 y 10
 end
-More
-arch store_alchemy_2
-x 5
-y 10
-end
-More
-arch store_alchemy_3
-x 4
-y 11
-end
-More
-arch store_alchemy_4
-x 5
-y 11
-end
diff --git a/editor/picks/alltown b/editor/picks/alltown
index be7d7c919..f930ead4a 100644
--- a/editor/picks/alltown
+++ b/editor/picks/alltown
@@ -117,939 +117,155 @@ end
 arch inn
 y 2
 end
-More
-arch inn_2
-y 2
-end
 arch house_long
 y 3
 end
-More
-arch house_long_2
-y 3
-end
 arch farmhouse
 y 4
 end
-More
-arch farmhouse_2
-y 4
-end
 arch barn
 y 5
 end
-More
-arch barn_2
-y 5
-end
-More
-arch barn_3
-y 6
-end
-More
-arch barn_4
-y 6
-end
 arch prison
 y 7
 end
-More
-arch prison_2
-y 7
-end
-More
-arch prison_3
-y 8
-end
-More
-arch prison_4
-y 8
-end
 arch keep
 y 9
 end
-More
-arch keep_2
-y 9
-end
-More
-arch keep_3
-y 10
-end
-More
-arch keep_4
-y 10
-end
 arch fort
 y 11
 end
-More
-arch fort_2
-y 11
-end
-More
-arch fort_3
-y 12
-end
-More
-arch fort_4
-y 12
-end
 arch store_alchemy
 y 13
 end
-More
-arch store_alchemy_2
-y 13
-end
-More
-arch store_alchemy_3
-y 14
-end
-More
-arch store_alchemy_4
-y 14
-end
 arch house_up
 x 2
 y 2
 end
-More
-arch house_up_2
-x 2
-y 3
-end
 arch guild
 x 2
 y 5
 end
-More
-arch guild_2
-x 3
-y 5
-end
-More
-arch guild_3
-x 2
-y 6
-end
-More
-arch guild_4
-x 3
-y 6
-end
 arch courthouse
 x 2
 y 7
 end
-More
-arch courthouse_2
-x 3
-y 7
-end
-More
-arch courthouse_3
-x 2
-y 8
-end
-More
-arch courthouse_4
-x 3
-y 8
-end
 arch t_house2
 x 2
 y 9
 end
-More
-arch t_house2_2
-x 3
-y 9
-end
-More
-arch t_house2_3
-x 2
-y 10
-end
-More
-arch t_house2_4
-x 3
-y 10
-end
 arch hovels2
 x 2
 y 11
 end
-More
-arch hovels2_2
-x 3
-y 11
-end
-More
-arch hovels2_3
-x 2
-y 12
-end
-More
-arch hovels2_4
-x 3
-y 12
-end
 arch store_general
 x 2
 y 13
 end
-More
-arch store_general_2
-x 3
-y 13
-end
-More
-arch store_general_3
-x 2
-y 14
-end
-More
-arch store_general_4
-x 3
-y 14
-end
 arch barrack_up
 x 3
 y 2
 end
-More
-arch barrack_up_2
-x 3
-y 3
-end
 arch barrack_long
 x 4
 y 2
 end
-More
-arch barrack_long_2
-x 5
-y 2
-end
 arch house_largish
 x 4
 y 3
 end
-More
-arch house_largish_2
-x 5
-y 3
-end
 arch church
 x 4
 y 5
 end
-More
-arch church_2
-x 5
-y 5
-end
-More
-arch church_3
-x 4
-y 6
-end
-More
-arch church_4
-x 5
-y 6
-end
 arch t_house1
 x 4
 y 7
 end
-More
-arch t_house1_2
-x 5
-y 7
-end
-More
-arch t_house1_3
-x 4
-y 8
-end
-More
-arch t_house1_4
-x 5
-y 8
-end
 arch rl_house2
 x 4
 y 9
 end
-More
-arch rl_house2_2
-x 5
-y 9
-end
-More
-arch rl_house2_3
-x 4
-y 10
-end
-More
-arch rl_house2_4
-x 5
-y 10
-end
 arch rl_house1
 x 4
 y 11
 end
-More
-arch rl_house1_2
-x 5
-y 11
-end
-More
-arch rl_house1_3
-x 4
-y 12
-end
-More
-arch rl_house1_4
-x 5
-y 12
-end
 arch store_weapons
 x 4
 y 13
 end
-More
-arch store_weapons_2
-x 5
-y 13
-end
-More
-arch store_weapons_3
-x 4
-y 14
-end
-More
-arch store_weapons_4
-x 5
-y 14
-end
 arch collesium
 x 6
 y 2
 end
-More
-arch collesium_2
-x 7
-y 2
-end
-More
-arch collesium_3
-x 8
-y 2
-end
-More
-arch collesium_4
-x 9
-y 2
-end
-More
-arch collesium_5
-x 10
-y 2
-end
-More
-arch collesium_6
-x 6
-y 3
-end
-More
-arch collesium_7
-x 7
-y 3
-end
-More
-arch collesium_8
-x 8
-y 3
-end
-More
-arch collesium_9
-x 9
-y 3
-end
-More
-arch collesium_10
-x 10
-y 3
-end
-More
-arch collesium_11
-x 6
-y 4
-end
-More
-arch collesium_12
-x 7
-y 4
-end
-More
-arch collesium_13
-x 8
-y 4
-end
-More
-arch collesium_14
-x 9
-y 4
-end
-More
-arch collesium_15
-x 10
-y 4
-end
 arch castle_a
 x 6
 y 5
 end
-More
-arch castle_b
-x 7
-y 5
-end
-More
-arch castle_c
-x 6
-y 6
-end
-More
-arch castle_d
-x 7
-y 6
-end
 arch rl_house3
 x 6
 y 9
 end
-More
-arch rl_house3_2
-x 7
-y 9
-end
-More
-arch rl_house3_3
-x 6
-y 10
-end
-More
-arch rl_house3_4
-x 7
-y 10
-end
 arch slum1
 x 6
 y 11
 end
-More
-arch slum1_2
-x 6
-y 12
-end
 arch store_armour
 x 6
 y 13
 end
-More
-arch store_armour_2
-x 7
-y 13
-end
-More
-arch store_armour_3
-x 6
-y 14
-end
-More
-arch store_armour_4
-x 7
-y 14
-end
 arch slum2
 x 7
 y 11
 end
-More
-arch slum2_2
-x 7
-y 12
-end
 arch s_tower1
 x 8
 end
-More
-arch s_tower1_2
-x 8
-end
 arch a_civic
 x 8
 y 8
 end
-More
-arch a_civic_2
-x 9
-y 8
-end
-More
-arch a_civic_3
-x 10
-y 8
-end
-More
-arch a_civic_4
-x 8
-y 9
-end
-More
-arch a_civic_5
-x 9
-y 9
-end
-More
-arch a_civic_6
-x 10
-y 9
-end
-More
-arch a_civic_7
-x 8
-y 10
-end
-More
-arch a_civic_8
-x 9
-y 10
-end
-More
-arch a_civic_9
-x 10
-y 10
-end
 arch slum3
 x 8
 y 11
 end
-More
-arch slum3_2
-x 8
-y 12
-end
 arch store_magic
 x 8
 y 13
 end
-More
-arch store_magic_2
-x 9
-y 13
-end
-More
-arch store_magic_3
-x 8
-y 14
-end
-More
-arch store_magic_4
-x 9
-y 14
-end
 arch s_tower2
 x 9
 end
-More
-arch s_tower2_2
-x 9
-end
 arch stronghold
 x 9
 y 5
 end
-More
-arch stronghold_2
-x 10
-y 5
-end
-More
-arch stronghold_3
-x 11
-y 5
-end
-More
-arch stronghold_4
-x 9
-y 6
-end
-More
-arch stronghold_5
-x 10
-y 6
-end
-More
-arch stronghold_6
-x 11
-y 6
-end
-More
-arch stronghold_7
-x 9
-y 7
-end
-More
-arch stronghold_8
-x 10
-y 7
-end
-More
-arch stronghold_9
-x 11
-y 7
-end
 arch temple1
 x 9
 y 11
 end
-More
-arch temple1_2
-x 10
-y 11
-end
-More
-arch temple1_3
-x 9
-y 12
-end
-More
-arch temple1_4
-x 10
-y 12
-end
 arch tower_a
 x 10
 end
-More
-arch tower_b
-x 10
-end
 arch city_tower
 x 11
 end
-More
-arch city_tower_2
-x 11
-end
 arch palace
 x 11
 y 9
 end
-More
-arch palace_2
-x 12
-y 9
-end
-More
-arch palace_3
-x 13
-y 9
-end
-More
-arch palace_4
-x 14
-y 9
-end
-More
-arch palace_5
-x 15
-y 9
-end
-More
-arch palace_6
-x 11
-y 10
-end
-More
-arch palace_7
-x 12
-y 10
-end
-More
-arch palace_8
-x 13
-y 10
-end
-More
-arch palace_9
-x 14
-y 10
-end
-More
-arch palace_10
-x 15
-y 10
-end
-More
-arch palace_11
-x 11
-y 11
-end
-More
-arch palace_12
-x 12
-y 11
-end
-More
-arch palace_13
-x 13
-y 11
-end
-More
-arch palace_14
-x 14
-y 11
-end
-More
-arch palace_15
-x 15
-y 11
-end
 arch l_shop1
 x 11
 y 13
 end
-More
-arch l_shop1_2
-x 12
-y 13
-end
-More
-arch l_shop1_3
-x 11
-y 14
-end
-More
-arch l_shop1_4
-x 12
-y 14
-end
 arch university
 x 12
 end
-More
-arch university_2
-x 13
-end
-More
-arch university_3
-x 14
-end
-More
-arch university_4
-x 15
-end
-More
-arch university_5
-x 16
-end
-More
-arch university_6
-x 12
-end
-More
-arch university_7
-x 13
-end
-More
-arch university_8
-x 14
-end
-More
-arch university_9
-x 15
-end
-More
-arch university_10
-x 16
-end
-More
-arch university_11
-x 12
-end
-More
-arch university_12
-x 13
-end
-More
-arch university_13
-x 14
-end
-More
-arch university_14
-x 15
-end
-More
-arch university_15
-x 16
-end
-More
-arch university_16
-x 12
-end
-More
-arch university_17
-x 13
-end
-More
-arch university_18
-x 14
-end
-More
-arch university_19
-x 15
-end
-More
-arch university_20
-x 16
-end
 arch cathedral
 x 12
 y 4
 end
-More
-arch cathedral_2
-x 13
-y 4
-end
-More
-arch cathedral_3
-x 14
-y 4
-end
-More
-arch cathedral_4
-x 12
-y 5
-end
-More
-arch cathedral_5
-x 13
-y 5
-end
-More
-arch cathedral_6
-x 14
-y 5
-end
-More
-arch cathedral_7
-x 12
-y 6
-end
-More
-arch cathedral_8
-x 13
-y 6
-end
-More
-arch cathedral_9
-x 14
-y 6
-end
-More
-arch cathedral_10
-x 12
-y 7
-end
-More
-arch cathedral_11
-x 13
-y 7
-end
-More
-arch cathedral_12
-x 14
-y 7
-end
 arch darkhold
 x 15
 y 4
 end
-More
-arch darkhold_2
-x 16
-y 4
-end
-More
-arch darkhold_3
-x 17
-y 4
-end
-More
-arch darkhold_4
-x 15
-y 5
-end
-More
-arch darkhold_5
-x 16
-y 5
-end
-More
-arch darkhold_6
-x 17
-y 5
-end
-More
-arch darkhold_7
-x 15
-y 6
-end
-More
-arch darkhold_8
-x 16
-y 6
-end
-More
-arch darkhold_9
-x 17
-y 6
-end
-More
-arch darkhold_10
-x 15
-y 7
-end
-More
-arch darkhold_11
-x 16
-y 7
-end
-More
-arch darkhold_12
-x 17
-y 7
-end
-More
-arch darkhold_13
-x 15
-y 8
-end
-More
-arch darkhold_14
-x 16
-y 8
-end
-More
-arch darkhold_15
-x 17
-y 8
-end
diff --git a/editor/picks/exits b/editor/picks/exits
index 84c39d6da..72146dc28 100644
--- a/editor/picks/exits
+++ b/editor/picks/exits
@@ -227,43 +227,3 @@ arch pentagram_111
 x 5
 y 6
 end
-More
-arch pentagram_112
-x 6
-y 6
-end
-More
-arch pentagram_113
-x 7
-y 6
-end
-More
-arch pentagram_121
-x 5
-y 7
-end
-More
-arch pentagram_122
-x 6
-y 7
-end
-More
-arch pentagram_123
-x 7
-y 7
-end
-More
-arch pentagram_131
-x 5
-y 8
-end
-More
-arch pentagram_132
-x 6
-y 8
-end
-More
-arch pentagram_133
-x 7
-y 8
-end
diff --git a/editor/picks/monsters b/editor/picks/monsters
index 9f6d0d516..528d59093 100644
--- a/editor/picks/monsters
+++ b/editor/picks/monsters
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Fri Apr 15 15:20:44 1994
 endmsg
-x 6
-y 27
+width 6
+height 27
 end
 arch kobold
 end
@@ -391,212 +391,34 @@ end
 arch behemoth
 y 20
 end
-More
-arch behemoth_2
-y 20
-end
-More
-arch behemoth_3
-y 21
-end
-More
-arch behemoth_4
-y 21
-end
 arch troll
 y 22
 end
-More
-arch troll_2
-y 22
-end
-More
-arch troll_3
-y 23
-end
-More
-arch troll_4
-y 23
-end
 arch titan
 x 1
 y 25
 end
-More
-arch titan_2
-x 0
-y 25
-end
-More
-arch titan_3
-x 0
-y 24
-end
-More
-arch titan_4
-x 1
-y 24
-end
-More
-arch titan_5
-x 2
-y 24
-end
-More
-arch titan_6
-x 2
-y 25
-end
-More
-arch titan_7
-x 2
-y 26
-end
-More
-arch titan_8
-x 1
-y 26
-end
-More
-arch titan_9
-x 0
-y 26
-end
 arch dread
 x 2
 y 20
 end
-More
-arch dread_2
-x 3
-y 20
-end
-More
-arch dread_3
-x 2
-y 21
-end
-More
-arch dread_4
-x 3
-y 21
-end
 arch big_dragon
 x 2
 y 22
 end
-More
-arch big_dragon_2
-x 3
-y 22
-end
-More
-arch big_dragon_3
-x 4
-y 22
-end
-More
-arch big_dragon_4
-x 2
-y 23
-end
-More
-arch big_dragon_5
-x 3
-y 23
-end
-More
-arch big_dragon_6
-x 4
-y 23
-end
 arch cobra
 x 3
 y 9
 end
-More
-arch cobra_2
-x 3
-y 10
-end
 arch big_wiz
 x 3
 y 24
 end
-More
-arch big_wiz2
-x 4
-y 24
-end
-More
-arch big_wiz3
-x 5
-y 24
-end
-More
-arch big_wiz4
-x 3
-y 25
-end
-More
-arch big_wiz5
-x 4
-y 25
-end
-More
-arch big_wiz6
-x 5
-y 25
-end
-More
-arch big_wiz7
-x 3
-y 26
-end
-More
-arch big_wiz8
-x 4
-y 26
-end
-More
-arch big_wiz9
-x 5
-y 26
-end
 arch giant
 x 4
 y 18
 end
-More
-arch giant_2
-x 4
-y 19
-end
 arch dragon
 x 4
 y 20
 end
-More
-arch dragon_2
-x 5
-y 20
-end
-arch chinese_dragon
-x 4
-y 21
-end
-More
-arch chinese_dragon_2
-x 5
-y 21
-end
-More
-arch chinese_dragon_3
-x 4
-y 22
-end
-More
-arch chinese_dragon_4
-x 5
-y 22
-end
diff --git a/editor/picks/monsters2 b/editor/picks/monsters2
index 05bf4d935..1ca13af5b 100644
--- a/editor/picks/monsters2
+++ b/editor/picks/monsters2
@@ -5,113 +5,113 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Tue Jun 24 11:19:39 1997
 endmsg
-x 21
-y 30
+width 21
+height 30
 end
 arch barbarian
+type 0
 hp 100
 maxhp 100
-type 0
 randomitems standard
 monster 1
 unaggressive 1
 end
 arch cleric
+type 0
 hp 100
 maxhp 100
-y 1
-type 0
 randomitems standard
 monster 1
 unaggressive 1
+y 1
 end
 arch elf
+type 0
 hp 100
 maxhp 100
-y 2
-type 0
 randomitems standard
 monster 1
 unaggressive 1
+y 2
 end
 arch fireborn
+type 0
 hp 100
 maxhp 100
-y 3
-type 0
 randomitems standard
 monster 1
 unaggressive 1
+y 3
 end
 arch human
+type 0
 hp 100
 maxhp 100
-y 4
-type 0
 randomitems standard
 monster 1
 unaggressive 1
+y 4
 end
 arch mage
+type 0
 hp 100
 maxhp 100
-y 5
-type 0
 randomitems standard
 monster 1
 unaggressive 1
+y 5
 end
 arch ninja
+type 0
 hp 100
 maxhp 100
-y 6
-type 0
 monster 1
 unaggressive 1
+y 6
 end
 arch priest
+type 0
 hp 100
 maxhp 100
-y 7
-type 0
 randomitems standard
 monster 1
 unaggressive 1
+y 7
 end
 arch swashbuckler
+type 0
 hp 100
 maxhp 100
-y 8
-type 0
 randomitems standard
 monster 1
 unaggressive 1
+y 8
 end
 arch thief
+type 0
 hp 100
 maxhp 100
+monster 1
+unaggressive 1
 y 9
+end
+arch viking
 type 0
 monster 1
 unaggressive 1
-end
-arch viking
 y 10
-type 0
-monster 1
-unaggressive 1
 end
 arch viking
-y 11
 type 0
 monster 1
 unaggressive 1
+y 11
 end
 arch wizard
-y 12
 type 0
 monster 1
 unaggressive 1
+y 12
 end
 arch conjurer
 y 13
@@ -544,10 +544,6 @@ arch mesangel
 x 8
 y 17
 end
-arch Arch Angel
-x 8
-y 18
-end
 arch fire_elemental
 x 9
 y 17
@@ -859,6 +855,10 @@ arch sandy
 x 19
 y 18
 end
+arch dire_wolf
+x 19
+y 21
+end
 arch chess_pawn
 x 19
 y 25
@@ -887,6 +887,14 @@ arch serp_priest
 x 20
 y 2
 end
+arch mastif
+x 20
+y 18
+end
+arch wolf
+x 20
+y 21
+end
 arch chess_queen
 x 20
 y 25
@@ -910,1224 +918,170 @@ end
 arch ent
 y 14
 end
-More
-arch ent_2
-y 14
-end
-More
-arch ent_3
-y 15
-end
-More
-arch ent_4
-y 15
-end
 arch big_demon
 y 18
 end
-More
-arch big_demon_2
-y 18
-end
-More
-arch big_demon_3
-y 18
-end
-More
-arch big_demon_4
-y 19
-end
-More
-arch big_demon_5
-y 19
-end
-More
-arch big_demon_6
-y 19
-end
-More
-arch big_demon_7
-y 20
-end
-More
-arch big_demon_8
-y 20
-end
-More
-arch big_demon_9
-y 20
-end
-More
-arch big_demon_A
-y 21
-end
-More
-arch big_demon_B
-y 21
-end
-More
-arch big_demon_C
-y 21
-end
 arch demon_lord
 x 1
 y 25
 end
-More
-arch demon_lord_1
-x 0
-y 22
-end
-More
-arch demon_lord_2
-x 1
-y 22
-end
-More
-arch demon_lord_3
-x 2
-y 22
-end
-More
-arch demon_lord_4
-x 3
-y 22
-end
-More
-arch demon_lord_5
-x 0
-y 23
-end
-More
-arch demon_lord_6
-x 1
-y 23
-end
-More
-arch demon_lord_7
-x 2
-y 23
-end
-More
-arch demon_lord_8
-x 3
-y 23
-end
-More
-arch demon_lord_9
-x 0
-y 24
-end
-More
-arch demon_lord_10
-x 1
-y 24
-end
-More
-arch demon_lord_11
-x 2
-y 24
-end
-More
-arch demon_lord_12
-x 3
-y 24
-end
-More
-arch demon_lord_13
-x 0
-y 25
-end
-More
-arch demon_lord_15
-x 2
-y 25
-end
-More
-arch demon_lord_16
-x 3
-y 25
-end
-More
-arch demon_lord_17
-x 0
-y 26
-end
-More
-arch demon_lord_18
-x 1
-y 26
-end
-More
-arch demon_lord_19
-x 2
-y 26
-end
-More
-arch demon_lord_20
-x 3
-y 26
-end
-More
-arch demon_lord_21
-x 0
-y 27
-end
-More
-arch demon_lord_22
-x 1
-y 27
-end
-More
-arch demon_lord_23
-x 2
-y 27
-end
-More
-arch demon_lord_24
-x 3
-y 27
-end
-More
-arch demon_lord_25
-x 0
-y 28
-end
-More
-arch demon_lord_26
-x 1
-y 28
-end
-More
-arch demon_lord_27
-x 2
-y 28
-end
-More
-arch demon_lord_28
-x 3
-y 28
-end
-More
-arch demon_lord_29
-x 0
-y 29
-end
-More
-arch demon_lord_30
-x 1
-y 29
-end
-More
-arch demon_lord_31
-x 2
-y 29
-end
-More
-arch demon_lord_32
-x 3
-y 29
-end
 arch Balrog
 x 3
 y 18
 end
-More
-arch Balrog_2
-x 4
-y 18
-end
-More
-arch Balrog_3
-x 5
-y 18
-end
-More
-arch Balrog_4
-x 6
-y 18
-end
-More
-arch Balrog_5
-x 3
-y 19
-end
-More
-arch Balrog_6
-x 4
-y 19
-end
-More
-arch Balrog_7
-x 5
-y 19
-end
-More
-arch Balrog_8
-x 6
-y 19
-end
-More
-arch Balrog_9
-x 3
-y 20
-end
-More
-arch Balrog_10
-x 4
-y 20
-end
-More
-arch Balrog_11
-x 5
-y 20
-end
-More
-arch Balrog_12
-x 6
-y 20
-end
-More
-arch Balrog_13
-x 3
-y 21
-end
-More
-arch Balrog_14
-x 4
-y 21
-end
-More
-arch Balrog_15
-x 5
-y 21
-end
-More
-arch Balrog_16
-x 6
-y 21
-end
 arch g_worm
 x 4
 y 11
 end
-More
-arch g_worm_2
-x 5
-y 11
-end
-More
-arch g_worm_3
-x 4
-y 12
-end
-More
-arch g_worm_4
-x 5
-y 12
-end
 arch Greater_Demon
 x 4
 y 22
 end
-More
-arch Greater_Demon_1
-x 5
-y 22
-end
-More
-arch Greater_Demon_2
-x 6
-y 22
-end
-More
-arch Greater_Demon_3
-x 7
-y 22
-end
-More
-arch Greater_Demon_4
-x 8
-y 22
-end
-More
-arch Greater_Demon_5
-x 9
-y 22
-end
-More
-arch Greater_Demon_6
-x 4
-y 23
-end
-More
-arch Greater_Demon_7
-x 5
-y 23
-end
-More
-arch Greater_Demon_8
-x 6
-y 23
-end
-More
-arch Greater_Demon_9
-x 7
-y 23
-end
-More
-arch Greater_Demon_A
-x 8
-y 23
-end
-More
-arch Greater_Demon_B
-x 9
-y 23
-end
-More
-arch Greater_Demon_C
-x 4
-y 24
-end
-More
-arch Greater_Demon_D
-x 5
-y 24
-end
-More
-arch Greater_Demon_E
-x 6
-y 24
-end
-More
-arch Greater_Demon_F
-x 7
-y 24
-end
-More
-arch Greater_Demon_G
-x 8
-y 24
-end
-More
-arch Greater_Demon_H
-x 9
-y 24
-end
-More
-arch Greater_Demon_I
-x 4
-y 25
-end
-More
-arch Greater_Demon_J
-x 5
-y 25
-end
-More
-arch Greater_Demon_K
-x 6
-y 25
-end
-More
-arch Greater_Demon_L
-x 7
-y 25
-end
-More
-arch Greater_Demon_M
-x 8
-y 25
-end
-More
-arch Greater_Demon_N
-x 9
-y 25
-end
-More
-arch Greater_Demon_O
-x 4
-y 26
-end
-More
-arch Greater_Demon_P
-x 5
-y 26
-end
-More
-arch Greater_Demon_Q
-x 6
-y 26
-end
-More
-arch Greater_Demon_R
-x 7
-y 26
-end
-More
-arch Greater_Demon_S
-x 8
-y 26
-end
-More
-arch Greater_Demon_T
-x 9
-y 26
-end
-More
-arch Greater_Demon_U
-x 4
-y 27
-end
-More
-arch Greater_Demon_V
-x 5
-y 27
-end
-More
-arch Greater_Demon_W
-x 6
-y 27
-end
-More
-arch Greater_Demon_X
-x 7
-y 27
-end
-More
-arch Greater_Demon_Y
-x 8
-y 27
-end
-More
-arch Greater_Demon_Z
-x 9
-y 27
-end
-More
-arch Greater_Demon_a
-x 4
-y 28
-end
-More
-arch Greater_Demon_b
-x 5
-y 28
-end
-More
-arch Greater_Demon_c
-x 6
-y 28
-end
-More
-arch Greater_Demon_d
-x 7
-y 28
-end
-More
-arch Greater_Demon_e
-x 8
-y 28
-end
-More
-arch Greater_Demon_f
-x 9
-y 28
-end
 arch lamia
 x 5
 y 14
 end
-More
-arch lamia_2
-x 6
-y 14
-end
 arch troll
 x 8
 end
-More
-arch troll_2
-x 9
-end
-More
-arch troll_3
-x 8
-end
-More
-arch troll_4
-x 9
-end
 arch gaelotroll
 x 8
 y 2
 end
-More
-arch gaelotroll_2
-x 9
-y 2
-end
-More
-arch gaelotroll_3
-x 8
-y 3
-end
-More
-arch gaelotroll_4
-x 9
-y 3
-end
-More
-arch gaelotroll_5
-x 8
-y 4
-end
-More
-arch gaelotroll_6
-x 9
-y 4
-end
 arch big_wiz
 x 8
 y 10
 end
-More
-arch big_wiz2
-x 9
-y 10
-end
-More
-arch big_wiz3
-x 10
-y 10
-end
-More
-arch big_wiz4
-x 8
-y 11
-end
-More
-arch big_wiz5
-x 9
-y 11
-end
-More
-arch big_wiz6
-x 10
-y 11
-end
-More
-arch big_wiz7
-x 8
-y 12
-end
-More
-arch big_wiz8
-x 9
-y 12
-end
-More
-arch big_wiz9
-x 10
-y 12
-end
 arch byakie
 x 8
 y 14
 end
-More
-arch byakie_2
-x 9
-y 14
-end
-More
-arch byakie_3
-x 8
-y 15
-end
-More
-arch byakie_4
-x 9
-y 15
-end
 arch giant
 x 9
 y 5
 end
-More
-arch giant_2
-x 9
-y 6
-end
 arch titan
 x 9
 y 8
 end
-More
-arch titan_2
-x 8
-y 8
-end
-More
-arch titan_3
-x 8
-y 7
-end
-More
-arch titan_4
-x 9
-y 7
-end
-More
-arch titan_5
-x 10
-y 7
-end
-More
-arch titan_6
-x 10
-y 8
-end
-More
-arch titan_7
-x 10
-y 9
-end
-More
-arch titan_8
-x 9
-y 9
-end
-More
-arch titan_9
-x 8
-y 9
-end
 arch minor_djinn
 x 10
 end
-More
-arch minor_djinn_2
-x 10
-end
 arch djinn
 x 10
 y 2
 end
-More
-arch djinn_2
-x 10
-y 3
-end
 arch dragonman
 x 10
 y 4
 end
-More
-arch dragonman_2
-x 10
-y 5
-end
 arch cyclops
 x 10
 y 14
 end
-More
-arch cyclops_2
-x 11
-y 14
-end
-More
-arch cyclops_3
-x 10
-y 15
-end
-More
-arch cyclops_4
-x 11
-y 15
-end
-More
-arch cyclops_5
-x 10
-y 16
-end
-More
-arch cyclops_6
-x 11
-y 16
-end
 arch dragon
 x 11
 y 2
 end
-More
-arch dragon_2
-x 12
-y 2
-end
 arch chinese_dragon
 x 11
 y 3
 end
-More
-arch chinese_dragon_2
-x 12
-y 3
-end
-More
-arch chinese_dragon_3
-x 11
-y 4
-end
-More
-arch chinese_dragon_4
-x 12
-y 4
-end
 arch big_dragon
 x 11
 y 5
 end
-More
-arch big_dragon_2
-x 12
-y 5
-end
-More
-arch big_dragon_3
-x 13
-y 5
-end
-More
-arch big_dragon_4
-x 11
-y 6
-end
-More
-arch big_dragon_5
-x 12
-y 6
-end
-More
-arch big_dragon_6
-x 13
-y 6
-end
 arch big_elec
 x 11
 y 7
 end
-More
-arch big_elec_2
-x 12
-y 7
-end
-More
-arch big_elec_3
-x 11
-y 8
-end
-More
-arch big_elec_4
-x 12
-y 8
-end
-More
-arch big_elec_5
-x 11
-y 9
-end
-More
-arch big_elec_6
-x 12
-y 9
-end
 arch baslic
 x 11
 y 10
 end
-More
-arch baslic_2
-x 12
-y 10
-end
-More
-arch baslic_3
-x 13
-y 10
-end
-More
-arch baslic_4
-x 11
-y 11
-end
-More
-arch baslic_5
-x 12
-y 11
-end
-More
-arch baslic_6
-x 13
-y 11
-end
 arch big_dragon_worthless
 x 11
 y 22
 end
-More
-arch big_worthless_dragon_2
-x 12
-y 22
-end
-More
-arch big_worthless_dragon_3
-x 13
-y 22
-end
-More
-arch big_worthless_dragon_4
+arch chinese_dragon
 x 11
-y 23
-end
-More
-arch big_worthless_dragon_5
-x 12
-y 23
-end
-More
-arch big_worthless_dragon_6
-x 13
-y 23
+y 24
 end
 arch Cwyvern
 x 12
 y 12
 end
-More
-arch Cwyvern_2
-x 13
-y 12
-end
 arch EDK
 x 12
 y 14
 end
-More
-arch EDK3
-x 12
-y 15
-end
-More
-arch EDK5
-x 12
-y 16
-end
-More
-arch EDK2
-x 13
-y 14
-end
-More
-arch EDK4
-x 13
-y 15
-end
-More
-arch EDK6
-x 13
-y 16
-end
 arch golem_necro
 x 12
 y 17
 end
-More
-arch golem_necro_2
-x 13
-y 17
-end
-More
-arch golem_necro_3
-x 12
-y 18
-end
-More
-arch golem_necro_4
-x 13
-y 18
-end
-More
-arch golem_necro_5
-x 12
-y 19
-end
-More
-arch golem_necro_6
-x 13
-y 19
-end
 arch DK
 x 14
 y 14
 end
-More
-arch DK3
-x 14
-y 15
-end
-More
-arch DK5
-x 14
-y 16
-end
-More
-arch DK2
-x 15
-y 14
-end
-More
-arch DK4
-x 15
-y 15
-end
-More
-arch DK6
-x 15
-y 16
-end
 arch jessyb
 x 14
 y 17
 end
-More
-arch jessyb_2
-x 15
-y 17
-end
-More
-arch jessyb_3
-x 16
-y 17
-end
-More
-arch jessyb_4
-x 17
-y 17
-end
-More
-arch jessyb_5
+arch ArchAngel
 x 14
-y 18
-end
-More
-arch jessyb_6
-x 15
-y 18
-end
-More
-arch jessyb_7
-x 16
-y 18
-end
-More
-arch jessyb_8
-x 17
-y 18
-end
-More
-arch jessyb_9
-x 14
-y 19
-end
-More
-arch jessyb_10
-x 15
-y 19
-end
-More
-arch jessyb_11
-x 16
-y 19
-end
-More
-arch jessyb_12
-x 17
-y 19
-end
-More
-arch jessyb_13
-x 14
-y 20
-end
-More
-arch jessyb_14
-x 15
-y 20
-end
-More
-arch jessyb_15
-x 16
-y 20
-end
-More
-arch jessyb_16
-x 17
-y 20
+y 21
 end
 arch mabu
 x 15
 y 11
 end
-More
-arch mabu_2
-x 15
-y 12
-end
 arch breeder_ant
 x 16
 end
-More
-arch breeder_ant_2
-x 17
-end
 arch slug
 x 16
 y 12
 end
-More
-arch slug_2
-x 17
-y 12
-end
 arch belzebub
 x 16
 y 14
 end
-More
-arch belzebub_2
-x 17
-y 14
-end
-More
-arch belzebub_3
-x 16
-y 15
-end
-More
-arch belzebub_4
-x 17
-y 15
-end
-More
-arch belzebub_5
-x 16
-y 16
-end
-More
-arch belzebub_6
-x 17
-y 16
-end
 arch serpent
 x 18
 y 1
 end
-More
-arch serpent_2
-x 19
-y 1
-end
 arch cobra
 x 18
 y 2
 end
-More
-arch cobra_2
-x 18
-y 3
-end
 arch unicorn
 x 18
 y 9
 end
-More
-arch unicorn_2
-x 19
-y 9
-end
 arch sphinx
 x 18
 y 10
 end
-More
-arch sphinx_2
-x 19
-y 10
-end
 arch behemoth
 x 18
 y 12
 end
-More
-arch behemoth_2
-x 19
-y 12
-end
-More
-arch behemoth_3
-x 18
-y 13
-end
-More
-arch behemoth_4
-x 19
-y 13
-end
 arch dread
 x 18
 y 14
 end
-More
-arch dread_2
-x 19
-y 14
-end
-More
-arch dread_3
-x 18
-y 15
-end
-More
-arch dread_4
-x 19
-y 15
-end
 arch shadowtiger
 x 18
 y 16
 end
-More
-arch shadowtiger_2
-x 19
-y 16
-end
-More
-arch shadowtiger_3
-x 18
-y 17
-end
-More
-arch shadowtiger_4
-x 19
-y 17
-end
 arch fire_serpent
 x 19
 end
-More
-arch fire_serpent_2
-x 20
+arch polarbear
+x 19
+y 19
+end
+arch bear
+x 20
+y 19
 end
diff --git a/editor/picks/monsters3 b/editor/picks/monsters3
index b14bd5aa6..1615ebfc4 100644
--- a/editor/picks/monsters3
+++ b/editor/picks/monsters3
@@ -5,8 +5,8 @@ Creator: Gnat the Gnu
 Email: gnu@foo.bar
 Date: Thu Jan  4 19:11:18 2001
 endmsg
-x 29
-y 40
+width 29
+height 40
 end
 arch sign
 name fighters
@@ -24,16 +24,16 @@ arch ninja2
 y 4
 end
 arch swashbuckler
-y 5
 type 0
 monster 1
 unaggressive 1
+y 5
 end
 arch viking
-y 6
 type 0
 monster 1
 unaggressive 1
+y 6
 end
 arch northman
 y 7
@@ -42,10 +42,10 @@ arch pirate
 y 8
 end
 arch barbarian
-y 9
 type 0
 monster 1
 unaggressive 1
+y 9
 end
 arch dwarf
 y 10
@@ -82,18 +82,18 @@ x 1
 y 2
 end
 arch priest
+type 0
+monster 1
+unaggressive 1
 x 1
 y 3
-type 0
-monster 1
-unaggressive 1
 end
 arch cleric
-x 1
-y 4
 type 0
 monster 1
 unaggressive 1
+x 1
+y 4
 end
 arch dwarf_priest
 x 1
@@ -120,11 +120,11 @@ name thieves
 x 2
 end
 arch thief
-x 2
-y 1
 type 0
 monster 1
 unaggressive 1
+x 2
+y 1
 end
 arch child_thief
 x 2
@@ -139,11 +139,11 @@ name mages
 x 3
 end
 arch wizard
-x 3
-y 1
 type 0
 monster 1
 unaggressive 1
+x 3
+y 1
 end
 arch necromancer
 x 3
@@ -269,16 +269,56 @@ arch child
 x 6
 y 1
 end
+arch halfling2
+x 6
+y 2
+end
+arch halfling3
+x 6
+y 3
+end
+arch blue_dragon1
+x 6
+y 4
+end
+arch blue_dragon2
+x 6
+y 5
+end
+arch black_dragon1
+x 6
+y 6
+end
+arch black_dragon2
+x 6
+y 7
+end
+arch green_dragon1
+x 6
+y 8
+end
+arch green_dragon2
+x 6
+y 9
+end
+arch red_dragon1
+x 6
+y 10
+end
+arch red_dragon2
+x 6
+y 11
+end
 arch sign
 name other humanoid
 x 7
 end
 arch fireborn
-x 7
-y 1
 type 0
 monster 1
 unaggressive 1
+x 7
+y 1
 end
 arch prisoner
 x 7
@@ -313,6 +353,14 @@ arch air_elemental
 x 7
 y 19
 end
+arch fire_witch
+x 7
+y 20
+end
+arch air_witch
+x 7
+y 21
+end
 arch sign
 name townsmen
 x 8
@@ -365,6 +413,14 @@ arch para_air
 x 8
 y 19
 end
+arch water_witch
+x 8
+y 20
+end
+arch s_mastif
+x 8
+y 21
+end
 arch sign
 name townswomen
 x 9
@@ -413,6 +469,14 @@ arch para_lightning
 x 9
 y 19
 end
+arch earth_witch
+x 9
+y 20
+end
+arch shadow
+x 9
+y 21
+end
 arch mudman
 x 10
 y 18
@@ -422,11 +486,11 @@ name elf/faerie
 x 11
 end
 arch elf
-x 11
-y 1
 type 0
 monster 1
 unaggressive 1
+x 11
+y 1
 end
 arch pixie
 x 11
@@ -462,11 +526,11 @@ x 11
 y 16
 end
 arch fireborn
-x 11
-y 17
 type 0
 monster 1
 unaggressive 1
+x 11
+y 17
 end
 arch sign
 name insect
@@ -505,10 +569,22 @@ arch bee
 x 11
 y 38
 end
+arch elf_man
+x 12
+y 1
+end
 arch generate_pixie
 x 12
 y 2
 end
+arch elf_lass
+x 12
+y 3
+end
+arch elf_guard
+x 12
+y 4
+end
 arch generate_stalker
 x 12
 y 5
@@ -740,15 +816,18 @@ arch shadowpup
 x 19
 y 21
 end
-arch sign
-name reptile
+arch wolf
 x 19
-y 30
+y 28
 end
-arch generate_serp_man
+arch leech
 x 19
 y 31
 end
+arch pup
+x 19
+y 32
+end
 arch sign
 name slime
 x 19
@@ -798,14 +877,18 @@ arch neko
 x 20
 y 21
 end
-arch snake
+arch dire_wolf
 x 20
-y 30
+y 28
 end
-arch serp_man
+arch mastif
 x 20
 y 31
 end
+arch sheep
+x 20
+y 32
+end
 arch slime
 x 20
 y 36
@@ -818,9 +901,21 @@ arch acid_pool
 x 20
 y 38
 end
-arch serp_priest
+arch slimecrawler
+x 20
+y 39
+end
+arch ape
 x 21
-y 31
+y 19
+end
+arch tentacle2
+x 21
+y 36
+end
+arch tentacle
+x 21
+y 37
 end
 arch sign
 name giants
@@ -872,6 +967,31 @@ arch generate_bird
 x 23
 y 28
 end
+arch goose
+x 23
+y 29
+end
+arch sign
+name reptile
+x 23
+y 35
+end
+arch generate_serp_man
+x 23
+y 36
+end
+arch snake
+x 24
+y 35
+end
+arch serp_man
+x 24
+y 36
+end
+arch serp_priest
+x 25
+y 36
+end
 arch sign
 name undead
 x 26
@@ -960,6 +1080,10 @@ arch demilich
 x 27
 y 10
 end
+arch banshee
+x 27
+y 11
+end
 arch broo
 x 27
 y 22
@@ -1007,1381 +1131,198 @@ end
 arch big_demon
 y 19
 end
-More
-arch big_demon_2
-y 19
-end
-More
-arch big_demon_3
-y 19
-end
-More
-arch big_demon_4
-y 20
-end
-More
-arch big_demon_5
-y 20
-end
-More
-arch big_demon_6
-y 20
-end
-More
-arch big_demon_7
-y 21
-end
-More
-arch big_demon_8
-y 21
-end
-More
-arch big_demon_9
-y 21
-end
-More
-arch big_demon_A
-y 22
-end
-More
-arch big_demon_B
-y 22
-end
-More
-arch big_demon_C
-y 22
-end
 arch Balrog
 y 23
 end
-More
-arch Balrog_2
-y 23
-end
-More
-arch Balrog_3
-y 23
-end
-More
-arch Balrog_4
-y 23
-end
-More
-arch Balrog_5
-y 24
-end
-More
-arch Balrog_6
-y 24
-end
-More
-arch Balrog_7
-y 24
-end
-More
-arch Balrog_8
-y 24
-end
-More
-arch Balrog_9
-y 25
-end
-More
-arch Balrog_10
-y 25
-end
-More
-arch Balrog_11
-y 25
-end
-More
-arch Balrog_12
-y 25
-end
-More
-arch Balrog_13
-y 26
-end
-More
-arch Balrog_14
-y 26
-end
-More
-arch Balrog_15
-y 26
-end
-More
-arch Balrog_16
-y 26
-end
 arch demon_lord
 x 1
 y 30
 end
-More
-arch demon_lord_1
-x 0
-y 27
-end
-More
-arch demon_lord_2
-x 1
-y 27
-end
-More
-arch demon_lord_3
-x 2
-y 27
-end
-More
-arch demon_lord_4
-x 3
-y 27
-end
-More
-arch demon_lord_5
-x 0
-y 28
-end
-More
-arch demon_lord_6
-x 1
-y 28
-end
-More
-arch demon_lord_7
-x 2
-y 28
-end
-More
-arch demon_lord_8
-x 3
-y 28
-end
-More
-arch demon_lord_9
-x 0
-y 29
-end
-More
-arch demon_lord_10
-x 1
-y 29
-end
-More
-arch demon_lord_11
-x 2
-y 29
-end
-More
-arch demon_lord_12
-x 3
-y 29
-end
-More
-arch demon_lord_13
-x 0
-y 30
-end
-More
-arch demon_lord_15
-x 2
-y 30
-end
-More
-arch demon_lord_16
-x 3
-y 30
-end
-More
-arch demon_lord_17
-x 0
-y 31
-end
-More
-arch demon_lord_18
-x 1
-y 31
-end
-More
-arch demon_lord_19
-x 2
-y 31
-end
-More
-arch demon_lord_20
-x 3
-y 31
-end
-More
-arch demon_lord_21
-x 0
-y 32
-end
-More
-arch demon_lord_22
-x 1
-y 32
-end
-More
-arch demon_lord_23
-x 2
-y 32
-end
-More
-arch demon_lord_24
-x 3
-y 32
-end
-More
-arch demon_lord_25
-x 0
-y 33
-end
-More
-arch demon_lord_26
-x 1
-y 33
-end
-More
-arch demon_lord_27
-x 2
-y 33
-end
-More
-arch demon_lord_28
-x 3
-y 33
-end
-More
-arch demon_lord_29
-x 0
-y 34
-end
-More
-arch demon_lord_30
-x 1
-y 34
-end
-More
-arch demon_lord_31
-x 2
-y 34
-end
-More
-arch demon_lord_32
-x 3
-y 34
-end
 arch belzebub
 x 1
 y 35
 end
-More
-arch belzebub_2
-x 2
-y 35
-end
-More
-arch belzebub_3
-x 1
-y 36
-end
-More
-arch belzebub_4
-x 2
-y 36
-end
-More
-arch belzebub_5
-x 1
-y 37
-end
-More
-arch belzebub_6
-x 2
-y 37
-end
 arch medium_demon
 x 3
 y 21
 end
-More
-arch medium_demon_2
-x 4
-y 21
-end
-More
-arch medium_demon_3
-x 3
-y 22
-end
-More
-arch medium_demon_4
-x 4
-y 22
-end
 arch jessyb
 x 4
 y 23
 end
-More
-arch jessyb_2
-x 5
-y 23
-end
-More
-arch jessyb_3
-x 6
-y 23
-end
-More
-arch jessyb_4
-x 7
-y 23
-end
-More
-arch jessyb_5
-x 4
-y 24
-end
-More
-arch jessyb_6
-x 5
-y 24
-end
-More
-arch jessyb_7
-x 6
-y 24
-end
-More
-arch jessyb_8
-x 7
-y 24
-end
-More
-arch jessyb_9
-x 4
-y 25
-end
-More
-arch jessyb_10
-x 5
-y 25
-end
-More
-arch jessyb_11
-x 6
-y 25
-end
-More
-arch jessyb_12
-x 7
-y 25
-end
-More
-arch jessyb_13
-x 4
-y 26
-end
-More
-arch jessyb_14
-x 5
-y 26
-end
-More
-arch jessyb_15
-x 6
-y 26
-end
-More
-arch jessyb_16
-x 7
-y 26
-end
 arch Greater_Demon
 x 4
 y 32
 end
-More
-arch Greater_Demon_1
-x 5
-y 32
-end
-More
-arch Greater_Demon_2
-x 6
-y 32
-end
-More
-arch Greater_Demon_3
-x 7
-y 32
-end
-More
-arch Greater_Demon_4
+arch s_wyvern
 x 8
-y 32
-end
-More
-arch Greater_Demon_5
-x 9
-y 32
-end
-More
-arch Greater_Demon_6
-x 4
-y 33
-end
-More
-arch Greater_Demon_7
-x 5
-y 33
-end
-More
-arch Greater_Demon_8
-x 6
-y 33
-end
-More
-arch Greater_Demon_9
-x 7
-y 33
-end
-More
-arch Greater_Demon_A
-x 8
-y 33
-end
-More
-arch Greater_Demon_B
-x 9
-y 33
-end
-More
-arch Greater_Demon_C
-x 4
-y 34
-end
-More
-arch Greater_Demon_D
-x 5
-y 34
-end
-More
-arch Greater_Demon_E
-x 6
-y 34
-end
-More
-arch Greater_Demon_F
-x 7
-y 34
-end
-More
-arch Greater_Demon_G
-x 8
-y 34
-end
-More
-arch Greater_Demon_H
-x 9
-y 34
-end
-More
-arch Greater_Demon_I
-x 4
-y 35
-end
-More
-arch Greater_Demon_J
-x 5
-y 35
-end
-More
-arch Greater_Demon_K
-x 6
-y 35
-end
-More
-arch Greater_Demon_L
-x 7
-y 35
-end
-More
-arch Greater_Demon_M
-x 8
-y 35
-end
-More
-arch Greater_Demon_N
-x 9
-y 35
-end
-More
-arch Greater_Demon_O
-x 4
-y 36
-end
-More
-arch Greater_Demon_P
-x 5
-y 36
-end
-More
-arch Greater_Demon_Q
-x 6
-y 36
-end
-More
-arch Greater_Demon_R
-x 7
-y 36
-end
-More
-arch Greater_Demon_S
-x 8
-y 36
-end
-More
-arch Greater_Demon_T
-x 9
-y 36
-end
-More
-arch Greater_Demon_U
-x 4
-y 37
-end
-More
-arch Greater_Demon_V
-x 5
-y 37
-end
-More
-arch Greater_Demon_W
-x 6
-y 37
-end
-More
-arch Greater_Demon_X
-x 7
-y 37
-end
-More
-arch Greater_Demon_Y
-x 8
-y 37
-end
-More
-arch Greater_Demon_Z
-x 9
-y 37
-end
-More
-arch Greater_Demon_a
-x 4
-y 38
-end
-More
-arch Greater_Demon_b
-x 5
-y 38
-end
-More
-arch Greater_Demon_c
-x 6
-y 38
-end
-More
-arch Greater_Demon_d
-x 7
-y 38
-end
-More
-arch Greater_Demon_e
-x 8
-y 38
-end
-More
-arch Greater_Demon_f
-x 9
-y 38
+y 22
 end
 arch ent
 x 11
 y 8
 end
-More
-arch ent_2
-x 12
-y 8
-end
-More
-arch ent_3
-x 11
-y 9
-end
-More
-arch ent_4
-x 12
-y 9
-end
 arch lamia
 x 11
 y 10
 end
-More
-arch lamia_2
-x 12
-y 10
-end
 arch minor_djinn
 x 11
 y 11
 end
-More
-arch minor_djinn_2
-x 11
-y 12
-end
 arch sphinx
 x 11
 y 18
 end
-More
-arch sphinx_2
-x 12
-y 18
-end
 arch baslic
 x 11
 y 19
 end
-More
-arch baslic_2
-x 12
-y 19
-end
-More
-arch baslic_3
-x 13
-y 19
-end
-More
-arch baslic_4
-x 11
-y 20
-end
-More
-arch baslic_5
-x 12
-y 20
-end
-More
-arch baslic_6
-x 13
-y 20
-end
 arch dread
 x 11
 y 21
 end
-More
-arch dread_2
-x 12
-y 21
-end
-More
-arch dread_3
-x 11
-y 22
-end
-More
-arch dread_4
-x 12
-y 22
-end
 arch golem_necro
 x 11
 y 23
 end
-More
-arch golem_necro_2
-x 12
-y 23
-end
-More
-arch golem_necro_3
-x 11
-y 24
-end
-More
-arch golem_necro_4
-x 12
-y 24
-end
-More
-arch golem_necro_5
-x 11
-y 25
-end
-More
-arch golem_necro_6
-x 12
-y 25
-end
 arch breeder_ant
 x 11
 y 29
 end
-More
-arch breeder_ant_2
-x 12
-y 29
-end
 arch djinn
 x 12
 y 11
 end
-More
-arch djinn_2
-x 12
-y 12
-end
 arch angel_knight
 x 14
 y 35
 end
-More
-arch angel_knight_2
-x 14
-y 36
-end
 arch dragon
 x 15
 y 15
 end
-More
-arch dragon_2
-x 16
-y 15
-end
 arch chinese_dragon
 x 15
 y 16
 end
-More
-arch chinese_dragon_2
-x 16
-y 16
-end
-More
-arch chinese_dragon_3
-x 15
-y 17
-end
-More
-arch chinese_dragon_4
-x 16
-y 17
-end
 arch big_dragon
 x 15
 y 18
 end
-More
-arch big_dragon_2
-x 16
-y 18
-end
-More
-arch big_dragon_3
-x 17
-y 18
-end
-More
-arch big_dragon_4
-x 15
-y 19
-end
-More
-arch big_dragon_5
-x 16
-y 19
-end
-More
-arch big_dragon_6
-x 17
-y 19
-end
 arch big_dragon_worthless
 x 15
 y 20
 end
-More
-arch big_worthless_dragon_2
-x 16
-y 20
-end
-More
-arch big_worthless_dragon_3
-x 17
-y 20
-end
-More
-arch big_worthless_dragon_4
-x 15
-y 21
-end
-More
-arch big_worthless_dragon_5
-x 16
-y 21
-end
-More
-arch big_worthless_dragon_6
-x 17
-y 21
-end
 arch big_elec
 x 15
 y 22
 end
-More
-arch big_elec_2
-x 16
-y 22
-end
-More
-arch big_elec_3
-x 15
-y 23
-end
-More
-arch big_elec_4
-x 16
-y 23
-end
-More
-arch big_elec_5
-x 15
-y 24
-end
-More
-arch big_elec_6
-x 16
-y 24
-end
 arch ArchAngel
 x 15
 y 32
 end
-More
-arch ArchAngel_2
-x 16
-y 32
-end
-More
-arch ArchAngel_3
-x 15
-y 33
-end
-More
-arch ArchAngel_4
-x 16
-y 33
-end
-More
-arch ArchAngel_5
-x 15
-y 34
-end
-More
-arch ArchAngel_6
-x 16
-y 34
-end
 arch destroying_angel
 x 15
 y 35
 end
-More
-arch destroying_angel_2
-x 16
-y 35
-end
-More
-arch destroying_angel_3
-x 15
-y 36
-end
-More
-arch destroying_angel_4
-x 16
-y 36
-end
-More
-arch destroying_angel_5
-x 15
-y 37
-end
-More
-arch destroying_angel_6
-x 16
-y 37
-end
 arch bone_drake
 x 16
 y 11
 end
-More
-arch bone_drake_2
-x 17
-y 11
-end
-More
-arch bone_drake_3
-x 16
-y 12
-end
-More
-arch bone_drake_4
-x 17
-y 12
-end
 arch Cwyvern
 x 16
 y 14
 end
-More
-arch Cwyvern_2
-x 17
-y 14
-end
 arch dragonman
 x 17
 y 16
 end
-More
-arch dragonman_2
-x 17
-y 17
-end
 arch troll
 x 19
 y 2
 end
-More
-arch troll_2
-x 20
-y 2
-end
-More
-arch troll_3
-x 19
-y 3
-end
-More
-arch troll_4
-x 20
-y 3
-end
 arch gaelotroll
 x 19
 y 4
 end
-More
-arch gaelotroll_2
-x 20
-y 4
-end
-More
-arch gaelotroll_3
-x 19
-y 5
-end
-More
-arch gaelotroll_4
-x 20
-y 5
-end
-More
-arch gaelotroll_5
-x 19
-y 6
-end
-More
-arch gaelotroll_6
-x 20
-y 6
-end
 arch behemoth
 x 19
 y 16
 end
-More
-arch behemoth_2
-x 20
-y 16
-end
-More
-arch behemoth_3
-x 19
-y 17
-end
-More
-arch behemoth_4
-x 20
-y 17
-end
 arch shadowtiger
 x 19
 y 19
 end
-More
-arch shadowtiger_2
-x 20
-y 19
-end
-More
-arch shadowtiger_3
-x 19
-y 20
-end
-More
-arch shadowtiger_4
-x 20
-y 20
-end
 arch g_worm
 x 19
 y 22
 end
-More
-arch g_worm_2
-x 20
-y 22
-end
-More
-arch g_worm_3
-x 19
-y 23
-end
-More
-arch g_worm_4
-x 20
-y 23
-end
 arch unicorn
 x 19
 y 24
 end
-More
-arch unicorn_2
-x 20
-y 24
-end
 arch gryphon
 x 19
 y 25
 end
-More
-arch gryphon2
-x 20
-y 25
-end
-More
-arch gryphon3
-x 21
-y 25
-end
-More
-arch gryphon4
+arch giantrat
 x 19
-y 26
+y 29
 end
-More
-arch gryphon5
-x 20
-y 26
-end
-More
-arch gryphon6
+arch bear
 x 21
-y 26
+y 11
 end
-More
-arch gryphon7
-x 19
-y 27
-end
-More
-arch gryphon8
-x 20
-y 27
-end
-More
-arch gryphon9
+arch polarbear
 x 21
-y 27
-end
-arch cobra
-x 19
-y 32
-end
-More
-arch cobra_2
-x 19
-y 33
-end
-arch serpent
-x 20
-y 32
-end
-More
-arch serpent_2
-x 21
-y 32
-end
-arch fire_serpent
-x 20
-y 33
-end
-More
-arch fire_serpent_2
-x 21
-y 33
+y 13
 end
 arch big_wiz
 x 22
 y 16
 end
-More
-arch big_wiz2
-x 23
-y 16
-end
-More
-arch big_wiz3
-x 24
-y 16
-end
-More
-arch big_wiz4
-x 22
-y 17
-end
-More
-arch big_wiz5
-x 23
-y 17
-end
-More
-arch big_wiz6
-x 24
-y 17
-end
-More
-arch big_wiz7
-x 22
-y 18
-end
-More
-arch big_wiz8
-x 23
-y 18
-end
-More
-arch big_wiz9
-x 24
-y 18
-end
 arch byakie
 x 22
 y 24
 end
-More
-arch byakie_2
-x 23
-y 24
-end
-More
-arch byakie_3
-x 22
-y 25
-end
-More
-arch byakie_4
-x 23
-y 25
-end
 arch giant
 x 23
 y 2
 end
-More
-arch giant_2
-x 23
-y 3
-end
 arch titan
 x 23
 y 5
 end
-More
-arch titan_2
-x 22
-y 5
-end
-More
-arch titan_3
-x 22
-y 4
-end
-More
-arch titan_4
-x 23
-y 4
-end
-More
-arch titan_5
-x 24
-y 4
-end
-More
-arch titan_6
-x 24
-y 5
-end
-More
-arch titan_7
-x 24
-y 6
-end
-More
-arch titan_8
-x 23
-y 6
-end
-More
-arch titan_9
-x 22
-y 6
-end
 arch DK
 x 23
 y 7
 end
-More
-arch DK3
-x 23
-y 8
-end
-More
-arch DK5
-x 23
-y 9
-end
-More
-arch DK2
-x 24
-y 7
-end
-More
-arch DK4
-x 24
-y 8
-end
-More
-arch DK6
-x 24
-y 9
-end
 arch EDK
 x 23
 y 10
 end
-More
-arch EDK3
-x 23
-y 11
-end
-More
-arch EDK5
-x 23
-y 12
-end
-More
-arch EDK2
-x 24
-y 10
-end
-More
-arch EDK4
-x 24
-y 11
-end
-More
-arch EDK6
-x 24
-y 12
-end
 arch cyclops
 x 23
 y 13
 end
-More
-arch cyclops_2
-x 24
-y 13
-end
-More
-arch cyclops_3
+arch cobra
 x 23
-y 14
-end
-More
-arch cyclops_4
-x 24
-y 14
-end
-More
-arch cyclops_5
-x 23
-y 15
-end
-More
-arch cyclops_6
-x 24
-y 15
+y 37
 end
 arch mabu
 x 24
 y 2
 end
-More
-arch mabu_2
+arch serpent
 x 24
-y 3
+y 37
+end
+arch fire_serpent
+x 24
+y 38
 end
 arch skree
 x 26
 y 12
 end
-More
-arch skree_2
-x 27
-y 12
-end
-More
-arch skree_3
-x 26
-y 13
-end
-More
-arch skree_4
-x 27
-y 13
-end
diff --git a/editor/picks/outdoors b/editor/picks/outdoors
index 534b8d378..cc7bfc5ed 100644
--- a/editor/picks/outdoors
+++ b/editor/picks/outdoors
@@ -373,296 +373,71 @@ end
 arch inn
 y 17
 end
-More
-arch inn_2
-y 17
-end
 arch house_long
 y 18
 end
-More
-arch house_long_2
-y 18
-end
 arch keep
 y 20
 end
-More
-arch keep_2
-y 20
-end
-More
-arch keep_3
-y 21
-end
-More
-arch keep_4
-y 21
-end
 arch town_5
 y 22
 end
-More
-arch town_5.2
-y 22
-end
-More
-arch town_5.3
-y 22
-end
-More
-arch town_5.4
-y 23
-end
-More
-arch town_5.5
-y 23
-end
-More
-arch town_5.6
-y 23
-end
 arch town_6
 y 24
 end
-More
-arch town_6.2
-y 24
-end
-More
-arch town_6.3
-y 25
-end
-More
-arch town_6.4
-y 25
-end
-More
-arch town_6.5
-y 26
-end
-More
-arch town_6.6
-y 26
-end
 arch mountain_2
 x 2
 y 7
 end
-More
-arch mountain_2_2
-x 3
-y 7
-end
-More
-arch mountain_2_3
-x 2
-y 8
-end
-More
-arch mountain_2_4
-x 3
-y 8
-end
 arch house_up
 x 2
 y 17
 end
-More
-arch house_up_2
-x 2
-y 18
-end
 arch fort
 x 2
 y 20
 end
-More
-arch fort_2
-x 3
-y 20
-end
-More
-arch fort_3
-x 2
-y 21
-end
-More
-arch fort_4
-x 3
-y 21
-end
 arch town_3
 x 2
 y 24
 end
-More
-arch town_3.2
-x 2
-y 25
-end
 arch town_2
 x 2
 y 26
 end
-More
-arch town_2.2
-x 3
-y 26
-end
 arch barrack_up
 x 3
 y 17
 end
-More
-arch barrack_up_2
-x 3
-y 18
-end
 arch town_7
 x 3
 y 22
 end
-More
-arch town_7.2
-x 4
-y 22
-end
-More
-arch town_7.3
-x 5
-y 22
-end
-More
-arch town_7.4
-x 3
-y 23
-end
-More
-arch town_7.5
-x 4
-y 23
-end
-More
-arch town_7.6
-x 5
-y 23
-end
-More
-arch town_7.7
-x 3
-y 24
-end
-More
-arch town_7.8
-x 4
-y 24
-end
-More
-arch town_7.9
-x 5
-y 24
-end
 arch volcano_low
 x 4
 y 6
 end
-More
-arch volcano_low_2
-x 5
-y 6
-end
 arch volcano_high
 x 4
 y 7
 end
-More
-arch volcano_high_2
-x 5
-y 7
-end
-More
-arch volcano_high_3
-x 4
-y 8
-end
-More
-arch volcano_high_4
-x 5
-y 8
-end
 arch city_tower
 x 4
 y 15
 end
-More
-arch city_tower_2
-x 4
-y 16
-end
 arch big_galleon
 x 4
 y 17
 end
-More
-arch big_galleon_2
-x 5
-y 17
-end
-More
-arch big_galleon_3
-x 4
-y 18
-end
-More
-arch big_galleon_4
-x 5
-y 18
-end
 arch castle_a
 x 4
 y 20
 end
-More
-arch castle_b
-x 4
-y 21
-end
-More
-arch castle_c
-x 5
-y 20
-end
-More
-arch castle_d
-x 5
-y 21
-end
 arch town_4
 x 4
 y 25
 end
-More
-arch town_4.2
-x 5
-y 25
-end
-More
-arch town_4.3
-x 4
-y 26
-end
-More
-arch town_4.4
-x 5
-y 26
-end
 arch tower_a
 x 5
 y 15
 end
-More
-arch tower_b
-x 5
-y 16
-end
diff --git a/editor/picks/shops b/editor/picks/shops
index 96b463f7e..8a444e9a4 100644
--- a/editor/picks/shops
+++ b/editor/picks/shops
@@ -114,7 +114,7 @@ y 2
 end
 arch create_Pdragon_mail
 x 3
-y 3
+ù 3
 end
 arch food_table
 x 3
@@ -174,72 +174,15 @@ end
 arch store_weapons
 x 5
 end
-More
-arch store_weapons_2
-x 6
-end
-More
-arch store_weapons_3
-x 5
-end
-More
-arch store_weapons_4
-x 6
-end
 arch store_armour
 x 5
 y 2
 end
-More
-arch store_armour_2
-x 6
-y 2
-end
-More
-arch store_armour_3
-x 5
-y 3
-end
-More
-arch store_armour_4
-x 6
-y 3
-end
 arch store_magic
 x 5
 y 4
 end
-More
-arch store_magic_2
-x 6
-y 4
-end
-More
-arch store_magic_3
-x 5
-y 5
-end
-More
-arch store_magic_4
-x 6
-y 5
-end
 arch store_general
 x 5
 y 6
 end
-More
-arch store_general_2
-x 6
-y 6
-end
-More
-arch store_general_3
-x 5
-y 7
-end
-More
-arch store_general_4
-x 6
-y 7
-end
diff --git a/editor/picks/special b/editor/picks/special
index 3c14c506c..d2313534d 100644
--- a/editor/picks/special
+++ b/editor/picks/special
@@ -642,26 +642,11 @@ arch active_volcano
 x 8
 y 10
 end
-More
-arch active_volcano_2
-x 9
-y 10
-end
 arch mine_secret_1_1
 x 9
 y 6
 end
-More
-arch mine_secret_1_2
-x 10
-y 6
-end
 arch mine_secret_2_1
 x 11
 y 6
 end
-More
-arch mine_secret_2_2
-x 11
-y 7
-end
diff --git a/editor/picks/town b/editor/picks/town
index 81c87937e..c4b24aff5 100644
--- a/editor/picks/town
+++ b/editor/picks/town
@@ -327,278 +327,66 @@ end
 arch farmhouse
 y 17
 end
-More
-arch farmhouse_2
-y 17
-end
 arch barn
 y 19
 end
-More
-arch barn_2
-y 19
-end
-More
-arch barn_3
-y 20
-end
-More
-arch barn_4
-y 20
-end
 arch store_general
 y 21
 end
-More
-arch store_general_2
-y 21
-end
-More
-arch store_general_3
-y 22
-end
-More
-arch store_general_4
-y 22
-end
 arch store_magic
 y 23
 end
-More
-arch store_magic_2
-y 23
-end
-More
-arch store_magic_3
-y 24
-end
-More
-arch store_magic_4
-y 24
-end
 arch courthouse
 y 25
 end
-More
-arch courthouse_2
-y 25
-end
-More
-arch courthouse_3
-y 26
-end
-More
-arch courthouse_4
-y 26
-end
 arch palace
 y 27
 end
-More
-arch palace_2
-y 27
-end
-More
-arch palace_3
-y 27
-end
-More
-arch palace_4
-y 27
-end
-More
-arch palace_5
-y 27
-end
-More
-arch palace_6
-y 26
-end
-More
-arch palace_7
-y 26
-end
-More
-arch palace_8
-y 26
-end
-More
-arch palace_9
-y 25
-end
-More
-arch palace_10
-y 25
-end
-More
-arch palace_11
-y 25
-end
 arch inn
 x 2
 y 16
 end
-More
-arch inn_2
-x 3
-y 16
-end
 arch barrack_long
 x 2
 y 17
 end
-More
-arch barrack_long_2
-x 3
-y 17
-end
 arch guild
 x 2
 y 19
 end
-More
-arch guild_2
-x 3
-y 19
-end
-More
-arch guild_3
-x 2
-y 20
-end
-More
-arch guild_4
-x 3
-y 20
-end
 arch store_weapons
 x 2
 y 21
 end
-More
-arch store_weapons_2
-x 3
-y 21
-end
-More
-arch store_weapons_3
-x 2
-y 22
-end
-More
-arch store_weapons_4
-x 3
-y 22
-end
 arch church
 x 2
 y 23
 end
-More
-arch church_2
-x 3
-y 23
-end
-More
-arch church_3
-x 2
-y 24
-end
-More
-arch church_4
-x 3
-y 24
-end
 arch house_up
 x 4
 y 16
 end
-More
-arch house_up_2
-x 4
-y 17
-end
 arch prison
 x 4
 y 19
 end
-More
-arch prison_2
-x 5
-y 19
-end
-More
-arch prison_3
-x 4
-y 20
-end
-More
-arch prison_4
-x 5
-y 20
-end
 arch store_armour
 x 4
 y 21
 end
-More
-arch store_armour_2
-x 5
-y 21
-end
-More
-arch store_armour_3
-x 4
-y 22
-end
-More
-arch store_armour_4
-x 5
-y 22
-end
 arch city_tower
 x 4
 y 23
 end
-More
-arch city_tower_2
-x 4
-y 24
-end
 arch big_galleon
 x 4
 y 25
 end
-More
-arch big_galleon_2
-x 5
-y 25
-end
-More
-arch big_galleon_3
-x 4
-y 26
-end
-More
-arch big_galleon_4
-x 5
-y 26
-end
 arch barrack_up
 x 5
 y 16
 end
-More
-arch barrack_up_2
-x 5
-y 17
-end
 arch tower_a
 x 5
 y 23
 end
-More
-arch tower_b
-x 5
-y 24
-end
diff --git a/editor/walls/caves b/editor/walls/caves
index b442732bd..9e2d0fc69 100644
--- a/editor/walls/caves
+++ b/editor/walls/caves
@@ -321,17 +321,7 @@ arch mine_secret_1_1
 x 6
 y 6
 end
-More
-arch mine_secret_1_2
-x 7
-y 6
-end
 arch mine_secret_2_1
 x 9
 y 6
 end
-More
-arch mine_secret_2_2
-x 9
-y 7
-end
diff --git a/euthville/devil.church2 b/euthville/devil.church2
index db9cd8ed7..29a29f9bb 100644
--- a/euthville/devil.church2
+++ b/euthville/devil.church2
@@ -3522,32 +3522,14 @@ end
 arch spell_summon_pet_monster
 end
 end
-More
-arch giant_2
-name Gromm, Big Giant Shaman
-hp 550
-exp 2000
-x 5
-y 13
-end
 arch giant
 x 6
 y 12
 end
-More
-arch giant_2
-x 6
-y 13
-end
 arch giant
 x 8
 y 12
 end
-More
-arch giant_2
-x 8
-y 13
-end
 arch dread
 name Groopa
 x 8
@@ -3556,80 +3538,19 @@ carrying 200
 arch improve_con
 end
 end
-More
-arch dread_2
-name Groopa
-hp 1500
-x 9
-y 18
-end
-More
-arch dread_3
-name Groopa
-hp 1500
-x 8
-y 19
-end
-More
-arch dread_4
-name Groopa
-hp 1500
-x 9
-y 19
-end
 arch giant
 x 10
 y 12
 end
-More
-arch giant_2
-x 10
-y 13
-end
 arch giant
 x 12
 y 12
 end
-More
-arch giant_2
-x 12
-y 13
-end
 arch troll
 x 19
 y 4
 end
-More
-arch troll_2
-x 20
-y 4
-end
-More
-arch troll_3
-x 19
-y 5
-end
-More
-arch troll_4
-x 20
-y 5
-end
 arch troll
 x 21
 y 2
 end
-More
-arch troll_2
-x 22
-y 2
-end
-More
-arch troll_3
-x 21
-y 3
-end
-More
-arch troll_4
-x 22
-y 3
-end
diff --git a/euthville/devil.church3 b/euthville/devil.church3
index 809a80d86..206b4f1ca 100644
--- a/euthville/devil.church3
+++ b/euthville/devil.church3
@@ -3152,39 +3152,6 @@ y 8
 attacktype 129
 can_cast_spell 1
 end
-More
-arch troll_2
-name Plague Trolls
-hp 1000
-sp 25
-dam 7
-x 7
-y 8
-attacktype 129
-can_cast_spell 1
-end
-More
-arch troll_3
-name Plague Trolls
-hp 1000
-sp 25
-dam 7
-x 6
-y 9
-attacktype 129
-can_cast_spell 1
-end
-More
-arch troll_4
-name Plague Trolls
-hp 1000
-sp 25
-dam 7
-x 7
-y 9
-attacktype 129
-can_cast_spell 1
-end
 arch troll
 name Plague Trolls
 sp 25
@@ -3194,39 +3161,6 @@ y 22
 attacktype 129
 can_cast_spell 1
 end
-More
-arch troll_2
-name Plague Trolls
-hp 1000
-sp 25
-dam 7
-x 17
-y 22
-attacktype 129
-can_cast_spell 1
-end
-More
-arch troll_3
-name Plague Trolls
-hp 1000
-sp 25
-dam 7
-x 16
-y 23
-attacktype 129
-can_cast_spell 1
-end
-More
-arch troll_4
-name Plague Trolls
-hp 1000
-sp 25
-dam 7
-x 17
-y 23
-attacktype 129
-can_cast_spell 1
-end
 arch troll
 name Plague Trolls
 sp 25
@@ -3236,36 +3170,3 @@ y 7
 attacktype 129
 can_cast_spell 1
 end
-More
-arch troll_2
-name Plague Trolls
-hp 1000
-sp 25
-dam 7
-x 18
-y 7
-attacktype 129
-can_cast_spell 1
-end
-More
-arch troll_3
-name Plague Trolls
-hp 1000
-sp 25
-dam 7
-x 17
-y 8
-attacktype 129
-can_cast_spell 1
-end
-More
-arch troll_4
-name Plague Trolls
-hp 1000
-sp 25
-dam 7
-x 18
-y 8
-attacktype 129
-can_cast_spell 1
-end
diff --git a/euthville/devil.church4 b/euthville/devil.church4
index 9d61b8a3d..3eefdef3c 100644
--- a/euthville/devil.church4
+++ b/euthville/devil.church4
@@ -3991,14 +3991,6 @@ y 9
 arch spell_mass_confusion
 end
 end
-More
-arch dragon_2
-hp 1300
-dam 50
-wc -10
-x 6
-y 9
-end
 arch dragon
 hp 1300
 dam 50
@@ -4008,14 +4000,6 @@ y 8
 arch spell_mass_confusion
 end
 end
-More
-arch dragon_2
-hp 1300
-dam 50
-wc -10
-x 10
-y 8
-end
 arch dragon
 hp 1300
 dam 50
@@ -4025,14 +4009,6 @@ y 4
 arch spell_mass_confusion
 end
 end
-More
-arch dragon_2
-hp 1300
-dam 50
-wc -10
-x 14
-y 4
-end
 arch dragon
 hp 1300
 dam 50
@@ -4042,14 +4018,6 @@ y 19
 arch spell_mass_confusion
 end
 end
-More
-arch dragon_2
-hp 1300
-dam 50
-wc -10
-x 23
-y 19
-end
 arch dragon
 hp 1300
 dam 50
@@ -4059,11 +4027,3 @@ y 6
 arch spell_mass_confusion
 end
 end
-More
-arch dragon_2
-hp 1300
-dam 50
-wc -10
-x 26
-y 6
-end
diff --git a/euthville/wiz5 b/euthville/wiz5
index 8d739e7bf..40c0d7ec9 100644
--- a/euthville/wiz5
+++ b/euthville/wiz5
@@ -1895,24 +1895,3 @@ arch key2
 slaying vampdoor
 end
 end
-More
-arch behemoth_2
-name behemoth
-hp 800
-x 6
-y 10
-end
-More
-arch behemoth_3
-name behemoth
-hp 800
-x 5
-y 11
-end
-More
-arch behemoth_4
-name behemoth
-hp 800
-x 6
-y 11
-end
diff --git a/euthville/wiz6 b/euthville/wiz6
index 240c4589f..b89310067 100644
--- a/euthville/wiz6
+++ b/euthville/wiz6
@@ -1802,44 +1802,19 @@ arch dragon
 x 5
 y 6
 end
-More
-arch dragon_2
-x 6
-y 6
-end
 arch dragon
 x 5
 y 11
 end
-More
-arch dragon_2
-x 6
-y 11
-end
 arch dragon
 x 8
 y 3
 end
-More
-arch dragon_2
-x 9
-y 3
-end
 arch dragon
 x 10
 y 7
 end
-More
-arch dragon_2
-x 11
-y 7
-end
 arch dragon
 x 14
 y 3
 end
-More
-arch dragon_2
-x 15
-y 3
-end
diff --git a/euthville/wiz7 b/euthville/wiz7
index c4a3558c1..27124259b 100644
--- a/euthville/wiz7
+++ b/euthville/wiz7
@@ -1826,28 +1826,3 @@ arch big_dragon
 x 15
 y 12
 end
-More
-arch big_dragon_2
-x 16
-y 12
-end
-More
-arch big_dragon_3
-x 17
-y 12
-end
-More
-arch big_dragon_4
-x 15
-y 13
-end
-More
-arch big_dragon_5
-x 16
-y 13
-end
-More
-arch big_dragon_6
-x 17
-y 13
-end