From fcdf6b81469c8af039868ee2239f3f670adc1298 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Tue, 15 Mar 2022 17:03:38 +0000
Subject: [PATCH] Updated NPC templates.

---
 .../dist/game/data/stats/npcs/00100-00199.xml |   8 +-
 .../dist/game/data/stats/npcs/04300-04399.xml |  32 +-
 .../dist/game/data/stats/npcs/05000-05099.xml |   2 +-
 .../dist/game/data/stats/npcs/08400-08499.xml |   2 +-
 .../dist/game/data/stats/npcs/08600-08699.xml |   6 +-
 .../dist/game/data/stats/npcs/08700-08799.xml |   8 +-
 .../dist/game/data/stats/npcs/12700-12799.xml |  10 +-
 .../dist/game/data/stats/npcs/13000-13099.xml |   4 +-
 .../dist/game/data/stats/npcs/13400-13499.xml |  20 +-
 .../dist/game/data/stats/npcs/13600-13699.xml | 228 +++++++
 .../dist/game/data/stats/npcs/14900-14999.xml |  18 +-
 .../dist/game/data/stats/npcs/15000-15099.xml |  22 +-
 .../dist/game/data/stats/npcs/15100-15199.xml |   2 +-
 .../dist/game/data/stats/npcs/15200-15299.xml | 386 +++++++++++
 .../dist/game/data/stats/npcs/16000-16099.xml |   2 +-
 .../dist/game/data/stats/npcs/18400-18499.xml |   2 +-
 .../dist/game/data/stats/npcs/18600-18699.xml |   4 +-
 .../dist/game/data/stats/npcs/18800-18899.xml |  64 +-
 .../dist/game/data/stats/npcs/18900-18999.xml |  12 +-
 .../dist/game/data/stats/npcs/19000-19099.xml |   8 +-
 .../dist/game/data/stats/npcs/19100-19199.xml |   2 +-
 .../dist/game/data/stats/npcs/19200-19299.xml |  18 +-
 .../dist/game/data/stats/npcs/19500-19599.xml |   4 +-
 .../dist/game/data/stats/npcs/19600-19699.xml |   8 +-
 .../dist/game/data/stats/npcs/19700-19799.xml |   2 +-
 .../dist/game/data/stats/npcs/19800-19899.xml |  18 +-
 .../dist/game/data/stats/npcs/20400-20499.xml |   2 +-
 .../dist/game/data/stats/npcs/20900-20999.xml |  24 +-
 .../dist/game/data/stats/npcs/21100-21199.xml |   4 +-
 .../dist/game/data/stats/npcs/21500-21599.xml |  20 +-
 .../dist/game/data/stats/npcs/21600-21699.xml |   4 +-
 .../dist/game/data/stats/npcs/22700-22799.xml |  14 +-
 .../dist/game/data/stats/npcs/22800-22899.xml |   2 +-
 .../dist/game/data/stats/npcs/23100-23199.xml |   2 +-
 .../dist/game/data/stats/npcs/23500-23599.xml |   4 +-
 .../dist/game/data/stats/npcs/23700-23799.xml |  16 +-
 .../dist/game/data/stats/npcs/23800-23899.xml |   8 +-
 .../dist/game/data/stats/npcs/23900-23999.xml |  16 +-
 .../dist/game/data/stats/npcs/24000-24099.xml |   4 +-
 .../dist/game/data/stats/npcs/24100-24199.xml |   4 +-
 .../dist/game/data/stats/npcs/24200-24299.xml |   4 +-
 .../dist/game/data/stats/npcs/24300-24399.xml |  40 +-
 .../dist/game/data/stats/npcs/24400-24499.xml |  58 +-
 .../dist/game/data/stats/npcs/24500-24599.xml |  42 +-
 .../dist/game/data/stats/npcs/24600-24699.xml | 335 ++++++++-
 .../dist/game/data/stats/npcs/24800-24899.xml | 636 ++++++++++++------
 .../dist/game/data/stats/npcs/24900-24999.xml | 271 ++++++++
 .../dist/game/data/stats/npcs/25600-25699.xml |  12 +-
 .../dist/game/data/stats/npcs/25800-25899.xml |   2 +-
 .../dist/game/data/stats/npcs/26100-26199.xml |   4 +-
 .../dist/game/data/stats/npcs/26200-26299.xml |   2 +-
 .../dist/game/data/stats/npcs/26400-26499.xml |   8 +-
 .../dist/game/data/stats/npcs/27400-27499.xml |  10 +-
 .../dist/game/data/stats/npcs/29300-29399.xml |  78 ++-
 .../dist/game/data/stats/npcs/30600-30699.xml |   2 +-
 .../dist/game/data/stats/npcs/30900-30999.xml |   4 +-
 .../dist/game/data/stats/npcs/31600-31699.xml |  10 +-
 .../dist/game/data/stats/npcs/32900-32999.xml |   2 +-
 .../dist/game/data/stats/npcs/33600-33699.xml |   8 +-
 .../dist/game/data/stats/npcs/33700-33799.xml |   2 +-
 .../dist/game/data/stats/npcs/33800-33899.xml |   4 +-
 .../dist/game/data/stats/npcs/33900-33999.xml |   4 +-
 .../dist/game/data/stats/npcs/34000-34099.xml |   2 +-
 .../dist/game/data/stats/npcs/34200-34299.xml |  10 +-
 .../dist/game/data/stats/npcs/34300-34399.xml |   2 +-
 .../dist/game/data/stats/npcs/34400-34499.xml |   4 +-
 .../dist/game/data/stats/npcs/34500-34599.xml |  10 +-
 .../dist/game/data/stats/npcs/34600-34699.xml | 255 ++++++-
 .../dist/game/data/stats/npcs/35500-35599.xml |  16 +-
 .../dist/game/data/stats/npcs/36500-36599.xml |  18 +-
 .../dist/game/data/stats/npcs/36700-36799.xml |  18 +-
 71 files changed, 2332 insertions(+), 557 deletions(-)
 create mode 100644 L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24900-24999.xml

diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/00100-00199.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/00100-00199.xml
index bbfcb36d69..68e0571701 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/00100-00199.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/00100-00199.xml
@@ -111,7 +111,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="103" level="70" type="Folk" name="Holiday Santa" title="Happy Holidays~">
+	<npc id="103" level="70" type="Folk" name="Holiday Santa" title="Happy New Year!">
 		<!-- Confirmed CT2.5 -->
 		<race>DWARF</race>
 		<sex>MALE</sex>
@@ -150,7 +150,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="104" level="70" type="Folk" name="Holiday Santa" title="Happy Holidays~">
+	<npc id="104" level="70" type="Folk" name="Holiday Santa" title="Happy New Year!">
 		<!-- Confirmed CT2.5 -->
 		<race>DWARF</race>
 		<sex>MALE</sex>
@@ -189,7 +189,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="105" level="70" type="Folk" name="Holiday Sled" title="Happy Holidays~">
+	<npc id="105" level="70" type="Folk" name="Holiday Sled" title="Happy New Year!">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>MALE</sex>
@@ -1133,7 +1133,7 @@
 			<height normal="12.5" />
 		</collision>
 	</npc>
-	<npc id="129" level="70" type="Folk" name="White-Bearded Santa" title="Happy Holidays~">
+	<npc id="129" level="70" type="Folk" name="White-Bearded Santa" title="Happy New Year!">
 		<!-- Confirmed CT2.5 -->
 		<race>DWARF</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/04300-04399.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/04300-04399.xml
index 8c5fc05ac0..a10846126b 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/04300-04399.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/04300-04399.xml
@@ -824,7 +824,7 @@
 			<height normal="16.3" />
 		</collision>
 	</npc>
-	<npc id="4324" level="70" type="Folk" name="Worshipper" title="Violent">
+	<npc id="4324" level="70" type="Folk" name="Worshiper" title="Violent">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -921,7 +921,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="4327" level="70" type="Folk" name="Worshipper" title="Violent">
+	<npc id="4327" level="70" type="Folk" name="Worshiper" title="Violent">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1946,7 +1946,7 @@
 			<height normal="28.3" />
 		</collision>
 	</npc>
-	<npc id="4363" level="85" type="Folk" name="Festival Goer">
+	<npc id="4363" level="85" type="Folk" name="Festival Spectator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ORC</race>
 		<sex>MALE</sex>
@@ -1976,7 +1976,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="4364" level="85" type="Folk" name="Festival Goer">
+	<npc id="4364" level="85" type="Folk" name="Festival Spectator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -2004,7 +2004,7 @@
 			<height normal="21.5" />
 		</collision>
 	</npc>
-	<npc id="4366" level="85" type="Folk" name="Festival Goer">
+	<npc id="4366" level="85" type="Folk" name="Festival Spectator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>MALE</sex>
@@ -2032,7 +2032,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="4367" level="85" type="Folk" name="Festival Goer">
+	<npc id="4367" level="85" type="Folk" name="Festival Spectator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>KAMAEL</race>
 		<sex>FEMALE</sex>
@@ -2060,7 +2060,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="4368" level="85" type="Folk" name="Festival Goer">
+	<npc id="4368" level="85" type="Folk" name="Festival Spectator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -2088,7 +2088,7 @@
 			<height normal="12.3" />
 		</collision>
 	</npc>
-	<npc id="4369" level="85" type="Folk" name="Festival Goer">
+	<npc id="4369" level="85" type="Folk" name="Festival Spectator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>KAMAEL</race>
 		<sex>MALE</sex>
@@ -2116,7 +2116,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="4370" level="85" type="Folk" name="Festival Goer">
+	<npc id="4370" level="85" type="Folk" name="Festival Spectator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>MALE</sex>
@@ -2144,7 +2144,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="4371" level="85" type="Folk" name="Festival Goer">
+	<npc id="4371" level="85" type="Folk" name="Festival Spectator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>MALE</sex>
@@ -2172,7 +2172,7 @@
 			<height normal="12.3" />
 		</collision>
 	</npc>
-	<npc id="4372" level="85" type="Folk" name="Festival Goer">
+	<npc id="4372" level="85" type="Folk" name="Festival Spectator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DWARF</race>
 		<sex>MALE</sex>
@@ -2201,7 +2201,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="4373" level="85" type="Folk" name="Festival Goer">
+	<npc id="4373" level="85" type="Folk" name="Festival Spectator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
@@ -2229,7 +2229,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="4374" level="85" type="Folk" name="Festival Goer">
+	<npc id="4374" level="85" type="Folk" name="Festival Spectator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
@@ -2257,7 +2257,7 @@
 			<height normal="24.5" />
 		</collision>
 	</npc>
-	<npc id="4375" level="85" type="Folk" name="Festival Goer">
+	<npc id="4375" level="85" type="Folk" name="Festival Spectator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DWARF</race>
 		<sex>MALE</sex>
@@ -2285,7 +2285,7 @@
 			<height normal="17.5" />
 		</collision>
 	</npc>
-	<npc id="4376" level="85" type="Folk" name="Festival Goer">
+	<npc id="4376" level="85" type="Folk" name="Festival Spectator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>MALE</sex>
@@ -2313,7 +2313,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="4377" level="85" type="Folk" name="Festival Goer">
+	<npc id="4377" level="85" type="Folk" name="Festival Spectator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ELF</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/05000-05099.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/05000-05099.xml
index f210fa2548..3920a77635 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/05000-05099.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/05000-05099.xml
@@ -31,7 +31,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="5002" level="80" type="Folk" name="Santa Girl" title="Happy Holidays">
+	<npc id="5002" level="80" type="Folk" name="Santa Girl" title="Happy New Year!">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08400-08499.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08400-08499.xml
index 4178b84f8c..45c267a473 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08400-08499.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08400-08499.xml
@@ -503,7 +503,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="8413" level="93" type="Monster" name="Divine Buff" title="Iss Enchanter">
+	<npc id="8413" level="93" type="Monster" name="Divine Wizard" title="Iss Enchanter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill_TYPE1" id="23474" level="1" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08600-08699.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08600-08699.xml
index a1634334f8..52b588aa4c 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08600-08699.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08600-08699.xml
@@ -1822,7 +1822,7 @@
 			<height normal="10.5" />
 		</collision>
 	</npc>
-	<npc id="8696" level="85" type="Folk" name="Ripe Squash">
+	<npc id="8696" level="85" type="Folk" name="Ripe Pumpkin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1841,7 +1841,7 @@
 			<height normal="26.12" />
 		</collision>
 	</npc>
-	<npc id="8697" level="85" type="Folk" name="Defective Pumpkin">
+	<npc id="8697" level="85" type="Folk" name="Withered Pumpkin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1879,7 +1879,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="8699" level="85" type="Folk" name="Big Honey Pumpkin">
+	<npc id="8699" level="85" type="Folk" name="Ripe Honey Pumpkin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08700-08799.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08700-08799.xml
index f24cafe8e4..733fa261f4 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08700-08799.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/08700-08799.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="8700" level="85" type="Folk" name="Defective Honey Pumpkin">
+	<npc id="8700" level="85" type="Folk" name="Withered Honey Pumpkin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -19,7 +19,7 @@
 			<height normal="31" />
 		</collision>
 	</npc>
-	<npc id="8701" level="85" type="Folk" name="Super Big Pumpkin">
+	<npc id="8701" level="85" type="Folk" name="Royal Pumpkin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -38,7 +38,7 @@
 			<height normal="26.12" />
 		</collision>
 	</npc>
-	<npc id="8702" level="85" type="Folk" name="Super Big Honey Pumpkin">
+	<npc id="8702" level="85" type="Folk" name="Royal Honey Pumpkin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -76,7 +76,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="8704" level="85" type="Folk" name="Santa Girl" title="Merry Christmas">
+	<npc id="8704" level="85" type="Folk" name="Santa Girl" title="Happy New Year!">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/12700-12799.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/12700-12799.xml
index 1b6add8175..a0efcc6bed 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/12700-12799.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/12700-12799.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="12774" level="1" type="Folk" name="Young Squash">
+	<npc id="12774" level="1" type="Folk" name="Little Pumpkin">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -37,7 +37,7 @@
 			<height normal="10.5" />
 		</collision>
 	</npc>
-	<npc id="12775" level="1" type="Monster" name="Ripe Squash">
+	<npc id="12775" level="1" type="Monster" name="Ripe Pumpkin">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -75,7 +75,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="12776" level="1" type="Monster" name="Defective Squash">
+	<npc id="12776" level="1" type="Monster" name="Withered Pumpkin">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -150,7 +150,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="12778" level="1" type="Monster" name="Large Ripe Squash">
+	<npc id="12778" level="1" type="Monster" name="Large Ripe Pumpkin">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -188,7 +188,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="12779" level="1" type="Monster" name="Defective Large Squash">
+	<npc id="12779" level="1" type="Monster" name="Large Withered Pumpkin">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/13000-13099.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/13000-13099.xml
index 3528589d37..c92147f260 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/13000-13099.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/13000-13099.xml
@@ -352,7 +352,7 @@
 			<height normal="18.5" />
 		</collision>
 	</npc>
