diff --git a/quests/mak/chaos/down3 b/quests/mak/chaos/down3
index 354bf03ed..19eeb8e65 100644
--- a/quests/mak/chaos/down3
+++ b/quests/mak/chaos/down3
@@ -365,38 +365,9 @@ sp 1
 x 1
 y 27
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 1
 y 27
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 1
@@ -601,38 +572,9 @@ arch dungeon_floor
 x 2
 y 26
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 2
 y 26
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 2
@@ -878,38 +820,9 @@ arch dungeon_floor
 x 3
 y 25
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 3
 y 25
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 3
@@ -1158,38 +1071,9 @@ arch dungeon_floor
 x 4
 y 24
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -6
+arch wandering_terror
 x 4
 y 24
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 4
@@ -1375,38 +1259,9 @@ arch dungeon_floor
 x 5
 y 23
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 5
 y 23
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 5
@@ -1653,38 +1508,9 @@ arch dungeon_floor
 x 6
 y 22
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 6
 y 22
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 6
@@ -1867,38 +1693,9 @@ arch dungeon_floor
 x 7
 y 21
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 7
 y 21
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 7
@@ -2149,38 +1946,9 @@ arch dungeon_floor
 x 8
 y 20
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 8
 y 20
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 8
@@ -2370,38 +2138,9 @@ arch dungeon_floor
 x 9
 y 19
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 9
 y 19
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 9
@@ -2711,38 +2450,9 @@ arch dungeon_floor
 x 10
 y 18
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 10
 y 18
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 10
@@ -2970,38 +2680,9 @@ arch dungeon_floor
 x 11
 y 17
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 11
 y 17
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 11
@@ -3285,38 +2966,9 @@ arch dungeon_floor
 x 12
 y 16
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 12
 y 16
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 12
@@ -3532,38 +3184,9 @@ arch dungeon_floor
 x 13
 y 15
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 13
 y 15
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 13
@@ -3643,38 +3266,9 @@ arch dungeon_floor
 x 13
 y 22
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 13
 y 22
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 13
@@ -3684,38 +3278,9 @@ arch dungeon_floor
 x 13
 y 24
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 13
 y 24
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 13
@@ -3819,38 +3384,9 @@ arch dungeon_floor
 x 14
 y 14
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 14
 y 14
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 14
@@ -4078,38 +3614,9 @@ arch dungeon_floor
 x 15
 y 13
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 15
 y 13
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 15
@@ -4201,38 +3708,9 @@ arch dungeon_floor
 x 15
 y 21
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 15
 y 21
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 15
@@ -4378,38 +3856,9 @@ arch dungeon_floor
 x 16
 y 12
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 16
 y 12
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 16
@@ -4645,38 +4094,9 @@ arch dungeon_floor
 x 17
 y 11
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 17
 y 11
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 17
@@ -4980,38 +4400,9 @@ arch dungeon_floor
 x 18
 y 10
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 18
 y 10
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 18
@@ -5131,38 +4522,9 @@ arch dungeon_floor
 x 18
 y 22
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 18
 y 22
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 18
@@ -5269,38 +4631,9 @@ arch dungeon_floor
 x 19
 y 9
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 19
 y 9
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 19
@@ -5384,38 +4717,9 @@ arch dungeon_floor
 x 19
 y 17
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 19
 y 17
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch abil_fear
-end
-arch spell_paralyze
-end
 end
 arch dungeon_floor
 x 19
@@ -5453,38 +4757,9 @@ arch dungeon_floor
 x 19
 y 24
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 19
 y 24
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 19
@@ -5568,38 +4843,9 @@ arch dungeon_floor
 x 20
 y 8
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 20
 y 8
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 20
@@ -5769,38 +5015,9 @@ arch dungeon_floor
 x 21
 y 2
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 21
 y 2
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 21
@@ -5834,38 +5051,9 @@ arch dungeon_floor
 x 21
 y 7
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 21
 y 7
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 21
@@ -6055,38 +5243,9 @@ arch dungeon_floor
 x 22
 y 6
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 22
 y 6
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 22
@@ -6186,38 +5345,9 @@ arch dungeon_floor
 x 22
 y 16
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 22
 y 16
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch abil_fear
-end
-arch spell_paralyze
-end
 end
 arch dungeon_floor
 x 22
@@ -6341,38 +5471,9 @@ arch dungeon_floor
 x 23
 y 5
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 23
 y 5
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 23
@@ -6581,38 +5682,9 @@ arch dungeon_floor
 x 24
 y 4
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 24
 y 4
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 24
@@ -6810,38 +5882,9 @@ arch dungeon_floor
 x 25
 y 3
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 25
 y 3
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 25
@@ -6937,38 +5980,9 @@ arch dungeon_floor
 x 25
 y 15
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 25
 y 15
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 25
@@ -7018,38 +6032,9 @@ arch dungeon_floor
 x 25
 y 26
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 25
 y 26
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 25
@@ -7081,38 +6066,9 @@ arch dungeon_floor
 x 26
 y 2
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 26
 y 2
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 26
@@ -7180,38 +6136,9 @@ arch dungeon_floor
 x 26
 y 7
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 26
 y 7
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 26
@@ -7225,38 +6152,9 @@ arch dungeon_floor
 x 26
 y 10
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 26
 y 10
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 26
@@ -7298,38 +6196,9 @@ arch dungeon_floor
 x 26
 y 18
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 26
 y 18
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch abil_fear
-end
-arch spell_paralyze
-end
 end
 arch dungeon_floor
 x 26
@@ -7389,38 +6258,9 @@ arch dungeon_floor
 x 27
 y 1
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 27
 y 1
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 27
@@ -7768,38 +6608,9 @@ arch dungeon_floor
 x 28
 y 25
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 28
 y 25
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 28
@@ -7879,38 +6690,9 @@ arch dungeon_floor
 x 29
 y 8
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 29
 y 8
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 29
@@ -7920,38 +6702,9 @@ arch dungeon_floor
 x 29
 y 10
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 29
 y 10
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 29
@@ -7977,38 +6730,9 @@ arch dungeon_floor
 x 29
 y 15
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 29
 y 15
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 29
@@ -8022,38 +6746,9 @@ arch dungeon_floor
 x 29
 y 18
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 29
 y 18
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 29
@@ -8229,38 +6924,9 @@ arch dungeon_floor
 x 30
 y 22
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 30
 y 22
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch dungeon_floor
 x 30
diff --git a/quests/mak/chaos/monsters.pick b/quests/mak/chaos/monsters.pick
index 081657b86..234f84e55 100644
--- a/quests/mak/chaos/monsters.pick
+++ b/quests/mak/chaos/monsters.pick
@@ -320,38 +320,9 @@ x 4
 y 4
 speed -1.200000
 end
-arch deathtree
-name wandering terror
-Str 80
-Con 56
-Wis 15
-Pow 5
-hp 8000
-maxhp 8000
-sp 20
-maxsp 20
-exp 100000
-dam 40
-wc -15
-ac -5
+arch wandering_terror
 x 5
 y 4
-speed -0.350000
-level 25
-attacktype 16897
-resist_physical 30
-resist_confusion 100
-resist_poison -100
-resist_paralyze 100
-resist_fear 100
-resist_chaos 100
-see_invisible 1
-can_cast_spell 1
-stand_still 0
-arch spell_paralyze
-end
-arch abil_fear
-end
 end
 arch large_gargolye
 x 5