diff --git a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npc-spawns.toml b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npc-spawns.toml
index 48500b7231..7c5f069174 100644
--- a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npc-spawns.toml
+++ b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npc-spawns.toml
@@ -10,11 +10,11 @@ spawns = [
   { id = "ice_warrior_ice_queens_lair", x = 2867, y = 9948, members = true },
   { id = "ice_warrior_ice_queens_lair", x = 2867, y = 9951, members = true },
   { id = "ice_warrior_ice_queens_lair", x = 2868, y = 9950, members = true },
-  { id = "ice_giant_ice_queens_lair", x = 2884, y = 9959, members = true },
-  { id = "ice_giant_ice_queens_lair", x = 2890, y = 9950, members = true },
-  { id = "ice_giant_camelot_castle", x = 2880, y = 9927 },
-  { id = "ice_giant_camelot_castle", x = 2887, y = 9955 },
-  { id = "ice_giant_camelot_castle", x = 2891, y = 9941 },
+  { id = "ice_giant_light", x = 2884, y = 9959, members = true },
+  { id = "ice_giant_light", x = 2890, y = 9950, members = true },
+  { id = "ice_giant_light_hair", x = 2880, y = 9927 },
+  { id = "ice_giant_light_hair", x = 2887, y = 9955 },
+  { id = "ice_giant_light_hair", x = 2891, y = 9941 },
   { id = "ice_spider", x = 2819, y = 9950 },
   { id = "ice_spider", x = 2824, y = 9934 },
   { id = "ice_spider", x = 2827, y = 9925 },
diff --git a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml
index 8823e45974..d3a584a6a7 100644
--- a/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml
+++ b/data/area/asgarnia/white_wolf_mountain/ice_queens_lair/ice_queens_lair.npcs.toml
@@ -1,9 +1,6 @@
 [ice_warrior_ice_queens_lair]
 id = 145
 
-[ice_giant_ice_queens_lair]
-id = 4685
-
 [ice_queen]
 id = 795
 hitpoints = 1040
diff --git a/data/area/asgarnia/white_wolf_mountain/white_wolf_mountain.npc-spawns.toml b/data/area/asgarnia/white_wolf_mountain/white_wolf_mountain.npc-spawns.toml
index 0b17311626..d7c22d08e4 100644
--- a/data/area/asgarnia/white_wolf_mountain/white_wolf_mountain.npc-spawns.toml
+++ b/data/area/asgarnia/white_wolf_mountain/white_wolf_mountain.npc-spawns.toml
@@ -20,8 +20,8 @@ spawns = [
   { id = "ice_warrior", x = 2850, y = 3512, members = true },
   { id = "captain_bleemadge", x = 2848, y = 3498, members = true },
   { id = "grimgnash", x = 2865, y = 3496, members = true },
-  { id = "ice_giant_ice_queens_lair", x = 2821, y = 3509, members = true },
-  { id = "ice_giant_camelot_castle", x = 2817, y = 3512, members = true },
-  { id = "ice_giant_camelot_castle", x = 2811, y = 3506, members = true },
+  { id = "ice_giant_light", x = 2821, y = 3509, members = true },
+  { id = "ice_giant_light_hair", x = 2817, y = 3512, members = true },
+  { id = "ice_giant_light_hair", x = 2811, y = 3506, members = true },
   { id = "ice_giant", x = 2804, y = 3507, members = true },
 ]
\ No newline at end of file
diff --git a/data/area/fremennik_province/fremennik_isles/fremennik_isle.drops.toml b/data/area/fremennik_province/fremennik_isles/fremennik_isle.drops.toml
index 110e94a611..ee24e23dd6 100644
--- a/data/area/fremennik_province/fremennik_isles/fremennik_isle.drops.toml
+++ b/data/area/fremennik_province/fremennik_isles/fremennik_isle.drops.toml
@@ -4,6 +4,7 @@ drops = [
     { id = "big_bones" },
     { table = "ice_troll_female_secondary" },
     { table = "ice_troll_female_tertiary" },
+    { table = "ice_troll_charms" },
 ]
 
 [ice_troll_female_secondary]
@@ -44,6 +45,7 @@ drops = [
     { id = "big_bones" },
     { table = "ice_troll_male_secondary" },
     { table = "ice_troll_male_tertiary" },
+    { table = "ice_troll_charms" },
 ]
 
 [ice_troll_male_secondary]
@@ -134,4 +136,13 @@ drops = [
     { id = "arctic_pine_logs_noted", min = 2, max = 4, chance = 358 },
     { id = "long_bone", chance = 12 },
     { id = "curved_bone" },
+]
+
+[ice_troll_charms]
+roll = 1000
+drops = [
+    { id = "gold_charm", chance = 6 },
+    { id = "green_charm", chance = 6 },
+    { id = "crimson_charm", chance = 4 },
+    { id = "blue_charm", chance = 2 },
 ]
\ No newline at end of file
diff --git a/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.anims.toml b/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.anims.toml
index d266a2eb6f..ef1a7ae1b5 100644
--- a/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.anims.toml
+++ b/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.anims.toml
@@ -6,3 +6,6 @@ id = 5783
 
 [yak_death]
 id = 5784
+
+[troll_attack]
+id = 284
diff --git a/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.combat.toml b/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.combat.toml
index d4c7731c28..645e3241e4 100644
--- a/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.combat.toml
+++ b/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.combat.toml
@@ -11,3 +11,32 @@ range = 1
 anim = "yak_attack"
 target_sound = "yak_attack"
 target_hit = { offense = "crush", max = 20 }
+
+[ice_troll]
+attack_speed = 4
+retreat_range = 8
+defend_anim = "troll_defend"
+defend_sound = "ice_troll_defend"
+death_anim = "troll_death"
+death_sound = "troll_death"
+
+[ice_troll.melee]
+range = 1
+anim = "troll_attack"
+target_sound = "ice_troll_attack"
+target_hit = { offense = "crush", max = 170 }
+
+[ice_troll_female]
+attack_speed = 4
+retreat_range = 8
+defend_anim = "troll_defend"
+defend_sound = "ice_troll_defend"
+death_anim = "troll_death"
+death_sound = "troll_death"
+
+[ice_troll_female.melee]
+range = 8
+anim = "thrower_troll_attack"
+sound = { id = "thrower_troll_attack", radius = 10 }
+projectile = "troll_rock"
+target_hit = { offense = "range", max = 170 }
diff --git a/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.npcs.toml b/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.npcs.toml
index d7e3d618e2..df17a278ef 100644
--- a/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.npcs.toml
+++ b/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.npcs.toml
@@ -60,8 +60,7 @@ hitpoints = 600
 att = 60
 str = 70
 def = 70
-style = "crush"
-max_hit_melee = 170
+combat_def = "ice_troll"
 attack_bonus = 60
 xp_bonus = 0.5
 hunt_mode = "cowardly"
@@ -76,8 +75,7 @@ hitpoints = 800
 att = 80
 str = 80
 def = 40
-style = "crush"
-max_hit_melee = 170
+combat_def = "ice_troll"
 attack_bonus = 60
 xp_bonus = 0.5
 hunt_mode = "cowardly"
@@ -92,13 +90,10 @@ hitpoints = 800
 att = 80
 str = 80
 def = 40
-style = "range"
-weapon_style = "thrown"
-ammo = "troll_rock"
-attack_range = 8
-max_hit_range = 170
+combat_def = "ice_troll_female"
 attack_bonus = 60
 xp_bonus = 0.5
+hunt_mode = "cowardly"
 slayer_xp = 84.0
 categories = ["trolls"]
 drop_table = "ice_troll_female"
diff --git a/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.sounds.toml b/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.sounds.toml
index 9824568db3..bf25711f44 100644
--- a/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.sounds.toml
+++ b/data/area/fremennik_province/fremennik_isles/neitiznot/neitiznot.sounds.toml
@@ -6,3 +6,9 @@ id = 3379
 
 [yak_defend]
 id = 3380
+
+[ice_troll_defend]
+id = 849
+
+[ice_troll_attack]
+id = 2399
diff --git a/data/area/kandarin/arandar/arandar.npc-spawns.toml b/data/area/kandarin/arandar/arandar.npc-spawns.toml
index c992e5a0af..922a0b48e5 100644
--- a/data/area/kandarin/arandar/arandar.npc-spawns.toml
+++ b/data/area/kandarin/arandar/arandar.npc-spawns.toml
@@ -1,10 +1,10 @@
 spawns = [
-  { id = "dire_wolf_isafdar", x = 2311, y = 3271 },
-  { id = "dire_wolf_isafdar", x = 2317, y = 3271 },
-  { id = "dire_wolf_isafdar", x = 2320, y = 3266 },
-  { id = "dire_wolf_isafdar", x = 2335, y = 3276 },
-  { id = "dire_wolf_isafdar", x = 2339, y = 3272 },
-  { id = "dire_wolf_isafdar", x = 2339, y = 3279 },
+  { id = "dire_wolf", x = 2311, y = 3271 },
+  { id = "dire_wolf", x = 2317, y = 3271 },
+  { id = "dire_wolf", x = 2320, y = 3266 },
+  { id = "dire_wolf", x = 2335, y = 3276 },
+  { id = "dire_wolf", x = 2339, y = 3272 },
+  { id = "dire_wolf", x = 2339, y = 3279 },
   { id = "deadly_red_spider", x = 2338, y = 3310 },
   { id = "deadly_red_spider", x = 2341, y = 3309 },
   { id = "deadly_red_spider", x = 2343, y = 3309 },
diff --git a/data/area/kandarin/arandar/arandar.npcs.toml b/data/area/kandarin/arandar/arandar.npcs.toml
index 658accb890..ca045207c0 100644
--- a/data/area/kandarin/arandar/arandar.npcs.toml
+++ b/data/area/kandarin/arandar/arandar.npcs.toml
@@ -1,12 +1,13 @@
-[dire_wolf_isafdar]
+[dire_wolf]
 id = 1198
 hitpoints = 850
 att = 75
 str = 75
 def = 75
-style = "stab"
-max_hit_melee = 80
+combat_def = "white_wolf"
+max_hit_stab = 80
 hunt_mode = "cowardly"
+drop_table = "wolf_bones"
 slayer_xp = 85.0
 categories = ["wolves"]
 respawn_delay = 90
diff --git a/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.combat.toml b/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.combat.toml
index 9b5925c98e..2f3f88c50c 100644
--- a/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.combat.toml
+++ b/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.combat.toml
@@ -17,3 +17,11 @@ projectile = "weaken"
 impact_gfx = "curse_impact"
 impact_sound = "curse_impact"
 impact_drain = { skill = "defence", multiplier = 0.05 }
+
+[shadow_spider]
+clone = "giant_spider"
+
+[shadow_spider.melee]
+clone = "giant_spider.melee"
+target_hit = { offense = "stab", max = 50 }
+impact_drain = { skill = "prayer", multiplier = 0.5 }
diff --git a/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.npcs.toml b/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.npcs.toml
index 522f7b85b0..b54fd4c171 100644
--- a/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.npcs.toml
+++ b/data/area/kandarin/baxtorian_falls/waterfall_dungeon/waterfall_dungeon.npcs.toml
@@ -4,8 +4,7 @@ hitpoints = 550
 att = 44
 str = 42
 def = 44
-style = "stab"
-max_hit_melee = 50
+combat_def = "shadow_spider"
 hunt_mode = "cowardly"
 slayer_xp = 55.0
 categories = ["spiders"]
diff --git a/data/area/kandarin/camelot/castle/camelot_castle.npc-spawns.toml b/data/area/kandarin/camelot/castle/camelot_castle.npc-spawns.toml
index da47881b17..f3dace50b4 100644
--- a/data/area/kandarin/camelot/castle/camelot_castle.npc-spawns.toml
+++ b/data/area/kandarin/camelot/castle/camelot_castle.npc-spawns.toml
@@ -11,6 +11,6 @@ spawns = [
   { id = "sir_lucan_camelot_castle", x = 2754, y = 3515 },
   { id = "king_arthur_camelot_castle", x = 2764, y = 3515 },
   { id = "sir_palomedes_camelot_castle", x = 2754, y = 3509, members = true },
-  { id = "ice_giant_camelot_castle", x = 2805, y = 3514, level = 2 },
+  { id = "ice_giant_light_hair", x = 2805, y = 3514, level = 2 },
   { id = "unicorn", x = 2785, y = 3461 },
 ]
\ No newline at end of file
diff --git a/data/area/kandarin/camelot/castle/camelot_castle.npcs.toml b/data/area/kandarin/camelot/castle/camelot_castle.npcs.toml
index 60da265959..467db888f0 100644
--- a/data/area/kandarin/camelot/castle/camelot_castle.npcs.toml
+++ b/data/area/kandarin/camelot/castle/camelot_castle.npcs.toml
@@ -39,11 +39,6 @@ examine = "Legendary King of the Britons."
 [sir_palomedes_camelot_castle]
 id = 3787
 
-[ice_giant_camelot_castle]
-id = 4686
-categories = ["ice_giants"]
-examine = "He's got icicles in his beard."
-
 [sir_bedivere]
 id = 6177
 hitpoints = 900
diff --git a/data/area/karamja/karamja.anims.toml b/data/area/karamja/karamja.anims.toml
index 47f13473cd..2f9dfa1054 100644
--- a/data/area/karamja/karamja.anims.toml
+++ b/data/area/karamja/karamja.anims.toml
@@ -11,4 +11,13 @@ id = 1583
 id = 1584
 
 [harpie_bug_swarm_death]
-id = 1585
\ No newline at end of file
+id = 1585
+
+[giant_ant_attack]
+id = 7237
+
+[giant_ant_defend]
+id = 7239
+
+[giant_ant_death]
+id = 7238
\ No newline at end of file
diff --git a/data/area/karamja/karamja.combat.toml b/data/area/karamja/karamja.combat.toml
index f3a8178b92..6bdebbba71 100644
--- a/data/area/karamja/karamja.combat.toml
+++ b/data/area/karamja/karamja.combat.toml
@@ -26,3 +26,16 @@ anim = "shaikahan_attack"
 target_sound = "shaikahan_attack"
 target_hit = { offense = "slash", max = 90 }
 
+[giant_ant]
+attack_speed = 4
+retreat_range = 8
+defend_anim = "giant_ant_defend"
+defend_sound = "giant_ant_defend"
+death_anim = "giant_ant_death"
+death_sound = "giant_ant_death"
+
+[giant_ant.melee]
+range = 1
+anim = "giant_ant_attack"
+target_sound = "giant_ant_attack"
+target_hit = { offense = "crush", max = 60 }
diff --git a/data/area/karamja/karamja.npcs.toml b/data/area/karamja/karamja.npcs.toml
index 8452a4a5c1..52e1b7525e 100644
--- a/data/area/karamja/karamja.npcs.toml
+++ b/data/area/karamja/karamja.npcs.toml
@@ -107,10 +107,24 @@ examine = "I wouldn't want to be footing that bill."
 
 [giant_ant_worker]
 id = 6379
+hitpoints = 300
+# Made up stats
+att = 80
+str = 40
+def = 50
+combat_def = "giant_ant"
 examine = "I wonder how much he can lift."
 
 [giant_ant_soldier]
 id = 6380
+hitpoints = 540
+# Made up stats
+att = 140
+str = 70
+def = 50
+hunt_mode = "aggressive"
+combat_def = "giant_ant"
+max_hit_crush = 130
 examine = "Gi-ant-ant-ant-ant..."
 
 [giant_wasp]
diff --git a/data/area/karamja/karamja.sounds.toml b/data/area/karamja/karamja.sounds.toml
index 138f375327..b6a2643807 100644
--- a/data/area/karamja/karamja.sounds.toml
+++ b/data/area/karamja/karamja.sounds.toml
@@ -6,3 +6,12 @@ id = 2744
 
 [harpie_bug_swarm_defend]
 id = 2745
+
+[giant_ant_defend]
+id = 4212
+
+[giant_ant_death]
+id = 4229
+
+[giant_ant_attack]
+id = 4264
\ No newline at end of file
diff --git a/data/area/kharidian_desert/jaldraocht_pyramid/jaldraocht_pyramid.npc-spawns.toml b/data/area/kharidian_desert/jaldraocht_pyramid/jaldraocht_pyramid.npc-spawns.toml
index 3dcac26acf..71c0c24b45 100644
--- a/data/area/kharidian_desert/jaldraocht_pyramid/jaldraocht_pyramid.npc-spawns.toml
+++ b/data/area/kharidian_desert/jaldraocht_pyramid/jaldraocht_pyramid.npc-spawns.toml
@@ -34,48 +34,48 @@ spawns = [
   { id = "mummy_2", x = 3255, y = 9301 },
   { id = "mummy_2", x = 3255, y = 9321 },
   { id = "mummy_2", x = 3261, y = 9331 },
-  { id = "mummy_3", x = 2771, y = 4947, level = 1 },
-  { id = "mummy_3", x = 2775, y = 4963, level = 1 },
-  { id = "mummy_3", x = 2781, y = 4948, level = 1 },
-  { id = "mummy_3", x = 2792, y = 4942, level = 1 },
-  { id = "mummy_3", x = 2798, y = 4954, level = 1 },
-  { id = "mummy_3", x = 2858, y = 4964, level = 2 },
-  { id = "mummy_3", x = 2926, y = 4965, level = 3 },
-  { id = "mummy_3", x = 3204, y = 9309 },
-  { id = "mummy_3", x = 3214, y = 9333 },
-  { id = "mummy_3", x = 3219, y = 9297 },
-  { id = "mummy_3", x = 3239, y = 9300 },
-  { id = "mummy_3", x = 3240, y = 9286 },
-  { id = "mummy_3", x = 3240, y = 9330 },
-  { id = "mummy_3", x = 3245, y = 9306 },
-  { id = "mummy_3", x = 3250, y = 9316 },
-  { id = "mummy_3", x = 3250, y = 9317 },
-  { id = "mummy_3", x = 3257, y = 9290 },
-  { id = "mummy_4", x = 2761, y = 4950, level = 1 },
-  { id = "mummy_4", x = 2765, y = 4938, level = 1 },
-  { id = "mummy_4", x = 2770, y = 4955, level = 1 },
-  { id = "mummy_4", x = 2772, y = 4940, level = 1 },
-  { id = "mummy_4", x = 2777, y = 4943, level = 1 },
-  { id = "mummy_4", x = 2782, y = 4967, level = 1 },
-  { id = "mummy_4", x = 2797, y = 4965, level = 1 },
-  { id = "mummy_4", x = 2799, y = 4937, level = 1 },
-  { id = "mummy_4", x = 2799, y = 4941, level = 1 },
-  { id = "mummy_4", x = 2807, y = 4968, level = 1 },
-  { id = "mummy_4", x = 2808, y = 4975, level = 1 },
-  { id = "mummy_4", x = 2809, y = 4953, level = 1 },
-  { id = "mummy_4", x = 2864, y = 4946, level = 2 },
-  { id = "mummy_4", x = 3202, y = 9283 },
-  { id = "mummy_4", x = 3206, y = 9333 },
-  { id = "mummy_4", x = 3209, y = 9299 },
-  { id = "mummy_4", x = 3219, y = 9301 },
-  { id = "mummy_4", x = 3226, y = 9285 },
-  { id = "mummy_4", x = 3227, y = 9303 },
-  { id = "mummy_4", x = 3228, y = 9293 },
-  { id = "mummy_4", x = 3229, y = 9333 },
-  { id = "mummy_4", x = 3237, y = 9293 },
-  { id = "mummy_4", x = 3246, y = 9321 },
-  { id = "mummy_4", x = 3256, y = 9296 },
-  { id = "mummy_4", x = 3260, y = 9285 },
-  { id = "mummy_4", x = 3262, y = 9317 },
+  { id = "mummy_female", x = 2771, y = 4947, level = 1 },
+  { id = "mummy_female", x = 2775, y = 4963, level = 1 },
+  { id = "mummy_female", x = 2781, y = 4948, level = 1 },
+  { id = "mummy_female", x = 2792, y = 4942, level = 1 },
+  { id = "mummy_female", x = 2798, y = 4954, level = 1 },
+  { id = "mummy_female", x = 2858, y = 4964, level = 2 },
+  { id = "mummy_female", x = 2926, y = 4965, level = 3 },
+  { id = "mummy_female", x = 3204, y = 9309 },
+  { id = "mummy_female", x = 3214, y = 9333 },
+  { id = "mummy_female", x = 3219, y = 9297 },
+  { id = "mummy_female", x = 3239, y = 9300 },
+  { id = "mummy_female", x = 3240, y = 9286 },
+  { id = "mummy_female", x = 3240, y = 9330 },
+  { id = "mummy_female", x = 3245, y = 9306 },
+  { id = "mummy_female", x = 3250, y = 9316 },
+  { id = "mummy_female", x = 3250, y = 9317 },
+  { id = "mummy_female", x = 3257, y = 9290 },
+  { id = "mummy_female_2", x = 2761, y = 4950, level = 1 },
+  { id = "mummy_female_2", x = 2765, y = 4938, level = 1 },
+  { id = "mummy_female_2", x = 2770, y = 4955, level = 1 },
+  { id = "mummy_female_2", x = 2772, y = 4940, level = 1 },
+  { id = "mummy_female_2", x = 2777, y = 4943, level = 1 },
+  { id = "mummy_female_2", x = 2782, y = 4967, level = 1 },
+  { id = "mummy_female_2", x = 2797, y = 4965, level = 1 },
+  { id = "mummy_female_2", x = 2799, y = 4937, level = 1 },
+  { id = "mummy_female_2", x = 2799, y = 4941, level = 1 },
+  { id = "mummy_female_2", x = 2807, y = 4968, level = 1 },
+  { id = "mummy_female_2", x = 2808, y = 4975, level = 1 },
+  { id = "mummy_female_2", x = 2809, y = 4953, level = 1 },
+  { id = "mummy_female_2", x = 2864, y = 4946, level = 2 },
+  { id = "mummy_female_2", x = 3202, y = 9283 },
+  { id = "mummy_female_2", x = 3206, y = 9333 },
+  { id = "mummy_female_2", x = 3209, y = 9299 },
+  { id = "mummy_female_2", x = 3219, y = 9301 },
+  { id = "mummy_female_2", x = 3226, y = 9285 },
+  { id = "mummy_female_2", x = 3227, y = 9303 },
+  { id = "mummy_female_2", x = 3228, y = 9293 },
+  { id = "mummy_female_2", x = 3229, y = 9333 },
+  { id = "mummy_female_2", x = 3237, y = 9293 },
+  { id = "mummy_female_2", x = 3246, y = 9321 },
+  { id = "mummy_female_2", x = 3256, y = 9296 },
+  { id = "mummy_female_2", x = 3260, y = 9285 },
+  { id = "mummy_female_2", x = 3262, y = 9317 },
   { id = "azzanadra_jaldraocht_pyramid", x = 3233, y = 9317, members = true },
 ]
diff --git a/data/area/kharidian_desert/kharidian_desert.drops.toml b/data/area/kharidian_desert/kharidian_desert.drops.toml
index 6a1a6cee8b..10cf9cd88a 100644
--- a/data/area/kharidian_desert/kharidian_desert.drops.toml
+++ b/data/area/kharidian_desert/kharidian_desert.drops.toml
@@ -12,9 +12,3 @@ drops = [
     { table = "herb_drop_table", roll = 20 },
     { table = "elite_clue_scroll" },
 ]
-
-[desert_wolf_drop_table]
-type = "all"
-drops = [
-    { id = "wolf_bones" }
-]
\ No newline at end of file
diff --git a/data/area/kharidian_desert/kharidian_desert.npcs.toml b/data/area/kharidian_desert/kharidian_desert.npcs.toml
index 2466929654..37b0ee9e4d 100644
--- a/data/area/kharidian_desert/kharidian_desert.npcs.toml
+++ b/data/area/kharidian_desert/kharidian_desert.npcs.toml
@@ -129,7 +129,7 @@ hunt_mode = "cowardly"
 slayer_xp = 34.0
 categories = ["wolves"]
 respawn_delay = 50
-drop_table = "desert_wolf"
+drop_table = "wolf_bones"
 examine = "A vicious desert wolf."
 
 [desert_wolf_dark]
diff --git a/data/area/tirannwn/isafdar/isafdar.npc-spawns.toml b/data/area/tirannwn/isafdar/isafdar.npc-spawns.toml
index 4c893b6d49..9f92dbf82d 100644
--- a/data/area/tirannwn/isafdar/isafdar.npc-spawns.toml
+++ b/data/area/tirannwn/isafdar/isafdar.npc-spawns.toml
@@ -100,8 +100,8 @@ spawns = [
   { id = "rabbit_isafdar_2", x = 2265, y = 3141, members = true },
   { id = "rabbit_isafdar_2", x = 2296, y = 3176, members = true },
   { id = "rabbit_isafdar_2", x = 2296, y = 3249, members = true },
-  { id = "dire_wolf_isafdar", x = 2294, y = 3185 },
-  { id = "dire_wolf_isafdar", x = 2296, y = 3187 },
+  { id = "dire_wolf", x = 2294, y = 3185 },
+  { id = "dire_wolf", x = 2296, y = 3187 },
   { id = "elf_tracker", x = 2257, y = 3149 },
   { id = "will_o_the_wisp", x = 2281, y = 3142 },
   { id = "will_o_the_wisp", x = 2283, y = 3136 },
diff --git a/data/area/troll_country/trollheim/trollheim.anims.toml b/data/area/troll_country/trollheim/trollheim.anims.toml
index b000d1663b..6b6003e2c7 100644
--- a/data/area/troll_country/trollheim/trollheim.anims.toml
+++ b/data/area/troll_country/trollheim/trollheim.anims.toml
@@ -1,8 +1,8 @@
 [thrower_troll_attack]
 id = 1142
 
-[thrower_troll_defend]
+[troll_defend]
 id = 285
 
-[thrower_troll_death]
+[troll_death]
 id = 287
diff --git a/data/area/troll_country/trollheim/trollheim.combat.toml b/data/area/troll_country/trollheim/trollheim.combat.toml
index e35ef58dbc..0e84422cc1 100644
--- a/data/area/troll_country/trollheim/trollheim.combat.toml
+++ b/data/area/troll_country/trollheim/trollheim.combat.toml
@@ -1,10 +1,10 @@
 [thrower_troll]
 attack_speed = 7
 retreat_range = 8
-defend_anim = "thrower_troll_defend"
+defend_anim = "troll_defend"
 defend_sound = "thrower_troll_defend"
-death_anim = "thrower_troll_death"
-death_sound = "thrower_troll_death"
+death_anim = "troll_death"
+death_sound = "troll_death"
 
 [thrower_troll.ranged]
 chance = 90
diff --git a/data/area/troll_country/trollheim/trollheim.sounds.toml b/data/area/troll_country/trollheim/trollheim.sounds.toml
index 1643c48aef..10f5195619 100644
--- a/data/area/troll_country/trollheim/trollheim.sounds.toml
+++ b/data/area/troll_country/trollheim/trollheim.sounds.toml
@@ -7,5 +7,5 @@ id = 871
 [thrower_troll_defend]
 id = 868
 
-[thrower_troll_death]
+[troll_death]
 id = 866
diff --git a/data/area/wilderness/agility_course/wilderness_agility_course.npc-spawns.toml b/data/area/wilderness/agility_course/wilderness_agility_course.npc-spawns.toml
index c05730ec7c..e10625ed61 100644
--- a/data/area/wilderness/agility_course/wilderness_agility_course.npc-spawns.toml
+++ b/data/area/wilderness/agility_course/wilderness_agility_course.npc-spawns.toml
@@ -34,9 +34,9 @@ spawns = [
   { id = "ice_warrior", x = 2977, y = 3953 },
   { id = "ice_warrior", x = 2978, y = 3942 },
   { id = "ice_warrior", x = 2984, y = 3933 },
-  { id = "ice_giant_ice_queens_lair", x = 2950, y = 3932, members = true },
-  { id = "ice_giant_ice_queens_lair", x = 2955, y = 3945, members = true },
-  { id = "ice_giant_camelot_castle", x = 2978, y = 3956 },
+  { id = "ice_giant_light", x = 2950, y = 3932, members = true },
+  { id = "ice_giant_light", x = 2955, y = 3945, members = true },
+  { id = "ice_giant_light_hair", x = 2978, y = 3956 },
   { id = "ice_spider", x = 2959, y = 3917 },
   { id = "ice_spider", x = 2960, y = 3925 },
   { id = "ice_spider", x = 2961, y = 3920 },
diff --git a/data/area/wilderness/chaos_tunnels/chaos_tunnels.anims.toml b/data/area/wilderness/chaos_tunnels/chaos_tunnels.anims.toml
index babe13b2b1..1d63054cfd 100644
--- a/data/area/wilderness/chaos_tunnels/chaos_tunnels.anims.toml
+++ b/data/area/wilderness/chaos_tunnels/chaos_tunnels.anims.toml
@@ -16,6 +16,15 @@ id = 1271
 [leech_death]
 id = 1272
 
+[bloodworm_attack]
+id = 2070
+
+[bloodworm_defend]
+id = 2072
+
+[bloodworm_death]
+id = 2073
+
 [giant_crypt_rat_attack]
 id = 4933
 
@@ -48,3 +57,12 @@ id = 300
 
 [waterfiend_defend]
 id = 301
+
+[mummy_defend]
+id = 5550
+
+[mummy_attack]
+id = 5549
+
+[mummy_death]
+id = 5563
diff --git a/data/area/wilderness/chaos_tunnels/chaos_tunnels.combat.toml b/data/area/wilderness/chaos_tunnels/chaos_tunnels.combat.toml
index 6a5a0a4caa..6c5fdccf7f 100644
--- a/data/area/wilderness/chaos_tunnels/chaos_tunnels.combat.toml
+++ b/data/area/wilderness/chaos_tunnels/chaos_tunnels.combat.toml
@@ -12,6 +12,20 @@ anim = "leech_attack"
 target_sound = "leech_attack"
 target_hit = { offense = "stab", max = 30 }
 
+[bloodworm]
+attack_speed = 4
+retreat_range = 8
+defend_anim = "bloodworm_defend"
+defend_sound = "leech_defend"
+death_anim = "bloodworm_death"
+death_sound = "leech_death"
+
+[bloodworm.melee]
+range = 1
+anim = "bloodworm_attack"
+target_sound = "leech_attack"
+target_hit = { offense = "stab", max = 30 }
+
 [dust_devil]
 attack_speed = 4
 retreat_range = 8
@@ -112,3 +126,35 @@ range = 4
 target_sound = "waterfiend_attack"
 projectile = "ice_arrow"
 target_hit = { offense = "range", defence = "magic", max = 120 }
+
+[dagonhai_monk]
+attack_speed = 6
+retreat_range = 8
+defend_anim = "human_defend"
+defend_sound = "human_defend"
+death_anim = "human_death"
+death_sound = "human_death"
+
+[dagonhai_monk.magic]
+range = 10
+# TODO check if earth strike or different gfx
+gfx = "earth_strike_cast"
+anim = "earth_spell"
+projectile = "earth_strike"
+target_hit = { offense = "magic", max = 110 }
+impact_gfx = "earth_strike_impact"
+miss_gfx = "spell_splash"
+
+[mummy]
+attack_speed = 4
+retreat_range = 8
+defend_anim = "mummy_defend"
+defend_sound = "mummy_defend"
+death_anim = "mummy_death"
+death_sound = "mummy_death"
+
+[mummy.attack]
+range = 1
+anim = "mummy_attack"
+target_sound = "mummy_attack"
+target_hit = { offense = "crush", max = 240 }
diff --git a/data/area/wilderness/chaos_tunnels/chaos_tunnels.drops.toml b/data/area/wilderness/chaos_tunnels/chaos_tunnels.drops.toml
index 9323ac7041..b50ecc5ce6 100644
--- a/data/area/wilderness/chaos_tunnels/chaos_tunnels.drops.toml
+++ b/data/area/wilderness/chaos_tunnels/chaos_tunnels.drops.toml
@@ -235,3 +235,47 @@ drops = [
     { id = "crimson_charm", chance = 790 },
     { id = "blue_charm", chance = 20 },
 ]
+
+[dagonhai_monk_drop_table]
+type = "all"
+drops = [
+    { id = "bones" },
+    { table = "dagonhai_monk_secondary" },
+    { table = "dagonhai_monk_tertiary" },
+]
+
+[dagonhai_monk_secondary]
+roll = 128
+drops = [
+    { id = "black_wizard_hat", chance = 4 },
+    { id = "black_wizard_robe_top", chance = 3 },
+    { id = "staff", chance = 4 },
+    { id = "air_rune", amount = 10, chance = 3 },
+    { id = "air_rune", amount = 18, chance = 2 },
+    { id = "water_rune", amount = 10, chance = 3 },
+    { id = "water_rune", amount = 18, chance = 2 },
+    { id = "fire_rune", amount = 10, chance = 3 },
+    { id = "fire_rune", amount = 18, chance = 2 },
+    { id = "cosmic_rune", amount = 2 },
+    { id = "chaos_rune", amount = 4, chance = 6 },
+    { id = "nature_rune", amount = 4, chance = 7 },
+    { id = "law_rune", amount = 3 },
+    { id = "blood_rune", amount = 2, chance = 2 },
+    { id = "coins", chance = 17 },
+    { id = "coins", amount = 2, chance = 16 },
+    { id = "coins", amount = 4, chance = 9 },
+    { id = "coins", amount = 29, chance = 3 },
+    { id = "coins", min = 60, max = 80, chance = 3 },
+    { id = "coins", min = 80, max = 100, chance = 11 },
+    { id = "water_talisman", chance = 2 },
+    { id = "fire_talisman", chance = 2 },
+]
+
+[dagonhai_monk_tertiary]
+roll = 512
+drops = [
+    { id = "dagonhai_robe_bottom" },
+    { id = "dagonhai_robe_top" },
+    { id = "dagonhai_hat" },
+    { id = "coins", amount = 30 },
+]
\ No newline at end of file
diff --git a/data/area/wilderness/chaos_tunnels/chaos_tunnels.npc-spawns.toml b/data/area/wilderness/chaos_tunnels/chaos_tunnels.npc-spawns.toml
index cbad17433c..3a9bcf62f1 100644
--- a/data/area/wilderness/chaos_tunnels/chaos_tunnels.npc-spawns.toml
+++ b/data/area/wilderness/chaos_tunnels/chaos_tunnels.npc-spawns.toml
@@ -48,13 +48,13 @@ spawns = [
   { id = "ice_giant", x = 3209, y = 5551 },
   { id = "ice_giant", x = 3212, y = 5548 },
   { id = "ice_giant", x = 3222, y = 5550 },
-  { id = "dire_wolf_isafdar", x = 3300, y = 5529 },
-  { id = "dire_wolf_isafdar", x = 3309, y = 5537 },
-  { id = "dire_wolf_isafdar", x = 3310, y = 5524 },
-  { id = "dire_wolf_isafdar", x = 3310, y = 5546 },
-  { id = "dire_wolf_isafdar", x = 3311, y = 5518 },
-  { id = "dire_wolf_isafdar", x = 3320, y = 5550 },
-  { id = "dire_wolf_isafdar", x = 3321, y = 5539 },
+  { id = "dire_wolf", x = 3300, y = 5529 },
+  { id = "dire_wolf", x = 3309, y = 5537 },
+  { id = "dire_wolf", x = 3310, y = 5524 },
+  { id = "dire_wolf", x = 3310, y = 5546 },
+  { id = "dire_wolf", x = 3311, y = 5518 },
+  { id = "dire_wolf", x = 3320, y = 5550 },
+  { id = "dire_wolf", x = 3321, y = 5539 },
   { id = "leech_chaos_tunnels", x = 3290, y = 5448 },
   { id = "leech_chaos_tunnels", x = 3292, y = 5453 },
   { id = "leech_chaos_tunnels", x = 3293, y = 5447 },
@@ -194,14 +194,14 @@ spawns = [
   { id = "mummy_2", x = 3155, y = 5476 },
   { id = "mummy_2", x = 3161, y = 5482 },
   { id = "mummy_2", x = 3167, y = 5470 },
-  { id = "mummy_3", x = 3147, y = 5473 },
-  { id = "mummy_3", x = 3147, y = 5479 },
-  { id = "mummy_3", x = 3161, y = 5479 },
-  { id = "mummy_3", x = 3169, y = 5463 },
-  { id = "mummy_4", x = 3144, y = 5479 },
-  { id = "mummy_4", x = 3145, y = 5465 },
-  { id = "mummy_4", x = 3145, y = 5475 },
-  { id = "mummy_4", x = 3151, y = 5475 },
+  { id = "mummy_female", x = 3147, y = 5473 },
+  { id = "mummy_female", x = 3147, y = 5479 },
+  { id = "mummy_female", x = 3161, y = 5479 },
+  { id = "mummy_female", x = 3169, y = 5463 },
+  { id = "mummy_female_2", x = 3144, y = 5479 },
+  { id = "mummy_female_2", x = 3145, y = 5465 },
+  { id = "mummy_female_2", x = 3145, y = 5475 },
+  { id = "mummy_female_2", x = 3151, y = 5475 },
   { id = "shadow_hound", x = 3283, y = 5510 },
   { id = "shadow_hound", x = 3286, y = 5527 },
   { id = "shadow_hound", x = 3287, y = 5513 },
@@ -242,10 +242,10 @@ spawns = [
   { id = "shadow_hound", x = 3322, y = 5552 },
   { id = "shadow_hound", x = 3324, y = 5510 },
   { id = "shadow_hound", x = 3324, y = 5516 },
-  { id = "bloodworm_chaos_tunnels", x = 3289, y = 5450 },
-  { id = "bloodworm_chaos_tunnels", x = 3292, y = 5449 },
-  { id = "bloodworm_chaos_tunnels", x = 3293, y = 5456 },
-  { id = "bloodworm_chaos_tunnels", x = 3294, y = 5453 },
+  { id = "bloodworm", x = 3289, y = 5450 },
+  { id = "bloodworm", x = 3292, y = 5449 },
+  { id = "bloodworm", x = 3293, y = 5456 },
+  { id = "bloodworm", x = 3294, y = 5453 },
   { id = "giant_crypt_rat_chaos_tunnels", x = 3186, y = 5514 },
   { id = "giant_crypt_rat_chaos_tunnels", x = 3190, y = 5510 },
   { id = "giant_crypt_rat_chaos_tunnels", x = 3269, y = 5488 },
@@ -276,15 +276,15 @@ spawns = [
   { id = "green_dragon_2", x = 3303, y = 5452 },
   { id = "green_dragon_3", x = 3296, y = 5560 },
   { id = "green_dragon_4", x = 3298, y = 5543 },
-  { id = "ice_giant_ice_queens_lair", x = 3209, y = 5449, members = true },
-  { id = "ice_giant_ice_queens_lair", x = 3215, y = 5450, members = true },
-  { id = "ice_giant_ice_queens_lair", x = 3228, y = 5442, members = true },
-  { id = "ice_giant_ice_queens_lair", x = 3212, y = 5560, members = true },
-  { id = "ice_giant_ice_queens_lair", x = 3215, y = 5554, members = true },
-  { id = "ice_giant_camelot_castle", x = 3215, y = 5442 },
-  { id = "ice_giant_camelot_castle", x = 3221, y = 5447 },
-  { id = "ice_giant_camelot_castle", x = 3215, y = 5547 },
-  { id = "ice_giant_camelot_castle", x = 3222, y = 5555 },
+  { id = "ice_giant_light", x = 3209, y = 5449, members = true },
+  { id = "ice_giant_light", x = 3215, y = 5450, members = true },
+  { id = "ice_giant_light", x = 3228, y = 5442, members = true },
+  { id = "ice_giant_light", x = 3212, y = 5560, members = true },
+  { id = "ice_giant_light", x = 3215, y = 5554, members = true },
+  { id = "ice_giant_light_hair", x = 3215, y = 5442 },
+  { id = "ice_giant_light_hair", x = 3221, y = 5447 },
+  { id = "ice_giant_light_hair", x = 3215, y = 5547 },
+  { id = "ice_giant_light_hair", x = 3222, y = 5555 },
   { id = "moss_giant_5", x = 3237, y = 5559 },
   { id = "giant_crypt_rat_chaos_tunnels_2", x = 3191, y = 5513 },
   { id = "giant_crypt_rat_chaos_tunnels_2", x = 3193, y = 5510 },
@@ -450,24 +450,24 @@ spawns = [
   { id = "giant_ant_soldier", x = 3320, y = 5472, members = true },
   { id = "giant_ant_soldier", x = 3322, y = 5474, members = true },
   { id = "giant_ant_soldier", x = 3323, y = 5470, members = true },
-  { id = "dagonhai_monk_chaos_tunnels", x = 3206, y = 5466, members = true },
-  { id = "dagonhai_monk_chaos_tunnels", x = 3213, y = 5458, members = true },
-  { id = "dagonhai_monk_chaos_tunnels", x = 3242, y = 5465, members = true },
-  { id = "dagonhai_monk_chaos_tunnels", x = 3247, y = 5459, members = true },
-  { id = "dagonhai_monk_chaos_tunnels", x = 3252, y = 5472, members = true },
-  { id = "dagonhai_monk_chaos_tunnels", x = 3255, y = 5452, members = true },
-  { id = "dagonhai_monk_chaos_tunnels", x = 3256, y = 5456, members = true },
-  { id = "dagonhai_monk_chaos_tunnels", x = 3257, y = 5461, members = true },
-  { id = "dagonhai_monk_chaos_tunnels_2", x = 3220, y = 5463, members = true },
-  { id = "dagonhai_monk_chaos_tunnels_2", x = 3222, y = 5471, members = true },
-  { id = "dagonhai_monk_chaos_tunnels_2", x = 3244, y = 5462, members = true },
-  { id = "dagonhai_monk_chaos_tunnels_2", x = 3244, y = 5470, members = true },
-  { id = "dagonhai_monk_chaos_tunnels_2", x = 3252, y = 5454, members = true },
-  { id = "dagonhai_monk_chaos_tunnels_2", x = 3257, y = 5465, members = true },
-  { id = "dagonhai_monk_chaos_tunnels_3", x = 3206, y = 5456, members = true },
-  { id = "dagonhai_monk_chaos_tunnels_3", x = 3250, y = 5472, members = true },
-  { id = "dagonhai_monk_chaos_tunnels_3", x = 3256, y = 5473, members = true },
-  { id = "dagonhai_monk_chaos_tunnels_3", x = 3259, y = 5447, members = true },
+  { id = "dagonhai_monk", x = 3206, y = 5466, members = true },
+  { id = "dagonhai_monk", x = 3213, y = 5458, members = true },
+  { id = "dagonhai_monk", x = 3242, y = 5465, members = true },
+  { id = "dagonhai_monk", x = 3247, y = 5459, members = true },
+  { id = "dagonhai_monk", x = 3252, y = 5472, members = true },
+  { id = "dagonhai_monk", x = 3255, y = 5452, members = true },
+  { id = "dagonhai_monk", x = 3256, y = 5456, members = true },
+  { id = "dagonhai_monk", x = 3257, y = 5461, members = true },
+  { id = "dagonhai_monk_beardiest", x = 3220, y = 5463, members = true },
+  { id = "dagonhai_monk_beardiest", x = 3222, y = 5471, members = true },
+  { id = "dagonhai_monk_beardiest", x = 3244, y = 5462, members = true },
+  { id = "dagonhai_monk_beardiest", x = 3244, y = 5470, members = true },
+  { id = "dagonhai_monk_beardiest", x = 3252, y = 5454, members = true },
+  { id = "dagonhai_monk_beardiest", x = 3257, y = 5465, members = true },
+  { id = "dagonhai_monk_beard", x = 3206, y = 5456, members = true },
+  { id = "dagonhai_monk_beard", x = 3250, y = 5472, members = true },
+  { id = "dagonhai_monk_beard", x = 3256, y = 5473, members = true },
+  { id = "dagonhai_monk_beard", x = 3259, y = 5447, members = true },
   { id = "black_demon", x = 3157, y = 5522, members = true },
   { id = "black_demon", x = 3157, y = 5529, members = true },
   { id = "black_demon", x = 3166, y = 5524, members = true },
diff --git a/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml b/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml
index c195b869f9..a018432d0a 100644
--- a/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml
+++ b/data/area/wilderness/chaos_tunnels/chaos_tunnels.npcs.toml
@@ -35,14 +35,13 @@ immune_cannon = true
 drop_table = "turoth"
 examine = "He's one big leg short!"
 
-[bloodworm_chaos_tunnels]
+[bloodworm]
 id = 2031
 hitpoints = 450
 att = 80
 str = 20
 def = 35
-style = "stab"
-max_hit_melee = 30
+combat_def = "leech"
 hunt_mode = "cowardly"
 respawn_delay = 50
 examine = "I think I should keep my distance..."
@@ -117,17 +116,24 @@ clone = "possessed_pickaxe"
 combat_def = "animated_spade"
 drop_table = "animated_spade"
 
-[dagonhai_monk_chaos_tunnels]
+[dagonhai_monk]
 id = 7138
+hitpoints = 880
+# Made up stats
+magic = 100
+def = 80
+combat_def = "dagonhai_monk"
+drop_table = "dagonhai_monk"
+hunt_mode = "cowardly"
 examine = "A monk of the Dagon'hai."
 
-[dagonhai_monk_chaos_tunnels_2]
+[dagonhai_monk_beardiest]
 id = 7139
-examine = "A monk of the Dagon'hai."
+clone = "dagonhai_monk"
 
-[dagonhai_monk_chaos_tunnels_3]
+[dagonhai_monk_beard]
 id = 7140
-examine = "A monk of the Dagon'hai."
+clone = "dagonhai_monk"
 
 [fire_elemental]
 id = 1019
@@ -148,11 +154,11 @@ hitpoints = 900
 att = 90
 str = 90
 def = 90
-style = "crush"
-max_hit_melee = 240
+combat_def = "mummy"
 hunt_mode = "cowardly"
 categories = ["zombies"]
 drop_table = "mummy"
+respawn_delay = 30
 examine = "A tightly-wrapped monster."
 
 [mummy_2]
@@ -160,16 +166,32 @@ id = 1962
 clone = "mummy"
 examine = "Spooky, bandaged dead dude."
 
-[mummy_3]
+[mummy_female]
 id = 1963
 clone = "mummy"
 examine = "A victim of poor first aid."
 
-[mummy_4]
+[mummy_female_2]
 id = 1964
 clone = "mummy"
 examine = "But who's the daddy?"
 
+[mummy_alight]
+id = 1965
+examine = "Spooky, bandaged dead dude."
+
+[mummy_2_alight]
+id = 1966
+examine = "Spooky, bandaged dead dude."
+
+[mummy_female_alight]
+id = 1967
+examine = "A victim of poor first aid."
+
+[mummy_female_2_alight]
+id = 1968
+examine = "But who's the daddy?"
+
 [waterfiend]
 id = 5361
 hitpoints = 1280
@@ -187,5 +209,16 @@ examine = "A fiendish embodiment of water."
 
 [skeleton_chaos_tunnels]
 id = 5386
-categories = ["skeletons"]
+hitpoints = 800
+att = 72
+str = 60
+def = 60
+combat_def = "skeleton_sword_shield"
+wander_range = 8
+hunt_mode = "cowardly"
+drop_table = "skeleton_armed"
+height = 30
+respawn_delay = 60
+categories = ["skeletons", "undead"]
+slayer_xp = 80.0
 examine = "Achingly thin."
diff --git a/data/area/wilderness/chaos_tunnels/chaos_tunnels.objs.toml b/data/area/wilderness/chaos_tunnels/chaos_tunnels.objs.toml
new file mode 100644
index 0000000000..9a8c002546
--- /dev/null
+++ b/data/area/wilderness/chaos_tunnels/chaos_tunnels.objs.toml
@@ -0,0 +1,20 @@
+[chaos_tunnels_exit]
+id = 28782
+
+[chaos_tunnels_rift]
+id = 28892
+
+[chaos_tunnels_rift_east]
+id = 28893
+
+[chaos_tunnels_rift_west]
+id = 28891
+
+[chaos_tunnels_portal]
+id = 28779
+
+[mummy_ash_breakup_male]
+id = 20985
+
+[mummy_ash_breakup_female]
+id = 20986
\ No newline at end of file
diff --git a/data/area/wilderness/chaos_tunnels/chaos_tunnels.sounds.toml b/data/area/wilderness/chaos_tunnels/chaos_tunnels.sounds.toml
index c7e38a7db5..0ef332afba 100644
--- a/data/area/wilderness/chaos_tunnels/chaos_tunnels.sounds.toml
+++ b/data/area/wilderness/chaos_tunnels/chaos_tunnels.sounds.toml
@@ -23,4 +23,16 @@ id = 3774
 id = 3773
 
 [waterfiend_death]
-id = 3772
\ No newline at end of file
+id = 3772
+
+[mummy_defend]
+id = 643
+
+[mummy_attack]
+id = 641
+
+[mummy_death]
+id = 644
+
+[mummy_ash]
+id = 638
diff --git a/data/area/wilderness/chaos_tunnels/chaos_tunnels.teles.toml b/data/area/wilderness/chaos_tunnels/chaos_tunnels.teles.toml
new file mode 100644
index 0000000000..56f59465a0
--- /dev/null
+++ b/data/area/wilderness/chaos_tunnels/chaos_tunnels.teles.toml
@@ -0,0 +1,589 @@
+[chaos_tunnels_rift]
+option = "Enter"
+tile = { x = 3165, y = 3561 }
+to = { x = 3293, y = 5480 }
+
+[chaos_tunnels_exit]
+option = "Climb-up"
+tile = { x = 3292, y = 5479 }
+to = { x = 3166, y = 3561 }
+
+[chaos_tunnels_rift_east]
+option = "Enter"
+tile = { x = 3119, y = 3571 }
+to = { x = 3249, y = 5491 }
+
+[chaos_tunnels_exit]
+option = "Climb-up"
+tile = { x = 3248, y = 5490 }
+to = { x = 3120, y = 3571 }
+
+[chaos_tunnels_rift_west]
+option = "Enter"
+tile = { x = 3059, y = 3550 }
+to = { x = 3184, y = 5471 }
+
+[chaos_tunnels_exit]
+option = "Climb-up"
+tile = { x = 3183, y = 5470 }
+to = { x = 3060, y = 3550 }
+
+[chaos_tunnels_rift_east]
+option = "Enter"
+tile = { x = 3107, y = 3639 }
+to = { x = 3235, y = 5560 }
+
+[chaos_tunnels_exit]
+option = "Climb-up"
+tile = { x = 3234, y = 5559 }
+to = { x = 3107, y = 3640 }
+
+[chaos_tunnels_rift]
+option = "Enter"
+tile = { x = 3165, y = 3618 }
+to = { x = 3290, y = 5539 }
+
+[chaos_tunnels_exit]
+option = "Climb-up"
+tile = { x = 3291, y = 5538 }
+to = { x = 3166, y = 3618 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3321, y = 5554 }
+to = { x = 3315, y = 5552 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3315, y = 5552 }
+to = { x = 3321, y = 5554 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3297, y = 5536 }
+to = { x = 3299, y = 5533 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3299, y = 5533 }
+to = { x = 3297, y = 5536 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3323, y = 5531 }
+to = { x = 3325, y = 5518 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3325, y = 5518 }
+to = { x = 3323, y = 5531 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3297, y = 5510 }
+to = { x = 3300, y = 5514 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3300, y = 5514 }
+to = { x = 3297, y = 5510 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3289, y = 5533 }
+to = { x = 3288, y = 5536 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3288, y = 5536 }
+to = { x = 3289, y = 5533 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3285, y = 5556 }
+to = { x = 3291, y = 5555 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3291, y = 5555 }
+to = { x = 3285, y = 5556 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3266, y = 5552 }
+to = { x = 3262, y = 5552 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3262, y = 5552 }
+to = { x = 3266, y = 5552 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3256, y = 5561 }
+to = { x = 3253, y = 5561 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3253, y = 5561 }
+to = { x = 3256, y = 5561 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3249, y = 5546 }
+to = { x = 3252, y = 5543 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3252, y = 5543 }
+to = { x = 3249, y = 5546 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3261, y = 5536 }
+to = { x = 3268, y = 5534 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3268, y = 5534 }
+to = { x = 3261, y = 5536 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3282, y = 5531 }
+to = { x = 3285, y = 5527 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3285, y = 5527 }
+to = { x = 3282, y = 5531 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3285, y = 5508 }
+to = { x = 3280, y = 5501 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3280, y = 5501 }
+to = { x = 3285, y = 5508 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3265, y = 5491 }
+to = { x = 3260, y = 5491 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3265, y = 5491 }
+to = { x = 3259, y = 5446 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3259, y = 5446 }
+to = { x = 3265, y = 5491 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3266, y = 5446 }
+to = { x = 3260, y = 5491 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3260, y = 5491 }
+to = { x = 3266, y = 5446 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3254, y = 5451 }
+to = { x = 3250, y = 5448 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3250, y = 5448 }
+to = { x = 3254, y = 5451 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3241, y = 5445 }
+to = { x = 3233, y = 5445 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3233, y = 5445 }
+to = { x = 3241, y = 5445 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3212, y = 5452 }
+to = { x = 3214, y = 5456 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3214, y = 5456 }
+to = { x = 3212, y = 5452 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3229, y = 5454 }
+to = { x = 3235, y = 5457 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3235, y = 5457 }
+to = { x = 3229, y = 5454 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3241, y = 5469 }
+to = { x = 3233, y = 5470 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3233, y = 5470 }
+to = { x = 3241, y = 5469 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3244, y = 5495 }
+to = { x = 3239, y = 5498 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3239, y = 5498 }
+to = { x = 3244, y = 5495 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3218, y = 5497 }
+to = { x = 3222, y = 5488 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3222, y = 5488 }
+to = { x = 3218, y = 5497 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3232, y = 5501 }
+to = { x = 3238, y = 5507 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3238, y = 5507 }
+to = { x = 3232, y = 5501 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3241, y = 5529 }
+to = { x = 3243, y = 5526 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3243, y = 5526 }
+to = { x = 3241, y = 5529 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3230, y = 5547 }
+to = { x = 3226, y = 5553 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3226, y = 5553 }
+to = { x = 3230, y = 5547 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3206, y = 5553 }
+to = { x = 3204, y = 5546 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3204, y = 5546 }
+to = { x = 3206, y = 5553 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3211, y = 5533 }
+to = { x = 3214, y = 5533 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3214, y = 5533 }
+to = { x = 3211, y = 5533 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3208, y = 5527 }
+to = { x = 3211, y = 5523 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3211, y = 5523 }
+to = { x = 3208, y = 5527 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3202, y = 5515 }
+to = { x = 3196, y = 5512 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3196, y = 5512 }
+to = { x = 3202, y = 5515 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3190, y = 5515 }
+to = { x = 3190, y = 5519 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3190, y = 5519 }
+to = { x = 3190, y = 5515 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3187, y = 5531 }
+to = { x = 3182, y = 5530 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3182, y = 5530 }
+to = { x = 3187, y = 5531 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3181, y = 5517 }
+to = { x = 3185, y = 5518 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3185, y = 5518 }
+to = { x = 3181, y = 5517 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3165, y = 5515 }
+to = { x = 3173, y = 5530 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3173, y = 5530 }
+to = { x = 3165, y = 5515 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3156, y = 5523 }
+to = { x = 3152, y = 5520 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3152, y = 5520 }
+to = { x = 3156, y = 5523 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3148, y = 5533 }
+to = { x = 3153, y = 5537 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3153, y = 5537 }
+to = { x = 3148, y = 5533 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3168, y = 5541 }
+to = { x = 3171, y = 5542 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3171, y = 5542 }
+to = { x = 3168, y = 5541 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3190, y = 5549 }
+to = { x = 3190, y = 5554 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3190, y = 5554 }
+to = { x = 3190, y = 5549 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3180, y = 5557 }
+to = { x = 3174, y = 5558 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3174, y = 5558 }
+to = { x = 3180, y = 5557 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3166, y = 5553 }
+to = { x = 3162, y = 5545 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3162, y = 5557 }
+to = { x = 3158, y = 5561 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3158, y = 5561 }
+to = { x = 3162, y = 5557 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3147, y = 5541 }
+to = { x = 3143, y = 5535 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3143, y = 5535 }
+to = { x = 3147, y = 5541 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3169, y = 5510 }
+to = { x = 3159, y = 5501 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3159, y = 5501 }
+to = { x = 3169, y = 5510 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3142, y = 5489 }
+to = { x = 3141, y = 5480 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3141, y = 5480 }
+to = { x = 3142, y = 5489 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3142, y = 5462 }
+to = { x = 3154, y = 5462 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3154, y = 5462 }
+to = { x = 3142, y = 5462 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3143, y = 5443 }
+to = { x = 3155, y = 5449 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3155, y = 5449 }
+to = { x = 3143, y = 5443 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3168, y = 5456 }
+to = { x = 3178, y = 5460 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3178, y = 5460 }
+to = { x = 3168, y = 5456 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3187, y = 5460 }
+to = { x = 3189, y = 5444 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3189, y = 5444 }
+to = { x = 3187, y = 5460 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3192, y = 5472 }
+to = { x = 3186, y = 5472 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3186, y = 5472 }
+to = { x = 3192, y = 5472 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3185, y = 5478 }
+to = { x = 3191, y = 5482 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3191, y = 5482 }
+to = { x = 3185, y = 5478 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3191, y = 5495 }
+to = { x = 3194, y = 5490 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3194, y = 5490 }
+to = { x = 3191, y = 5495 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3210, y = 5477 }
+to = { x = 3208, y = 5471 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3208, y = 5471 }
+to = { x = 3210, y = 5477 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3215, y = 5475 }
+to = { x = 3218, y = 5478 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3218, y = 5478 }
+to = { x = 3215, y = 5475 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3224, y = 5479 }
+to = { x = 3222, y = 5474 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3222, y = 5474 }
+to = { x = 3224, y = 5479 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+tile = { x = 3318, y = 5481 }
+to = { x = 3322, y = 5480 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+to = { x = 3318, y = 5481 }
+tile = { x = 3322, y = 5480 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+to = { x = 3299, y = 5484 }
+tile = { x = 3303, y = 5477 }
+
+[chaos_tunnels_portal]
+option = "Enter"
+to = { x = 3303, y = 5477 }
+tile = { x = 3299, y = 5484 }
diff --git a/data/area/wilderness/wilderness.npc-spawns.toml b/data/area/wilderness/wilderness.npc-spawns.toml
index fc376bfe01..b77d197eac 100644
--- a/data/area/wilderness/wilderness.npc-spawns.toml
+++ b/data/area/wilderness/wilderness.npc-spawns.toml
@@ -265,10 +265,10 @@ spawns = [
     { id = "green_dragon_4", x = 3078, y = 3810 },
     { id = "green_dragon_4", x = 3331, y = 3672 },
     { id = "green_dragon_4", x = 3347, y = 3694 },
-    { id = "ice_giant_ice_queens_lair", x = 2949, y = 3871, members = true },
-    { id = "ice_giant_ice_queens_lair", x = 2958, y = 3868, members = true },
-    { id = "ice_giant_camelot_castle", x = 2949, y = 3876 },
-    { id = "ice_giant_camelot_castle", x = 2967, y = 3874 },
+    { id = "ice_giant_light", x = 2949, y = 3871, members = true },
+    { id = "ice_giant_light", x = 2958, y = 3868, members = true },
+    { id = "ice_giant_light_hair", x = 2949, y = 3876 },
+    { id = "ice_giant_light_hair", x = 2967, y = 3874 },
     { id = "greater_demon_2", x = 3288, y = 3888 },
     { id = "greater_demon_3", x = 3035, y = 10245 },
     { id = "greater_demon_3", x = 3289, y = 3897 },
diff --git a/data/entity/npc/animal/wolf/wolf.npcs.toml b/data/entity/npc/animal/wolf/wolf.npcs.toml
index ca353f4b94..3ac39ae509 100644
--- a/data/entity/npc/animal/wolf/wolf.npcs.toml
+++ b/data/entity/npc/animal/wolf/wolf.npcs.toml
@@ -11,6 +11,7 @@ slayer_xp = 69.0
 hunt_mode = "aggressive"
 respawn_delay = 90
 categories = ["wolves"]
+drop_table = "wolf_bones"
 examine = "Not man's best friend."
 
 [white_wolf]
diff --git a/data/entity/npc/misc.drops.toml b/data/entity/npc/misc.drops.toml
index 8dad2d36c0..3c9aa90066 100644
--- a/data/entity/npc/misc.drops.toml
+++ b/data/entity/npc/misc.drops.toml
@@ -16,6 +16,12 @@ drops = [
   { id = "big_bones" }
 ]
 
+[wolf_bones_drop_table]
+type = "all"
+drops = [
+  { id = "wolf_bones" }
+]
+
 [empty_drop_table]
 type = "all"
 drops = [
diff --git a/data/entity/npc/monster/giant/ice_giant/ice_giant.npcs.toml b/data/entity/npc/monster/giant/ice_giant/ice_giant.npcs.toml
index 727fdde7a1..29b88f7d7e 100644
--- a/data/entity/npc/monster/giant/ice_giant/ice_giant.npcs.toml
+++ b/data/entity/npc/monster/giant/ice_giant/ice_giant.npcs.toml
@@ -20,4 +20,12 @@ clone = "ice_giant"
 
 [ice_giant_hair]
 id = 4687
-clone = "ice_giant"
\ No newline at end of file
+clone = "ice_giant"
+
+[ice_giant_light]
+id = 4685
+clone = "ice_giant"
+
+[ice_giant_light_hair]
+id = 4686
+clone = "ice_giant"
diff --git a/data/minigame/barrows_brothers/barrows.npc-spawns.toml b/data/minigame/barrows_brothers/barrows.npc-spawns.toml
index 675e9a8b46..56bf6921d3 100644
--- a/data/minigame/barrows_brothers/barrows.npc-spawns.toml
+++ b/data/minigame/barrows_brothers/barrows.npc-spawns.toml
@@ -1,13 +1,13 @@
 spawns = [
   { id = "cyreg_paddlehorn_barrows", x = 3522, y = 3284, members = true },
   { id = "strange_old_man_barrows", x = 3565, y = 3288 },
-  { id = "bloodworm_chaos_tunnels", x = 3548, y = 9675 },
-  { id = "bloodworm_chaos_tunnels", x = 3549, y = 9679 },
-  { id = "bloodworm_chaos_tunnels", x = 3551, y = 9676 },
-  { id = "bloodworm_chaos_tunnels", x = 3552, y = 9679 },
-  { id = "bloodworm_chaos_tunnels", x = 3552, y = 9682 },
-  { id = "bloodworm_chaos_tunnels", x = 3555, y = 9675 },
-  { id = "bloodworm_chaos_tunnels", x = 3555, y = 9679 },
+  { id = "bloodworm", x = 3548, y = 9675 },
+  { id = "bloodworm", x = 3549, y = 9679 },
+  { id = "bloodworm", x = 3551, y = 9676 },
+  { id = "bloodworm", x = 3552, y = 9679 },
+  { id = "bloodworm", x = 3552, y = 9682 },
+  { id = "bloodworm", x = 3555, y = 9675 },
+  { id = "bloodworm", x = 3555, y = 9679 },
   { id = "crypt_rat_barrows", x = 3531, y = 9694 },
   { id = "crypt_rat_barrows", x = 3534, y = 9690 },
   { id = "crypt_rat_barrows", x = 3534, y = 9698 },
diff --git a/data/quest/members/desert_treasure/shadow_dungeon.npcs.toml b/data/quest/members/desert_treasure/shadow_dungeon.npcs.toml
index 96cd3b396b..b17caa463c 100644
--- a/data/quest/members/desert_treasure/shadow_dungeon.npcs.toml
+++ b/data/quest/members/desert_treasure/shadow_dungeon.npcs.toml
@@ -19,8 +19,8 @@ hitpoints = 620
 att = 53
 str = 54
 def = 54
-style = "stab"
-max_hit_melee = 60
+combat_def = "jackal"
+max_hit_stab = 60
 hunt_mode = "cowardly"
 slayer_xp = 62.0
 categories = ["dogs"]
diff --git a/data/skill/cooking/cooking.tables.toml b/data/skill/cooking/cooking.tables.toml
index cc5e4a1f42..cdf1f61139 100644
--- a/data/skill/cooking/cooking.tables.toml
+++ b/data/skill/cooking/cooking.tables.toml
@@ -127,6 +127,7 @@ chance_cook_o_matic = [138, 531]
 chance_gauntlet = [128, 511]
 cooked = "anchovies"
 cooked_message = "You successfully cook some anchovies."
+burnt = "burnt_anchovies"
 burnt_message = "You accidentally burn the anchovies."
 
 [.raw_bass]
@@ -138,6 +139,7 @@ chance_cook_o_matic = [33, 311]
 chance_gauntlet = [33, 311]
 cooked = "bass"
 cooked_message = "You cook a bass."
+burnt = "burnt_tuna"
 burnt_message = "You accidentally burn the bass."
 
 [.raw_bear_meat]
@@ -161,6 +163,7 @@ chance_range = [180, 254]
 chance_cook_o_matic = [180, 254]
 chance_gauntlet = [180, 254]
 cooked = "roast_beast_meat"
+burnt = "burnt_beast_meat"
 
 [.raw_beef]
 level = 1
@@ -183,6 +186,7 @@ chance_range = [155, 254]
 chance_cook_o_matic = [155, 254]
 chance_gauntlet = [155, 254]
 cooked = "roast_bird_meat"
+burnt = "burnt_bird_meat"
 
 [.raw_cave_eel]
 level = 38
@@ -193,6 +197,7 @@ chance_cook_o_matic = [38, 331]
 chance_gauntlet = [38, 331]
 cooked = "cave_eel"
 cooked_message = "You successfully cook a slimy cave eel."
+burnt = "burnt_cave_eel"
 burnt_message = "You accidentally burn the cave eel."
 
 [.raw_cavefish]
@@ -203,6 +208,7 @@ chance_range = [4, 229]
 chance_cook_o_matic = [4, 229]
 chance_gauntlet = [12, 268]
 cooked = "cavefish"
+burnt = "burnt_cavefish"
 
 [.raw_chicken]
 level = 1
@@ -212,6 +218,7 @@ chance_range = [128, 511]
 chance_cook_o_matic = [138, 531]
 chance_gauntlet = [128, 511]
 cooked_message = "You cook some chicken."
+burnt = "burnt_chicken"
 burnt_message = "You accidentally burn the chicken."
 
 [.raw_cod]
@@ -235,6 +242,7 @@ chance_cook_o_matic = [128, 511]
 chance_gauntlet = [128, 511]
 cooked = "crayfish"
 cooked_message = "You successfully cook some crayfish."
+burnt = "burnt_crayfish"
 burnt_message = "You accidentally burn the crayfish."
 
 [.raw_fish_pie]
@@ -258,6 +266,7 @@ chance_range = [57, 376]
 chance_cook_o_matic = [57, 376]
 chance_gauntlet = [57, 376]
 cooked_message = "You manage to cook a fishcake."
+burnt = "burnt_fishcake"
 burnt_message = "You accidentally burn the uncooked cake."
 
 [.raw_garden_pie]
@@ -294,6 +303,7 @@ chance_cook_o_matic = [118, 491]
 chance_gauntlet = [108, 471]
 cooked = "herring"
 cooked_message = "You successfully cook a herring."
+burnt = "burnt_herring"
 burnt_message = "You accidentally burn the herring."
 
 [.raw_jubbly]
@@ -304,6 +314,8 @@ chance_fire = [50, 259]
 chance_range = [50, 259]
 chance_cook_o_matic = [50, 259]
 chance_gauntlet = [50, 259]
+cooked = "cooked_jubbly"
+burnt = "burnt_jubbly"
 
 [.raw_karambwan]
 level = 30
@@ -313,7 +325,9 @@ chance_range = [70, 254]
 chance_cook_o_matic = [70, 254]
 chance_gauntlet = [70, 254]
 cooked_message = "You cook the karambwan. It looks delicious."
+cooked = "cooked_karambwan"
 burnt_message = "You accidentally burn the karambwan."
+burnt = "burnt_karambwan"
 
 [.raw_lava_eel]
 level = 53
@@ -334,6 +348,7 @@ chance_cook_o_matic = [38, 331]
 chance_gauntlet = [55, 367]
 cooked = "lobster"
 cooked_message = "You roast a lobster."
+burnt = "burnt_lobster"
 burnt_message = "You accidentally burn the lobster."
 
 [.raw_mackerel]
@@ -357,6 +372,7 @@ chance_cook_o_matic = [1, 221]
 chance_gauntlet = [1, 221]
 cooked = "manta_ray"
 cooked_message = "You successfully cook a manta ray."
+burnt = "burnt_manta_ray"
 burnt_message = "You accidentally burn the manta ray."
 
 [.raw_monkfish]
@@ -368,6 +384,7 @@ chance_cook_o_matic = [13, 279]
 chance_gauntlet = [24, 289]
 cooked = "monkfish"
 cooked_message = "You successfully cook a monkfish."
+burnt = "burnt_monkfish"
 burnt_message = "You accidentally burn the monkfish."
 
 [.raw_mud_pie]
@@ -402,6 +419,7 @@ chance_cook_o_matic = [88, 431]
 chance_gauntlet = [78, 411]
 cooked = "pike"
 cooked_message = "You successfully cook a pike."
+burnt = "burnt_trout"
 burnt_message = "You accidentally burn the pike."
 
 [.raw_potato]
@@ -413,6 +431,7 @@ chance_cook_o_matic = [108, 471]
 chance_gauntlet = [108, 471]
 cooked = "baked_potato"
 cooked_message = "You successfully bake a potato."
+burnt = "burnt_potato"
 burnt_message = "You accidentally burn the potato."
 
 [.raw_rabbit]
@@ -422,7 +441,9 @@ chance_fire = [128, 511]
 chance_range = [128, 511]
 chance_cook_o_matic = [128, 511]
 chance_gauntlet = [128, 511]
+cooked = "rabbit"
 cooked_message = "You cook the rabbit."
+burnt = "burnt_rabbit"
 burnt_message = "You accidentally burn the rabbit."
 
 [.raw_rainbow_fish]
@@ -434,6 +455,7 @@ chance_cook_o_matic = [56, 369]
 chance_gauntlet = [56, 369]
 cooked = "rainbow_fish"
 cooked_message = "You manage to cook a rainbow fish."
+burnt = "burnt_rainbow_fish"
 burnt_message = "You accidentally burn the rainbow fish."
 
 [.raw_rat_meat]
@@ -457,6 +479,7 @@ chance_cook_o_matic = [1, 179]
 chance_gauntlet = [1, 268]
 cooked = "rocktail"
 cooked_message = "You successfully cook a rocktail."
+burnt = "burnt_rocktail"
 burnt_message = "You accidentally burn the rocktail."
 
 [.raw_salmon]
@@ -468,6 +491,7 @@ chance_cook_o_matic = [78, 401]
 chance_gauntlet = [68, 391]
 cooked = "salmon"
 cooked_message = "You successfully cook a salmon."
+burnt = "burnt_trout"
 burnt_message = "You accidentally burn the salmon."
 
 [.raw_sardine]
@@ -479,6 +503,7 @@ chance_cook_o_matic = [128, 511]
 chance_gauntlet = [118, 491]
 cooked = "sardine"
 cooked_message = "You successfully cook a sardine."
+burnt = "burnt_sardine"
 burnt_message = "You accidentally burn the sardine."
 
 [.raw_sea_turtle]
@@ -490,6 +515,7 @@ chance_cook_o_matic = [1, 221]
 chance_gauntlet = [1, 221]
 cooked = "sea_turtle"
 cooked_message = "You successfully cook a sea turtle."
+burnt = "burnt_sea_turtle"
 burnt_message = "You accidentally burn the sea turtle."
 
 [.raw_shark]
@@ -501,6 +527,7 @@ chance_cook_o_matic = [1, 231]
 chance_gauntlet = [15, 269]
 cooked = "shark"
 cooked_message = "You successfully cook a shark."
+burnt = "burnt_shark"
 burnt_message = "You accidentally burn the shark."
 
 [.raw_shrimps]
@@ -537,6 +564,7 @@ chance_cook_o_matic = [30, 309]
 chance_gauntlet = [30, 309]
 cooked = "swordfish"
 cooked_message = "You successfully cook a swordfish."
+burnt = "burnt_swordfish"
 burnt_message = "You accidentally burn the swordfish."
 
 [.raw_trout]
@@ -548,6 +576,7 @@ chance_cook_o_matic = [98, 451]
 chance_gauntlet = [88, 431]
 cooked = "trout"
 cooked_message = "You successfully cook a trout."
+burnt = "burnt_trout"
 burnt_message = "You accidentally burn the trout."
 
 [.raw_tuna]
@@ -559,6 +588,7 @@ chance_cook_o_matic = [58, 371]
 chance_gauntlet = [58, 371]
 cooked = "tuna"
 cooked_message = "You manage to cook a tuna."
+burnt = "burnt_tuna"
 burnt_message = "You accidentally burn the tuna."
 
 [.raw_ugthanki_meat]
@@ -569,6 +599,7 @@ chance_range = [30, 252]
 chance_cook_o_matic = [30, 252]
 chance_gauntlet = [30, 252]
 cooked = "ugthanki_meat"
+burnt = "burnt_meat"
 
 [.raw_wild_pie]
 level = 85
diff --git a/game/src/main/kotlin/content/area/morytania/braindeath_island/Brewer.kt b/game/src/main/kotlin/content/area/morytania/braindeath_island/Brewer.kt
index 86d41ec658..b71c3e7505 100644
--- a/game/src/main/kotlin/content/area/morytania/braindeath_island/Brewer.kt
+++ b/game/src/main/kotlin/content/area/morytania/braindeath_island/Brewer.kt
@@ -13,7 +13,6 @@ import content.entity.player.dialogue.type.npc
 import content.entity.player.dialogue.type.player
 import content.quest.questCompleted
 import world.gregs.voidps.engine.Script
-import world.gregs.voidps.engine.entity.Despawn.Companion.player
 
 class Brewer : Script {
     init {
diff --git a/game/src/main/kotlin/content/area/wilderness/chaos_tunnels/ChaosTunnels.kt b/game/src/main/kotlin/content/area/wilderness/chaos_tunnels/ChaosTunnels.kt
new file mode 100644
index 0000000000..fcd1b5841e
--- /dev/null
+++ b/game/src/main/kotlin/content/area/wilderness/chaos_tunnels/ChaosTunnels.kt
@@ -0,0 +1,41 @@
+package content.area.wilderness.chaos_tunnels
+
+import content.entity.obj.ObjectTeleports
+import content.entity.player.dialogue.type.warning
+import world.gregs.voidps.engine.Script
+import world.gregs.voidps.engine.entity.character.player.Player
+import world.gregs.voidps.engine.entity.character.player.Teleport
+import world.gregs.voidps.engine.entity.obj.GameObject
+import world.gregs.voidps.engine.queue.queue
+
+class ChaosTunnels(val teleports: ObjectTeleports) : Script {
+    init {
+        objTeleportLand("Enter", "chaos_tunnels_portal") { _, _ ->
+            gfx("curse_impact")
+        }
+
+        objTeleportTakeOff("Enter", "chaos_tunnels_rift_west") { target, _ ->
+            rift(target, "west")
+        }
+
+        objTeleportTakeOff("Enter", "chaos_tunnels_rift") { target, _ ->
+            rift(target, "central")
+        }
+
+        objTeleportTakeOff("Enter", "chaos_tunnels_rift_east") { target, _ ->
+            rift(target, "east")
+        }
+    }
+
+    private fun Player.rift(target: GameObject, direction: String): Int = if (get("warning_chaos_tunnels_$direction", 0) == 7) {
+        Teleport.CONTINUE
+    } else {
+        queue("warning_chaos_tunnels_$direction") {
+            if (warning("chaos_tunnels_$direction")) {
+                val definition = teleports.get("Enter")[target.tile.id]!!
+                teleports.teleportContinue(this@rift, definition, target)
+            }
+        }
+        Teleport.CANCEL
+    }
+}
diff --git a/game/src/main/kotlin/content/area/wilderness/chaos_tunnels/Mummy.kt b/game/src/main/kotlin/content/area/wilderness/chaos_tunnels/Mummy.kt
new file mode 100644
index 0000000000..a223302c59
--- /dev/null
+++ b/game/src/main/kotlin/content/area/wilderness/chaos_tunnels/Mummy.kt
@@ -0,0 +1,29 @@
+package content.area.wilderness.chaos_tunnels
+
+import content.entity.combat.killer
+import content.entity.effect.transform
+import world.gregs.voidps.engine.Script
+import world.gregs.voidps.engine.entity.World
+import world.gregs.voidps.engine.entity.character.sound
+import world.gregs.voidps.engine.entity.obj.GameObjects
+import world.gregs.voidps.type.Direction
+
+class Mummy : Script {
+    init {
+        npcDeath("mummy*") {
+            transform("${id}_alight")
+            World.queue("mummy_ash_breakup_$index", 1) {
+                anim("mummy_death")
+                killer?.sound("mummy_ash")
+                hide = true
+                val rotation = when (direction) {
+                    Direction.WEST -> 1
+                    Direction.NORTH -> 2
+                    Direction.EAST -> 3
+                    else -> 0
+                }
+                GameObjects.add("mummy_ash_breakup_${if (id.startsWith("mummy_female")) "female" else "male"}", tile, rotation = rotation, ticks = 4)
+            }
+        }
+    }
+}