-	<npc id="13016" level="1" type="Monster" name="King Squash">
+	<npc id="13016" level="1" type="Monster" name="Royal Pumpkin">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -390,7 +390,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13017" level="1" type="Monster" name="Emperor Squash">
+	<npc id="13017" level="1" type="Monster" name="Royal Large Pumpkin">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/13400-13499.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/13400-13499.xml
index 1c7de03a7b..b2f6dcc357 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/13400-13499.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/13400-13499.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="13400" level="1" type="Monster" name="Snowy Ripe Squash">
+	<npc id="13400" level="1" type="Monster" name="Snowy Ripe Pumpkin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -28,7 +28,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13401" level="1" type="Monster" name="Snowy Rotten Squash">
+	<npc id="13401" level="1" type="Monster" name="Snowy Withered Pumpkin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -56,7 +56,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="13402" level="1" type="Monster" name="Snowy Royal Ripe Squash">
+	<npc id="13402" level="1" type="Monster" name="Snowy Royal Ripe Pumpkin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -112,7 +112,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13404" level="1" type="Monster" name="Snowy Large Ripe Squash">
+	<npc id="13404" level="1" type="Monster" name="Snowy Large Ripe Pumpkin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -140,7 +140,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="13405" level="1" type="Monster" name="Snowy Large Rotten Squash">
+	<npc id="13405" level="1" type="Monster" name="Snowy Large Withered Pumpkin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -168,7 +168,7 @@
 			<height normal="31" />
 		</collision>
 	</npc>
-	<npc id="13406" level="1" type="Monster" name="Snowy Royal Large Ripe Squash">
+	<npc id="13406" level="1" type="Monster" name="Snowy Royal Large Ripe Pumpkin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -424,7 +424,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13419" level="1" type="Monster" name="Ripe Squash">
+	<npc id="13419" level="1" type="Monster" name="Ripe Pumpkin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -446,7 +446,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13420" level="1" type="Monster" name="Defective Squash">
+	<npc id="13420" level="1" type="Monster" name="Withered Pumpkin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -468,7 +468,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="13421" level="1" type="Monster" name="Large Ripe Squash">
+	<npc id="13421" level="1" type="Monster" name="Large Ripe Pumpkin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -490,7 +490,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="13422" level="1" type="Monster" name="Defective Large Squash">
+	<npc id="13422" level="1" type="Monster" name="Large Withered Pumpkin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/13600-13699.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/13600-13699.xml
index 62e73a050e..17cc3cd551 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/13600-13699.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/13600-13699.xml
@@ -247,4 +247,232 @@
 			<height normal="36" />
 		</collision>
 	</npc>
+	<npc id="13613" level="85" type="Folk" name="Poison Swarm">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="20" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="0.001" />
+			<height normal="0.001" />
+		</collision>
+	</npc>
+	<npc id="13614" level="85" type="Folk" name="Poison Swarm">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="20" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="0.001" />
+			<height normal="0.001" />
+		</collision>
+	</npc>
+	<npc id="13615" level="85" type="Folk" name="Clone Attack">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="3176" hpRegen="10.5" mp="1169" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="131" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="8.5" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="13616" level="85" type="Folk" name="Clone Attack">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="3176" hpRegen="10.5" mp="1169" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="131" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="8.5" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="13617" level="85" type="Folk" name="Istina Acid Swarm">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="20" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="0.001" />
+			<height normal="0.001" />
+		</collision>
+	</npc>
+	<npc id="13618" level="85" type="Folk" name="Istina Acid Swarm">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="20" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="0.001" />
+			<height normal="0.001" />
+		</collision>
+	</npc>
+	<npc id="13619" level="85" type="Folk" name="Shadow Snare">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="20" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="0.001" />
+			<height normal="0.001" />
+		</collision>
+	</npc>
+	<npc id="13620" level="85" type="Folk" name="Shadow Snare">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="20" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="0.001" />
+			<height normal="0.001" />
+		</collision>
+	</npc>
+	<npc id="13621" level="85" type="Folk" name="Frost Trap">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1" hpRegen="10.5" mp="1" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="5" />
+			<height normal="10" />
+		</collision>
+	</npc>
+	<npc id="13622" level="85" type="Folk" name="Frost Trap">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1" hpRegen="10.5" mp="1" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="5" />
+			<height normal="10" />
+		</collision>
+	</npc>
+	<npc id="13623" level="85" type="Folk" name="Yoke Trap">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1" hpRegen="10.5" mp="1" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="5" />
+			<height normal="10" />
+		</collision>
+	</npc>
+	<npc id="13624" level="85" type="Folk" name="Yoke Trap">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1" hpRegen="10.5" mp="1" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="5" />
+			<height normal="10" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/14900-14999.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/14900-14999.xml
index 40120fb58a..27a7e5bdc7 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/14900-14999.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/14900-14999.xml
@@ -1255,7 +1255,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="14930" level="85" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="14930" level="85" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="1" />
 			<skill name="Skill02_ID" id="11281" level="1" />
@@ -2095,7 +2095,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="14954" level="87" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="14954" level="87" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="2" />
 			<skill name="Skill02_ID" id="11281" level="2" />
@@ -2130,7 +2130,7 @@
 			<height normal="12.25" />
 		</collision>
 	</npc>
-	<npc id="14955" level="89" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="14955" level="89" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="3" />
 			<skill name="Skill02_ID" id="11281" level="3" />
@@ -2165,7 +2165,7 @@
 			<height normal="12.25" />
 		</collision>
 	</npc>
-	<npc id="14956" level="91" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="14956" level="91" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="4" />
 			<skill name="Skill02_ID" id="11281" level="4" />
@@ -2200,7 +2200,7 @@
 			<height normal="12.25" />
 		</collision>
 	</npc>
-	<npc id="14957" level="93" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="14957" level="93" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="5" />
 			<skill name="Skill02_ID" id="11281" level="5" />
@@ -2235,7 +2235,7 @@
 			<height normal="12.25" />
 		</collision>
 	</npc>
-	<npc id="14958" level="95" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="14958" level="95" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="6" />
 			<skill name="Skill02_ID" id="11281" level="6" />
@@ -2270,7 +2270,7 @@
 			<height normal="12.25" />
 		</collision>
 	</npc>
-	<npc id="14959" level="97" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="14959" level="97" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="7" />
 			<skill name="Skill02_ID" id="11281" level="7" />
@@ -2305,7 +2305,7 @@
 			<height normal="12.25" />
 		</collision>
 	</npc>
-	<npc id="14960" level="99" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="14960" level="99" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="8" />
 			<skill name="Skill02_ID" id="11281" level="8" />
@@ -2719,7 +2719,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="14972" level="99" type="Monster" name="Saber Tooth Cougar">
+	<npc id="14972" level="99" type="Monster" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="8" />
 			<skill name="Skill02_ID" id="11281" level="8" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/15000-15099.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/15000-15099.xml
index 0c2a326b7c..73788ac39c 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/15000-15099.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/15000-15099.xml
@@ -1044,7 +1044,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="15032" level="99" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="15032" level="99" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="101" />
 			<skill name="Skill02_ID" id="11281" level="101" />
@@ -1079,7 +1079,7 @@
 			<height normal="12.25" />
 		</collision>
 	</npc>
-	<npc id="15033" level="99" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="15033" level="99" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="102" />
 			<skill name="Skill02_ID" id="11281" level="102" />
@@ -1114,7 +1114,7 @@
 			<height normal="12.25" />
 		</collision>
 	</npc>
-	<npc id="15034" level="99" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="15034" level="99" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="103" />
 			<skill name="Skill02_ID" id="11281" level="103" />
@@ -1149,7 +1149,7 @@
 			<height normal="12.25" />
 		</collision>
 	</npc>
-	<npc id="15035" level="99" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="15035" level="99" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="104" />
 			<skill name="Skill02_ID" id="11281" level="104" />
@@ -1184,7 +1184,7 @@
 			<height normal="12.25" />
 		</collision>
 	</npc>
-	<npc id="15036" level="99" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="15036" level="99" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="105" />
 			<skill name="Skill02_ID" id="11281" level="105" />
@@ -1219,7 +1219,7 @@
 			<height normal="12.25" />
 		</collision>
 	</npc>
-	<npc id="15037" level="99" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="15037" level="99" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="106" />
 			<skill name="Skill02_ID" id="11281" level="106" />
@@ -1254,7 +1254,7 @@
 			<height normal="12.25" />
 		</collision>
 	</npc>
-	<npc id="15038" level="99" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="15038" level="99" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="107" />
 			<skill name="Skill02_ID" id="11281" level="107" />
@@ -1289,7 +1289,7 @@
 			<height normal="12.25" />
 		</collision>
 	</npc>
-	<npc id="15039" level="99" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="15039" level="99" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="108" />
 			<skill name="Skill02_ID" id="11281" level="108" />
@@ -1324,7 +1324,7 @@
 			<height normal="12.25" />
 		</collision>
 	</npc>
-	<npc id="15040" level="99" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="15040" level="99" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="109" />
 			<skill name="Skill02_ID" id="11281" level="109" />
@@ -1359,7 +1359,7 @@
 			<height normal="12.25" />
 		</collision>
 	</npc>
-	<npc id="15041" level="99" type="Servitor" name="Saber Tooth Cougar">
+	<npc id="15041" level="99" type="Servitor" name="Saber-toothed Cougar">
 		<parameters>
 			<skill name="Skill01_ID" id="11280" level="110" />
 			<skill name="Skill02_ID" id="11281" level="110" />
@@ -1777,7 +1777,7 @@
 			<height normal="39.5" />
 		</collision>
 	</npc>
-	<npc id="15053" level="85" type="Servitor" name="Clan Guardian">
+	<npc id="15053" level="85" type="Servitor" name="Divine Clan Guardian">
 		<parameters>
 			<param name="skill_delay" value="1" />
 			<param name="despawn_time" value="180" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/15100-15199.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/15100-15199.xml
index f1a97d3373..1d44cdedd6 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/15100-15199.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/15100-15199.xml
@@ -1502,7 +1502,7 @@
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
-	<npc id="15154" level="101" type="Servitor" name="Tree of Life">
+	<npc id="15154" level="101" type="Servitor" name="Mother Tree">
 		<parameters>
 			<skill name="s_tree_heal" id="19219" level="1" />
 		</parameters>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/15200-15299.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/15200-15299.xml
index f828d58042..15313d9a4d 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/15200-15299.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/15200-15299.xml
@@ -1775,4 +1775,390 @@
 			<height normal="33" />
 		</collision>
 	</npc>
+	<npc id="15258" level="85" type="Folk" name="Cursed Man">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="15774" hpRegen="10.5" mp="1520" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="160" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="20" />
+			<height normal="42" />
+		</collision>
+	</npc>
+	<npc id="15259" level="85" type="Folk" name="Cursed Man">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="16569" hpRegen="10.5" mp="1621" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="160" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="20" />
+			<height normal="42" />
+		</collision>
+	</npc>
+	<npc id="15260" level="85" type="Folk" name="Reanimated Man">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="15774" hpRegen="10.5" mp="1520" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="11" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="15261" level="85" type="Folk" name="Reanimated Man">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="16569" hpRegen="10.5" mp="1621" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="11" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="15262" level="85" type="Folk" name="Discarded Wizard's Soul">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="30933" hpRegen="10.5" mp="2959" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="22.4" />
+			<height normal="30.6" />
+		</collision>
+	</npc>
+	<npc id="15263" level="85" type="Folk" name="Discarded Wizard's Soul">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="32494" hpRegen="10.5" mp="3162" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="22.4" />
+			<height normal="30.6" />
+		</collision>
+	</npc>
+	<npc id="15264" level="85" type="Folk" name="Death Gate">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="28876" hpRegen="10.5" mp="7065" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="57" />
+			<height normal="67.5" />
+		</collision>
+	</npc>
+	<npc id="15265" level="85" type="Folk" name="Death Gate">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="28876" hpRegen="10.5" mp="7065" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="57" />
+			<height normal="67.5" />
+		</collision>
+	</npc>
+	<npc id="15266" level="85" type="Folk" name="Commando Cat">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="17180" hpRegen="10.5" mp="1650" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="198" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="12" />
+			<height normal="16.75" />
+		</collision>
+	</npc>
+	<npc id="15267" level="85" type="Folk" name="Commando Cat">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="18047" hpRegen="10.5" mp="1761" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="198" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="12" />
+			<height normal="16.75" />
+		</collision>
+	</npc>
+	<npc id="15268" level="85" type="Folk" name="Witch Cat">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="37014" /> <!-- Arcana Reaper -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="12516" hpRegen="10.5" mp="1210" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="198" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="12" />
+			<height normal="15.9" />
+		</collision>
+	</npc>
+	<npc id="15269" level="85" type="Folk" name="Witch Cat">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="37014" /> <!-- Arcana Reaper -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="13146" hpRegen="10.5" mp="1290" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="198" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="12" />
+			<height normal="15.9" />
+		</collision>
+	</npc>
+	<npc id="15270" level="85" type="Folk" name="Unicorn Lancer">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="17180" hpRegen="10.5" mp="1650" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="198" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7.5" />
+			<height normal="16.5" />
+		</collision>
+	</npc>
+	<npc id="15271" level="85" type="Folk" name="Unicorn Lancer">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="18047" hpRegen="10.5" mp="1761" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="198" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7.5" />
+			<height normal="16.5" />
+		</collision>
+	</npc>
+	<npc id="15272" level="85" type="Folk" name="Unicorn Cherub">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="37015" /> <!-- Elemental Reaper -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="12516" hpRegen="10.5" mp="1210" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="198" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7.5" />
+			<height normal="16.5" />
+		</collision>
+	</npc>
+	<npc id="15273" level="85" type="Folk" name="Unicorn Cherub">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="37015" /> <!-- Elemental Reaper -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="13146" hpRegen="10.5" mp="1290" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="198" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7.5" />
+			<height normal="16.5" />
+		</collision>
+	</npc>
+	<npc id="15274" level="85" type="Folk" name="Soul Specter">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="17180" hpRegen="10.5" mp="1650" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="198" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="12" />
+			<height normal="28.6" />
+		</collision>
+	</npc>
+	<npc id="15275" level="85" type="Folk" name="Soul Specter">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="18047" hpRegen="10.5" mp="1761" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="198" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="12" />
+			<height normal="28.6" />
+		</collision>
+	</npc>
+	<npc id="15276" level="85" type="Folk" name="Banshee Queen">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="37016" /> <!-- Spectral Reaper -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="12516" hpRegen="10.5" mp="1210" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="198" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="12" />
+			<height normal="23.5" />
+		</collision>
+	</npc>
+	<npc id="15277" level="85" type="Folk" name="Banshee Queen">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="37016" /> <!-- Spectral Reaper -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="13146" hpRegen="10.5" mp="1290" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="198" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="12" />
+			<height normal="23.5" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/16000-16099.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/16000-16099.xml
index d8458661c2..36af8d742e 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/16000-16099.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/16000-16099.xml
@@ -3754,7 +3754,7 @@
 			<height normal="5.87" />
 		</collision>
 	</npc>
