diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/00100-00199.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/00100-00199.xml
index 650776bf33..a56ff20386 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/00100-00199.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/00100-00199.xml
@@ -1,10 +1,10 @@
-<?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="159" level="80" type="Folk" name="Tame Princess Ant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
-			<vitals hp="2444" mp="40" />
+			<vitals hp="39" mp="40" />
 			<attack physical="500" magical="500" attackSpeed="278" range="40" />
 			<defence physical="500" magical="500" />
 			<speed>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/01500-01599.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/01500-01599.xml
index e4637bedda..9f8d6cfe85 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/01500-01599.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/01500-01599.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="1513" level="55" type="Folk" name="Agathion One-eyed Bat Drove">
+	<npc id="1513" level="55" type="Folk" name="One-eyed Bat Drove Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -32,7 +32,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1514" level="55" type="Folk" name="Agathion Pegasus">
+	<npc id="1514" level="55" type="Folk" name="Pegasus Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -96,7 +96,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1533" level="55" type="Folk" name="Agathion Uthanka">
+	<npc id="1533" level="55" type="Folk" name="Uthanka Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -128,7 +128,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1539" level="55" type="Folk" name="Agathion Iken">
+	<npc id="1539" level="55" type="Folk" name="Iken Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -160,7 +160,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1540" level="55" type="Folk" name="Agathion Lanya">
+	<npc id="1540" level="55" type="Folk" name="Lanya Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -192,7 +192,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1541" level="55" type="Folk" name="Agathion Gnosian">
+	<npc id="1541" level="55" type="Folk" name="Gnosian Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -224,7 +224,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1542" level="55" type="Folk" name="Agathion Cheerleader Orodriel">
+	<npc id="1542" level="55" type="Folk" name="Cheerleader Orodriel Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -256,7 +256,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1543" level="55" type="Folk" name="Agathion Lakinos">
+	<npc id="1543" level="55" type="Folk" name="Lakinos Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -288,7 +288,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1544" level="55" type="Folk" name="Agathion Mortia">
+	<npc id="1544" level="55" type="Folk" name="Mortia Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -320,7 +320,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1545" level="55" type="Folk" name="Agathion Heintz">
+	<npc id="1545" level="55" type="Folk" name="Heintz Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -352,7 +352,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1546" level="55" type="Folk" name="Agathion Meruril">
+	<npc id="1546" level="55" type="Folk" name="Meruril Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -384,7 +384,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1547" level="55" type="Folk" name="Agathion Taman Zu Rapatui">
+	<npc id="1547" level="55" type="Folk" name="Taman Zu Rapatui Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -416,7 +416,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1548" level="55" type="Folk" name="Agathion Kaurin">
+	<npc id="1548" level="55" type="Folk" name="Kaurin Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -448,7 +448,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1549" level="55" type="Folk" name="Agathion Ahertbein">
+	<npc id="1549" level="55" type="Folk" name="Ahertbein Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -480,7 +480,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1550" level="55" type="Folk" name="Agathion Naonin">
+	<npc id="1550" level="55" type="Folk" name="Naonin Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -512,7 +512,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1551" level="55" type="Folk" name="Agathion Guangong">
+	<npc id="1551" level="55" type="Folk" name="Guangong Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -544,7 +544,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1552" level="55" type="Folk" name="Agathion Gwanseum Nyang">
+	<npc id="1552" level="55" type="Folk" name="Gwanseum Nyang Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -576,7 +576,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1553" level="55" type="Folk" name="Agathion Blue Opera">
+	<npc id="1553" level="55" type="Folk" name="Blue Opera Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -608,7 +608,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1554" level="55" type="Folk" name="Agathion Red Opera">
+	<npc id="1554" level="55" type="Folk" name="Red Opera Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -640,7 +640,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1556" level="55" type="Folk" name="Agathion Miss Chipao">
+	<npc id="1556" level="55" type="Folk" name="Miss Chipao Agathion">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -768,7 +768,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1594" level="80" type="Folk" name="Agathion Singer and Dancer">
+	<npc id="1594" level="80" type="Folk" name="Singer and Dancer Agathion">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -785,12 +785,12 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1595" level="80" type="Folk" name="Agathion Zaken's Spirit Swords">
+	<npc id="1595" level="80" type="Folk" name="Zaken's Spirit Swords Agathion">
 		<!-- 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="889" mpRegen="3.6" />
+			<vitals hp="1673" hpRegen="10.5" mp="889" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/04300-04399.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/04300-04399.xml
index f0a77ebefa..ca8aa47716 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/04300-04399.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/04300-04399.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="4308" level="80" type="Folk" name="Angel Cat" title="Herald of Love">
+	<npc id="4308" level="80" type="Folk" name="Angel Cat" title="Love's Envoy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -17,7 +17,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="4309" level="80" type="Folk" name="Small Angel Cat" title="Herald of Love">
+	<npc id="4309" level="80" type="Folk" name="Little Angel Cat" title="Love Envoy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/08500-08599.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/08500-08599.xml
new file mode 100644
index 0000000000..2c979ece30
--- /dev/null
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/08500-08599.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
+	<npc id="8534" level="85" type="Folk" name="Talented Snow">
+		<!-- 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="966" hpRegen="10.5" mp="478" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<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="01" />
+			<height normal="8" />
+		</collision>
+	</npc>
+</list>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/09000-09099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/09000-09099.xml
index 0df454cb4b..bb79f839ed 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/09000-09099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/09000-09099.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="9000" level="75" type="Folk" name="Rosalia" title="Letter Collector">
+	<npc id="9000" level="75" type="Folk" name="Rosello" title="Letter Collector">
 		<!-- Classic NPC -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -38,7 +38,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="9002" level="75" type="Folk" name="Synge the Cat" title="Grand Soloist">
+	<npc id="9002" level="75" type="Folk" name="Synge the Cat" title="Best Singer">
 		<!-- Classic NPC -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -76,8 +76,8 @@
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="612" hpRegen="3.5" mp="245" mpRegen="1.5" />
 			<speed>
-				<walk ground="55" />
-				<run ground="130" />
+				<walk ground="60" />
+				<run ground="160" />
 			</speed>
 			<hitTime>280</hitTime>
 			<attack physical="66.216557" magical="41.10666" random="30" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
@@ -125,8 +125,8 @@
 			<attack physical="52.711164" magical="32.72263" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="81.57326364" magical="65.66095" />
 			<speed>
-				<walk ground="60" />
-				<run ground="80" />
+				<walk ground="50" />
+				<run ground="150" />
 			</speed>
 			<hitTime>340</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -174,7 +174,7 @@
 			<defence physical="78.68469" magical="57.57804" />
 			<speed>
 				<walk ground="50" />
-				<run ground="110" />
+				<run ground="150" />
 			</speed>
 			<hitTime>460</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -275,8 +275,8 @@
 			<attack physical="319.490468" magical="198.33688" random="30" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
 			<defence physical="177.8754727" magical="143.17771" />
 			<speed>
-				<walk ground="70" />
-				<run ground="174" />
+				<walk ground="50" />
+				<run ground="180" />
 			</speed>
 			<hitTime>300</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -305,8 +305,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="35" />
-			<height normal="75.5" />
+			<radius normal="1" />
+			<height normal="5" />
 		</collision>
 	</npc>
 	<npc id="9008" level="75" type="Folk" name="">
@@ -409,7 +409,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="2444" hpRegen="8.5" mp="259" mpRegen="3" />
+			<vitals hp="28588" hpRegen="8.5" mp="259" mpRegen="3" />
 			<speed>
 				<walk ground="60" />
 				<run ground="190" />
@@ -468,7 +468,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="2676" hpRegen="8.5" mp="889" mpRegen="3" />
+			<vitals hp="1673" hpRegen="8.5" mp="889" mpRegen="3" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -487,7 +487,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="2676" hpRegen="8.5" mp="889" mpRegen="3" />
+			<vitals hp="1673" hpRegen="8.5" mp="889" mpRegen="3" />
 			<speed>
 				<walk ground="60" />
 				<run ground="600" />
@@ -506,7 +506,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="2676" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<vitals hp="8446" hpRegen="8.5" mp="2355" mpRegen="3" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -525,7 +525,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="2676" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<vitals hp="8446" hpRegen="8.5" mp="2355" mpRegen="3" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -544,7 +544,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="2676" hpRegen="8.5" mp="2355" mpRegen="3" />
+			<vitals hp="8446" hpRegen="8.5" mp="2355" mpRegen="3" />
 			<speed>
 				<walk ground="60" />
 				<run ground="1" />
@@ -586,12 +586,12 @@
 			<height normal="1" />
 		</collision>
 	</npc>
-	<npc id="9022" level="80" type="Folk" name="Rico" title="Jack's Scarecrow">
+	<npc id="9022" level="80" type="Folk" name="Pumpkinface" title="Halloween Master">
 		<!-- 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="478" mpRegen="3.6" />
+			<vitals hp="966" hpRegen="10.5" mp="478" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="120" />
@@ -610,7 +610,7 @@
 		<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="1812" mpRegen="3.6" />
+			<vitals hp="4039" hpRegen="10.5" mp="1812" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -624,12 +624,12 @@
 			<height normal="30.5" />
 		</collision>
 	</npc>
-	<npc id="9024" level="80" type="Folk" name="Older Sister" title="Daydreamer Match Girl">
+	<npc id="9024" level="80" type="Folk" name="Older Sister" title="Daydreamer Matchstick Girl">
 		<!-- 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="478" mpRegen="3.6" />
+			<vitals hp="966" hpRegen="10.5" mp="478" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="120" />
@@ -643,12 +643,12 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="9025" level="80" type="Folk" name="Younger Sister" title="Hungry Match Girl">
+	<npc id="9025" level="80" type="Folk" name="Younger Sister" title="Hungry Matchstick Girl">
 		<!-- 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="478" mpRegen="3.6" />
+			<vitals hp="966" hpRegen="10.5" mp="478" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
@@ -762,7 +762,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
@@ -776,12 +776,12 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="9032" level="80" type="Folk" name="Agathion Bugbear">
+	<npc id="9032" level="80" type="Folk" name="Bugbear Agathion">
 		<!-- 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="889" mpRegen="3.6" />
+			<vitals hp="1673" hpRegen="10.5" mp="889" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -795,12 +795,12 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="9033" level="80" type="Folk" name="Agathion Dryad">
+	<npc id="9033" level="80" type="Folk" name="Dryad Agathion">
 		<!-- 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="889" mpRegen="3.6" />
+			<vitals hp="1673" hpRegen="10.5" mp="889" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -819,7 +819,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="20" />
 				<run ground="120" />
@@ -833,7 +833,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="9035" level="80" type="Folk" name="Agathion Mermaid">
+	<npc id="9035" level="80" type="Folk" name="Mermaid Agathion">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -848,7 +848,7 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="6" />
 		</collision>
 	</npc>
@@ -857,7 +857,7 @@
 		<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="889" mpRegen="3.6" />
+			<vitals hp="1673" hpRegen="10.5" mp="889" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -876,7 +876,7 @@
 		<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="889" mpRegen="3.6" />
+			<vitals hp="1673" hpRegen="10.5" mp="889" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -895,7 +895,7 @@
 		<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="889" mpRegen="3.6" />
+			<vitals hp="1673" hpRegen="10.5" mp="889" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -909,7 +909,7 @@
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="9039" level="80" type="Folk" name="Agathion Meliodas">
+	<npc id="9039" level="80" type="Folk" name="Meliodas Agathion">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -928,7 +928,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="9040" level="80" type="Folk" name="Agathion Elizabeth">
+	<npc id="9040" level="80" type="Folk" name="Elizabeth Agathion">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -947,7 +947,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="9041" level="80" type="Folk" name="Agathion Hawk">
+	<npc id="9041" level="80" type="Folk" name="Hawk Agathion">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -966,7 +966,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="9042" level="80" type="Folk" name="Agathion Ban">
+	<npc id="9042" level="80" type="Folk" name="Ban Agathion">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -985,7 +985,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="9043" level="80" type="Folk" name="Agathion Diane">
+	<npc id="9043" level="80" type="Folk" name="Diane Agathion">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1004,7 +1004,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="9044" level="80" type="Folk" name="Agathion King">
+	<npc id="9044" level="80" type="Folk" name="King Agathion">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1023,7 +1023,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="9045" level="80" type="Folk" name="Agathion Merlin">
+	<npc id="9045" level="80" type="Folk" name="Merlin Agathion">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1042,7 +1042,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="9046" level="80" type="Folk" name="Agathion Gowther">
+	<npc id="9046" level="80" type="Folk" name="Gowther Agathion">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1061,7 +1061,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="9047" level="80" type="Folk" name="Agathion Escanor">
+	<npc id="9047" level="80" type="Folk" name="Escanor Agathion">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1099,4 +1099,251 @@
 			<height normal="17" />
 		</collision>
 	</npc>
+	<npc id="9049" level="85" type="Folk" name="Transformed: Kitty Sales Part-timer">
+		<!-- 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="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="9" />
+			<height normal="32" />
+		</collision>
+	</npc>
+	<npc id="9050" level="85" type="Folk" name="Little Pumpkin">
+		<!-- 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="39" hpRegen="10.5" mp="40" 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="10" />
+			<height normal="10.5" />
+		</collision>
+	</npc>
+	<npc id="9051" level="85" type="Folk" name="Big Pumpkin">
+		<!-- 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="39" hpRegen="10.5" mp="40" 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="30.8" />
+			<height normal="26.12" />
+		</collision>
+	</npc>
+	<npc id="9052" level="85" type="Folk" name="Defective Pumpkin">
+		<!-- 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="39" hpRegen="10.5" mp="40" 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="15" />
+			<height normal="16" />
+		</collision>
+	</npc>
+	<npc id="9053" level="85" type="Folk" name="Little Honey Pumpkin">
+		<!-- 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="39" hpRegen="10.5" mp="40" 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="23" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="9054" level="85" type="Folk" name="Big Honey Pumpkin">
+		<!-- 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="39" hpRegen="10.5" mp="40" 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="38.5" />
+			<height normal="33.4" />
+		</collision>
+	</npc>
+	<npc id="9055" level="85" type="Folk" name="Defective Honey Pumpkin">
+		<!-- 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="39" hpRegen="10.5" mp="40" 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="28" />
+			<height normal="31" />
+		</collision>
+	</npc>
+	<npc id="9056" level="85" type="Folk" name="Super Big Pumpkin">
+		<!-- 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="39" hpRegen="10.5" mp="40" 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="30.8" />
+			<height normal="26.12" />
+		</collision>
+	</npc>
+	<npc id="9057" level="85" type="Folk" name="Super Big Honey Pumpkin">
+		<!-- 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="39" hpRegen="10.5" mp="40" 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="46.2" />
+			<height normal="40.68" />
+		</collision>
+	</npc>
+	<npc id="9058" level="85" type="Folk" name="Uldie" title="Event manager">
+		<!-- 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="39" hpRegen="10.5" mp="40" mpRegen="3.6" />
+			<speed>
+				<walk ground="18" />
+				<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="8" />
+			<height normal="17" />
+		</collision>
+	</npc>
+	<npc id="9059" level="85" type="Folk" name="Magic Warehouse">
+		<!-- 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="80" />
+				<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="8.5" />
+			<height normal="8.5" />
+		</collision>
+	</npc>
+	<npc id="9060" level="85" type="Folk" name="Decoy">
+		<!-- 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="8.5" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="9061" level="85" type="Folk" name="Devil Decoy">
+		<!-- 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="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="01" />
+			<height normal="01" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13100-13199.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13100-13199.xml
index d56bb04cb8..827ed1c3c7 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13100-13199.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13100-13199.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="13146" level="70" type="Folk" name="Tawny-maned Lion">
 		<!-- Todo: Need Confirmation -->
@@ -6,7 +6,7 @@
 		<sex>ETC</sex>
 		<acquire exp="490" sp="10" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="2444.46819" hpRegen="7.5" mp="889" mpRegen="2.7" />
+			<vitals hp="1673" hpRegen="7.5" mp="889" mpRegen="2.7" />
 			<attack physical="688.86373" magical="470.40463" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="295.91597" magical="216.53847" />
 			<speed>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13200-13299.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13200-13299.xml
index 2f6d9a060a..667016fd7b 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13200-13299.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13200-13299.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="13271" level="1" type="Folk" name="Young Watermelon">
+	<npc id="13271" level="1" type="Folk" name="Growing Watermelon">
 		<race>ETC</race>
 		<sex>ETC</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -33,7 +33,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="13272" level="1" type="Monster" name="Defective Watermelon">
+	<npc id="13272" level="1" type="Monster" name="Rotten Watermelon">
 		<race>ETC</race>
 		<sex>ETC</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -67,7 +67,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="13273" level="1" type="Monster" name="Rain Watermelon">
+	<npc id="13273" level="1" type="Monster" name="Fresh Watermelon">
 		<race>ETC</race>
 		<sex>ETC</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -102,7 +102,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="13274" level="1" type="Monster" name="Large Rain Watermelon">
+	<npc id="13274" level="1" type="Monster" name="Plump Watermelon">
 		<race>ETC</race>
 		<sex>ETC</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -137,7 +137,7 @@
 			<height normal="65" />
 		</collision>
 	</npc>
-	<npc id="13275" level="1" type="Folk" name="Young Honey Watermelon">
+	<npc id="13275" level="1" type="Folk" name="Growing Honey Watermelon">
 		<race>ETC</race>
 		<sex>ETC</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -171,7 +171,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="13276" level="1" type="Monster" name="Defective Honey Watermelon">
+	<npc id="13276" level="1" type="Monster" name="Rotten Honey Watermelon">
 		<race>ETC</race>
 		<sex>ETC</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -206,7 +206,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="13277" level="1" type="Monster" name="Rain Honey Watermelon">
+	<npc id="13277" level="1" type="Monster" name="Fresh Honey Watermelon">
 		<race>ETC</race>
 		<sex>ETC</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -241,7 +241,7 @@
 			<height normal="52" />
 		</collision>
 	</npc>
-	<npc id="13278" level="1" type="Monster" name="Large Rain Honey Watermelon">
+	<npc id="13278" level="1" type="Monster" name="Plump Honey Watermelon">
 		<race>ETC</race>
 		<sex>ETC</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13400-13499.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13400-13499.xml
index b9b0c8e9d3..9e2c2e4fb6 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13400-13499.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13400-13499.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="13400" level="1" type="Monster" name="Snowy Ripe Squash">
 		<race>ETC</race>
@@ -238,7 +238,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="13407" level="80" type="Folk" name="Pierce">
+	<npc id="13407" level="80" type="Folk" name="Pisces">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -276,7 +276,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13409" level="80" type="Folk" name="Cat">
+	<npc id="13409" level="80" type="Folk" name="Cancer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -510,7 +510,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="13421" level="1" type="Monster" name="High Quality Large Squash">
+	<npc id="13421" level="1" type="Monster" name="Large Young Squash">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -532,7 +532,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="High Quality Large Squash">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13500-13599.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13500-13599.xml
index 12cdeeaad2..24b8786de9 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13500-13599.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13500-13599.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="13500" level="80" type="Folk" name="Virgo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -529,7 +529,7 @@
 		<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="40" mpRegen="3.6" />
+			<vitals hp="41" hpRegen="10.5" mp="40" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
@@ -549,7 +549,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="142" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1188" mpRegen="3.6" />
+			<vitals hp="2313" hpRegen="10.5" mp="1188" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -568,7 +568,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -598,7 +598,7 @@
 		<status attackable="false" />
 		<collision>
 			<radius normal="15" />
-			<height normal="141.875" />
+			<height normal="14.1875" />
 		</collision>
 	</npc>
 	<npc id="13552" level="80" type="Folk" name="Big Bundle of Magical Firewood">
@@ -620,12 +620,12 @@
 			<height normal="21.125" />
 		</collision>
 	</npc>
-	<npc id="13553" level="80" type="Folk" name="Agathion Virgo">
+	<npc id="13553" level="80" type="Folk" name="Virgo Agathion">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -639,12 +639,12 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13554" level="80" type="Folk" name="Agathion Capricorn">
+	<npc id="13554" level="80" type="Folk" name="Capricorn Agathion">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -658,12 +658,12 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13555" level="80" type="Folk" name="Agathion Libra">
+	<npc id="13555" level="80" type="Folk" name="Libra Agathion">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -677,12 +677,12 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13556" level="80" type="Folk" name="Agathion Aries">
+	<npc id="13556" level="80" type="Folk" name="Aries Agathion">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -696,12 +696,12 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13557" level="80" type="Folk" name="Agathion Taurus">
+	<npc id="13557" level="80" type="Folk" name="Taurus Agathion">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -715,12 +715,12 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13558" level="80" type="Folk" name="Agathion Leo">
+	<npc id="13558" level="80" type="Folk" name="Leo Agathion">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -734,12 +734,12 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13559" level="80" type="Folk" name="Agathion Gemini">
+	<npc id="13559" level="80" type="Folk" name="Gemini Agathion">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -753,12 +753,12 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13560" level="80" type="Folk" name="Agathion Scorpio">
+	<npc id="13560" level="80" type="Folk" name="Scorpio Agathion">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -772,12 +772,12 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13561" level="80" type="Folk" name="Agathion Aquarius">
+	<npc id="13561" level="80" type="Folk" name="Aquarius Agathion">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -791,12 +791,12 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13562" level="80" type="Folk" name="Agathion Pisces">
+	<npc id="13562" level="80" type="Folk" name="Pisces Agathion">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -810,12 +810,12 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13563" level="80" type="Folk" name="Agathion Sagittarius">
+	<npc id="13563" level="80" type="Folk" name="Sagittarius Agathion">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -829,12 +829,12 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13564" level="80" type="Folk" name="Agathion Cancer">
+	<npc id="13564" level="80" type="Folk" name="Cancer Agathion">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -848,12 +848,12 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13565" level="80" type="Folk" name="Ignis" title="Flame Spirit Seed">
+	<npc id="13565" level="80" type="Folk" name="Ignis" title="Fire Spirit Seed">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -863,16 +863,16 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="13566" level="80" type="Folk" name="Ignis" title="Minor Flame Spirit">
+	<npc id="13566" level="80" type="Folk" name="Ignis" title="Minor Fire Spirit">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -882,16 +882,16 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="13567" level="80" type="Folk" name="Ignis" title="Lesser Flame Spirit">
+	<npc id="13567" level="80" type="Folk" name="Ignis" title="Lesser Fire Spirit">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -901,16 +901,16 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="13568" level="80" type="Folk" name="Ignis" title="Median Flame Spirit">
+	<npc id="13568" level="80" type="Folk" name="Ignis" title="Intermediate Fire Spirit">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -920,7 +920,7 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="6" />
 		</collision>
 	</npc>
@@ -929,7 +929,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -939,7 +939,7 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="6" />
 		</collision>
 	</npc>
@@ -948,7 +948,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -958,7 +958,7 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="6" />
 		</collision>
 	</npc>
@@ -967,7 +967,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -977,16 +977,16 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="13572" level="80" type="Folk" name="Nebula" title="Median Water Spirit">
+	<npc id="13572" level="80" type="Folk" name="Nebula" title="Intermediate Water Spirit">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -996,7 +996,7 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="6" />
 		</collision>
 	</npc>
@@ -1005,7 +1005,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1015,7 +1015,7 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="6" />
 		</collision>
 	</npc>
@@ -1024,7 +1024,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1034,7 +1034,7 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="6" />
 		</collision>
 	</npc>
@@ -1043,7 +1043,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1053,16 +1053,16 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="13576" level="80" type="Folk" name="Procella" title="Median Wind Spirit">
+	<npc id="13576" level="80" type="Folk" name="Procella" title="Intermediate Wind Spirit">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1072,7 +1072,7 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="6" />
 		</collision>
 	</npc>
@@ -1081,7 +1081,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1091,7 +1091,7 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="6" />
 		</collision>
 	</npc>
@@ -1100,7 +1100,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1110,7 +1110,7 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="6" />
 		</collision>
 	</npc>
@@ -1119,7 +1119,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1129,16 +1129,16 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="13580" level="80" type="Folk" name="Petram" title="Median Earth Spirit">
+	<npc id="13580" level="80" type="Folk" name="Petram" title="Intermediate Earth Spirit">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1148,7 +1148,7 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="6" />
 		</collision>
 	</npc>
@@ -1157,7 +1157,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="45" />
 				<run ground="180" />
@@ -1176,7 +1176,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -1186,8 +1186,8 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="1.5" />
-			<height normal="6" />
+			<radius normal="1" />
+			<height normal="3" />
 		</collision>
 	</npc>
 	<npc id="13583" level="80" type="Folk" name="Nebula">
@@ -1195,7 +1195,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -1205,8 +1205,8 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="1.8" />
-			<height normal="7.8" />
+			<radius normal="1" />
+			<height normal="3" />
 		</collision>
 	</npc>
 	<npc id="13584" level="80" type="Folk" name="Procella">
@@ -1214,7 +1214,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -1224,8 +1224,8 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="1.5" />
-			<height normal="6" />
+			<radius normal="1" />
+			<height normal="3" />
 		</collision>
 	</npc>
 	<npc id="13585" level="80" type="Folk" name="Petram">
@@ -1233,7 +1233,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -1243,8 +1243,8 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="1.5" />
-			<height normal="6" />
+			<radius normal="1" />
+			<height normal="3" />
 		</collision>
 	</npc>
 	<npc id="13586" level="80" type="Folk" name="Dark Elf">
@@ -1252,7 +1252,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -1262,8 +1262,8 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0" />
-			<height normal="-3" />
+			<radius normal="1" />
+			<height normal="3" />
 		</collision>
 	</npc>
 	<npc id="13587" level="80" type="Folk" name="Dwarf">
@@ -1271,7 +1271,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -1281,8 +1281,8 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0" />
-			<height normal="-3" />
+			<radius normal="1" />
+			<height normal="3" />
 		</collision>
 	</npc>
 	<npc id="13588" level="80" type="Folk" name="Elf">
@@ -1290,7 +1290,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -1300,8 +1300,8 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0" />
-			<height normal="-3" />
+			<radius normal="1" />
+			<height normal="3" />
 		</collision>
 	</npc>
 	<npc id="13589" level="80" type="Folk" name="Fairweather Borna">
@@ -1309,9 +1309,9 @@
 		<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="889" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
-				<walk ground="18" />
+				<walk ground="60" />
 				<run ground="180" />
 			</speed>
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
@@ -1328,7 +1328,7 @@
 		<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="1846" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -1338,8 +1338,179 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="9" />