-	<npc id="16071" level="55" type="Pet" name="Wild Maguen">
+	<npc id="16071" level="55" type="Pet" name="Maguen">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="lv_step1" value="60" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/18400-18499.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/18400-18499.xml
index b7d948dc75..b5e08c2af8 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/18400-18499.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/18400-18499.xml
@@ -3664,7 +3664,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="18493" level="87" type="Monster" name="Ward" title="Tower of Naia">
+	<npc id="18493" level="87" type="Monster" name="Guardian" title="Tower of Naia">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="120" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/18600-18699.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/18600-18699.xml
index e6ae500799..05ae91c517 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/18600-18699.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/18600-18699.xml
@@ -1426,7 +1426,7 @@
 			<height normal="28.5" />
 		</collision>
 	</npc>
-	<npc id="18628" level="61" type="Monster" name="Atan" title="Lookout">
+	<npc id="18628" level="61" type="Monster" name="Atan" title="Protector">
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -3849,7 +3849,7 @@
 			<height normal="31" />
 		</collision>
 	</npc>
-	<npc id="18677" level="73" type="Monster" name="Dragon Steed Troop Messenger">
+	<npc id="18677" level="73" type="Monster" name="Dragon's Messenger">
 		<!-- Confirmed CT2.5 -->
 		<race>DRAGON</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/18800-18899.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/18800-18899.xml
index ebb06692b0..6e48b35fc5 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/18800-18899.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/18800-18899.xml
@@ -1353,7 +1353,7 @@
 			<height normal="8" />
 		</collision>
 	</npc>
-	<npc id="18839" level="85" type="Monster" name="Wild Maguen">
+	<npc id="18839" level="85" type="Monster" name="Maguen">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="B_PLASMA1" id="6367" level="1" />
@@ -2590,7 +2590,7 @@
 			<height normal="33" />
 		</collision>
 	</npc>
-	<npc id="18869" level="83" type="TamedBeast" name="Alpine Kookaburra" title="Tame">
+	<npc id="18869" level="83" type="TamedBeast" name="Mountain Kookaburra" title="Tame">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="my_type" value="1" />
@@ -2658,7 +2658,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="18870" level="83" type="TamedBeast" name="Cougar" title="Tame">
+	<npc id="18870" level="83" type="TamedBeast" name="Mountain Cougar" title="Tame">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="my_type" value="2" />
@@ -2726,7 +2726,7 @@
 			<height normal="15.7" />
 		</collision>
 	</npc>
-	<npc id="18871" level="84" type="TamedBeast" name="Buffalo" title="Tame">
+	<npc id="18871" level="84" type="TamedBeast" name="Mountain Buffalo" title="Tame">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="my_type" value="3" />
@@ -2794,7 +2794,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="18872" level="84" type="TamedBeast" name="Grendel" title="Tame">
+	<npc id="18872" level="84" type="TamedBeast" name="Mountain Grendel" title="Tame">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="my_type" value="4" />
@@ -2861,7 +2861,7 @@
 			<height normal="12.5" />
 		</collision>
 	</npc>
-	<npc id="18873" level="83" type="FeedableBeast" name="Alpine Kookaburra">
+	<npc id="18873" level="83" type="FeedableBeast" name="Mountain Kookaburra">
 		<parameters>
 			<param name="my_type" value="1" />
 			<param name="my_grade" value="1" />
@@ -2917,7 +2917,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18874" level="83" type="FeedableBeast" name="Alpine Kookaburra">
+	<npc id="18874" level="83" type="FeedableBeast" name="Mountain Kookaburra">
 		<parameters>
 			<param name="my_type" value="1" />
 			<param name="my_grade" value="2" />
@@ -2985,7 +2985,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18875" level="83" type="FeedableBeast" name="Young Kookaburra">
+	<npc id="18875" level="83" type="FeedableBeast" name="Mountain Kookaburra">
 		<parameters>
 			<param name="my_type" value="1" />
 			<param name="my_grade" value="2" />
@@ -3048,7 +3048,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18876" level="83" type="FeedableBeast" name="Adult Kookaburra">
+	<npc id="18876" level="83" type="FeedableBeast" name="Mountain Kookaburra">
 		<parameters>
 			<param name="my_type" value="1" />
 			<param name="my_grade" value="3" />
@@ -3113,7 +3113,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18877" level="83" type="FeedableBeast" name="Adult Kookaburra">
+	<npc id="18877" level="83" type="FeedableBeast" name="Mountain Kookaburra">
 		<parameters>
 			<param name="my_type" value="1" />
 			<param name="my_grade" value="3" />
@@ -3175,7 +3175,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18878" level="83" type="FeedableBeast" name="Full Grown Kookaburra">
+	<npc id="18878" level="83" type="FeedableBeast" name="Mountain Kookaburra">
 		<parameters>
 			<param name="my_type" value="1" />
 			<param name="my_grade" value="4" />
@@ -3247,7 +3247,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18879" level="83" type="FeedableBeast" name="Full Grown Kookaburra">
+	<npc id="18879" level="83" type="FeedableBeast" name="Mountain Kookaburra">
 		<parameters>
 			<param name="my_type" value="1" />
 			<param name="my_grade" value="4" />
@@ -3312,7 +3312,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18880" level="83" type="FeedableBeast" name="Baby Alpine Cougar">
+	<npc id="18880" level="83" type="FeedableBeast" name="Mountain Cougar">
 		<parameters>
 			<param name="my_type" value="2" />
 			<param name="my_grade" value="1" />
@@ -3368,7 +3368,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18881" level="83" type="FeedableBeast" name="Young Cougar">
+	<npc id="18881" level="83" type="FeedableBeast" name="Mountain Cougar">
 		<parameters>
 			<param name="my_type" value="2" />
 			<param name="my_grade" value="2" />
@@ -3437,7 +3437,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18882" level="83" type="FeedableBeast" name="Young Cougar">
+	<npc id="18882" level="83" type="FeedableBeast" name="Mountain Cougar">
 		<parameters>
 			<param name="my_type" value="2" />
 			<param name="my_grade" value="2" />
@@ -3500,7 +3500,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18883" level="83" type="FeedableBeast" name="Adult Cougar">
+	<npc id="18883" level="83" type="FeedableBeast" name="Mountain Cougar">
 		<parameters>
 			<param name="my_type" value="2" />
 			<param name="my_grade" value="3" />
@@ -3565,7 +3565,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18884" level="83" type="FeedableBeast" name="Adult Cougar">
+	<npc id="18884" level="83" type="FeedableBeast" name="Mountain Cougar">
 		<parameters>
 			<param name="my_type" value="2" />
 			<param name="my_grade" value="3" />
@@ -3628,7 +3628,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18885" level="83" type="FeedableBeast" name="Full Grown Cougar">
+	<npc id="18885" level="83" type="FeedableBeast" name="Mountain Cougar">
 		<parameters>
 			<param name="my_type" value="2" />
 			<param name="my_grade" value="4" />
@@ -3700,7 +3700,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18886" level="83" type="FeedableBeast" name="Full Grown Cougar">
+	<npc id="18886" level="83" type="FeedableBeast" name="Mountain Cougar">
 		<parameters>
 			<param name="my_type" value="2" />
 			<param name="my_grade" value="4" />
@@ -3765,7 +3765,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18887" level="84" type="FeedableBeast" name="Baby Alpine Buffalo">
+	<npc id="18887" level="84" type="FeedableBeast" name="Mountain Buffalo">
 		<parameters>
 			<param name="my_type" value="3" />
 			<param name="my_grade" value="1" />
@@ -3821,7 +3821,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18888" level="84" type="FeedableBeast" name="Young Buffalo">
+	<npc id="18888" level="84" type="FeedableBeast" name="Mountain Buffalo">
 		<parameters>
 			<param name="my_type" value="3" />
 			<param name="my_grade" value="2" />
@@ -3890,7 +3890,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18889" level="84" type="FeedableBeast" name="Young Buffalo">
+	<npc id="18889" level="84" type="FeedableBeast" name="Mountain Buffalo">
 		<parameters>
 			<param name="my_type" value="3" />
 			<param name="my_grade" value="2" />
@@ -3953,7 +3953,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18890" level="84" type="FeedableBeast" name="Adult Buffalo">
+	<npc id="18890" level="84" type="FeedableBeast" name="Mountain Buffalo">
 		<parameters>
 			<param name="my_type" value="3" />
 			<param name="my_grade" value="3" />
@@ -4018,7 +4018,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18891" level="84" type="FeedableBeast" name="Adult Buffalo">
+	<npc id="18891" level="84" type="FeedableBeast" name="Mountain Buffalo">
 		<parameters>
 			<param name="my_type" value="3" />
 			<param name="my_grade" value="3" />
@@ -4081,7 +4081,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18892" level="84" type="FeedableBeast" name="Full Grown Buffalo">
+	<npc id="18892" level="84" type="FeedableBeast" name="Mountain Buffalo">
 		<parameters>
 			<param name="my_type" value="3" />
 			<param name="my_grade" value="4" />
@@ -4150,7 +4150,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18893" level="84" type="FeedableBeast" name="Full Grown Buffalo">
+	<npc id="18893" level="84" type="FeedableBeast" name="Mountain Buffalo">
 		<parameters>
 			<param name="my_type" value="3" />
 			<param name="my_grade" value="4" />
@@ -4215,7 +4215,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18894" level="84" type="FeedableBeast" name="Baby Alpine Grendel">
+	<npc id="18894" level="84" type="FeedableBeast" name="Mountain Grendel">
 		<parameters>
 			<param name="my_type" value="4" />
 			<param name="my_grade" value="1" />
@@ -4270,7 +4270,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18895" level="84" type="FeedableBeast" name="Young Grendel">
+	<npc id="18895" level="84" type="FeedableBeast" name="Mountain Grendel">
 		<parameters>
 			<param name="my_type" value="4" />
 			<param name="my_grade" value="2" />
@@ -4338,7 +4338,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18896" level="84" type="FeedableBeast" name="Young Grendel">
+	<npc id="18896" level="84" type="FeedableBeast" name="Mountain Grendel">
 		<parameters>
 			<param name="my_type" value="4" />
 			<param name="my_grade" value="2" />
@@ -4400,7 +4400,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18897" level="84" type="FeedableBeast" name="Adult Grendel">
+	<npc id="18897" level="84" type="FeedableBeast" name="Mountain Grendel">
 		<parameters>
 			<param name="my_type" value="4" />
 			<param name="my_grade" value="3" />
@@ -4464,7 +4464,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18898" level="84" type="FeedableBeast" name="Adult Grendel">
+	<npc id="18898" level="84" type="FeedableBeast" name="Mountain Grendel">
 		<parameters>
 			<param name="my_type" value="4" />
 			<param name="my_grade" value="3" />
@@ -4527,7 +4527,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18899" level="84" type="FeedableBeast" name="Full Grown Grendel">
+	<npc id="18899" level="84" type="FeedableBeast" name="Mountain Grendel">
 		<parameters>
 			<param name="my_type" value="4" />
 			<param name="my_grade" value="4" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/18900-18999.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/18900-18999.xml
index 970c97d4e6..b29f0d53e6 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/18900-18999.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/18900-18999.xml
@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="18900" level="84" type="FeedableBeast" name="Full Grown Grendel">
+	<npc id="18900" level="84" type="FeedableBeast" name="Mountain Grendel">
 		<parameters>
 			<param name="my_type" value="4" />
 			<param name="my_grade" value="4" />
@@ -64,7 +64,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18901" level="83" type="Monster" name="Kookaburra" title="Golden">
+	<npc id="18901" level="83" type="Monster" name="Mountain Kookaburra" title="Golden">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6556" level="16" />
@@ -121,7 +121,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18902" level="83" type="Monster" name="Cougar" title="Golden">
+	<npc id="18902" level="83" type="Monster" name="Mountain Cougar" title="Golden">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6556" level="16" />
@@ -178,7 +178,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18903" level="84" type="Monster" name="Buffalo" title="Golden">
+	<npc id="18903" level="84" type="Monster" name="Mountain Buffalo" title="Golden">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="IsAggressive" value="1" />
@@ -226,7 +226,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="18904" level="84" type="Monster" name="Grendel" title="Golden">
+	<npc id="18904" level="84" type="Monster" name="Mountain Grendel" title="Golden">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6556" level="17" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19000-19099.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19000-19099.xml
index 4e26a159dd..8ee727199f 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19000-19099.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19000-19099.xml
@@ -365,7 +365,7 @@
 			<height normal="13" />
 		</collision>
 	</npc>
-	<npc id="19013" level="96" type="FriendlyNpc" name="Crystalline Golem" usingServerSideTitle="true">
+	<npc id="19013" level="96" type="FriendlyNpc" name="Crystalline Golem">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Link_Skill_01" id="14283" level="1" />
@@ -402,7 +402,7 @@
 			<height normal="47" />
 		</collision>
 	</npc>
-	<npc id="19014" level="96" type="FriendlyNpc" name="Crystalline Golem" usingServerSideTitle="true">
+	<npc id="19014" level="96" type="FriendlyNpc" name="Crystalline Golem">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Link_Skill_01" id="14283" level="1" />
@@ -664,7 +664,7 @@
 			<height normal="37.5" />
 		</collision>
 	</npc>
-	<npc id="19021" level="85" type="Monster" name="Magical Power Ballista">
+	<npc id="19021" level="85" type="Monster" name="Magical Ballista">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
@@ -1114,7 +1114,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="19037" level="85" type="Monster" name="Wild Maguen" title="Raider">
+	<npc id="19037" level="85" type="Monster" name="Maguen" title="Raider">
 		<parameters>
 			<skill name="Steal_Skill" id="14235" level="1" />
 		</parameters>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19100-19199.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19100-19199.xml
index 68712d7976..d235716922 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19100-19199.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19100-19199.xml
@@ -1997,7 +1997,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="19162" level="99" type="Folk" name="Magical Power Ballista">
+	<npc id="19162" level="99" type="Folk" name="Magical Ballista">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19200-19299.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19200-19299.xml
index c86754f8e5..1f6b4c1038 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19200-19299.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19200-19299.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="19200" level="85" type="FriendlyNpc" name="Reep" title="Weapons Merchant">
+	<npc id="19200" level="85" type="FriendlyNpc" name="Reep" title="Weapon Merchant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="Attack_BoostValue" value="126" />
@@ -120,7 +120,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="19204" level="85" type="FriendlyNpc" name="Runant" title="Defender">
+	<npc id="19204" level="85" type="FriendlyNpc" name="Runant" title="Protector">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="Attack_BoostValue" value="126" />
@@ -150,7 +150,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="19205" level="85" type="FriendlyNpc" name="Ethan" title="Defender">
+	<npc id="19205" level="85" type="FriendlyNpc" name="Ethan" title="Protector">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="Attack_BoostValue" value="126" />
@@ -180,7 +180,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="19206" level="85" type="FriendlyNpc" name="Cromwell" title="Defender">
+	<npc id="19206" level="85" type="FriendlyNpc" name="Cromwell" title="Protector">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="Attack_BoostValue" value="126" />
@@ -210,7 +210,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="19207" level="85" type="FriendlyNpc" name="Proton" title="Defender">
+	<npc id="19207" level="85" type="FriendlyNpc" name="Proton" title="Protector">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="Attack_BoostValue" value="126" />
@@ -240,7 +240,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="19208" level="85" type="FriendlyNpc" name="Dinkey" title="Defender">
+	<npc id="19208" level="85" type="FriendlyNpc" name="Dinkey" title="Protector">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="Attack_BoostValue" value="126" />
@@ -270,7 +270,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="19209" level="85" type="FriendlyNpc" name="Tardyon" title="Defender">
+	<npc id="19209" level="85" type="FriendlyNpc" name="Tardyon" title="Protector">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="Attack_BoostValue" value="126" />
@@ -300,7 +300,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="19210" level="85" type="FriendlyNpc" name="Nathan" title="Defender">
+	<npc id="19210" level="85" type="FriendlyNpc" name="Nathan" title="Protector">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="Attack_BoostValue" value="126" />
@@ -2593,7 +2593,7 @@
 			<height normal="31" grown="36" />
 		</collision>
 	</npc>
-	<npc id="19269" level="90" type="EffectPoint" name="Clan Flag">
+	<npc id="19269" level="90" type="EffectPoint" name="Clan's Flag">
 		<race>CONSTRUCT</race>
 		<sex>ETC</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19500-19599.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19500-19599.xml
index c376b07721..b9697dad29 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19500-19599.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19500-19599.xml
@@ -105,7 +105,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="19521" level="99" type="Monster" name="Jabberwok" title="Clone">
+	<npc id="19521" level="99" type="Monster" name="Jabberwok" title="Incarnation">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>BEAST</race>
 		<sex>FEMALE</sex>
@@ -331,7 +331,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="19552" level="20" type="FriendlyNpc" name="Ricky" usingServerSideTitle="true">
+	<npc id="19552" level="20" type="FriendlyNpc" name="Ricky">
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19600-19699.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19600-19699.xml
index 4367af3944..ccaeaf754b 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19600-19699.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19600-19699.xml
@@ -1567,7 +1567,7 @@
 			<height normal="148.5" />
 		</collision>
 	</npc>
-	<npc id="19696" level="85" type="Folk" name="Clan Flag">
+	<npc id="19696" level="85" type="Folk" name="Clan's Flag">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1586,7 +1586,7 @@
 			<height normal="120" />
 		</collision>
 	</npc>
-	<npc id="19697" level="85" type="Folk" name="Clan Flag">
+	<npc id="19697" level="85" type="Folk" name="Clan's Flag">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1605,7 +1605,7 @@
 			<height normal="120" />
 		</collision>
 	</npc>
-	<npc id="19698" level="85" type="Folk" name="Clan Flag">
+	<npc id="19698" level="85" type="Folk" name="Clan's Flag">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1624,7 +1624,7 @@
 			<height normal="120" />
 		</collision>
 	</npc>
-	<npc id="19699" level="85" type="Folk" name="Clan Flag">
+	<npc id="19699" level="85" type="Folk" name="Clan's Flag">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19700-19799.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19700-19799.xml
index 922bbcaab8..f001f4d7d7 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19700-19799.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19700-19799.xml
@@ -152,7 +152,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="19708" level="85" type="Folk" name="Isle of Souls Monster">
+	<npc id="19708" level="85" type="Folk" name="Isle of Souls' Monster">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19800-19899.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
index ae0a89eaa1..5b3e2d90cf 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
@@ -518,7 +518,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1964" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -537,7 +537,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1964" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -556,7 +556,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="1964" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -570,12 +570,12 @@
 			<height normal="118.1" />
 		</collision>
 	</npc>
-	<npc id="19830" level="85" type="Folk" name="Soul Light">
+	<npc id="19830" level="85" type="Folk" name="Luminous Soul">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="67" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="90" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -589,12 +589,12 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="19831" level="85" type="Folk" name="Soul Light">
+	<npc id="19831" level="85" type="Folk" name="Luminous Soul">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="67" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="90" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -608,12 +608,12 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="19832" level="85" type="Folk" name="Soul Light">
+	<npc id="19832" level="85" type="Folk" name="Luminous Soul">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="67" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="90" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/20400-20499.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/20400-20499.xml
index 3413d5cd37..6adeb56baa 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/20400-20499.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/20400-20499.xml
@@ -1677,7 +1677,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="20483" level="17" type="Monster" name="Deadman's Lamp">
+	<npc id="20483" level="17" type="Monster" name="Deadman�s Lamp">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/20900-20999.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/20900-20999.xml
index 3f96ec43f1..356b76b93f 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/20900-20999.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/20900-20999.xml
@@ -1034,8 +1034,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="19.5" />
-			<height normal="45" />
+			<radius normal="16.9" />
+			<height normal="38.6" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -1119,8 +1119,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="19.5" />
-			<height normal="45" />
+			<radius normal="16.9" />
+			<height normal="38.6" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -1209,8 +1209,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="19.5" />
-			<height normal="45" />
+			<radius normal="16.9" />
+			<height normal="38.6" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -1298,8 +1298,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="19.5" />
-			<height normal="48" />
+			<radius normal="16.9" />
+			<height normal="41.2" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -1507,8 +1507,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="15" />
-			<height normal="64.5" />
+			<radius normal="13" />
+			<height normal="55.5" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="3" /> <!-- Beasts -->
@@ -1592,8 +1592,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="15" />
-			<height normal="64.5" />
+			<radius normal="13" />
+			<height normal="55.5" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="3" /> <!-- Beasts -->
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/21100-21199.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/21100-21199.xml
index 9a64342d11..f00be6d563 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/21100-21199.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/21100-21199.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
 	<npc id="21100" level="19" type="Monster" name="Langk Lizardman Sentinel">
 		<parameters>
@@ -179,7 +179,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21103" level="31" type="Monster" name="Roughly Hewn Rock Golem">
+	<npc id="21103" level="31" type="Monster" name="Black Golem">
 		<parameters>
 			<param name="MoveAroundSocial" value="116" />
 			<param name="MoveAroundSocial1" value="116" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/21500-21599.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/21500-21599.xml
index 751fb202e6..16cd418976 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/21500-21599.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/21500-21599.xml
@@ -802,7 +802,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21521" level="60" type="Monster" name="Claws of Splendor">
+	<npc id="21521" level="60" type="Monster" name="Claw of Splendor">
 		<parameters>
 			<param name="MoveAroundSocial" value="110" />
 			<param name="MoveAroundSocial1" value="74" />
@@ -873,7 +873,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21522" level="60" type="Monster" name="Claws of Splendor">
+	<npc id="21522" level="60" type="Monster" name="Claw of Splendor">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -1165,7 +1165,7 @@
 			<height normal="26" />
 		</collision>
 	</npc>
-	<npc id="21526" level="62" type="Monster" name="Wisdom of Splendor">
+	<npc id="21526" level="62" type="Monster" name="Wiseman of Splendor">
 		<parameters>
 			<param name="MoveAroundSocial" value="110" />
 			<param name="MoveAroundSocial1" value="74" />
@@ -1371,7 +1371,7 @@
 			<height normal="13" />
 		</collision>
 	</npc>
-	<npc id="21529" level="63" type="Monster" name="Soul of Splendor">
+	<npc id="21529" level="63" type="Monster" name="Spirit of Splendor">
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
 			<param name="MoveAroundSocial1" value="74" />
@@ -1439,7 +1439,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21530" level="64" type="Monster" name="Victory of Splendor">
+	<npc id="21530" level="64" type="Monster" name="Victor of Splendor">
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
 			<param name="MoveAroundSocial1" value="74" />
@@ -1503,7 +1503,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21531" level="64" type="Monster" name="Punishment of Splendor">
+	<npc id="21531" level="64" type="Monster" name="Punisher of Splendor">
 		<parameters>
 			<param name="MoveAroundSocial" value="110" />
 			<param name="MoveAroundSocial1" value="74" />
@@ -1643,7 +1643,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21533" level="65" type="Monster" name="Alliance of Splendor">
+	<npc id="21533" level="65" type="Monster" name="Alliance Warrior of Splendor">
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
 			<param name="MoveAroundSocial1" value="74" />
@@ -1715,7 +1715,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21534" level="65" type="Monster" name="Alliance of Splendor">
+	<npc id="21534" level="65" type="Monster" name="Alliance Warrior of Splendor">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -2075,7 +2075,7 @@
 			<height normal="13" />
 		</collision>
 	</npc>
-	<npc id="21539" level="67" type="Monster" name="Wailing of Splendor">
+	<npc id="21539" level="67" type="Monster" name="Wail of Splendor">
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
 			<param name="MoveAroundSocial1" value="74" />
@@ -2147,7 +2147,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21540" level="67" type="Monster" name="Wailing of Splendor">
+	<npc id="21540" level="67" type="Monster" name="Wail of Splendor">
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
 			<param name="MoveAroundSocial1" value="74" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/21600-21699.xml
index 92d3422954..33594145a2 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/21600-21699.xml
@@ -1751,7 +1751,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="21628" level="92" type="Monster" name="Kaim Vanul Lad">
+	<npc id="21628" level="92" type="Monster" name="Young Kaim Vanul">
 		<parameters>
 			<param name="MoveAroundSocial" value="108" />
 			<param name="MoveAroundSocial1" value="108" />
@@ -3203,7 +3203,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21658" level="64" type="Monster" name="Punishment of Splendor">
+	<npc id="21658" level="64" type="Monster" name="Punisher of Splendor">
 		<parameters>
 			<param name="MoveAroundSocial" value="110" />
 			<param name="MoveAroundSocial1" value="74" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/22700-22799.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/22700-22799.xml
index e870d2dec0..6248a7d9ed 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/22700-22799.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/22700-22799.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
 	<npc id="22701" level="81" type="Monster" name="Varangka's Dre Vanul">
 		<parameters>
@@ -3882,7 +3882,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22794" level="84" type="Monster" name="Divinity Judge">
+	<npc id="22794" level="84" type="Monster" name="Divine Judge">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6314" level="1" />
@@ -3945,7 +3945,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22795" level="84" type="Monster" name="Divinity Manager">
+	<npc id="22795" level="84" type="Monster" name="Divine Manager">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6309" level="1" />
@@ -4004,7 +4004,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22796" level="84" type="Monster" name="Divinity Supervisor">
+	<npc id="22796" level="84" type="Monster" name="Divine Supervisor">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6317" level="1" />
@@ -4061,7 +4061,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22797" level="84" type="Monster" name="Divinity Worshipper">
+	<npc id="22797" level="84" type="Monster" name="Divine Worshiper">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6327" level="1" />
@@ -4118,7 +4118,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22798" level="84" type="Monster" name="Divinity Protector">
+	<npc id="22798" level="84" type="Monster" name="Divine Protector">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6318" level="1" />
@@ -4183,7 +4183,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22799" level="84" type="Monster" name="Divinity Fighter">
+	<npc id="22799" level="84" type="Monster" name="Divine Fighter">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6328" level="1" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/22800-22899.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/22800-22899.xml
index cab8346c46..f1d523e6ab 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/22800-22899.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/22800-22899.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="22800" level="84" type="Monster" name="Divinity Magus">
+	<npc id="22800" level="84" type="Monster" name="Divine Magus">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6321" level="1" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23100-23199.xml
index d42c0d4555..d4a0b1ffc7 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23100-23199.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23100-23199.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="23101" level="61" type="Monster" name="Slaughter Bathin">
+	<npc id="23101" level="61" type="Monster" name="Bathin">
 		<parameters>
 			<minions name="Privates">
 				<npc id="23103" count="1" respawnTime="360" weightPoint="1" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23500-23599.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23500-23599.xml
index 9c82468487..537818ab10 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23500-23599.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23500-23599.xml
@@ -1389,7 +1389,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23545" level="102" type="Monster" name="Fury Kiku">
+	<npc id="23545" level="102" type="Monster" name="Furious Kiku">
 		<!-- Source: www.l2wiki.com (2015-04-08) -->
 		<race>ELEMENTAL</race>
 		<acquire exp="71402652" sp="71476" />
@@ -1894,7 +1894,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23554" level="102" type="Monster" name="Fury Kiku">
+	<npc id="23554" level="102" type="Monster" name="Furious Kiku">
 		<!-- Source: www.l2wiki.com (2015-04-08) -->
 		<race>ELEMENTAL</race>
 		<acquire exp="71402652" sp="71476" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23700-23799.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23700-23799.xml
index b729c54388..d45eec60f1 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23700-23799.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23700-23799.xml
@@ -1075,7 +1075,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23733" level="100" type="Monster" name="Lesser Giant Warrior">
+	<npc id="23733" level="100" type="Monster" name="Degraded Lesser Giant Warrior">
 		<parameters>
 			<skill name="Skill01_ID" id="23661" level="1" />
 			<param name="Skill01_Probablity" value="2000" />
@@ -1115,7 +1115,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23734" level="100" type="Monster" name="Lesser Giant Wizard">
+	<npc id="23734" level="100" type="Monster" name="Degraded Lesser Giant Wizard">
 		<parameters>
 			<skill name="Skill01_ID" id="16121" level="5" />
 			<skill name="Skill02_ID" id="23665" level="1" />