-			<height normal="23.5" />
+			<radius normal="8" />
+			<height normal="16" />
+		</collision>
+	</npc>
+	<npc id="13591" level="85" type="Folk" name="Fire Dragon Type Virgo Agathion">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="3" />
+			<height normal="5.15" />
+		</collision>
+	</npc>
+	<npc id="13592" level="85" type="Folk" name="Fire Dragon Type Capricorn Agathion">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="3" />
+			<height normal="5.15" />
+		</collision>
+	</npc>
+	<npc id="13593" level="85" type="Folk" name="Fire Dragon Type Libra Agathion">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="3" />
+			<height normal="5.15" />
+		</collision>
+	</npc>
+	<npc id="13594" level="85" type="Folk" name="Fire Dragon Type Taurus Agathion">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="3" />
+			<height normal="5.15" />
+		</collision>
+	</npc>
+	<npc id="13595" level="85" type="Folk" name="Fire Dragon Type Leo Agathion">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="3" />
+			<height normal="5.15" />
+		</collision>
+	</npc>
+	<npc id="13596" level="85" type="Folk" name="Fire Dragon Type Scorpio Agathion">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="3" />
+			<height normal="5.15" />
+		</collision>
+	</npc>
+	<npc id="13597" level="85" type="Folk" name="Fire Dragon Type Aquarius Agathion">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="3" />
+			<height normal="5.15" />
+		</collision>
+	</npc>
+	<npc id="13598" level="85" type="Folk" name="Fire Dragon Type Sagittarius Agathion">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="3" />
+			<height normal="5.15" />
+		</collision>
+	</npc>
+	<npc id="13599" level="85" type="Folk" name="Earth Dragon Type Virgo Agathion">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="3" />
+			<height normal="5.15" />
 		</collision>
 	</npc>
 </list>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13600-13699.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13600-13699.xml
new file mode 100644
index 0000000000..2cb3d2dcc6
--- /dev/null
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/13600-13699.xml
@@ -0,0 +1,345 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
+	<npc id="13600" level="85" type="Folk" name="Earth Dragon Type Capricorn Agathion">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="3" />
+			<height normal="5.15" />
+		</collision>
+	</npc>
+	<npc id="13601" level="85" type="Folk" name="Earth Dragon Type Libra Agathion">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="3" />
+			<height normal="5.15" />
+		</collision>
+	</npc>
+	<npc id="13602" level="85" type="Folk" name="Earth Dragon Type Taurus Agathion">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="3" />
+			<height normal="5.15" />
+		</collision>
+	</npc>
+	<npc id="13603" level="85" type="Folk" name="Earth Dragon Type Leo Agathion">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="3" />
+			<height normal="5.15" />
+		</collision>
+	</npc>
+	<npc id="13604" level="85" type="Folk" name="Earth Dragon Type Scorpio Agathion">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="3" />
+			<height normal="5.15" />
+		</collision>
+	</npc>
+	<npc id="13605" level="85" type="Folk" name="Earth Dragon Type Aquarius Agathion">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="3" />
+			<height normal="5.15" />
+		</collision>
+	</npc>
+	<npc id="13606" level="85" type="Folk" name="Earth Dragon Type Sagittarius Agathion">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="3" />
+			<height normal="5.15" />
+		</collision>
+	</npc>
+	<npc id="13607" level="85" type="Folk" name="Greater Gemini Agathion">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="3" />
+			<height normal="5.15" />
+		</collision>
+	</npc>
+	<npc id="13608" level="85" type="Folk" name="Snowman">
+		<!-- 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="1673" hpRegen="10.5" mp="889" mpRegen="3.6" />
+			<speed>
+				<walk ground="20" />
+				<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="30" />
+		</collision>
+	</npc>
+	<npc id="13609" level="85" type="Folk" name="Scarecrow">
+		<!-- 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="1673" hpRegen="10.5" mp="889" mpRegen="3.6" />
+			<speed>
+				<walk ground="23" />
+				<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="30" />
+		</collision>
+	</npc>
+	<npc id="13610" level="85" type="Folk" name="Tin Golem">
+		<!-- 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="1673" hpRegen="10.5" mp="889" mpRegen="3.6" />
+			<speed>
+				<walk ground="13" />
+				<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="18.5" />
+		</collision>
+	</npc>
+	<npc id="13611" level="85" type="Folk" name="Tow">
+		<!-- 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="1673" hpRegen="10.5" mp="889" mpRegen="3.6" />
+			<speed>
+				<walk ground="155" />
+				<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="4.4" />
+			<height normal="8.25" />
+		</collision>
+	</npc>
+	<npc id="13612" level="85" type="Folk" name="Lure Tow">
+		<!-- 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="1673" hpRegen="10.5" mp="889" mpRegen="3.6" />
+			<speed>
+				<walk ground="155" />
+				<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="4.4" />
+			<height normal="8.25" />
+		</collision>
+	</npc>
+	<npc id="13613" level="85" type="Folk" name="Heavy Tow">
+		<!-- 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="1673" hpRegen="10.5" mp="889" mpRegen="3.6" />
+			<speed>
+				<walk ground="165" />
+				<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="4.4" />
+			<height normal="8.25" />
+		</collision>
+	</npc>
+	<npc id="13614" level="85" type="Folk" name="Wimp Tow">
+		<!-- 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="1673" hpRegen="10.5" mp="889" mpRegen="3.6" />
+			<speed>
+				<walk ground="140" />
+				<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="4.4" />
+			<height normal="8.25" />
+		</collision>
+	</npc>
+	<npc id="13615" level="85" type="Folk" name="White Dog">
+		<!-- 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="25" />
+				<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="9.5" />
+		</collision>
+	</npc>
+	<npc id="13616" level="85" type="Folk" name="Pink Dog">
+		<!-- 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="25" />
+				<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="9.5" />
+		</collision>
+	</npc>
+	<npc id="13617" level="85" type="Folk" name="Golden Dog">
+		<!-- 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="25" />
+				<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="9.5" />
+		</collision>
+	</npc>
+</list>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/14200-14299.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/14200-14299.xml
index 0b7d5041cb..993ced00f5 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/14200-14299.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/14200-14299.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="14200" level="80" type="Pet" name="Mew the Cat">
 		<parameters>
@@ -2280,7 +2280,7 @@
 			<attack physical="370.05" magical="640.40994" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="398.70061" magical="295.45587" />
 			<speed>
-				<walk ground="26" />
+				<walk ground="25" />
 				<run ground="170" />
 			</speed>
 			<hitTime>480</hitTime>
@@ -2332,7 +2332,7 @@
 			<attack physical="390.05" magical="660.40994" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="410.70061" magical="305.45587" />
 			<speed>
-				<walk ground="26" />
+				<walk ground="25" />
 				<run ground="170" />
 			</speed>
 			<hitTime>480</hitTime>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/14800-14899.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/14800-14899.xml
index 68c8dc7a80..6c30025685 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/14800-14899.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/14800-14899.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="14800" level="51" type="Pet" name="Dark Panther">
 		<parameters>
@@ -1856,7 +1856,7 @@
 		<sNpcPropHpRate>1.331</sNpcPropHpRate>
 		<collision>
 			<radius normal="6" />
-			<height normal="16.055" />
+			<height normal="1655" />
 		</collision>
 	</npc>
 	<npc id="14837" level="85" type="Pet" name="Magnus the Unicorn">
@@ -3161,7 +3161,7 @@
 		<sNpcPropHpRate>1.331</sNpcPropHpRate>
 		<collision>
 			<radius normal="6" />
-			<height normal="16.01" />
+			<height normal="1655" />
 		</collision>
 	</npc>
 	<npc id="14872" level="77" type="Pet" name="Feline King">
@@ -3203,7 +3203,7 @@
 		<sNpcPropHpRate>1.331</sNpcPropHpRate>
 		<collision>
 			<radius normal="6" />
-			<height normal="16.01" />
+			<height normal="1655" />
 		</collision>
 	</npc>
 	<npc id="14873" level="77" type="Pet" name="Feline King">
@@ -3245,7 +3245,7 @@
 		<sNpcPropHpRate>1.331</sNpcPropHpRate>
 		<collision>
 			<radius normal="6" />
-			<height normal="16.01" />
+			<height normal="1655" />
 		</collision>
 	</npc>
 	<npc id="14874" level="81" type="Pet" name="Feline King">
@@ -3288,7 +3288,7 @@
 		<sNpcPropHpRate>1.331</sNpcPropHpRate>
 		<collision>
 			<radius normal="6" />
-			<height normal="16.01" />
+			<height normal="1655" />
 		</collision>
 	</npc>
 	<npc id="14875" level="82" type="Pet" name="Feline King">
@@ -3304,7 +3304,7 @@
 			<attack physical="927.839984444444" magical="633.594428888889" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="349.050693333333" magical="255.420148888889" />
 			<speed>
-				<walk ground="160" />
+				<walk ground="10" />
 				<run ground="180" />
 			</speed>
 			<abnormalResist physical="10" magical="10" />
@@ -3331,7 +3331,7 @@
 		<sNpcPropHpRate>1.331</sNpcPropHpRate>
 		<collision>
 			<radius normal="6" />
-			<height normal="16.01" />
+			<height normal="1655" />
 		</collision>
 	</npc>
 	<npc id="14876" level="83" type="Pet" name="Feline King">
@@ -3347,7 +3347,7 @@
 			<attack physical="934.456273333333" magical="638.112496666667" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="350.585832" magical="256.543496666667" />
 			<speed>
-				<walk ground="160" />
+				<walk ground="10" />
 				<run ground="180" />
 			</speed>
 			<abnormalResist physical="10" magical="10" />
@@ -3374,7 +3374,7 @@
 		<sNpcPropHpRate>1.331</sNpcPropHpRate>
 		<collision>
 			<radius normal="6" />
-			<height normal="16.01" />
+			<height normal="1655" />
 		</collision>
 	</npc>
 	<npc id="14877" level="84" type="Pet" name="Feline King">
@@ -3390,7 +3390,7 @@
 			<attack physical="941.072562222222" magical="642.630564444444" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="352.120970666667" magical="257.666844444444" />
 			<speed>
-				<walk ground="160" />
+				<walk ground="10" />
 				<run ground="180" />
 			</speed>
 			<abnormalResist physical="10" magical="10" />
@@ -3417,7 +3417,7 @@
 		<sNpcPropHpRate>1.331</sNpcPropHpRate>
 		<collision>
 			<radius normal="6" />
-			<height normal="16.01" />
+			<height normal="1655" />
 		</collision>
 	</npc>
 	<npc id="14878" level="85" type="Pet" name="Feline King">
@@ -3433,7 +3433,7 @@
 			<attack physical="947.688851111111" magical="647.148632222222" random="10" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="353.656109333333" magical="258.790192222222" />
 			<speed>
-				<walk ground="160" />
+				<walk ground="10" />
 				<run ground="180" />
 			</speed>
 			<abnormalResist physical="10" magical="10" />
@@ -3460,7 +3460,7 @@
 		<sNpcPropHpRate>1.331</sNpcPropHpRate>
 		<collision>
 			<radius normal="6" />
-			<height normal="16.01" />
+			<height normal="1655" />
 		</collision>
 	</npc>
 	<npc id="14879" level="90" type="Pet" name="Feline King">
@@ -3502,7 +3502,7 @@
 		<sNpcPropHpRate>1.331</sNpcPropHpRate>
 		<collision>
 			<radius normal="6" />
-			<height normal="16.01" />
+			<height normal="1655" />
 		</collision>
 	</npc>
 	<npc id="14880" level="90" type="Pet" name="Feline King">
@@ -3544,7 +3544,7 @@
 		<sNpcPropHpRate>1.331</sNpcPropHpRate>
 		<collision>
 			<radius normal="6" />
-			<height normal="16.01" />
+			<height normal="1655" />
 		</collision>
 	</npc>
 	<npc id="14881" level="90" type="Pet" name="Feline King">
@@ -3586,7 +3586,7 @@
 		<sNpcPropHpRate>1.331</sNpcPropHpRate>
 		<collision>
 			<radius normal="6" />
-			<height normal="16.01" />
+			<height normal="1655" />
 		</collision>
 	</npc>
 	<npc id="14882" level="90" type="Pet" name="Feline King">
@@ -3628,7 +3628,7 @@
 		<sNpcPropHpRate>1.331</sNpcPropHpRate>
 		<collision>
 			<radius normal="6" />
-			<height normal="16.01" />
+			<height normal="1655" />
 		</collision>
 	</npc>
 	<npc id="14883" level="90" type="Pet" name="Feline King">
@@ -3670,7 +3670,7 @@
 		<sNpcPropHpRate>1.331</sNpcPropHpRate>
 		<collision>
 			<radius normal="6" />
-			<height normal="16.01" />
+			<height normal="1655" />
 		</collision>
 	</npc>
 	<npc id="14884" level="90" type="Pet" name="Feline King">
@@ -3712,7 +3712,7 @@
 		<sNpcPropHpRate>1.331</sNpcPropHpRate>
 		<collision>
 			<radius normal="6" />
-			<height normal="16.01" />
+			<height normal="1655" />
 		</collision>
 	</npc>
 	<npc id="14885" level="90" type="Pet" name="Feline King">
@@ -3754,7 +3754,7 @@
 		<sNpcPropHpRate>1.331</sNpcPropHpRate>
 		<collision>
 			<radius normal="6" />
-			<height normal="16.01" />
+			<height normal="1655" />
 		</collision>
 	</npc>
 	<npc id="14886" level="77" type="Pet" name="Magnus the Unicorn">
@@ -4350,4 +4350,4 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-</list>
\ No newline at end of file
+</list>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/14900-14999.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/14900-14999.xml
index 814a6beb1f..56fbf01f50 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/14900-14999.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/14900-14999.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="14900" level="85" type="Pet" name="Magnus the Unicorn">
 		<parameters>
@@ -697,7 +697,7 @@
 		<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="1870" mpRegen="3.6" />
+			<vitals hp="3066" hpRegen="10.5" mp="1870" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -716,7 +716,7 @@
 		<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="1870" mpRegen="3.6" />
+			<vitals hp="3066" hpRegen="10.5" mp="1870" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/16000-16099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/16000-16099.xml
index 52ce11b524..26791d9c5e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/16000-16099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/16000-16099.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="16049" level="55" type="Folk" name="Agathion Love">
+	<npc id="16049" level="55" type="Folk" name="Love Agathion">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -33,7 +33,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="16055" level="55" type="Folk" name="Griffin">
+	<npc id="16055" level="55" type="Folk" name="Griffon">
 		<race>ETC</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -131,12 +131,12 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="16073" level="80" type="Folk" name="Agathion Rudolph">
+	<npc id="16073" level="80" type="Folk" name="Rudolph Agathion">
 		<!-- 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="889" mpRegen="3.6" />
+			<vitals hp="1764" hpRegen="10.5" mp="889" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -146,7 +146,7 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.01" />
+			<radius normal="01" />
 			<height normal="5.271" />
 		</collision>
 	</npc>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18000-18099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18000-18099.xml
index 1d3c39802d..ca49d0afdf 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18000-18099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18000-18099.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="18001" level="60" type="Monster" name="">
 		<parameters>
@@ -756,7 +756,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -775,7 +775,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -794,7 +794,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -813,7 +813,7 @@
 		<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="300" mpRegen="3.6" />
+			<vitals hp="40218408" hpRegen="10.5" mp="300" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="230" />
@@ -908,7 +908,7 @@
 		<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="478" mpRegen="3.6" />
+			<vitals hp="60678" hpRegen="10.5" mp="478" mpRegen="3.6" />
 			<speed>
 				<walk ground="70" />
 				<run ground="190" />
@@ -927,7 +927,7 @@
 		<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="463" mpRegen="3.6" />
+			<vitals hp="6146" hpRegen="10.5" mp="463" mpRegen="3.6" />
 			<speed>
 				<walk ground="70" />
 				<run ground="190" />
@@ -946,7 +946,7 @@
 		<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="463" mpRegen="3.6" />
+			<vitals hp="9173" hpRegen="10.5" mp="463" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="190" />
@@ -965,7 +965,7 @@
 		<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="557" mpRegen="3.6" />
+			<vitals hp="194788" hpRegen="10.5" mp="557" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="150" />
@@ -984,7 +984,7 @@
 		<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="36939" mpRegen="3.6" />
+			<vitals hp="34079799" hpRegen="10.5" mp="36939" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="230" />
@@ -1079,7 +1079,7 @@
 		<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="889" mpRegen="3.6" />
+			<vitals hp="125175" hpRegen="10.5" mp="889" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="170" />
@@ -1098,7 +1098,7 @@
 		<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="861" mpRegen="3.6" />
+			<vitals hp="12939" hpRegen="10.5" mp="861" mpRegen="3.6" />
 			<speed>
 				<walk ground="90" />
 				<run ground="170" />
@@ -1117,7 +1117,7 @@
 		<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="861" mpRegen="3.6" />
+			<vitals hp="19312" hpRegen="10.5" mp="861" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="170" />
@@ -1137,7 +1137,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="201" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="948" mpRegen="3.6" />
+			<vitals hp="133844" hpRegen="10.5" mp="948" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
@@ -1157,7 +1157,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="74" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="918" mpRegen="3.6" />
+			<vitals hp="20729" hpRegen="10.5" mp="918" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="175" />
@@ -1177,7 +1177,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="74" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="918" mpRegen="3.6" />
+			<vitals hp="10364" hpRegen="10.5" mp="918" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="165" />
@@ -1197,7 +1197,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="1472" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1036" mpRegen="3.6" />
+			<vitals hp="145926" hpRegen="10.5" mp="1036" mpRegen="3.6" />
 			<speed>
 				<walk ground="100" />
 				<run ground="190" />
@@ -1217,7 +1217,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="946" lhand="945" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1007" mpRegen="3.6" />
+			<vitals hp="22725" hpRegen="10.5" mp="1007" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="190" />
@@ -1237,7 +1237,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="148" lhand="103" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1007" mpRegen="3.6" />
+			<vitals hp="22725" hpRegen="10.5" mp="1007" mpRegen="3.6" />
 			<speed>
 				<walk ground="40" />
 				<run ground="190" />
@@ -1257,7 +1257,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="71" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1036" mpRegen="3.6" />
+			<vitals hp="145926" hpRegen="10.5" mp="1036" mpRegen="3.6" />
 			<speed>
 				<walk ground="36" />
 				<run ground="175" />
@@ -1277,7 +1277,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="283" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1007" mpRegen="3.6" />
+			<vitals hp="15226" hpRegen="10.5" mp="1007" mpRegen="3.6" />
 			<speed>
 				<walk ground="45" />
 				<run ground="160" />
@@ -1297,7 +1297,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="127" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1007" mpRegen="3.6" />
+			<vitals hp="11362" hpRegen="10.5" mp="1007" mpRegen="3.6" />
 			<speed>
 				<walk ground="45" />
 				<run ground="175" />
@@ -1317,7 +1317,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="186" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1097" mpRegen="3.6" />
+			<vitals hp="322915" hpRegen="10.5" mp="1097" mpRegen="3.6" />
 			<speed>
 				<walk ground="70" />
 				<run ground="180" />
@@ -1337,7 +1337,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="9" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1066" mpRegen="3.6" />
+			<vitals hp="50429" hpRegen="10.5" mp="1066" mpRegen="3.6" />
 			<speed>
 				<walk ground="70" />
 				<run ground="170" />
@@ -1357,7 +1357,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="79" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1066" mpRegen="3.6" />
+			<vitals hp="25214" hpRegen="10.5" mp="1066" mpRegen="3.6" />
 			<speed>
 				<walk ground="70" />
 				<run ground="190" />
@@ -1377,7 +1377,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="189" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<vitals hp="373386" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="70" />
 				<run ground="170" />
@@ -1397,7 +1397,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="279" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1314" mpRegen="3.6" />
+			<vitals hp="39454" hpRegen="10.5" mp="1314" mpRegen="3.6" />
 			<speed>
 				<walk ground="40" />
 				<run ground="170" />
@@ -1417,7 +1417,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5129" lhand="5129" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1314" mpRegen="3.6" />
+			<vitals hp="29443" hpRegen="10.5" mp="1314" mpRegen="3.6" />
 			<speed>
 				<walk ground="22" />
 				<run ground="170" />
@@ -1436,7 +1436,7 @@
 		<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="3015" mpRegen="3.6" />
+			<vitals hp="1589749" hpRegen="10.5" mp="3015" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="140" />
@@ -1494,7 +1494,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -1513,7 +1513,7 @@
 		<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="712533" mpRegen="3.6" />
+			<vitals hp="3404507" hpRegen="10.5" mp="712533" mpRegen="3.6" />
 			<speed>
 				<walk ground="15" />
 				<run ground="120" />
@@ -1532,7 +1532,7 @@
 		<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="712533" mpRegen="3.6" />
+			<vitals hp="3404507" hpRegen="10.5" mp="712533" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -1551,7 +1551,7 @@
 		<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="712533" mpRegen="3.6" />
+			<vitals hp="3404507" hpRegen="10.5" mp="712533" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="120" />
@@ -1570,7 +1570,7 @@
 		<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="712533" mpRegen="3.6" />
+			<vitals hp="3404507" hpRegen="10.5" mp="712533" mpRegen="3.6" />
 			<speed>
 				<walk ground="20" />
 				<run ground="120" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18100-18199.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18100-18199.xml
index acf5260104..14c6434d3d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18100-18199.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18100-18199.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="18120" level="80" type="Folk" name="Halisha's Officer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -6,7 +6,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="134" lhand="6721" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -26,7 +26,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="134" lhand="6721" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -46,7 +46,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="134" lhand="6721" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -66,7 +66,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="134" lhand="6721" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -86,7 +86,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="134" lhand="6721" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -106,7 +106,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="134" lhand="6721" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -126,7 +126,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="134" lhand="6721" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -146,7 +146,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="134" lhand="6721" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -166,7 +166,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="134" lhand="6721" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -186,7 +186,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="134" lhand="6721" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -206,7 +206,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="134" lhand="6721" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -226,7 +226,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="134" lhand="6721" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="39" />
 				<run ground="150" />
@@ -245,7 +245,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="45" />
 				<run ground="170" />
@@ -264,7 +264,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="170" />
@@ -283,7 +283,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="170" />
@@ -302,7 +302,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="170" />
@@ -321,7 +321,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="170" />
@@ -340,7 +340,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="45" />
 				<run ground="180" />
@@ -359,7 +359,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="45" />
 				<run ground="180" />
@@ -378,7 +378,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="45" />
 				<run ground="180" />
@@ -397,7 +397,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="45" />
 				<run ground="180" />
@@ -657,7 +657,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
@@ -676,7 +676,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
@@ -695,7 +695,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
@@ -714,7 +714,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
@@ -733,7 +733,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
@@ -752,7 +752,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
@@ -771,7 +771,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
@@ -790,7 +790,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
@@ -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="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="31" />
 				<run ground="150" />
@@ -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="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="31" />
 				<run ground="150" />
@@ -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="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="31" />
 				<run ground="150" />
@@ -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="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="31" />
 				<run ground="150" />
@@ -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="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="31" />
 				<run ground="150" />
@@ -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="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="31" />
 				<run ground="150" />
@@ -923,7 +923,7 @@
 		<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" />
+			<vitals hp="17851" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="31" />
 				<run ground="150" />
@@ -942,7 +942,7 @@
 		<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" />
+			<vitals hp="17851" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="31" />
 				<run ground="150" />
@@ -962,7 +962,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="142" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="27" />
 				<run ground="110" />
@@ -982,7 +982,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="142" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="27" />
 				<run ground="110" />
@@ -1002,7 +1002,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="142" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="27" />
 				<run ground="110" />
@@ -1022,7 +1022,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="142" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="27" />
 				<run ground="110" />
@@ -1041,7 +1041,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="160" />
@@ -1060,7 +1060,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="160" />
@@ -1079,7 +1079,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="160" />
@@ -1098,7 +1098,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="160" />
@@ -1117,7 +1117,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="160" />
@@ -1136,7 +1136,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="160" />
@@ -1155,7 +1155,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="160" />
@@ -1174,7 +1174,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="160" />
@@ -1193,7 +1193,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="160" />
@@ -1212,7 +1212,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="160" />
@@ -1231,7 +1231,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="160" />
@@ -1250,7 +1250,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="160" />
@@ -1269,7 +1269,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="160" />
@@ -1288,7 +1288,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="160" />
@@ -1307,7 +1307,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="160" />
@@ -1377,7 +1377,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="78" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="40" />
 				<run ground="160" />
@@ -1397,7 +1397,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="78" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="40" />
 				<run ground="160" />
@@ -1417,7 +1417,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="78" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="40" />
 				<run ground="160" />
@@ -1437,7 +1437,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="78" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="40" />
 				<run ground="160" />
@@ -1451,13 +1451,13 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="18191" level="80" type="Folk" name="Witch of Dust">
+	<npc id="18191" level="80" type="Folk" name="Witch of dust">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="3939" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="160" />
@@ -1471,13 +1471,13 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18192" level="80" type="Folk" name="Witch of Dust">
+	<npc id="18192" level="80" type="Folk" name="Witch of dust">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="3939" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="160" />
@@ -1491,13 +1491,13 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18193" level="80" type="Folk" name="Witch of Dust">
+	<npc id="18193" level="80" type="Folk" name="Witch of dust">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="3939" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="160" />
@@ -1511,13 +1511,13 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18194" level="80" type="Folk" name="Witch of Dust">
+	<npc id="18194" level="80" type="Folk" name="Witch of dust">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="3939" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="160" />
@@ -1536,7 +1536,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="40" />
 				<run ground="60" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18200-18299.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18200-18299.xml
index 6182815672..7d5eba0ce9 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18200-18299.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18200-18299.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="18200" level="85" type="Monster" name="Charm of Corner">
 		<race>ETC</race>
@@ -330,7 +330,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="6722" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="35" />
 				<run ground="185" />
@@ -350,7 +350,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="6722" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="35" />
 				<run ground="185" />
@@ -370,7 +370,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="6722" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="35" />
 				<run ground="185" />
@@ -390,7 +390,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="6722" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="35" />
 				<run ground="185" />
@@ -410,7 +410,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="6722" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="35" />
 				<run ground="185" />
@@ -430,7 +430,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="6722" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="35" />
 				<run ground="185" />
@@ -450,7 +450,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="6722" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="35" />
 				<run ground="185" />
@@ -470,7 +470,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="6722" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="35" />
 				<run ground="185" />
@@ -490,7 +490,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="3939" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="160" />
@@ -510,7 +510,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="3939" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="160" />
@@ -529,7 +529,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="41" />
 				<run ground="190" />
@@ -548,7 +548,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="41" />
 				<run ground="190" />
@@ -567,7 +567,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="41" />
 				<run ground="190" />
@@ -586,7 +586,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="41" />
 				<run ground="190" />
@@ -705,7 +705,7 @@
 		<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" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="40" />
 				<run ground="60" />
@@ -725,7 +725,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5795" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="53" />
 				<run ground="140" />
@@ -745,7 +745,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5795" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="53" />
 				<run ground="140" />
@@ -765,7 +765,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5795" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="53" />
 				<run ground="140" />
@@ -785,7 +785,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5795" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="53" />
 				<run ground="140" />
@@ -805,7 +805,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5795" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="53" />
 				<run ground="140" />
@@ -825,7 +825,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5795" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="53" />
 				<run ground="140" />
@@ -845,7 +845,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5795" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="53" />
 				<run ground="140" />
@@ -865,7 +865,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5795" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="53" />
 				<run ground="140" />
@@ -885,7 +885,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5795" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="53" />
 				<run ground="140" />
@@ -905,7 +905,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5795" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="53" />
 				<run ground="140" />
@@ -925,7 +925,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5795" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="53" />
 				<run ground="140" />
@@ -945,7 +945,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5795" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="53" />
 				<run ground="140" />
@@ -965,7 +965,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5795" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="44350" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="53" />
 				<run ground="140" />
@@ -984,7 +984,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="90" />
 				<run ground="1" />
@@ -1003,7 +1003,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="90" />
 				<run ground="1" />
@@ -1022,7 +1022,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="90" />
 				<run ground="1" />
@@ -1041,7 +1041,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="90" />
 				<run ground="1" />
@@ -1060,7 +1060,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="90" />
 				<run ground="1" />
@@ -1079,7 +1079,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="90" />
 				<run ground="1" />
@@ -1098,7 +1098,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="90" />
 				<run ground="1" />
@@ -1117,7 +1117,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="90" />
 				<run ground="1" />
@@ -1136,7 +1136,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="90" />
 				<run ground="1" />
@@ -1155,7 +1155,7 @@
 		<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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="90" />
 				<run ground="1" />
@@ -1169,14 +1169,14 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="18254" level="80" type="Folk" name="Watchman of Grave">
+	<npc id="18254" level="80" type="Folk" name="Halisha's Box">
 		<!-- 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" />
+			<vitals hp="1" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
-				<walk ground="90" />
+				<walk ground="80" />
 				<run ground="1" />
 			</speed>
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
@@ -1184,18 +1184,18 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="11" />
-			<height normal="20" />
+			<radius normal="8.5" />
+			<height normal="8.5" />
 		</collision>
 	</npc>
-	<npc id="18255" level="80" type="Folk" name="Watchman of Grave">
+	<npc id="18255" level="80" type="Folk" name="Halisha's Treasure Chest">
 		<!-- 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" />
+			<vitals hp="1" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
-				<walk ground="90" />
+				<walk ground="80" />
 				<run ground="1" />
 			</speed>
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
@@ -1203,8 +1203,8 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="11" />
-			<height normal="20" />
+			<radius normal="8.5" />
+			<height normal="8.5" />
 		</collision>
 	</npc>
 	<npc id="18256" level="80" type="Folk" name="Halisha's Treasure Chest">
@@ -1212,7 +1212,7 @@
 		<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" />
+			<vitals hp="1" hpRegen="10.5" mp="2770" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="1" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18300-18399.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18300-18399.xml
index bcd76e084e..7da1d0f91d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18300-18399.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18300-18399.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="18328" level="85" type="Monster" name="Hall Alarm">
 		<parameters>
@@ -114,6 +114,7 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
+		<equipment rhand="198" /> <!-- Inferno Staff -->
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
 			<vitals hp="3835" hpRegen="8.5" mp="1777" mpRegen="3" />
 			<attack physical="1099.42361669366" magical="750.763809564873" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
@@ -665,7 +666,7 @@
 				<defence fire="100" water="100" wind="100" earth="100" holy="50" dark="100" default="120" />
 			</attribute>
 			<speed>
-				<walk ground="30" />
+				<walk ground="150" />
 				<run ground="100" />
 			</speed>
 			<hitTime>430</hitTime>
@@ -717,7 +718,7 @@
 				<defence fire="100" water="100" wind="100" earth="100" holy="50" dark="100" default="120" />
 			</attribute>
 			<speed>
-				<walk ground="30" />
+				<walk ground="200" />
 				<run ground="150" />
 			</speed>
 			<hitTime>430</hitTime>
@@ -789,94 +790,98 @@
 		<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" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
-				<walk ground="60" />
-				<run ground="120" />
+				<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="5" />
-			<height normal="12" />
+			<radius normal="0.1" />
+			<height normal="0.1" />
 		</collision>
 	</npc>
 	<npc id="18344" level="85" type="Folk" name="Ol Mahum Commander">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<equipment rhand="69" /> <!-- Bastard 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" />
+			<vitals hp="318" hpRegen="10.5" mp="174" mpRegen="3.6" />
 			<speed>
-				<walk ground="60" />
-				<run ground="120" />
+				<walk ground="50" />
+				<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="5" />
-			<height normal="12" />
+			<radius normal="14" />
+			<height normal="27" />
 		</collision>
 	</npc>
 	<npc id="18345" level="85" type="Folk" name="Turek Orc Prefect">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<equipment rhand="127" /> <!-- Crimson 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" />
+			<vitals hp="573" hpRegen="10.5" mp="300" mpRegen="3.6" />
 			<speed>
-				<walk ground="60" />
-				<run ground="120" />
+				<walk ground="45" />
+				<run ground="130" />
 			</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="12" />
+			<radius normal="10" />
+			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="18346" level="85" type="Folk" name="Dark Lord">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<equipment rhand="1472" /> <!-- Dreadbane - Not Available -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="934" hpRegen="10.5" mp="447" mpRegen="3.6" />
 			<speed>
-				<walk ground="60" />
-				<run ground="120" />
+				<walk ground="100" />
+				<run ground="174" />
 			</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="12" />
+			<radius normal="15" />
+			<height normal="45" />
 		</collision>
 	</npc>
 	<npc id="18347" level="85" type="Folk" name="Nos">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<equipment rhand="5130" /> <!-- Nos Sword - Not Available -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="1396" hpRegen="10.5" mp="692" mpRegen="3.6" />
 			<speed>
-				<walk ground="60" />
-				<run ground="120" />
+				<walk ground="18" />
+				<run ground="174" />
 			</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="12" />
+			<radius normal="26" />
+			<height normal="42" />
 		</collision>
 	</npc>
 	<npc id="18348" level="85" type="Folk" name="Carinkain">
@@ -884,18 +889,18 @@
 		<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" />
+			<vitals hp="1928" hpRegen="10.5" mp="977" mpRegen="3.6" />
 			<speed>
-				<walk ground="60" />
-				<run ground="120" />
+				<walk ground="90" />
+				<run ground="174" />
 			</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="12" />
+			<radius normal="11" />
+			<height normal="20" />
 		</collision>
 	</npc>
 	<npc id="18349" level="85" type="Folk" name="Sharp Talon Tiger">
@@ -903,45 +908,236 @@
 		<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" />
+			<vitals hp="2474" hpRegen="10.5" mp="1282" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
-				<run ground="120" />
+				<run ground="174" />
 			</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="12" />
+			<radius normal="40.8" />
+			<height normal="34.2" />
 		</collision>
 	</npc>
 	<npc id="18350" level="85" type="Folk" name="Lesser Giant Warrior">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
+		<equipment rhand="3937" /> <!-- Monster Only (Lesser Giant) - Not Available -->
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="3547" hpRegen="10.5" mp="2411" mpRegen="3.6" />
 			<speed>
-				<walk ground="60" />
-				<run ground="120" />
+				<walk ground="15" />
+				<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="12" />
+			<radius normal="25" />
+			<height normal="44" />
 		</collision>
 	</npc>
-	<npc id="18351" level="85" type="Folk" name="Blood Priest">
+	<npc id="18351" level="85" type="Folk" name="Priest of Blood">
 		<!-- 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" />
+			<vitals hp="3856" hpRegen="10.5" mp="2770" mpRegen="3.6" />
+			<speed>
+				<walk ground="31" />
+				<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="21" />
+			<height normal="50" />
+		</collision>
+	</npc>
+	<npc id="18352" 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="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<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="100" />
+			<height normal="72" />
+		</collision>
+	</npc>
+	<npc id="18353" 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="2823" hpRegen="10.5" mp="1507" 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="32" />
+			<height normal="17.5" />
+		</collision>
+	</npc>
+	<npc id="18354" 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="2823" hpRegen="10.5" mp="1507" 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="18" />
+			<height normal="14" />
+		</collision>
+	</npc>
+	<npc id="18355" 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="2823" hpRegen="10.5" mp="1507" 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="13" />
+			<height normal="9" />
+		</collision>
+	</npc>
+	<npc id="18356" 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="2823" hpRegen="10.5" mp="1507" 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="17" />
+			<height normal="13" />
+		</collision>
+	</npc>
+	<npc id="18357" level="85" type="Folk" name="Goldbug's Treasure Chest">
+		<!-- 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="6076" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<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="8.5" />
+			<height normal="8.5" />
+		</collision>
+	</npc>
+	<npc id="18358" level="85" type="Folk" name="Goldbug's Butler">
+		<!-- 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="6227" hpRegen="10.5" mp="2614" mpRegen="3.6" />
+			<speed>
+				<walk ground="39" />
+				<run ground="175" />
+			</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="26.25" />
+		</collision>
+	</npc>
+	<npc id="18359" level="85" type="Folk" name="Goldbug" title="Ancient Pirate Captain">
+		<!-- 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="200000" hpRegen="10.5" mp="2666" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="175" />
+			</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="50" />
+			<height normal="87" />
+		</collision>
+	</npc>
+	<npc id="18360" level="85" type="Folk" name="Sayha Dorr">
+		<!-- 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="30" hpRegen="10.5" mp="40" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<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="7" />
+			<height normal="36.2" />
+		</collision>
+	</npc>
+	<npc id="18361" level="85" type="Folk" name="Sayha Sylph">
+		<!-- 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="30" hpRegen="10.5" mp="40" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="120" />
@@ -951,8 +1147,103 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="5" />
-			<height normal="12" />
+			<radius normal="8.8" />
+			<height normal="27.4" />
+		</collision>
+	</npc>
+	<npc id="18362" level="85" type="Folk" name="Sayha Ant">
+		<!-- 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="30" hpRegen="10.5" mp="40" mpRegen="3.6" />
+			<speed>
+				<walk ground="39" />
+				<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="27" />
+		</collision>
+	</npc>
+	<npc id="18363" level="85" type="Folk" name="Sayha Lipia">
+		<!-- 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="30" hpRegen="10.5" mp="40" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<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="12" />
+			<height normal="20" />
+		</collision>
+	</npc>
+	<npc id="18364" level="85" type="Folk" name="Sayha 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="30" hpRegen="10.5" mp="40" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<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="20" />
+			<height normal="44" />
+		</collision>
+	</npc>
+	<npc id="18365" level="85" type="Folk" name="Sayha Procella">
+		<!-- 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="30" hpRegen="10.5" mp="40" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<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="20" />
+			<height normal="65" />
+		</collision>
+	</npc>
+	<npc id="18366" 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="3213" hpRegen="10.5" mp="1846" 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="0.1" />
+			<height normal="0.1" />
 		</collision>
 	</npc>
 </list>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18900-18999.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18900-18999.xml
index 61b01e7577..5e0f3230e6 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18900-18999.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/18900-18999.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="18919" level="85" type="Monster" name="">
 		<race>CONSTRUCT</race>
@@ -33,12 +33,12 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="18926" level="80" type="Folk" name="Varka's Althar">
+	<npc id="18926" level="80" type="Folk" name="Varka's Altar">
 		<!-- 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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -52,12 +52,12 @@
 			<height normal="55" />
 		</collision>
 	</npc>
-	<npc id="18927" level="80" type="Folk" name="Bonfire">
+	<npc id="18927" level="80" type="Folk" name="Campfire">
 		<!-- 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="1812" mpRegen="3.6" />
+			<vitals hp="4039" hpRegen="10.5" mp="1812" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -71,7 +71,7 @@
 			<height normal="30.5" />
 		</collision>
 	</npc>
-	<npc id="18928" level="80" type="Folk" name="Bonfire">
+	<npc id="18928" level="80" type="Folk" name="Campfire">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/19100-19199.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/19100-19199.xml
index 75f038bb99..517b216bde 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/19100-19199.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/19100-19199.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="19133" level="75" type="Folk" name="Expedition Member">
 		<!-- CLASSIC NPC TOI slot_lhand=8683 -->
@@ -6,7 +6,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="8683" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="2444" hpRegen="10.5" mp="2280" mpRegen="3.6" />
+			<vitals hp="7624" hpRegen="10.5" mp="2280" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -25,7 +25,7 @@
 		<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="1674" mpRegen="3.6" />
+			<vitals hp="3038" hpRegen="10.5" mp="1674" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="50" />
@@ -44,7 +44,7 @@
 		<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="2280" mpRegen="3.6" />
+			<vitals hp="7624" hpRegen="10.5" mp="2280" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -64,7 +64,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="288" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="2444" hpRegen="10.5" mp="1846" mpRegen="3.6" />
+			<vitals hp="4234" hpRegen="10.5" mp="1846" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -83,7 +83,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="2444" hpRegen="10.5" mp="1846" mpRegen="3.6" />
+			<vitals hp="4234" hpRegen="10.5" mp="1846" mpRegen="3.6" />
 			<speed>
 				<walk ground="28" />
 				<run ground="160" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/19500-19599.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/19500-19599.xml
index ad2e175de2..fb84605d13 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/19500-19599.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/19500-19599.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="19545" level="80" type="Folk" name="Flame of Calm">
+	<npc id="19545" level="80" type="Folk" name="Warming Fire">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/19600-19699.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/19600-19699.xml
index facdf52b88..ad547081e6 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/19600-19699.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/19600-19699.xml
@@ -1,11 +1,11 @@
-<?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="19671" level="80" 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="8446" hpRegen="10.5" mp="1674" mpRegen="3.6" />
+			<vitals hp="3038" hpRegen="10.5" mp="1674" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20000-20099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20000-20099.xml
index 6e249f975a..3898b60c86 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20000-20099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20000-20099.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="20001" level="1" type="Monster" name="Gremlin">
 	<!-- L2wiki: https://l2wiki.com/classic/Gremlin -->
@@ -711,7 +711,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20015" level="13" type="Monster" name="Zombie Forest Elf">
+	<npc id="20015" level="13" type="Monster" name="Marsh Zombie">
 		<!-- L2wiki: https://l2wiki.com/classic/Zombie_Forest_Elf -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
@@ -969,7 +969,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20020" level="14" type="Monster" name="Zombie Forest Elf Researcher">
+	<npc id="20020" level="14" type="Monster" name="Marsh Zombie Scout">
 		<!-- L2wiki: https://l2wiki.com/classic/Zombie_Forest_Elf_Researcher -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
@@ -2685,7 +2685,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20050" level="20" type="Monster" name="Poisonous Thornleg">
+	<npc id="20050" level="20" type="Monster" name="Arachnid Predator">
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
 			<param name="MoveAroundSocial1" value="80" />
@@ -5648,7 +5648,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20097" level="11" type="Monster" name="Clawed Bat">
+	<npc id="20097" level="11" type="Monster" name="Drill Bat">
 		<!-- L2wiki: https://l2wiki.com/classic/Clawed_Bat -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20100-20199.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20100-20199.xml
index 314f954266..71be2ce4b0 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20100-20199.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20100-20199.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="20100" level="13" type="Monster" name="Skeleton Archer">
 		<parameters>
@@ -1185,7 +1185,7 @@
 			<attack physical="12.34006" magical="8.42666" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="51.60553" magical="37.76269" />
 			<speed>
-				<walk ground="50" />
+				<walk ground="37" />
 				<run ground="100" />
 			</speed>
 			<hitTime>350</hitTime>
@@ -1201,8 +1201,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="20" />
-			<height normal="10" />
+			<radius normal="18" />
+			<height normal="8.5" />
 		</collision>
 		<dropLists>
 			<drop>
@@ -1709,8 +1709,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="16" />
-			<height normal="50" />
+			<radius normal="48" />
+			<height normal="97" />
 		</collision>
 	</npc>
 	<npc id="20139" level="75" type="Monster" name="Divine Angel">
@@ -1924,7 +1924,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20143" level="12" type="Monster" name="Grizzly Bear">
+	<npc id="20143" level="12" type="Monster" name="Bear">
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20200-20299.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20200-20299.xml
index 1d475399fc..ee75e42b65 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20200-20299.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20200-20299.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="20200" level="31" type="Monster" name="Strain">
 		<!-- L2wiki: https://l2wiki.com/classic/Strain -->
@@ -1491,7 +1491,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20223" level="20" type="Monster" name="Mandragora">
+	<npc id="20223" level="20" type="Monster" name="Mandragora Sprout">
 		<!-- L2wiki: https://l2wiki.com/classic/Mandragora -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1894,8 +1894,8 @@
 			<attack physical="84.22023636" magical="63.26266" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="130.310697" magical="86.68702" />
 			<speed>
-				<walk ground="90" />
-				<run ground="90" />
+				<walk ground="60" />
+				<run ground="174" />
 			</speed>
 			<hitTime>500</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -1914,8 +1914,8 @@
 		<exCrtEffect>false</exCrtEffect>
 		<ai aggroRange="450" clanHelpRange="300" isAggressive="true" />
 		<collision>
-			<radius normal="8" />
-			<height normal="24.5" />
+			<radius normal="11" />
+			<height normal="25" />
 		</collision>
 		<dropLists>
 			<drop>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20400-20499.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20400-20499.xml
index 412ac7785a..8c5426cb93 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20400-20499.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20400-20499.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="20400" level="12" type="Monster" name="Blood Fungus">
 		<parameters>
@@ -421,8 +421,8 @@
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="300" />
 		<collision>
-			<radius normal="11" />
-			<height normal="28.5" />
+			<radius normal="9" />
+			<height normal="23" />
 		</collision>
 		<dropLists>
 			<drop>
@@ -479,7 +479,7 @@
 		<ai type="BALANCED" clanHelpRange="300" />
 		<collision>
 			<radius normal="15" />
-			<height normal="45" />
+			<height normal="26.5" />
 		</collision>
 		<dropLists>
 			<drop>
@@ -666,8 +666,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="11" />
-			<height normal="28.5" />
+			<radius normal="9" />
+			<height normal="23" />
 		</collision>
 	</npc>
 	<npc id="20415" level="17" type="Monster" name="Scarlet Salamander">
@@ -2388,7 +2388,7 @@
 			<attack physical="32.578601" magical="20.22451" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="66.8656" magical="53.82228" />
 			<speed>
-				<walk ground="80" />
+				<walk ground="25" />
 				<run ground="140" />
 			</speed>
 			<hitTime>100</hitTime>
@@ -3799,7 +3799,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20477" level="6" type="Monster" name="Kasha Forest Wolf">
+	<npc id="20477" level="6" type="Monster" name="Kasha Timber Wolf">
 		<parameters>
 			<param name="MoveAroundSocial" value="60" />
 			<param name="MoveAroundSocial1" value="60" />
@@ -4061,7 +4061,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20483" level="17" type="Monster" name="Deadman's Lamp">
+	<npc id="20483" level="17" type="Monster" name="Corpse Candle">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -4076,7 +4076,7 @@
 			<attack physical="31.72536364" magical="23.83074" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="86.553159" magical="57.57804" />
 			<speed>
-				<walk ground="80" />
+				<walk ground="25" />
 				<run ground="140" />
 			</speed>
 			<hitTime>100</hitTime>
@@ -4645,8 +4645,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="16" />
-			<height normal="40" />
+			<radius normal="21" />
+			<height normal="39" />
 		</collision>
 		<dropLists>
 			<drop>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20500-20599.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20500-20599.xml
index 6f8d8328cb..8518babd32 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20500-20599.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20500-20599.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="20500" level="25" type="Monster" name="Turek Orc Sentinel">
 		<parameters>
@@ -108,8 +108,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="14" />
-			<height normal="35" />
+			<radius normal="13.5" />
+			<height normal="34.5" />
 		</collision>
 		<dropLists>
 			<drop>
@@ -599,7 +599,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20510" level="12" type="Monster" name="Crystal Puma">
+	<npc id="20510" level="12" type="Monster" name="Puma">
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
 			<param name="MoveAroundSocial1" value="90" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20600-20699.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20600-20699.xml
index 5952d94b05..c41df07cdc 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20600-20699.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20600-20699.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="20600" level="40" type="Monster" name="Karul Bugbear">
 		<parameters>
@@ -639,7 +639,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20610" level="31" type="Monster" name="Watchman Of Fire">
+	<npc id="20610" level="31" type="Monster" name="Sentinel Of Water">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -1378,7 +1378,7 @@
 			<attack physical="573.236301" magical="355.86007" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="233.9478818" magical="188.3122" />
 			<speed>
-				<walk ground="80" />
+				<walk ground="25" />
 				<run ground="174" />
 			</speed>
 			<hitTime>100</hitTime>
@@ -1850,7 +1850,7 @@
 			<attack physical="734.253971" magical="455.81844" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="264.6823909" magical="213.05139" />
 			<speed>
-				<walk ground="80" />
+				<walk ground="45" />
 				<run ground="174" />
 			</speed>
 			<hitTime>500</hitTime>
@@ -1878,8 +1878,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="14" />
-			<height normal="40" />
+			<radius normal="18" />
+			<height normal="41" />
 		</collision>
 	</npc>
 	<npc id="20629" level="78" type="Monster" name="Karik">
@@ -3489,7 +3489,7 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="50" />
+			<radius normal="25" />
 			<height normal="44" />
 		</collision>
 		<dropLists>
@@ -3556,7 +3556,7 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="50" />
+			<radius normal="25" />
 			<height normal="44" />
 		</collision>
 		<dropLists>
@@ -3691,7 +3691,7 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="50" />
+			<radius normal="25" />
 			<height normal="44" />
 		</collision>
 		<dropLists>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20800-20899.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20800-20899.xml
index e98e8909c8..096f921dec 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20800-20899.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20800-20899.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="20800" level="79" type="Monster" name="Eva's Watchman" element="WATER">
 		<parameters>
@@ -3164,7 +3164,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20846" level="74" type="Monster" name="Maiden Doll">
+	<npc id="20846" level="74" type="Monster" name="Doll Blader">
 		<parameters>
 			<param name="MoveAroundSocial" value="50" />
 			<param name="MoveAroundSocial1" value="50" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20900-20999.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20900-20999.xml
index 259388a36d..5bed20ed2d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20900-20999.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/20900-20999.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="20919" level="20" type="Monster" name="Maille Lizardman">
 		<parameters>
@@ -581,8 +581,8 @@
 			<attack physical="74.99121" magical="51.20928" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
 			<defence physical="92.0445195" magical="79.24022" evasion="10" />
 			<speed>
-				<walk ground="72" />
-				<run ground="130" />
+				<walk ground="90" />
+				<run ground="120" />
 			</speed>
 			<hitTime>260</hitTime>
 			<abnormalResist physical="10" magical="10" />
@@ -610,8 +610,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="39" />
-			<height normal="38" />
+			<radius normal="8" />
+			<height normal="24.5" />
 		</collision>
 		<dropLists>
 			<drop>
@@ -3610,7 +3610,7 @@
 		<sNpcPropHpRate>2</sNpcPropHpRate>
 		<ai clanHelpRange="300" aggroRange="450" />
 		<collision>
-			<radius normal="50" />
+			<radius normal="25" />
 			<height normal="44" />
 		</collision>
 		<dropLists>
@@ -3675,7 +3675,7 @@
 		<sNpcPropHpRate>2</sNpcPropHpRate>
 		<ai clanHelpRange="300" aggroRange="450" />
 		<collision>
-			<radius normal="50" />
+			<radius normal="25" />
 			<height normal="44" />
 		</collision>
 		<dropLists>
@@ -4305,7 +4305,7 @@
 			<attack physical="568.1199909" magical="426.74754" random="50" critical="1" accuracy="9" attackSpeed="253" type="BLUNT" range="40" distance="80" width="120" />
 			<defence physical="309.707761" magical="206.02791" />
 			<speed>
-				<walk ground="37" />
+				<walk ground="60" />
 				<run ground="160" />
 			</speed>
 			<hitTime>450</hitTime>
@@ -5213,7 +5213,7 @@
 		</ai>
 		<collision>
 			<radius normal="15.6" />
-			<height normal="34.05" />
+			<height normal="345" />
 		</collision>
 	</npc>
 	<npc id="20995" level="81" type="Monster" name="Garden Guard" element="WATER">
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21000-21099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21000-21099.xml
index 18906a33b1..089d3fe3aa 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21000-21099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21000-21099.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="21000" level="54" type="Monster" name="Soul of Ruins">
 		<!-- L2wiki: https://l2wiki.com/classic/Soul_of_Ruins -->
@@ -2195,7 +2195,7 @@
 			<attack physical="319.490468" magical="198.33688" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="177.8754727" magical="143.17771" />
 			<speed>
-				<walk ground="80" />
+				<walk ground="25" />
 				<run ground="174" />
 			</speed>
 			<hitTime>100</hitTime>
@@ -4342,7 +4342,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21086" level="72" type="Monster" name="Bloody Liviona">
+	<npc id="21086" level="72" type="Monster" name="Drake Scout">
 		<parameters>
 			<param name="MoveAroundSocial" value="57" />
 			<param name="MoveAroundSocial1" value="57" />
@@ -4358,12 +4358,13 @@
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<acquire exp="33396" sp="3392" /> <!-- Need confirm retail values -->
+		<equipment rhand="236" /> <!-- Soul Separator -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="3572" hpRegen="42.5" mp="1410" mpRegen="3" />
 			<attack physical="731.52506" magical="499.53679" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="305.35947" magical="223.44881" />
 			<speed>
-				<walk ground="80" />
+				<walk ground="89" />
 				<run ground="174" />
 			</speed>
 			<hitTime>340</hitTime>
@@ -4392,8 +4393,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="15" />
-			<height normal="28" />
+			<radius normal="18" />
+			<height normal="36" />
 		</collision>
 		<dropLists> <!-- CT2.5 -->
 			<drop>
@@ -4417,7 +4418,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21087" level="65" type="Monster" name="Bloody Knight">
+	<npc id="21087" level="65" type="Monster" name="Drake Warrior">
 		<!-- L2wiki: https://l2wiki.com/classic/Bloody_Knight -->
 		<parameters>
 			<param name="MoveAroundSocial" value="74" />