@@ -1639,7 +1639,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23746" level="101" type="Monster" name="Recovering Lesser Giant Warrior">
+	<npc id="23746" level="101" type="Monster" name="Evolving Lesser Giant Warrior">
 		<race>GIANT</race>
 		<acquire exp="494607115" sp="445070" />
 		<equipment rhand="46741" />
@@ -1686,7 +1686,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23747" level="101" type="Monster" name="Recovering Lesser Giant Wizard">
+	<npc id="23747" level="101" type="Monster" name="Evolving Lesser Giant Wizard">
 		<parameters>
 			<skill name="Skill01_ID" id="16121" level="5" />
 			<skill name="Skill02_ID" id="23665" level="2" />
@@ -1739,7 +1739,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23748" level="100" type="Monster" name="Lesser Giant Soldier">
+	<npc id="23748" level="100" type="Monster" name="Degraded Lesser Giant Soldier">
 		<race>GIANT</race>
 		<acquire exp="272575600" sp="245300" />
 		<equipment rhand="4028" />
@@ -1901,7 +1901,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23752" level="100" type="Monster" name="Lesser Giant Archer">
+	<npc id="23752" level="100" type="Monster" name="Degraded Lesser Giant Archer">
 		<race>GIANT</race>
 		<acquire exp="136287800" sp="136300" />
 		<equipment rhand="4028" />
@@ -1938,7 +1938,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23753" level="100" type="Monster" name="Lesser Giant Support Troop">
+	<npc id="23753" level="100" type="Monster" name="Degraded Lesser Giant Support Trooper">
 		<race>GIANT</race>
 		<acquire exp="136287800" sp="136300" />
 		<equipment rhand="4028" />
@@ -1975,7 +1975,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23754" level="100" type="Monster" name="Essence of the Lesser Giant">
+	<npc id="23754" level="100" type="Monster" name="Giant Aggregation">
 		<parameters>
 			<skill name="Skill01_ID" id="16156" level="8" />
 			<skill name="Skill02_ID" id="23682" level="1" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23800-23899.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23800-23899.xml
index f62b3bd712..f06cc808ea 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23800-23899.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23800-23899.xml
@@ -1422,7 +1422,7 @@
 			<height normal="34" />
 		</collision>
 	</npc>
-	<npc id="23852" level="85" type="Monster" name="Hell Armor" title="Devil's Advocate">
+	<npc id="23852" level="85" type="Monster" name="Hell Armor" title="Devil�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1464,7 +1464,7 @@
 			<height normal="42" />
 		</collision>
 	</npc>
-	<npc id="23854" level="85" type="Monster" name="Hell Lord" title="Devil's Advocate">
+	<npc id="23854" level="85" type="Monster" name="Hell Lord" title="Devil�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1634,7 +1634,7 @@
 			<height normal="53.5" />
 		</collision>
 	</npc>
-	<npc id="23862" level="85" type="Monster" name="Drak" title="Dragon's Advocate">
+	<npc id="23862" level="85" type="Monster" name="Drak" title="Dragon�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1676,7 +1676,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="23864" level="85" type="Monster" name="Chaos Drake" title="Dragon's Advocate">
+	<npc id="23864" level="85" type="Monster" name="Chaos Drake" title="Dragon�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23900-23999.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23900-23999.xml
index 3ebee30c15..c43988a4a5 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23900-23999.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/23900-23999.xml
@@ -226,7 +226,7 @@
 			<height normal="34" />
 		</collision>
 	</npc>
-	<npc id="23910" level="85" type="Monster" name="Hell Armor" title="Devil's Advocate">
+	<npc id="23910" level="85" type="Monster" name="Hell Armor" title="Devil�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -272,7 +272,7 @@
 			<height normal="42" />
 		</collision>
 	</npc>
-	<npc id="23912" level="85" type="Monster" name="Hell Lord" title="Devil's Advocate">
+	<npc id="23912" level="85" type="Monster" name="Hell Lord" title="Devil�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -458,7 +458,7 @@
 			<height normal="53.5" />
 		</collision>
 	</npc>
-	<npc id="23920" level="85" type="Monster" name="Drak" title="Dragon's Advocate">
+	<npc id="23920" level="85" type="Monster" name="Drak" title="Dragon�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -504,7 +504,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="23922" level="85" type="Monster" name="Chaos Drake" title="Dragon's Advocate">
+	<npc id="23922" level="85" type="Monster" name="Chaos Drake" title="Dragon�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1293,7 +1293,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="23957" level="85" type="Monster" name="Tanta Healer" title="Commander's Medic">
+	<npc id="23957" level="85" type="Monster" name="Tanta Healer" title="Commander�s Medic">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1566,7 +1566,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="23970" level="85" type="Monster" name="Dandy's Dinosaur Friend">
+	<npc id="23970" level="85" type="Monster" name="Dandy�s Dinosaur Friend">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1608,7 +1608,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="23972" level="85" type="Monster" name="Tanta Healer" title="Commander's Medic">
+	<npc id="23972" level="85" type="Monster" name="Tanta Healer" title="Commander�s Medic">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1902,7 +1902,7 @@
 			<height normal="47.2" />
 		</collision>
 	</npc>
-	<npc id="23986" level="85" type="Monster" name="Leona Blackbird" title="Dragon's Advocate">
+	<npc id="23986" level="85" type="Monster" name="Leona Blackbird" title="Dragon�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="1893" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24000-24099.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24000-24099.xml
index c915871028..6e74245920 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24000-24099.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24000-24099.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="24000" level="85" type="Monster" name="Leona Blackbird" title="Dragon's Advocate">
+	<npc id="24000" level="85" type="Monster" name="Leona Blackbird" title="Dragon�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="1893" />
@@ -2420,7 +2420,7 @@
 			<skill id="16758" level="1" /> <!-- Embryo -->
 		</skillList>
 	</npc>
-	<npc id="24081" level="106" type="Monster" name="Temple Guard Captain">
+	<npc id="24081" level="106" type="Monster" name="Temple Elite Guardian">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="17417" lhand="17435" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24100-24199.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24100-24199.xml
index 5b7b513883..1f2cdb1a62 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24100-24199.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24100-24199.xml
@@ -2318,7 +2318,7 @@
 			<skill id="16758" level="1" /> <!-- Embryo -->
 		</skillList>
 	</npc>
-	<npc id="24166" level="106" type="Monster" name="Temple Guard Captain">
+	<npc id="24166" level="106" type="Monster" name="Temple Elite Guardian">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="17417" lhand="17435" />
@@ -2795,7 +2795,7 @@
 			<skill id="16758" level="1" /> <!-- Embryo -->
 		</skillList>
 	</npc>
-	<npc id="24182" level="106" type="Monster" name="Temple Guard Captain">
+	<npc id="24182" level="106" type="Monster" name="Temple Elite Guardian">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="17417" lhand="17435" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24200-24299.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24200-24299.xml
index 4c779e2aa3..8e20fb0955 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24200-24299.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24200-24299.xml
@@ -2424,7 +2424,7 @@
 			<height normal="63" />
 		</collision>
 	</npc>
-	<npc id="24296" level="85" type="Folk" name="Battle Demolisher" title="Lookout">
+	<npc id="24296" level="85" type="Folk" name="Battle Demolisher" title="Protector">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -2443,7 +2443,7 @@
 			<height normal="63" />
 		</collision>
 	</npc>
-	<npc id="24297" level="85" type="Folk" name="Battle Demolisher" title="Lookout">
+	<npc id="24297" level="85" type="Folk" name="Battle Demolisher" title="Protector">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24300-24399.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24300-24399.xml
index 509ebf7723..3a45d2abb1 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24300-24399.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24300-24399.xml
@@ -91,8 +91,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="51" />
-			<height normal="36.1" />
+			<radius normal="45" />
+			<height normal="31.5" />
 		</collision>
 		<skillList>
 			<skill id="4116" level="10" /> <!-- Magic Damage Resistance -->
@@ -179,8 +179,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="51" />
-			<height normal="36.1" />
+			<radius normal="45" />
+			<height normal="31.5" />
 		</collision>
 		<skillList>
 			<skill id="4116" level="10" /> <!-- Magic Damage Resistance -->
@@ -267,8 +267,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="54" />
-			<height normal="84.75" />
+			<radius normal="46.8" />
+			<height normal="73.05" />
 		</collision>
 		<skillList>
 			<skill id="4116" level="10" /> <!-- Magic Damage Resistance -->
@@ -355,8 +355,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="87" />
-			<height normal="80.25" />
+			<radius normal="75.4" />
+			<height normal="69.15" />
 		</collision>
 		<skillList>
 			<skill id="4116" level="10" /> <!-- Magic Damage Resistance -->
@@ -608,7 +608,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="24318" level="120" type="Monster" name="Temple Guard Captain">
+	<npc id="24318" level="120" type="Monster" name="Temple Elite Guardian">
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<acquire exp="1750248000" sp="1575216" />
@@ -1654,8 +1654,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="26" />
-			<height normal="37.3" />
+			<radius normal="20" />
+			<height normal="28" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -1759,8 +1759,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="26" />
-			<height normal="42" />
+			<radius normal="20.8" />
+			<height normal="33" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -1823,7 +1823,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="24377" level="108" type="Monster" name="Swamp Tribe" title="Lord of Alligator Island">
+	<npc id="24377" level="108" type="Monster" name="Swamp Beast">
 		<parameters>
 			<skill name="Skill01_ID" id="32870" level="1" />
 			<param name="Skill01_Probablity" value="2000" />
@@ -1843,8 +1843,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="32" />
-			<height normal="65" />
+			<radius normal="19.2" />
+			<height normal="37.8" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -1933,8 +1933,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="27" />
-			<height normal="45" />
+			<radius normal="21.6" />
+			<height normal="35.4" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -2023,8 +2023,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="30" />
-			<height normal="43.5" />
+			<radius normal="24" />
+			<height normal="34.2" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24400-24499.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24400-24499.xml
index 0e80708686..25bb3d7b5a 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24400-24499.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24400-24499.xml
@@ -1683,7 +1683,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="24432" level="110" type="Monster" name="Fury Harpy Queen" title="Goddess of Storm">
+	<npc id="24432" level="110" type="Monster" name="Fury Harpy Queen" title="Storm Goddess">
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<acquire exp="3327584700" sp="2994750" />
@@ -2031,8 +2031,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="26" />
-			<height normal="53.225" />
+			<radius normal="22" />
+			<height normal="44.575" />
 		</collision>
 		<skillList>
 			<skill id="4116" level="10" /> <!-- Magic Damage Resistance -->
@@ -2117,8 +2117,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="10" />
-			<height normal="35" />
+			<radius normal="9" />
+			<height normal="31.2" />
 		</collision>
 		<skillList>
 			<skill id="4116" level="10" /> <!-- Magic Damage Resistance -->
@@ -2203,8 +2203,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="30" />
-			<height normal="42.75" />
+			<radius normal="24" />
+			<height normal="33.6" />
 		</collision>
 		<skillList>
 			<skill id="4116" level="10" /> <!-- Magic Damage Resistance -->
@@ -2290,8 +2290,8 @@
 		<status attackable="true" />
 		<ai type="ARCHER" />
 		<collision>
-			<radius normal="26" />
-			<height normal="53.225" />
+			<radius normal="22" />
+			<height normal="44.575" />
 		</collision>
 		<skillList>
 			<skill id="4116" level="10" /> <!-- Magic Damage Resistance -->
@@ -2379,8 +2379,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="42" />
-			<height normal="57.75" />
+			<radius normal="33.6" />
+			<height normal="45.6" />
 		</collision>
 		<skillList>
 			<skill id="4116" level="10" /> <!-- Magic Damage Resistance -->
@@ -3359,8 +3359,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="52" />
-			<height normal="107" />
+			<radius normal="46.8" />
+			<height normal="96" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="13" /> <!-- Fairies -->
@@ -4363,8 +4363,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="42" />
-			<height normal="96.6" />
+			<radius normal="35" />
+			<height normal="80" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="5" /> <!-- Plants -->
@@ -4472,8 +4472,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="42" />
-			<height normal="42.6" />
+			<radius normal="35" />
+			<height normal="35" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="12" /> <!-- Bugs -->
@@ -5037,8 +5037,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="32.4" />
-			<height normal="37.8" />
+			<radius normal="29.7" />
+			<height normal="34.4" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -5128,8 +5128,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="34.8" />
-			<height normal="45" />
+			<radius normal="31.9" />
+			<height normal="41" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -5219,8 +5219,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="43.5" />
-			<height normal="57" />
+			<radius normal="37.7" />
+			<height normal="49" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -5393,8 +5393,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="26" />
-			<height normal="52.9" />
+			<radius normal="20" />
+			<height normal="40" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -5473,8 +5473,8 @@
 		<status attackable="true" />
 		<ai type="ARCHER" />
 		<collision>
-			<radius normal="26" />
-			<height normal="53.225" />
+			<radius normal="20" />
+			<height normal="40.25" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
@@ -5552,8 +5552,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="16.9" />
-			<height normal="46.4" />
+			<radius normal="13" />
+			<height normal="35" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="6" /> <!-- Humanoids -->
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24500-24599.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24500-24599.xml
index 9d5aa1e06c..5790258249 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24500-24599.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24500-24599.xml
@@ -672,8 +672,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="20" />
-			<height normal="49" />
+			<radius normal="16" />
+			<height normal="38.6" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
@@ -751,8 +751,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="23" />
-			<height normal="60" />
+			<radius normal="18.4" />
+			<height normal="47.4" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
@@ -829,8 +829,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="27.3" />
-			<height normal="52.9" />
+			<radius normal="21" />
+			<height normal="40" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
@@ -907,8 +907,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="24" />
-			<height normal="40" />
+			<radius normal="19.2" />
+			<height normal="31.4" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
@@ -1533,8 +1533,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="51" />
-			<height normal="36.1" />
+			<radius normal="45" />
+			<height normal="31.5" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="3" /> <!-- Beasts -->
@@ -1611,8 +1611,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="54" />
-			<height normal="84.75" />
+			<radius normal="46.8" />
+			<height normal="73.05" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="3" /> <!-- Beasts -->
@@ -1689,8 +1689,8 @@
 		</stats>
 		<status attackable="true" />
 		<collision>