@@ -4436,14 +4437,14 @@
 		</parameters>
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
-		<equipment rhand="84" />
+		<equipment rhand="5800" />
 		<acquire exp="12401" sp="372" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="3638" hpRegen="6" mp="1442" mpRegen="3" />
 			<attack physical="1077" magical="619" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="355" magical="340" />
 			<speed>
-				<walk ground="27" />
+				<walk ground="56" />
 				<run ground="174" />
 			</speed>
 			<hitTime>710</hitTime>
@@ -4492,7 +4493,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21088" level="74" type="Monster" name="Bloody Banshee">
+	<npc id="21088" level="74" type="Monster" name="Drakw Leader">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -4514,7 +4515,7 @@
 			<attack physical="773.81598" magical="528.41601" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="314.65987" magical="230.25444" />
 			<speed>
-				<walk ground="80" />
+				<walk ground="43" />
 				<run ground="174" />
 			</speed>
 			<hitTime>560</hitTime>
@@ -4542,8 +4543,8 @@
 			</clanList>
 		</ai>
 		<collision>
-			<radius normal="9" />
-			<height normal="23" />
+			<radius normal="29" />
+			<height normal="49.9" />
 		</collision>
 		<dropLists> <!-- CT2.5 -->
 			<drop>
@@ -4568,7 +4569,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21089" level="68" type="Monster" name="Bloody Lord">
+	<npc id="21089" level="68" type="Monster" name="Drake Mage">
 		<!-- L2wiki: https://l2wiki.com/classic/Bloody_Lord -->
 		<parameters>
 			<param name="MoveAroundSocial" value="140" />
@@ -4591,7 +4592,7 @@
 			<attack physical="1217.179911" magical="713.68324" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="382.2238455" magical="365.61053" />
 			<speed>
-				<walk ground="37" />
+				<walk ground="92" />
 				<run ground="174" />
 			</speed>
 			<hitTime>450</hitTime>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21100-21199.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21100-21199.xml
index d311c1f7dd..963578b71a 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21100-21199.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/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>
@@ -2643,7 +2643,7 @@
 		<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="478" mpRegen="3.6" />
+			<vitals hp="1019" hpRegen="10.5" mp="478" mpRegen="3.6" />
 			<speed>
 				<walk ground="100" />
 				<run ground="160" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21400-21499.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21400-21499.xml
index 89ac8cbc23..41d62fb1b5 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21400-21499.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21400-21499.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="21400" level="84" type="Monster" name="Hexa Beetle">
 		<race>BUG</race>
@@ -72,7 +72,7 @@
 			<skill id="4274" level="1" /> <!-- Blunt Weapon Vulnerability -->
 		</skillList>
 	</npc>
-	<npc id="21402" level="84" type="Monster" name="Katraxith">
+	<npc id="21402" level="84" type="Monster" name="Katraxis">
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire exp="993837" sp="14907" />
@@ -119,7 +119,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21403" level="84" type="Monster" name="Katraxith">
+	<npc id="21403" level="84" type="Monster" name="Katraxis">
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire exp="1980478" sp="29707" />
@@ -220,7 +220,7 @@
 			<skill id="4274" level="1" /> <!-- Blunt Weapon Vulnerability -->
 		</skillList>
 	</npc>
-	<npc id="21406" level="84" type="Monster" name="Imperial Knight">
+	<npc id="21406" level="84" type="Monster" name="Knight of Empire">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="150" lhand="103" />
@@ -261,7 +261,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21407" level="84" type="Monster" name="Imperial Knight">
+	<npc id="21407" level="84" type="Monster" name="Knight of Empire">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="150" lhand="103" />
@@ -288,7 +288,7 @@
 			<skill id="4274" level="1" /> <!-- Blunt Weapon Vulnerability -->
 		</skillList>
 	</npc>
-	<npc id="21408" level="84" type="Monster" name="Imperial Royal Guard">
+	<npc id="21408" level="84" type="Monster" name="Royal Guard of Empire">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="98" />
@@ -332,7 +332,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21409" level="84" type="Monster" name="Imperial Royal Guard">
+	<npc id="21409" level="84" type="Monster" name="Royal Guard of Empire">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="98" />
@@ -501,7 +501,7 @@
 			<skill id="4274" level="1" /> <!-- Blunt Weapon Vulnerability -->
 		</skillList>
 	</npc>
-	<npc id="21414" level="84" type="Monster" name="Imperial Assassin">
+	<npc id="21414" level="84" type="Monster" name="Assassin of Empire">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="946" lhand="945" />
@@ -541,7 +541,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21415" level="84" type="Monster" name="Imperial Assassin">
+	<npc id="21415" level="84" type="Monster" name="Assassin of Empire">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="946" lhand="945" />
@@ -639,7 +639,7 @@
 			<skill id="4274" level="1" /> <!-- Blunt Weapon Vulnerability -->
 		</skillList>
 	</npc>
-	<npc id="21418" level="84" type="Monster" name="Imperial Guard">
+	<npc id="21418" level="84" type="Monster" name="Imperial Royal Guard">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="142" />
@@ -679,7 +679,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21419" level="84" type="Monster" name="Imperial Guard">
+	<npc id="21419" level="84" type="Monster" name="Imperial Royal Guard">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="142" />
@@ -769,7 +769,7 @@
 			<skill id="4285" level="3" /> <!-- Sleep Resistance -->
 		</skillList>
 	</npc>
-	<npc id="21422" level="85" type="Monster" name="Imperial Dancer">
+	<npc id="21422" level="85" type="Monster" name="Dancer of Empire">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<equipment rhand="3939" />
@@ -809,7 +809,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21423" level="85" type="Monster" name="Imperial Dancer">
+	<npc id="21423" level="85" type="Monster" name="Dancer of Empire">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<equipment rhand="3939" />
@@ -837,7 +837,7 @@
 			<skill id="4233" level="1" /> <!-- Vampiric Attack -->
 		</skillList>
 	</npc>
-	<npc id="21424" level="85" type="Monster" name="Ashikenas">
+	<npc id="21424" level="85" type="Monster" name="Ashkenas">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="1059474" sp="15892" />
@@ -875,7 +875,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21425" level="85" type="Monster" name="Ashikenas">
+	<npc id="21425" level="85" type="Monster" name="Ashkenas">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="2076464" sp="31146" />
@@ -901,7 +901,7 @@
 			<skill id="4285" level="3" /> <!-- Sleep Resistance -->
 		</skillList>
 	</npc>
-	<npc id="21426" level="85" type="Monster" name="Abraxian">
+	<npc id="21426" level="85" type="Monster" name="Abraxion">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="1059474" sp="15892" />
@@ -939,7 +939,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21427" level="85" type="Monster" name="Abraxian">
+	<npc id="21427" level="85" type="Monster" name="Abraxion">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="2076464" sp="31146" />
@@ -1031,7 +1031,7 @@
 			<skill id="4233" level="1" /> <!-- Vampiric Attack -->
 		</skillList>
 	</npc>
-	<npc id="21430" level="85" type="Monster" name="Ahrimanes">
+	<npc id="21430" level="85" type="Monster" name="Arimanes">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<equipment rhand="6722" />
@@ -1070,7 +1070,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21431" level="85" type="Monster" name="Ahrimanes">
+	<npc id="21431" level="85" type="Monster" name="Arimanes">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<equipment rhand="6722" />
@@ -1140,7 +1140,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21433" level="85" type="Monster" name="Jamadhr Beetle">
+	<npc id="21433" level="85" type="Monster" name="Jamadar Beetle">
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire exp="2669276" sp="40039" />
@@ -1182,7 +1182,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21434" level="85" type="Monster" name="Blood Priest">
+	<npc id="21434" level="85" type="Monster" name="Priest of Blood">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="3792041" sp="56880" />
@@ -1222,7 +1222,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21435" level="85" type="Monster" name="Sacrifice Guide">
+	<npc id="21435" level="85" type="Monster" name="Guide of Offering">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="134" lhand="6721" />
@@ -1263,7 +1263,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21436" level="85" type="Monster" name="Sacrifice Leader">
+	<npc id="21436" level="85" type="Monster" name="Leader of Offering">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="134" lhand="6721" />
@@ -1304,7 +1304,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21437" level="85" type="Monster" name="Sacrifice Insect">
+	<npc id="21437" level="85" type="Monster" name="Offering Bug">
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<acquire exp="2056090" sp="30841" />
@@ -1329,7 +1329,7 @@
 			<skill id="4274" level="1" /> <!-- Blunt Weapon Vulnerability -->
 		</skillList>
 	</npc>
-	<npc id="21438" level="83" type="Monster" name="Ghost of Gatekeeper">
+	<npc id="21438" level="83" type="Monster" name="Gatekeeper's Ghost">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="150" lhand="103" />
@@ -1353,7 +1353,7 @@
 			<skill id="4274" level="1" /> <!-- Blunt Weapon Vulnerability -->
 		</skillList>
 	</npc>
-	<npc id="21439" level="83" type="Monster" name="Ghost of Gatekeeper">
+	<npc id="21439" level="83" type="Monster" name="Gatekeeper's Ghost">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="150" lhand="103" />
@@ -1377,7 +1377,7 @@
 			<skill id="4274" level="1" /> <!-- Blunt Weapon Vulnerability -->
 		</skillList>
 	</npc>
-	<npc id="21440" level="83" type="Monster" name="Ghost of Vassal">
+	<npc id="21440" level="83" type="Monster" name="Vassal Ghost">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<acquire exp="702678" sp="10540" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21600-21699.xml
index c2d6e6e6b2..59bcf8d99c 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21600-21699.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="21602" level="65" type="Monster" name="Ancient Holy Ground's Wing">
 		<!-- Classic Antharas -->
@@ -3080,7 +3080,7 @@
 		</ai>
 		<collision>
 			<radius normal="12" />
-			<height normal="31" />
+			<height normal="29" />
 		</collision>
 	</npc>
 	<npc id="21646" level="46" type="Monster" name="Wandering Ghost of Abyss">
@@ -3984,7 +3984,7 @@
 		<status attackable="true" canMove="true" />
 		<collision>
 			<radius normal="14.5" />
-			<height normal="48.0" />
+			<height normal="48" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
@@ -4124,7 +4124,7 @@
 			<height normal="57.75" grown="69" />
 		</collision>
 	</npc>
-	<npc id="21673" level="76" type="Monster" name="Ivlis of Immortality" element="FIRE">
+	<npc id="21673" level="76" type="Monster" name="Iblis of Immortality" element="FIRE">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="4599" level="9" />
@@ -4184,8 +4184,8 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="24.0" />
-			<height normal="40.0" />
+			<radius normal="24" />
+			<height normal="40" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
@@ -4211,8 +4211,8 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="17.0" />
-			<height normal="49.0" />
+			<radius normal="17" />
+			<height normal="49" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
@@ -4239,8 +4239,8 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="34.0" />
-			<height normal="25.0" />
+			<radius normal="34" />
+			<height normal="25" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="3" /> <!-- Beasts -->
@@ -4255,7 +4255,7 @@
 		<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="1848" mpRegen="3.6" />
+			<vitals hp="3077" hpRegen="10.5" mp="1848" mpRegen="3.6" />
 			<speed>
 				<walk ground="38" />
 				<run ground="150" />
@@ -4300,7 +4300,7 @@
 		<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="1607" mpRegen="3.6" />
+			<vitals hp="2956" hpRegen="10.5" mp="1607" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -4319,7 +4319,7 @@
 		<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" />
+			<vitals hp="3044" hpRegen="10.5" mp="1812" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -4339,7 +4339,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="235" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1607" mpRegen="3.6" />
+			<vitals hp="2956" hpRegen="10.5" mp="1607" mpRegen="3.6" />
 			<speed>
 				<walk ground="25" />
 				<run ground="165" />
@@ -4358,7 +4358,7 @@
 		<race>BUG</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1607" mpRegen="3.6" />
+			<vitals hp="2956" hpRegen="10.5" mp="1607" mpRegen="3.6" />
 			<speed>
 				<walk ground="45" />
 				<run ground="165" />
@@ -4385,7 +4385,7 @@
 		<race>DEMONIC</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" />
+			<vitals hp="2975" hpRegen="10.5" mp="1742" mpRegen="3.6" />
 			<speed>
 				<walk ground="70" />
 				<run ground="140" />
@@ -4412,7 +4412,7 @@
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1777" mpRegen="3.6" />
+			<vitals hp="3010" hpRegen="10.5" mp="1777" mpRegen="3.6" />
 			<speed>
 				<walk ground="35" />
 				<run ground="185" />
@@ -4433,7 +4433,7 @@
 			<skill id="4412" level="17" /> <!-- Very Strong P. Def. -->
 		</skillList>
 	</npc>
-	<npc id="21685" level="78" type="Monster" name="Ashuras of Immortality" element="FIRE">
+	<npc id="21685" level="78" type="Monster" name="Ashuras of Eternity" element="FIRE">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="94946" sp="2848" attributeExp="858" />
@@ -4449,8 +4449,8 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="17.0" />
-			<height normal="49.0" />
+			<radius normal="17" />
+			<height normal="49" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
@@ -4493,7 +4493,7 @@
 		<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="402" mpRegen="3.6" />
+			<vitals hp="815" hpRegen="10.5" mp="402" mpRegen="3.6" />
 			<speed>
 				<walk ground="24" />
 				<run ground="140" />
@@ -4513,7 +4513,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="2507" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="417" mpRegen="3.6" />
+			<vitals hp="853" hpRegen="10.5" mp="417" mpRegen="3.6" />
 			<speed>
 				<walk ground="43" />
 				<run ground="140" />
@@ -4533,7 +4533,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="7" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="432" mpRegen="3.6" />
+			<vitals hp="893" hpRegen="10.5" mp="432" mpRegen="3.6" />
 			<speed>
 				<walk ground="43" />
 				<run ground="140" />
@@ -4553,7 +4553,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="98" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="447" mpRegen="3.6" />
+			<vitals hp="934" hpRegen="10.5" mp="447" mpRegen="3.6" />
 			<speed>
 				<walk ground="22" />
 				<run ground="174" />
@@ -4573,7 +4573,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="2507" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="463" mpRegen="3.6" />
+			<vitals hp="976" hpRegen="10.5" mp="463" mpRegen="3.6" />
 			<speed>
 				<walk ground="43" />
 				<run ground="140" />
@@ -4593,7 +4593,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="2507" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="463" mpRegen="3.6" />
+			<vitals hp="976" hpRegen="10.5" mp="463" mpRegen="3.6" />
 			<speed>
 				<walk ground="43" />
 				<run ground="140" />
@@ -4612,7 +4612,7 @@
 		<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="463" mpRegen="3.6" />
+			<vitals hp="976" hpRegen="10.5" mp="463" mpRegen="3.6" />
 			<speed>
 				<walk ground="100" />
 				<run ground="150" />
@@ -4631,7 +4631,7 @@
 		<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="478" mpRegen="3.6" />
+			<vitals hp="1019" hpRegen="10.5" mp="478" mpRegen="3.6" />
 			<speed>
 				<walk ground="100" />
 				<run ground="174" />
@@ -4650,7 +4650,7 @@
 		<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="1708" mpRegen="3.6" />
+			<vitals hp="33003" hpRegen="10.5" mp="1708" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -4670,7 +4670,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="946" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1708" mpRegen="3.6" />
+			<vitals hp="33003" hpRegen="10.5" mp="1708" mpRegen="3.6" />
 			<speed>
 				<walk ground="64" />
 				<run ground="180" />
@@ -4689,7 +4689,7 @@
 		<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="1708" mpRegen="3.6" />
+			<vitals hp="3461" hpRegen="10.5" mp="1708" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
@@ -4708,7 +4708,7 @@
 		<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="1708" mpRegen="3.6" />
+			<vitals hp="3461" hpRegen="10.5" mp="1708" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="100" />
@@ -4727,7 +4727,7 @@
 		<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="1708" mpRegen="3.6" />
+			<vitals hp="3461" hpRegen="10.5" mp="1708" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21700-21799.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21700-21799.xml
index 0c64f30c0e..3faa6ed61b 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21700-21799.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21700-21799.xml
@@ -1,11 +1,11 @@
-<?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="21700" level="80" type="Folk" name="Ailith Watchman">
 		<!-- 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="1708" mpRegen="3.6" />
+			<vitals hp="3461" hpRegen="10.5" mp="1708" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="200" />
@@ -371,7 +371,7 @@
 		<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="1708" mpRegen="3.6" />
+			<vitals hp="65918" hpRegen="10.5" mp="1708" mpRegen="3.6" />
 			<speed>
 				<walk ground="36" />
 				<run ground="170" />
@@ -390,7 +390,7 @@
 		<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="1708" mpRegen="3.6" />
+			<vitals hp="65918" hpRegen="10.5" mp="1708" mpRegen="3.6" />
 			<speed>
 				<walk ground="36" />
 				<run ground="170" />
@@ -409,7 +409,7 @@
 		<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="1708" mpRegen="3.6" />
+			<vitals hp="65918" hpRegen="10.5" mp="1708" mpRegen="3.6" />
 			<speed>
 				<walk ground="36" />
 				<run ground="170" />
@@ -428,7 +428,7 @@
 		<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="1708" mpRegen="3.6" />
+			<vitals hp="65918" hpRegen="10.5" mp="1708" mpRegen="3.6" />
 			<speed>
 				<walk ground="36" />
 				<run ground="170" />
@@ -447,7 +447,7 @@
 		<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="1708" mpRegen="3.6" />
+			<vitals hp="338766" hpRegen="10.5" mp="1708" mpRegen="3.6" />
 			<speed>
 				<walk ground="36" />
 				<run ground="170" />
@@ -466,7 +466,7 @@
 		<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="1777" mpRegen="3.6" />
+			<vitals hp="3835" hpRegen="10.5" mp="1777" mpRegen="3.6" />
 			<speed>
 				<walk ground="46" />
 				<run ground="160" />
@@ -485,7 +485,7 @@
 		<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="1777" mpRegen="3.6" />
+			<vitals hp="32829" hpRegen="10.5" mp="1777" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -504,7 +504,7 @@
 		<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="1777" mpRegen="3.6" />
+			<vitals hp="32829" hpRegen="10.5" mp="1777" mpRegen="3.6" />
 			<speed>
 				<walk ground="33" />
 				<run ground="120" />
@@ -523,7 +523,7 @@
 		<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="1777" mpRegen="3.6" />
+			<vitals hp="32829" hpRegen="10.5" mp="1777" mpRegen="3.6" />
 			<speed>
 				<walk ground="43" />
 				<run ground="120" />
@@ -542,7 +542,7 @@
 		<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="1777" mpRegen="3.6" />
+			<vitals hp="32829" hpRegen="10.5" mp="1777" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="170" />
@@ -553,7 +553,7 @@
 		<status attackable="false" />
 		<collision>
 			<radius normal="20" />
-			<height normal="405.985" />
+			<height normal="40.5985" />
 		</collision>
 	</npc>
 	<npc id="21729" level="80" type="Folk" name="Magic Circle Guard Captain">
@@ -561,7 +561,7 @@
 		<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="2666" mpRegen="3.6" />
+			<vitals hp="3778" hpRegen="10.5" mp="2666" mpRegen="3.6" />
 			<speed>
 				<walk ground="37" />
 				<run ground="160" />
@@ -580,7 +580,7 @@
 		<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="2666" mpRegen="3.6" />
+			<vitals hp="3778" hpRegen="10.5" mp="2666" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="170" />
@@ -2514,15 +2514,15 @@
 			<attack physical="494.5442" magical="438.8752173913" random="30" critical="4.75" accuracy="4.75" attackSpeed="250" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="1009.413" magical="1682.355" />
 			<speed>
-				<walk ground="39" />
+				<walk ground="30" />
 				<run ground="175" />
 			</speed>
 			<abnormalResist physical="100" magical="100" />
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="20.0" />
-			<height normal="25.0" />
+			<radius normal="20" />
+			<height normal="25" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="7" /> <!-- Spirits -->
@@ -2553,8 +2553,8 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="38.0" />
-			<height normal="45.0" />
+			<radius normal="38" />
+			<height normal="45" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="7" /> <!-- Spirits -->
@@ -2570,7 +2570,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21763" level="82" type="Monster" name="Firen" title="Master" element="FIRE">
+	<npc id="21763" level="82" type="Monster" name="Pyra" title="Master" element="FIRE">
 		<race>ELEMENTAL</race>
 		<sex>FEMALE</sex>
 		<acquire exp="1207859" sp="36235" attributeExp="1230" />
@@ -2665,7 +2665,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21766" level="82" type="Monster" name="Tortay" title="Master" element="EARTH">
+	<npc id="21766" level="82" type="Monster" name="Tortai" title="Master" element="EARTH">
 		<race>ELEMENTAL</race>
 		<acquire exp="1207859" sp="36235" attributeExp="1230" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2761,7 +2761,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21769" level="82" type="Monster" name="Ishtir" title="Master" element="WATER">
+	<npc id="21769" level="82" type="Monster" name="Istri" title="Master" element="WATER">
 		<race>ELEMENTAL</race>
 		<sex>FEMALE</sex>
 		<acquire exp="1207859" sp="36235" attributeExp="1230" />
@@ -2898,7 +2898,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21772" level="82" type="Monster" name="Radin" title="Master" element="WIND">
+	<npc id="21772" level="82" type="Monster" name="Radi" title="Master" element="WIND">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -2951,7 +2951,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21773" level="82" type="Monster" name="Captain's Henchman" element="WATER">
+	<npc id="21773" level="82" type="Monster" name="Guard Captain's Subordinate" element="WATER">
 		<race>ETC</race>
 		<sex>MALE</sex>
 		<acquire exp="101142" sp="3034" attributeExp="1230" />
@@ -2977,7 +2977,7 @@
 			<skill id="4413" level="10" /> <!-- Slightly Weak M. Def. -->
 		</skillList>
 	</npc>
-	<npc id="21774" level="78" type="Monster" name="Buffalo" title="Guardian of Gorge" element="EARTH">
+	<npc id="21774" level="78" type="Monster" name="Buffalo" title="Guardian of the Canyon" element="EARTH">
 		<!-- Classic Seven Sings -->
 		<race>BEAST</race>
 		<acquire exp="96918" sp="2907" attributeExp="858" />
@@ -3002,7 +3002,7 @@
 			<height normal="37.8" />
 		</collision>
 	</npc>
-	<npc id="21775" level="78" type="Monster" name="Arahan" title="Hero of the Past" element="EARTH">
+	<npc id="21775" level="78" type="Monster" name="Arahan" title="Hero of Ages" element="EARTH">
 		<!-- Classic Seven Sings -->
 		<race>DIVINE</race>
 		<acquire exp="322658" sp="9679" attributeExp="858" />
@@ -3029,7 +3029,7 @@
 			<height normal="44" />
 		</collision>
 	</npc>
-	<npc id="21776" level="80" type="Monster" name="Fuish" title="Guardian of Wind" element="WIND">
+	<npc id="21776" level="80" type="Monster" name="Fish" title="Wind Guardian" element="WIND">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -3396,7 +3396,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="21784" level="79" type="Monster" name="Storm Tapo" element="WIND">
+	<npc id="21784" level="79" type="Monster" name="Storm Monk" element="WIND">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -3534,7 +3534,7 @@
 			<height normal="21.3" />
 		</collision>
 	</npc>
-	<npc id="21787" level="80" type="Monster" name="Breeze Piker" element="WIND">
+	<npc id="21787" level="80" type="Monster" name="Breeze Spiker" element="WIND">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -3673,7 +3673,7 @@
 			<height normal="27.6" />
 		</collision>
 	</npc>
-	<npc id="21790" level="81" type="Monster" name="Wingrow" element="WIND">
+	<npc id="21790" level="81" type="Monster" name="Wing Grow" element="WIND">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -3874,8 +3874,8 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="20" />
-			<height normal="34" />
+			<radius normal="24" />
+			<height normal="43.8" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
@@ -3920,8 +3920,8 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="24" />
-			<height normal="40" />
+			<radius normal="19.2" />
+			<height normal="31.4" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
@@ -3963,8 +3963,8 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="10.2" />
-			<height normal="22.5" />
+			<radius normal="8.4" />
+			<height normal="18" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="9" /> <!-- Demons -->
@@ -4005,8 +4005,8 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="13" />
-			<height normal="33.4" />
+			<radius normal="11" />
+			<height normal="27.8" />
 		</collision>
 		<skillList>
 			<skill id="4416" level="1" /> <!-- Undead -->
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21800-21899.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21800-21899.xml
index d5b7885e34..c929ec50c8 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21800-21899.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21800-21899.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="21800" level="80" type="Monster" name="Kookaburra">
 		<race>BEAST</race>
@@ -1239,7 +1239,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="21821" level="79" type="Monster" name="Eye of the Watchman" element="EARTH">
+	<npc id="21821" level="79" type="Monster" name="Eye of Watchman" element="EARTH">
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
 			<param name="MoveAroundSocial1" value="90" />
@@ -1348,7 +1348,7 @@
 			<height normal="26" />
 		</collision>
 	</npc>
-	<npc id="21823" level="80" type="Monster" name="Canyon Grendel Warrior" element="EARTH">
+	<npc id="21823" level="80" type="Monster" name="Valley Grendel Warrior" element="EARTH">
 		<!-- Classic Seven Sings -->
 		<parameters>
 			<param name="MoveAroundSocial" value="115" />
@@ -1679,7 +1679,7 @@
 			<height normal="30" grown="36.5" />
 		</collision>
 	</npc>
-	<npc id="21829" level="81" type="Monster" name="Disciple of Punishment" element="EARTH">
+	<npc id="21829" level="81" type="Monster" name="Disciples of Punishment" element="EARTH">
 		<parameters>
 			<param name="MoveAroundSocial" value="130" />
 			<param name="MoveAroundSocial1" value="130" />
@@ -1734,7 +1734,7 @@
 			<height normal="30" grown="36.5" />
 		</collision>
 	</npc>
-	<npc id="21830" level="82" type="Monster" name="Disciple of Conquest" element="EARTH">
+	<npc id="21830" level="82" type="Monster" name="Apostle of Conquest" element="EARTH">
 		<parameters>
 			<param name="MoveAroundSocial" value="130" />
 			<param name="MoveAroundSocial1" value="130" />
@@ -1785,7 +1785,7 @@
 			<height normal="30" grown="36.5" />
 		</collision>
 	</npc>
-	<npc id="21831" level="82" type="Monster" name="Disciple of Power" element="EARTH">
+	<npc id="21831" level="82" type="Monster" name="Apostle of Strength" element="EARTH">
 		<parameters>
 			<param name="MoveAroundSocial" value="85" />
 			<param name="MoveAroundSocial1" value="85" />
@@ -1836,13 +1836,13 @@
 			<height normal="38.5" grown="46.5" />
 		</collision>
 	</npc>
-	<npc id="21832" level="82" type="Folk" name="Disciple of Authority">
+	<npc id="21832" level="82" type="Folk" name="Disciples of Authority">
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="6718" />
 		<acquire exp="190827" sp="5724" attributeExp="1230" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="6297" hpRegen="10.5" mp="2666" mpRegen="3.6" />
+			<vitals hp="3736" hpRegen="10.5" mp="2614" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="155" />
@@ -2329,7 +2329,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21839" level="82" type="Monster" name="Hot Springs Yeti" title="Ruler of Hot Springs">
+	<npc id="21839" level="82" type="Monster" name="Hot Springs Yeti" title="Hot Springs Master">
 		<!-- Classic Seven Sings -->
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
@@ -2385,7 +2385,7 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="21840" level="81" type="Monster" name="Hot Springs Atroxspawn">
+	<npc id="21840" level="81" type="Monster" name="Hot Springs Atrox">
 		<!-- Classic Seven Sings -->
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
@@ -4406,7 +4406,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="21869" level="80" type="Monster" name="Varka Silenos Altar Escort" title="Guardian of the Altar">
+	<npc id="21869" level="80" type="Monster" name="Varka's Altar Rear Escort" title="Guardian of the Altar">
 		<!-- Classic Seven Sings -->
 		<parameters>
 			<param name="MoveAroundSocial" value="65" />
@@ -4770,7 +4770,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21874" level="80" type="Monster" name="Varka Silenos Altar Shaman" title="Guardian of the Altar">
+	<npc id="21874" level="80" type="Monster" name="Varka's Altar Shaman" title="Guardian of the Altar">
 		<!-- Classic Seven Sings -->
 		<parameters>
 			<param name="MoveAroundSocial" value="123" />
@@ -6370,7 +6370,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21898" level="78" type="Monster" name="Ancient Holy Ground's Witch">
+	<npc id="21898" level="78" type="Monster" name="Ancient Holy Ground Witch">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
@@ -6414,7 +6414,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21899" level="78" type="Monster" name="Ancient Holy Ground's Watchman">
+	<npc id="21899" level="78" type="Monster" name="Ancient Martyrium Watchman">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21900-21999.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21900-21999.xml
index 0ddfdf9ffa..9e81140bd4 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21900-21999.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/21900-21999.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="21900" level="79" type="Monster" name="Ancient Holy Ground's Deadman">
+	<npc id="21900" level="79" type="Monster" name="Ancient Holy Ground Dead">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
@@ -51,7 +51,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21901" level="79" type="Monster" name="Lillim Slayer">
+	<npc id="21901" level="79" type="Monster" name="Lilim Slayer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
@@ -107,7 +107,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21902" level="80" type="Monster" name="Lillim Shaman">
+	<npc id="21902" level="80" type="Monster" name="Lilim Sorcerer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
@@ -162,7 +162,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21903" level="80" type="Monster" name="Lillim Royal Knight">
+	<npc id="21903" level="80" type="Monster" name="Lilim Royal Knight">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
@@ -620,7 +620,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21912" level="80" type="Monster" name="Nephilim Escort">
+	<npc id="21912" level="80" type="Monster" name="Nephilim Royal Escort">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
@@ -671,4 +671,653 @@
 			</spoil>
 		</dropLists>
 	</npc>
+	<npc id="21913" level="85" type="Folk" name="Lilith" title="Apostle">
+		<!-- 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="224799" hpRegen="10.5" mp="1679" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<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="42.5" />
+			<height normal="55" />
+		</collision>
+	</npc>
+	<npc id="21914" level="85" type="Folk" name="Lilith's Escort">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="5800" lhand="5799" /> <!-- Nephilim Lord - Not Available / Nephilim Lord -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="74933" hpRegen="10.5" mp="1679" mpRegen="3.6" />
+			<speed>
+				<walk ground="56" />
+				<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="7.2" />
+			<height normal="28.8" />
+		</collision>
+	</npc>
+	<npc id="21915" level="85" type="Folk" name="Anakim" title="Fallen Angel">
+		<!-- 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="224799" hpRegen="10.5" mp="1679" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<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="18.6" />
+			<height normal="35.4" />
+		</collision>
+	</npc>
+	<npc id="21916" level="85" type="Folk" name="Anakim's Royal 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="74933" hpRegen="10.5" mp="1679" mpRegen="3.6" />
+			<speed>
+				<walk ground="65" />
+				<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="7.2" />
+			<height normal="24.6" />
+		</collision>
+	</npc>
+	<npc id="21917" level="85" type="Folk" name="Lilith" title="Apostle">
+		<!-- 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="234166" hpRegen="10.5" mp="1768" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<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="42.5" />
+			<height normal="55" />
+		</collision>
+	</npc>
+	<npc id="21918" level="85" type="Folk" name="Lilith's Escort">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="5800" lhand="5799" /> <!-- Nephilim Lord - Not Available / Nephilim Lord -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="78055" hpRegen="10.5" mp="1768" mpRegen="3.6" />
+			<speed>
+				<walk ground="56" />
+				<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="7.2" />
+			<height normal="28.8" />
+		</collision>
+	</npc>
+	<npc id="21919" level="85" type="Folk" name="Anakim" title="Fallen Angel">
+		<!-- 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="234166" hpRegen="10.5" mp="1768" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<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="18.6" />
+			<height normal="35.4" />
+		</collision>
+	</npc>
+	<npc id="21920" level="85" type="Folk" name="Anakim's Royal 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="78055" hpRegen="10.5" mp="1768" mpRegen="3.6" />
+			<speed>
+				<walk ground="65" />
+				<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="7.2" />
+			<height normal="24.6" />
+		</collision>
+	</npc>
+	<npc id="21921" level="85" type="Folk" name="Ignis" title="Apostle of Fire">
+		<!-- 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="265672" hpRegen="10.5" mp="1985" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="190" />
+			</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" />
+			<height normal="81" />
+		</collision>
+	</npc>
+	<npc id="21922" level="85" type="Folk" name="Nebula" title="Apostle of Water">
+		<!-- 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="306545" hpRegen="10.5" mp="2290" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="190" />
+			</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="58" />
+		</collision>
+	</npc>
+	<npc id="21923" level="85" type="Folk" name="Water Slime">
+		<!-- 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="102181" hpRegen="10.5" mp="2290" mpRegen="3.6" />
+			<speed>
+				<walk ground="36" />
+				<run ground="36" />
+			</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="18" />
+		</collision>
+	</npc>
+	<npc id="21924" level="85" type="Folk" name="Petram" title="Apostle of Wind">
+		<!-- 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="347417" hpRegen="10.5" mp="2595" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="190" />
+			</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="61" />
+		</collision>
+	</npc>
+	<npc id="21925" level="85" type="Folk" name="Petram's Fragment">
+		<!-- 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="115805" hpRegen="10.5" mp="2595" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="190" />
+			</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="35.4" />
+		</collision>
+	</npc>
+	<npc id="21926" level="85" type="Folk" name="Petram's Piece">
+		<!-- 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="115805" hpRegen="10.5" mp="2595" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="190" />
+			</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="35.4" />
+		</collision>
+	</npc>
+	<npc id="21927" level="85" type="Folk" name="Procella" title="Apostle of Earth">
+		<!-- 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="408726" hpRegen="10.5" mp="3054" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="190" />
+			</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" />
+			<height normal="105.8" />
+		</collision>
+	</npc>
+	<npc id="21928" level="85" type="Folk" name="Procella'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="136242" hpRegen="10.5" mp="3054" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="190" />
+			</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="65" />
+		</collision>
+	</npc>
+	<npc id="21929" level="85" type="Folk" name="Procella's Escort">
+		<!-- 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="136242" hpRegen="10.5" mp="3054" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="190" />
+			</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="65" />
+		</collision>
+	</npc>
+	<npc id="21930" level="85" type="Folk" name="Ignis" title="Apostle of Fire">
+		<!-- 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="276742" hpRegen="10.5" mp="2089" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="190" />
+			</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" />
+			<height normal="81" />
+		</collision>
+	</npc>
+	<npc id="21931" level="85" type="Folk" name="Nebula" title="Apostle of Water">
+		<!-- 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="319317" hpRegen="10.5" mp="2411" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="190" />
+			</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="70.2" />
+		</collision>
+	</npc>
+	<npc id="21932" level="85" type="Folk" name="Water Slime">
+		<!-- 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="106439" hpRegen="10.5" mp="2411" mpRegen="3.6" />
+			<speed>
+				<walk ground="36" />
+				<run ground="36" />
+			</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="18" />
+		</collision>
+	</npc>
+	<npc id="21933" level="85" type="Folk" name="Petram" title="Apostle of Wind">
+		<!-- 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="361893" hpRegen="10.5" mp="2732" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="190" />
+			</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="61" />
+		</collision>
+	</npc>
+	<npc id="21934" level="85" type="Folk" name="Petram's Fragment">
+		<!-- 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="120631" hpRegen="10.5" mp="2732" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="190" />
+			</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="35.4" />
+		</collision>
+	</npc>
+	<npc id="21935" level="85" type="Folk" name="Petram's Piece">
+		<!-- 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="120631" hpRegen="10.5" mp="2732" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="190" />
+			</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="35.4" />
+		</collision>
+	</npc>
+	<npc id="21936" level="85" type="Folk" name="Procella" title="Apostle of Earth">
+		<!-- 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="425756" hpRegen="10.5" mp="3214" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="190" />
+			</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" />
+			<height normal="105.8" />
+		</collision>
+	</npc>
+	<npc id="21937" level="85" type="Folk" name="Procella'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="141918" hpRegen="10.5" mp="3214" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="190" />
+			</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="65" />
+		</collision>
+	</npc>
+	<npc id="21938" level="85" type="Folk" name="Procella's Escort">
+		<!-- 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="141918" hpRegen="10.5" mp="3214" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="190" />
+			</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="65" />
+		</collision>
+	</npc>
+	<npc id="21939" level="85" type="Folk" name="Pirate Ship Janitor">
+		<!-- 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="6153" hpRegen="10.5" mp="2563" mpRegen="3.6" />
+			<speed>
+				<walk ground="20" />
+				<run ground="175" />
+			</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="20" />
+		</collision>
+	</npc>
+	<npc id="21940" level="85" type="Folk" name="Pirate Ship Soldier">
+		<!-- 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="6227" hpRegen="10.5" mp="2614" mpRegen="3.6" />
+			<speed>
+				<walk ground="39" />
+				<run ground="175" />
+			</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.5" />
+		</collision>
+	</npc>
+	<npc id="21941" level="85" type="Folk" name="Pirate Ship Shaman">
+		<!-- 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="6227" hpRegen="10.5" mp="2614" mpRegen="3.6" />
+			<speed>
+				<walk ground="39" />
+				<run ground="175" />
+			</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="26" />
+		</collision>
+	</npc>
+	<npc id="21942" level="85" type="Folk" name="Pirate Ship Shield Soldier">
+		<!-- 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="6227" hpRegen="10.5" mp="2614" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="175" />
+			</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="25" />
+			<height normal="30" />
+		</collision>
+	</npc>
+	<npc id="21943" level="85" type="Folk" name="Ruluik" title="Ancient Pirate">
+		<!-- 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="6297" hpRegen="10.5" mp="2666" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="175" />
+			</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="19.5" />
+			<height normal="54.75" />
+		</collision>
+	</npc>
+	<npc id="21944" level="85" type="Folk" name="Eric" title="Ancient Pirate">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="39719" /> <!-- Monster only_Crook Staff -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="6297" hpRegen="10.5" mp="2666" mpRegen="3.6" />
+			<speed>
+				<walk ground="39" />
+				<run ground="175" />
+			</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="60" />
+		</collision>
+	</npc>
+	<npc id="21945" level="85" type="Folk" name="Leif" title="Ancient Pirate">
+		<!-- 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="6297" hpRegen="10.5" mp="2666" mpRegen="3.6" />
+			<speed>
+				<walk ground="43" />
+				<run ground="175" />
+			</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="54" />
+		</collision>
+	</npc>
+	<npc id="21946" level="85" type="Folk" name="Gunhild" title="Ancient Pirate">
+		<!-- 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="6297" hpRegen="10.5" mp="2666" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="175" />
+			</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="45" />
+			<height normal="60" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/23800-23899.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/23800-23899.xml
index f589df2023..a634227a0c 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/23800-23899.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/23800-23899.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="23820" level="80" type="Folk" name="Ketra Elite Soldier">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -711,7 +711,7 @@
 		</skillList>
 		<collision>
 			<radius normal="35" />
-			<height normal="463.765" />
+			<height normal="46.3765" />
 		</collision>
 	</npc>
 	<npc id="23850" level="80" type="Folk" name="Hell Assassin">
@@ -719,7 +719,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="21659" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<vitals hp="20793" hpRegen="10.5" mp="1278" mpRegen="3.6" />
 			<speed>
 				<walk ground="36" />
 				<run ground="180" />
@@ -741,7 +741,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="41019" hpRegen="10.5" mp="1377" mpRegen="3.6" />
+			<vitals hp="39378" hpRegen="10.5" mp="1308" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -764,7 +764,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5800" lhand="5799" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="96461" hpRegen="10.5" mp="1410" mpRegen="3.6" />
+			<vitals hp="92603" hpRegen="10.5" mp="1339" mpRegen="3.6" />
 			<speed>
 				<walk ground="56" />
 				<run ground="180" />
@@ -786,7 +786,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="98227" hpRegen="10.5" mp="1442" mpRegen="3.6" />
+			<vitals hp="94298" hpRegen="10.5" mp="1370" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -831,7 +831,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="80" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="21659" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<vitals hp="20793" hpRegen="10.5" mp="1278" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -854,7 +854,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="2504" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="41019" hpRegen="10.5" mp="1377" mpRegen="3.6" />
+			<vitals hp="39378" hpRegen="10.5" mp="1308" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -877,7 +877,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="97" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="96461" hpRegen="10.5" mp="1410" mpRegen="3.6" />
+			<vitals hp="92603" hpRegen="10.5" mp="1339" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -900,7 +900,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="97" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="98227" hpRegen="10.5" mp="1442" mpRegen="3.6" />
+			<vitals hp="94298" hpRegen="10.5" mp="1370" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
@@ -1182,7 +1182,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="81358" hpRegen="10.5" mp="1251" mpRegen="3.6" />
+			<vitals hp="78104" hpRegen="10.5" mp="1188" mpRegen="3.6" />
 			<speed>
 				<walk ground="120" />
 				<run ground="180" />
@@ -1204,7 +1204,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="81358" hpRegen="10.5" mp="1251" mpRegen="3.6" />
+			<vitals hp="78104" hpRegen="10.5" mp="1188" mpRegen="3.6" />
 			<speed>
 				<walk ground="15" />
 				<run ground="180" />
@@ -1217,8 +1217,8 @@
 			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<collision>
-			<radius normal="39" />
-			<height normal="61.5" />
+			<radius normal="32.5" />
+			<height normal="50.75" />
 		</collision>
 	</npc>
 	<npc id="23872" level="80" type="Folk" name="Gatekeeper Roxxy" title="Intruding Challenger">
@@ -1226,7 +1226,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="86639" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<vitals hp="83173" hpRegen="10.5" mp="1278" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -1248,7 +1248,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="86639" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<vitals hp="83173" hpRegen="10.5" mp="1278" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1270,7 +1270,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="109952" hpRegen="10.5" mp="1475" mpRegen="3.6" />
+			<vitals hp="105554" hpRegen="10.5" mp="1401" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1292,7 +1292,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="109952" hpRegen="10.5" mp="1475" mpRegen="3.6" />
+			<vitals hp="105554" hpRegen="10.5" mp="1401" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1314,7 +1314,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="117083" hpRegen="10.5" mp="1607" mpRegen="3.6" />
+			<vitals hp="112399" hpRegen="10.5" mp="1527" mpRegen="3.6" />
 			<speed>
 				<walk ground="64" />
 				<run ground="180" />
@@ -1336,7 +1336,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="117083" hpRegen="10.5" mp="1607" mpRegen="3.6" />
+			<vitals hp="112399" hpRegen="10.5" mp="1527" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/23900-23999.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/23900-23999.xml
index 21d8e1be64..9fda4b6cc5 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/23900-23999.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/23900-23999.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="23900" level="80" type="Folk" name="Laikel of Terror" title="Leader of Creation">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -173,7 +173,7 @@
 		</skillList>
 		<collision>
 			<radius normal="35" />
-			<height normal="463.765" />
+			<height normal="46.3765" />
 		</collision>
 	</npc>
 	<npc id="23908" level="80" type="Folk" name="Hell Assassin">
@@ -679,8 +679,8 @@
 			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 		<collision>
-			<radius normal="39" />
-			<height normal="61.5" />
+			<radius normal="32.5" />
+			<height normal="50.75" />
 		</collision>
 	</npc>
 	<npc id="23930" level="80" type="Folk" name="Gatekeeper Roxxy" title="Intruding Challenger">
@@ -821,7 +821,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="160" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="4894" hpRegen="10.5" mp="1036" mpRegen="3.6" />
+			<vitals hp="4698" hpRegen="10.5" mp="984" mpRegen="3.6" />
 			<speed>
 				<walk ground="36" />
 				<run ground="180" />
@@ -844,7 +844,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="160" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="4894" hpRegen="10.5" mp="1036" mpRegen="3.6" />
+			<vitals hp="4698" hpRegen="10.5" mp="984" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -867,7 +867,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="1472" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="10844" hpRegen="10.5" mp="1158" mpRegen="3.6" />
+			<vitals hp="10410" hpRegen="10.5" mp="1100" mpRegen="3.6" />
 			<speed>
 				<walk ground="100" />
 				<run ground="180" />
@@ -889,7 +889,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="10844" hpRegen="10.5" mp="1158" mpRegen="3.6" />
+			<vitals hp="10410" hpRegen="10.5" mp="1100" mpRegen="3.6" />
 			<speed>
 				<walk ground="40" />
 				<run ground="180" />
@@ -911,7 +911,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="26151" hpRegen="10.5" mp="1251" mpRegen="3.6" />
+			<vitals hp="25105" hpRegen="10.5" mp="1188" mpRegen="3.6" />
 			<speed>
 				<walk ground="45" />
 				<run ground="180" />
@@ -933,7 +933,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="26151" hpRegen="10.5" mp="1251" mpRegen="3.6" />
+			<vitals hp="25105" hpRegen="10.5" mp="1188" mpRegen="3.6" />
 			<speed>
 				<walk ground="55" />
 				<run ground="180" />
@@ -955,7 +955,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="21659" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<vitals hp="20793" hpRegen="10.5" mp="1278" mpRegen="3.6" />
 			<speed>
 				<walk ground="36" />
 				<run ground="180" />
@@ -978,7 +978,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="80" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="21659" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<vitals hp="20793" hpRegen="10.5" mp="1278" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -1309,7 +1309,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="14528" hpRegen="10.5" mp="1251" mpRegen="3.6" />
+			<vitals hp="13947" hpRegen="10.5" mp="1188" mpRegen="3.6" />
 			<speed>
 				<walk ground="75" />
 				<run ground="180" />
@@ -1331,7 +1331,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="7883" hpRegen="10.5" mp="1314" mpRegen="3.6" />
+			<vitals hp="7568" hpRegen="10.5" mp="1248" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1353,7 +1353,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="7883" hpRegen="10.5" mp="1314" mpRegen="3.6" />
+			<vitals hp="7568" hpRegen="10.5" mp="1248" mpRegen="3.6" />
 			<speed>
 				<walk ground="21" />
 				<run ground="180" />
@@ -1418,7 +1418,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="193" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="19645" hpRegen="10.5" mp="1442" mpRegen="3.6" />
+			<vitals hp="18859" hpRegen="10.5" mp="1370" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
@@ -1440,7 +1440,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="27119" hpRegen="10.5" mp="1251" mpRegen="3.6" />
+			<vitals hp="26034" hpRegen="10.5" mp="1188" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -1462,7 +1462,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="27119" hpRegen="10.5" mp="1251" mpRegen="3.6" />
+			<vitals hp="26034" hpRegen="10.5" mp="1188" mpRegen="3.6" />
 			<speed>
 				<walk ground="15" />
 				<run ground="180" />
@@ -1484,7 +1484,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="28879" hpRegen="10.5" mp="1251" mpRegen="3.6" />
+			<vitals hp="27724" hpRegen="10.5" mp="1188" mpRegen="3.6" />
 			<speed>
 				<walk ground="28" />
 				<run ground="180" />
@@ -1506,7 +1506,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="28879" hpRegen="10.5" mp="1251" mpRegen="3.6" />
+			<vitals hp="27724" hpRegen="10.5" mp="1188" mpRegen="3.6" />
 			<speed>
 				<walk ground="40" />
 				<run ground="180" />
@@ -1528,7 +1528,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="27488" hpRegen="10.5" mp="1475" mpRegen="3.6" />
+			<vitals hp="26388" hpRegen="10.5" mp="1401" mpRegen="3.6" />
 			<speed>
 				<walk ground="25" />
 				<run ground="180" />
@@ -1550,7 +1550,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="27488" hpRegen="10.5" mp="1475" mpRegen="3.6" />
+			<vitals hp="26388" hpRegen="10.5" mp="1401" mpRegen="3.6" />
 			<speed>
 				<walk ground="25" />
 				<run ground="180" />
@@ -1572,7 +1572,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="29270" hpRegen="10.5" mp="1475" mpRegen="3.6" />
+			<vitals hp="28099" hpRegen="10.5" mp="1401" mpRegen="3.6" />
 			<speed>
 				<walk ground="70" />
 				<run ground="180" />
@@ -1594,7 +1594,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="29270" hpRegen="10.5" mp="1475" mpRegen="3.6" />
+			<vitals hp="28099" hpRegen="10.5" mp="1401" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -1616,7 +1616,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="29270" hpRegen="10.5" mp="1475" mpRegen="3.6" />
+			<vitals hp="28099" hpRegen="10.5" mp="1401" mpRegen="3.6" />
 			<speed>
 				<walk ground="33" />
 				<run ground="180" />
@@ -2009,7 +2009,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="98" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="67763" hpRegen="10.5" mp="1507" mpRegen="3.6" />
+			<vitals hp="65052" hpRegen="10.5" mp="1432" mpRegen="3.6" />
 			<speed>
 				<walk ground="64" />
 				<run ground="180" />
@@ -2032,7 +2032,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5233" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="67763" hpRegen="10.5" mp="1507" mpRegen="3.6" />
+			<vitals hp="65052" hpRegen="10.5" mp="1432" mpRegen="3.6" />
 			<speed>
 				<walk ground="64" />
 				<run ground="180" />
@@ -2054,7 +2054,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="151492" hpRegen="10.5" mp="1540" mpRegen="3.6" />
+			<vitals hp="145432" hpRegen="10.5" mp="1463" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -2076,7 +2076,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="55088" hpRegen="10.5" mp="1540" mpRegen="3.6" />
+			<vitals hp="52884" hpRegen="10.5" mp="1463" mpRegen="3.6" />
 			<speed>
 				<walk ground="40" />
 				<run ground="180" />
@@ -2098,7 +2098,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="55088" hpRegen="10.5" mp="1540" mpRegen="3.6" />
+			<vitals hp="52884" hpRegen="10.5" mp="1463" mpRegen="3.6" />
 			<speed>
 				<walk ground="40" />
 				<run ground="180" />
@@ -2120,7 +2120,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="167822" hpRegen="10.5" mp="1574" mpRegen="3.6" />
+			<vitals hp="161109" hpRegen="10.5" mp="1495" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -2142,7 +2142,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="62933" hpRegen="10.5" mp="1574" mpRegen="3.6" />
+			<vitals hp="60416" hpRegen="10.5" mp="1495" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -2164,7 +2164,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="62933" hpRegen="10.5" mp="1574" mpRegen="3.6" />
+			<vitals hp="60416" hpRegen="10.5" mp="1495" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
@@ -2186,7 +2186,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="188800" hpRegen="10.5" mp="1574" mpRegen="3.6" />
+			<vitals hp="181248" hpRegen="10.5" mp="1495" mpRegen="3.6" />
 			<speed>
 				<walk ground="42" />
 				<run ground="180" />
@@ -2208,7 +2208,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="188800" hpRegen="10.5" mp="1574" mpRegen="3.6" />
+			<vitals hp="181248" hpRegen="10.5" mp="1495" mpRegen="3.6" />
 			<speed>
 				<walk ground="42" />
 				<run ground="180" />
@@ -2230,7 +2230,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="69926" hpRegen="10.5" mp="1574" mpRegen="3.6" />
+			<vitals hp="67129" hpRegen="10.5" mp="1495" mpRegen="3.6" />
 			<speed>
 				<walk ground="14" />
 				<run ground="180" />
@@ -2252,7 +2252,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="69926" hpRegen="10.5" mp="1574" mpRegen="3.6" />
+			<vitals hp="67129" hpRegen="10.5" mp="1495" mpRegen="3.6" />
 			<speed>
 				<walk ground="11" />
 				<run ground="180" />
@@ -2274,7 +2274,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="212878" hpRegen="10.5" mp="1607" mpRegen="3.6" />
+			<vitals hp="204363" hpRegen="10.5" mp="1527" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -2297,7 +2297,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="97" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="70959" hpRegen="10.5" mp="1607" mpRegen="3.6" />
+			<vitals hp="68121" hpRegen="10.5" mp="1527" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/24000-24099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/24000-24099.xml
index 50e4e02c47..78e5e80011 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/24000-24099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/24000-24099.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="24000" level="80" type="Folk" name="Leona Blackbird" title="Dragon's Advocate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -410,7 +410,7 @@
 			<skill id="4085" level="1" /> <!-- Critical Damage -->
 		</skillList>
 		<collision>
-			<radius normal="50" />
+			<radius normal="25" />
 			<height normal="44" />
 		</collision>
 		<dropLists>
@@ -630,7 +630,7 @@
 			<skill id="4413" level="12" /> <!-- Slightly Strong M. Def. -->
 		</skillList>
 		<collision>
-			<radius normal="50" />
+			<radius normal="25" />
 			<height normal="44" />
 		</collision>
 		<dropLists>
@@ -735,7 +735,7 @@
 		<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="2261" mpRegen="3.6" />
+			<vitals hp="3388" hpRegen="10.5" mp="2261" mpRegen="3.6" />
 			<speed>
 				<walk ground="27" />
 				<run ground="150" />