-			<radius normal="98.6" />
-			<height normal="91.35" />
+			<radius normal="87" />
+			<height normal="80.25" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="3" /> <!-- Beasts -->
@@ -2101,7 +2101,7 @@
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24538" level="100" type="RaidBoss" name="Kalix" title="Kastia's Ruler">
+	<npc id="24538" level="100" type="RaidBoss" name="Kalix" title="Kastia�s Ruler">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="118486370000" sp="106637700" />
@@ -2235,7 +2235,7 @@
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24542" level="105" type="RaidBoss" name="Clav" title="Kastia's Ruler">
+	<npc id="24542" level="105" type="RaidBoss" name="Clav" title="Kastia�s Ruler">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="391466439000" sp="352319751" />
@@ -2378,7 +2378,7 @@
 			<skill id="14765" level="1" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24546" level="110" type="RaidBoss" name="Spata" title="Kastia's Ruler">
+	<npc id="24546" level="110" type="RaidBoss" name="Spata" title="Kastia�s Ruler">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<acquire exp="645039964800" sp="580535857" />
@@ -3901,7 +3901,7 @@
 			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24591" level="115" type="RaidBoss" name="Vishes" title="Kastia's Ruler">
+	<npc id="24591" level="115" type="RaidBoss" name="Vishes" title="Kastia�s Ruler">
 		<race>UNDEAD</race>
 		<sex>FEMALE</sex>
 		<acquire exp="1057279142304" sp="951551112" />
@@ -4000,7 +4000,7 @@
 			<skill id="16547" level="10" /> <!-- Danger Zone Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24595" level="120" type="Monster" name="Tykan" title="Kastia's Ruler">
+	<npc id="24595" level="120" type="Monster" name="Tykan" title="Kastia�s Ruler">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="1727214451200" sp="1554492960" />
@@ -4070,7 +4070,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="316618" hpRegen="10.5" mp="2943" mpRegen="3.6" />
+			<vitals hp="443265" hpRegen="10.5" mp="2943" mpRegen="3.6" />
 			<speed>
 				<walk ground="70" />
 				<run ground="180" />
@@ -4089,7 +4089,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="316618" hpRegen="10.5" mp="2943" mpRegen="3.6" />
+			<vitals hp="443265" hpRegen="10.5" mp="2943" mpRegen="3.6" />
 			<speed>
 				<walk ground="75" />
 				<run ground="170" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24600-24699.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24600-24699.xml
index 85686906fa..edeaeec310 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24600-24699.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24600-24699.xml
@@ -398,8 +398,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="25" />
-			<height normal="63" />
+			<radius normal="20" />
+			<height normal="49.8" />
 		</collision>
 		<dropLists>
 			<drop>
@@ -484,6 +484,64 @@
 			</drop>
 		</dropLists>
 	</npc>
+	<npc id="24614" level="85" type="Folk" name="Dragon Peltast" title="Earth Dragon's Guardian">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="13843" /> <!-- Dragon Peltast's Weapon -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2177181" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="89" />
+				<run ground="220" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="32.5" />
+			<height normal="61.35" />
+		</collision>
+	</npc>
+	<npc id="24615" level="85" type="Folk" name="Dragon Officer" title="Earth Dragon's Guardian">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2177181" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="92" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="36.4" />
+			<height normal="69.8" />
+		</collision>
+	</npc>
+	<npc id="24616" level="85" type="Folk" name="Dragon Elite Guard">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2177181" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="100" />
+				<run ground="200" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="40" />
+			<height normal="55" />
+		</collision>
+	</npc>
 	<npc id="24617" level="85" type="Monster" name="Dragon Peltast">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
@@ -509,7 +567,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1281141" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="2177181" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="92" />
 				<run ground="170" />
@@ -528,7 +586,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1281141" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="4354362" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
@@ -547,7 +605,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="1281141" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<vitals hp="4354362" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -2241,4 +2299,271 @@
 			</drop>
 		</dropLists>
 	</npc>
+	<npc id="24649" level="85" type="Folk" name="Carnivorous Fungus" title="Sea of Spores Defender">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1278871" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="70" />
+				<run ground="110" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="30" />
+			<height normal="48" />
+		</collision>
+	</npc>
+	<npc id="24650" level="85" type="Folk" name="Walking Fungus">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1278871" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="70" />
+				<run ground="110" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="12" />
+			<height normal="17.4" />
+		</collision>
+	</npc>
+	<npc id="24651" level="85" type="Folk" name="Red Kookaburra">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2012329" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="23" />
+				<run ground="119" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="15.6" />
+			<height normal="39" />
+		</collision>
+	</npc>
+	<npc id="24652" level="85" type="Folk" name="Blue Kookaburra">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2012329" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="23" />
+				<run ground="119" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="15.6" />
+			<height normal="39" />
+		</collision>
+	</npc>
+	<npc id="24653" level="85" type="Folk" name="White Cougar">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2012329" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="178" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="33.6" />
+			<height normal="25.8" />
+		</collision>
+	</npc>
+	<npc id="24654" level="85" type="Folk" name="Cougar">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2012329" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="178" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="33.6" />
+			<height normal="25.8" />
+		</collision>
+	</npc>
+	<npc id="24655" level="85" type="Folk" name="Black Buffalo">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2012329" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="80" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="32.4" />
+			<height normal="37.8" />
+		</collision>
+	</npc>
+	<npc id="24656" level="85" type="Folk" name="White Buffalo">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2012329" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="20" />
+				<run ground="80" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="32.4" />
+			<height normal="37.8" />
+		</collision>
+	</npc>
+	<npc id="24657" level="85" type="Folk" name="Grandel">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2012329" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="40.8" />
+			<height normal="39.6" />
+		</collision>
+	</npc>
+	<npc id="24658" level="85" type="Folk" name="Black Grandel">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2012329" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="36" />
+				<run ground="155" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="18" />
+			<height normal="47.4" />
+		</collision>
+	</npc>
+	<npc id="24659" level="85" type="Folk" name="Beast Devourer" title="Beast Farm Defender">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2012329" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="150" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="32.4" />
+			<height normal="37.8" />
+		</collision>
+	</npc>
+	<npc id="24660" level="85" type="Folk" name="Fierce Water Dragon" title="Bare Fang">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8012026" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="210" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="63" />
+			<height normal="75" />
+		</collision>
+	</npc>
+	<npc id="24661" level="85" type="Folk" name="Temple Zealot" title="Hidden Blade">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8012026" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="75" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="28" />
+			<height normal="72.5" />
+		</collision>
+	</npc>
+	<npc id="24662" level="85" type="Folk" name="Temple Elite Archer" title="Water Dragon Guardian">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="4006013" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="75" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="28" />
+			<height normal="73" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24800-24899.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24800-24899.xml
index ef5987638e..3c8e07a595 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24800-24899.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24800-24899.xml
@@ -691,7 +691,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="15304" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -711,7 +711,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="38430" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="75" />
 				<run ground="120" />
@@ -731,7 +731,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="38559" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="31" />
 				<run ground="120" />
@@ -750,7 +750,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="100" />
@@ -770,7 +770,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="8688" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -790,7 +790,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="38564" lhand="38432" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<vitals hp="556031" hpRegen="10.5" mp="3024" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="120" />
@@ -809,7 +809,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486" hpRegen="10.5" mp="3107" mpRegen="3.6" />
 			<speed>
 				<walk ground="65" />
 				<run ground="170" />
@@ -828,7 +828,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486" hpRegen="10.5" mp="3107" mpRegen="3.6" />
 			<speed>
 				<walk ground="65" />
 				<run ground="180" />
@@ -847,7 +847,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486" hpRegen="10.5" mp="3107" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
@@ -857,7 +857,7 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="30" />
+			<radius normal="14" />
 			<height normal="33" />
 		</collision>
 	</npc>
@@ -866,7 +866,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486" hpRegen="10.5" mp="3107" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
@@ -876,7 +876,7 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="30" />
+			<radius normal="14" />
 			<height normal="33" />
 		</collision>
 	</npc>
@@ -885,7 +885,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486" hpRegen="10.5" mp="3107" mpRegen="3.6" />
 			<speed>
 				<walk ground="73" />
 				<run ground="170" />
@@ -904,7 +904,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="498204" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<vitals hp="697486" hpRegen="10.5" mp="3107" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -2089,129 +2089,15 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="24876" level="85" type="Folk" name="Conquest Archer">
+	<npc id="24876" level="85" type="Folk" name="Guide of Splendor">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
-		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<equipment rhand="193" /> <!-- Transparent Bow (NPC) -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<vitals hp="874926" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
-				<walk ground="80" />
-				<run ground="180" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="13" />
-			<height normal="40" />
-		</collision>
-	</npc>
-	<npc id="24877" level="85" type="Folk" name="Conquest Knight">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
-			<speed>
-				<walk ground="80" />
-				<run ground="180" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="13" />
-			<height normal="40" />
-		</collision>
-	</npc>
-	<npc id="24878" level="85" type="Folk" name="Conquest Rogue">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
-			<speed>
-				<walk ground="80" />
-				<run ground="180" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="13" />
-			<height normal="40" />
-		</collision>
-	</npc>
-	<npc id="24879" level="85" type="Folk" name="Conquest Warrior">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
-			<speed>
-				<walk ground="80" />
-				<run ground="180" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="13" />
-			<height normal="40" />
-		</collision>
-	</npc>
-	<npc id="24880" level="85" type="Folk" name="Conquest Wizard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
-			<speed>
-				<walk ground="60" />
-				<run ground="180" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="13" />
-			<height normal="40" />
-		</collision>
-	</npc>
-	<npc id="24881" level="85" type="Folk" name="Atron of the Conquest">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
-			<speed>
-				<walk ground="25" />
-				<run ground="140" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="10" />
-			<height normal="12" />
-		</collision>
-	</npc>
-	<npc id="24882" level="85" type="Folk" name="Craigo of the Conquest">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
-			<speed>
-				<walk ground="35" />
+				<walk ground="50" />
 				<run ground="170" />
 			</speed>
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
@@ -2219,19 +2105,406 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="13" />
-			<height normal="18" />
+			<radius normal="15.6" />
+			<height normal="39" />
 		</collision>
 	</npc>
-	<npc id="24883" level="85" type="Folk" name="Daril of the Conquest">
+	<npc id="24877" level="85" type="Folk" name="Herald of Splendor">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="326" /> <!-- Heathen's Book -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="874926" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="160" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="15.6" />
+			<height normal="31.8" />
+		</collision>
+	</npc>
+	<npc id="24878" level="85" type="Folk" name="Believer of Splendor">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="193" /> <!-- Stick of Faith -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="874926" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="160" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="15.6" />
+			<height normal="34.2" />
+		</collision>
+	</npc>
+	<npc id="24879" level="85" type="Folk" name="Observer of Splendor">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="288" /> <!-- Carnage Bow -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="874926" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="160" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="15.6" />
+			<height normal="33" />
+		</collision>
+	</npc>
+	<npc id="24880" level="85" type="Folk" name="Wiseman of Splendor">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="202" /> <!-- Mace of Underworld -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="874926" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="160" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="15.6" />
+			<height normal="30.6" />
+		</collision>
+	</npc>
+	<npc id="24881" level="85" type="Folk" name="Springs' Dwarf Hero">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<vitals hp="874926" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
-				<walk ground="13" />
-				<run ground="140" />
+				<walk ground="25" />
+				<run ground="100" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13.2" />
+			<height normal="27" />
+		</collision>
+	</npc>
+	<npc id="24882" level="85" type="Folk" name="Springs Scavenger">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="874926" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="25" />
+				<run ground="100" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13.2" />
+			<height normal="27" />
+		</collision>
+	</npc>
+	<npc id="24883" level="85" type="Folk" name="Springs Dwarf Defender">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="874926" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14.4" />
+			<height normal="23.4" />
+		</collision>
+	</npc>
+	<npc id="24884" level="85" type="Folk" name="Springs Dwarf Berserker">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="874926" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="25" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="15.6" />
+			<height normal="30.6" />
+		</collision>
+	</npc>
+	<npc id="24885" level="85" type="Folk" name="Springs Dwarf Priest">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="874926" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="100" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10.8" />
+			<height normal="23.4" />
+		</collision>
+	</npc>
+	<npc id="24886" level="85" type="Folk" name="Springs Yeti">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="874926" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="15" />
+			<height normal="27.5" />
+		</collision>
+	</npc>
+	<npc id="24887" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="447704" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+	</npc>
+	<npc id="24888" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="598407" hpRegen="10.5" mp="2943" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+	</npc>
+	<npc id="24889" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="834046" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+	</npc>
+	<npc id="24890" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="834046" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+	</npc>
+	<npc id="24891" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1150851" hpRegen="10.5" mp="3107" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+	</npc>
+	<npc id="24892" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1574866" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+	</npc>
+	<npc id="24893" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1574866" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+	</npc>
+	<npc id="24894" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2140140" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+	</npc>
+	<npc id="24895" level="85" type="Folk" name="Mimic" title="Baium's Treasure">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1451454" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="13.5" />
+		</collision>
+	</npc>
+	<npc id="24896" level="85" type="Folk" name="Heaven's Palace Watcher">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1574866" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="220" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="47" />
+		</collision>
+	</npc>
+	<npc id="24897" level="85" type="Folk" name="Heaven's Palace Pilgrim">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="6717" /> <!-- Monster Only (Einhasad Warrior) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1574866" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="180" />
 			</speed>
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
 			<defence physical="405.85106382979" magical="297.0297029703" />
@@ -2239,15 +2512,16 @@
 		<status attackable="false" />
 		<collision>
 			<radius normal="8" />
-			<height normal="10" />
+			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="24884" level="85" type="Folk" name="Seo of the Conquest">
+	<npc id="24898" level="85" type="Folk" name="Heaven's Palace Guardian">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<equipment rhand="148" /> <!-- Sword of Valhalla -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<vitals hp="1574866" hpRegen="10.5" mp="3190" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="170" />
@@ -2256,67 +2530,29 @@
 			<defence physical="405.85106382979" magical="297.0297029703" />
 		</stats>
 		<status attackable="false" />
+		<collision>
+			<radius normal="13.5" />
+			<height normal="36.5" />
+		</collision>
+	</npc>
+	<npc id="24899" level="85" type="Folk" name="Heaven's Palace Herald">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="6718" /> <!-- Monster Only (Einhasad Shaman) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1574866" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="165" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
 		<collision>
 			<radius normal="11" />