@@ -1133,8 +1133,8 @@
 			<skill id="4413" level="10" /> <!-- Slightly Weak M. Def. -->
 		</skillList>
 		<collision>
-			<radius normal="20" />
-			<height normal="34" />
+			<radius normal="24" />
+			<height normal="43.8" />
 		</collision>
 		
 		<dropLists>
@@ -1185,8 +1185,8 @@
 			<skill id="4412" level="9" /> <!-- Slightly Weak P. Def. -->
 		</skillList>
 		<collision>
-			<radius normal="24" />
-			<height normal="40" />
+			<radius normal="19.2" />
+			<height normal="31.4" />
 		</collision>
 		<dropLists>
 			<drop>
@@ -1230,8 +1230,8 @@
 			<skill id="4408" level="10" /> <!-- HP Increase (2x) -->
 		</skillList>
 		<collision>
-			<radius normal="10.2" />
-			<height normal="22.5" />
+			<radius normal="8.4" />
+			<height normal="18" />
 		</collision>
 		<dropLists>
 			<drop>
@@ -1278,8 +1278,8 @@
 			<skill id="4410" level="12" /> <!-- Slightly Strong P. Atk. -->
 		</skillList>
 		<collision>
-			<radius normal="13" />
-			<height normal="33.4" />
+			<radius normal="11" />
+			<height normal="27.8" />
 		</collision>
 		<dropLists>
 			<drop>
@@ -2051,7 +2051,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -2070,7 +2070,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
@@ -2089,7 +2089,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -2108,7 +2108,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -2127,7 +2127,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -2146,7 +2146,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
@@ -2165,7 +2165,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -2184,7 +2184,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -2203,7 +2203,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -2222,7 +2222,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="180" />
@@ -2241,7 +2241,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -2260,7 +2260,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="180" />
@@ -2279,7 +2279,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -2298,7 +2298,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="180" />
@@ -2317,7 +2317,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -2336,7 +2336,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -2355,7 +2355,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -2374,7 +2374,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -2393,7 +2393,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="180" />
@@ -2412,7 +2412,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="180" />
@@ -2431,7 +2431,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="180" />
@@ -2450,7 +2450,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="180" />
@@ -2469,7 +2469,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
@@ -2488,7 +2488,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
@@ -2507,7 +2507,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
@@ -2526,7 +2526,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
@@ -2545,7 +2545,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
@@ -2564,7 +2564,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="180" />
@@ -2583,7 +2583,7 @@
 		<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="2018" mpRegen="3.6" />
+			<vitals hp="3094" hpRegen="10.5" mp="2018" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="180" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25000-25099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25000-25099.xml
index 5fce1277fd..866180a4ff 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25000-25099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25000-25099.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="25001" level="23" type="RaidBoss" name="Greyclaw Kutus" title="Raid Boss">
 		<parameters>
@@ -230,8 +230,8 @@
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="ARCHER" clanHelpRange="300" />
 		<collision>
-			<radius normal="24" />
-			<height normal="61.5" />
+			<radius normal="21" />
+			<height normal="39" />
 		</collision>
 	</npc>
 	<npc id="25006" level="29" type="Monster" name="Turek Mercenary Warrior" title="Raid Fighter">
@@ -3336,7 +3336,7 @@
 			<height normal="61" />
 		</collision>
 	</npc>
-	<npc id="25070" level="55" type="RaidBoss" name="Enchanted Valley Lookout Ruell" title="Raid Boss">
+	<npc id="25070" level="55" type="RaidBoss" name="Enchanted Forest Lookout Ruell" title="Raid Boss">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25071" count="1" respawnTime="360" weightPoint="1" /> <!-- Ruell's Wind -->
@@ -4776,7 +4776,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25098" level="35" type="RaidBoss" name="Sejarr's Servant" title="Raid Boss">
+	<npc id="25098" level="35" type="RaidBoss" name="Sejarr's Servitor" title="Raid Boss">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm03_A" />
 			<skill name="SelfBuff_a" id="4173" level="3" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25100-25199.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25100-25199.xml
index bede8009f3..7a17d2ab5d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25100-25199.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25100-25199.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="25100" level="55" type="Monster" name="Spirit of the Sea of Spores" title="Raid Fighter">
 		<parameters>
@@ -1506,8 +1506,8 @@
 			<attack physical="281.115059392479" magical="44.7780251490961" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="387.69285" magical="189.14" evasion="-18" />
 			<speed>
-				<walk ground="50" />
-				<run ground="170" />
+				<walk ground="60" />
+				<run ground="190" />
 			</speed>
 			<hitTime>300</hitTime>
 			<abnormalResist physical="230" magical="230" />
@@ -1531,8 +1531,8 @@
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" clanHelpRange="300" />
 		<collision>
-			<radius normal="22" />
-			<height normal="35" />
+			<radius normal="30" />
+			<height normal="21.25" />
 		</collision>
 		<dropLists>
 			<drop>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25200-25299.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25200-25299.xml
index 3ebb621dbe..f0eb303cc8 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25200-25299.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25200-25299.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="25200" level="71" type="Monster" name="Sheshark's Family" title="Raid Fighter">
 		<parameters>
@@ -2955,7 +2955,7 @@
 		<ai type="BALANCED" />
 		<collision>
 			<radius normal="35" />
-			<height normal="463.765" />
+			<height normal="46.3765" />
 		</collision>
 		<dropLists>
 			<drop>
@@ -3580,7 +3580,7 @@
 		<ai type="BALANCED" />
 		<collision>
 			<radius normal="35" />
-			<height normal="463.765" />
+			<height normal="46.3765" />
 		</collision>
 	</npc>
 	<npc id="25274" level="49" type="Monster" name="Carnabarun" title="Raid Fighter">
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25300-25399.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25300-25399.xml
index 9eb5c530d2..e40285331d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25300-25399.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25300-25399.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="25300" level="79" type="Monster" name="Hekaton's Scout" title="Raid Fighter">
 		<race>HUMANOID</race>
@@ -1688,7 +1688,7 @@
 			<height normal="90" grown="109" />
 		</collision>
 	</npc>
-	<npc id="25339" level="85" type="Monster" name="Halisha's Shadow" title="Ruler of Sepulcher">
+	<npc id="25339" level="85" type="Monster" name="Alectia" title="Halisha's Shadow">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25340" count="1" respawnTime="360" weightPoint="1" />
@@ -1742,7 +1742,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25340" level="80" type="Monster" name="Knight of Shadow">
+	<npc id="25340" level="80" type="Monster" name="Alectia's Knight">
 		<parameters>
 			<skill name="HealMagic_a" id="4788" level="9" />
 			<skill name="SelfRangeBuff_a" id="4212" level="9" />
@@ -1784,7 +1784,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="25341" level="80" type="Monster" name="Knight of Shadow">
+	<npc id="25341" level="80" type="Monster" name="Alectia's Knight">
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -1820,7 +1820,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="25342" level="80" type="Monster" name="Halisha's Shadow" title="Ruler of Sepulcher">
+	<npc id="25342" level="80" type="Monster" name="Tishas" title="Halisha's Shadow">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25343" count="1" respawnTime="360" weightPoint="1" />
@@ -1870,7 +1870,7 @@
 			<height normal="60" />
 		</collision>
 	</npc>
-	<npc id="25343" level="80" type="Monster" name="Knight of Shadow">
+	<npc id="25343" level="80" type="Monster" name="Tishas' Knight">
 		<parameters>
 			<skill name="HealMagic_a" id="4788" level="9" />
 			<skill name="SelfRangeBuff_a" id="4212" level="9" />
@@ -1912,7 +1912,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="25344" level="80" type="Monster" name="Knight of Shadow">
+	<npc id="25344" level="80" type="Monster" name="Tishas' Knight">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -1948,7 +1948,7 @@
 			<height normal="55" />
 		</collision>
 	</npc>
-	<npc id="25345" level="80" type="Monster" name="Knight of Shadow">
+	<npc id="25345" level="80" type="Monster" name="Tishas' Knight">
 		<parameters>
 			<skill name="DDMagic_a" id="4191" level="9" />
 			<skill name="Debuff_a" id="4203" level="9" />
@@ -1990,7 +1990,7 @@
 			<height normal="34" />
 		</collision>
 	</npc>
-	<npc id="25346" level="80" type="Monster" name="Halisha's Shadow" title="Ruler of Sepulcher">
+	<npc id="25346" level="80" type="Monster" name="Mekara" title="Halisha's Shadow">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25347" count="1" respawnTime="360" weightPoint="1" />
@@ -2039,7 +2039,7 @@
 			<height normal="60" />
 		</collision>
 	</npc>
-	<npc id="25347" level="80" type="Monster" name="Knight of Shadow">
+	<npc id="25347" level="80" type="Monster" name="Mekara's Knight">
 		<parameters>
 			<skill name="DDMagic_a" id="4191" level="9" />
 			<skill name="Debuff_a" id="4199" level="9" />
@@ -2081,7 +2081,7 @@
 			<height normal="34" />
 		</collision>
 	</npc>
-	<npc id="25348" level="80" type="Monster" name="Knight of Shadow">
+	<npc id="25348" level="80" type="Monster" name="Mekara's Knight">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4743" level="9" />
 		</parameters>
@@ -2124,7 +2124,7 @@
 			<height normal="40" grown="48" />
 		</collision>
 	</npc>
-	<npc id="25349" level="80" type="Monster" name="Halisha's Shadow" title="Ruler of Sepulcher">
+	<npc id="25349" level="80" type="Monster" name="Morigul" title="Halisha's Shadow">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25350" count="1" respawnTime="360" weightPoint="1" />
@@ -2177,7 +2177,7 @@
 			<height normal="60" />
 		</collision>
 	</npc>
-	<npc id="25350" level="80" type="Monster" name="Knight of Shadow">
+	<npc id="25350" level="80" type="Monster" name="Morigul's Knight">
 		<parameters>
 			<skill name="DDMagic_a" id="4191" level="9" />
 			<skill name="Debuff_a" id="4201" level="9" />
@@ -2219,7 +2219,7 @@
 			<height normal="34" />
 		</collision>
 	</npc>
-	<npc id="25351" level="80" type="Monster" name="Knight of Shadow">
+	<npc id="25351" level="80" type="Monster" name="Morigul's Knight">
 		<parameters>
 			<skill name="HealMagic_a" id="4788" level="9" />
 			<skill name="SelfRangeBuff_a" id="4212" level="9" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25700-25799.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25700-25799.xml
index fa2297bef6..bf2bde3a2b 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25700-25799.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25700-25799.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="25735" level="90" type="RaidBoss" name="Giant Golden Pig" title="Raid Boss">
+	<npc id="25735" level="90" type="RaidBoss" name="Gigantic Golden Pig" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -22,7 +22,7 @@
 			<height normal="120" />
 		</collision>
 	</npc>
-	<npc id="25736" level="90" type="RaidBoss" name="Giant Golden Pig" title="Raid Boss">
+	<npc id="25736" level="90" type="RaidBoss" name="Gigantic Golden Pig" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -44,7 +44,7 @@
 			<height normal="120" />
 		</collision>
 	</npc>
-	<npc id="25737" level="90" type="RaidBoss" name="Giant Golden Pig" title="Raid Boss">
+	<npc id="25737" level="90" type="RaidBoss" name="Gigantic Golden Pig" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -201,7 +201,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="120" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1507" mpRegen="3.6" />
+			<vitals hp="1043476" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="170" />
@@ -221,7 +221,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="206" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1507" mpRegen="3.6" />
+			<vitals hp="1043476" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="170" />
@@ -2719,7 +2719,7 @@
 			<height normal="66" />
 		</collision>
 	</npc>
-	<npc id="25787" level="25" name="Death Knight" title="Raid Soul Drinker" type="RaidBoss">
+	<npc id="25787" level="25" name="Death Knight" title="Raid Soul Drinker">
 		<collision>
 			<radius normal="38" />
 			<height normal="72" />
@@ -2751,7 +2751,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25788" level="35" name="Death Knight" title="Raid Soul Drinker" type="RaidBoss">
+	<npc id="25788" level="35" name="Death Knight" title="Raid Soul Drinker">
 		<collision>
 			<radius normal="38" />
 			<height normal="72" />
@@ -2783,7 +2783,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25789" level="45" name="Death Knight" title="Raid Soul Drinker" type="RaidBoss">
+	<npc id="25789" level="45" name="Death Knight" title="Raid Soul Drinker">
 		<collision>
 			<radius normal="38" />
 			<height normal="72" />
@@ -2815,7 +2815,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25790" level="55" name="Death Knight" title="Raid Soul Drinker" type="RaidBoss">
+	<npc id="25790" level="55" name="Death Knight" title="Raid Soul Drinker">
 		<collision>
 			<radius normal="38" />
 			<height normal="72" />
@@ -2847,7 +2847,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25791" level="65" name="Death Knight" title="Raid Soul Drinker" type="RaidBoss">
+	<npc id="25791" level="65" name="Death Knight" title="Raid Soul Drinker">
 		<collision>
 			<radius normal="38" />
 			<height normal="72" />
@@ -2881,8 +2881,8 @@
 	</npc>
 	<npc id="25792" type="RaidBoss" level="75" name="Death Knight" title="Raid Soul Drinker">
 		<collision>
-			<radius normal="38" />
-			<height normal="72" />
+			<radius normal="23" />
+			<height normal="64" />
 		</collision>
 		<acquire exp="43740000" sp="1312200" raidPoints="0" />
 		<stats str="40" con="43" dex="30" int="21" men="25" wit="20">
@@ -2890,7 +2890,7 @@
 			<attack type="SWORD" critical="40" physical="1662.16594596409" attackSpeed="253" magical="941.257306822256" random="30" range="40" />
 			<defence physical="998.10183" magical="486.92" shield="0" shieldRate="0" />
 			<speed>
-				<walk ground="63" />
+				<walk ground="80" />
 				<run ground="175" />
 			</speed>
 		</stats>
@@ -2950,7 +2950,7 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="21.0" />
+			<radius normal="21" />
 			<height normal="43.5" />
 		</collision>
 		<skillList>
@@ -3018,8 +3018,8 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="24.0" />
-			<height normal="47.0" />
+			<radius normal="24" />
+			<height normal="47" />
 		</collision>
 		<skillList>
 			<skill id="50028" level="3" /> <!-- 66 Lv. Raid Boss -->
@@ -3062,7 +3062,7 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="18.0" />
+			<radius normal="18" />
 			<height normal="47.5" />
 		</collision>
 		<skillList>
@@ -3096,8 +3096,8 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="24.0" />
-			<height normal="45.0" />
+			<radius normal="24" />
+			<height normal="45" />
 		</collision>
 		<skillList>
 			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25800-25899.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25800-25899.xml
index 72513ec3af..5d9bbcece0 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25800-25899.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/25800-25899.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="25800" level="74" type="Monster" name="Kasha" title="Gosmos' Mentor">
 		<!-- Source: www.l2wiki.com -->
@@ -20,8 +20,8 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="24.0" />
-			<height normal="52.0" />
+			<radius normal="24" />
+			<height normal="52" />
 		</collision>
 		<skillList>
 			<skill id="5238" level="1" /> <!-- Freezing -->
@@ -55,7 +55,7 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="30.0" />
+			<radius normal="30" />
 			<height normal="46.5" />
 		</collision>
 		<skillList>
@@ -90,7 +90,7 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="24.0" />
+			<radius normal="24" />
 			<height normal="46.2" />
 		</collision>
 		<skillList>
@@ -158,8 +158,8 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="18.0" />
-			<height normal="37.0" />
+			<radius normal="18" />
+			<height normal="37" />
 		</collision>
 		<skillList>
 			<skill id="14765" level="2" /> <!-- Blood Siphon Resistance -->
@@ -196,8 +196,8 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="21.0" />
-			<height normal="40.0" />
+			<radius normal="21" />
+			<height normal="40" />
 		</collision>
 		<skillList>
 			<skill id="14765" level="2" /> <!-- Blood Siphon Resistance -->
@@ -271,7 +271,7 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="20.0" />
+			<radius normal="20" />
 			<height normal="49.2" />
 		</collision>
 		<skillList>
@@ -310,7 +310,7 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="14.0" />
+			<radius normal="14" />
 			<height normal="28.8" />
 		</collision>
 		<skillList>
@@ -348,7 +348,7 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="18.0" />
+			<radius normal="18" />
 			<height normal="39.6" />
 		</collision>
 		<skillList>
@@ -388,7 +388,7 @@
 		<status attackable="true" canMove="true" />
 		<collision>
 			<radius normal="15.6" />
-			<height normal="39.0" />
+			<height normal="39" />
 		</collision>
 		<skillList>
 			<skill id="50028" level="17" /> <!-- 80 Lv. Raid Boss -->
@@ -425,8 +425,8 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="22.0" />
-			<height normal="51.0" />
+			<radius normal="22" />
+			<height normal="51" />
 		</collision>
 		<skillList>
 			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
@@ -464,7 +464,7 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="11.0" />
+			<radius normal="11" />
 			<height normal="38.5" />
 		</collision>
 		<skillList>
@@ -501,8 +501,8 @@
 		</stats>
 		<status attackable="true" canMove="true" />
 		<collision>
-			<radius normal="25.0" />
-			<height normal="47.0" />
+			<radius normal="25" />
+			<height normal="47" />
 		</collision>
 		<skillList>
 			<skill id="14765" level="4" /> <!-- Blood Siphon Resistance -->
@@ -546,7 +546,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="72" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="37345" mpRegen="3.6" />
+			<vitals hp="51770" hpRegen="10.5" mp="37345" mpRegen="3.6" />
 			<speed>
 				<walk ground="34" />
 				<run ground="170" />
@@ -566,7 +566,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="84" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="39620" mpRegen="3.6" />
+			<vitals hp="59795" hpRegen="10.5" mp="39620" mpRegen="3.6" />
 			<speed>
 				<walk ground="45" />
 				<run ground="170" />
@@ -585,7 +585,7 @@
 		<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="42032" mpRegen="3.6" />
+			<vitals hp="72352" hpRegen="10.5" mp="42032" mpRegen="3.6" />
 			<speed>
 				<walk ground="100" />
 				<run ground="170" />
@@ -605,7 +605,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="75" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="44592" mpRegen="3.6" />
+			<vitals hp="87546" hpRegen="10.5" mp="44592" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="170" />
@@ -625,7 +625,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="195" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="48227" mpRegen="3.6" />
+			<vitals hp="105931" hpRegen="10.5" mp="48227" mpRegen="3.6" />
 			<speed>
 				<walk ground="29" />
 				<run ground="170" />
@@ -645,7 +645,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="286" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="53170" mpRegen="3.6" />
+			<vitals hp="128176" hpRegen="10.5" mp="53170" mpRegen="3.6" />
 			<speed>
 				<walk ground="45" />
 				<run ground="170" />
@@ -664,7 +664,7 @@
 		<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="58620" mpRegen="3.6" />
+			<vitals hp="155093" hpRegen="10.5" mp="58620" mpRegen="3.6" />
 			<speed>
 				<walk ground="15" />
 				<run ground="170" />
@@ -684,7 +684,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="2503" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="64628" mpRegen="3.6" />
+			<vitals hp="187663" hpRegen="10.5" mp="64628" mpRegen="3.6" />
 			<speed>
 				<walk ground="70" />
 				<run ground="170" />
@@ -704,7 +704,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5793" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="71253" mpRegen="3.6" />
+			<vitals hp="227072" hpRegen="10.5" mp="71253" mpRegen="3.6" />
 			<speed>
 				<walk ground="36" />
 				<run ground="170" />
@@ -724,7 +724,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="287" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="71253" mpRegen="3.6" />
+			<vitals hp="227072" hpRegen="10.5" mp="71253" mpRegen="3.6" />
 			<speed>
 				<walk ground="45" />
 				<run ground="170" />
@@ -743,7 +743,7 @@
 		<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="71253" mpRegen="3.6" />
+			<vitals hp="227072" hpRegen="10.5" mp="71253" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="170" />
@@ -763,7 +763,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="210" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="71253" mpRegen="3.6" />
+			<vitals hp="227072" hpRegen="10.5" mp="71253" mpRegen="3.6" />
 			<speed>
 				<walk ground="70" />
 				<run ground="170" />
@@ -782,7 +782,7 @@
 		<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="71253" mpRegen="3.6" />
+			<vitals hp="227072" hpRegen="10.5" mp="71253" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="170" />
@@ -802,7 +802,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="175" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="71253" mpRegen="3.6" />
+			<vitals hp="227072" hpRegen="10.5" mp="71253" mpRegen="3.6" />
 			<speed>
 				<walk ground="36" />
 				<run ground="170" />
@@ -822,7 +822,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="1472" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="71253" mpRegen="3.6" />
+			<vitals hp="227072" hpRegen="10.5" mp="71253" mpRegen="3.6" />
 			<speed>
 				<walk ground="100" />
 				<run ground="170" />
@@ -842,7 +842,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="202" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="71253" mpRegen="3.6" />
+			<vitals hp="227072" hpRegen="10.5" mp="71253" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="170" />
@@ -862,7 +862,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="5794" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="71253" mpRegen="3.6" />
+			<vitals hp="227072" hpRegen="10.5" mp="71253" mpRegen="3.6" />
 			<speed>
 				<walk ground="36" />
 				<run ground="170" />
@@ -882,7 +882,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="171" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="71253" mpRegen="3.6" />
+			<vitals hp="227072" hpRegen="10.5" mp="71253" mpRegen="3.6" />
 			<speed>
 				<walk ground="33" />
 				<run ground="170" />
@@ -902,7 +902,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="3939" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="71253" mpRegen="3.6" />
+			<vitals hp="227072" hpRegen="10.5" mp="71253" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="170" />
@@ -916,7 +916,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="25834" level="81" type="RaidBoss" name="Shadai" title="Chief">
+	<npc id="25834" level="81" type="RaidBoss" name="Shadai" title="Captain">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="8679" />
@@ -972,7 +972,7 @@
 			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 		</skillList>
 	</npc>
-	<npc id="25836" level="83" type="RaidBoss" name="Tier" title="Fallen Angel">
+	<npc id="25836" level="83" type="RaidBoss" name="Tiela" title="Fallen Angel">
 		<race>DIVINE</race>
 		<sex>MALE</sex>
 		<equipment rhand="8683" />
@@ -1000,7 +1000,7 @@
 			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 		</skillList>
 	</npc>
-	<npc id="25837" level="84" type="RaidBoss" name="Cherkya" title="Demon Apostle">
+	<npc id="25837" level="84" type="RaidBoss" name="Cherkia" title="Apostle's Demon">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -1027,7 +1027,7 @@
 			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 		</skillList>
 	</npc>
-	<npc id="25838" level="85" type="RaidBoss" name="Spicula" title="Procella's Nemesis">
+	<npc id="25838" level="85" type="RaidBoss" name="Spicula" title="Procella's Archenemy">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -1054,13 +1054,13 @@
 			<skill id="4413" level="14" /> <!-- Strong M. Def. -->
 		</skillList>
 	</npc>
-	<npc id="25839" level="80" type="Folk" name="Shadai's Priest" title="Raid Fighter">
+	<npc id="25839" level="80" type="Folk" name="Shadai's Chief Priest" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="5794" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="102528" mpRegen="3.6" />
+			<vitals hp="249779" hpRegen="10.5" mp="102528" mpRegen="3.6" />
 			<speed>
 				<walk ground="36" />
 				<run ground="170" />
@@ -1074,13 +1074,13 @@
 			<height normal="39.5" />
 		</collision>
 	</npc>
-	<npc id="25840" level="80" type="Folk" name="Turabait's Warrior" title="Raid Fighter">
+	<npc id="25840" level="80" type="Folk" name="Turabait Warrior" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="8678" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="104580" mpRegen="3.6" />
+			<vitals hp="274757" hpRegen="10.5" mp="104580" mpRegen="3.6" />
 			<speed>
 				<walk ground="33" />
 				<run ground="170" />
@@ -1094,13 +1094,13 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="25841" level="80" type="Folk" name="Tier's Follower" title="Raid Fighter">
+	<npc id="25841" level="80" type="Folk" name="Tiela's Believer" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="8680" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="106644" mpRegen="3.6" />
+			<vitals hp="302233" hpRegen="10.5" mp="106644" mpRegen="3.6" />
 			<speed>
 				<walk ground="61" />
 				<run ground="170" />
@@ -1114,12 +1114,12 @@
 			<height normal="23.4" />
 		</collision>
 	</npc>
-	<npc id="25842" level="80" type="Folk" name="Cherkya's Escort" title="Raid Fighter">
+	<npc id="25842" level="80" type="Folk" name="Cherkia's Escort" title="Raid Fighter">
 		<!-- 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="108720" mpRegen="3.6" />
+			<vitals hp="332457" hpRegen="10.5" mp="108720" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="170" />
@@ -1138,7 +1138,7 @@
 		<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="110808" mpRegen="3.6" />
+			<vitals hp="365702" hpRegen="10.5" mp="110808" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="170" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/27100-27199.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/27100-27199.xml
index 3bb06e70e2..2fcc1260ff 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/27100-27199.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/27100-27199.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="27100" level="39" type="Monster" name="Skeleton Mercenary" title="Quest Monster">
 		<parameters>
@@ -105,7 +105,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="27103" level="38" type="Monster" name="Unicorn" title="Quest Monster">
+	<npc id="27103" level="38" type="Monster" name="Racer the Unicorn" title="Quest Monster">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -118,7 +118,7 @@
 			<attack physical="166.06476" magical="113.4007" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="152.46752" magical="111.56912" />
 			<speed>
-				<walk ground="80" />
+				<walk ground="27" />
 				<run ground="140" />
 			</speed>
 			<hitTime>540</hitTime>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/27300-27399.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/27300-27399.xml
index f91021eb46..309ea2bbd7 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/27300-27399.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/27300-27399.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="27300" level="76" type="Monster" name="Stone Watchman Ezekiel" title="Quest Monster">
 		<parameters>
@@ -907,7 +907,7 @@
 		<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="463" mpRegen="3.6" />
+			<vitals hp="976" hpRegen="10.5" mp="463" mpRegen="3.6" />
 			<speed>
 				<walk ground="35" />
 				<run ground="174" />
@@ -926,7 +926,7 @@
 		<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="463" mpRegen="3.6" />
+			<vitals hp="976" hpRegen="10.5" mp="463" mpRegen="3.6" />
 			<speed>
 				<walk ground="35" />
 				<run ground="174" />
@@ -945,7 +945,7 @@
 		<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="463" mpRegen="3.6" />