-			<height normal="25" />
-		</collision>
-	</npc>
-	<npc id="24885" level="85" type="Folk" name="Powerful Conquest Warrior">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
-			<speed>
-				<walk ground="20" />
-				<run ground="100" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="10" />
-			<height normal="17" />
-		</collision>
-	</npc>
-	<npc id="24886" level="85" type="Folk" name="Powerful Conquest Wizard">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
-			<speed>
-				<walk ground="19" />
-				<run ground="80" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="7" />
-			<height normal="13" />
-		</collision>
-	</npc>
-	<npc id="24887" level="85" type="Folk" name="Powerful Conquest Archer">
-		<!-- AUTO GENERATED NPC TODO: FIX IT -->
-		<race>ETC</race>
-		<sex>FEMALE</sex>
-		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
-		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
-			<speed>
-				<walk ground="35" />
-				<run ground="80" />
-			</speed>
-			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
-			<defence physical="405.85106382979" magical="297.0297029703" />
-		</stats>
-		<status attackable="false" />
-		<collision>
-			<radius normal="7" />
-			<height normal="16.75" />
+			<height normal="38.5" />
 		</collision>
 	</npc>
 </list>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24900-24999.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24900-24999.xml
new file mode 100644
index 0000000000..edcc819288
--- /dev/null
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/24900-24999.xml
@@ -0,0 +1,271 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
+	<npc id="24900" level="85" type="Folk" name="Heaven's Palace Judge">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="8221" /> <!-- Monster Only (Grail Apostle Spear) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1574866" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="220" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="47" />
+		</collision>
+	</npc>
+	<npc id="24901" level="85" type="Folk" name="Heaven's Palace Archangel" title="Elite Monster">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="15748668" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="30" />
+			<height normal="76" />
+		</collision>
+	</npc>
+	<npc id="24902" level="85" type="Folk" name="Divine Watcher">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2140140" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="200" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="33" />
+		</collision>
+	</npc>
+	<npc id="24903" level="85" type="Folk" name="Divine Pilgrim">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2140140" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="150" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="18" />
+			<height normal="44" />
+		</collision>
+	</npc>
+	<npc id="24904" level="85" type="Folk" name="Divine Protector">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2140140" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="150" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="24" />
+			<height normal="49" />
+		</collision>
+	</npc>
+	<npc id="24905" level="85" type="Folk" name="Divine Herald">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2140140" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="200" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="33" />
+		</collision>
+	</npc>
+	<npc id="24906" level="85" type="Folk" name="Divine Judge">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2140140" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="200" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="33" />
+		</collision>
+	</npc>
+	<npc id="24907" level="85" type="Folk" name="Divine Archangel" title="Elite Monster">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="21401406" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="20" />
+			<height normal="51" />
+		</collision>
+	</npc>
+	<npc id="24908" level="85" type="Folk" name="Sealed Watcher">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2140140" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="9" />
+			<height normal="22.5" />
+		</collision>
+	</npc>
+	<npc id="24909" level="85" type="Folk" name="Sealed Pilgrim">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2140140" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="11" />
+			<height normal="22.5" />
+		</collision>
+	</npc>
+	<npc id="24910" level="85" type="Folk" name="Sealed Guardian">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2140140" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10" />
+			<height normal="24" />
+		</collision>
+	</npc>
+	<npc id="24911" level="85" type="Folk" name="Sealed Herald">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2140140" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="24" />
+		</collision>
+	</npc>
+	<npc id="24912" level="85" type="Folk" name="Sealed Judge">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2140140" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="15" />
+			<height normal="36.5" />
+		</collision>
+	</npc>
+	<npc id="24913" level="85" type="Folk" name="Sealed Archangel" title="Elite Monster">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="21401406" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="65" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="22" />
+			<height normal="62" />
+		</collision>
+	</npc>
+</list>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/25600-25699.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/25600-25699.xml
index 81364185e0..f6a945e844 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/25600-25699.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/25600-25699.xml
@@ -1469,7 +1469,7 @@
 			<height normal="60" />
 		</collision>
 	</npc>
-	<npc id="25627" level="75" type="Monster" name="Mutant Bird" title="King's Subordinate">
+	<npc id="25627" level="75" type="Monster" name="Mutant Bird" title="Queen's Servant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="Skill02_Target" value="3" />
@@ -1521,7 +1521,7 @@
 			<height normal="85" />
 		</collision>
 	</npc>
-	<npc id="25628" level="76" type="Monster" name="Dra Hawk" title="King's Subordinate">
+	<npc id="25628" level="76" type="Monster" name="Dra Hawk" title="Queen's Servant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="Skill02_AttackSplash" value="1" />
@@ -2536,7 +2536,7 @@
 			<height normal="44.2" />
 		</collision>
 	</npc>
-	<npc id="25647" level="81" type="RaidBoss" name="Awakened Ancient Fighter" title="Raid Boss">
+	<npc id="25647" level="81" type="RaidBoss" name="Ancient Death Knight" title="Raid Boss">
 		<parameters>
 			<skill name="Skill01_ID" id="5884" level="2" />
 			<skill name="Skill02_ID" id="5891" level="1" />
@@ -2588,7 +2588,7 @@
 			<height normal="62.4" />
 		</collision>
 	</npc>
-	<npc id="25648" level="81" type="RaidBoss" name="Awakened Ancient Fighter" title="Raid Boss">
+	<npc id="25648" level="81" type="RaidBoss" name="Ancient Death Knight" title="Raid Boss">
 		<parameters>
 			<skill name="Skill01_ID" id="5855" level="1" />
 			<skill name="Skill02_ID" id="5891" level="1" />
@@ -2985,7 +2985,7 @@
 			<height normal="33" />
 		</collision>
 	</npc>
-	<npc id="25655" level="106" type="RaidBoss" name="Kanadis Herald" title="Invading Forces">
+	<npc id="25655" level="106" type="RaidBoss" name="Kanadis' Herald" title="Invading Forces">
 		<parameters>
 			<param name="String_Num1" value="1300146" />
 			<param name="String_Num2" value="1300147" />
@@ -3171,7 +3171,7 @@
 			<height normal="23.4" />
 		</collision>
 	</npc>
-	<npc id="25658" level="105" type="Monster" name="Kanadis Fanatic">
+	<npc id="25658" level="105" type="Monster" name="Kanadis' Fanatic">
 		<parameters>
 			<param name="String_Num1" value="1300149" />
 			<skill name="different_level_9_attacked" id="5456" level="1" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/25800-25899.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/25800-25899.xml
index 8cca1e606a..94ef36e734 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/25800-25899.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/25800-25899.xml
@@ -1053,7 +1053,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25818" level="75" type="Monster" name="Emperor of Heaven's Palace">
+	<npc id="25818" level="75" type="Monster" name="Heaven's Palace Emperor">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25819" count="2" respawnTime="360" weightPoint="1" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26100-26199.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26100-26199.xml
index 0d65334cde..a574afb136 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26100-26199.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26100-26199.xml
@@ -2668,7 +2668,7 @@
 			<height normal="45.5" />
 		</collision>
 	</npc>
-	<npc id="26147" level="104" type="Monster" name="Wizard of the Queen">
+	<npc id="26147" level="104" type="Monster" name="Queen's Wizard">
 		<parameters>
 			<skill name="Skill01_ID" id="16685" level="1" />
 			<skill name="Skill02_ID" id="16686" level="1" />
@@ -3077,7 +3077,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26153" level="96" type="Folk" name="Enhance Death Knight">
+	<npc id="26153" level="96" type="Folk" name="Enchanted Death Knight">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26200-26299.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26200-26299.xml
index c11b367714..36ea147920 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26200-26299.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26200-26299.xml
@@ -3555,7 +3555,7 @@
 			<height normal="63" />
 		</collision>
 	</npc>
-	<npc id="26274" level="85" type="Folk" name="Snow Man" title="GM's Guardian">
+	<npc id="26274" level="85" type="Folk" name="Snowman" title="GM's Guardian">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26400-26499.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26400-26499.xml
index c9f52746b8..3160be54ec 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26400-26499.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/26400-26499.xml
@@ -1572,7 +1572,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26445" level="85" type="Folk" name="Slaughter Bathin" title="Raid Boss">
+	<npc id="26445" level="85" type="Folk" name="Bathin" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -2135,7 +2135,7 @@
 			<vitals hp="7499856" hpRegen="488.1839242" mp="59126" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
-				<run ground="180" />
+				<run ground="200" />
 			</speed>
 			<attack physical="52380.9523809524" magical="9243.6974789916" critical="4" attackSpeed="253" range="40" />
 			<defence physical="4074.07407407407" magical="2365.59139784946" />
@@ -2672,7 +2672,7 @@
 			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26480" level="85" type="Folk" name="Slaughter Bathin" title="Raid Boss">
+	<npc id="26480" level="85" type="Folk" name="Bathin" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -2691,7 +2691,7 @@
 			<height normal="125" />
 		</collision>
 	</npc>
-	<npc id="26481" level="85" type="Folk" name="Slaughter Bathin" title="Raid Boss">
+	<npc id="26481" level="85" type="Folk" name="Bathin" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/27400-27499.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/27400-27499.xml
index 942d66e901..0fab331246 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/27400-27499.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/27400-27499.xml
@@ -522,7 +522,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="27411" level="84" type="Monster" name="Divinity Manager">
+	<npc id="27411" level="84" type="Monster" name="Divine Manager">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<param name="IsAggressive" value="1" />
@@ -580,7 +580,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="27412" level="84" type="Monster" name="Divinity Supervisor">
+	<npc id="27412" level="84" type="Monster" name="Divine Supervisor">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<param name="IsAggressive" value="1" />
@@ -636,7 +636,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="27413" level="84" type="Monster" name="Divinity Fighter">
+	<npc id="27413" level="84" type="Monster" name="Divine Fighter">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<param name="IsAggressive" value="1" />
@@ -693,7 +693,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="27414" level="84" type="Monster" name="Divinity Magus">
+	<npc id="27414" level="84" type="Monster" name="Divine Magus">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<param name="IsAggressive" value="1" />
@@ -953,7 +953,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="27419" level="80" type="Monster" name="Divinity Watchman">
+	<npc id="27419" level="80" type="Monster" name="Divine Watchman">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<param name="IsAggressive" value="1" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/29300-29399.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/29300-29399.xml
index 134db93534..cc046ac751 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/29300-29399.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/29300-29399.xml
@@ -2763,7 +2763,7 @@
 			<height normal="33" />
 		</collision>
 	</npc>
-	<npc id="29358" level="125" type="Monster" name="Nephilim Knight Captain" title="Anakim's Eye">
+	<npc id="29358" level="125" type="Monster" name="Nephilim Knight Captain" title="Anakim�s Eye">
 		<parameters>
 			<param name="MoveAroundSocial" value="71" />
 			<param name="MoveAroundSocial1" value="71" />
@@ -4548,4 +4548,80 @@
 			<height normal="143" />
 		</collision>
 	</npc>
+	<npc id="29387" level="85" type="Folk" name="Antharas" title="Earth Dragon">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="87492600" hpRegen="10.5" mp="66584" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="250" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="33" />
+			<height normal="90" />
+		</collision>
+	</npc>
+	<npc id="29388" level="85" type="Folk" name="Antharas" title="Earth Dragon's Avatar">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="7874334" hpRegen="10.5" mp="66584" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="250" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="33" />
+			<height normal="90" />
+		</collision>
+	</npc>
+	<npc id="29389" level="85" type="Folk" name="">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="874926" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="1" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="0.1" />
+			<height normal="0.1" />
+		</collision>
+	</npc>
+	<npc id="29390" level="85" type="Folk" name="Antharas' Symbol">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2624778" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="1" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="60" />
+			<height normal="100.5" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/30600-30699.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/30600-30699.xml
index fbccfe5cc8..de02fd018b 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/30600-30699.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/30600-30699.xml
@@ -708,7 +708,7 @@
 			<height normal="16.5" />
 		</collision>
 	</npc>
-	<npc id="30622" level="70" type="Folk" name="Box of Titan">
+	<npc id="30622" level="70" type="Folk" name="Giants' Box">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/30900-30999.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/30900-30999.xml
index 9e7cdd804a..72d6e904d7 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/30900-30999.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/30900-30999.xml
@@ -1723,7 +1723,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="30941" level="70" type="Monster" name="Malcom6" title="Prince of Wild Beast">
+	<npc id="30941" level="70" type="Monster" name="Malcom6" title="Wild Beast Prince">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
@@ -2806,7 +2806,7 @@
 			<height normal="9.5" />
 		</collision>
 	</npc>
-	<npc id="30967" level="70" type="Folk" name="Statue of Light">
+	<npc id="30967" level="70" type="Folk" name="Chest of Light">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/31600-31699.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/31600-31699.xml
index c5ae2a3733..107816c286 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/31600-31699.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/31600-31699.xml
@@ -1003,7 +1003,7 @@
 			<height normal="16.3" />
 		</collision>
 	</npc>
-	<npc id="31624" level="70" type="Folk" name="Donath" title="Master Chef">
+	<npc id="31624" level="70" type="Folk" name="Donath" title="Chef">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1088,7 +1088,7 @@
 			<height normal="10.5" />
 		</collision>
 	</npc>
-	<npc id="31626" level="70" type="Folk" name="Duncan" title="Chef">
+	<npc id="31626" level="70" type="Folk" name="Kinbad" title="Springs' Dwarf">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1105,7 +1105,7 @@
 				<defence fire="150" water="150" wind="150" earth="150" holy="150" dark="150" default="150" />
 			</attribute>
 			<speed>
-				<walk ground="50" />
+				<walk ground="25" />
 				<run ground="120" />
 			</speed>
 			<abnormalResist physical="10" magical="10" />
@@ -1126,8 +1126,8 @@
 		<exCrtEffect>true</exCrtEffect>
 		<ai clanHelpRange="300" aggroRange="450" />
 		<collision>
-			<radius normal="7" />
-			<height normal="16.5" />
+			<radius normal="11" />
+			<height normal="22" />
 		</collision>
 	</npc>
 	<npc id="31627" level="70" type="Folk" name="Mist" title="Information Broker">
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/32900-32999.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/32900-32999.xml
index 3478b649b7..cb8482f31d 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/32900-32999.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/32900-32999.xml
@@ -2823,7 +2823,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="32988" level="85" type="FriendlyNpc" name="Bloodhound" usingServerSideTitle="true">
+	<npc id="32988" level="85" type="FriendlyNpc" name="Bloodhound">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="NoFnHi" value="1" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/33600-33699.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/33600-33699.xml
index 85e7faad29..30e389d0ea 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/33600-33699.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/33600-33699.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
 	<npc id="33600" level="40" type="Folk" name="Chip" title="Party Staff">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -34,7 +34,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="33601" level="40" type="Folk" name="Dusohn" title="Helper">
+	<npc id="33601" level="40" type="Folk" name="Dusohn" title="Assistant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -68,7 +68,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="33602" level="40" type="Folk" name="Dancer" title="Helper">
+	<npc id="33602" level="40" type="Folk" name="Dancer" title="Assistant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -102,7 +102,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="33603" level="40" type="Folk" name="Rangi" title="Helper">
+	<npc id="33603" level="40" type="Folk" name="Rangi" title="Assistant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/33700-33799.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/33700-33799.xml
index 08e797f724..0a2d180726 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/33700-33799.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/33700-33799.xml
@@ -1014,7 +1014,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="33734" level="1" type="Folk" name="Santa Girl" title="Happy Holidays">
+	<npc id="33734" level="1" type="Folk" name="Santa Girl" title="Happy New Year!">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/33800-33899.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/33800-33899.xml
index d42a791f5f..de17da60cd 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/33800-33899.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/33800-33899.xml
@@ -1951,7 +1951,7 @@
 			<height normal="33.5" />
 		</collision>
 	</npc>
-	<npc id="33883" level="99" type="Folk" name="Wish Tree" title="Happy Holidays">
+	<npc id="33883" level="99" type="Folk" name="Wish Tree" title="Happy New Year!">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1995,7 +1995,7 @@
 			<height normal="73" />
 		</collision>
 	</npc>
-	<npc id="33885" level="99" type="Folk" name="Santa Girl" title="Happy Holidays">
+	<npc id="33885" level="99" type="Folk" name="Santa Girl" title="Happy New Year!">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/33900-33999.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/33900-33999.xml
index 06aa4bc7da..17a7100b25 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/33900-33999.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/33900-33999.xml
@@ -1048,7 +1048,7 @@
 			<height normal="20.4" />
 		</collision>
 	</npc>
-	<npc id="33946" level="99" type="Folk" name="Adventure Guildsman" title="PA Manager">
+	<npc id="33946" level="99" type="Folk" name="Adventure Guildsman">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DWARF</race>
 		<sex>FEMALE</sex>
@@ -1884,7 +1884,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="33983" level="99" type="Guard" name="Lenoa" title="Guard">
+	<npc id="33983" level="99" type="Guard" name="Reeya" title="Guard">
 		<race>ERTHEIA</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="288" /> <!-- rhand: Carnage Bow -->
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34000-34099.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34000-34099.xml
index c3f344df92..faa1b8d117 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34000-34099.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34000-34099.xml
@@ -730,7 +730,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="34044" level="99" type="Folk" name="Town of Goddard Herald">
+	<npc id="34044" level="99" type="Folk" name="Goddard Herald">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34200-34299.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34200-34299.xml
index 194bd295f9..35cad4adf2 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34200-34299.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34200-34299.xml
@@ -699,7 +699,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34237" level="100" type="Folk" name="Krenaht" title="Giant Tracker Leader">
+	<npc id="34237" level="100" type="Folk" name="Krenaht" title="Giant Trackers' Leader">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>KAMAEL</race>
 		<sex>MALE</sex>
@@ -809,7 +809,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34244" level="85" type="Folk" name="Roukedas" title="Giant Tracker">
+	<npc id="34244" level="85" type="Folk" name="Roukedas" title="Giant Trackers">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -828,7 +828,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="34245" level="85" type="Folk" name="Tior" title="Giant Tracker">
+	<npc id="34245" level="85" type="Folk" name="Tior" title="Giant Trackers">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -847,7 +847,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34246" level="85" type="Folk" name="Systic" title="Giant Tracker">
+	<npc id="34246" level="85" type="Folk" name="Systic" title="Giant Trackers">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1398,7 +1398,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="34284" level="85" type="Folk" name="2015 Red Snow Man">
+	<npc id="34284" level="85" type="Folk" name="2015 Red Snowman">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34300-34399.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34300-34399.xml
index 116f9b7563..5850635092 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34300-34399.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34300-34399.xml
@@ -968,7 +968,7 @@
 			<height normal="24.9" />
 		</collision>
 	</npc>
-	<npc id="34350" level="85" type="Folk" name="Memoria" title="Number Card Game Maitre 'D">
+	<npc id="34350" level="85" type="Folk" name="Memoria" title="Number Card Game Maitre �D">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34400-34499.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34400-34499.xml
index 496916c0d4..222067b703 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34400-34499.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34400-34499.xml
@@ -535,7 +535,7 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="34428" level="85" type="Folk" name="Atelia Energy">
+	<npc id="34428" level="85" type="Folk" name="Atelia's Energy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1781,7 +1781,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="34494" level="85" type="Folk" name="Mammon's Relic Collector" title="Greedy">
+	<npc id="34494" level="85" type="Folk" name="Mammon�s Relic Collector" title="Greedy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34500-34599.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34500-34599.xml
index 58327c22b6..08eb0be9d8 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34500-34599.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34500-34599.xml
@@ -886,7 +886,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34546" level="85" type="Folk" name="Wael" title="Lulu's Dad">
+	<npc id="34546" level="85" type="Folk" name="Wael" title="Lulu�s Dad">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -905,7 +905,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34547" level="85" type="Folk" name="Eileen" title="Lulu's Mom">
+	<npc id="34547" level="85" type="Folk" name="Eileen" title="Lulu�s Mom">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1213,7 +1213,7 @@
 			<height normal="13" />
 		</collision>
 	</npc>
-	<npc id="34563" level="85" type="Folk" name="Lilly" title="Festive">
+	<npc id="34563" level="85" type="Folk" name="Lilly" title="Joyful">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1672,7 +1672,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="34587" level="85" type="Folk" name="17th Anniversary" title="Unifier">
+	<npc id="34587" level="85" type="Folk" name="Anniversary" title="Unifier">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1826,7 +1826,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="34595" level="85" type="Folk" name="Prophetess" title="Kind">
+	<npc id="34595" level="85" type="Folk" name="Prophetess" title="Opening a New World">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34600-34699.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34600-34699.xml
index 6603a28503..3183fa8538 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34600-34699.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/34600-34699.xml
@@ -19,7 +19,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="34601" level="85" type="Folk" name="Lilly" title="Congratulating">
+	<npc id="34601" level="85" type="Folk" name="Lilly" title="Happy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -58,4 +58,257 @@
 			<height normal="24.2" />
 		</collision>
 	</npc>
+	<npc id="34603" level="85" type="Folk" name="Jenny" title="Secret Shop Keeper">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="17300" /> <!-- Requiem Retributer -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="64" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="9" />
+			<height normal="21.5" />
+		</collision>
+	</npc>
+	<npc id="34604" level="85" type="Folk" name="Moon Child" title="Full Moon Keeper">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="13" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="16" />
+			<height normal="23" />
+		</collision>
+	</npc>
+	<npc id="34605" level="85" type="Folk" name="Full Moon" title="Harvest Day">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="150" />
+			<height normal="290" />
+		</collision>
+	</npc>
+	<npc id="34606" level="85" type="Folk" name="Akira" title="BuffToon Event">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="8" />
+			<height normal="26" />
+		</collision>
+	</npc>
+	<npc id="34607" level="85" type="Folk" name="Sentry Scout" title="Tower of Insolence (7th Floor)">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="132" /> <!-- Ultimate Sword -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="100" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="34608" level="85" type="Folk" name="Sentry Scout" title="Tower of Insolence (8th Floor)">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="132" /> <!-- Ultimate Sword -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="100" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="34609" level="85" type="Folk" name="Sentry Scout" title="Tower of Insolence (9th Floor)">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="132" /> <!-- Ultimate Sword -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="100" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="34610" level="85" type="Folk" name="Gableena" title="Nostra">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="5" />
+			<height normal="21" />
+		</collision>
+	</npc>
+	<npc id="34611" level="85" type="Folk" name="Amora" title="Celebrating 18th Anniversary">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="13539" /> <!-- Master Yogi's Staff  -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="20" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="5.4" />
+			<height normal="24.9" />
+		</collision>
+	</npc>
+	<npc id="34612" level="85" type="Folk" name="Anniversary Light" title="Undying">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="1" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10" />
+			<height normal="30" />
+		</collision>
+	</npc>
+	<npc id="34613" level="85" type="Folk" name="Galaxia" title="Earth Angel">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="97" /> <!-- Lance -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="100" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="22" />
+			<height normal="120" />
+		</collision>
+	</npc>
+	<npc id="34614" level="85" type="Folk" name="Galaxia's Herald">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="100" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="24" />
+		</collision>
+	</npc>
+	<npc id="34615" level="85" type="Folk" name="Galaxia's Herald">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="100" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="22.5" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/35500-35599.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/35500-35599.xml
index d3f8a4b8b4..edb142a044 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/35500-35599.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/35500-35599.xml
@@ -4324,7 +4324,7 @@
 			<height normal="17.7" />
 		</collision>
 	</npc>
-	<npc id="35588" level="56" type="Monster" name="Hot Springs Gourd">
+	<npc id="35588" level="56" type="Monster" name="Hot Springs Pumpkin">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -4365,7 +4365,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="35589" level="56" type="Monster" name="Hot Springs Gourd">
+	<npc id="35589" level="56" type="Monster" name="Hot Springs Pumpkin">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -4406,7 +4406,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="35590" level="56" type="Monster" name="Hot Springs Gourd">
+	<npc id="35590" level="56" type="Monster" name="Hot Springs Pumpkin">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -4447,7 +4447,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="35591" level="56" type="Monster" name="Hot Springs Gourd">
+	<npc id="35591" level="56" type="Monster" name="Hot Springs Pumpkin">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -4647,7 +4647,7 @@
 			<height normal="8.5" />
 		</collision>
 	</npc>
-	<npc id="35596" level="56" type="Folk" name="Hot Spring Yeti" title="Maitre 'D">
+	<npc id="35596" level="56" type="Folk" name="Hot Springs Yeti" title="Maitre 'D">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
@@ -4688,7 +4688,7 @@
 			<height normal="10.5" />
 		</collision>
 	</npc>
-	<npc id="35597" level="56" type="Folk" name="Hot Spring Yeti" title="Maitre 'D">
+	<npc id="35597" level="56" type="Folk" name="Hot Springs Yeti" title="Maitre 'D">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
@@ -4729,7 +4729,7 @@
 			<height normal="10.5" />
 		</collision>
 	</npc>
-	<npc id="35598" level="56" type="Folk" name="Hot Spring Yeti" title="Maitre 'D">
+	<npc id="35598" level="56" type="Folk" name="Hot Springs Yeti" title="Maitre 'D">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
@@ -4770,7 +4770,7 @@
 			<height normal="10.5" />
 		</collision>
 	</npc>
-	<npc id="35599" level="56" type="Folk" name="Hot Spring Yeti" title="Maitre 'D">
+	<npc id="35599" level="56" type="Folk" name="Hot Springs Yeti" title="Maitre 'D">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/36500-36599.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/36500-36599.xml
index ea3ef7c814..82f5d54d85 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/36500-36599.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/36500-36599.xml
@@ -463,7 +463,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36511" level="94" type="Defender" name="Territory Guard" title="Gludio">
+	<npc id="36511" level="94" type="Defender" name="Guardian" title="Gludio">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -777,7 +777,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36517" level="94" type="Defender" name="Territory Guard" title="Dion">
+	<npc id="36517" level="94" type="Defender" name="Guardian" title="Dion">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1091,7 +1091,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36523" level="94" type="Defender" name="Territory Guard" title="Giran">
+	<npc id="36523" level="94" type="Defender" name="Guardian" title="Giran">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1405,7 +1405,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36529" level="94" type="Defender" name="Territory Guard" title="Oren">
+	<npc id="36529" level="94" type="Defender" name="Guardian" title="Oren">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1719,7 +1719,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36535" level="94" type="Defender" name="Territory Guard" title="Aden">
+	<npc id="36535" level="94" type="Defender" name="Guardian" title="Aden">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2033,7 +2033,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36541" level="94" type="Defender" name="Territory Guard" title="Innadril">
+	<npc id="36541" level="94" type="Defender" name="Guardian" title="Innadril">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2347,7 +2347,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36547" level="94" type="Defender" name="Territory Guard" title="Goddard">
+	<npc id="36547" level="94" type="Defender" name="Guardian" title="Goddard">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2661,7 +2661,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36553" level="94" type="Defender" name="Territory Guard" title="Rune">
+	<npc id="36553" level="94" type="Defender" name="Guardian" title="Rune">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2975,7 +2975,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36559" level="94" type="Defender" name="Territory Guard" title="Schuttgart">
+	<npc id="36559" level="94" type="Defender" name="Guardian" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/36700-36799.xml b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/36700-36799.xml
index 4538edb9e2..ec92c179d7 100644
--- a/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/36700-36799.xml
+++ b/L2J_Mobius_10.2_MasterClass/dist/game/data/stats/npcs/36700-36799.xml
@@ -1075,7 +1075,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="36750" level="85" type="Folk" name="Deborah" title="Blackbird Clan Envoy">
+	<npc id="36750" level="85" type="Folk" name="Deborah" title="Blackbird Clan's Envoy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1094,7 +1094,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36751" level="85" type="Folk" name="Lamunes" title="Giant Trackers Envoy">
+	<npc id="36751" level="85" type="Folk" name="Lamunes" title="Giant Trackers' Envoy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1152,7 +1152,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="36754" level="85" type="Folk" name="James" title="Kingdom's Royal Guard Envoy">
+	<npc id="36754" level="85" type="Folk" name="James" title="Kingdom's Royal Guards' Envoy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1171,7 +1171,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="36755" level="85" type="Folk" name="Kalas" title="Giant Tracker">
+	<npc id="36755" level="85" type="Folk" name="Kalas" title="Giant Trackers">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1191,7 +1191,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="36756" level="85" type="Folk" name="Karuna" title="Giant Tracker">
+	<npc id="36756" level="85" type="Folk" name="Karuna" title="Giant Trackers">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1365,7 +1365,7 @@
 			<height normal="34.4" />
 		</collision>
 	</npc>
-	<npc id="36765" level="85" type="Folk" name="Berserker Sculpture" title="Giant Tracker">
+	<npc id="36765" level="85" type="Folk" name="Berserker Sculpture" title="Giant Trackers">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1384,7 +1384,7 @@
 			<height normal="34.4" />
 		</collision>
 	</npc>
-	<npc id="36766" level="85" type="Folk" name="Berserker Sculpture" title="Giant Tracker">
+	<npc id="36766" level="85" type="Folk" name="Berserker Sculpture" title="Giant Trackers">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1555,7 +1555,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="36775" level="85" type="Folk" name="Parnezze" title="Giant Tracker">
+	<npc id="36775" level="85" type="Folk" name="Parnezze" title="Giant Trackers">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1574,7 +1574,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="36776" level="85" type="Folk" name="Luka" title="Giant Tracker">
+	<npc id="36776" level="85" type="Folk" name="Luka" title="Giant Trackers">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>