+			<vitals hp="976" hpRegen="10.5" mp="463" mpRegen="3.6" />
 			<speed>
 				<walk ground="35" />
 				<run ground="174" />
@@ -964,7 +964,7 @@
 		<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="463" mpRegen="3.6" />
+			<vitals hp="976" hpRegen="10.5" mp="463" mpRegen="3.6" />
 			<speed>
 				<walk ground="35" />
 				<run ground="174" />
@@ -983,7 +983,7 @@
 		<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="343" mpRegen="3.6" />
+			<vitals hp="670" hpRegen="10.5" mp="343" mpRegen="3.6" />
 			<speed>
 				<walk ground="15" />
 				<run ground="120" />
@@ -1002,7 +1002,7 @@
 		<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="358" mpRegen="3.6" />
+			<vitals hp="705" hpRegen="10.5" mp="358" mpRegen="3.6" />
 			<speed>
 				<walk ground="15" />
 				<run ground="15" />
@@ -1021,7 +1021,7 @@
 		<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="372" mpRegen="3.6" />
+			<vitals hp="740" hpRegen="10.5" mp="372" mpRegen="3.6" />
 			<speed>
 				<walk ground="23" />
 				<run ground="23" />
@@ -1040,7 +1040,7 @@
 		<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="387" mpRegen="3.6" />
+			<vitals hp="777" hpRegen="10.5" mp="387" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="80" />
@@ -1054,12 +1054,12 @@
 			<height normal="33.5" />
 		</collision>
 	</npc>
-	<npc id="27330" level="80" type="Folk" name="Iron Wild Boar" title="Quest Monster">
+	<npc id="27330" level="80" type="Folk" name="Steel Wild Boar" title="Quest 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="8446" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<vitals hp="3646" hpRegen="10.5" mp="2512" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="170" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/29000-29099.xml
index 8d2e83d9f1..18c9c3fe43 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/29000-29099.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="29001" level="40" type="GrandBoss" name="Queen Ant">
 		<parameters>
@@ -1477,8 +1477,8 @@
 		<exCrtEffect>true</exCrtEffect>
 		<ai type="BALANCED" aggroRange="1000" clanHelpRange="300" isAggressive="true" />
 		<collision>
-			<radius normal="19.2" />
-			<height normal="39" />
+			<radius normal="32" />
+			<height normal="67" />
 		</collision>
 		<dropLists>
 			<drop>
@@ -1559,7 +1559,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29023" level="74" type="Monster" name="Maiden Doll">
+	<npc id="29023" level="74" type="Monster" name="Doll Blader">
 		<parameters>
 			<param name="MoveAroundSocial" value="50" />
 			<param name="MoveAroundSocial1" value="50" />
@@ -1804,7 +1804,7 @@
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
-			<vitals hp="643059.482835" hpRegen="319.2293199" mp="38410.582" mpRegen="3" />
+			<vitals hp="428076" hpRegen="319.2293199" mp="23423" mpRegen="3" />
 			<attack physical="2641.63342970569" magical="971.856593649426" random="5" critical="4" accuracy="5" attackSpeed="253" type="FIST" range="40" distance="80" width="120" />
 			<defence physical="4218.55484265502" magical="3093.6078479881" />
 			<attribute>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/29100-29199.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/29100-29199.xml
index 84e9f96d95..5ebcedd176 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/29100-29199.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/29100-29199.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="29100" level="80" type="Monster" name="Archangel">
 		<race>DIVINE</race>
@@ -106,7 +106,7 @@
 			<skill id="4416" level="10" /> <!-- Dragons -->
 		</skillList>
 	</npc>
-	<npc id="29105" level="82" type="RaidBoss" name="King Ignis" title="Flame Spirit King">
+	<npc id="29105" level="82" type="RaidBoss" name="King Ignis">
 		<race>ELEMENTAL</race>
 		<sex>MALE</sex>
 		<acquire exp="806880000" sp="21785760" />
@@ -402,7 +402,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29108" level="82" type="RaidBoss" name="King Petram" title="Earth Spirit King">
+	<npc id="29108" level="82" type="RaidBoss" name="King Petram">
 		<race>ELEMENTAL</race>
 		<sex>MALE</sex>
 		<acquire exp="806880000" sp="21785760" />
@@ -534,8 +534,8 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="0.001" />
-			<height normal="0.001" />
+			<radius normal="01" />
+			<height normal="01" />
 		</collision>
 	</npc>
 	<npc id="29111" level="80" type="Monster" name="Water Slime">
@@ -620,7 +620,7 @@
 			<height normal="133" />
 		</collision>
 	</npc>
-	<npc id="29115" level="80" type="Monster" name="Procella's Storm">
+	<npc id="29115" level="80" type="Monster" name="Procella's Gust">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -639,7 +639,7 @@
 			<height normal="100" />
 		</collision>
 	</npc>
-	<npc id="29116" level="80" type="Monster" name="Petram Piece">
+	<npc id="29116" level="80" type="Monster" name="Petram's Fragment">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -658,7 +658,7 @@
 			<height normal="61" />
 		</collision>
 	</npc>
-	<npc id="29117" level="80" type="Monster" name="Petram Fragment">
+	<npc id="29117" level="80" type="Monster" name="Petram's Piece">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -682,7 +682,7 @@
 		<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="18000" mpRegen="3.6" />
+			<vitals hp="355555" hpRegen="10.5" mp="18000" mpRegen="3.6" />
 			<speed>
 				<walk ground="45" />
 				<run ground="190" />
@@ -717,6 +717,272 @@
 			<skill id="4416" level="1" /> <!-- Undead -->
 		</skillList>
 	</npc>
+	<npc id="29120" level="85" type="Folk" name="King Ignis" title="Fire Spirit King">
+		<!-- 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="300000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="190" />
+			</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="102" />
+		</collision>
+	</npc>
+	<npc id="29121" level="85" type="Folk" name="Queen Nebula" title="Water Spirit Queen">
+		<!-- 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="300000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="190" />
+			</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="42" />
+			<height normal="88.5" />
+		</collision>
+	</npc>
+	<npc id="29122" level="85" type="Folk" name="King Procella" title="Wind Spirit King">
+		<!-- 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="300000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="190" />
+			</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="133" />
+		</collision>
+	</npc>
+	<npc id="29123" level="85" type="Folk" name="King Petram" title="Earth Spirit King">
+		<!-- 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="300000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="190" />
+			</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="80" />
+			<height normal="125" />
+		</collision>
+	</npc>
+	<npc id="29124" level="85" type="Folk" name="Freya" title="Ice Queen">
+		<!-- 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="12680" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="54" />
+				<run ground="190" />
+			</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="55" />
+		</collision>
+	</npc>
+	<npc id="29125" level="85" type="Folk" name="Safe Zone">
+		<!-- 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="12680640" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="190" />
+			</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="01" />
+			<height normal="01" />
+		</collision>
+	</npc>
+	<npc id="29126" level="85" type="Folk" name="Water Slime">
+		<!-- 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="50000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="36" />
+				<run ground="36" />
+			</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" />
+			<height normal="39" />
+		</collision>
+	</npc>
+	<npc id="29127" level="85" type="Folk" name="Procella'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="2962962" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="190" />
+			</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="133" />
+		</collision>
+	</npc>
+	<npc id="29128" level="85" type="Folk" name="Procella'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="2962962" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="190" />
+			</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="133" />
+		</collision>
+	</npc>
+	<npc id="29129" level="85" type="Folk" name="Procella'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="2962962" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="190" />
+			</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="133" />
+		</collision>
+	</npc>
+	<npc id="29130" level="85" type="Folk" name="Procella's Gust">
+		<!-- 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="2962962" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="50" />
+			</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="50" />
+			<height normal="100" />
+		</collision>
+	</npc>
+	<npc id="29131" level="85" type="Folk" name="Petram's Fragment">
+		<!-- 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="355555" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="190" />
+			</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="61" />
+		</collision>
+	</npc>
+	<npc id="29132" level="85" type="Folk" name="Petram's Piece">
+		<!-- 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="355555" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="190" />
+			</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="61" />
+		</collision>
+	</npc>
+	<npc id="29133" level="85" type="Folk" name="Spirit Sovereignty's Magic">
+		<!-- 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="355555" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<run ground="190" />
+			</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="27.5" />
+		</collision>
+	</npc>
 	<npc id="29190" level="84" type="Monster" name="Tarask Dragon">
 		<!-- Todo: CT2.5 -->
 		<parameters>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30000-30099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30000-30099.xml
index 5227a87909..cb0e9b4fbb 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30000-30099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30000-30099.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="30001" level="70" type="Merchant" name="Lector" title="Weapon Merchant">
 		<parameters>
@@ -260,7 +260,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="30009" level="70" type="Folk" name="Newbie Helper">
+	<npc id="30009" level="70" type="Folk" name="Newbie Helper" title="Tutorial">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="130" />
@@ -383,7 +383,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="30012" level="70" type="Fisherman" name="Fishing Guildsman">
+	<npc id="30012" level="70" type="Fisherman" name="Fishing Guild Member">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -424,7 +424,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="30013" level="85" type="Folk" name="Pierre" title="Fishing Specialist">
+	<npc id="30013" level="85" type="Folk" name="Pierre" title="Fishing Manager">
 		<race>HUMAN</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -498,7 +498,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="30016" level="85" type="Folk" name="Baikal" title="Researcher of Waters">
+	<npc id="30016" level="85" type="Folk" name="Baikal" title="Water Pollution Researcher">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -554,7 +554,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="30018" level="85" type="Folk" name="Misfety" title="Ingenious Master">
+	<npc id="30018" level="85" type="Folk" name="Miss Patch" title="Master of Exclusives">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -573,7 +573,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="30019" level="70" type="Folk" name="Newbie Helper">
+	<npc id="30019" level="70" type="Folk" name="Newbie Helper" title="Tutorial">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="90" />
@@ -610,7 +610,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="30020" level="85" type="Merchant" name="Baggins" title="Blacksmith">
+	<npc id="30020" level="85" type="Merchant" name="Beginns" title="Blacksmith">
 		<race>DWARF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -628,7 +628,7 @@
 			<height normal="16.5" />
 		</collision>
 	</npc>
-	<npc id="30021" level="85" type="Folk" name="Baggins Deko">
+	<npc id="30021" level="85" type="Folk" name="Beginns Deco">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30100-30199.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30100-30199.xml
index 7d5bec6b1d..c0aac21487 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30100-30199.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30100-30199.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="30103" level="70" type="Warehouse" name="Valkon" title="Warehouse Keeper">
 		<parameters>
@@ -1027,7 +1027,7 @@
 			<height normal="22.3" />
 		</collision>
 	</npc>
-	<npc id="30131" level="70" type="Folk" name="Newbie Helper">
+	<npc id="30131" level="70" type="Folk" name="Newbie Helper" title="Tutorial">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="106" />
@@ -1399,7 +1399,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="30141" level="70" type="Folk" name="Talos" title="Hierarch">
+	<npc id="30141" level="70" type="Folk" name="Talos" title="Tetrach">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="180" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30200-30299.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30200-30299.xml
index f471b111c1..000bfbdcac 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30200-30299.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30200-30299.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="30200" level="80" type="Guard" name="Stan" title="Guard">
 		<parameters>
@@ -83,7 +83,7 @@
 		<race>DWARF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="10.5" mp="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="160" />
@@ -102,7 +102,7 @@
 		<race>ETC</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="10.5" mp="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="160" />
@@ -121,7 +121,7 @@
 		<race>ETC</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -966,7 +966,7 @@
 			<height normal="16.5" />
 		</collision>
 	</npc>
-	<npc id="30284" level="80" type="Guard" name="Alberius" title="Sentry Knight">
+	<npc id="30284" level="80" type="Guard" name="Alberius" title="Sentinel Knight">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="79" />
@@ -1044,7 +1044,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="30288" level="70" type="VillageMasterFighter" name="Rains" title="Grand Master">
+	<npc id="30288" level="70" type="VillageMasterFighter" name="Reins" title="Grand Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="63" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30300-30399.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30300-30399.xml
index a0d9d554cc..45ffead0b9 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30300-30399.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30300-30399.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="30300" level="70" type="Merchant" name="Pushkin" title="Blacksmith">
 		<parameters>
@@ -1175,7 +1175,7 @@
 			<height normal="21.2" />
 		</collision>
 	</npc>
-	<npc id="30346" level="80" type="Guard" name="Kayleen" title="Sentinel">
+	<npc id="30346" level="80" type="Guard" name="Kayleen" title="Sentry">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1214,7 +1214,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30347" level="80" type="Guard" name="Marion" title="Sentinel">
+	<npc id="30347" level="80" type="Guard" name="Marion" title="Sentry">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1253,7 +1253,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30348" level="80" type="Guard" name="Nelsya" title="Sentinel">
+	<npc id="30348" level="80" type="Guard" name="Nelsya" title="Sentry">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1292,7 +1292,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30349" level="80" type="Guard" name="Jenna" title="Sentinel">
+	<npc id="30349" level="80" type="Guard" name="Jenna" title="Sentry">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1516,7 +1516,7 @@
 			<height normal="21.5" />
 		</collision>
 	</npc>
-	<npc id="30355" level="80" type="Guard" name="Roselyn" title="Sentinel">
+	<npc id="30355" level="80" type="Guard" name="Roselyn" title="Sentry">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1555,7 +1555,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30356" level="80" type="Guard" name="Altima" title="Sentinel">
+	<npc id="30356" level="80" type="Guard" name="Altima" title="Sentry">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1594,7 +1594,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30357" level="80" type="Guard" name="Kristin" title="Sentinel">
+	<npc id="30357" level="80" type="Guard" name="Kristin" title="Sentry">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1929,7 +1929,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="30370" level="70" type="Folk" name="Nerupa">
+	<npc id="30370" level="70" type="Folk" name="Nerupa" title="Guardian of Water">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30400-30499.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30400-30499.xml
index bb3d534a3d..6472c25053 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30400-30499.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30400-30499.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="30400" level="70" type="Folk" name="Newbie Helper">
+	<npc id="30400" level="70" type="Folk" name="Newbie Helper" title="Tutorial">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="79" />
@@ -82,7 +82,7 @@
 		<race>ELF</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="2444" hpRegen="7.5" mp="1345" mpRegen="2.7" />
+			<vitals hp="2578" hpRegen="7.5" mp="1345" mpRegen="2.7" />
 			<attack physical="688.86373" magical="470.40463" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="295.91597" magical="216.53847" />
 			<speed>
@@ -1198,7 +1198,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="30432" level="80" type="Guard" name="Irene" title="Sentinel">
+	<npc id="30432" level="80" type="Guard" name="Irene" title="Sentry">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1237,7 +1237,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30433" level="80" type="Guard" name="Kathaway" title="Sentinel">
+	<npc id="30433" level="80" type="Guard" name="Kathaway" title="Sentry">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30500-30599.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30500-30599.xml
index 5ca5e5f21e..ad4c4bda08 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30500-30599.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30500-30599.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="30500" level="70" type="VillageMasterOrc" name="Osborn" title="High Prefect">
 		<parameters>
@@ -1114,7 +1114,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="30530" level="70" type="Folk" name="Newbie Helper">
+	<npc id="30530" level="70" type="Folk" name="Newbie Helper" title="Tutorial">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="60" />
@@ -1151,7 +1151,7 @@
 			<height normal="18.5" />
 		</collision>
 	</npc>
-	<npc id="30531" level="70" type="Folk" name="Lockirin" title="Steel Door's">
+	<npc id="30531" level="70" type="Folk" name="Lockirin" title="Iron Gate's">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="93" />
@@ -1188,7 +1188,7 @@
 			<height normal="17.5" />
 		</collision>
 	</npc>
-	<npc id="30532" level="70" type="Folk" name="Spiron" title="Elder">
+	<npc id="30532" level="70" type="Folk" name="Spiron" title="Golden Wheel's">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="180" />
@@ -1225,7 +1225,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="30533" level="70" type="Folk" name="Balanki" title="Elder">
+	<npc id="30533" level="70" type="Folk" name="Balanki" title="Silver Scale's">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="140" />
@@ -1262,7 +1262,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="30534" level="70" type="Folk" name="Keef" title="Elder">
+	<npc id="30534" level="70" type="Folk" name="Keef" title="Bronze Key's">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="130" />
@@ -1299,7 +1299,7 @@
 			<height normal="18.4" />
 		</collision>
 	</npc>
-	<npc id="30535" level="70" type="Folk" name="Filaur" title="Elder">
+	<npc id="30535" level="70" type="Folk" name="Filaur" title="Gray Pillar's">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="132" />
@@ -1336,7 +1336,7 @@
 			<height normal="19.7" />
 		</collision>
 	</npc>
-	<npc id="30536" level="70" type="Folk" name="Arin" title="Elder">
+	<npc id="30536" level="70" type="Folk" name="Arin" title="Black Anvil's">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="85" />
@@ -1410,7 +1410,7 @@
 			<height normal="19.5" />
 		</collision>
 	</npc>
-	<npc id="30538" level="70" type="Folk" name="Zimenf" title="Head Priest of the Earth">
+	<npc id="30538" level="70" type="Folk" name="Zimenf" title="Priest of the Earth">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="150" />
@@ -1563,7 +1563,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="30542" level="80" type="Guard" name="Runant" title="Protector">
+	<npc id="30542" level="80" type="Guard" name="Runant" title="Defender">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="144" />
@@ -1602,7 +1602,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="30543" level="80" type="Guard" name="Ethan" title="Protector">
+	<npc id="30543" level="80" type="Guard" name="Ethan" title="Defender">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="144" />
@@ -1641,7 +1641,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="30544" level="80" type="Guard" name="Cromwell" title="Protector">
+	<npc id="30544" level="80" type="Guard" name="Cromwell" title="Defender">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="144" />
@@ -1680,7 +1680,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="30545" level="80" type="Guard" name="Proton" title="Protector">
+	<npc id="30545" level="80" type="Guard" name="Proton" title="Defender">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="144" />
@@ -1719,7 +1719,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="30546" level="80" type="Guard" name="Dinkey" title="Protector">
+	<npc id="30546" level="80" type="Guard" name="Dinkey" title="Defender">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="144" />
@@ -1758,7 +1758,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="30547" level="80" type="Guard" name="Tardyon" title="Protector">
+	<npc id="30547" level="80" type="Guard" name="Tardyon" title="Defender">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="144" />
@@ -1797,7 +1797,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="30548" level="80" type="Guard" name="Nathan" title="Protector">
+	<npc id="30548" level="80" type="Guard" name="Nathan" title="Defender">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="144" />
@@ -2764,7 +2764,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="30575" level="70" type="Folk" name="Newbie Helper">
+	<npc id="30575" level="70" type="Folk" name="Newbie Helper" title="Tutorial">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30600-30699.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30600-30699.xml
index f2245693fc..e85fa8713d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30600-30699.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30600-30699.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="30600" level="70" type="Folk" name="Newbie Guide">
 		<parameters>
@@ -1689,7 +1689,7 @@
 			<height normal="103" />
 		</collision>
 	</npc>
-	<npc id="30650" level="70" type="Folk" name="Gerald" title="Head Priest of the Earth">
+	<npc id="30650" level="70" type="Folk" name="Gerald" title="Priest of the Earth">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="150" />
@@ -2285,7 +2285,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="30666" level="70" type="Folk" name="Sla" title="Prophet">
+	<npc id="30666" level="70" type="Folk" name="Sla" title="Preacher">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="133" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30700-30799.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30700-30799.xml
index ef3d502d40..411731bf1f 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30700-30799.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30700-30799.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="30700" level="70" type="Folk" name="Prestan" title="Master">
 		<parameters>
@@ -113,7 +113,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="30703" level="70" type="Folk" name="Colleen" title="Hunter Guild Member">
+	<npc id="30703" level="70" type="Folk" name="Colin" title="Hunter Guild Member">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -768,7 +768,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="206" /> <!-- Demon's Staff -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="2444" hpRegen="7.5" mp="1345" mpRegen="2.7" />
+			<vitals hp="2578" hpRegen="7.5" mp="1345" mpRegen="2.7" />
 			<attack physical="688.86373" magical="470.40463" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="295.91597" magical="216.53847" />
 			<speed>
@@ -2161,7 +2161,7 @@
 		<race>HUMAN</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="2444" hpRegen="7.5" mp="1345" mpRegen="2.7" />
+			<vitals hp="2578" hpRegen="7.5" mp="1345" mpRegen="2.7" />
 			<attack physical="688.86373" magical="470.40463" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="295.91597" magical="216.53847" />
 			<speed>
@@ -2228,7 +2228,7 @@
 			<height normal="98" />
 		</collision>
 	</npc>
-	<npc id="30758" level="70" type="Folk" name="Ritasha" title="Witch">
+	<npc id="30758" level="70" type="Folk" name="Ritasha" title="Sorceress">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30800-30899.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30800-30899.xml
index 8e97c2ac07..9017e82c2e 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30800-30899.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30800-30899.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="30827" level="70" type="PetManager" name="Lundy" title="Pet Manager">
 		<parameters>
@@ -351,7 +351,7 @@
 		<race>HUMAN</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="2444" hpRegen="7.5" mp="1345" mpRegen="2.7" />
+			<vitals hp="2578" hpRegen="7.5" mp="1345" mpRegen="2.7" />
 			<attack physical="688.86373" magical="470.40463" random="30" critical="4" accuracy="4.75" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="295.91597" magical="216.53847" />
 			<speed>
@@ -642,7 +642,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="30840" level="70" type="Merchant" name="Lorenzo" title="Magic Books Trader">
+	<npc id="30840" level="70" type="Merchant" name="Lorenzo" title="Spellbook Trader">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1805,7 +1805,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="30870" level="80" type="Folk" name="Curtis" title="Captain">
+	<npc id="30870" level="80" type="Folk" name="Kurtiz" title="Captain">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="92" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30900-30999.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30900-30999.xml
index 464e18e1ed..fcbe6b72fa 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30900-30999.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/30900-30999.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="30900" level="70" type="VillageMasterFighter" name="Marcus" title="Grand Master">
 		<parameters>
@@ -959,7 +959,7 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="30925" level="70" type="Folk" name="Morelyn" title="High Priestess">
+	<npc id="30925" level="70" type="Folk" name="Morelyn" title="Eva's High Priestess">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -996,7 +996,7 @@
 			<height normal="21.2" />
 		</collision>
 	</npc>
-	<npc id="30926" level="70" type="Folk" name="Restina" title="Priestess">
+	<npc id="30926" level="70" type="Folk" name="Restina" title="Eva's Priestess">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -1033,7 +1033,7 @@
 			<height normal="21.2" />
 		</collision>
 	</npc>
-	<npc id="30927" level="70" type="Folk" name="Alicia" title="Priestess">
+	<npc id="30927" level="70" type="Folk" name="Alicia" title="Eva's Priestess">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1442,7 +1442,7 @@
 			<height normal="17.5" />
 		</collision>
 	</npc>
-	<npc id="30938" level="70" type="Folk" name="Vanutu" title="Priest">
+	<npc id="30938" level="70" type="Folk" name="Vanutu" title="Seer">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -1476,7 +1476,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="30939" level="70" type="Folk" name="Jones" title="Moon Knight">
+	<npc id="30939" level="70" type="Folk" name="Johnson" title="Moonlight Knight">
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
 			<param name="MoveAroundSocial1" value="80" />
@@ -1553,7 +1553,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="30941" level="70" type="Folk" name="Gudz" title="Ol Mahum Hierarch">
+	<npc id="30941" level="70" type="Folk" name="Gudz" title="Ol Mahum Elder">
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
 			<param name="MoveAroundSocial1" value="30" />
@@ -1964,7 +1964,7 @@
 			<height normal="19.7" />
 		</collision>
 	</npc>
-	<npc id="30952" level="70" type="Folk" name="Dimensional Vortex">
+	<npc id="30952" level="70" type="Folk" name="Dimensional Vortex 1">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -2343,7 +2343,7 @@
 			<height normal="9.5" />
 		</collision>
 	</npc>
-	<npc id="30962" level="70" type="Folk" name="Chest Caught with an Icy Air Bait">
+	<npc id="30962" level="70" type="Folk" name="Statue of Water">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -2381,7 +2381,7 @@
 			<height normal="9.5" />
 		</collision>
 	</npc>
-	<npc id="30963" level="70" type="Folk" name="Chest Caught with a Bait of Flame">
+	<npc id="30963" level="70" type="Folk" name="Statue of Fire">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -2419,7 +2419,7 @@
 			<height normal="9.5" />
 		</collision>
 	</npc>
-	<npc id="30964" level="70" type="Folk" name="Chest Caught with a Wind Bait">
+	<npc id="30964" level="70" type="Folk" name="Statue of Wind">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -2457,7 +2457,7 @@
 			<height normal="9.5" />
 		</collision>
 	</npc>
-	<npc id="30965" level="70" type="Folk" name="Chest Caught with an Earth Bait">
+	<npc id="30965" level="70" type="Folk" name="Statue of Earth">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -2645,7 +2645,7 @@
 			<height normal="20.5" />
 		</collision>
 	</npc>
-	<npc id="30970" level="70" type="Folk" name="Dorothy" title="Blacksmith">
+	<npc id="30970" level="70" type="Folk" name="Dorothy" title="Locksmith">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="90" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31000-31099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31000-31099.xml
index bb15a86421..9f4aae9da1 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31000-31099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31000-31099.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="31001" level="70" type="Folk" name="Claudia Athebaldt">
 		<parameters>
@@ -1197,7 +1197,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="31035" level="80" type="Guard" name="Protector">
+	<npc id="31035" level="80" type="Guard" name="Defender">
 		<parameters>
 			<param name="NoFnHi" value="1" />
 			<param name="MoveAroundSocial" value="0" />
@@ -1832,7 +1832,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="7.5" mp="1345" mpRegen="2.7" />
+			<vitals hp="2578" hpRegen="7.5" mp="1345" mpRegen="2.7" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -1849,7 +1849,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="7.5" mp="1345" mpRegen="2.7" />
+			<vitals hp="2578" hpRegen="7.5" mp="1345" mpRegen="2.7" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -1866,7 +1866,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -1885,7 +1885,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -1904,7 +1904,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -1923,7 +1923,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -1942,7 +1942,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -1961,7 +1961,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -1980,7 +1980,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -1999,7 +1999,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -2018,7 +2018,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -2037,7 +2037,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -2056,7 +2056,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -2075,7 +2075,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -2094,7 +2094,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31200-31299.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31200-31299.xml
index 071aab6b0b..8fb52807fc 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31200-31299.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31200-31299.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="31210" level="70" type="Folk" name="Race Track Gatekeeper" title="Monster Race Track">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -174,7 +174,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -193,7 +193,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -212,7 +212,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="62" />
 				<run ground="120" />
@@ -231,7 +231,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -250,7 +250,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -269,7 +269,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -283,12 +283,12 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="31262" level="80" type="Folk" name="Rupert" title="Merchant">
+	<npc id="31262" level="80" type="Folk" name="Rupert" title="Trader">
 		<!-- 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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="64" />
 				<run ground="120" />
@@ -307,7 +307,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -326,7 +326,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -340,12 +340,12 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="31267" level="80" type="Warehouse" name="Lietta" title="Warehouse Keeper">
+	<npc id="31267" level="80" type="Warehouse" name="Lietta" title="Warehouse Manager">
 		<!-- 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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -359,12 +359,12 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="31268" level="80" type="Warehouse" name="Hakon" title="Warehouse Keeper">
+	<npc id="31268" level="80" type="Warehouse" name="Hakon" title="Warehouse Manager">
 		<!-- 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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -397,12 +397,12 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="31270" level="80" type="Warehouse" name="Stefano" title="Warehouse Keeper">
+	<npc id="31270" level="80" type="Warehouse" name="Stefano" title="Warehouse Manager">
 		<!-- 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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -422,7 +422,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="87" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="20" />
 				<run ground="120" />
@@ -460,7 +460,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -480,7 +480,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="89" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -499,7 +499,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -577,7 +577,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="130" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -616,7 +616,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -675,7 +675,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="40" />
 				<run ground="120" />
@@ -695,7 +695,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="6579" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -714,7 +714,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -753,7 +753,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="143" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -773,7 +773,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="204" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -812,7 +812,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="161" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -832,7 +832,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="202" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -851,7 +851,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -865,7 +865,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="31292" level="80" type="Guard" name="Andrei" title="Captain">
+	<npc id="31292" level="80" type="Guard" name="Andrei" title="Guard Captain">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31400-31499.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31400-31499.xml
index 1694706064..9b04f3e919 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31400-31499.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31400-31499.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="31445" level="70" type="Merchant" name="Shutner" title="Mineral Trader">
 		<parameters>
@@ -42,7 +42,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -53,7 +53,7 @@
 		<status attackable="false" />
 		<collision>
 			<radius normal="8" />
-			<height normal="22.5" />
+			<height normal="24.5" />
 		</collision>
 	</npc>
 	<npc id="31453" level="80" type="Folk" name="Nameless Spirit">
@@ -61,7 +61,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -75,12 +75,12 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="31454" level="80" type="Folk" name="Ghost of Wigoth">
+	<npc id="31454" level="80" type="Folk" name="Ghost of Imperial Tomb">
 		<!-- 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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -91,7 +91,7 @@
 		<status attackable="false" />
 		<collision>
 			<radius normal="8" />
-			<height normal="22.5" />
+			<height normal="24.5" />
 		</collision>
 	</npc>
 	<npc id="31455" level="80" type="Folk" name="Key Box">
@@ -99,7 +99,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -118,7 +118,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -137,7 +137,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -156,7 +156,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -175,7 +175,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -194,7 +194,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -213,7 +213,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -232,7 +232,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -251,7 +251,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -270,7 +270,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -289,7 +289,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -308,7 +308,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -327,7 +327,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -346,7 +346,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -365,7 +365,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -384,7 +384,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -403,7 +403,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -422,7 +422,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -441,7 +441,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -460,7 +460,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -479,7 +479,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -498,7 +498,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -517,7 +517,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -536,7 +536,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -555,7 +555,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -574,7 +574,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -593,7 +593,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -612,7 +612,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -631,7 +631,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -650,7 +650,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -669,7 +669,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -688,7 +688,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -707,7 +707,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31500-31599.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31500-31599.xml
index 7af97594b4..572d10ff37 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31500-31599.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31500-31599.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="31580" level="70" type="Folk" name="Galadrid" title="Master">
 		<parameters>
@@ -123,7 +123,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="168" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -142,7 +142,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="20" />
 				<run ground="120" />
@@ -256,7 +256,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="72" />
 				<run ground="120" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31600-31699.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31600-31699.xml
index c05647af1e..f20e9688b6 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31600-31699.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31600-31699.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="31601" level="70" type="Folk" name="Pamela Aprodia">
 		<parameters>
@@ -797,7 +797,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="31630" level="70" type="Folk" name="Kaleidos the Unicorn">
+	<npc id="31630" level="70" type="Folk" name="Unicorn Kaleidos">
 		<race>ELEMENTAL</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31700-31799.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31700-31799.xml
index 94b82ce625..5718a0b283 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31700-31799.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31700-31799.xml
@@ -1,11 +1,11 @@
-<?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="31713" level="80" type="Folk" name="Fellow" title="Balthus 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="8446" hpRegen="10.5" mp="1674" mpRegen="3.6" />
+			<vitals hp="3038" hpRegen="10.5" mp="1674" mpRegen="3.6" />
 			<speed>
 				<walk ground="35" />
 				<run ground="130" />
@@ -42,7 +42,7 @@
 		<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="1674" mpRegen="3.6" />
+			<vitals hp="3038" hpRegen="10.5" mp="1674" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="120" />
@@ -62,7 +62,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="80" lhand="641" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="8446" hpRegen="10.5" mp="1674" mpRegen="3.6" />
+			<vitals hp="3038" hpRegen="10.5" mp="1674" mpRegen="3.6" />
 			<speed>
 				<walk ground="30" />
 				<run ground="160" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31800-31899.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31800-31899.xml
index f362d962fb..f0d0c5122f 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31800-31899.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31800-31899.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="31842" level="70" type="Folk" name="Teleportation Cubic">
 		<parameters>
@@ -250,7 +250,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="31848" level="50" type="FriendlyMob" name="Fairy">
+	<npc id="31848" level="50" type="FriendlyMob" name="Pixy">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31900-31999.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31900-31999.xml
index a0e761ae35..ba25396dc7 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31900-31999.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/31900-31999.xml
@@ -1,11 +1,11 @@
-<?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="31919" level="80" type="Folk" name="Elmoreden Chamberlain's Ghost">
 		<!-- 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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -24,7 +24,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -43,7 +43,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -62,7 +62,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -81,7 +81,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -100,7 +100,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -119,7 +119,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -138,7 +138,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -157,7 +157,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -176,7 +176,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -195,7 +195,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -214,7 +214,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -233,7 +233,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -252,7 +252,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -271,7 +271,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -290,7 +290,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -309,7 +309,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -328,7 +328,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -347,7 +347,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -366,7 +366,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -385,7 +385,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -404,7 +404,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -423,7 +423,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -442,7 +442,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -461,7 +461,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -480,7 +480,7 @@
 		<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="1345" mpRegen="3.6" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/32000-32099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/32000-32099.xml
index 838d0725c8..7e1f750820 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/32000-32099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/32000-32099.xml
@@ -1,13 +1,13 @@
-<?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="32011" level="85" type="Folk" name="Imperial Tomb Guide">
 		<!-- 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" />
+			<vitals hp="2444" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
-				<walk ground="60" />
+				<walk ground="50" />
 				<run ground="120" />
 			</speed>
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
@@ -15,8 +15,8 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="5" />
-			<height normal="12" />
+			<radius normal="8" />
+			<height normal="23" />
 		</collision>
 	</npc>
 </list>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/32400-32499.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/32400-32499.xml
index 28e34d4cd8..b27c84f527 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/32400-32499.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/32400-32499.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="32478" level="70" type="Warehouse" name="Dimensional Merchant" title="Energy of Life">
+	<npc id="32478" level="70" type="Warehouse" name="Dimensional Merchant" title="Life Vitality">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/33600-33699.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/33600-33699.xml
index 2d79fdb899..c8750b4790 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/33600-33699.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/33600-33699.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="33668" level="80" type="Folk" name="Maphrian" title="Lands of Abundance Guide">
+	<npc id="33668" level="80" type="Folk" name="Maphrian" title="Land of Abundance Guide">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/33800-33899.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/33800-33899.xml
index 62450a7173..08a3862b4c 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/33800-33899.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/33800-33899.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="33833" level="80" type="Folk" name="Spirit Thunder" title="Spiritshot Maker">
+	<npc id="33833" level="80" type="Folk" name="Spirit Boom" title="Soulshot Master">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/33900-33999.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/33900-33999.xml
index 89470e4721..e34b230f56 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/33900-33999.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/33900-33999.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="33922" level="80" type="Folk" name="Uldie" title="Event Manager">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -51,7 +51,7 @@
 		<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="610" mpRegen="3.6" />
+			<vitals hp="1183" hpRegen="10.5" mp="610" mpRegen="3.6" />
 			<speed>
 				<walk ground="64" />
 				<run ground="1" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/34000-34099.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/34000-34099.xml
index 28d39d88db..dacd1407b8 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/34000-34099.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/34000-34099.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="34011" level="80" type="Folk" name="Dandy" title="Dreaming">
+	<npc id="34011" level="80" type="Folk" name="Dandy" title="Dreamer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -17,7 +17,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="34012" level="80" type="Folk" name="Dandy" title="Dreaming">
+	<npc id="34012" level="80" type="Folk" name="Dandy" title="Dreamer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -39,7 +39,7 @@
 		<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" />
+			<vitals hp="3532" hpRegen="10.5" mp="2355" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -74,7 +74,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="7.5" mp="1507" mpRegen="2.7" />
+			<vitals hp="2823" hpRegen="7.5" mp="1507" mpRegen="2.7" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -91,7 +91,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -110,7 +110,7 @@
 		<race>HUMAN</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="7.5" mp="1507" mpRegen="2.7" />
+			<vitals hp="2823" hpRegen="7.5" mp="1507" mpRegen="2.7" />
 			<speed>
 				<walk ground="40" />
 				<run ground="1" />
@@ -127,7 +127,7 @@
 		<race>HUMAN</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="7.5" mp="1507" mpRegen="2.7" />
+			<vitals hp="2823" hpRegen="7.5" mp="1507" mpRegen="2.7" />
 			<speed>
 				<walk ground="40" />
 				<run ground="1" />
@@ -144,7 +144,7 @@
 		<race>HUMAN</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="7.5" mp="1507" mpRegen="2.7" />
+			<vitals hp="2823" hpRegen="7.5" mp="1507" mpRegen="2.7" />
 			<speed>
 				<walk ground="40" />
 				<run ground="1" />
@@ -195,7 +195,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -214,7 +214,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -233,7 +233,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -252,7 +252,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -305,7 +305,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="40" />
 				<run ground="1" />
@@ -409,7 +409,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -461,7 +461,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
 				<run ground="1" />
@@ -479,7 +479,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="7.5" mp="1507" mpRegen="2.7" />
+			<vitals hp="2823" hpRegen="7.5" mp="1507" mpRegen="2.7" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -496,7 +496,7 @@
 		<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="1743" mpRegen="3.6" />
+			<vitals hp="3113" hpRegen="10.5" mp="1743" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -515,7 +515,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -534,7 +534,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -553,7 +553,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -572,7 +572,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -591,7 +591,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -610,7 +610,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="2" lhand="102" />
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="7.5" mp="1507" mpRegen="2.7" />
+			<vitals hp="2823" hpRegen="7.5" mp="1507" mpRegen="2.7" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -626,7 +626,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="7.5" mp="1507" mpRegen="2.7" />
+			<vitals hp="2823" hpRegen="7.5" mp="1507" mpRegen="2.7" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -642,7 +642,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="7.5" mp="1507" mpRegen="2.7" />
+			<vitals hp="2823" hpRegen="7.5" mp="1507" mpRegen="2.7" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -659,7 +659,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -678,7 +678,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -692,12 +692,12 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="34052" level="80" type="Folk" name="God of Earth" title="Attribute Master">
+	<npc id="34052" level="80" type="Folk" name="Earth Spirit King" title="Attribute Master">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="20" />
 				<run ground="1" />
@@ -711,11 +711,11 @@
 			<height normal="19.8" />
 		</collision>
 	</npc>
-	<npc id="34053" level="78" type="Merchant" name="Svein" title="Attribute Master">
+	<npc id="34053" level="78" type="Merchant" name="Sven" title="Attribute Master">
 		<race>HUMAN</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="7.5" mp="1507" mpRegen="2.7" />
+			<vitals hp="2823" hpRegen="7.5" mp="1507" mpRegen="2.7" />
 			<speed>
 				<walk ground="36" />
 				<run ground="1" />
@@ -727,12 +727,12 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="34054" level="80" type="Folk" name="God of Water" title="Attribute Master">
+	<npc id="34054" level="80" type="Folk" name="Goddess of Water" title="Attribute Master">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="36" />
 				<run ground="1" />
@@ -746,12 +746,12 @@
 			<height normal="23.7" />
 		</collision>
 	</npc>
-	<npc id="34055" level="80" type="Folk" name="God of Fire" title="Attribute Master">
+	<npc id="34055" level="80" type="Folk" name="Flame Spirit King" title="Attribute Master">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -769,7 +769,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="7.5" mp="1507" mpRegen="2.7" />
+			<vitals hp="2823" hpRegen="7.5" mp="1507" mpRegen="2.7" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -781,12 +781,12 @@
 			<height normal="19.7" />
 		</collision>
 	</npc>
-	<npc id="34057" level="80" type="Folk" name="Santa's Girl" title="Event Manager">
+	<npc id="34057" level="80" type="Folk" name="Santa Girl" title="Event Manager">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="1" />
@@ -800,12 +800,12 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="34058" level="80" type="Folk" name="Valentine Lucky Tree">
+	<npc id="34058" level="80" type="Folk" name="Rose Luck Tree">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="120" />
@@ -819,12 +819,12 @@
 			<height normal="72.65" />
 		</collision>
 	</npc>
-	<npc id="34059" level="80" type="Folk" name="Valentine Love Tree">
+	<npc id="34059" level="80" type="Folk" name="Rose Love Tree">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="120" />
@@ -838,7 +838,370 @@
 			<height normal="72.65" />
 		</collision>
 	</npc>
-	<npc id="34079" level="80" type="Merchant" name="Macken" title="Rarities Merchant">
+	<npc id="34060" level="85" type="Folk" name="Primavera" title="Herald of Spring">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="47945" /> <!-- Magic Fan - Yellow - Event -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2823" hpRegen="10.5" mp="1507" 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="7" />
+			<height normal="21.2" />
+		</collision>
+	</npc>
+	<npc id="34061" level="85" type="Folk" name="Cavalia" title="Event Manager">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<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="15" />
+		</collision>
+	</npc>
+	<npc id="34062" level="85" type="Folk" name="Spunkie">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<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="7" />
+			<height normal="60" />
+		</collision>
+	</npc>
+	<npc id="34063" level="85" type="Folk" name="Dimo" title="Chief Manager">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="8" />
+			<height normal="18.4" />
+		</collision>
+	</npc>
+	<npc id="34064" level="85" type="Folk" name="Dimo" title="Chief Manager">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="8" />
+			<height normal="18.4" />
+		</collision>
+	</npc>
+	<npc id="34065" level="85" type="Folk" name="Misto" title="Researcher">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="8" />
+			<height normal="19.7" />
+		</collision>
+	</npc>
+	<npc id="34066" level="85" type="Folk" name="Excalibur Expeditionary Force Leader" title="Event Manager">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="8" />
+			<height normal="23.5" />
+		</collision>
+	</npc>
+	<npc id="34067" level="85" type="Folk" name="Leader" title="Meow Unit">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
+			<speed>
+				<walk ground="20" />
+				<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="10" />
+			<height normal="18.5" />
+		</collision>
+	</npc>
+	<npc id="34068" level="85" type="Folk" name="Elder" title="Meow Unit">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="14" />
+			<height normal="20" />
+		</collision>
+	</npc>
+	<npc id="34069" level="85" type="Folk" name="Guide" title="Meow Unit">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="20" />
+			<height normal="45" />
+		</collision>
+	</npc>
+	<npc id="34070" level="85" type="Folk" name="Merchant" title="Meow Unit">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="12" />
+			<height normal="20.5" />
+		</collision>
+	</npc>
+	<npc id="34071" level="85" type="Folk" name="Buff Guide" title="Meow Unit">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="12" />
+			<height normal="16.75" />
+		</collision>
+	</npc>
+	<npc id="34072" level="85" type="Folk" name="Recovery Guide" title="Meow Unit">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="12" />
+			<height normal="15.9" />
+		</collision>
+	</npc>
+	<npc id="34073" level="85" type="Folk" name="Special Merchant" title="Meow Unit">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="7" />
+			<height normal="13" />
+		</collision>
+	</npc>
+	<npc id="34074" level="85" type="Folk" name="Antoni" title="Captain">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="23" />
+		</collision>
+	</npc>
+	<npc id="34075" level="85" type="Folk" name="Oscar">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="7" />
+			<height normal="22" />
+		</collision>
+	</npc>
+	<npc id="34076" level="85" type="Folk" name="Charles">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
+			<speed>
+				<walk ground="70" />
+				<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="10" />
+			<height normal="24" />
+		</collision>
+	</npc>
+	<npc id="34077" level="85" type="Folk" name="Jensen">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
+			<speed>
+				<walk ground="63" />
+				<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="23.5" />
+		</collision>
+	</npc>
+	<npc id="34078" level="85" type="Folk" name="Hanns">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="78" /> <!-- Great Sword -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2823" hpRegen="10.5" mp="1507" 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="8" />
+			<height normal="23" />
+		</collision>
+	</npc>
+	<npc id="34079" level="80" type="Merchant" name="Macken" title="Valuables Merchant">
 		<race>HUMAN</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -854,7 +1217,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="34080" level="80" type="Merchant" name="Pritty" title="Beauty Merchant">
+	<npc id="34080" level="80" type="Merchant" name="Pritty" title="Beauty Shop Merchant">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -870,7 +1233,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="34081" level="80" type="Merchant" name="Supree" title="Grocer">
+	<npc id="34081" level="80" type="Merchant" name="Supree" title="Peddler">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -886,7 +1249,7 @@
 			<height normal="17.7" />
 		</collision>
 	</npc>
-	<npc id="34082" level="80" type="Folk" name="Tyke" title="Jolly">
+	<npc id="34082" level="80" type="Folk" name="Tyke" title="Merrymaker">
 		<race>HUMAN</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -902,7 +1265,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="34083" level="80" type="Folk" name="Vivianne" title="Market Mistress">
+	<npc id="34083" level="80" type="Folk" name="Eleveny" title="Event Manager">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -936,7 +1299,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="34085" level="80" type="Folk" name="Captive Tulio" title="Cubeful of Gifts">
+	<npc id="34085" level="80" type="Folk" name="Eleveny" title="Group Reward Box">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -953,7 +1316,7 @@
 			<height normal="52.8" />
 		</collision>
 	</npc>
-	<npc id="34086" level="80" type="Folk" name="Tulio">
+	<npc id="34086" level="80" type="Folk" name="Eleveny">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -970,7 +1333,7 @@
 			<height normal="110.4" />
 		</collision>
 	</npc>
-	<npc id="34087" level="80" type="Teleporter" name="Santa Claus" title="Collector of Letters">
+	<npc id="34087" level="80" type="Teleporter" name="Santa Claus" title="Letter Collector">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -987,7 +1350,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="34088" level="80" type="Folk" name="Christmas Tree" title="Happy Holidays!">
+	<npc id="34088" level="80" type="Folk" name="Christmas Tree" title="Merry Christmas">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>MALE</sex>
@@ -1004,7 +1367,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="34089" level="80" type="Folk" name="Roa" title="Character Helper">
+	<npc id="34089" level="80" type="Folk" name="Roa" title="Assistant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -1021,4 +1384,194 @@
 			<height normal="21.5" />
 		</collision>
 	</npc>
+	<npc id="34090" level="85" type="Folk" name="Irina" title="Mate">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="17.5" />
+		</collision>
+	</npc>
+	<npc id="34091" level="85" type="Folk" name="Sora" title="Explorer">
+		<!-- 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="2823" hpRegen="10.5" mp="1507" 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="18.5" />
+		</collision>
+	</npc>
+	<npc id="34092" level="85" type="Folk" name="Lifteen" title="Event Manager">
+		<!-- 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="3038" hpRegen="10.5" mp="1674" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<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="8" />
+			<height normal="19" />
+		</collision>
+	</npc>
+	<npc id="34093" level="85" type="Folk" name="Fioti" title="Event Reward">
+		<!-- 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="3038" hpRegen="10.5" mp="1674" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<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="13.5" />
+			<height normal="34.875" />
+		</collision>
+	</npc>
+	<npc id="34094" level="85" type="Folk" name="Mysterious Cake" title="15th Anniversary">
+		<!-- 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="95000000" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<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="63" />
+			<height normal="82.5" />
+		</collision>
+	</npc>
+	<npc id="34095" level="85" type="Folk" name="Magic Research Center Employee" title="Event Manager">
+		<!-- 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="3038" hpRegen="10.5" mp="1674" mpRegen="3.6" />
+			<speed>
+				<walk ground="20" />
+				<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="8" />
+			<height normal="17.5" />
+		</collision>
+	</npc>
+	<npc id="34096" level="85" type="Folk" name="Pig of Love" title="Mild">
+		<!-- 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="180" hpRegen="10.5" mp="1674" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<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="15" />
+			<height normal="18.3" />
+		</collision>
+	</npc>
+	<npc id="34097" level="85" type="Folk" name="Gold Pig" title="Fantastic">
+		<!-- 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="284" hpRegen="10.5" mp="1674" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<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="15" />
+			<height normal="18.3" />
+		</collision>
+	</npc>
+	<npc id="34098" level="85" type="Folk" name="Bora" title="GM Helper">
+		<!-- 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="3532" 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="20" />
+			<height normal="45" />
+		</collision>
+	</npc>
+	<npc id="34099" level="85" type="Folk" name="Bora" title="GM Helper">
+		<!-- 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="3532" 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="20" />
+			<height normal="45" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/34100-34199.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/34100-34199.xml
new file mode 100644
index 0000000000..47ae27c9ea
--- /dev/null
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/34100-34199.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
+	<npc id="34100" level="85" type="Folk" name="Ophillia" title="Victory Spirit">
+		<!-- 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="3532" 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="12" />
+			<height normal="30" />
+		</collision>
+	</npc>
+	<npc id="34101" level="85" type="Folk" name="Gift Box" title="Lucky">
+		<!-- 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="95000000" 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="54" />
+			<height normal="52.8" />
+		</collision>
+	</npc>
+	<npc id="34102" level="85" type="Folk" name="Happy" title="Event Manager">
+		<!-- 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="3038" hpRegen="10.5" mp="1674" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<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="9" />
+			<height normal="22.25" />
+		</collision>
+	</npc>
+	<npc id="34103" level="85" type="Folk" name="Nuia" title="Event Reward">
+		<!-- 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="3038" hpRegen="10.5" mp="1674" 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="45" />
+			<height normal="87" />
+		</collision>
+	</npc>
+</list>
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/34200-34299.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/34200-34299.xml
index 4efff0ef6a..5e4bb63fde 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/34200-34299.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/34200-34299.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="34210" level="85" type="Folk" name="Red" title="Wealthy Merchant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -105,7 +105,7 @@
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="7.5" mp="1507" mpRegen="2.7" />
+			<vitals hp="2823" hpRegen="7.5" mp="1507" mpRegen="2.7" />
 			<speed>
 				<walk ground="20" />
 				<run ground="40" />
@@ -889,7 +889,7 @@
 		<race>ETC</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="8446" hpRegen="7.5" mp="1507" mpRegen="2.7" />
+			<vitals hp="2823" hpRegen="7.5" mp="1507" mpRegen="2.7" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -906,7 +906,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -925,7 +925,7 @@
 		<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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/34300-34399.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/34300-34399.xml
index 331b188d2f..8322041c5d 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/34300-34399.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/34300-34399.xml
@@ -1,11 +1,11 @@
-<?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="34300" level="80" type="Folk" name="Wizards" title="Cupid's Messenger">
 		<!-- 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="1507" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="40" />
 				<run ground="1" />
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/35500-35599.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/35500-35599.xml
index 1e27c47676..829804bb1b 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/35500-35599.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/35500-35599.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="35500" level="75" type="Monster" name="Gatekeeper" title="Rune">
 		<parameters>
@@ -647,7 +647,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="35514" level="20" type="Artefact" name="Altar of Water">
+	<npc id="35514" level="20" type="Artefact" name="Altar of Wind">
 		<race>ETC</race>
 		<sex>ETC</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
diff --git a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/36700-36799.xml b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/36700-36799.xml
index b490d2fee7..e6a139bcd5 100644
--- a/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/36700-36799.xml
+++ b/L2J_Mobius_Classic_2.9.5_Saviors/dist/game/data/stats/npcs/36700-36799.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="36721" level="80" type="Merchant" name="Leina" title="Clan Hall Manager">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -460,7 +460,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="36783" level="62" type="Monster" name="Human Knight" title="Royal Guard">
+	<npc id="36783" level="62" type="Monster" name="Knight" title="Royal Guard">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="384" sp="0" />
@@ -487,7 +487,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="36784" level="62" type="Monster" name="Human Knight" title="Royal Guard">
+	<npc id="36784" level="62" type="Monster" name="Knight" title="Royal Guard">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="384" sp="0" />
@@ -514,7 +514,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="36785" level="62" type="Monster" name="Human Knight" title="Royal Guard">
+	<npc id="36785" level="62" type="Monster" name="Knight" title="Royal Guard">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="384" sp="0" />
@@ -541,7 +541,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="36786" level="62" type="Monster" name="Human Knight" title="Royal Guard">
+	<npc id="36786" level="62" type="Monster" name="Knight" title="Royal Guard">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="384" sp="0" />
@@ -591,7 +591,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="36788" level="62" type="Monster" name="Human Knight" title="Royal Guard">
+	<npc id="36788" level="62" type="Monster" name="Knight" title="Royal Guard">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="384" sp="0" />
@@ -618,7 +618,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="36789" level="62" type="Monster" name="Human Knight" title="Royal Guard">
+	<npc id="36789" level="62" type="Monster" name="Knight" title="Royal Guard">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="384" sp="0" />
@@ -645,7 +645,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="36790" level="62" type="Monster" name="Human Knight" title="Royal Guard">
+	<npc id="36790" level="62" type="Monster" name="Knight" title="Royal Guard">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="384" sp="0" />
@@ -672,7 +672,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="36791" level="62" type="Monster" name="Human Knight" title="Royal Guard">
+	<npc id="36791" level="62" type="Monster" name="Knight" title="Royal Guard">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="384" sp="0" />