diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/00100-00199.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/00100-00199.xml
index 5c64fb074f..bbfcb36d69 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/00100-00199.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/00100-00199.xml
@@ -1094,7 +1094,7 @@
 			<height normal="13" />
 		</collision>
 	</npc>
-	<npc id="128" level="70" type="Folk" name="Flame Box" title="Flame Box">
+	<npc id="128" level="70" type="Folk" name="Firecracker Box" title="Firecracker Pack">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>MALE</sex>
@@ -1834,7 +1834,7 @@
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="151" level="85" type="Monster" name="Liverless Bunny">
+	<npc id="151" level="85" type="Monster" name="Gloomy Bunny">
 		<!-- TODO: Must be confirmed -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
@@ -1863,7 +1863,7 @@
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="152" level="85" type="Monster" name="Liverless Bunny Captain">
+	<npc id="152" level="85" type="Monster" name="Gloomy Bunny Captain">
 		<!-- TODO: Must be confirmed -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
@@ -1892,7 +1892,7 @@
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="153" level="75" type="Folk" name="Employee of Magic Research Institute" title="Event Manager">
+	<npc id="153" level="75" type="Folk" name="Magic Laboratory Assistant" title="Event Manager">
 		<!-- TODO: Must be confirmed -->
 		<race>DWARF</race>
 		<sex>FEMALE</sex>
@@ -1975,7 +1975,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="156" level="85" type="Monster" name="Big Liver Bunny">
+	<npc id="156" level="85" type="Monster" name="Happy Bunny">
 		<!-- TODO: Must be confirmed -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
@@ -2004,7 +2004,7 @@
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="157" level="85" type="Monster" name="Big Liver Bunny Captain">
+	<npc id="157" level="85" type="Monster" name="Happy Bunny Captain">
 		<!-- TODO: Must be confirmed -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
@@ -2062,7 +2062,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="159" level="1" type="Folk" name="Tame Princess Ant">
+	<npc id="159" level="1" type="Folk" name="Tame Queen Ant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ANIMAL</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/01500-01599.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/01500-01599.xml
index 82b8725965..b62e1c3e3a 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/01500-01599.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="1501" level="55" type="Folk" name="Majo Agathion">
+	<npc id="1501" level="55" type="Folk" name="Agathion Majo">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -36,7 +36,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1502" level="55" type="Folk" name="Gold Crown Agathion">
+	<npc id="1502" level="55" type="Folk" name="Agathion Gold Majo">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -72,7 +72,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1503" level="55" type="Folk" name="Black Crown Agathion">
+	<npc id="1503" level="55" type="Folk" name="Agathion Black Majo">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -108,7 +108,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1504" level="55" type="Folk" name="Plaipitak Agathion">
+	<npc id="1504" level="55" type="Folk" name="Agathion Plaipitak">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -144,7 +144,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1505" level="55" type="Folk" name="Baby Panda Agathion">
+	<npc id="1505" level="55" type="Folk" name="Agathion Baby Panda">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -432,7 +432,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1513" level="55" type="Folk" name="One-eyed Bat Drove Agathion">
+	<npc id="1513" level="55" type="Folk" name="Agathion One-eyed Bat Drove">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -468,7 +468,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1514" level="55" type="Folk" name="Pegasus Agathion">
+	<npc id="1514" level="55" type="Folk" name="Agathion Pegasus">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -612,7 +612,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1518" level="55" type="Folk" name="Bugbear Agathion">
+	<npc id="1518" level="55" type="Folk" name="Agathion Bugbear">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -648,7 +648,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1519" level="55" type="Folk" name="Red Sumo Wrestler Agathion">
+	<npc id="1519" level="55" type="Folk" name="Agathion Red Sumo Wrestler">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -684,7 +684,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1520" level="55" type="Folk" name="Blue Sumo Wrestler Agathion">
+	<npc id="1520" level="55" type="Folk" name="Agathion Blue Sumo Wrestler">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -756,7 +756,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1522" level="55" type="Folk" name="Button-eyed Bear Doll">
+	<npc id="1522" level="55" type="Folk" name="Agathion Teddy Boy">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -828,7 +828,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1524" level="55" type="Folk" name="Dryad Agathion">
+	<npc id="1524" level="55" type="Folk" name="Agathion Dryad">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -864,7 +864,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1525" level="55" type="Folk" name="Wonboso Agathion">
+	<npc id="1525" level="55" type="Folk" name="Agathion Wonboso">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -900,7 +900,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1526" level="55" type="Folk" name="Daewoonso Agathion">
+	<npc id="1526" level="55" type="Folk" name="Agathion Daewoonso">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -936,7 +936,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1527" level="55" type="Folk" name="Pomona Agathion">
+	<npc id="1527" level="55" type="Folk" name="Agathion Pomona">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -972,7 +972,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1528" level="55" type="Folk" name="Weaver Agathion">
+	<npc id="1528" level="55" type="Folk" name="Agathion Weaver">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1008,7 +1008,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1529" level="55" type="Folk" name="Lucky Girl Agathion">
+	<npc id="1529" level="55" type="Folk" name="Agathion Lucky Girl">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1080,7 +1080,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1531" level="55" type="Folk" name="Dancing Lucky Kid Agathion">
+	<npc id="1531" level="55" type="Folk" name="Agathion Dancing Lucky Kid">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1116,7 +1116,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1532" level="55" type="Folk" name="Agathion - Monkey King">
+	<npc id="1532" level="55" type="Folk" name="Agathion Monkey King">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1152,7 +1152,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1533" level="55" type="Folk" name="Uthanka Agathion">
+	<npc id="1533" level="55" type="Folk" name="Agathion Uthanka">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1224,7 +1224,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1535" level="55" type="Folk" name="Zombie Agathion">
+	<npc id="1535" level="55" type="Folk" name="Agathion Zombie">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1260,7 +1260,7 @@
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="1536" level="55" type="Folk" name="Bluebird Agathion">
+	<npc id="1536" level="55" type="Folk" name="Agathion Bluebird">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1296,7 +1296,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="1537" level="55" type="Folk" name="Hatbird Agathion">
+	<npc id="1537" level="55" type="Folk" name="Agathion Hatbird">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1370,7 +1370,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="1539" level="55" type="Folk" name="Iken Agathion">
+	<npc id="1539" level="55" type="Folk" name="Agathion Iken">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1406,7 +1406,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1540" level="55" type="Folk" name="Lanya Agathion">
+	<npc id="1540" level="55" type="Folk" name="Agathion Lanya">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1442,7 +1442,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1541" level="55" type="Folk" name="Gnosian Agathion">
+	<npc id="1541" level="55" type="Folk" name="Agathion Gnosian">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1478,7 +1478,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1542" level="55" type="Folk" name="Orodriel Agathion">
+	<npc id="1542" level="55" type="Folk" name="Agathion Orodriel">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1514,7 +1514,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1543" level="55" type="Folk" name="Lakinos Agathion">
+	<npc id="1543" level="55" type="Folk" name="Agathion Lakinos">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1550,7 +1550,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1544" level="55" type="Folk" name="Mortia Agathion">
+	<npc id="1544" level="55" type="Folk" name="Agathion Mortia">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1586,7 +1586,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1545" level="55" type="Folk" name="Heintz Agathion">
+	<npc id="1545" level="55" type="Folk" name="Agathion Heintz">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1622,7 +1622,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1546" level="55" type="Folk" name="Meruril Agathion">
+	<npc id="1546" level="55" type="Folk" name="Agathion Meruril">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1658,7 +1658,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1547" level="55" type="Folk" name="Taman Zu Rapatui Agathion">
+	<npc id="1547" level="55" type="Folk" name="Agathion Taman Zu Rapatui">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1694,7 +1694,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1548" level="55" type="Folk" name="Kaurin Agathion">
+	<npc id="1548" level="55" type="Folk" name="Agathion Kaurin">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1730,7 +1730,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1549" level="55" type="Folk" name="Ahertbein Agathion">
+	<npc id="1549" level="55" type="Folk" name="Agathion Ahertbein">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1766,7 +1766,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1550" level="55" type="Folk" name="Naonin Agathion">
+	<npc id="1550" level="55" type="Folk" name="Agathion Naonin">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1802,7 +1802,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1551" level="55" type="Folk" name="Guangong Agathion">
+	<npc id="1551" level="55" type="Folk" name="Agathion Guangong">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1838,7 +1838,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1552" level="55" type="Folk" name="Gwanseum Nyang Nyang Agathion">
+	<npc id="1552" level="55" type="Folk" name="Agathion Gwanseum Nyang">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1874,7 +1874,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1553" level="55" type="Folk" name="Blue Opera Agathion">
+	<npc id="1553" level="55" type="Folk" name="Agathion Blue Opera">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1910,7 +1910,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1554" level="55" type="Folk" name="Red Opera Agathion">
+	<npc id="1554" level="55" type="Folk" name="Agathion Red Opera">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1982,7 +1982,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1556" level="55" type="Folk" name="Miss Chipao Agathion">
+	<npc id="1556" level="55" type="Folk" name="Agathion Miss Chipao">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -2018,7 +2018,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1557" level="55" type="Folk" name="Nepal Snow Agathion">
+	<npc id="1557" level="55" type="Folk" name="Agathion Nepal Snow">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -2054,7 +2054,7 @@
 			<height normal="12.5" />
 		</collision>
 	</npc>
-	<npc id="1558" level="55" type="Folk" name="Round Ball Snow Agathion">
+	<npc id="1558" level="55" type="Folk" name="Agathion Round Ball Snow">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -2090,7 +2090,7 @@
 			<height normal="20.5" />
 		</collision>
 	</npc>
-	<npc id="1559" level="55" type="Folk" name="Ladder Snow Agathion">
+	<npc id="1559" level="55" type="Folk" name="Agathion Ladder Snow">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -5199,7 +5199,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1594" level="55" type="Monster" name="Singer and Dancer Agathion">
+	<npc id="1594" level="55" type="Monster" name="Agathion Singer and Dancer">
 		<!-- TODO: Must be confirmed -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -5228,7 +5228,7 @@
 			<height normal="3.75" />
 		</collision>
 	</npc>
-	<npc id="1595" level="55" type="Monster" name="Zakensword Agathion">
+	<npc id="1595" level="55" type="Monster" name="Agathion Zaken's Spirit Swords">
 		<!-- TODO: Must be confirmed -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -5257,7 +5257,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="1596" level="55" type="Monster" name="Cow Agathion">
+	<npc id="1596" level="55" type="Monster" name="Agathion Cow">
 		<!-- TODO: Must be confirmed -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
@@ -5287,7 +5287,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="1597" level="55" type="Monster" name="Makeshift Bat Agathion">
+	<npc id="1597" level="55" type="Monster" name="Agathion Makeshift Bat">
 		<!-- TODO: Must be confirmed -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
@@ -5346,7 +5346,7 @@
 			<height normal="4.5" />
 		</collision>
 	</npc>
-	<npc id="1599" level="55" type="Monster" name="Zinyanzi Agathion">
+	<npc id="1599" level="55" type="Monster" name="Agathion Zinyanzi">
 		<!-- TODO: Must be confirmed -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/01600-01699.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/01600-01699.xml
index 0e1be16982..fd745997bc 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/01600-01699.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/01600-01699.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="1600" level="55" type="Monster" name="Yanzi Agathion">
 		<!-- TODO: Must be confirmed -->
@@ -546,7 +546,7 @@
 			<height normal="3" />
 		</collision>
 	</npc>
-	<npc id="1605" level="55" type="Folk" name="Juju Agathion">
+	<npc id="1605" level="55" type="Folk" name="Agathion Chuchu">
 		<!-- TODO: Must be confirmed -->
 		<race>ETC</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/04300-04399.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/04300-04399.xml
index c3aa990c8e..8c5fc05ac0 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/04300-04399.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/04300-04399.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="4301" level="70" type="Folk" name="Queen of Hearts" title="Valentine Messenger">
 		<!-- Confirmed CT2.5 -->
@@ -227,7 +227,7 @@
 			<height normal="26.5" />
 		</collision>
 	</npc>
-	<npc id="4307" level="80" type="Folk" name="Santa" title="Event Manager">
+	<npc id="4307" level="80" type="Folk" name="Santa Claus" title="Event Manager">
 		<!-- TODO: Must be confirmed -->
 		<race>HUMAN</race>
 		<sex>MALE</sex>
@@ -255,7 +255,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="4308" level="70" type="Folk" name="Angel Cat" title="Love's Envoy">
+	<npc id="4308" level="70" type="Folk" name="Angel Cat" title="Herald of Love">
 		<!-- TODO: Must be confirmed -->
 		<race>ELEMENTAL</race>
 		<sex>FEMALE</sex>
@@ -824,7 +824,7 @@
 			<height normal="16.3" />
 		</collision>
 	</npc>
-	<npc id="4324" level="70" type="Folk" name="Worshipper" title="Sinister">
+	<npc id="4324" level="70" type="Folk" name="Worshipper" title="Violent">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -921,7 +921,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="4327" level="70" type="Folk" name="Worshipper" title="Sinister">
+	<npc id="4327" level="70" type="Folk" name="Worshipper" title="Violent">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/04600-04699.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/04600-04699.xml
index 85643f5607..f791beab31 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/04600-04699.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/04600-04699.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="4601" level="99" type="Folk" name="Vesterman" title="Mysterious Agitator">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -58,7 +58,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="4603" level="99" type="Folk" name="Aden Castle Siege Camp">
+	<npc id="4603" level="99" type="Folk" name="Aden Attackers' Camp">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -87,7 +87,7 @@
 			<height normal="72" />
 		</collision>
 	</npc>
-	<npc id="4604" level="99" type="Folk" name="Rune Castle Siege Camp">
+	<npc id="4604" level="99" type="Folk" name="Rune Attackers' Camp">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>ETC</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/05000-05099.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/05000-05099.xml
index fc4c2932c3..f210fa2548 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/05000-05099.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/05000-05099.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="5001" level="85" type="Monster" name="Norhand" title="Steward">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -59,7 +59,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="5003" level="55" type="Folk" name="Snow Man Grouch">
+	<npc id="5003" level="55" type="Folk" name="Blue Snowman">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
@@ -87,7 +87,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="5004" level="55" type="Folk" name="Snow Man Grouch">
+	<npc id="5004" level="55" type="Folk" name="Blue Snowman">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
@@ -238,7 +238,7 @@
 			<height normal="53.5" grown="65.5" />
 		</collision>
 	</npc>
-	<npc id="5009" level="80" type="Folk" name="Instant Zone Roadblock D?cor">
+	<npc id="5009" level="80" type="Folk" name="Evolution Guide">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ELEMENTAL</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/08400-08499.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/08400-08499.xml
index 131c8c6677..4178b84f8c 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/08400-08499.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/08400-08499.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="8401" level="88" type="Monster" name="Jermann" title="Ancient Kartia's Ruler">
+	<npc id="8401" level="88" type="Monster" name="Jermann" title="Lord of Ancient Kartia">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
@@ -37,7 +37,7 @@
 			<height normal="74" />
 		</collision>
 	</npc>
-	<npc id="8402" level="88" type="Monster" name="Jermann" title="Ancient Kartia's Ruler">
+	<npc id="8402" level="88" type="Monster" name="Jermann" title="Lord of Ancient Kartia">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
@@ -74,7 +74,7 @@
 			<height normal="74" />
 		</collision>
 	</npc>
-	<npc id="8403" level="88" type="Monster" name="Jermann" title="Ancient Kartia's Ruler">
+	<npc id="8403" level="88" type="Monster" name="Jermann" title="Lord of Ancient Kartia">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
@@ -139,7 +139,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="8405" level="80" type="Folk" name="Ancient Kartia Records" title="Holder of Mysterious Power">
+	<npc id="8405" level="80" type="Folk" name="Ancient Kartia's Records" title="Holder of Mysterious Power">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>MALE</sex>
@@ -886,7 +886,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="8422" level="99" type="Monster" name="Jermann" title="Ancient Kartia's Ruler">
+	<npc id="8422" level="99" type="Monster" name="Jermann" title="Lord of Ancient Kartia">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="i_despawn_time" value="10" />
@@ -926,7 +926,7 @@
 			<height normal="74" />
 		</collision>
 	</npc>
-	<npc id="8423" level="85" type="Monster" name="Warrior of Death">
+	<npc id="8423" level="85" type="Monster" name="Death Soldier">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="60" />
@@ -1356,7 +1356,7 @@
 			<height normal="20.5" />
 		</collision>
 	</npc>
-	<npc id="8433" level="90" type="Monster" name="Warrior of Death">
+	<npc id="8433" level="90" type="Monster" name="Death Soldier">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="60" />
@@ -1400,7 +1400,7 @@
 			<height normal="27.2" />
 		</collision>
 	</npc>
-	<npc id="8434" level="95" type="Monster" name="Warrior of Death">
+	<npc id="8434" level="95" type="Monster" name="Death Soldier">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="60" />
@@ -1904,7 +1904,7 @@
 			<height normal="8.5" />
 		</collision>
 	</npc>
-	<npc id="8449" level="88" type="Folk" name="Zellaka" title="Shilen's Subordinate">
+	<npc id="8449" level="88" type="Folk" name="Zellaka" title="Shillien's Subordinate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="atkdeco_type" value="1" />
@@ -1943,7 +1943,7 @@
 			<height normal="54" />
 		</collision>
 	</npc>
-	<npc id="8450" level="93" type="Folk" name="Pelline" title="Shilen's Subordinate">
+	<npc id="8450" level="93" type="Folk" name="Pelline" title="Shillien's Subordinate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="atkdeco_type" value="1" />
@@ -1982,7 +1982,7 @@
 			<height normal="46" />
 		</collision>
 	</npc>
-	<npc id="8451" level="98" type="Folk" name="Kalios" title="Shilen's Subordinate">
+	<npc id="8451" level="98" type="Folk" name="Kalios" title="Shillien's Subordinate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="atkdeco_type" value="1" />
@@ -2021,7 +2021,7 @@
 			<height normal="65.5" />
 		</collision>
 	</npc>
-	<npc id="8452" level="88" type="Folk" name="Kartia Guard" title="Shilen's Subordinate">
+	<npc id="8452" level="88" type="Folk" name="Kartia Guard" title="Shillien's Subordinate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
@@ -2055,7 +2055,7 @@
 			<height normal="14" />
 		</collision>
 	</npc>
-	<npc id="8453" level="88" type="Folk" name="Kartia Watchman" title="Shilen's Subordinate">
+	<npc id="8453" level="88" type="Folk" name="Kartia Watchman" title="Shillien's Subordinate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
@@ -2089,7 +2089,7 @@
 			<height normal="40.48" />
 		</collision>
 	</npc>
-	<npc id="8454" level="93" type="Folk" name="Kartia Guard" title="Shilen's Subordinate">
+	<npc id="8454" level="93" type="Folk" name="Kartia Guard" title="Shillien's Subordinate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
@@ -2124,7 +2124,7 @@
 			<height normal="33" />
 		</collision>
 	</npc>
-	<npc id="8455" level="93" type="Folk" name="Kartia Watchman" title="Shilen's Subordinate">
+	<npc id="8455" level="93" type="Folk" name="Kartia Watchman" title="Shillien's Subordinate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
@@ -2159,7 +2159,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="8456" level="98" type="Folk" name="Kartia Guard" title="Shilen's Subordinate">
+	<npc id="8456" level="98" type="Folk" name="Kartia Guard" title="Shillien's Subordinate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DRAGON</race>
 		<sex>MALE</sex>
@@ -2195,7 +2195,7 @@
 			<height normal="42" />
 		</collision>
 	</npc>
-	<npc id="8457" level="98" type="Folk" name="Kartia Watchman" title="Shilen's Subordinate">
+	<npc id="8457" level="98" type="Folk" name="Kartia Watchman" title="Shillien's Subordinate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DRAGON</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/08500-08599.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/08500-08599.xml
index 33f3a9d3c3..d946371e6f 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/08500-08599.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/08500-08599.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="8500" level="90" type="Folk" name="Gerrard" title="Person of Influence">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -1221,7 +1221,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="8542" level="70" type="Folk" name="Eve" title="Crystal Seer">
+	<npc id="8542" level="70" type="Folk" name="Eve" title="Fortune Teller">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1408,7 +1408,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="8550" level="55" type="Folk" name="Anakim Agathion">
+	<npc id="8550" level="55" type="Folk" name="Agathion Anakim">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1862,7 +1862,7 @@
 			<height normal="8.5" />
 		</collision>
 	</npc>
-	<npc id="8568" level="99" type="Monster" name="Katura Altar of Fire">
+	<npc id="8568" level="99" type="Monster" name="Katura's Fire Altar">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
@@ -1884,7 +1884,7 @@
 			<height normal="50" />
 		</collision>
 	</npc>
-	<npc id="8569" level="99" type="Monster" name="Katura Altar of Water">
+	<npc id="8569" level="99" type="Monster" name="Katura's Water Altar">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
@@ -1906,7 +1906,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="8570" level="99" type="Monster" name="Katura Altar of Darkness">
+	<npc id="8570" level="99" type="Monster" name="Katura's Dark Altar">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
@@ -1928,7 +1928,7 @@
 			<height normal="55" />
 		</collision>
 	</npc>
-	<npc id="8571" level="99" type="Monster" name="Katura Altar of Earth">
+	<npc id="8571" level="99" type="Monster" name="Katura's Earth Altar">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/08600-08699.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/08600-08699.xml
index f635a4cc0d..a1634334f8 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/08600-08699.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/08600-08699.xml
@@ -491,7 +491,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="8626" level="85" type="Folk" name="Babayaga">
+	<npc id="8626" level="85" type="Folk" name="Hut on Chicken Legs">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -549,7 +549,7 @@
 			<skill id="5464" level="1" /> <!-- Wind Attack -->
 		</skillList>
 	</npc>
-	<npc id="8629" level="85" type="Folk" name="Virgo Agathion">
+	<npc id="8629" level="85" type="Folk" name="Agathion Virgo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -568,7 +568,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8630" level="85" type="Folk" name="Capricorn Agathion">
+	<npc id="8630" level="85" type="Folk" name="Agathion Capricorn">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -587,7 +587,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8631" level="85" type="Folk" name="Libra Agathion">
+	<npc id="8631" level="85" type="Folk" name="Agathion Libra">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -606,7 +606,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8632" level="85" type="Folk" name="Aries Agathion">
+	<npc id="8632" level="85" type="Folk" name="Agathion Aries">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -625,7 +625,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8633" level="85" type="Folk" name="Taurus Agathion">
+	<npc id="8633" level="85" type="Folk" name="Agathion Taurus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -644,7 +644,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8634" level="85" type="Folk" name="Leo Agathion">
+	<npc id="8634" level="85" type="Folk" name="Agathion Leo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -663,7 +663,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8635" level="85" type="Folk" name="Gemini Agathion">
+	<npc id="8635" level="85" type="Folk" name="Agathion Gemini">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -682,7 +682,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8636" level="85" type="Folk" name="Scorpio Agathion">
+	<npc id="8636" level="85" type="Folk" name="Agathion Scorpio">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -701,7 +701,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8637" level="85" type="Folk" name="Aquarius Agathion">
+	<npc id="8637" level="85" type="Folk" name="Agathion Aquarius">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -720,7 +720,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8638" level="85" type="Folk" name="Pisces Agathion">
+	<npc id="8638" level="85" type="Folk" name="Agathion Pisces">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -739,7 +739,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8639" level="85" type="Folk" name="Sagittarius Agathion">
+	<npc id="8639" level="85" type="Folk" name="Agathion Sagittarius">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -758,7 +758,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8640" level="85" type="Folk" name="Cancer Agathion">
+	<npc id="8640" level="85" type="Folk" name="Agathion Cancer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -777,7 +777,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8641" level="85" type="Folk" name="Virgo Agathion">
+	<npc id="8641" level="85" type="Folk" name="Agathion Virgo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -796,7 +796,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8642" level="85" type="Folk" name="Capricorn Agathion">
+	<npc id="8642" level="85" type="Folk" name="Agathion Capricorn">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -815,7 +815,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8643" level="85" type="Folk" name="Libra Agathion">
+	<npc id="8643" level="85" type="Folk" name="Agathion Libra">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -834,7 +834,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8644" level="85" type="Folk" name="Aries Agathion">
+	<npc id="8644" level="85" type="Folk" name="Agathion Aries">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -853,7 +853,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8645" level="85" type="Folk" name="Taurus Agathion">
+	<npc id="8645" level="85" type="Folk" name="Agathion Taurus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -872,7 +872,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8646" level="85" type="Folk" name="Leo Agathion">
+	<npc id="8646" level="85" type="Folk" name="Agathion Leo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -891,7 +891,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8647" level="85" type="Folk" name="Gemini Agathion">
+	<npc id="8647" level="85" type="Folk" name="Agathion Gemini">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -910,7 +910,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8648" level="85" type="Folk" name="Scorpio Agathion">
+	<npc id="8648" level="85" type="Folk" name="Agathion Scorpio">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -929,7 +929,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8649" level="85" type="Folk" name="Aquarius Agathion">
+	<npc id="8649" level="85" type="Folk" name="Agathion Aquarius">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -948,7 +948,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8650" level="85" type="Folk" name="Pisces Agathion">
+	<npc id="8650" level="85" type="Folk" name="Agathion Pisces">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -967,7 +967,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8651" level="85" type="Folk" name="Sagittarius Agathion">
+	<npc id="8651" level="85" type="Folk" name="Agathion Sagittarius">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -986,7 +986,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8652" level="85" type="Folk" name="Cancer Agathion">
+	<npc id="8652" level="85" type="Folk" name="Agathion Cancer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1005,7 +1005,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8653" level="85" type="Folk" name="Virgo Agathion">
+	<npc id="8653" level="85" type="Folk" name="Agathion Virgo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1024,7 +1024,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8654" level="85" type="Folk" name="Capricorn Agathion">
+	<npc id="8654" level="85" type="Folk" name="Agathion Capricorn">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1043,7 +1043,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8655" level="85" type="Folk" name="Libra Agathion">
+	<npc id="8655" level="85" type="Folk" name="Agathion Libra">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1062,7 +1062,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8656" level="85" type="Folk" name="Aries Agathion">
+	<npc id="8656" level="85" type="Folk" name="Agathion Aries">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1081,7 +1081,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8657" level="85" type="Folk" name="Taurus Agathion">
+	<npc id="8657" level="85" type="Folk" name="Agathion Taurus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1100,7 +1100,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8658" level="85" type="Folk" name="Leo Agathion">
+	<npc id="8658" level="85" type="Folk" name="Agathion Leo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1119,7 +1119,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8659" level="85" type="Folk" name="Gemini Agathion">
+	<npc id="8659" level="85" type="Folk" name="Agathion Gemini">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1138,7 +1138,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8660" level="85" type="Folk" name="Scorpio Agathion">
+	<npc id="8660" level="85" type="Folk" name="Agathion Scorpio">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1157,7 +1157,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8661" level="85" type="Folk" name="Aquarius Agathion">
+	<npc id="8661" level="85" type="Folk" name="Agathion Aquarius">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1176,7 +1176,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8662" level="85" type="Folk" name="Pisces Agathion">
+	<npc id="8662" level="85" type="Folk" name="Agathion Pisces">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1195,7 +1195,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8663" level="85" type="Folk" name="Sagittarius Agathion">
+	<npc id="8663" level="85" type="Folk" name="Agathion Sagittarius">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1214,7 +1214,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8664" level="85" type="Folk" name="Cancer Agathion">
+	<npc id="8664" level="85" type="Folk" name="Agathion Cancer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1233,7 +1233,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8665" level="85" type="Folk" name="Virgo Agathion">
+	<npc id="8665" level="85" type="Folk" name="Agathion Virgo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1252,7 +1252,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8666" level="85" type="Folk" name="Capricorn Agathion">
+	<npc id="8666" level="85" type="Folk" name="Agathion Capricorn">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1271,7 +1271,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8667" level="85" type="Folk" name="Libra Agathion">
+	<npc id="8667" level="85" type="Folk" name="Agathion Libra">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1290,7 +1290,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8668" level="85" type="Folk" name="Aries Agathion">
+	<npc id="8668" level="85" type="Folk" name="Agathion Aries">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1309,7 +1309,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8669" level="85" type="Folk" name="Taurus Agathion">
+	<npc id="8669" level="85" type="Folk" name="Agathion Taurus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1328,7 +1328,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8670" level="85" type="Folk" name="Leo Agathion">
+	<npc id="8670" level="85" type="Folk" name="Agathion Leo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1347,7 +1347,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8671" level="85" type="Folk" name="Gemini Agathion">
+	<npc id="8671" level="85" type="Folk" name="Agathion Gemini">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1366,7 +1366,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8672" level="85" type="Folk" name="Scorpio Agathion">
+	<npc id="8672" level="85" type="Folk" name="Agathion Scorpio">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1385,7 +1385,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8673" level="85" type="Folk" name="Aquarius Agathion">
+	<npc id="8673" level="85" type="Folk" name="Agathion Aquarius">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1404,7 +1404,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8674" level="85" type="Folk" name="Pisces Agathion">
+	<npc id="8674" level="85" type="Folk" name="Agathion Pisces">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1423,7 +1423,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8675" level="85" type="Folk" name="Sagittarius Agathion">
+	<npc id="8675" level="85" type="Folk" name="Agathion Sagittarius">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1442,7 +1442,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="8676" level="85" type="Folk" name="Cancer Agathion">
+	<npc id="8676" level="85" type="Folk" name="Agathion Cancer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1480,7 +1480,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="8678" level="85" type="Folk" name="Bonfire" title="Made with matchsticks">
+	<npc id="8678" level="85" type="Folk" name="Campfire" title="Made with Matchsticks">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1537,7 +1537,7 @@
 			<height normal="17.7" />
 		</collision>
 	</npc>
-	<npc id="8681" level="85" type="Folk" name="Mermaid Agathion">
+	<npc id="8681" level="85" type="Folk" name="Agathion Mermaid">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1613,7 +1613,7 @@
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="8685" level="85" type="Folk" name="Meliodas Agathion">
+	<npc id="8685" level="85" type="Folk" name="Agathion Meliodas">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1632,7 +1632,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="8686" level="85" type="Folk" name="Elizabeth Agathion">
+	<npc id="8686" level="85" type="Folk" name="Agathion Elizabeth">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1651,7 +1651,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="8687" level="85" type="Folk" name="Hawk Agathion">
+	<npc id="8687" level="85" type="Folk" name="Agathion Hawk">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1670,7 +1670,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="8688" level="85" type="Folk" name="Ban Agathion">
+	<npc id="8688" level="85" type="Folk" name="Agathion Ban">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1689,7 +1689,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="8689" level="85" type="Folk" name="Diane Agathion">
+	<npc id="8689" level="85" type="Folk" name="Agathion Diane">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1708,7 +1708,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="8690" level="85" type="Folk" name="King Agathion">
+	<npc id="8690" level="85" type="Folk" name="Agathion King">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1727,7 +1727,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="8691" level="85" type="Folk" name="Merlin Agathion">
+	<npc id="8691" level="85" type="Folk" name="Agathion Merlin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1746,7 +1746,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="8692" level="85" type="Folk" name="Gowther Agathion">
+	<npc id="8692" level="85" type="Folk" name="Agathion Gowther">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1765,7 +1765,7 @@
 			<height normal="5" />
 		</collision>
 	</npc>
-	<npc id="8693" level="85" type="Folk" name="Escanor Agathion">
+	<npc id="8693" level="85" type="Folk" name="Agathion Escanor">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1822,7 +1822,7 @@
 			<height normal="10.5" />
 		</collision>
 	</npc>
-	<npc id="8696" level="85" type="Folk" name="Big Pumpkin">
+	<npc id="8696" level="85" type="Folk" name="Ripe Squash">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/08700-08799.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/08700-08799.xml
index 97fe94e144..f24cafe8e4 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/08700-08799.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/08700-08799.xml
@@ -57,7 +57,7 @@
 			<height normal="40.68" />
 		</collision>
 	</npc>
-	<npc id="8703" level="85" type="Folk" name="Uldie" title="Event manager">
+	<npc id="8703" level="85" type="Folk" name="Uldie" title="Event Manager">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -238,4 +238,23 @@
 			<height normal="16" />
 		</collision>
 	</npc>
+	<npc id="8712" level="85" type="Folk" name="Freya" 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="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="54" />
+				<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="28" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/12700-12799.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/12700-12799.xml
index 4548f212a4..1b6add8175 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/12700-12799.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/12700-12799.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="12774" level="1" type="Folk" name="Young Squash">
 		<!-- Confirmed CT2.5 -->
@@ -37,7 +37,7 @@
 			<height normal="10.5" />
 		</collision>
 	</npc>
-	<npc id="12775" level="1" type="Monster" name="High Quality Squash">
+	<npc id="12775" level="1" type="Monster" name="Ripe Squash">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -150,7 +150,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="12778" level="1" type="Monster" name="High Quality Large Squash">
+	<npc id="12778" level="1" type="Monster" name="Large Ripe Squash">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -226,7 +226,7 @@
 			<height normal="31" />
 		</collision>
 	</npc>
-	<npc id="12780" level="25" type="Pet" name="Baby Buffalo">
+	<npc id="12780" level="25" type="Pet" name="Buffalo Calf">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="Heal1" id="4717" level="1" />
@@ -270,7 +270,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="12781" level="25" type="Pet" name="Baby Kookaburra">
+	<npc id="12781" level="25" type="Pet" name="Kookaburra Chick">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="Heal1" id="4717" level="1" />
@@ -314,7 +314,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="12782" level="25" type="Pet" name="Baby Cougar">
+	<npc id="12782" level="25" type="Pet" name="Cougar Cub">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="Heal1" id="4717" level="1" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13100-13199.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13100-13199.xml
index ac736aa4e5..008c026279 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13100-13199.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="13100" level="55" type="Folk" name="Anakim">
 		<!-- Confirmed CT2.5 -->
@@ -2214,7 +2214,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="13156" level="55" type="Folk" name="Myo Race">
+	<npc id="13156" level="55" type="Folk" name="Undead">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
@@ -3264,7 +3264,7 @@
 			<height normal="34" />
 		</collision>
 	</npc>
-	<npc id="13184" level="80" type="Folk" name="Santa">
+	<npc id="13184" level="80" type="Folk" name="Santa Claus">
 		<!-- Confirmed CT2.5 -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
@@ -3301,7 +3301,7 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="13185" level="80" type="Folk" name="Santa">
+	<npc id="13185" level="80" type="Folk" name="Santa Claus">
 		<!-- Confirmed CT2.5 -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
@@ -3338,7 +3338,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13186" level="80" type="Folk" name="Santa">
+	<npc id="13186" level="80" type="Folk" name="Santa Claus">
 		<!-- Confirmed CT2.5 -->
 		<race>ANIMAL</race>
 		<sex>FEMALE</sex>
@@ -3485,7 +3485,7 @@
 			<height normal="12.5" />
 		</collision>
 	</npc>
-	<npc id="13190" level="85" type="Monster" name="Head Bull">
+	<npc id="13190" level="85" type="Monster" name="Mighty Bull">
 		<!-- Confirmed CT2.5 -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13200-13299.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13200-13299.xml
index 0e5ba81cb4..c679405816 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13200-13299.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13200-13299.xml
@@ -2932,7 +2932,7 @@
 			<height normal="5.35" grown="65.5" />
 		</collision>
 	</npc>
-	<npc id="13271" level="1" type="Folk" name="Growing Watermelon">
+	<npc id="13271" level="1" type="Folk" name="Young Watermelon">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -2969,7 +2969,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="13272" level="1" type="Monster" name="Rotten Watermelon">
+	<npc id="13272" level="1" type="Monster" name="Defective Watermelon">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -3007,7 +3007,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="13273" level="1" type="Monster" name="Fresh Watermelon">
+	<npc id="13273" level="1" type="Monster" name="Prime Watermelon">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -3046,7 +3046,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="13274" level="1" type="Monster" name="Plump Watermelon">
+	<npc id="13274" level="1" type="Monster" name="Large Prime Watermelon">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -3085,7 +3085,7 @@
 			<height normal="65" />
 		</collision>
 	</npc>
-	<npc id="13275" level="1" type="Folk" name="Growing Honey Watermelon">
+	<npc id="13275" level="1" type="Folk" name="Young Watermelon">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -3123,7 +3123,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="13276" level="1" type="Monster" name="Rotten Honey Watermelon">
+	<npc id="13276" level="1" type="Monster" name="Rotten Watermelon">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -3162,7 +3162,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="13277" level="1" type="Monster" name="Fresh Honey Watermelon">
+	<npc id="13277" level="1" type="Monster" name="Prime Watermelon">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -3201,7 +3201,7 @@
 			<height normal="52" />
 		</collision>
 	</npc>
-	<npc id="13278" level="1" type="Monster" name="Plump Honey Watermelon">
+	<npc id="13278" level="1" type="Monster" name="Large Prime Watermelon">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -3318,7 +3318,7 @@
 			<height normal="20.5" />
 		</collision>
 	</npc>
-	<npc id="13281" level="80" type="Folk" name="Skooldie" title="Event manager">
+	<npc id="13281" level="80" type="Folk" name="Skooldie" title="Event Manager">
 		<!-- Confirmed CT2.5 -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
@@ -3468,7 +3468,7 @@
 			<height normal="34" />
 		</collision>
 	</npc>
-	<npc id="13285" level="80" type="Folk" name="Santa" title="Event manager">
+	<npc id="13285" level="80" type="Folk" name="Santa Claus" title="Event Manager">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMAN</race>
 		<sex>MALE</sex>
@@ -3727,7 +3727,7 @@
 			<height normal="34" />
 		</collision>
 	</npc>
-	<npc id="13292" level="75" type="Folk" name="Employee of Magic Research Institute" title="Event manager">
+	<npc id="13292" level="75" type="Folk" name="Magic Laboratory Assistant" title="Event Manager">
 		<!-- Confirmed CT2.5 -->
 		<race>DWARF</race>
 		<sex>FEMALE</sex>
@@ -3837,7 +3837,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="13295" level="80" type="Folk" name="White Lady" title="Event manager">
+	<npc id="13295" level="80" type="Folk" name="White Lady" title="Event Manager">
 		<!-- Confirmed CT2.5 -->
 		<race>DWARF</race>
 		<sex>FEMALE</sex>
@@ -3874,7 +3874,7 @@
 			<height normal="17.5" />
 		</collision>
 	</npc>
-	<npc id="13296" level="80" type="Folk" name="Freya" title="Event manager">
+	<npc id="13296" level="80" type="Folk" name="Freya" title="Event Manager">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13300-13399.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13300-13399.xml
index ab3d9d374f..03065cafb5 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13300-13399.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13300-13399.xml
@@ -842,7 +842,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="13326" level="85" type="Folk" name="Severe Trap">
+	<npc id="13326" level="85" type="Folk" name="Frost Trap">
 		<parameters>
 			<param name="trap_skill_type" value="1" />
 			<skill name="trap_skill" id="10806" level="1" />
@@ -1526,7 +1526,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="13349" level="1" type="Monster" name="Shard of Light">
+	<npc id="13349" level="1" type="Monster" name="Light Shard">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
@@ -1754,7 +1754,7 @@
 			<height normal="18.5" />
 		</collision>
 	</npc>
-	<npc id="13357" level="99" type="Monster" name="Severe Trap">
+	<npc id="13357" level="99" type="Monster" name="Frost Trap">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="trap_skill_type" value="0" />
@@ -1787,7 +1787,7 @@
 			<height normal="10" />
 		</collision>
 	</npc>
-	<npc id="13358" level="99" type="Monster" name="Severe Trap">
+	<npc id="13358" level="99" type="Monster" name="Frost Trap">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="trap_skill_type" value="0" />
@@ -1820,7 +1820,7 @@
 			<height normal="10" />
 		</collision>
 	</npc>
-	<npc id="13359" level="99" type="Monster" name="Severe Trap">
+	<npc id="13359" level="99" type="Monster" name="Frost Trap">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="trap_skill_type" value="0" />
@@ -1853,7 +1853,7 @@
 			<height normal="10" />
 		</collision>
 	</npc>
-	<npc id="13360" level="99" type="Monster" name="Severe Trap">
+	<npc id="13360" level="99" type="Monster" name="Frost Trap">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="trap_skill_type" value="0" />
@@ -1886,7 +1886,7 @@
 			<height normal="10" />
 		</collision>
 	</npc>
-	<npc id="13361" level="99" type="Monster" name="Severe Trap">
+	<npc id="13361" level="99" type="Monster" name="Frost Trap">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="trap_skill_type" value="0" />
@@ -1919,7 +1919,7 @@
 			<height normal="10" />
 		</collision>
 	</npc>
-	<npc id="13362" level="99" type="Monster" name="Severe Trap">
+	<npc id="13362" level="99" type="Monster" name="Frost Trap">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="trap_skill_type" value="0" />
@@ -1952,7 +1952,7 @@
 			<height normal="10" />
 		</collision>
 	</npc>
-	<npc id="13363" level="99" type="Monster" name="Severe Trap">
+	<npc id="13363" level="99" type="Monster" name="Frost Trap">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="trap_skill_type" value="0" />
@@ -1985,7 +1985,7 @@
 			<height normal="10" />
 		</collision>
 	</npc>
-	<npc id="13364" level="99" type="Monster" name="Severe Trap">
+	<npc id="13364" level="99" type="Monster" name="Frost Trap">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="trap_skill_type" value="0" />
@@ -2018,7 +2018,7 @@
 			<height normal="10" />
 		</collision>
 	</npc>
-	<npc id="13365" level="99" type="Monster" name="Severe Trap">
+	<npc id="13365" level="99" type="Monster" name="Frost Trap">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="trap_skill_type" value="0" />
@@ -2051,7 +2051,7 @@
 			<height normal="10" />
 		</collision>
 	</npc>
-	<npc id="13366" level="99" type="Monster" name="Severe Trap">
+	<npc id="13366" level="99" type="Monster" name="Frost Trap">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="trap_skill_type" value="0" />
@@ -2994,7 +2994,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13398" level="55" type="Folk" name="Holiday Bae Kisung">
+	<npc id="13398" level="55" type="Folk" name="Holiday Agathion Bae Kisung">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
@@ -3019,7 +3019,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13399" level="1" type="Folk" name="Young Wintermelon">
+	<npc id="13399" level="1" type="Folk" name="Snowy Young Squash">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13400-13499.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13400-13499.xml
index 2175448d32..1c7de03a7b 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13400-13499.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13400-13499.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="13400" level="1" type="Monster" name="High Quality Wintermelon">
+	<npc id="13400" level="1" type="Monster" name="Snowy Ripe Squash">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -28,7 +28,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13401" level="1" type="Monster" name="Defective Wintermelon">
+	<npc id="13401" level="1" type="Monster" name="Snowy Rotten Squash">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -56,7 +56,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="13402" level="1" type="Monster" name="King Wintermelon">
+	<npc id="13402" level="1" type="Monster" name="Snowy Royal Ripe Squash">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -84,7 +84,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="13403" level="1" type="Folk" name="Young Large Wintermelon">
+	<npc id="13403" level="1" type="Folk" name="Snowy Large Young Squash">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -112,7 +112,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13404" level="1" type="Monster" name="High Quality Large Wintermelon">
+	<npc id="13404" level="1" type="Monster" name="Snowy Large Ripe Squash">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -140,7 +140,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="13405" level="1" type="Monster" name="Defective Large Wintermelon">
+	<npc id="13405" level="1" type="Monster" name="Snowy Large Rotten Squash">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -168,7 +168,7 @@
 			<height normal="31" />
 		</collision>
 	</npc>
-	<npc id="13406" level="1" type="Monster" name="Emperor Wintermelon">
+	<npc id="13406" level="1" type="Monster" name="Snowy Royal Large Ripe Squash">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -367,7 +367,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13416" level="99" type="Folk" name="Saggitarius">
+	<npc id="13416" level="99" type="Folk" name="Sagittarius">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -424,7 +424,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13419" level="1" type="Monster" name="High Quality Squash">
+	<npc id="13419" level="1" type="Monster" name="Ripe Squash">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -468,7 +468,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="13421" level="1" type="Monster" name="High Quality Large Squash">
+	<npc id="13421" level="1" type="Monster" name="Large Ripe Squash">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -787,7 +787,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="13436" level="85" type="Decoy" name="Decoy">
+	<npc id="13436" level="85" type="Decoy" name="False Decoy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -806,7 +806,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13437" level="90" type="Decoy" name="Decoy">
+	<npc id="13437" level="90" type="Decoy" name="False Decoy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -825,7 +825,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13438" level="95" type="Decoy" name="Decoy">
+	<npc id="13438" level="95" type="Decoy" name="False Decoy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -844,7 +844,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13439" level="99" type="Decoy" name="Decoy">
+	<npc id="13439" level="99" type="Decoy" name="False Decoy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1377,7 +1377,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="13461" level="101" type="Folk" name="Severe Trap">
+	<npc id="13461" level="101" type="Folk" name="Frost Trap">
 		<parameters>
 			<param name="trap_skill_type" value="0" />
 			<skill name="trap_skill" id="10806" level="2" />
@@ -1408,7 +1408,7 @@
 			<height normal="10" />
 		</collision>
 	</npc>
-	<npc id="13462" level="103" type="Folk" name="Severe Trap">
+	<npc id="13462" level="103" type="Folk" name="Frost Trap">
 		<parameters>
 			<param name="trap_skill_type" value="0" />
 			<skill name="trap_skill" id="10806" level="3" />
@@ -1439,7 +1439,7 @@
 			<height normal="10" />
 		</collision>
 	</npc>
-	<npc id="13463" level="105" type="Folk" name="Severe Trap">
+	<npc id="13463" level="105" type="Folk" name="Frost Trap">
 		<parameters>
 			<param name="trap_skill_type" value="0" />
 			<skill name="trap_skill" id="10806" level="4" />
@@ -1762,7 +1762,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="13485" level="85" type="Folk" name="Pisces">
+	<npc id="13485" level="85" type="Folk" name="Peace">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1781,7 +1781,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13486" level="85" type="Folk" name="Aquarius">
+	<npc id="13486" level="85" type="Folk" name="Aku">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1933,7 +1933,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13494" level="85" type="Folk" name="Saggitarius">
+	<npc id="13494" level="85" type="Folk" name="Sagittarius">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13500-13599.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13500-13599.xml
index 84357563b1..3655eaec7b 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13500-13599.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13500-13599.xml
@@ -114,7 +114,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13506" level="85" type="Folk" name="Saggitarius">
+	<npc id="13506" level="85" type="Folk" name="Sagittarius">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -342,7 +342,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13518" level="85" type="Folk" name="Saggitarius">
+	<npc id="13518" level="85" type="Folk" name="Sagittarius">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -772,7 +772,7 @@
 			<height normal="21.125" />
 		</collision>
 	</npc>
-	<npc id="13553" level="85" type="Folk" name="Virgo Agathion">
+	<npc id="13553" level="85" type="Folk" name="Agathion Virgo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -791,7 +791,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13554" level="85" type="Folk" name="Capricorn Agathion">
+	<npc id="13554" level="85" type="Folk" name="Agathion Capricorn">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -810,7 +810,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13555" level="85" type="Folk" name="Libra Agathion">
+	<npc id="13555" level="85" type="Folk" name="Agathion Libra">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -829,7 +829,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13556" level="85" type="Folk" name="Aries Agathion">
+	<npc id="13556" level="85" type="Folk" name="Agathion Aries">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -848,7 +848,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13557" level="85" type="Folk" name="Taurus Agathion">
+	<npc id="13557" level="85" type="Folk" name="Agathion Taurus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -867,7 +867,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13558" level="85" type="Folk" name="Leo Agathion">
+	<npc id="13558" level="85" type="Folk" name="Agathion Leo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -886,7 +886,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13559" level="85" type="Folk" name="Gemini Agathion">
+	<npc id="13559" level="85" type="Folk" name="Agathion Gemini">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -905,7 +905,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13560" level="85" type="Folk" name="Scorpio Agathion">
+	<npc id="13560" level="85" type="Folk" name="Agathion Scorpio">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -924,7 +924,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13561" level="85" type="Folk" name="Aquarius Agathion">
+	<npc id="13561" level="85" type="Folk" name="Agathion Aquarius">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -943,7 +943,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13562" level="85" type="Folk" name="Pisces Agathion">
+	<npc id="13562" level="85" type="Folk" name="Agathion Pisces">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -962,7 +962,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13563" level="85" type="Folk" name="Saggitarius Agathion">
+	<npc id="13563" level="85" type="Folk" name="Agathion Sagittarius">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -981,7 +981,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13564" level="85" type="Folk" name="Cancer Agathion">
+	<npc id="13564" level="85" type="Folk" name="Agathion Cancer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1114,7 +1114,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13571" level="85" type="Folk" name="Pollyne's Guard">
+	<npc id="13571" level="85" type="Folk" name="Paulina's Guard">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1209,7 +1209,7 @@
 			<height normal="9.5" />
 		</collision>
 	</npc>
-	<npc id="13576" level="107" type="EffectPoint" name="Solo Dance">
+	<npc id="13576" level="107" type="EffectPoint" name="Poison Swarm">
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1238,7 +1238,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="13577" level="109" type="EffectPoint" name="Solo Dance">
+	<npc id="13577" level="109" type="EffectPoint" name="Poison Swarm">
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1267,7 +1267,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="13578" level="107" type="Doppelganger" name="Incarnation">
+	<npc id="13578" level="107" type="Doppelganger" name="Clone Attack">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="8" />
 			<skill name="Skill02_ID" id="10551" level="8" />
@@ -1298,7 +1298,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13579" level="109" type="Doppelganger" name="Incarnation">
+	<npc id="13579" level="109" type="Doppelganger" name="Clone Attack">
 		<parameters>
 			<skill name="Skill01_ID" id="10550" level="9" />
 			<skill name="Skill02_ID" id="10551" level="9" />
@@ -1327,7 +1327,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="13580" level="107" type="EffectPoint" name="Solo Dance">
+	<npc id="13580" level="107" type="EffectPoint" name="Istina Acid Swarm">
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1360,7 +1360,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="13581" level="109" type="EffectPoint" name="Solo Dance">
+	<npc id="13581" level="109" type="EffectPoint" name="Istina Acid Swarm">
 		<parameters>
 			<param name="skill_delay" value="2" />
 			<param name="despawn_time" value="15" />
@@ -1463,7 +1463,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="13584" level="85" type="Folk" name="Severe Trap">
+	<npc id="13584" level="85" type="Folk" name="Frost Trap">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1482,7 +1482,7 @@
 			<height normal="10" />
 		</collision>
 	</npc>
-	<npc id="13585" level="85" type="Folk" name="Severe Trap">
+	<npc id="13585" level="85" type="Folk" name="Frost Trap">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1539,7 +1539,7 @@
 			<height normal="10" />
 		</collision>
 	</npc>
-	<npc id="13591" level="85" type="Folk" name="Greater Virgo Agathion Charm">
+	<npc id="13591" level="85" type="Folk" name="Greater Agathion Virgo Charm">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1558,7 +1558,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13592" level="85" type="Folk" name="Greater Capricorn Agathion Charm">
+	<npc id="13592" level="85" type="Folk" name="Greater Agathion Capricorn Charm">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1577,7 +1577,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13593" level="85" type="Folk" name="Greater Libra Agathion Charm">
+	<npc id="13593" level="85" type="Folk" name="Greater Agathion Libra Charm">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1596,7 +1596,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13594" level="85" type="Folk" name="Greater Aries Agathion Charm">
+	<npc id="13594" level="85" type="Folk" name="Greater Agathion Aries Charm">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1615,7 +1615,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13595" level="85" type="Folk" name="Greater Taurus Agathion Charm">
+	<npc id="13595" level="85" type="Folk" name="Greater Agathion Taurus Charm">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1634,7 +1634,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13596" level="85" type="Folk" name="Greater Leo Agathion Charm">
+	<npc id="13596" level="85" type="Folk" name="Greater Agathion Leo Charm">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1653,7 +1653,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13597" level="85" type="Folk" name="Greater Gemini Agathion Charm">
+	<npc id="13597" level="85" type="Folk" name="Greater Agathion Gemini Charm">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1672,7 +1672,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13598" level="85" type="Folk" name="Greater Scorpio Agathion Charm">
+	<npc id="13598" level="85" type="Folk" name="Greater Agathion Scorpio Charm">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1691,7 +1691,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13599" level="85" type="Folk" name="Greater Aquarius Agathion Charm">
+	<npc id="13599" level="85" type="Folk" name="Greater Agathion Aquarius Charm">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13600-13699.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13600-13699.xml
index 26879a8a45..62e73a050e 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13600-13699.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/13600-13699.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="13600" level="85" type="Folk" name="Greater Pisces Agathion Charm">
+	<npc id="13600" level="85" type="Folk" name="Greater Agathion Pisces Charm">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -19,7 +19,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13601" level="85" type="Folk" name="Greater Saggitarius Agathion Charm">
+	<npc id="13601" level="85" type="Folk" name="Greater Agathion Sagittarius Charm">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -38,7 +38,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13602" level="85" type="Folk" name="Greater Cancer Agathion Charm">
+	<npc id="13602" level="85" type="Folk" name="Greater Agathion Cancer Charm">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -209,4 +209,42 @@
 			<height normal="60" />
 		</collision>
 	</npc>
+	<npc id="13611" level="85" type="Folk" name="Fire Earthquake">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="20" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="0.001" />
+			<height normal="0.001" />
+		</collision>
+	</npc>
+	<npc id="13612" level="85" type="Folk" name="Warhorse">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="4234" hpRegen="10.5" mp="1846" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="26" />
+			<height normal="36" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/14600-14699.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/14600-14699.xml
index 5e740c6930..1dfa19ccbe 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/14600-14699.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/14600-14699.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="14600" level="80" type="Pet" name="Soulless">
 		<!-- Confirmed CT2.5 -->
@@ -3160,7 +3160,7 @@
 			<height normal="35.5" />
 		</collision>
 	</npc>
-	<npc id="14663" level="30" type="Pet" name="Mechanic Golem">
+	<npc id="14663" level="30" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="3" />
@@ -3205,7 +3205,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14664" level="38" type="Pet" name="Mechanic Golem">
+	<npc id="14664" level="38" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="3" />
@@ -3250,7 +3250,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14665" level="45" type="Pet" name="Mechanic Golem">
+	<npc id="14665" level="45" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="4" />
@@ -3295,7 +3295,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14666" level="51" type="Pet" name="Mechanic Golem">
+	<npc id="14666" level="51" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="5" />
@@ -3340,7 +3340,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14667" level="57" type="Pet" name="Mechanic Golem">
+	<npc id="14667" level="57" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="5" />
@@ -3385,7 +3385,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14668" level="62" type="Pet" name="Mechanic Golem">
+	<npc id="14668" level="62" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="6" />
@@ -3430,7 +3430,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14669" level="66" type="Pet" name="Mechanic Golem">
+	<npc id="14669" level="66" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="6" />
@@ -3475,7 +3475,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14670" level="70" type="Pet" name="Mechanic Golem">
+	<npc id="14670" level="70" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="7" />
@@ -3520,7 +3520,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14671" level="74" type="Pet" name="Mechanic Golem">
+	<npc id="14671" level="74" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="7" />
@@ -3565,7 +3565,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14672" level="78" type="Pet" name="Mechanic Golem">
+	<npc id="14672" level="78" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="8" />
@@ -3610,7 +3610,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14673" level="78" type="Pet" name="Mechanic Golem">
+	<npc id="14673" level="78" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="8" />
@@ -3655,7 +3655,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14674" level="78" type="Pet" name="Mechanic Golem">
+	<npc id="14674" level="78" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="8" />
@@ -3700,7 +3700,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14675" level="78" type="Pet" name="Mechanic Golem">
+	<npc id="14675" level="78" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="8" />
@@ -3745,7 +3745,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14676" level="79" type="Pet" name="Mechanic Golem">
+	<npc id="14676" level="79" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="8" />
@@ -3790,7 +3790,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14677" level="79" type="Pet" name="Mechanic Golem">
+	<npc id="14677" level="79" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="8" />
@@ -3835,7 +3835,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14678" level="79" type="Pet" name="Mechanic Golem">
+	<npc id="14678" level="79" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="9" />
@@ -3880,7 +3880,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14679" level="79" type="Pet" name="Mechanic Golem">
+	<npc id="14679" level="79" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="9" />
@@ -3925,7 +3925,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14680" level="80" type="Pet" name="Mechanic Golem">
+	<npc id="14680" level="80" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="9" />
@@ -3970,7 +3970,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14681" level="80" type="Pet" name="Mechanic Golem">
+	<npc id="14681" level="80" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="9" />
@@ -4015,7 +4015,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14682" level="80" type="Pet" name="Mechanic Golem">
+	<npc id="14682" level="80" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="9" />
@@ -4060,7 +4060,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14683" level="80" type="Pet" name="Mechanic Golem">
+	<npc id="14683" level="80" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="9" />
@@ -4105,7 +4105,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14684" level="81" type="Pet" name="Mechanic Golem">
+	<npc id="14684" level="81" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="10" />
@@ -4150,7 +4150,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14685" level="81" type="Pet" name="Mechanic Golem">
+	<npc id="14685" level="81" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="10" />
@@ -4195,7 +4195,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14686" level="81" type="Pet" name="Mechanic Golem">
+	<npc id="14686" level="81" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="10" />
@@ -4240,7 +4240,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14687" level="81" type="Pet" name="Mechanic Golem">
+	<npc id="14687" level="81" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="10" />
@@ -4285,7 +4285,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14688" level="82" type="Pet" name="Mechanic Golem">
+	<npc id="14688" level="82" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="10" />
@@ -4330,7 +4330,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14689" level="82" type="Pet" name="Mechanic Golem">
+	<npc id="14689" level="82" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="10" />
@@ -4375,7 +4375,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14690" level="82" type="Pet" name="Mechanic Golem">
+	<npc id="14690" level="82" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="11" />
@@ -4420,7 +4420,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14691" level="82" type="Pet" name="Mechanic Golem">
+	<npc id="14691" level="82" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="11" />
@@ -4465,7 +4465,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14692" level="83" type="Pet" name="Mechanic Golem">
+	<npc id="14692" level="83" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="11" />
@@ -4510,7 +4510,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14693" level="83" type="Pet" name="Mechanic Golem">
+	<npc id="14693" level="83" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="11" />
@@ -4555,7 +4555,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14694" level="83" type="Pet" name="Mechanic Golem">
+	<npc id="14694" level="83" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="11" />
@@ -4600,7 +4600,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14695" level="83" type="Pet" name="Mechanic Golem">
+	<npc id="14695" level="83" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="11" />
@@ -4645,7 +4645,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14696" level="84" type="Pet" name="Mechanic Golem">
+	<npc id="14696" level="84" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="12" />
@@ -4690,7 +4690,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14697" level="84" type="Pet" name="Mechanic Golem">
+	<npc id="14697" level="84" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="12" />
@@ -4735,7 +4735,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14698" level="84" type="Pet" name="Mechanic Golem">
+	<npc id="14698" level="84" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="12" />
@@ -4780,7 +4780,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14699" level="85" type="Pet" name="Mechanic Golem">
+	<npc id="14699" level="85" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="12" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/14700-14799.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/14700-14799.xml
index b9c55fcdb1..78e2e711a0 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/14700-14799.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/14700-14799.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="14700" level="85" type="Pet" name="Mechanic Golem">
+	<npc id="14700" level="85" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="12" />
@@ -45,7 +45,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14701" level="85" type="Pet" name="Mechanic Golem">
+	<npc id="14701" level="85" type="Pet" name="Mechanical Golem">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="DDMagic" id="4068" level="12" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/14900-14999.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/14900-14999.xml
index 855de3d75e..40120fb58a 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/14900-14999.xml
+++ b/L2J_Mobius_10.0_MasterClass/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">
 		<!-- Confirmed CT2.5 -->
@@ -918,7 +918,7 @@
 			<height normal="34" />
 		</collision>
 	</npc>
-	<npc id="14919" level="85" type="Monster" name="Meow Unit">
+	<npc id="14919" level="85" type="Monster" name="Cat Guild">
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1006,7 +1006,7 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="14922" level="85" type="Monster" name="Meow Unit">
+	<npc id="14922" level="85" type="Monster" name="Cat Guild">
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/15100-15199.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/15100-15199.xml
index 15a83b0f7a..f1a97d3373 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/15100-15199.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/15100-15199.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="15100" level="89" type="Servitor" name="Wynn Spectral Lord">
 		<race>ETC</race>
@@ -2290,7 +2290,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="15179" level="100" type="Servitor" name="Dark Crusader">
+	<npc id="15179" level="100" type="Servitor" name="Soul Specter">
 		<parameters>
 			<skill name="Skill01_ID" id="11383" level="1" />
 			<skill name="Skill02_ID" id="11384" level="1" />
@@ -2321,7 +2321,7 @@
 			<height normal="28.6" />
 		</collision>
 	</npc>
-	<npc id="15180" level="101" type="Servitor" name="Dark Crusader">
+	<npc id="15180" level="101" type="Servitor" name="Soul Specter">
 		<parameters>
 			<skill name="Skill01_ID" id="11383" level="1" />
 			<skill name="Skill02_ID" id="11384" level="1" />
@@ -2352,7 +2352,7 @@
 			<height normal="28.6" />
 		</collision>
 	</npc>
-	<npc id="15181" level="102" type="Servitor" name="Dark Crusader">
+	<npc id="15181" level="102" type="Servitor" name="Soul Specter">
 		<parameters>
 			<skill name="Skill01_ID" id="11383" level="2" />
 			<skill name="Skill02_ID" id="11384" level="2" />
@@ -2383,7 +2383,7 @@
 			<height normal="28.6" />
 		</collision>
 	</npc>
-	<npc id="15182" level="103" type="Servitor" name="Dark Crusader">
+	<npc id="15182" level="103" type="Servitor" name="Soul Specter">
 		<parameters>
 			<skill name="Skill01_ID" id="11383" level="2" />
 			<skill name="Skill02_ID" id="11384" level="2" />
@@ -2414,7 +2414,7 @@
 			<height normal="28.6" />
 		</collision>
 	</npc>
-	<npc id="15183" level="104" type="Servitor" name="Dark Crusader">
+	<npc id="15183" level="104" type="Servitor" name="Soul Specter">
 		<parameters>
 			<skill name="Skill01_ID" id="11383" level="3" />
 			<skill name="Skill02_ID" id="11384" level="3" />
@@ -2445,7 +2445,7 @@
 			<height normal="28.6" />
 		</collision>
 	</npc>
-	<npc id="15184" level="105" type="Servitor" name="Dark Crusader">
+	<npc id="15184" level="105" type="Servitor" name="Soul Specter">
 		<parameters>
 			<skill name="Skill01_ID" id="11383" level="3" />
 			<skill name="Skill02_ID" id="11384" level="3" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/15200-15299.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/15200-15299.xml
index e1e5ed83c1..f828d58042 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/15200-15299.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/15200-15299.xml
@@ -105,7 +105,7 @@
 			<height normal="67.5" />
 		</collision>
 	</npc>
-	<npc id="15203" level="99" type="Servitor" name="Burning Mechanic Golem">
+	<npc id="15203" level="99" type="Servitor" name="Burning Mechanical Golem">
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -131,7 +131,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="15204" level="101" type="Servitor" name="Burning Mechanic Golem">
+	<npc id="15204" level="101" type="Servitor" name="Burning Mechanical Golem">
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -157,7 +157,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="15205" level="103" type="Servitor" name="Burning Mechanic Golem">
+	<npc id="15205" level="103" type="Servitor" name="Burning Mechanical Golem">
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -183,7 +183,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="15206" level="105" type="Servitor" name="Burning Mechanic Golem">
+	<npc id="15206" level="105" type="Servitor" name="Burning Mechanical Golem">
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/15900-15999.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/15900-15999.xml
index b804a01d3f..29b98bf4a1 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/15900-15999.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/15900-15999.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="15922" level="99" type="Folk" name="">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -258,7 +258,7 @@
 			<height normal="55" grown="66" />
 		</collision>
 	</npc>
-	<npc id="15935" level="99" type="Monster" name="Evil Tumor" title="Attack Target">
+	<npc id="15935" level="99" type="Monster" name="Evil Tumor" title="Target">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/16000-16099.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/16000-16099.xml
index a6c7709e1e..d8458661c2 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/16000-16099.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/16000-16099.xml
@@ -2464,7 +2464,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="16049" level="55" type="Folk" name="Love Agathion">
+	<npc id="16049" level="55" type="Folk" name="Agathion Love">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -3372,7 +3372,7 @@
 			<height normal="7" />
 		</collision>
 	</npc>
-	<npc id="16063" level="55" type="Folk" name="Neolithica">
+	<npc id="16063" level="55" type="Folk" name="Saerom">
 		<!-- Confirmed CT2.5 -->
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
@@ -3409,7 +3409,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="16064" level="55" type="Folk" name="Juju">
+	<npc id="16064" level="55" type="Folk" name="Agathion Chuchu">
 		<!-- Confirmed CT2.5 -->
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
@@ -3446,7 +3446,7 @@
 			<height normal="7" />
 		</collision>
 	</npc>
-	<npc id="16065" level="55" type="Folk" name="Oink Oink">
+	<npc id="16065" level="55" type="Folk" name="Agathion Oink Oink">
 		<!-- Confirmed CT2.5 -->
 		<race>ELEMENTAL</race>
 		<sex>FEMALE</sex>
@@ -3683,7 +3683,7 @@
 			<height normal="33.5" />
 		</collision>
 	</npc>
-	<npc id="16069" level="55" type="Folk" name="Pona">
+	<npc id="16069" level="55" type="Folk" name="Agathion Pona">
 		<!-- Confirmed CT2.5 -->
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
@@ -3946,7 +3946,7 @@
 			<height normal="13.25" />
 		</collision>
 	</npc>
-	<npc id="16073" level="55" type="Monster" name="Rudolph Agathion">
+	<npc id="16073" level="55" type="Monster" name="Agathion Rudolph">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>MALE</sex>
@@ -4290,7 +4290,7 @@
 			<height normal="8" />
 		</collision>
 	</npc>
-	<npc id="16085" level="55" type="Monster" name="Cobra Agathion">
+	<npc id="16085" level="55" type="Monster" name="Agathion Cobra">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/16100-16199.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/16100-16199.xml
index c947106633..4f07932e8b 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/16100-16199.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/16100-16199.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="16100" level="55" type="Folk" name="Sin Eater">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -106,7 +106,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="16104" level="55" type="Monster" name="Valakas Agathion">
+	<npc id="16104" level="55" type="Monster" name="Agathion Valakas">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -150,7 +150,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="16106" level="55" type="Monster" name="Bae Kisung Agathion">
+	<npc id="16106" level="55" type="Monster" name="Agathion Bae Kisung">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -172,7 +172,7 @@
 			<height normal="3" />
 		</collision>
 	</npc>
-	<npc id="16107" level="55" type="Monster" name="Bae Kisung Holiday Agathion">
+	<npc id="16107" level="55" type="Monster" name="Holiday Agathion Bae Kisung">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18100-18199.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18100-18199.xml
index 299708863e..6bef1f2a92 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18100-18199.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="18100" level="76" type="FestivalMonster" name="Offering of Forbidden Path">
 		<parameters>
@@ -2558,7 +2558,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18150" level="78" type="Monster" name="Victim">
+	<npc id="18150" level="78" type="Monster" name="Sacrifice">
 		<parameters>
 			<param name="KeyBox" value="31455" />
 			<param name="StrongNPC" value="18158" />
@@ -2594,7 +2594,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18151" level="78" type="Monster" name="Victim">
+	<npc id="18151" level="78" type="Monster" name="Sacrifice">
 		<parameters>
 			<param name="KeyBox" value="31455" />
 			<param name="StrongNPC" value="18159" />
@@ -2630,7 +2630,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18152" level="78" type="Monster" name="Victim">
+	<npc id="18152" level="78" type="Monster" name="Sacrifice">
 		<parameters>
 			<param name="KeyBox" value="31455" />
 			<param name="StrongNPC" value="18160" />
@@ -2666,7 +2666,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18153" level="78" type="Monster" name="Victim">
+	<npc id="18153" level="78" type="Monster" name="Sacrifice">
 		<parameters>
 			<param name="KeyBox" value="31455" />
 			<param name="StrongNPC" value="18161" />
@@ -2702,7 +2702,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18154" level="78" type="Monster" name="Victim">
+	<npc id="18154" level="78" type="Monster" name="Sacrifice">
 		<parameters>
 			<param name="KeyBox" value="31455" />
 			<param name="StrongNPC" value="18162" />
@@ -2738,7 +2738,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18155" level="78" type="Monster" name="Victim">
+	<npc id="18155" level="78" type="Monster" name="Sacrifice">
 		<parameters>
 			<param name="KeyBox" value="31455" />
 			<param name="StrongNPC" value="18163" />
@@ -2774,7 +2774,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18156" level="78" type="Monster" name="Victim">
+	<npc id="18156" level="78" type="Monster" name="Sacrifice">
 		<parameters>
 			<param name="KeyBox" value="31455" />
 			<param name="StrongNPC" value="18164" />
@@ -2810,7 +2810,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18157" level="78" type="Monster" name="Victim">
+	<npc id="18157" level="78" type="Monster" name="Sacrifice">
 		<parameters>
 			<param name="KeyBox" value="31455" />
 			<param name="StrongNPC" value="18165" />
@@ -4619,7 +4619,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18191" level="78" type="Monster" name="Witch of dust">
+	<npc id="18191" level="78" type="Monster" name="Witch of Dust">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -4662,7 +4662,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18192" level="78" type="Monster" name="Witch of dust">
+	<npc id="18192" level="78" type="Monster" name="Witch of Dust">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -4724,7 +4724,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18193" level="78" type="Monster" name="Witch of dust">
+	<npc id="18193" level="78" type="Monster" name="Witch of Dust">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -4786,7 +4786,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18194" level="78" type="Monster" name="Witch of dust">
+	<npc id="18194" level="78" type="Monster" name="Witch of Dust">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -4846,7 +4846,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18195" level="78" type="Monster" name="Signet of Emperor">
+	<npc id="18195" level="78" type="Monster" name="Emperor's Seal Device">
 		<parameters>
 			<param name="MoveAroundSocial" value="115" />
 			<param name="MoveAroundSocial1" value="115" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18200-18299.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18200-18299.xml
index 840abc4b12..aece7989b1 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18200-18299.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="78" type="Monster" name="Charm of Corner">
 		<parameters>
@@ -1142,7 +1142,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18222" level="78" type="Monster" name="Assassin of Darkness">
+	<npc id="18222" level="78" type="Monster" name="Dark Assassin">
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -1184,7 +1184,7 @@
 			<height normal="37.5" />
 		</collision>
 	</npc>
-	<npc id="18223" level="78" type="Monster" name="Assassin of Darkness">
+	<npc id="18223" level="78" type="Monster" name="Dark Assassin">
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -1240,7 +1240,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18224" level="78" type="Monster" name="Assassin of Darkness">
+	<npc id="18224" level="78" type="Monster" name="Dark Assassin">
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -1299,7 +1299,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18225" level="78" type="Monster" name="Assassin of Darkness">
+	<npc id="18225" level="78" type="Monster" name="Dark Assassin">
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -1581,7 +1581,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18230" level="78" type="Monster" name="Signet of Emperor">
+	<npc id="18230" level="78" type="Monster" name="Emperor's Seal Device">
 		<parameters>
 			<param name="MoveAroundSocial" value="115" />
 			<param name="MoveAroundSocial1" value="115" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18400-18499.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18400-18499.xml
index faaeab316d..b7d948dc75 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18400-18499.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18400-18499.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="18400" level="78" type="Folk" name="Trap">
 		<!-- Confirmed CT2.5 -->
@@ -2505,7 +2505,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18468" level="99" type="Monster" name="Tester">
+	<npc id="18468" level="99" type="Monster" name="Test">
 		<race>ETC</race>
 		<sex>ETC</sex>
 		<acquire exp="735075" sp="176" />
@@ -3575,7 +3575,7 @@
 			<height normal="17.5" />
 		</collision>
 	</npc>
-	<npc id="18491" level="87" type="Monster" name="Lock" title="Tower of Naia">
+	<npc id="18491" level="87" type="Monster" name="Crystal" title="Tower of Naia">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<minions name="Privates">
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18700-18799.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18700-18799.xml
index b4677f3add..022cd5c1dd 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18700-18799.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18700-18799.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="18700" level="80" type="Monster">
 		<!-- Confirmed CT2.5 -->
@@ -3255,7 +3255,7 @@
 			<height normal="63" />
 		</collision>
 	</npc>
-	<npc id="18782" level="70" type="Monster" name="Shilen's Zealot">
+	<npc id="18782" level="70" type="Monster" name="Shillien's Zealot">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
@@ -3450,7 +3450,7 @@
 			<height normal="42" />
 		</collision>
 	</npc>
-	<npc id="18786" level="80" type="Monster" name="Defeated Troops Infantry">
+	<npc id="18786" level="80" type="Monster" name="Defeated Dragontroop Soldier">
 		<parameters>
 			<param name="Breath_Prob" value="1000" />
 			<param name="Skill01_Prob" value="1000" />
@@ -3557,7 +3557,7 @@
 			<height normal="39.5" />
 		</collision>
 	</npc>
-	<npc id="18788" level="81" type="Monster" name="Defeated Troops Wizard">
+	<npc id="18788" level="81" type="Monster" name="Defeated Dragontroop Wizard">
 		<parameters>
 			<param name="Breath_Prob" value="1000" />
 			<param name="Skill01_Prob" value="10000" />
@@ -3717,7 +3717,7 @@
 			<height normal="34.5" />
 		</collision>
 	</npc>
-	<npc id="18791" level="80" type="Monster" name="Defeated Troops Javelin Thrower">
+	<npc id="18791" level="80" type="Monster" name="Defeated Dragontroop Lancer">
 		<parameters>
 			<param name="Skill01_Prob" value="1000" />
 			<param name="Skill02_Prob" value="1000" />
@@ -3780,7 +3780,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18792" level="80" type="Monster" name="Defeated Troops Javelin Thrower">
+	<npc id="18792" level="80" type="Monster" name="Defeated Dragontroop Lancer">
 		<parameters>
 			<param name="Skill01_Prob" value="1000" />
 			<param name="Skill02_Prob" value="1000" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18800-18899.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18800-18899.xml
index a014a44ec1..ebb06692b0 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18800-18899.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/18800-18899.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="18800" level="77" type="Monster" name="Fledgling Lavasaurus">
 		<parameters>
@@ -466,7 +466,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="18812" level="81" type="Monster" name="Kasha's Eye" title="Atk. Spd. Boost">
+	<npc id="18812" level="81" type="Monster" name="Kasha's Eye" title="Atk. Spd.">
 		<parameters>
 			<param name="my_buff_type" value="1" />
 		</parameters>
@@ -497,7 +497,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="18813" level="81" type="Monster" name="Kasha's Eye" title="P. Atk. Boost">
+	<npc id="18813" level="81" type="Monster" name="Kasha's Eye" title="P. Atk.">
 		<parameters>
 			<param name="my_buff_type" value="2" />
 		</parameters>
@@ -528,7 +528,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="18814" level="81" type="Monster" name="Kasha's Eye" title="Critical Rate Boost">
+	<npc id="18814" level="81" type="Monster" name="Kasha's Eye" title="Critical Rate">
 		<parameters>
 			<param name="my_buff_type" value="3" />
 		</parameters>
@@ -891,7 +891,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="18826" level="80" type="Folk" name="Shilen's Evil Thoughts (Presentation)">
+	<npc id="18826" level="80" type="Folk" name="Shillien's Evil Thoughts (Presentation)">
 		<!-- Confirmed CT2.5 -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
@@ -990,7 +990,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="18829" level="80" type="Folk" name="Shilen's Evil Thoughts Captain (Presentation)">
+	<npc id="18829" level="80" type="Folk" name="Shillien's Evil Thoughts Captain (Presentation)">
 		<!-- Confirmed CT2.5 -->
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
@@ -2304,7 +2304,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18863" level="84" type="Monster" name="Priest Ugoros" title="Tanta Lizardmen">
+	<npc id="18863" level="84" type="Monster" name="Priest Ugoros" title="Tanta Lizardman">
 		<parameters>
 			<skill name="Skill01_ID" id="6426" level="1" />
 		</parameters>
@@ -2590,7 +2590,7 @@
 			<height normal="33" />
 		</collision>
 	</npc>
-	<npc id="18869" level="83" type="TamedBeast" name="Kookaburra" title="Tame">
+	<npc id="18869" level="83" type="TamedBeast" name="Alpine Kookaburra" title="Tame">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="my_type" value="1" />
@@ -2861,7 +2861,7 @@
 			<height normal="12.5" />
 		</collision>
 	</npc>
-	<npc id="18873" level="83" type="FeedableBeast" name="Baby Alpine Kookaburra">
+	<npc id="18873" level="83" type="FeedableBeast" name="Alpine Kookaburra">
 		<parameters>
 			<param name="my_type" value="1" />
 			<param name="my_grade" value="1" />
@@ -2917,7 +2917,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="18874" level="83" type="FeedableBeast" name="Young Kookaburra">
+	<npc id="18874" level="83" type="FeedableBeast" name="Alpine Kookaburra">
 		<parameters>
 			<param name="my_type" value="1" />
 			<param name="my_grade" value="2" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19000-19099.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19000-19099.xml
index b567454b36..4e26a159dd 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19000-19099.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19000-19099.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="19000" level="88" type="Monster" name="Mutated Millipede">
 		<parameters>
@@ -516,7 +516,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="19017" level="90" type="Folk" name="Fairy of the Genesis">
+	<npc id="19017" level="90" type="Folk" name="Fairy of Genesis">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ELEMENTAL</race>
 		<sex>FEMALE</sex>
@@ -2150,7 +2150,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="19076" level="93" type="Monster" name="Escort Paladin">
+	<npc id="19076" level="93" type="Monster" name="Praetorian Guard">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="14130" level="1" />
@@ -2494,7 +2494,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="19088" level="40" type="Folk" name="Follower of Shilen">
+	<npc id="19088" level="40" type="Folk" name="Follower of Shillien">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
@@ -2519,7 +2519,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="19089" level="99" type="Folk" name="Follower of Shilen">
+	<npc id="19089" level="99" type="Folk" name="Follower of Shillien">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19100-19199.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19100-19199.xml
index 7f14ba9c63..68712d7976 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19100-19199.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19100-19199.xml
@@ -504,7 +504,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="19115" level="98" type="Folk" name="Corrupted Poison Cloud">
+	<npc id="19115" level="98" type="Folk" name="Poisonous Cloud">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="selfBlasting" id="14264" level="1" />
@@ -737,7 +737,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="19123" level="95" type="Folk" name="Altar of Shilen">
+	<npc id="19123" level="95" type="Folk" name="Altar of Shillien">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19200-19299.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19200-19299.xml
index 25e863e96d..c86754f8e5 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19200-19299.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19200-19299.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="19200" level="85" type="FriendlyNpc" name="Reep" title="Weapons Merchant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -2792,7 +2792,7 @@
 			<height normal="45" />
 		</collision>
 	</npc>
-	<npc id="19276" level="99" type="Folk" name="Bundle (Presentation)">
+	<npc id="19276" level="99" type="Folk" name="Scarecrow">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
@@ -3030,7 +3030,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="19284" level="61" type="Folk" name="Explosive Orc Barrel">
+	<npc id="19284" level="61" type="Folk" name="Bomb Loaded Oak Barrel">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
@@ -3310,7 +3310,7 @@
 			<height normal="47.5" />
 		</collision>
 	</npc>
-	<npc id="19294" level="93" type="Monster" name="Cocoon Destroyer" title="Violent">
+	<npc id="19294" level="93" type="Monster" name="Cocoon Destroyer" title="Savage">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<param name="party_mode" value="1" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19500-19599.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19500-19599.xml
index 5a11810858..c376b07721 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19500-19599.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19500-19599.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="19501" level="99" type="Folk" name="Beleth">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -187,7 +187,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="19545" level="99" type="Folk" name="Warming Fire">
+	<npc id="19545" level="99" type="Folk" name="Flame of Calm">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -274,7 +274,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="19549" level="76" type="Folk" name="Whirling Vortex">
+	<npc id="19549" level="76" type="Folk" name="Tornado">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -293,7 +293,7 @@
 			<height normal="100" />
 		</collision>
 	</npc>
-	<npc id="19550" level="76" type="Folk" name="Whirling Vortex">
+	<npc id="19550" level="76" type="Folk" name="Tornado">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19600-19699.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19600-19699.xml
index 0a3de93178..4367af3944 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19600-19699.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19600-19699.xml
@@ -132,7 +132,7 @@
 			<height normal="60.8" />
 		</collision>
 	</npc>
-	<npc id="19608" level="85" type="Folk" name="Seal Device">
+	<npc id="19608" level="85" type="Folk" name="Emperor's Seal Device">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -302,7 +302,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="19624" level="85" type="Folk" name="Altar of Earth">
+	<npc id="19624" level="85" type="Folk" name="Earth Altar">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -319,7 +319,7 @@
 			<height normal="65" />
 		</collision>
 	</npc>
-	<npc id="19625" level="85" type="Folk" name="Altar of Wind">
+	<npc id="19625" level="85" type="Folk" name="Wind Altar">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -978,7 +978,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="19665" level="85" type="Folk" name="Giant Monster">
+	<npc id="19665" level="85" type="Folk" name="Raid Bosses">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -997,7 +997,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="19666" level="85" type="Folk" name="Embryo Disciple">
+	<npc id="19666" level="85" type="Folk" name="Embryo Apostle">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1263,7 +1263,7 @@
 			<height normal="193.5" />
 		</collision>
 	</npc>
-	<npc id="19680" level="85" type="Folk" name="Seal of Punishment" title="Seven Signs">
+	<npc id="19680" level="85" type="Folk" name="Seal of Scourge" title="Seven Signs">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1396,7 +1396,7 @@
 			<height normal="0.001" />
 		</collision>
 	</npc>
-	<npc id="19687" level="85" type="Folk" name="Enchant Type Giant">
+	<npc id="19687" level="85" type="Folk" name="Enhanced Giant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19700-19799.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19700-19799.xml
index 71c65f5853..922bbcaab8 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19700-19799.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19700-19799.xml
@@ -323,7 +323,7 @@
 			<height normal="193.5" />
 		</collision>
 	</npc>
-	<npc id="19717" level="85" type="Folk" name="Seal of Punishment">
+	<npc id="19717" level="85" type="Folk" name="Seal of Scourge">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -643,7 +643,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="19734" level="85" type="Folk" name="Explosive Orc Barrel">
+	<npc id="19734" level="85" type="Folk" name="Bomb Loaded Oak Barrel">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1204,64 +1204,64 @@
 			<height normal="300" />
 		</collision>
 	</npc>
-	<npc id="19782" level="85" type="Folk" name="Baium">
+	<npc id="19782" level="85" type="Folk" name="Lindvior">
 		<!-- AUTO GENERATED NPC 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="80" />
-				<run ground="120" />
+				<walk ground="100" />
+				<run ground="270" />
 			</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="65" />
-			<height normal="174" />
+			<radius normal="350" />
+			<height normal="210" />
 		</collision>
 	</npc>
-	<npc id="19783" level="85" type="Folk" name="Zaken">
+	<npc id="19783" level="85" type="Folk" name="Fafurion">
 		<!-- AUTO GENERATED NPC 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="42" />
-				<run ground="170" />
+				<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="16" />
-			<height normal="32" />
+			<radius normal="200" />
+			<height normal="320" />
 		</collision>
 	</npc>
-	<npc id="19784" level="85" type="Folk" name="Queen Ant">
+	<npc id="19784" level="85" type="Folk" name="Valakas">
 		<!-- AUTO GENERATED NPC 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="80" />
-				<run ground="130" />
+				<walk ground="120" />
+				<run ground="300" />
 			</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="53" />
+			<radius normal="190" />
+			<height normal="335" />
 		</collision>
 	</npc>
-	<npc id="19785" level="85" type="Folk" name="Orfen">
+	<npc id="19785" level="85" type="Folk" name="Eigis">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1269,15 +1269,15 @@
 			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
 			<speed>
 				<walk ground="60" />
-				<run ground="190" />
+				<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="35" />
-			<height normal="143" />
+			<radius normal="20" />
+			<height normal="67" />
 		</collision>
 	</npc>
 	<npc id="19786" level="85" type="Folk" name="Core">
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19800-19899.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
index 9561860300..ae0a89eaa1 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/19800-19899.xml
@@ -228,4 +228,441 @@
 			<height normal="46.5" />
 		</collision>
 	</npc>
+	<npc id="19812" level="85" type="Folk" name="Conquest Spirits' Flower">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="27.8" />
+		</collision>
+	</npc>
+	<npc id="19813" level="85" type="Folk" name="Conquest Spirits' 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="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="77" />
+			<height normal="118.1" />
+		</collision>
+	</npc>
+	<npc id="19814" level="85" type="Folk" name="Conquest Spirits' Light">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="4" hpRegen="10.5" mp="3024" 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="7" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="19815" level="85" type="Folk" name="Conquest Mutant">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="210" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="8" />
+			<height normal="27.5" />
+		</collision>
+	</npc>
+	<npc id="19816" level="85" type="Folk" name="Soul Flower">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="36" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="27.8" />
+		</collision>
+	</npc>
+	<npc id="19817" level="85" type="Folk" name="Soul Flower">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="36" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="27.8" />
+		</collision>
+	</npc>
+	<npc id="19818" level="85" type="Folk" name="Soul Flower">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="9" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="27.8" />
+		</collision>
+	</npc>
+	<npc id="19819" level="85" type="Folk" name="Soul Flower">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="27.8" />
+		</collision>
+	</npc>
+	<npc id="19820" level="85" type="Folk" name="Soul Flower">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="27.8" />
+		</collision>
+	</npc>
+	<npc id="19821" level="85" type="Folk" name="Soul Flower">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="9" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="27.8" />
+		</collision>
+	</npc>
+	<npc id="19822" level="85" type="Folk" name="Soul Flower">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="27.8" />
+		</collision>
+	</npc>
+	<npc id="19823" level="85" type="Folk" name="Soul Flower">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="27.8" />
+		</collision>
+	</npc>
+	<npc id="19824" level="85" type="Folk" name="Soul Flower">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="9" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="27.8" />
+		</collision>
+	</npc>
+	<npc id="19825" level="85" type="Folk" name="Soul Flower">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="27.8" />
+		</collision>
+	</npc>
+	<npc id="19826" level="85" type="Folk" name="Soul Flower">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="9" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="27.8" />
+		</collision>
+	</npc>
+	<npc id="19827" level="85" type="Folk" name="Soul 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="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="77" />
+			<height normal="118.1" />
+		</collision>
+	</npc>
+	<npc id="19828" level="85" type="Folk" name="Soul 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="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="77" />
+			<height normal="118.1" />
+		</collision>
+	</npc>
+	<npc id="19829" level="85" type="Folk" name="Soul 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="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="77" />
+			<height normal="118.1" />
+		</collision>
+	</npc>
+	<npc id="19830" level="85" type="Folk" name="Soul Light">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="67" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<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="7" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="19831" level="85" type="Folk" name="Soul Light">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="67" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<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="7" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="19832" level="85" type="Folk" name="Soul Light">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="67" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<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="7" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="19833" 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="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="1" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="0.1" />
+			<height normal="0.1" />
+		</collision>
+	</npc>
+	<npc id="19834" 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="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="1" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="0.001" />
+			<height normal="0.001" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20100-20199.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20100-20199.xml
index cc224dd8fe..b67b5bde1b 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20100-20199.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="20116" level="2" type="Monster" name="Fox">
 		<parameters>
@@ -530,7 +530,7 @@
 			<height normal="44" />
 		</collision>
 	</npc>
-	<npc id="20143" level="12" type="Monster" name="Bear">
+	<npc id="20143" level="12" type="Monster" name="Grizzly Bear">
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20200-20299.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20200-20299.xml
index a65e5da95f..b8d8ff4aa9 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20200-20299.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="20203" level="20" type="Monster" name="Dion Grizzly">
 		<parameters>
@@ -2203,7 +2203,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="20241" level="52" type="Monster" name="Hunter Gargoyle">
+	<npc id="20241" level="52" type="Monster" name="Gargoyle Hunter">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -3107,7 +3107,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="20266" level="25" type="Monster" name="Monster Eye Gazer">
+	<npc id="20266" level="25" type="Monster" name="Monster Eye Overseer">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20400-20499.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20400-20499.xml
index bdf5dd8faf..6adeb56baa 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20400-20499.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="20403" level="16" type="Monster" name="Hunter Tarantula">
 		<parameters>
@@ -297,7 +297,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="20426" level="10" type="Monster" name="Evil Eye">
+	<npc id="20426" level="10" type="Monster" name="Eye of Seer">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -1480,7 +1480,7 @@
 			<height normal="25.5" />
 		</collision>
 	</npc>
-	<npc id="20477" level="6" type="Monster" name="Kasha Timber Wolf">
+	<npc id="20477" level="6" type="Monster" name="Kasha Forest Wolf">
 		<parameters>
 			<param name="MoveAroundSocial" value="60" />
 			<param name="MoveAroundSocial1" value="60" />
@@ -1677,7 +1677,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="20483" level="17" type="Monster" name="Corpse Candle">
+	<npc id="20483" level="17" type="Monster" name="Deadman�s Lamp">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20500-20599.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20500-20599.xml
index 966e372e5d..afb75bdac0 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20500-20599.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20500-20599.xml
@@ -307,7 +307,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="20510" level="12" type="Monster" name="Puma">
+	<npc id="20510" level="12" type="Monster" name="Crystal Puma">
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
 			<param name="MoveAroundSocial1" value="90" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20600-20699.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20600-20699.xml
index 021933c547..d650d3f021 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20600-20699.xml
+++ b/L2J_Mobius_10.0_MasterClass/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>
@@ -2218,7 +2218,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="20682" level="46" type="Monster" name="Vanor Silenos Solider">
+	<npc id="20682" level="46" type="Monster" name="Vanor Silenos Soldier">
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="50" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20800-20899.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20800-20899.xml
index c40f641677..86ff3468ba 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20800-20899.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="47" type="Monster" name="Eva's Watchman">
 		<parameters>
@@ -61,7 +61,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="20801" level="48" type="Monster" name="Theeder Piker">
+	<npc id="20801" level="48" type="Monster" name="Theeder Pikeman">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -1160,7 +1160,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="20846" level="92" type="Monster" name="Doll Blader">
+	<npc id="20846" level="92" type="Monster" name="Maiden Doll">
 		<parameters>
 			<param name="MoveAroundSocial" value="50" />
 			<param name="MoveAroundSocial1" value="50" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20900-20999.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20900-20999.xml
index 665bab7e47..3f96ec43f1 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20900-20999.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/20900-20999.xml
@@ -415,7 +415,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="20926" level="25" type="Monster" name="Poison Araneid">
+	<npc id="20926" level="25" type="Monster" name="Arachnid Predator">
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
 			<param name="MoveAroundSocial1" value="80" />
@@ -1098,7 +1098,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20937" level="108" type="Monster" name="Tanor Silenos Solider">
+	<npc id="20937" level="108" type="Monster" name="Tanor Silenos Soldier">
 		<parameters>
 			<skill name="Skill01_ID" id="32827" level="1" />
 			<param name="Skill01_Probablity" value="2000" />
@@ -2227,7 +2227,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="20977" level="65" type="Monster" name="Elmoreden's Lady">
+	<npc id="20977" level="65" type="Monster" name="Elmoreden Lady">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/21500-21599.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/21500-21599.xml
index d1ae6c612a..751fb202e6 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/21500-21599.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/21500-21599.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="21508" level="66" type="Monster" name="Splinter Stakato">
 		<parameters>
@@ -3492,7 +3492,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21561" level="67" type="Monster" name="Sacrificed Man">
+	<npc id="21561" level="67" type="Monster" name="Sacrifice">
 		<parameters>
 			<param name="MoveAroundSocial" value="120" />
 			<param name="MoveAroundSocial1" value="120" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/21600-21699.xml
index b0ec51eff0..92d3422954 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="21600" level="70" type="Monster" name="Requiem Behemoth">
 		<parameters>
@@ -800,7 +800,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="21613" level="92" type="Monster" name="Dismal shout">
+	<npc id="21613" level="92" type="Monster" name="Dismal Shriller">
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/22000-22099.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/22000-22099.xml
index 2661700844..e598d77d7d 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/22000-22099.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/22000-22099.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="22001" level="25" type="Monster" name="Grim Wolf">
 		<parameters>
@@ -602,7 +602,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22083" level="55" type="Monster" name="Baby Panthera">
+	<npc id="22083" level="55" type="Monster" name="Panthera Cub">
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
 			<param name="MoveAroundSocial1" value="30" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/22500-22599.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/22500-22599.xml
index 565fd20aa9..2d82d50fb3 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/22500-22599.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/22500-22599.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="22500" level="78" type="Monster" name="Lost Watchman">
 		<parameters>
@@ -711,7 +711,7 @@
 			<height normal="42" />
 		</collision>
 	</npc>
-	<npc id="22541" level="94" type="Monster" name="Dragontroop Infantry">
+	<npc id="22541" level="94" type="Monster" name="Dragontroop Soldier">
 		<parameters>
 			<param name="Breath_Prob" value="1000" />
 			<param name="Skill01_Prob" value="1000" />
@@ -984,7 +984,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22546" level="93" type="Monster" name="Berserker">
+	<npc id="22546" level="93" type="Monster" name="Dragontroop Berserker">
 		<parameters>
 			<param name="Skill01_Prob" value="3333" />
 			<skill name="Skill01_ID" id="5274" level="5" />
@@ -1648,7 +1648,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22597" level="94" type="Monster" name="Dragontroop Infantry">
+	<npc id="22597" level="94" type="Monster" name="Dragontroop Soldier">
 		<parameters>
 			<param name="Breath_Prob" value="1000" />
 			<param name="Skill01_Prob" value="1000" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/22800-22899.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/22800-22899.xml
index 634d11e3f9..cab8346c46 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/22800-22899.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/22800-22899.xml
@@ -1546,7 +1546,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="22857" level="85" type="Monster" name="Knoriks" title="Land Dragon's Patrol">
+	<npc id="22857" level="85" type="Monster" name="Knoriks" title="Earth Dragon's Patrol">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="4239720" sp="1017" />
@@ -1852,7 +1852,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22867" level="90" type="Monster" name="Fairy Warrior" title="Violent">
+	<npc id="22867" level="90" type="Monster" name="Fairy Warrior" title="Savage">
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -2364,7 +2364,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22875" level="90" type="Monster" name="Fairy Rogue" title="Violent">
+	<npc id="22875" level="90" type="Monster" name="Fairy Rogue" title="Savage">
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -2868,7 +2868,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22883" level="90" type="Monster" name="Fairy Knight" title="Violent">
+	<npc id="22883" level="90" type="Monster" name="Fairy Knight" title="Savage">
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -3380,7 +3380,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22891" level="90" type="Monster" name="Satyr Wizard" title="Violent">
+	<npc id="22891" level="90" type="Monster" name="Satyr Wizard" title="Savage">
 		<parameters>
 			<param name="MoveAroundSocial" value="120" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -3904,7 +3904,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22899" level="90" type="Monster" name="Satyr Summoner" title="Violent">
+	<npc id="22899" level="90" type="Monster" name="Satyr Summoner" title="Savage">
 		<parameters>
 			<param name="MoveAroundSocial" value="120" />
 			<param name="MoveAroundSocial1" value="120" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/22900-22999.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/22900-22999.xml
index 5cfcf8ebb9..73edfdba2a 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/22900-22999.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/22900-22999.xml
@@ -459,7 +459,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22907" level="90" type="Monster" name="Satyr Witch" title="Violent">
+	<npc id="22907" level="90" type="Monster" name="Satyr Witch" title="Savage">
 		<parameters>
 			<param name="MoveAroundSocial" value="120" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1794,7 +1794,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22932" level="86" type="Monster" name="Krakia Carcass">
+	<npc id="22932" level="86" type="Monster" name="Krakia Krakos">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -2362,7 +2362,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22940" level="86" type="Monster" name="Demonic Carcass">
+	<npc id="22940" level="86" type="Monster" name="Demonic Krakos">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="100" />
@@ -4174,7 +4174,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22983" level="93" type="Monster" name="Escort Warrior">
+	<npc id="22983" level="93" type="Monster" name="Praetorian Battle Mage">
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
 			<param name="MoveAroundSocial1" value="80" />
@@ -4213,7 +4213,7 @@
 			<height normal="55" />
 		</collision>
 	</npc>
-	<npc id="22984" level="20" type="Monster" name="Nemertess" title="Escort">
+	<npc id="22984" level="20" type="Monster" name="Nemertess" title="Praetorian">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="100" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23000-23099.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23000-23099.xml
index 786de3ed3a..edadbede69 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23000-23099.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23000-23099.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="23010" level="98" type="Monster" name="Square Intruder">
 		<parameters>
@@ -1571,7 +1571,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="23046" level="61" type="Monster" name="Byron's Knight">
+	<npc id="23046" level="61" type="Monster" name="Baron's Knight">
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
 			<param name="MoveAroundSocial1" value="80" />
@@ -1824,7 +1824,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="23051" level="62" type="Monster" name="Byron's Confidant">
+	<npc id="23051" level="62" type="Monster" name="Baron's Confidant">
 		<parameters>
 			<param name="MoveAroundSocial" value="114" />
 			<param name="MoveAroundSocial1" value="114" />
@@ -3265,7 +3265,7 @@
 			<height normal="26" />
 		</collision>
 	</npc>
-	<npc id="23080" level="94" type="Monster" name="Corrupted Poison Cloud">
+	<npc id="23080" level="94" type="Monster" name="Poisonous Cloud">
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
 			<param name="MoveAroundSocial1" value="80" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23100-23199.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23100-23199.xml
index db29a32e9f..d42c0d4555 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23100-23199.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23100-23199.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="23101" level="61" type="Monster" name="Slaughter Bathin">
 		<parameters>
@@ -164,7 +164,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="23104" level="65" type="Monster" name="Elmoreden's Lady">
+	<npc id="23104" level="65" type="Monster" name="Elmoreden Lady">
 		<parameters>
 			<minions name="Privates">
 				<npc id="23107" count="1" respawnTime="360" weightPoint="1" />
@@ -2379,7 +2379,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23151" level="96" type="Monster" name="Shilen's Messenger">
+	<npc id="23151" level="96" type="Monster" name="Shillien's Messenger">
 		<parameters>
 			<param name="MoveAroundSocial" value="180" />
 			<param name="MoveAroundSocial1" value="180" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23200-23299.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23200-23299.xml
index 12ebde2362..5a66806172 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23200-23299.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23200-23299.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="23200" level="97" type="Monster" name="Turan the Severed Ghost">
 		<parameters>
@@ -447,7 +447,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23209" level="97" type="Monster" name="Kelbara the Dualsword Slaughterer">
+	<npc id="23209" level="97" type="Monster" name="Kelbara the Dual Sword Slaughterer">
 		<parameters>
 			<param name="MoveAroundSocial" value="119" />
 			<param name="MoveAroundSocial1" value="119" />
@@ -3095,7 +3095,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23260" level="94" type="Monster" name="Summoned Golem Body">
+	<npc id="23260" level="94" type="Monster" name="Summoned Golem">
 		<parameters>
 			<param name="MoveAroundSocial" value="68" />
 			<param name="MoveAroundSocial1" value="68" />
@@ -4858,7 +4858,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23291" level="98" type="Monster" name="Personal Magician">
+	<npc id="23291" level="98" type="Monster" name="Elite Wizard">
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<acquire exp="11484656" sp="10277" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23300-23399.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23300-23399.xml
index 65d0d7b860..1bf238b268 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23300-23399.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23300-23399.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="23300" level="98" type="Monster" name="Commander of Operations">
 		<parameters>
@@ -707,7 +707,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23324" level="99" type="Monster" name="Captain (Raiders Crossroads)">
+	<npc id="23324" level="99" type="Monster" name="Captain" title="Nerva Bloodlust">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="312430692" sp="312456" />
@@ -740,7 +740,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23325" level="99" type="Monster" name="Archer (Raiders Crossroads)">
+	<npc id="23325" level="99" type="Monster" name="Archer" title="Nerva Bloodlust">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="15304" />
@@ -778,7 +778,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23326" level="99" type="Monster" name="Wizard (Raiders Crossroads)">
+	<npc id="23326" level="99" type="Monster" name="Wizard" title="Nerva Bloodlust">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="8688" />
@@ -817,7 +817,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23327" level="99" type="Monster" name="Soldier (Raiders Crossroads)">
+	<npc id="23327" level="99" type="Monster" name="Soldier" title="Nerva Bloodlust">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="17325" />
@@ -855,7 +855,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23328" level="99" type="Monster" name="Assassin (Raiders Crossroads)">
+	<npc id="23328" level="99" type="Monster" name="Assassin" title="Nerva Bloodlust">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="56356731" sp="56454" />
@@ -892,7 +892,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23329" level="99" type="Monster" name="Nerva Kaiser">
+	<npc id="23329" level="99" type="Monster" name="Nerva Kaysen">
 		<race>ETC</race>
 		<sex>MALE</sex>
 		<acquire exp="1752885034" sp="1752909" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23400-23499.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23400-23499.xml
index 1886011574..40b4d44719 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23400-23499.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23400-23499.xml
@@ -3373,7 +3373,7 @@
 		<shots shotChance="30" spiritChance="30" />
 		<exCrtEffect>false</exCrtEffect>
 		<collision>
-			<radius normal="29" />
+			<radius normal="20" />
 			<height normal="72" />
 		</collision>
 		<dropLists>
@@ -3665,7 +3665,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23497" level="99" type="Monster" name="Blazing Saurus" title="Fire Stigma">
+	<npc id="23497" level="99" type="Monster" name="Blazing Saurus" title="Mark of Fire">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="147131926" sp="132412" />
@@ -3711,7 +3711,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23498" level="99" type="Monster" name="Blazing Wizard" title="Fire Stigma">
+	<npc id="23498" level="99" type="Monster" name="Blazing Wizard" title="Mark of Fire">
 		<race>UNDEAD</race>
 		<sex>FEMALE</sex>
 		<acquire exp="147131926" sp="132412" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23500-23599.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23500-23599.xml
index a07f48b742..9c82468487 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23500-23599.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23500-23599.xml
@@ -77,7 +77,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23502" level="99" type="Monster" name="Flame Salamander">
+	<npc id="23502" level="99" type="Monster" name="Blazing Salamander">
 		<parameters>
 			<skill name="Skill01_ID" id="32849" level="1" />
 			<param name="Skill01_Probablity" value="100" />
@@ -3110,7 +3110,7 @@
 			<height normal="28.25" />
 		</collision>
 	</npc>
-	<npc id="23588" level="102" type="Monster" name="Hummel" title="Embryo Quartermaster">
+	<npc id="23588" level="102" type="Monster" name="Hummel" title="Quartermaster">
 		<!-- Source: www.l2wiki.com (2015-04-08) -->
 		<race>HUMANOID</race>
 		<acquire exp="5738066517" sp="5738119" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23600-23699.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23600-23699.xml
index bc6b2dc5d0..eac005f997 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23600-23699.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23600-23699.xml
@@ -1874,7 +1874,7 @@
 			<height normal="25.5" />
 		</collision>
 	</npc>
-	<npc id="23648" level="110" type="Monster" name="Dark Crusader">
+	<npc id="23648" level="110" type="Monster" name="Soul Specter">
 		<parameters>
 			<skill name="DDMagic1" id="11383" level="1" />
 			<skill name="DDMagic2" id="11384" level="1" />
@@ -3242,7 +3242,7 @@
 			<skill id="14817" level="1" /> <!-- Instant Kill Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="23683" level="102" type="Monster" name="Seal Archangel">
+	<npc id="23683" level="102" type="Monster" name="Sealed Archangel">
 		<race>DIVINE</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -3270,7 +3270,7 @@
 			<skill id="14823" level="1" /> <!-- Instant Kill Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="23684" level="100" type="Monster" name="Seal Angel">
+	<npc id="23684" level="100" type="Monster" name="Sealed Angel">
 		<race>DIVINE</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -3297,7 +3297,7 @@
 			<skill id="14821" level="1" /> <!-- Instant Kill Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="23685" level="101" type="Monster" name="Seal Angel">
+	<npc id="23685" level="101" type="Monster" name="Sealed Angel">
 		<race>DIVINE</race>
 		<sex>MALE</sex>
 		<acquire exp="2038660364" sp="4077340" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23700-23799.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23700-23799.xml
index 331426befa..b729c54388 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23700-23799.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23700-23799.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="23700" level="100" type="Monster" name="Altar Guardian">
 		<race>ETC</race>
@@ -860,7 +860,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23728" level="100" type="Monster" name="Shaqrima Carcass">
+	<npc id="23728" level="100" type="Monster" name="Shaqrima Krakos">
 		<race>GIANT</race>
 		<acquire exp="1333313600" sp="1199900" />
 		<equipment rhand="15304" />
@@ -989,7 +989,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23731" level="101" type="Monster" name="Om Carcass">
+	<npc id="23731" level="101" type="Monster" name="Om Krakos">
 		<race>GIANT</race>
 		<acquire exp="1187051811" sp="1068249" />
 		<equipment rhand="15304" />
@@ -1442,7 +1442,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23742" level="101" type="Monster" name="Naia Bathus" title="Demons Foreman">
+	<npc id="23742" level="101" type="Monster" name="Naia Bathus" title="Demonic Foreman">
 		<parameters>
 			<skill name="Skill01_ID" id="16594" level="1" />
 			<param name="Skill01_Probablity" value="2000" />
@@ -1492,7 +1492,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23743" level="101" type="Monster" name="Naia Karkus" title="Demons Foreman">
+	<npc id="23743" level="101" type="Monster" name="Naia Krakos" title="Demonic Foreman">
 		<!-- Source: www.l2wiki.com -->
 		<parameters>
 			<skill name="Skill01_ID" id="16595" level="1" />
@@ -1546,7 +1546,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23744" level="101" type="Monster" name="Naia Kshana" title="Demons Foreman">
+	<npc id="23744" level="101" type="Monster" name="Naia Kshana" title="Demonic Foreman">
 		<race>GIANT</race>
 		<acquire exp="494607115" sp="445070" />
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1592,7 +1592,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23745" level="101" type="Monster" name="Naia Lucas" title="Demons Foreman">
+	<npc id="23745" level="101" type="Monster" name="Naia Lucas" title="Demonic Foreman">
 		<race>GIANT</race>
 		<acquire exp="247303558" sp="247375" />
 		<equipment rhand="15304" />
@@ -2248,7 +2248,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23763" level="85" type="Monster" name="Fairy Knight" title="Enraged">
+	<npc id="23763" level="85" type="Monster" name="Fairy Knight" title="Savage">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2304,7 +2304,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23765" level="85" type="Monster" name="Fairy Rogue" title="Enraged">
+	<npc id="23765" level="85" type="Monster" name="Fairy Rogue" title="Savage">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2360,7 +2360,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="23767" level="85" type="Monster" name="Fairy Warrior" title="Enraged">
+	<npc id="23767" level="85" type="Monster" name="Fairy Warrior" title="Savage">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2418,7 +2418,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="23769" level="85" type="Monster" name="Satyr Summoner" title="Enraged">
+	<npc id="23769" level="85" type="Monster" name="Satyr Summoner" title="Savage">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2478,7 +2478,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="23771" level="85" type="Monster" name="Satyr Witch" title="Enraged">
+	<npc id="23771" level="85" type="Monster" name="Satyr Witch" title="Savage">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2538,7 +2538,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="23773" level="85" type="Monster" name="Satyr Wizard" title="Enraged">
+	<npc id="23773" level="85" type="Monster" name="Satyr Wizard" title="Savage">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2634,7 +2634,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23775" level="102" type="Monster" name="Delta Carcass">
+	<npc id="23775" level="102" type="Monster" name="Delta Krakos">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="16653" level="1" />
@@ -3322,7 +3322,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23792" level="101" type="Monster" name="Carcass" title="Marred">
+	<npc id="23792" level="101" type="Monster" name="Krakos" title="Marred">
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<equipment rhand="15304" />
@@ -3536,7 +3536,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="23799" level="102" type="Monster" name="Delta Carcass" title="Superion Scout">
+	<npc id="23799" level="102" type="Monster" name="Delta Krakos" title="Superion Scout">
 		<race>GIANT</race>
 		<acquire exp="364870361" sp="328351" />
 		<equipment rhand="15304" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23800-23899.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23800-23899.xml
index f62b3bd712..f06cc808ea 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23800-23899.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23800-23899.xml
@@ -1422,7 +1422,7 @@
 			<height normal="34" />
 		</collision>
 	</npc>
-	<npc id="23852" level="85" type="Monster" name="Hell Armor" title="Devil's Advocate">
+	<npc id="23852" level="85" type="Monster" name="Hell Armor" title="Devil�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1464,7 +1464,7 @@
 			<height normal="42" />
 		</collision>
 	</npc>
-	<npc id="23854" level="85" type="Monster" name="Hell Lord" title="Devil's Advocate">
+	<npc id="23854" level="85" type="Monster" name="Hell Lord" title="Devil�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1634,7 +1634,7 @@
 			<height normal="53.5" />
 		</collision>
 	</npc>
-	<npc id="23862" level="85" type="Monster" name="Drak" title="Dragon's Advocate">
+	<npc id="23862" level="85" type="Monster" name="Drak" title="Dragon�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1676,7 +1676,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="23864" level="85" type="Monster" name="Chaos Drake" title="Dragon's Advocate">
+	<npc id="23864" level="85" type="Monster" name="Chaos Drake" title="Dragon�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23900-23999.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23900-23999.xml
index ae45c38180..c43988a4a5 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23900-23999.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/23900-23999.xml
@@ -226,7 +226,7 @@
 			<height normal="34" />
 		</collision>
 	</npc>
-	<npc id="23910" level="85" type="Monster" name="Hell Armor" title="Devil's Advocate">
+	<npc id="23910" level="85" type="Monster" name="Hell Armor" title="Devil�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -272,7 +272,7 @@
 			<height normal="42" />
 		</collision>
 	</npc>
-	<npc id="23912" level="85" type="Monster" name="Hell Lord" title="Devil's Advocate">
+	<npc id="23912" level="85" type="Monster" name="Hell Lord" title="Devil�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -458,7 +458,7 @@
 			<height normal="53.5" />
 		</collision>
 	</npc>
-	<npc id="23920" level="85" type="Monster" name="Drak" title="Dragon's Advocate">
+	<npc id="23920" level="85" type="Monster" name="Drak" title="Dragon�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -504,7 +504,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="23922" level="85" type="Monster" name="Chaos Drake" title="Dragon's Advocate">
+	<npc id="23922" level="85" type="Monster" name="Chaos Drake" title="Dragon�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -976,7 +976,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="23943" level="85" type="Monster" name="Heavenly Knight Recruit">
+	<npc id="23943" level="85" type="Monster" name="Heavenly Guardian">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1203,7 +1203,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="23953" level="85" type="Monster" name="Heavenly Knight Recruit">
+	<npc id="23953" level="85" type="Monster" name="Heavenly Guardian">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1293,7 +1293,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="23957" level="85" type="Monster" name="Tanta Healer" title="Commander's Medic">
+	<npc id="23957" level="85" type="Monster" name="Tanta Healer" title="Commander�s Medic">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1398,7 +1398,7 @@
 			<height normal="44" />
 		</collision>
 	</npc>
-	<npc id="23962" level="85" type="Monster" name="Baby Golden Pig">
+	<npc id="23962" level="85" type="Monster" name="Golden Piglet">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1503,7 +1503,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="23967" level="85" type="Monster" name="Queen the Cat">
+	<npc id="23967" level="85" type="Monster" name="Feline Queen">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1566,7 +1566,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="23970" level="85" type="Monster" name="Dandy's Dinosaur Friend">
+	<npc id="23970" level="85" type="Monster" name="Dandy�s Dinosaur Friend">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1608,7 +1608,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="23972" level="85" type="Monster" name="Tanta Healer" title="Commander's Medic">
+	<npc id="23972" level="85" type="Monster" name="Tanta Healer" title="Commander�s Medic">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1713,7 +1713,7 @@
 			<height normal="44" />
 		</collision>
 	</npc>
-	<npc id="23977" level="85" type="Monster" name="Baby Golden Pig">
+	<npc id="23977" level="85" type="Monster" name="Golden Piglet">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1818,7 +1818,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="23982" level="85" type="Monster" name="Queen the Cat">
+	<npc id="23982" level="85" type="Monster" name="Feline Queen">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1902,7 +1902,7 @@
 			<height normal="47.2" />
 		</collision>
 	</npc>
-	<npc id="23986" level="85" type="Monster" name="Leona Blackbird" title="Dragon's Advocate">
+	<npc id="23986" level="85" type="Monster" name="Leona Blackbird" title="Dragon�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="1893" />
@@ -1942,7 +1942,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="23988" level="85" type="Monster" name="Princess Ant" title="Successor in the Ant Nest">
+	<npc id="23988" level="85" type="Monster" name="Queen Ant" title="Successor in the Ant Nest">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24000-24099.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24000-24099.xml
index d580a18ed7..4641b764c2 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24000-24099.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24000-24099.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="24000" level="85" type="Monster" name="Leona Blackbird" title="Dragon's Advocate">
+	<npc id="24000" level="85" type="Monster" name="Leona Blackbird" title="Dragon�s Advocate">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="1893" />
@@ -40,7 +40,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="24002" level="85" type="Monster" name="Princess Ant" title="Successor in the Ant Nest">
+	<npc id="24002" level="85" type="Monster" name="Queen Ant" title="Successor in the Ant Nest">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="79" int="34" dex="42" wit="66" con="75" men="12">
@@ -1479,7 +1479,7 @@
 			<skill id="16770" level="1" /> <!-- Energy Blast -->
 		</skillList>
 	</npc>
-	<npc id="24050" level="100" type="Monster" name="Knights Commander" title="Rune Castle Unit">
+	<npc id="24050" level="100" type="Monster" name="Knights Commander" title="Rune">
 		<race>HUMAN</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1508,7 +1508,7 @@
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24051" level="100" type="Monster" name="Knights Warrior" title="Rune Castle Unit">
+	<npc id="24051" level="100" type="Monster" name="Knights Warrior" title="Rune">
 		<race>HUMAN</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1537,7 +1537,7 @@
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24052" level="100" type="Monster" name="Knights Archer" title="Rune Castle Unit">
+	<npc id="24052" level="100" type="Monster" name="Knights Archer" title="Rune">
 		<race>HUMAN</race>
 		<sex>MALE</sex>
 		<equipment rhand="15302" />
@@ -1566,7 +1566,7 @@
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24053" level="100" type="Monster" name="Knights Priest" title="Rune Castle Unit">
+	<npc id="24053" level="100" type="Monster" name="Knights Priest" title="Rune">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1595,7 +1595,7 @@
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24054" level="100" type="Monster" name="Knights Commander" title="Rune Castle Unit">
+	<npc id="24054" level="100" type="Monster" name="Knights Commander" title="Rune">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<acquire exp="233823400" sp="233900" />
@@ -1625,7 +1625,7 @@
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24055" level="100" type="Monster" name="Knights Warrior" title="Rune Castle Unit">
+	<npc id="24055" level="100" type="Monster" name="Knights Warrior" title="Rune">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<acquire exp="233823400" sp="233900" />
@@ -1655,7 +1655,7 @@
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24056" level="100" type="Monster" name="Knights Archer" title="Rune Castle Unit">
+	<npc id="24056" level="100" type="Monster" name="Knights Archer" title="Rune">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="15302" />
@@ -1685,7 +1685,7 @@
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24057" level="100" type="Monster" name="Knights Priest" title="Rune Castle Unit">
+	<npc id="24057" level="100" type="Monster" name="Knights Priest" title="Rune">
 		<race>UNDEAD</race>
 		<sex>FEMALE</sex>
 		<acquire exp="233823400" sp="233900" />
@@ -2278,7 +2278,7 @@
 			<skill id="16758" level="1" /> <!-- Embryo -->
 		</skillList>
 	</npc>
-	<npc id="24076" level="107" type="Monster" name="Soul Destroyer">
+	<npc id="24076" level="107" type="Monster" name="Soul Breaker">
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="61829740601" sp="55642140" />
@@ -2867,7 +2867,7 @@
 			<height normal="11.5" />
 		</collision>
 	</npc>
-	<npc id="24099" level="85" type="Folk" name="Cyclone">
+	<npc id="24099" level="85" type="Folk" name="Vortex">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24100-24199.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24100-24199.xml
index 520a2472f3..5b7b513883 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24100-24199.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24100-24199.xml
@@ -1608,7 +1608,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="24148" level="105" type="Monster" name="Death Pondus" title="Atelia Lookout">
+	<npc id="24148" level="105" type="Monster" name="Death Pondus" title="Atelia Protector">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="1074071597" sp="966562" />
@@ -1689,7 +1689,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="24150" level="104" type="Monster" name="Devil Warrior">
+	<npc id="24150" level="104" type="Monster" name="Demon Warrior">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="146339183" sp="131631" />
@@ -1812,7 +1812,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="24153" level="105" type="Monster" name="Devil Varos" title="Atelia Lookout">
+	<npc id="24153" level="105" type="Monster" name="Devil Varos" title="Atelia Protector">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="1074071597" sp="966562" />
@@ -2020,7 +2020,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="24158" level="105" type="Monster" name="Demonic Weiss" title="Atelia Lookout">
+	<npc id="24158" level="105" type="Monster" name="Demonic Weiss" title="Atelia Protector">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="1074071597" sp="966562" />
@@ -2440,7 +2440,7 @@
 			<skill id="16758" level="1" /> <!-- Embryo -->
 		</skillList>
 	</npc>
-	<npc id="24170" level="105" type="Monster" name="Zealous Berserker">
+	<npc id="24170" level="105" type="Monster" name="Blind Berserker">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2470,7 +2470,7 @@
 			<skill id="16758" level="1" /> <!-- Embryo -->
 		</skillList>
 	</npc>
-	<npc id="24171" level="106" type="Monster" name="Soul Destroyer">
+	<npc id="24171" level="106" type="Monster" name="Soul Breaker">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2905,7 +2905,7 @@
 			<skill id="16758" level="1" /> <!-- Embryo -->
 		</skillList>
 	</npc>
-	<npc id="24186" level="105" type="Monster" name="Zealous Berserker">
+	<npc id="24186" level="105" type="Monster" name="Blind Berserker">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2932,7 +2932,7 @@
 			<skill id="16758" level="1" /> <!-- Embryo -->
 		</skillList>
 	</npc>
-	<npc id="24187" level="106" type="Monster" name="Soul Destroyer">
+	<npc id="24187" level="106" type="Monster" name="Soul Breaker">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24200-24299.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24200-24299.xml
index 61de92a12a..4c779e2aa3 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24200-24299.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24200-24299.xml
@@ -235,7 +235,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="24205" level="97" type="Monster" name="Silence Preacle" title="Watcher">
+	<npc id="24205" level="97" type="Monster" name="Silence Prickle" title="Watcher">
 		<parameters>
 			<skill name="Skill01_ID" id="32382" level="1" />
 			<skill name="Skill02_ID" id="32386" level="1" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24300-24399.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24300-24399.xml
index a86e5a50ce..509ebf7723 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24300-24399.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24300-24399.xml
@@ -428,7 +428,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="24308" level="112" type="Monster" name="Water Drake" title="Fafurion's Henchman">
+	<npc id="24308" level="112" type="Monster" name="Groz Water Drake">
 		<parameters>
 			<skill name="Skill01_ID" id="32666" level="1" />
 			<param name="Skill01_Probablity" value="2000" />
@@ -2195,7 +2195,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="24384" level="20" type="Monster" name="Carcass Bat">
+	<npc id="24384" level="20" type="Monster" name="Krakos Bat">
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<acquire exp="46" sp="1" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24400-24499.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24400-24499.xml
index 0359832559..0e80708686 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24400-24499.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24400-24499.xml
@@ -2102,7 +2102,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="24446" level="112" type="Monster" name="Island Guardian">
+	<npc id="24446" level="112" type="Monster" name="Island Guard">
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<acquire exp="1364210176" sp="1227682" />
@@ -3344,7 +3344,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="24466" level="110" type="Monster" name="Demonic Mirror" title="Emperor of the Forest of Mirrors">
+	<npc id="24466" level="110" type="Monster" name="Demonic Mirror">
 		<race>FAIRY</race>
 		<sex>MALE</sex>
 		<acquire exp="1279841200" sp="1151799" />
@@ -3690,7 +3690,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="24480" level="120" type="Monster" name="Dragon Legionnaire">
+	<npc id="24480" level="120" type="Monster" name="Dragon Legionary">
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<equipment rhand="13979" lhand="13980" />
@@ -4348,7 +4348,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="24486" level="116" type="Monster" name="Dismal Pole">
+	<npc id="24486" level="116" type="Monster" name="Dismal Oak">
 		<race>PLANT</race>
 		<sex>MALE</sex>
 		<acquire exp="1546130008" sp="1391465" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24500-24599.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24500-24599.xml
index e88d0dbb67..dc131944f9 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24500-24599.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24500-24599.xml
@@ -735,7 +735,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="24507" level="106" type="Monster" name="Silence Preacle">
+	<npc id="24507" level="106" type="Monster" name="Silence Prickle">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<equipment rhand="17330" /> 
@@ -2101,7 +2101,7 @@
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24538" level="100" type="RaidBoss" name="Kalix" title="Kastia's Ruler">
+	<npc id="24538" level="100" type="RaidBoss" name="Kalix" title="Kastia�s Ruler">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="118486370000" sp="106637700" />
@@ -2235,7 +2235,7 @@
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24542" level="105" type="RaidBoss" name="Clav" title="Kastia's Ruler">
+	<npc id="24542" level="105" type="RaidBoss" name="Clav" title="Kastia�s Ruler">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="391466439000" sp="352319751" />
@@ -2378,7 +2378,7 @@
 			<skill id="14765" level="1" /> <!-- Blood Siphon Resistance -->
 		</skillList>
 	</npc>
-	<npc id="24546" level="110" type="RaidBoss" name="Spata" title="Kastia's Ruler">
+	<npc id="24546" level="110" type="RaidBoss" name="Spata" title="Kastia�s Ruler">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<acquire exp="645039964800" sp="580535857" />
@@ -2472,7 +2472,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="24551" level="115" type="Monster" name="Forgotten Elmoreden's Lady">
+	<npc id="24551" level="115" type="Monster" name="Forgotten Elmoreden Lady">
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="3939" />
@@ -2664,7 +2664,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="24555" level="115" type="Monster" name="Watchman of the Forgotten" title="Vadin's Servant">
+	<npc id="24555" level="115" type="Monster" name="Watchman of the Forgotten" title="Elite Monster">
 		<race>UNDEAD</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="1472" />
@@ -2948,7 +2948,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="24561" level="118" type="Monster" name="Watchman of the Resurrected" title="Vadin's Servant">
+	<npc id="24561" level="118" type="Monster" name="Watchman of the Resurrected" title="Elite Monster">
 		<race>UNDEAD</race>
 		<sex>FEMALE</sex>
 		<acquire exp="55256558560" sp="49730820" />
@@ -3231,7 +3231,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="24567" level="120" type="Monster" name="Watchman of the Cursed" title="Vadin's Servant">
+	<npc id="24567" level="120" type="Monster" name="Watchman of the Cursed" title="Elite Monster">
 		<race>UNDEAD</race>
 		<sex>FEMALE</sex>
 		<acquire exp="122517360000" sp="110265552" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24800-24899.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24800-24899.xml
index a49432f74c..369e08b7a2 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24800-24899.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/24800-24899.xml
@@ -998,7 +998,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="24851" level="116" type="Monster" name="Resurrected Spira" title="Atelia Protector">		
+	<npc id="24851" level="116" type="Monster" name="Resurrected Spira" title="Atelia Protector">
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -1280,4 +1280,594 @@
 			</spoil>
 		</dropLists>
 	</npc>
+	<npc id="24858" level="85" type="Folk" name="Platinum Tribe Archer">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="288" /> <!-- Carnage Bow -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="319789" hpRegen="10.5" mp="2862" 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="13" />
+			<height normal="27" />
+		</collision>
+	</npc>
+	<npc id="24859" level="85" type="Folk" name="Platinum Tribe Shaman">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="202" /> <!-- Mace of Underworld -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="319789" hpRegen="10.5" mp="2862" 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="13" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="24860" level="85" type="Folk" name="Platinum Tribe Soldier">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="242" /> <!-- Soulfire Dirk -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="319789" hpRegen="10.5" mp="2862" 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="13" />
+			<height normal="26" />
+		</collision>
+	</npc>
+	<npc id="24861" level="85" type="Folk" name="Platinum Tribe Warrior">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="148" /> <!-- Sword of Valhalla -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="319789" hpRegen="10.5" mp="2862" 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="13" />
+			<height normal="28" />
+		</collision>
+	</npc>
+	<npc id="24862" level="85" type="Folk" name="Platinum Tribe Hero">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="147" /> <!-- Tear of Darkness -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="319789" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="32" />
+		</collision>
+	</npc>
+	<npc id="24863" level="85" type="Folk" name="Guardian of the Insolence Seal" title="Elite Monster">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="97" /> <!-- Lance -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="959367" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="12" />
+			<height normal="63.4" />
+		</collision>
+	</npc>
+	<npc id="24864" level="85" type="Folk" name="Elite Platinum Tribe Archer">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="288" /> <!-- Carnage Bow -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="595747" hpRegen="10.5" mp="3024" 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="13" />
+			<height normal="27" />
+		</collision>
+	</npc>
+	<npc id="24865" level="85" type="Folk" name="Elite Platinum Tribe Shaman">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="202" /> <!-- Mace of Underworld -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="595747" hpRegen="10.5" mp="3024" 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="13" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="24866" level="85" type="Folk" name="Elite Platinum Tribe Soldier">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="242" /> <!-- Soulfire Dirk -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="595747" hpRegen="10.5" mp="3024" 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="13" />
+			<height normal="26" />
+		</collision>
+	</npc>
+	<npc id="24867" level="85" type="Folk" name="Elite Platinum Tribe Warrior">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="148" /> <!-- Sword of Valhalla -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="595747" hpRegen="10.5" mp="3024" 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="13" />
+			<height normal="28" />
+		</collision>
+	</npc>
+	<npc id="24868" level="85" type="Folk" name="Elite Platinum Tribe Hero">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="147" /> <!-- Tear of Darkness -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="595747" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="32" />
+		</collision>
+	</npc>
+	<npc id="24869" level="85" type="Folk" name="Guardian of the Insolence Seal" title="Elite Monster">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="97" /> <!-- Lance -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1787242" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="12" />
+			<height normal="63.4" />
+		</collision>
+	</npc>
+	<npc id="24870" level="85" type="Folk" name="Divine Platinum Tribe Archer">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="288" /> <!-- Carnage Bow -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1124904" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="160" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="27" />
+		</collision>
+	</npc>
+	<npc id="24871" level="85" type="Folk" name="Divine Platinum Tribe Shaman">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="202" /> <!-- Mace of Underworld -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1124904" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="160" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="24872" level="85" type="Folk" name="Divine Platinum Tribe Soldier">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="242" /> <!-- Soulfire Dirk -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1124904" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="160" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="26" />
+		</collision>
+	</npc>
+	<npc id="24873" level="85" type="Folk" name="Divine Platinum Tribe Warrior">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="148" /> <!-- Sword of Valhalla -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1124904" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="160" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="28" />
+		</collision>
+	</npc>
+	<npc id="24874" level="85" type="Folk" name="Divine Platinum Tribe Hero">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="147" /> <!-- Tear of Darkness -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1124904" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="32" />
+		</collision>
+	</npc>
+	<npc id="24875" level="85" type="Folk" name="Guardian of the Insolence Seal" title="Elite Monster">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="97" /> <!-- Lance -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="3374713" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="12" />
+			<height normal="63.4" />
+		</collision>
+	</npc>
+	<npc id="24876" level="85" type="Folk" name="Conquest Archer">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="24877" level="85" type="Folk" name="Conquest Knight">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="24878" level="85" type="Folk" name="Conquest Rogue">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="24879" level="85" type="Folk" name="Conquest Warrior">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="24880" level="85" type="Folk" name="Conquest Wizard">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="24881" level="85" type="Folk" name="Atron of the Conquest">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="25" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10" />
+			<height normal="12" />
+		</collision>
+	</npc>
+	<npc id="24882" level="85" type="Folk" name="Craigo of the Conquest">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="18" />
+		</collision>
+	</npc>
+	<npc id="24883" level="85" type="Folk" name="Daril of the Conquest">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="13" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="8" />
+			<height normal="10" />
+		</collision>
+	</npc>
+	<npc id="24884" level="85" type="Folk" name="Seo of the Conquest">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="11" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="24885" level="85" type="Folk" name="Powerful Conquest Warrior">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="20" />
+				<run ground="100" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10" />
+			<height normal="17" />
+		</collision>
+	</npc>
+	<npc id="24886" level="85" type="Folk" name="Powerful Conquest Wizard">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="19" />
+				<run ground="80" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7" />
+			<height normal="13" />
+		</collision>
+	</npc>
+	<npc id="24887" level="85" type="Folk" name="Powerful Conquest Archer">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="80" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7" />
+			<height normal="16.75" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25500-25599.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25500-25599.xml
index eced6228a0..fa3ef14978 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25500-25599.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25500-25599.xml
@@ -445,7 +445,7 @@
 			<height normal="43.5" />
 		</collision>
 	</npc>
-	<npc id="25538" level="81" type="Monster" name="Vengeance" title="Raid Fighter">
+	<npc id="25538" level="81" type="Monster" name="Revenge" title="Raid Fighter">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<skill name="HealMagic_a" id="4780" level="8" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25600-25699.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25600-25699.xml
index c1a13e851f..81364185e0 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25600-25699.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25600-25699.xml
@@ -2391,7 +2391,7 @@
 			<height normal="27.5" />
 		</collision>
 	</npc>
-	<npc id="25644" level="81" type="RaidBoss" name="Awakened Ancient Severer" title="Raid Boss">
+	<npc id="25644" level="81" type="RaidBoss" name="Ancient Bonebreaker" title="Raid Boss">
 		<parameters>
 			<skill name="Skill01_ID" id="5884" level="2" />
 			<skill name="Skill02_ID" id="5898" level="2" />
@@ -3418,7 +3418,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25662" level="104" type="Monster" name="Kanadis Follower">
+	<npc id="25662" level="104" type="Monster" name="Kanadis' Follower">
 		<parameters>
 			<param name="String_Num1" value="1300149" />
 			<skill name="different_level_9_attacked" id="5456" level="1" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25700-25799.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25700-25799.xml
index 6b6d38a660..15223b41ec 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25700-25799.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25700-25799.xml
@@ -4354,7 +4354,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25776" level="98" type="Monster" name="Royal Guard" title="Apherus Garden">
+	<npc id="25776" level="98" type="Monster" name="Royal Guard" title="Apherus' Garden">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<minions name="Privates">
@@ -4421,7 +4421,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25777" level="92" type="Monster" name="Chasseur" title="Apherus Garden">
+	<npc id="25777" level="92" type="Monster" name="Chasseur" title="Apherus' Garden">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<param name="IsAggressive" value="1" />
@@ -4469,7 +4469,7 @@
 			<height normal="25.5" />
 		</collision>
 	</npc>
-	<npc id="25778" level="92" type="Monster" name="Escort" title="Apherus Garden">
+	<npc id="25778" level="92" type="Monster" name="Escort" title="Apherus' Garden">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<param name="IsAggressive" value="1" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25800-25899.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25800-25899.xml
index afa5c3f5eb..8cca1e606a 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25800-25899.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25800-25899.xml
@@ -337,7 +337,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="25805" level="98" type="Monster" name="Escort" title="Queen's Subordinate">
+	<npc id="25805" level="98" type="Monster" name="Praetorian" title="Queen's Subordinate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<skill name="Skill01_ID" id="14099" level="4" />
@@ -400,7 +400,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25806" level="98" type="Monster" name="Escort" title="Queen's Subordinate">
+	<npc id="25806" level="98" type="Monster" name="Praetorian" title="Queen's Subordinate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="IsAggressive" value="1" />
@@ -767,7 +767,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="25813" level="66" type="Monster" name="Byron" title="Queen of Blood">
+	<npc id="25813" level="66" type="Monster" name="Baron" title="Queen of Blood">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25814" count="2" respawnTime="360" weightPoint="1" />
@@ -831,7 +831,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25814" level="65" type="Monster" name="Byron's Maid">
+	<npc id="25814" level="65" type="Monster" name="Baron's Maid">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
@@ -5385,7 +5385,7 @@
 			<height normal="50" />
 		</collision>
 	</npc>
-	<npc id="25898" level="99" type="Monster" name="Cyclone">
+	<npc id="25898" level="99" type="Monster" name="Vortex">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="200" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25900-25999.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25900-25999.xml
index 01d3271162..3a8bb491cb 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25900-25999.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/25900-25999.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="25900" level="99" type="Folk" name="Skill Lind">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -1951,7 +1951,7 @@
 			<height normal="62.4" />
 		</collision>
 	</npc>
-	<npc id="25942" level="98" type="RaidBoss" name="Flaming Ladar" title="Raid Boss">
+	<npc id="25942" level="98" type="RaidBoss" name="Fire Ladar" title="Raid Boss">
 		<race>ELEMENTAL</race>
 		<sex>FEMALE</sex>
 		<acquire exp="9339738544" sp="2241537" raidPoints="300" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26000-26099.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26000-26099.xml
index d4f40d489f..0cfe6ba0cb 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26000-26099.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26000-26099.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="26088" level="40" type="Monster" name="Undine" title="Time-defying">
 		<race>ELEMENTAL</race>
@@ -92,7 +92,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26091" level="40" type="Monster" name="Aspiring Orc Ruler of Aden">
+	<npc id="26091" level="40" type="Monster" name="Frederick the Destroyer">
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="4" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26100-26199.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26100-26199.xml
index 627f7b8b48..0d65334cde 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26100-26199.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26100-26199.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="26100" level="99" type="Monster" name="Sirra's Knight">
 		<race>HUMANOID</race>
@@ -2227,7 +2227,7 @@
 			<height normal="46" />
 		</collision>
 	</npc>
-	<npc id="26139" level="101" type="Monster" name="Mimillion Carcass">
+	<npc id="26139" level="101" type="Monster" name="Mimillion Krakos">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="15304" />
@@ -2891,7 +2891,7 @@
 			<height normal="46" />
 		</collision>
 	</npc>
-	<npc id="26150" level="102" type="Monster" name="Enhanced Mimillion Carcass">
+	<npc id="26150" level="102" type="Monster" name="Enhanced Mimillion Krakos">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="15304" />
@@ -3295,7 +3295,7 @@
 			<height normal="46.15" grown="55" />
 		</collision>
 	</npc>
-	<npc id="26159" level="91" type="Folk" name="Enhanced Demonic Carcass">
+	<npc id="26159" level="91" type="Folk" name="Enhanced Demonic Krakos">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26200-26299.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26200-26299.xml
index 6d545e5922..2afde3ada4 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26200-26299.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26200-26299.xml
@@ -2353,7 +2353,7 @@
 			<height normal="25.5" />
 		</collision>
 	</npc>
-	<npc id="26235" level="104" type="RaidBoss" name="Kain van Halter" title="Embryo Commander-in-chief">
+	<npc id="26235" level="104" type="RaidBoss" name="Kain van Halter" title="Embryo Commander-in-Chief">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="164" int="188" dex="55" wit="78" con="111" men="149">
@@ -2700,7 +2700,7 @@
 			<height normal="34.2" />
 		</collision>
 	</npc>
-	<npc id="26243" level="103" type="Monster" name="Mamut" title="Chief Gatekeeper">
+	<npc id="26243" level="103" type="Monster" name="Mamut" title="Gatekeeper">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="26114827957" sp="52229699" />
@@ -3612,7 +3612,7 @@
 			<height normal="46" />
 		</collision>
 	</npc>
-	<npc id="26277" level="101" type="RaidBoss" name="Ashen Shadow Expeditionary Force Leaders Kantu" title="Raid Boss">
+	<npc id="26277" level="101" type="RaidBoss" name="Ashen Shadow Squad Leader Kantu" title="Raid Boss">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="46329" />
@@ -3707,7 +3707,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26278" level="101" type="RaidBoss" name="Ashen Shadow Expeditionary Force Leaders Kai" title="Raid Boss">
+	<npc id="26278" level="101" type="RaidBoss" name="Ashen Shadow Squad Leader Kai" title="Raid Boss">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="46331" />
@@ -3802,7 +3802,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26279" level="101" type="RaidBoss" name="Ashen Shadow Expeditionary Force Leaders Heine" title="Raid Boss">
+	<npc id="26279" level="101" type="RaidBoss" name="Ashen Shadow Squad Leader Heine" title="Raid Boss">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="46334" />
@@ -3897,7 +3897,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26280" level="101" type="RaidBoss" name="Ashen Shadow Expeditionary Force Leaders Xenon" title="Raid Boss">
+	<npc id="26280" level="101" type="RaidBoss" name="Ashen Shadow Squad Leader Xenon" title="Raid Boss">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="46335" />
@@ -3996,7 +3996,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26281" level="85" type="Folk" name="Ashen Shadow Expeditionary Force Soldier Recruit" title="Raid Fighter">
+	<npc id="26281" level="85" type="Folk" name="Ashen Shadow Squad Fighter" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -4015,7 +4015,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="26282" level="85" type="Folk" name="Ashen Shadow Expeditionary Force Scout" title="Raid Fighter">
+	<npc id="26282" level="85" type="Folk" name="Ashen Shadow Squad Scout" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -4034,7 +4034,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="26283" level="85" type="Folk" name="Ashen Shadow Expeditionary Force Wizard" title="Raid Fighter">
+	<npc id="26283" level="85" type="Folk" name="Ashen Shadow Squad Wizard" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -4053,7 +4053,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="26284" level="85" type="Folk" name="Ashen Shadow Expeditionary Force Healer" title="Raid Fighter">
+	<npc id="26284" level="85" type="Folk" name="Ashen Shadow Squad Healer" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26300-26399.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26300-26399.xml
index 8727d72f08..4b565028d4 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26300-26399.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26300-26399.xml
@@ -1152,7 +1152,7 @@
 			<height normal="249" />
 		</collision>
 	</npc>
-	<npc id="26337" level="99" type="Monster" name="Helios's Red Lightning" title="Enuma Elish">
+	<npc id="26337" level="99" type="Monster" name="Helios' Red Lightning" title="Enuma Elish">
 		<race>ETC</race>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
 			<vitals hp="159275.821635012" hpRegen="10.5" mp="2220.53748231966" mpRegen="3.6" />
@@ -2293,7 +2293,7 @@
 			<height normal="81.75" />
 		</collision>
 	</npc>
-	<npc id="26391" level="110" type="Monster" name="Krotanion">
+	<npc id="26391" level="110" type="Monster" name="Enhanced Krotanion">
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2317,7 +2317,7 @@
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26392" level="110" type="Monster" name="Kropion">
+	<npc id="26392" level="110" type="Monster" name="Enhanced Kropion">
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2341,7 +2341,7 @@
 			<skill id="16547" level="10" /> <!-- Danger Zone Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26393" level="110" type="Monster" name="Krotanios">
+	<npc id="26393" level="110" type="Monster" name="Fragile Young Krotanion">
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2367,7 +2367,7 @@
 			<skill id="14617" level="1" /> <!-- Knock Down/ Knock Back Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26394" level="110" type="Monster" name="Kropios">
+	<npc id="26394" level="110" type="Monster" name="Fragile Young Kropion">
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2450,7 +2450,7 @@
 			<skill id="4440" level="1" /> <!-- Greater Paralysis Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26397" level="110" type="Monster" name="Krotanios">
+	<npc id="26397" level="110" type="Monster" name="Young Krotanion">
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2476,7 +2476,7 @@
 			<skill id="14617" level="1" /> <!-- Knock Down/ Knock Back Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26398" level="110" type="Monster" name="Kropios">
+	<npc id="26398" level="110" type="Monster" name="Young Kropion">
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26400-26499.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26400-26499.xml
index 8160b4fad4..fa07008d66 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26400-26499.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/26400-26499.xml
@@ -102,7 +102,7 @@
 			<height normal="120.75" />
 		</collision>
 	</npc>
-	<npc id="26431" level="120" type="RaidBoss" name="Avenger Alusion">
+	<npc id="26431" level="120" type="RaidBoss" name="Avenger Alusion" title="Raid Boss">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<acquire exp="4270604083200" sp="3843543600" />
@@ -234,7 +234,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26432" level="106" type="RaidBoss" name="Avenger Graff">
+	<npc id="26432" level="106" type="RaidBoss" name="Avenger Graff" title="Raid Boss">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<acquire exp="3332257463808" sp="2999031659" />
@@ -319,7 +319,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26433" level="120" type="RaidBoss" name="Demon Venoma">
+	<npc id="26433" level="120" type="RaidBoss" name="Demonic Venom" title="Raid Boss">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="4908329395200" sp="4417496352" />
@@ -452,7 +452,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26434" level="116" type="RaidBoss" name="Fiend Sarboth">
+	<npc id="26434" level="116" type="RaidBoss" name="Fiend Sarboth" title="Raid Boss">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="4583834285184" sp="4125450760" />
@@ -520,7 +520,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26435" level="120" type="RaidBoss" name="Watcher Tristan">
+	<npc id="26435" level="120" type="RaidBoss" name="Watcher Tristan" title="Raid Boss">
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<acquire exp="4391878579200" sp="3952690704" />
@@ -652,7 +652,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26436" level="108" type="RaidBoss" name="Watcher Setheth">
+	<npc id="26436" level="108" type="RaidBoss" name="Watcher Setheth" title="Raid Boss">
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<acquire exp="3557421649152" sp="3201679471" />
@@ -720,7 +720,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26437" level="120" type="RaidBoss" name="Berserker Zetahl">
+	<npc id="26437" level="120" type="RaidBoss" name="Berserker Zetahl" title="Raid Boss">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="4773773491200" sp="4296396096" />
@@ -852,7 +852,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26438" level="114" type="RaidBoss" name="Berserker Tabris">
+	<npc id="26438" level="114" type="RaidBoss" name="Berserker Tabris" title="Raid Boss">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<acquire exp="4308330575808" sp="3877497477" />
@@ -920,7 +920,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26439" level="120" type="RaidBoss" name="Ferocious Valac">
+	<npc id="26439" level="120" type="RaidBoss" name="Ferocious Valac" title="Raid Boss">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="4642918963200" sp="4178626992" />
@@ -1052,7 +1052,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26440" level="112" type="RaidBoss" name="Arrogant Lebruum">
+	<npc id="26440" level="112" type="RaidBoss" name="Arrogant Lebruum" title="Raid Boss">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="4044498296832" sp="3640048402" />
@@ -1269,7 +1269,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26442" level="110" type="RaidBoss" name="Mad Cullan">
+	<npc id="26442" level="110" type="RaidBoss" name="Mad Cullan" title="Raid Boss">
 		<race>DWARF</race>
 		<sex>MALE</sex>
 		<acquire exp="3794387889600" sp="3414948999" raidPoints="0" />
@@ -1487,7 +1487,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="26444" level="118" type="RaidBoss" name="Scorpion King Votan">
+	<npc id="26444" level="118" type="RaidBoss" name="Scorpion King Votan" title="Raid Boss">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="4879895267520" sp="4391905713" raidPoints="0" />
@@ -2271,7 +2271,7 @@
 			<height normal="82.02" />
 		</collision>
 	</npc>
-	<npc id="26468" level="110" type="Monster" name="Krotanion">
+	<npc id="26468" level="110" type="Monster" name="Krotanion" title="Brutal">
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2299,7 +2299,7 @@
 			<skill id="33195" level="10" /> <!-- Direct hit Resistance -->
 		</skillList>
 	</npc>
-	<npc id="26469" level="110" type="Monster" name="Kropion">
+	<npc id="26469" level="110" type="Monster" name="Kropion" title="Wrathful">
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
@@ -2588,4 +2588,42 @@
 			<skill id="5599" level="12" /> <!-- Confusion Resistance -->
 		</skillList>
 	</npc>
+	<npc id="26480" level="85" type="Folk" name="Slaughter Bathin" title="Raid Boss">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="141473764" hpRegen="10.5" mp="66584" mpRegen="3.6" />
+			<speed>
+				<walk ground="100" />
+				<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="56" />
+			<height normal="125" />
+		</collision>
+	</npc>
+	<npc id="26481" level="85" type="Folk" name="Slaughter Bathin" title="Raid Boss">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="141473764" hpRegen="10.5" mp="66584" mpRegen="3.6" />
+			<speed>
+				<walk ground="100" />
+				<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="56" />
+			<height normal="125" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/27300-27399.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/27300-27399.xml
index f0451b4418..d3d0ca4490 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/27300-27399.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="27316" level="55" type="Monster" name="Fallen Chieftain Vegus">
 		<race>HUMANOID</race>
@@ -166,7 +166,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="27341" level="51" type="Monster" name="Shilen's Evil Thoughts">
+	<npc id="27341" level="51" type="Monster" name="Shillien's Evil Thoughts">
 		<parameters>
 			<param name="Skill02_Target" value="3" />
 			<param name="Skill02_AttackSplash" value="1" />
@@ -202,7 +202,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="27342" level="61" type="Monster" name="Shilen's Evil Thoughts">
+	<npc id="27342" level="61" type="Monster" name="Shillien's Evil Thoughts">
 		<parameters>
 			<param name="Skill02_Target" value="3" />
 			<param name="Skill02_AttackSplash" value="1" />
@@ -238,7 +238,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="27343" level="79" type="Monster" name="Shilen's Evil Thoughts">
+	<npc id="27343" level="79" type="Monster" name="Shillien's Evil Thoughts">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -290,7 +290,7 @@
 			<height normal="27.5" />
 		</collision>
 	</npc>
-	<npc id="27344" level="51" type="Monster" name="Shilen's Evil Thoughts">
+	<npc id="27344" level="51" type="Monster" name="Shillien's Evil Thoughts">
 		<parameters>
 			<param name="Skill02_Target" value="3" />
 			<param name="Skill02_AttackSplash" value="1" />
@@ -328,7 +328,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="27345" level="61" type="Monster" name="Shilen's Evil Thoughts">
+	<npc id="27345" level="61" type="Monster" name="Shillien's Evil Thoughts">
 		<parameters>
 			<param name="Skill02_Target" value="3" />
 			<param name="Skill02_AttackSplash" value="1" />
@@ -366,7 +366,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="27346" level="79" type="Monster" name="Shilen's Evil Thoughts">
+	<npc id="27346" level="79" type="Monster" name="Shillien's Evil Thoughts">
 		<parameters>
 			<minions name="Privates">
 				<npc id="27399" count="1" respawnTime="360" weightPoint="1" />
@@ -899,7 +899,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="27361" level="89" type="Monster" name="Lilim Royal Knight">
+	<npc id="27361" level="89" type="Monster" name="Lillim Royal Knight">
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
 			<param name="MoveAroundSocial1" value="80" />
@@ -1309,7 +1309,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="27370" level="89" type="Monster" name="Lilim Royal Knight">
+	<npc id="27370" level="89" type="Monster" name="Lillim Royal Knight">
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
 			<param name="MoveAroundSocial1" value="80" />
@@ -1509,7 +1509,7 @@
 			<height normal="45" />
 		</collision>
 	</npc>
-	<npc id="27374" level="79" type="Monster" name="Shilen's Evil Thoughts">
+	<npc id="27374" level="79" type="Monster" name="Shillien's Evil Thoughts">
 		<parameters>
 			<param name="MoveAroundSocial" value="150" />
 			<param name="MoveAroundSocial1" value="150" />
@@ -1560,7 +1560,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="27375" level="79" type="Monster" name="Shilen's Evil Thoughts">
+	<npc id="27375" level="79" type="Monster" name="Shillien's Evil Thoughts">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -1779,7 +1779,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="27379" level="89" type="Monster" name="Lilim Royal Knight">
+	<npc id="27379" level="89" type="Monster" name="Lillim Royal Knight">
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
 			<param name="MoveAroundSocial1" value="80" />
@@ -2093,7 +2093,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="27394" level="51" type="Monster" name="Shilen's Evil Thoughts">
+	<npc id="27394" level="51" type="Monster" name="Shillien's Evil Thoughts">
 		<parameters>
 			<skill name="Skill01_ID" id="5975" level="1" />
 			<skill name="Skill02_ID" id="5976" level="1" />
@@ -2129,7 +2129,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="27395" level="61" type="Monster" name="Shilen's Evil Thoughts">
+	<npc id="27395" level="61" type="Monster" name="Shillien's Evil Thoughts">
 		<parameters>
 			<skill name="Skill01_ID" id="5975" level="1" />
 			<skill name="Skill02_ID" id="5976" level="2" />
@@ -2165,7 +2165,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="27396" level="79" type="Monster" name="Shilen's Evil Thoughts">
+	<npc id="27396" level="79" type="Monster" name="Shillien's Evil Thoughts">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -2206,7 +2206,7 @@
 			<height normal="27.5" />
 		</collision>
 	</npc>
-	<npc id="27397" level="51" type="Monster" name="Shilen's Evil Thoughts">
+	<npc id="27397" level="51" type="Monster" name="Shillien's Evil Thoughts">
 		<parameters>
 			<skill name="Skill01_ID" id="5975" level="1" />
 			<skill name="Skill02_ID" id="5976" level="1" />
@@ -2242,7 +2242,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="27398" level="61" type="Monster" name="Shilen's Evil Thoughts">
+	<npc id="27398" level="61" type="Monster" name="Shillien's Evil Thoughts">
 		<parameters>
 			<skill name="Skill01_ID" id="5975" level="1" />
 			<skill name="Skill02_ID" id="5976" level="2" />
@@ -2278,7 +2278,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="27399" level="79" type="Monster" name="Shilen's Evil Thoughts">
+	<npc id="27399" level="79" type="Monster" name="Shillien's Evil Thoughts">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/27400-27499.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/27400-27499.xml
index 6be220cad1..942d66e901 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/27400-27499.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/27400-27499.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="27400" level="51" type="Monster" name="Shilen's Evil Thoughts">
+	<npc id="27400" level="51" type="Monster" name="Shillien's Evil Thoughts">
 		<parameters>
 			<skill name="Skill01_ID" id="5975" level="1" />
 			<skill name="Skill02_ID" id="5976" level="1" />
@@ -36,7 +36,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="27401" level="61" type="Monster" name="Shilen's Evil Thoughts">
+	<npc id="27401" level="61" type="Monster" name="Shillien's Evil Thoughts">
 		<parameters>
 			<skill name="Skill01_ID" id="5975" level="1" />
 			<skill name="Skill02_ID" id="5976" level="2" />
@@ -72,7 +72,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="27402" level="79" type="Monster" name="Shilen's Evil Thoughts">
+	<npc id="27402" level="79" type="Monster" name="Shillien's Evil Thoughts">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -1223,7 +1223,7 @@
 			<height normal="28" grown="33" />
 		</collision>
 	</npc>
-	<npc id="27425" level="79" type="Monster" name="Death Wound" title="Shilen's Creation">
+	<npc id="27425" level="79" type="Monster" name="Death Wound" title="Shillien's Creation">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6050" level="13" />
@@ -1266,7 +1266,7 @@
 			<height normal="40" grown="48" />
 		</collision>
 	</npc>
-	<npc id="27426" level="79" type="Monster" name="Death Wound" title="Shilen's Creation">
+	<npc id="27426" level="79" type="Monster" name="Death Wound" title="Shillien's Creation">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6914" level="3" />
@@ -1310,7 +1310,7 @@
 			<height normal="40" grown="48" />
 		</collision>
 	</npc>
-	<npc id="27427" level="79" type="Monster" name="Death Wound" title="Shilen's Creation">
+	<npc id="27427" level="79" type="Monster" name="Death Wound" title="Shillien's Creation">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6914" level="3" />
@@ -1352,7 +1352,7 @@
 			<height normal="40" grown="48" />
 		</collision>
 	</npc>
-	<npc id="27428" level="79" type="Monster" name="Death Wound" title="Shilen's Creation">
+	<npc id="27428" level="79" type="Monster" name="Death Wound" title="Shillien's Creation">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6050" level="13" />
@@ -1396,7 +1396,7 @@
 			<height normal="40" grown="48" />
 		</collision>
 	</npc>
-	<npc id="27429" level="79" type="Monster" name="Death Wound" title="Shilen's Creation">
+	<npc id="27429" level="79" type="Monster" name="Death Wound" title="Shillien's Creation">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6914" level="3" />
@@ -1440,7 +1440,7 @@
 			<height normal="40" grown="48" />
 		</collision>
 	</npc>
-	<npc id="27430" level="76" type="Monster" name="Screaming Shaman" title="Resurrected">
+	<npc id="27430" level="76" type="Monster" name="Dismal Shriller" title="Resurrected">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<skill name="Skill01_ID" id="6527" level="11" />
@@ -1767,7 +1767,7 @@
 			<skill id="14677" level="1" /> <!-- Cry of Destiny - Giant Punch -->
 		</skillList>
 	</npc>
-	<npc id="27438" level="85" type="Monster" name="Krakia Carcass" title="Yul Archer">
+	<npc id="27438" level="85" type="Monster" name="Krakia Krakos" title="Yul Archer">
 		<!-- TODO: Must be confirmed -->
 		<parameters>
 			<skill name="Skill01_ID" id="14682" level="1" />
@@ -2262,7 +2262,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="27447" level="86" type="Monster" name="Demonic Carcass" title="Watchman of the Seal">
+	<npc id="27447" level="86" type="Monster" name="Demonic Krakos" title="Watchman of the Seal">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 		</parameters>
@@ -2986,7 +2986,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="27465" level="86" type="Monster" name="Krakia Carcass" title="Yul Archer">
+	<npc id="27465" level="86" type="Monster" name="Krakia Krakos" title="Yul Archer">
 		<parameters>
 			<skill name="Skill01_ID" id="14682" level="1" />
 			<skill name="Skill02_ID" id="14683" level="1" />
@@ -3283,7 +3283,7 @@
 			</lucky>
 		</dropLists>
 	</npc>
-	<npc id="27470" level="70" type="Monster" name="Shilen's Messenger Cabrio" title="Quest Monster">
+	<npc id="27470" level="70" type="Monster" name="Shillien's Messenger Cabrio" title="Quest Monster">
 		<parameters>
 			<minions name="Privates">
 				<npc id="27471" count="2" respawnTime="120" weightPoint="1" />
@@ -4007,7 +4007,7 @@
 			<height normal="34" />
 		</collision>
 	</npc>
-	<npc id="27492" level="96" type="Monster" name="Shilen's Messenger">
+	<npc id="27492" level="96" type="Monster" name="Shillien's Messenger">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="13983" /> <!-- Monster Only (Death Knight_2hs) -->
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/27700-27799.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/27700-27799.xml
new file mode 100644
index 0000000000..0a72dda82a
--- /dev/null
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/27700-27799.xml
@@ -0,0 +1,1611 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
+	<npc id="27701" level="85" type="Folk" name="Daril">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="13" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="8" />
+			<height normal="10" />
+		</collision>
+	</npc>
+	<npc id="27702" level="85" type="Folk" name="Atron">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="25" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10" />
+			<height normal="12" />
+		</collision>
+	</npc>
+	<npc id="27703" level="85" type="Folk" name="Seo">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="11" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="27704" level="85" type="Folk" name="Craigo">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="18" />
+		</collision>
+	</npc>
+	<npc id="27705" level="85" type="Folk" name="Kiku">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="39" />
+				<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="6" />
+			<height normal="10.5" />
+		</collision>
+	</npc>
+	<npc id="27706" level="85" type="Folk" name="Floato">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="266491" hpRegen="10.5" mp="2862" mpRegen="3.6" />
+			<speed>
+				<walk ground="39" />
+				<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="10" />
+			<height normal="14" />
+		</collision>
+	</npc>
+	<npc id="27707" level="85" type="Folk" name="Daril Phran">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="13" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="8" />
+			<height normal="10" />
+		</collision>
+	</npc>
+	<npc id="27708" level="85" type="Folk" name="Atron Phran">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="25" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10" />
+			<height normal="12" />
+		</collision>
+	</npc>
+	<npc id="27709" level="85" type="Folk" name="Seo Phran">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="11" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="27710" level="85" type="Folk" name="Craigo Phran">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="18" />
+		</collision>
+	</npc>
+	<npc id="27711" level="85" type="Folk" name="Kiku Phran">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="39" />
+				<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="6" />
+			<height normal="10.5" />
+		</collision>
+	</npc>
+	<npc id="27712" level="85" type="Folk" name="Floato Phran">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="39" />
+				<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="10" />
+			<height normal="14" />
+		</collision>
+	</npc>
+	<npc id="27713" level="85" type="Folk" name="Daril Asa Ar">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="13" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="8" />
+			<height normal="10" />
+		</collision>
+	</npc>
+	<npc id="27714" level="85" type="Folk" name="Seo Asa Ar">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="11" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="27715" level="85" type="Folk" name="Floato Asa Ar">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="39" />
+				<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="10" />
+			<height normal="14" />
+		</collision>
+	</npc>
+	<npc id="27716" level="85" type="Folk" name="Asa Ar Hunter">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27717" level="85" type="Folk" name="Asa Ar Sorceress">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27718" level="85" type="Folk" name="Saida Asa Ar">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27719" level="85" type="Folk" name="Atron Asa Mide">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="25" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10" />
+			<height normal="12" />
+		</collision>
+	</npc>
+	<npc id="27720" level="85" type="Folk" name="Craigo Asa Mide">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="18" />
+		</collision>
+	</npc>
+	<npc id="27721" level="85" type="Folk" name="Kerberos Asa Mide">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="28" />
+			<height normal="28" />
+		</collision>
+	</npc>
+	<npc id="27722" level="85" type="Folk" name="Asa Mide Hunter">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27723" level="85" type="Folk" name="Asa Mide Sorceress">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27724" level="85" type="Folk" name="Saida Asa Mide">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27725" level="85" type="Folk" name="Asa Mide Blader">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27726" level="85" type="Folk" name="Atron Asa Telro">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="25" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10" />
+			<height normal="12" />
+		</collision>
+	</npc>
+	<npc id="27727" level="85" type="Folk" name="Craigo Asa Telro">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="18" />
+		</collision>
+	</npc>
+	<npc id="27728" level="85" type="Folk" name="Beor Asa Telro">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="18" />
+				<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="26.8" />
+		</collision>
+	</npc>
+	<npc id="27729" level="85" type="Folk" name="Asa Telro Hunter">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27730" level="85" type="Folk" name="Asa Telro Sorceress">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27731" level="85" type="Folk" name="Saida Asa Telro">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27732" level="85" type="Folk" name="Asa Telro Blader">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27733" level="85" type="Folk" name="Asa Telro 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="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27734" level="85" type="Folk" name="Daril Nox Ar">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="13" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="8" />
+			<height normal="10" />
+		</collision>
+	</npc>
+	<npc id="27735" level="85" type="Folk" name="Seo Nox Ar">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="11" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="27736" level="85" type="Folk" name="Floato Nox Ar">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="39" />
+				<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="10" />
+			<height normal="14" />
+		</collision>
+	</npc>
+	<npc id="27737" level="85" type="Folk" name="Nox Ar Hunter">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27738" level="85" type="Folk" name="Nox Ar Sorceress">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27739" level="85" type="Folk" name="Saida Nox Ar">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27740" level="85" type="Folk" name="Atron Nox Mide">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="25" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10" />
+			<height normal="12" />
+		</collision>
+	</npc>
+	<npc id="27741" level="85" type="Folk" name="Craigo Nox Mide">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="18" />
+		</collision>
+	</npc>
+	<npc id="27742" level="85" type="Folk" name="Kerberos Nox Mide">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="28" />
+			<height normal="28" />
+		</collision>
+	</npc>
+	<npc id="27743" level="85" type="Folk" name="Nox Mide Hunter">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27744" level="85" type="Folk" name="Nox Mide Sorceress">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27745" level="85" type="Folk" name="Saida Nox Mide">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27746" level="85" type="Folk" name="Nox Mide Blader">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27747" level="85" type="Folk" name="Atron Nox Telro">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="25" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10" />
+			<height normal="12" />
+		</collision>
+	</npc>
+	<npc id="27748" level="85" type="Folk" name="Craigo Nox Telro">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="18" />
+		</collision>
+	</npc>
+	<npc id="27749" level="85" type="Folk" name="Beor Nox Telro">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="18" />
+				<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="26.8" />
+		</collision>
+	</npc>
+	<npc id="27750" level="85" type="Folk" name="Nox Telro Hunter">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27751" level="85" type="Folk" name="Nox Telro Sorceress">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27752" level="85" type="Folk" name="Saida Nox Telro">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27753" level="85" type="Folk" name="Nox Telro Blader">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27754" level="85" type="Folk" name="Nox Telro 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="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27755" level="85" type="Folk" name="Daril Anima Ar">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="13" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="8" />
+			<height normal="10" />
+		</collision>
+	</npc>
+	<npc id="27756" level="85" type="Folk" name="Seo Anima Ar">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="11" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="27757" level="85" type="Folk" name="Floato Anima Ar">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="39" />
+				<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="10" />
+			<height normal="14" />
+		</collision>
+	</npc>
+	<npc id="27758" level="85" type="Folk" name="Anima Ar Hunter">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27759" level="85" type="Folk" name="Anima Ar Sorceress">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27760" level="85" type="Folk" name="Saida Anima Ar">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="397165" hpRegen="10.5" mp="3024" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27761" level="85" type="Folk" name="Atron Anima Mide">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="25" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10" />
+			<height normal="12" />
+		</collision>
+	</npc>
+	<npc id="27762" level="85" type="Folk" name="Craigo Anima Mide">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="18" />
+		</collision>
+	</npc>
+	<npc id="27763" level="85" type="Folk" name="Kerberos Anima Mide">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="28" />
+			<height normal="28" />
+		</collision>
+	</npc>
+	<npc id="27764" level="85" type="Folk" name="Anima Mide Hunter">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27765" level="85" type="Folk" name="Anima Mide Sorceress">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27766" level="85" type="Folk" name="Saida Anima Mide">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27767" level="85" type="Folk" name="Anima Mide Blader">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="624947" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27768" level="85" type="Folk" name="Atron Anima Telro">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="25" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10" />
+			<height normal="12" />
+		</collision>
+	</npc>
+	<npc id="27769" level="85" type="Folk" name="Craigo Anima Telro">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="18" />
+		</collision>
+	</npc>
+	<npc id="27770" level="85" type="Folk" name="Beor Anima Telro">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="18" />
+				<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="26.8" />
+		</collision>
+	</npc>
+	<npc id="27771" level="85" type="Folk" name="Anima Telro Hunter">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27772" level="85" type="Folk" name="Anima Telro Sorceress">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27773" level="85" type="Folk" name="Saida Anima Telro">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27774" level="85" type="Folk" name="Anima Telro Swordsman">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27775" level="85" type="Folk" name="Anima Telro 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="1036753" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="27776" level="85" type="Folk" name="Catshi Trickster" title="Asa Guardian">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="80" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7" />
+			<height normal="16.75" />
+		</collision>
+	</npc>
+	<npc id="27777" level="85" type="Folk" name="Catshi Muse" title="Asa 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="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="19" />
+				<run ground="80" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7" />
+			<height normal="13" />
+		</collision>
+	</npc>
+	<npc id="27778" level="85" type="Folk" name="Catshi Ripper" title="Asa 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="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="20" />
+				<run ground="100" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10" />
+			<height normal="17" />
+		</collision>
+	</npc>
+	<npc id="27779" level="85" type="Folk" name="Catshi Trickster" title="Nox Guardian">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="80" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7" />
+			<height normal="16.75" />
+		</collision>
+	</npc>
+	<npc id="27780" level="85" type="Folk" name="Catshi Muse" title="Nox 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="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="19" />
+				<run ground="80" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7" />
+			<height normal="13" />
+		</collision>
+	</npc>
+	<npc id="27781" level="85" type="Folk" name="Catshi Ripper" title="Nox 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="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="20" />
+				<run ground="100" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10" />
+			<height normal="17" />
+		</collision>
+	</npc>
+	<npc id="27782" level="85" type="Folk" name="Catshi Trickster" title="Anima Guardian">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="80" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7" />
+			<height normal="16.75" />
+		</collision>
+	</npc>
+	<npc id="27783" level="85" type="Folk" name="Catshi Muse" title="Anima 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="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="19" />
+				<run ground="80" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7" />
+			<height normal="13" />
+		</collision>
+	</npc>
+	<npc id="27784" level="85" type="Folk" name="Catshi Ripper" title="Anima 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="1287" hpRegen="10.5" mp="3190" mpRegen="3.6" />
+			<speed>
+				<walk ground="20" />
+				<run ground="100" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10" />
+			<height normal="17" />
+		</collision>
+	</npc>
+</list>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/29000-29099.xml
index c8b18b056c..44b62e742f 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/29000-29099.xml
@@ -698,7 +698,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29020" level="125" type="GrandBoss" name="Baium">
+	<npc id="29020" level="125" type="GrandBoss" name="Baium" title="Elmoreden's Emperor">
 		<!-- NEW UPDATE: PRELUDE OF WAR -->
 		<parameters>
 			<minions name="Privates">
@@ -895,7 +895,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29023" level="58" type="Monster" name="Doll Blader">
+	<npc id="29023" level="58" type="Monster" name="Maiden Doll">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="50" />
@@ -1294,7 +1294,7 @@
 			<height normal="75" />
 		</collision>
 	</npc>
-	<npc id="29030" level="84" type="RaidBoss" name="Fenril Hound Kerinne" title="Family of Valakas">
+	<npc id="29030" level="84" type="RaidBoss" name="Fenril Hound Kerinne" title="Valakas' Spawn">
 		<parameters>
 			<minions name="Privates">
 				<npc id="29031" count="2" respawnTime="360" weightPoint="1" />
@@ -1427,7 +1427,7 @@
 			<height normal="45" />
 		</collision>
 	</npc>
-	<npc id="29033" level="84" type="RaidBoss" name="Fenril Hound Freki" title="Family of Valakas">
+	<npc id="29033" level="84" type="RaidBoss" name="Fenril Hound Freki" title="Valakas' Spawn">
 		<parameters>
 			<minions name="Privates">
 				<npc id="29034" count="3" respawnTime="360" weightPoint="1" />
@@ -1560,7 +1560,7 @@
 			<height normal="45" />
 		</collision>
 	</npc>
-	<npc id="29036" level="84" type="RaidBoss" name="Fenril Hound Uruz" title="Family of Valakas">
+	<npc id="29036" level="84" type="RaidBoss" name="Fenril Hound Uruz" title="Valakas' Spawn">
 		<parameters>
 			<skill name="SelfRangeCancel_a" id="4177" level="9" />
 			<skill name="SelfBuff_a" id="4175" level="9" />
@@ -1611,7 +1611,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29037" level="84" type="RaidBoss" name="Fenril Hound Kinaz" title="Family of Valakas">
+	<npc id="29037" level="84" type="RaidBoss" name="Fenril Hound Kinaz" title="Valakas' Spawn">
 		<parameters>
 			<minions name="Privates">
 				<npc id="29038" count="3" respawnTime="360" weightPoint="1" />
@@ -2473,7 +2473,7 @@
 			<height normal="58" />
 		</collision>
 	</npc>
-	<npc id="29054" level="99" type="RaidBoss" name="Benom" title="Triol's Leader">
+	<npc id="29054" level="99" type="RaidBoss" name="Venom" title="Triol's Leader">
 		<parameters>
 			<skill name="PhysicalSpecial" id="4993" level="1" />
 			<skill name="DDMagic" id="4994" level="1" />
@@ -2818,7 +2818,7 @@
 			<height normal="80" />
 		</collision>
 	</npc>
-	<npc id="29062" level="99" type="RaidBoss" name="Andreas Van Halter" title="Seer of Pagan">
+	<npc id="29062" level="99" type="RaidBoss" name="Andreas Van Halter" title="High Priestess">
 		<parameters>
 			<minions name="Privates">
 				<npc id="29063" count="3" respawnTime="360" weightPoint="1" />
@@ -3205,7 +3205,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29068" level="118" type="GrandBoss" name="Antharas" title="Land Dragon">
+	<npc id="29068" level="118" type="GrandBoss" name="Antharas" title="Earth Dragon">
 		<parameters>
 			<param name="ultra_respawn_time" value="3" />
 		</parameters>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/29200-29299.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/29200-29299.xml
index ac5a817755..4097727041 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/29200-29299.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/29200-29299.xml
@@ -1167,7 +1167,7 @@
 			<height normal="1600" />
 		</collision>
 	</npc>
-	<npc id="29223" level="112" type="Monster" name="Antharas" title="Land Dragon">
+	<npc id="29223" level="112" type="Monster" name="Antharas" title="Earth Dragon">
 		<parameters>
 			<skill name="SKILL_ANTARAS_MOUTH" id="14378" level="1" />
 			<skill name="SKILL_ANTARAS_TAIL" id="14380" level="1" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/29300-29399.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/29300-29399.xml
index 4d2c4f5354..01a2be85da 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/29300-29399.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/29300-29399.xml
@@ -1016,7 +1016,7 @@
 			<skill id="32296" level="1" /> <!-- Provoke -->
 		</skillList>
 	</npc>
-	<npc id="29322" level="108" type="Monster" name="Guide of Pride">
+	<npc id="29322" level="108" type="Monster" name="Guide of Arrogance">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<acquire exp="15747706368" sp="14171760" />
@@ -2763,7 +2763,7 @@
 			<height normal="33" />
 		</collision>
 	</npc>
-	<npc id="29358" level="125" type="Monster" name="Nephilim Knight Captain" title="Anakim's Eye">
+	<npc id="29358" level="125" type="Monster" name="Nephilim Knight Captain" title="Anakim�s Eye">
 		<parameters>
 			<param name="MoveAroundSocial" value="71" />
 			<param name="MoveAroundSocial1" value="71" />
@@ -4294,7 +4294,7 @@
 			<skill id="32741" level="1" /> <!-- Arrow Flush -->
 		</skillList>
 	</npc>
-	<npc id="29379" level="125" type="RaidBoss" name="Lord Ishka">
+	<npc id="29379" level="125" type="RaidBoss" name="Lord Ishka" title="Blade of Revenge">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="80949" /> 
@@ -4510,4 +4510,42 @@
 			<height normal="109" />
 		</collision>
 	</npc>
+	<npc id="29385" level="85" type="Folk" name="Eigis" title="Lady of Despair">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="761086172" hpRegen="10.5" mp="68076" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="36" />
+			<height normal="123" />
+		</collision>
+	</npc>
+	<npc id="29386" level="85" type="Folk" name="Magic Device" title="Owned by Eigis">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="250" hpRegen="10.5" mp="3190" 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="56" />
+			<height normal="143" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30100-30199.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30100-30199.xml
index 37ef13b84d..936687fa89 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30100-30199.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30100-30199.xml
@@ -1055,7 +1055,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="30129" level="70" type="Folk" name="Mitraell" title="Brown Elf Chief">
+	<npc id="30129" level="70" type="Folk" name="Mitraell" title="Dark Elf Chief">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30200-30299.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30200-30299.xml
index 6c8717970b..67dafdcf15 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30200-30299.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="99" type="Guard" name="Stan" title="Guard">
 		<!-- Confirmed CT2.5 -->
@@ -1005,7 +1005,7 @@
 			<height normal="16.5" />
 		</collision>
 	</npc>
-	<npc id="30284" level="99" type="Guard" name="Alberius" title="Sentinel Knight">
+	<npc id="30284" level="99" type="Guard" name="Alberius" title="Sentry Knight">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30300-30399.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30300-30399.xml
index 10a26ffe00..9cde2d5546 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30300-30399.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="Folk" name="Pushkin" title="Blacksmith">
 		<!-- Confirmed CT2.5 -->
@@ -1301,7 +1301,7 @@
 			<height normal="21.2" />
 		</collision>
 	</npc>
-	<npc id="30346" level="99" type="Guard" name="Kayleen" title="Sentry">
+	<npc id="30346" level="99" type="Guard" name="Kayleen" title="Sentinel">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1344,7 +1344,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30347" level="99" type="Guard" name="Marion" title="Sentry">
+	<npc id="30347" level="99" type="Guard" name="Marion" title="Sentinel">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1387,7 +1387,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30348" level="99" type="Guard" name="Nelsya" title="Sentry">
+	<npc id="30348" level="99" type="Guard" name="Nelsya" title="Sentinel">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1430,7 +1430,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30349" level="99" type="Guard" name="Jenna" title="Sentry">
+	<npc id="30349" level="99" type="Guard" name="Jenna" title="Sentinel">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1678,7 +1678,7 @@
 			<height normal="21.5" />
 		</collision>
 	</npc>
-	<npc id="30355" level="99" type="Guard" name="Roselyn" title="Sentry">
+	<npc id="30355" level="99" type="Guard" name="Roselyn" title="Sentinel">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1721,7 +1721,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30356" level="99" type="Guard" name="Altima" title="Sentry">
+	<npc id="30356" level="99" type="Guard" name="Altima" title="Sentinel">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1764,7 +1764,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30357" level="99" type="Guard" name="Kristin" title="Sentry">
+	<npc id="30357" level="99" type="Guard" name="Kripi" title="Sentinel">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30400-30499.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30400-30499.xml
index c62ed6f512..0ed38719d6 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30400-30499.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30400-30499.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="30400" level="70" type="Folk" name="Newbie Helper">
 		<!-- Confirmed CT2.5 -->
@@ -825,7 +825,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30420" level="70" type="Merchant" name="Tyra">
+	<npc id="30420" level="70" type="Merchant" name="Tyra" title="Grocer">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1321,7 +1321,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="30432" level="99" type="Guard" name="Irene" title="Sentry">
+	<npc id="30432" level="99" type="Guard" name="Irene" title="Sentinel">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1364,7 +1364,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30433" level="99" type="Guard" name="Kathaway" title="Sentry">
+	<npc id="30433" level="99" type="Guard" name="Kathaway" title="Sentinel">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30500-30599.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30500-30599.xml
index 5677b4f22c..8a3f2b1067 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30500-30599.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="VillageMaster" name="Osborn" title="High Prefect">
 		<!-- Confirmed CT2.5 -->
@@ -1275,7 +1275,7 @@
 			<height normal="18.5" />
 		</collision>
 	</npc>
-	<npc id="30531" level="70" type="Folk" name="Lockirin" title="Iron Gate's">
+	<npc id="30531" level="70" type="Folk" name="Lockirin" title="First Elder">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1316,7 +1316,7 @@
 			<height normal="17.5" />
 		</collision>
 	</npc>
-	<npc id="30532" level="70" type="Folk" name="Spiron" title="Golden Wheel's">
+	<npc id="30532" level="70" type="Folk" name="Spiron" title="Elder">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1357,7 +1357,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="30533" level="70" type="Folk" name="Balanki" title="Silver Scale's">
+	<npc id="30533" level="70" type="Folk" name="Balanki" title="Elder">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1398,7 +1398,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="30534" level="70" type="Folk" name="Keef" title="Bronze Key's">
+	<npc id="30534" level="70" type="Folk" name="Keef" title="Elder">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1439,7 +1439,7 @@
 			<height normal="18.4" />
 		</collision>
 	</npc>
-	<npc id="30535" level="70" type="Folk" name="Filaur" title="Gray Pillar's">
+	<npc id="30535" level="70" type="Folk" name="Filaur" title="Elder">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1480,7 +1480,7 @@
 			<height normal="19.7" />
 		</collision>
 	</npc>
-	<npc id="30536" level="70" type="Folk" name="Arin" title="Black Anvil's">
+	<npc id="30536" level="70" type="Folk" name="Arin" title="Elder">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1562,7 +1562,7 @@
 			<height normal="19.5" />
 		</collision>
 	</npc>
-	<npc id="30538" level="70" type="Folk" name="Zimenf" title="Priest of the Earth">
+	<npc id="30538" level="70" type="Folk" name="Zimenf" title="Head Priest of the Earth">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1731,7 +1731,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="30542" level="99" type="Guard" name="Runant" title="Defender">
+	<npc id="30542" level="99" type="Guard" name="Runant" title="Protector">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1774,7 +1774,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="30543" level="99" type="Guard" name="Ethan" title="Defender">
+	<npc id="30543" level="99" type="Guard" name="Ethan" title="Protector">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1817,7 +1817,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="30544" level="99" type="Guard" name="Cromwell" title="Defender">
+	<npc id="30544" level="99" type="Guard" name="Cromwell" title="Protector">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1860,7 +1860,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="30545" level="99" type="Guard" name="Proton" title="Defender">
+	<npc id="30545" level="99" type="Guard" name="Proton" title="Protector">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1903,7 +1903,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="30546" level="99" type="Guard" name="Dinkey" title="Defender">
+	<npc id="30546" level="99" type="Guard" name="Dinkey" title="Protector">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1946,7 +1946,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="30547" level="99" type="Guard" name="Tardyon" title="Defender">
+	<npc id="30547" level="99" type="Guard" name="Tardyon" title="Protector">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1989,7 +1989,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="30548" level="99" type="Guard" name="Nathan" title="Defender">
+	<npc id="30548" level="99" type="Guard" name="Nathan" title="Protector">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30600-30699.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30600-30699.xml
index 356b8f77c7..fbccfe5cc8 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30600-30699.xml
+++ b/L2J_Mobius_10.0_MasterClass/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 Helper">
 		<!-- Confirmed CT2.5 -->
@@ -708,7 +708,7 @@
 			<height normal="16.5" />
 		</collision>
 	</npc>
-	<npc id="30622" level="70" type="Folk" name="Box Of Titan">
+	<npc id="30622" level="70" type="Folk" name="Box of Titan">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1746,7 +1746,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="30647" level="70" type="Folk" name="Chest Of Shyslassys">
+	<npc id="30647" level="70" type="Folk" name="Chest of Shyslassys">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1788,7 +1788,7 @@
 			<height normal="9" />
 		</collision>
 	</npc>
-	<npc id="30648" level="70" type="Folk" name="Santiago" title="Hermit">
+	<npc id="30648" level="70" type="Folk" name="Reclous" title="Hermit">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1870,7 +1870,7 @@
 			<height normal="103" />
 		</collision>
 	</npc>
-	<npc id="30650" level="70" type="Folk" name="Gerald" title="Priest of the Earth">
+	<npc id="30650" level="70" type="Folk" name="Gerald" title="Head Priest of the Earth">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2118,7 +2118,7 @@
 			<height normal="22.4" />
 		</collision>
 	</npc>
-	<npc id="30656" level="70" type="Folk" name="Spirit Of Sir Talianus">
+	<npc id="30656" level="70" type="Folk" name="Spirit of Sir Talianus">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2531,7 +2531,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="Prophetess">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30700-30799.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30700-30799.xml
index db119ffe15..a7a2808b32 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30700-30799.xml
+++ b/L2J_Mobius_10.0_MasterClass/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">
 		<!-- Confirmed CT2.5 -->
@@ -84,7 +84,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="30702" level="70" type="Folk" name="Bernard" title="Hunter Guild President">
+	<npc id="30702" level="70" type="Folk" name="Bernard" title="Hunters' Guild Leader">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -125,7 +125,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="30703" level="70" type="Folk" name="Colin" title="Hunter Guild Member">
+	<npc id="30703" level="70" type="Folk" name="Colleen" title="Hunters' Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1876,7 +1876,7 @@
 			<height normal="9" />
 		</collision>
 	</npc>
-	<npc id="30744" level="70" type="Folk" name="Grey" title="Hunter Guild Member">
+	<npc id="30744" level="70" type="Folk" name="Grey" title="Hunters' Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1917,7 +1917,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="30745" level="70" type="Folk" name="Tor" title="Hunter Guild Member">
+	<npc id="30745" level="70" type="Folk" name="Tor" title="Hunters' Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2293,7 +2293,7 @@
 			<height normal="22.4" />
 		</collision>
 	</npc>
-	<npc id="30754" level="70" type="Folk" name="Gilmore" title="Antharas Watchman">
+	<npc id="30754" level="70" type="Folk" name="Gilmore" title="Antharas' Watchman">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="215" />
@@ -2336,7 +2336,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30755" level="70" type="Folk" name="Theodric" title="Antharas Watchman">
+	<npc id="30755" level="70" type="Folk" name="Theodric" title="Antharas' Watchman">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="215" />
@@ -2462,7 +2462,7 @@
 			<height normal="98" />
 		</collision>
 	</npc>
-	<npc id="30758" level="70" type="Folk" name="Athrea" title="Witch">
+	<npc id="30758" level="70" type="Folk" name="Ritasha" title="Witch">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30800-30899.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30800-30899.xml
index a77a9b9990..0341ec7ce9 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30800-30899.xml
+++ b/L2J_Mobius_10.0_MasterClass/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">
 		<!-- Confirmed CT2.5 -->
@@ -445,7 +445,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="30834" level="70" type="Merchant" name="Cema" title="Magic Trader">
+	<npc id="30834" level="70" type="Merchant" name="Cema" title="Grocer">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1977,7 +1977,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="30870" level="99" type="Folk" name="Kurtiz" title="Captain">
+	<npc id="30870" level="99" type="Folk" name="Curtis" title="Captain">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30900-30999.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30900-30999.xml
index 742eaf3400..9e7cdd804a 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/30900-30999.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="VillageMaster" name="Marcus" title="Grand Master">
 		<!-- Confirmed CT2.5 -->
@@ -1060,7 +1060,7 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="30925" level="70" type="Folk" name="Morelyn" title="Eva's High Priestess">
+	<npc id="30925" level="70" type="Folk" name="Morelyn" title="High Priestess">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1102,7 +1102,7 @@
 			<height normal="21.2" />
 		</collision>
 	</npc>
-	<npc id="30926" level="70" type="Folk" name="Restina" title="Eva's Priestess">
+	<npc id="30926" level="70" type="Folk" name="Restina" title="Priestess">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1144,7 +1144,7 @@
 			<height normal="21.2" />
 		</collision>
 	</npc>
-	<npc id="30927" level="70" type="Folk" name="Alicia" title="Eva's Priestess">
+	<npc id="30927" level="70" type="Folk" name="Alicia" title="Priestess">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2596,7 +2596,7 @@
 			<height normal="9.5" />
 		</collision>
 	</npc>
-	<npc id="30962" level="70" type="Folk" name="Statue of Water">
+	<npc id="30962" level="70" type="Folk" name="Water Chest">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2638,7 +2638,7 @@
 			<height normal="9.5" />
 		</collision>
 	</npc>
-	<npc id="30963" level="70" type="Folk" name="Statue of Fire">
+	<npc id="30963" level="70" type="Folk" name="Fire Chest">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2680,7 +2680,7 @@
 			<height normal="9.5" />
 		</collision>
 	</npc>
-	<npc id="30964" level="70" type="Folk" name="Statue of Wind">
+	<npc id="30964" level="70" type="Folk" name="Wind Chest">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2722,7 +2722,7 @@
 			<height normal="9.5" />
 		</collision>
 	</npc>
-	<npc id="30965" level="70" type="Folk" name="Statue of Earth">
+	<npc id="30965" level="70" type="Folk" name="Earth Chest">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2930,7 +2930,7 @@
 			<height normal="20.5" />
 		</collision>
 	</npc>
-	<npc id="30970" level="70" type="Folk" name="Dorothy" title="Locksmith">
+	<npc id="30970" level="70" type="Folk" name="Dorothy" title="Blacksmith">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31000-31099.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31000-31099.xml
index cd52ed8b68..9fdd2bad40 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31000-31099.xml
+++ b/L2J_Mobius_10.0_MasterClass/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">
 		<!-- Confirmed CT2.5 -->
@@ -311,7 +311,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="31009" level="70" type="Monster" name="Cyclone Thunder">
+	<npc id="31009" level="70" type="Monster" name="Cyclone">
 		<!-- Confirmed CT2.5 -->
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
@@ -1163,7 +1163,7 @@
 			<height normal="9" />
 		</collision>
 	</npc>
-	<npc id="31031" level="70" type="BroadcastingTower" name="Broadcasting Tower">
+	<npc id="31031" level="70" type="BroadcastingTower" name="Anchor Crystal">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -1333,7 +1333,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="31035" level="99" type="Guard" name="Defender">
+	<npc id="31035" level="99" type="Guard" name="Protector">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="NoFnHi" value="1" />
@@ -1503,7 +1503,7 @@
 			<height normal="18.5" />
 		</collision>
 	</npc>
-	<npc id="31044" level="70" type="Merchant" name="Galman" title="Trader of the Valley">
+	<npc id="31044" level="70" type="Merchant" name="Galman" title="Grocer">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1544,7 +1544,7 @@
 			<height normal="16.5" />
 		</collision>
 	</npc>
-	<npc id="31045" level="70" type="Merchant" name="Kitzka" title="Trader of the Valley">
+	<npc id="31045" level="70" type="Merchant" name="Kitzka" title="Grocer">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1585,7 +1585,7 @@
 			<height normal="17.5" />
 		</collision>
 	</npc>
-	<npc id="31046" level="70" type="Folk" name="Marsden" title="Symbol Maker">
+	<npc id="31046" level="70" type="Folk" name="Marsden" title="Dye Merchant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1626,7 +1626,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="31047" level="70" type="Folk" name="Kell" title="Symbol Maker">
+	<npc id="31047" level="70" type="Folk" name="Kell" title="Dye Merchant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1667,7 +1667,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="31048" level="70" type="Folk" name="McDermott" title="Symbol Maker">
+	<npc id="31048" level="70" type="Folk" name="McDermott" title="Dye Merchant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1708,7 +1708,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="31049" level="70" type="Folk" name="Pepper" title="Symbol Maker">
+	<npc id="31049" level="70" type="Folk" name="Pepper" title="Dye Merchant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1749,7 +1749,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="31050" level="70" type="Folk" name="Thora" title="Symbol Maker">
+	<npc id="31050" level="70" type="Folk" name="Thora" title="Dye Merchant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1790,7 +1790,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="31051" level="70" type="Folk" name="Keach" title="Symbol Maker">
+	<npc id="31051" level="70" type="Folk" name="Keach" title="Dye Merchant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1831,7 +1831,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="31052" level="70" type="Folk" name="Heid" title="Symbol Maker">
+	<npc id="31052" level="70" type="Folk" name="Heid" title="Dye Merchant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1872,7 +1872,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="31053" level="70" type="Folk" name="Kidder" title="Symbol Maker">
+	<npc id="31053" level="70" type="Folk" name="Kidder" title="Dye Merchant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2027,7 +2027,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="31075" level="70" type="Folk" name="Sales Cat of Ivory Tower">
+	<npc id="31075" level="70" type="Folk" name="Cat Trader of Ivory Tower">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31200-31299.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31200-31299.xml
index 7c3596f861..1f8582c4e1 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31200-31299.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="31200" level="70" type="Folk" name="Preacher of Doom">
 		<!-- Confirmed CT2.5 -->
@@ -2535,7 +2535,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="31262" level="70" type="Merchant" name="Rupert" title="Trader">
+	<npc id="31262" level="70" type="Merchant" name="Rupert" title="Merchant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2617,7 +2617,7 @@
 			<height normal="21.1" />
 		</collision>
 	</npc>
-	<npc id="31264" level="70" type="Folk" name="Olsun" title="Symbol Maker">
+	<npc id="31264" level="70" type="Folk" name="Olsun" title="Dye Merchant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2732,7 +2732,7 @@
 			<height normal="22.4" />
 		</collision>
 	</npc>
-	<npc id="31266" level="70" type="Folk" name="Kaiser">
+	<npc id="31266" level="70" type="Folk" name="Kaysen">
 		<!-- Confirmed CT2.5 -->
 		<race>BEAST</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31300-31399.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31300-31399.xml
index 48540e4b14..200072da07 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31300-31399.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31300-31399.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="31300" level="70" type="Merchant" name="Drumond" title="Weapon Merchant">
 		<!-- Confirmed CT2.5 -->
@@ -329,7 +329,7 @@
 			<height normal="21.5" />
 		</collision>
 	</npc>
-	<npc id="31308" level="70" type="Folk" name="Achim" title="Symbol Maker">
+	<npc id="31308" level="70" type="Folk" name="Achim" title="Dye Merchant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3590,7 +3590,7 @@
 			<height normal="120" />
 		</collision>
 	</npc>
-	<npc id="31386" level="70" type="Merchant" name="Violet" title="Grocer">
+	<npc id="31386" level="70" type="Merchant" name="Violette" title="Grocer">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3755,7 +3755,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="31390" level="70" type="Folk" name="Dummy - Boy A" title="For Test">
+	<npc id="31390" level="70" type="Folk" name="Dummy - Boy A" title="Test">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3796,7 +3796,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31391" level="70" type="Folk" name="Dummy - Boy B" title="For Test">
+	<npc id="31391" level="70" type="Folk" name="Dummy - Boy B" title="Test">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3837,7 +3837,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31392" level="70" type="Folk" name="Dummy - Boy C" title="For Test">
+	<npc id="31392" level="70" type="Folk" name="Dummy - Boy C" title="Test">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3878,7 +3878,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31393" level="70" type="Folk" name="Dummy - Boy D" title="For Test">
+	<npc id="31393" level="70" type="Folk" name="Dummy - Boy D" title="Test">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3919,7 +3919,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31394" level="70" type="Folk" name="Dummy - Boy E" title="For Test">
+	<npc id="31394" level="70" type="Folk" name="Dummy - Boy E" title="Test">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3960,7 +3960,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31395" level="70" type="Folk" name="Dummy - Lady F" title="For Test">
+	<npc id="31395" level="70" type="Folk" name="Dummy - Lady F" title="Test">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -4001,7 +4001,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31396" level="70" type="Folk" name="Dummy - Lady G" title="For Test">
+	<npc id="31396" level="70" type="Folk" name="Dummy - Lady G" title="Test">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -4042,7 +4042,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31397" level="70" type="Folk" name="Dummy - Lady H" title="For Test">
+	<npc id="31397" level="70" type="Folk" name="Dummy - Lady H" title="Test">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -4083,7 +4083,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31398" level="70" type="Folk" name="Dummy - Lady I" title="For Test">
+	<npc id="31398" level="70" type="Folk" name="Dummy - Lady I" title="Test">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -4124,7 +4124,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31399" level="70" type="Folk" name="Dummy - Lady J" title="For Test">
+	<npc id="31399" level="70" type="Folk" name="Dummy - Lady J" title="Test">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31400-31499.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31400-31499.xml
index 1de2fe290e..54cd7a014b 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31400-31499.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31400-31499.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="31400" level="99" type="Guard" name="Dummy - Sword Guard" title="For Test">
+	<npc id="31400" level="99" type="Guard" name="Dummy - Sword Guard" title="Test">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="Attack_BoostValue" value="155" />
@@ -41,7 +41,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31401" level="99" type="Guard" name="Dummy - Bow Guard" title="For Test">
+	<npc id="31401" level="99" type="Guard" name="Dummy - Bow Guard" title="Test">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="Attack_BoostValue" value="155" />
@@ -287,7 +287,7 @@
 			<height normal="21.3" />
 		</collision>
 	</npc>
-	<npc id="31409" level="70" type="Folk" name="Monster Race Guide" title="Hunter's Village">
+	<npc id="31409" level="70" type="Folk" name="Monster Race Guide" title="Hunters' Village">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -410,7 +410,7 @@
 			<height normal="21.3" />
 		</collision>
 	</npc>
-	<npc id="31412" level="70" type="Folk" name="Monster Race Guide" title="Town of Rune">
+	<npc id="31412" level="70" type="Folk" name="Monster Race Guide" title="Rune">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31500-31599.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31500-31599.xml
index 8d88d990f8..c470708e3f 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31500-31599.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="31500" level="70" type="Folk" name="Dimensional Doorkeeper">
 		<!-- Confirmed CT2.5 -->
@@ -504,7 +504,7 @@
 			<height normal="45.5" />
 		</collision>
 	</npc>
-	<npc id="31512" level="70" type="Folk" name="Evil Altar">
+	<npc id="31512" level="70" type="Folk" name="Altar of Evil">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -546,7 +546,7 @@
 			<height normal="45" />
 		</collision>
 	</npc>
-	<npc id="31513" level="70" type="Folk" name="Evil Altar">
+	<npc id="31513" level="70" type="Folk" name="Altar of Evil">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -588,7 +588,7 @@
 			<height normal="45" />
 		</collision>
 	</npc>
-	<npc id="31514" level="70" type="Folk" name="Evil Altar">
+	<npc id="31514" level="70" type="Folk" name="Altar of Evil">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -630,7 +630,7 @@
 			<height normal="45" />
 		</collision>
 	</npc>
-	<npc id="31515" level="70" type="Folk" name="Evil Altar">
+	<npc id="31515" level="70" type="Folk" name="Altar of Evil">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -672,7 +672,7 @@
 			<height normal="45" />
 		</collision>
 	</npc>
-	<npc id="31516" level="70" type="Folk" name="Evil Altar">
+	<npc id="31516" level="70" type="Folk" name="Altar of Evil">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2470,7 +2470,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31558" level="70" type="Folk" name="Ketra's Holy Altar">
+	<npc id="31558" level="70" type="Folk" name="Ketra's Sacred Altar">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2554,7 +2554,7 @@
 			<height normal="9.5" />
 		</collision>
 	</npc>
-	<npc id="31560" level="70" type="Folk" name="Varka's Holy Altar">
+	<npc id="31560" level="70" type="Folk" name="Varka's Sacred Altar">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2638,7 +2638,7 @@
 			<height normal="9" />
 		</collision>
 	</npc>
-	<npc id="31562" level="70" type="Fisherman" name="Klufe" title="Fishing Guild Member">
+	<npc id="31562" level="70" type="Fisherman" name="Klufe" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2680,7 +2680,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31563" level="70" type="Fisherman" name="Perelin" title="Fishing Guild Member">
+	<npc id="31563" level="70" type="Fisherman" name="Perelin" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2722,7 +2722,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31564" level="70" type="Fisherman" name="Mishini" title="Fishing Guild Member">
+	<npc id="31564" level="70" type="Fisherman" name="Mishini" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2764,7 +2764,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31565" level="70" type="Fisherman" name="Ogord" title="Fishing Guild Member">
+	<npc id="31565" level="70" type="Fisherman" name="Ogord" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2806,7 +2806,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31566" level="70" type="Fisherman" name="Ropfi" title="Fishing Guild Member">
+	<npc id="31566" level="70" type="Fisherman" name="Ropfi" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2848,7 +2848,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31567" level="70" type="Fisherman" name="Bleaker" title="Fishing Guild Member">
+	<npc id="31567" level="70" type="Fisherman" name="Bleaker" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2890,7 +2890,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31568" level="70" type="Fisherman" name="Pamfus" title="Fishing Guild Member">
+	<npc id="31568" level="70" type="Fisherman" name="Pamfus" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2932,7 +2932,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31569" level="70" type="Fisherman" name="Cyano" title="Fishing Guild Member">
+	<npc id="31569" level="70" type="Fisherman" name="Cyano" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2974,7 +2974,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31570" level="70" type="Fisherman" name="Lanosco" title="Fishing Guild Member">
+	<npc id="31570" level="70" type="Fisherman" name="Lanosco" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3016,7 +3016,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31571" level="70" type="Fisherman" name="Hufs" title="Fishing Guild Member">
+	<npc id="31571" level="70" type="Fisherman" name="Hufs" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3058,7 +3058,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31572" level="70" type="Fisherman" name="O'Fulle" title="Fishing Guild Member">
+	<npc id="31572" level="70" type="Fisherman" name="O'Fulle" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3100,7 +3100,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31573" level="70" type="Fisherman" name="Monakan" title="Fishing Guild Member">
+	<npc id="31573" level="70" type="Fisherman" name="Monakan" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3142,7 +3142,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31574" level="70" type="Fisherman" name="Willie" title="Fishing Guild Member">
+	<npc id="31574" level="70" type="Fisherman" name="Willie" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3184,7 +3184,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31575" level="70" type="Fisherman" name="Litulon" title="Fishing Guild Member">
+	<npc id="31575" level="70" type="Fisherman" name="Litulon" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3226,7 +3226,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31576" level="70" type="Fisherman" name="Berix" title="Fishing Guild Member">
+	<npc id="31576" level="70" type="Fisherman" name="Berix" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3268,7 +3268,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31577" level="70" type="Fisherman" name="Linnaeus" title="Fishing Guild Member">
+	<npc id="31577" level="70" type="Fisherman" name="Linnaeus" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3310,7 +3310,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31578" level="70" type="Fisherman" name="Hilgendorf" title="Fishing Guild Member">
+	<npc id="31578" level="70" type="Fisherman" name="Hilgendorf" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3352,7 +3352,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31579" level="70" type="Fisherman" name="Klaus" title="Fishing Guild Member">
+	<npc id="31579" level="70" type="Fisherman" name="Klaus" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31600-31699.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31600-31699.xml
index f4b0cacd5f..c5ae2a3733 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31600-31699.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="31600" level="70" type="Folk" name="Pamela Aprodia">
 		<!-- Confirmed CT2.5 -->
@@ -126,7 +126,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="31603" level="70" type="Folk" name="Black Cat" title="Hunter Guild Member">
+	<npc id="31603" level="70" type="Folk" name="Black Cat" title="Hunters' Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -253,7 +253,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31606" level="70" type="Folk" name="Alice de Catrina" title="Kinsley's Servitor">
+	<npc id="31606" level="70" type="Folk" name="Elise de Catrina" title="Kinsley's Servitor">
 		<!-- Confirmed CT2.5 -->
 		<race>ELEMENTAL</race>
 		<sex>FEMALE</sex>
@@ -1334,7 +1334,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="31632" level="70" type="Folk" name="Mysterious Servitor">
+	<npc id="31632" level="70" type="Folk" name="Enigmatic Servitor">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="24" />
@@ -1964,7 +1964,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31647" level="70" type="Folk" name="Tablet of Vision">
+	<npc id="31647" level="70" type="Folk" name="Tablet Of Vision">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2006,7 +2006,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31648" level="70" type="Folk" name="Tablet of Vision">
+	<npc id="31648" level="70" type="Folk" name="Tablet Of Vision">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2048,7 +2048,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31649" level="70" type="Folk" name="Tablet of Vision">
+	<npc id="31649" level="70" type="Folk" name="Tablet Of Vision">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2090,7 +2090,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31650" level="70" type="Folk" name="Tablet of Vision">
+	<npc id="31650" level="70" type="Folk" name="Tablet Of Vision">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2132,7 +2132,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31651" level="70" type="Folk" name="Tablet of Vision">
+	<npc id="31651" level="70" type="Folk" name="Tablet Of Vision">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2174,7 +2174,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31652" level="70" type="Folk" name="Tablet of Vision">
+	<npc id="31652" level="70" type="Folk" name="Tablet Of Vision">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2216,7 +2216,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31653" level="70" type="Folk" name="Tablet of Vision">
+	<npc id="31653" level="70" type="Folk" name="Tablet Of Vision">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2258,7 +2258,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31654" level="70" type="Folk" name="Tablet of Vision">
+	<npc id="31654" level="70" type="Folk" name="Tablet Of Vision">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2300,7 +2300,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31655" level="70" type="Folk" name="Tablet of Vision">
+	<npc id="31655" level="70" type="Folk" name="Tablet Of Vision">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2342,7 +2342,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31656" level="70" type="Folk" name="Tablet of Vision">
+	<npc id="31656" level="70" type="Folk" name="Tablet Of Vision">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2384,7 +2384,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31657" level="70" type="Folk" name="Tablet of Vision">
+	<npc id="31657" level="70" type="Folk" name="Tablet Of Vision">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2426,7 +2426,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31658" level="70" type="Folk" name="Tablet of Vision">
+	<npc id="31658" level="70" type="Folk" name="Tablet Of Vision">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2468,7 +2468,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31659" level="70" type="Folk" name="Tablet of Vision">
+	<npc id="31659" level="70" type="Folk" name="Tablet Of Vision">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2510,7 +2510,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="31660" level="70" type="Folk" name="Tablet of Vision">
+	<npc id="31660" level="70" type="Folk" name="Tablet Of Vision">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -4046,7 +4046,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="31696" level="70" type="Fisherman" name="Platis" title="Fishing Guild Member">
+	<npc id="31696" level="70" type="Fisherman" name="Platis" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -4088,7 +4088,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31697" level="70" type="Fisherman" name="Eindarkner" title="Fishing Guild Member">
+	<npc id="31697" level="70" type="Fisherman" name="Eindarkner" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31800-31899.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31800-31899.xml
index e1b5e2b713..6e00f30160 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31800-31899.xml
+++ b/L2J_Mobius_10.0_MasterClass/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">
 		<!-- Confirmed CT2.5 -->
@@ -274,7 +274,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="31848" level="99" type="FriendlyMob" name="Pixy">
+	<npc id="31848" level="99" type="FriendlyMob" name="Fairy">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31900-31999.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31900-31999.xml
index 2fab541b28..34432bd5b3 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31900-31999.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/31900-31999.xml
@@ -2593,7 +2593,7 @@
 			<height normal="21.1" />
 		</collision>
 	</npc>
-	<npc id="31953" level="70" type="Folk" name="Rankar" title="Symbol Maker">
+	<npc id="31953" level="70" type="Folk" name="Rankar" title="Dye Merchant">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -4141,7 +4141,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="31989" level="70" type="Fisherman" name="Batidae" title="Fishing Guild Member">
+	<npc id="31989" level="70" type="Fisherman" name="Batidae" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32000-32099.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32000-32099.xml
index e496a73de3..5015255f22 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32000-32099.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32000-32099.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="32000" level="70" type="Folk" name="Preacher of Doom">
 		<!-- Confirmed CT2.5 -->
@@ -270,7 +270,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="32007" level="70" type="Fisherman" name="Galba" title="Fishing Guild Member">
+	<npc id="32007" level="70" type="Fisherman" name="Galba" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3243,7 +3243,7 @@
 			<height normal="21.5" />
 		</collision>
 	</npc>
-	<npc id="32095" level="70" type="VillageMaster" name="Marie" title="High Priest">
+	<npc id="32095" level="70" type="VillageMaster" name="Marie" title="High Priestess">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32100-32199.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32100-32199.xml
index 41a46468a7..72458e4642 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32100-32199.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32100-32199.xml
@@ -366,7 +366,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="32109" level="70" type="Folk" name="Shilen's Stone Statue">
+	<npc id="32109" level="70" type="Folk" name="Shillien's Stone Statue">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -1246,7 +1246,7 @@
 			<height normal="16.006" />
 		</collision>
 	</npc>
-	<npc id="32131" level="70" type="Folk" name="Employee of Magic Research Institute" title="Event Manager">
+	<npc id="32131" level="70" type="Folk" name="Magic Laboratory Assistant" title="Event Manager">
 		<!-- Confirmed CT2.5 -->
 		<race>DWARF</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32200-32299.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32200-32299.xml
index a918f355c4..9b6094441d 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32200-32299.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32200-32299.xml
@@ -129,7 +129,7 @@
 			<height normal="22.25" />
 		</collision>
 	</npc>
-	<npc id="32203" level="70" type="Folk" name="Ramen" title="Master">
+	<npc id="32203" level="70" type="Folk" name="Rameen" title="Master">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32300-32399.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32300-32399.xml
index e7df185e4f..432b27c5ee 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32300-32399.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32300-32399.xml
@@ -1662,7 +1662,7 @@
 			<height normal="16.5" />
 		</collision>
 	</npc>
-	<npc id="32348" level="70" type="Fisherman" name="Burang" title="Fishing Guild Member">
+	<npc id="32348" level="70" type="Fisherman" name="Burang" title="Fishing Guild">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2816,7 +2816,7 @@
 			<height normal="17.285" />
 		</collision>
 	</npc>
-	<npc id="32378" level="70" type="Teleporter" name="Fantasy Isle Paddy" title="Gatekeeper">
+	<npc id="32378" level="70" type="Teleporter" name="Fantasy Isle's Paddy" title="Gatekeeper">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32400-32499.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32400-32499.xml
index 1db98b8440..0004692a6f 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32400-32499.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32400-32499.xml
@@ -2634,7 +2634,7 @@
 			<height normal="16.006" />
 		</collision>
 	</npc>
-	<npc id="32476" level="70" type="Folk" name="Employee of Magic Research Institute" title="Event manager">
+	<npc id="32476" level="70" type="Folk" name="Magic Laboratory Assistant" title="Event Manager">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="event_animal" value="1" />
@@ -2713,7 +2713,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="32478" level="70" type="Warehouse" name="Dimensional Merchant" title="Life Vitality">
+	<npc id="32478" level="70" type="Warehouse" name="Game Assistant" title="Special">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -2964,7 +2964,7 @@
 			<height normal="46" />
 		</collision>
 	</npc>
-	<npc id="32484" level="70" type="Folk" name="Pathfinder Worker">
+	<npc id="32484" level="70" type="Folk" name="Plains Walker">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMAN</race>
 		<sex>MALE</sex>
@@ -3001,7 +3001,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="32485" level="70" type="Folk" name="Pathfinder Worker">
+	<npc id="32485" level="70" type="Folk" name="Plains Walker">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMAN</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32500-32599.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32500-32599.xml
index 40d2b38f31..c985291d80 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32500-32599.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32500-32599.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="32500" level="70" type="Folk" name="Inspector Sinai">
 		<!-- Confirmed CT2.5 -->
@@ -2681,7 +2681,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="32567" level="70" type="Folk" name="Lelrikia" title="Shilen's Priest">
+	<npc id="32567" level="70" type="Folk" name="Lelrikia" title="Shillien's Priest">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3926,7 +3926,7 @@
 			<height normal="23.75" />
 		</collision>
 	</npc>
-	<npc id="32598" level="70" type="Folk" name="Court Wizard" title="Elmoreden's">
+	<npc id="32598" level="70" type="Folk" name="Court Wizard" title="Elmoreden">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32600-32699.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32600-32699.xml
index a62460bf60..ba880c9107 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32600-32699.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32600-32699.xml
@@ -1309,7 +1309,7 @@
 			<height normal="22.5" />
 		</collision>
 	</npc>
-	<npc id="32633" level="70" type="Folk" name="Cat of Christmas" title="Sharing happiness">
+	<npc id="32633" level="70" type="Folk" name="New Year Cat" title="Sharing happiness">
 		<!-- Confirmed CT2.5 -->
 		<race>ELEMENTAL</race>
 		<sex>FEMALE</sex>
@@ -1347,7 +1347,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="32634" level="70" type="Folk" name="Cat of Christmas" title="Sharing happiness">
+	<npc id="32634" level="70" type="Folk" name="New Year Cat" title="Sharing happiness">
 		<!-- Confirmed CT2.5 -->
 		<race>ELEMENTAL</race>
 		<sex>FEMALE</sex>
@@ -1422,7 +1422,7 @@
 			<height normal="16.7" />
 		</collision>
 	</npc>
-	<npc id="32636" level="75" type="Folk" name="Employee of Magic Research Institute" title="Event manager">
+	<npc id="32636" level="75" type="Folk" name="Magic Laboratory Assistant" title="Event Manager">
 		<!-- Confirmed CT2.5 -->
 		<race>DWARF</race>
 		<sex>FEMALE</sex>
@@ -1497,7 +1497,7 @@
 			<height normal="33.5" />
 		</collision>
 	</npc>
-	<npc id="32638" level="75" type="Folk" name="Roni the cat" title="PC Cafe Event">
+	<npc id="32638" level="75" type="Folk" name="Roni the cat" title="PA Event">
 		<!-- Confirmed CT2.5 -->
 		<race>ELEMENTAL</race>
 		<sex>FEMALE</sex>
@@ -1644,7 +1644,7 @@
 			<height normal="18.5" />
 		</collision>
 	</npc>
-	<npc id="32648" level="80" type="Teleporter" name="Water Dragon's Messenger" title="News Informer">
+	<npc id="32648" level="80" type="Teleporter" name="Larra" title="News Informer">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32700-32799.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32700-32799.xml
index 36e7bf57d8..acddcbff36 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32700-32799.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32700-32799.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="32700" level="80" type="Folk" name="Delusion Manager">
 		<!-- Confirmed CT2.5 -->
@@ -187,7 +187,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="32705" level="80" type="Folk" name="Orc Barrel">
+	<npc id="32705" level="80" type="Folk" name="Oak Barrel">
 		<!-- Confirmed CT2.5 -->
 		<race>CONSTRUCT</race>
 		<sex>FEMALE</sex>
@@ -447,7 +447,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="32713" level="80" type="Folk" name="Pathfinder Worker">
+	<npc id="32713" level="80" type="Folk" name="Plains Walker">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMAN</race>
 		<sex>MALE</sex>
@@ -910,7 +910,7 @@
 			<height normal="26.5" />
 		</collision>
 	</npc>
-	<npc id="32726" level="80" type="Folk" name="Dr. Ice" title="Event manager">
+	<npc id="32726" level="80" type="Folk" name="Dr. Ice" title="Event Manager">
 		<!-- Confirmed CT2.5 -->
 		<race>DWARF</race>
 		<sex>FEMALE</sex>
@@ -946,7 +946,7 @@
 			<height normal="21.3" />
 		</collision>
 	</npc>
-	<npc id="32727" level="80" type="Folk" name="Puss the Cat" title="Event manager">
+	<npc id="32727" level="80" type="Folk" name="Puss the Cat" title="Event Manager">
 		<!-- Confirmed CT2.5 -->
 		<race>ELEMENTAL</race>
 		<sex>MALE</sex>
@@ -983,7 +983,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="32728" level="80" type="Folk" name="Heavenly Bridge Keeper" title="Event manager">
+	<npc id="32728" level="80" type="Folk" name="Heavenly Bridge Keeper" title="Event Manager">
 		<!-- Confirmed CT2.5 -->
 		<race>DWARF</race>
 		<sex>MALE</sex>
@@ -1127,7 +1127,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="32732" level="80" type="Folk" name="6th Anniversary Party Manager" title="Event manager">
+	<npc id="32732" level="80" type="Folk" name="6th Anniversary Party Manager" title="Event Manager">
 		<!-- Confirmed CT2.5 -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32900-32999.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32900-32999.xml
index c31655bd1f..3478b649b7 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32900-32999.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/32900-32999.xml
@@ -135,7 +135,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="32904" level="97" type="Folk" name="Loewyna">
+	<npc id="32904" level="97" type="Folk" name="Loewyna" title="Arcan Guardian">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="110" />
@@ -168,7 +168,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="32905" level="97" type="Folk" name="Loewmus">
+	<npc id="32905" level="97" type="Folk" name="Loewmus" title="Arcan Guardian">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
@@ -201,7 +201,7 @@
 			<height normal="16.006" />
 		</collision>
 	</npc>
-	<npc id="32906" level="97" type="Folk" name="Mystery Cat">
+	<npc id="32906" level="97" type="Folk" name="Mystery Cat" title="Arcan Guardian">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -234,7 +234,7 @@
 			<height normal="18.5" />
 		</collision>
 	</npc>
-	<npc id="32907" level="99" type="Folk" name="Un Dinaer">
+	<npc id="32907" level="99" type="Folk" name="Un Dinaer" title="Arcan Guard">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -267,7 +267,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="32908" level="99" type="Folk" name="Un Magnier">
+	<npc id="32908" level="99" type="Folk" name="Un Magnier" title="Arcan Guard">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
@@ -2496,7 +2496,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="32977" level="85" type="Folk" name="Lakcis">
+	<npc id="32977" level="85" type="Folk" name="Rakcis">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="200" />
@@ -2790,7 +2790,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="32987" level="85" type="Folk" name="Fishing Guild Member">
+	<npc id="32987" level="85" type="Folk" name="Fishing Guild">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33100-33199.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33100-33199.xml
index 17fcfb56f7..45574efea1 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33100-33199.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33100-33199.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="33100" level="85" type="Folk" name="Lada" title="Magmeld Emissary Leader">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -613,7 +613,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="33119" level="85" type="Folk" name="Combat Soldier">
+	<npc id="33119" level="85" type="Folk" name="Warrior">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="200" />
@@ -2290,7 +2290,7 @@
 			<height normal="24.5" />
 		</collision>
 	</npc>
-	<npc id="33171" level="85" type="FriendlyNpc" name="Priest Alice" title="Aden Vanguard">
+	<npc id="33171" level="85" type="FriendlyNpc" name="Priestess Elise" title="Aden Vanguard">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33200-33299.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33200-33299.xml
index 6453063c36..8d72094b96 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33200-33299.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33200-33299.xml
@@ -1991,7 +1991,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="33261" level="85" type="Folk" name="Kastia">
+	<npc id="33261" level="85" type="Folk" name="Casdia">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33300-33399.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33300-33399.xml
index 996ba70017..36e4d43032 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33300-33399.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33300-33399.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="33300" level="85" type="Folk" name="Frikios" title="Guardian of Revelation">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -1254,7 +1254,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="33337" level="85" type="Folk" name="Crystal of the Ethereal Dragon">
+	<npc id="33337" level="85" type="Folk" name="Dragon Crystal">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1354,7 +1354,7 @@
 			<height normal="120" />
 		</collision>
 	</npc>
-	<npc id="33340" level="85" type="Folk" name="Hermuncus" title="The Last Giant">
+	<npc id="33340" level="85" type="Folk" name="Hermuncus" title="Last Giant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1386,7 +1386,7 @@
 			<height normal="100" />
 		</collision>
 	</npc>
-	<npc id="33341" level="85" type="Folk" name="Kite">
+	<npc id="33341" level="85" type="Folk" name="Kite" title="Arcan Guardian">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="30" />
@@ -1768,7 +1768,7 @@
 			<height normal="24.5" />
 		</collision>
 	</npc>
-	<npc id="33353" level="85" type="Folk" name="Priest Alice" title="Aden Vanguard">
+	<npc id="33353" level="85" type="Folk" name="Priestess Elise" title="Aden Vanguard">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33400-33499.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33400-33499.xml
index 06485c632c..02b752abc7 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33400-33499.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33400-33499.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="33400" level="85" type="Folk" name="Powerful Bow/Crossbow Sharpshooters" title="Yul Archer Awakening">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -2605,7 +2605,7 @@
 			<height normal="82" />
 		</collision>
 	</npc>
-	<npc id="33490" level="85" type="Folk" name="Trandon" title="Subclass/Dual Class Certificate Manager">
+	<npc id="33490" level="85" type="Folk" name="Trandon" title="Dual Class Certificate Manager">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2639,7 +2639,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="33491" level="85" type="Folk" name="Raina" title="Subclass/Dual Class Master">
+	<npc id="33491" level="85" type="Folk" name="Raina" title="Dual Class Master">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33700-33799.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33700-33799.xml
index 92841c1349..08e797f724 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33700-33799.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33700-33799.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="33700" level="1" type="Folk" name="Dimensional Treasure Chest">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -952,7 +952,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="33732" level="1" type="Folk" name="Snow Man Grouch">
+	<npc id="33732" level="1" type="Folk" name="Blue Snowman">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ELEMENTAL</race>
 		<sex>ETC</sex>
@@ -983,7 +983,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="33733" level="1" type="Folk" name="Snow Man Grouch">
+	<npc id="33733" level="1" type="Folk" name="Blue Snowman">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ELEMENTAL</race>
 		<sex>ETC</sex>
@@ -2794,7 +2794,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="33785" level="99" type="Folk" name="Altar of Shilen">
+	<npc id="33785" level="99" type="Folk" name="Altar of Shillien">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
@@ -3178,7 +3178,7 @@
 			<height normal="22.25" />
 		</collision>
 	</npc>
-	<npc id="33797" level="99" type="Folk" name="Seal Watchman">
+	<npc id="33797" level="99" type="Folk" name="Watchman of the Seal">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33800-33899.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33800-33899.xml
index 1b9172a7b0..d42a791f5f 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33800-33899.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33800-33899.xml
@@ -150,7 +150,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="33805" level="99" type="Folk" name="Tiffany" title="Dazzling">
+	<npc id="33805" level="99" type="Folk" name="Tiffany" title="Mad with Love">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1973,7 +1973,7 @@
 			<height normal="140" />
 		</collision>
 	</npc>
-	<npc id="33884" level="99" type="Folk" name="Decoration Tree">
+	<npc id="33884" level="99" type="Folk" name="Decorated Tree">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -2062,7 +2062,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="33888" level="99" type="Folk" name="Santa" title="Event Manager">
+	<npc id="33888" level="99" type="Folk" name="Santa Claus" title="Event Manager">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -2084,7 +2084,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="33889" level="99" type="Folk" name="Snow Man Grouch">
+	<npc id="33889" level="99" type="Folk" name="Blue Snowman">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -2106,7 +2106,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="33890" level="99" type="Folk" name="Snow Man Grumps">
+	<npc id="33890" level="99" type="Folk" name="Red Snowman">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33900-33999.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33900-33999.xml
index 2eda1cfe8d..06aa4bc7da 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/33900-33999.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="33900" level="99" type="Teleporter" name="Warp Gate">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -65,7 +65,7 @@
 			<height normal="31" />
 		</collision>
 	</npc>
-	<npc id="33903" level="99" type="Warehouse" name="Philline" title="Warehouse Manager">
+	<npc id="33903" level="99" type="Warehouse" name="Philline" title="Warehouse Keeper">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DWARF</race>
 		<sex>FEMALE</sex>
@@ -294,7 +294,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="33913" level="99" type="Folk" name="Tommy" title="Warehouse Manager">
+	<npc id="33913" level="99" type="Folk" name="Tommy" title="Warehouse Keeper">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -404,7 +404,7 @@
 			<height normal="44" />
 		</collision>
 	</npc>
-	<npc id="33918" level="99" type="Merchant" name="Aria Furstmater" title="Soul Tracker">
+	<npc id="33918" level="99" type="Merchant" name="Aria Furstmater" title="Soul Seeker">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DARK_ELF</race>
 		<sex>FEMALE</sex>
@@ -791,7 +791,7 @@
 			<height normal="19.5" />
 		</collision>
 	</npc>
-	<npc id="33935" level="99" type="Merchant" name="Evna" title="Weapon Merchant">
+	<npc id="33935" level="99" type="Merchant" name="Seira" title="Weapon Merchant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ERTHEIA</race>
 		<sex>FEMALE</sex>
@@ -1907,7 +1907,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="33984" level="99" type="Guard" name="Nairu" title="Guard">
+	<npc id="33984" level="99" type="Guard" name="Erica" title="Guard">
 		<race>ERTHEIA</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="148" /> <!-- rhand: Sword of Valhalla -->
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34000-34099.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34000-34099.xml
index e55b3e685c..c3f344df92 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34000-34099.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34000-34099.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="34000" level="99" type="Folk" name="Ferin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -405,7 +405,7 @@
 			<height normal="21.5" />
 		</collision>
 	</npc>
-	<npc id="34025" level="99" type="Folk" name="Kabaleon" title="Talkative">
+	<npc id="34025" level="99" type="Folk" name="Kableon" title="Talkative">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>MALE</sex>
@@ -694,7 +694,7 @@
 			<height normal="62" />
 		</collision>
 	</npc>
-	<npc id="34042" level="99" type="Folk" name="Town of Aden Herald">
+	<npc id="34042" level="99" type="Folk" name="Aden Herald">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>MALE</sex>
@@ -712,7 +712,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="34043" level="99" type="Folk" name="Town of Giran Herald">
+	<npc id="34043" level="99" type="Folk" name="Giran Herald">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>MALE</sex>
@@ -748,7 +748,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="34045" level="99" type="Folk" name="Town of Gludio Herald">
+	<npc id="34045" level="99" type="Folk" name="Gludio Herald">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>MALE</sex>
@@ -802,7 +802,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="34048" level="99" type="Folk" name="Town of Oren Herald">
+	<npc id="34048" level="99" type="Folk" name="Oren Herald">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34100-34199.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34100-34199.xml
index 3c07e0d875..a32393cd73 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34100-34199.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34100-34199.xml
@@ -1367,7 +1367,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="34171" level="85" type="Folk" name="Melisa" title="Princess">
+	<npc id="34171" level="85" type="Folk" name="Maliss" title="Princess">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -1835,7 +1835,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="34199" level="85" type="Folk" name="Melisa" title="Princess">
+	<npc id="34199" level="85" type="Folk" name="Maliss" title="Princess">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34200-34299.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34200-34299.xml
index 6d7a2e3375..194bd295f9 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34200-34299.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34200-34299.xml
@@ -847,7 +847,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34246" level="85" type="Folk" name="Systic" title="Giant Trackers">
+	<npc id="34246" level="85" type="Folk" name="Systic" title="Giant Tracker">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1149,7 +1149,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="34262" level="85" type="Merchant" name="Sibi" title="Balthus Knight">
+	<npc id="34262" level="85" type="Merchant" name="Sibi" title="Balthus Knights' Supply Officer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1168,7 +1168,7 @@
 			<height normal="17.5" />
 		</collision>
 	</npc>
-	<npc id="34263" level="85" type="Folk" name="Dandy" title="Celebrating">
+	<npc id="34263" level="85" type="Folk" name="Dandy" title="Happy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1187,7 +1187,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="34264" level="85" type="Folk" name="Dandy" title="Celebrating">
+	<npc id="34264" level="85" type="Folk" name="Dandy" title="Happy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1245,7 +1245,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="34267" level="85" type="Folk" name="Arcturus" title="Hunter Guild Leader">
+	<npc id="34267" level="85" type="Folk" name="Arcturus" title="Hunters' Guild Leader">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1379,7 +1379,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="34283" level="85" type="Folk" name="2015 Blue Snow Man">
+	<npc id="34283" level="85" type="Folk" name="2015 Blue Snowman">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1436,7 +1436,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="34286" level="85" type="Folk" name="2015 Rudolph, Small">
+	<npc id="34286" level="85" type="Folk" name="2015 Baby Rudolph">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1609,7 +1609,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="34295" level="85" type="Folk" name="Leona Blackbird" title="Lord of the Blackbird Clan">
+	<npc id="34295" level="85" type="Folk" name="Leona Blackbird" title="Blackbird Clan Leader">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1648,7 +1648,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34297" level="85" type="Folk" name="Ellikia" title="Verdure Elder">
+	<npc id="34297" level="85" type="Folk" name="Elikia" title="Verdure Elder">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34300-34399.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34300-34399.xml
index 4c6ba4e519..5850635092 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34300-34399.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34300-34399.xml
@@ -20,7 +20,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="34301" level="85" type="Folk" name="Leona Blackbird" title="Lord of the Blackbird Clan">
+	<npc id="34301" level="85" type="Folk" name="Leona Blackbird" title="Blackbird Clan Leader">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -40,7 +40,7 @@
 			<height normal="22.4" />
 		</collision>
 	</npc>
-	<npc id="34302" level="85" type="Folk" name="Ellikia" title="Verdure Elder">
+	<npc id="34302" level="85" type="Folk" name="Elikia" title="Verdure Elder">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -159,7 +159,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="34308" level="85" type="Folk" name="Alice" title="Aden Vanguard">
+	<npc id="34308" level="85" type="Folk" name="Elise" title="Aden Vanguard">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -390,7 +390,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34320" level="85" type="Folk" name="Leona Blackbird" title="Lord of the Blackbird Clan">
+	<npc id="34320" level="85" type="Folk" name="Leona Blackbird" title="Blackbird Clan Leader">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -429,7 +429,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34322" level="85" type="Folk" name="Ellikia" title="Verdure Elder">
+	<npc id="34322" level="85" type="Folk" name="Elikia" title="Verdure Elder">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -582,7 +582,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="34330" level="85" type="Folk" name="Chorong" title="Event Manager">
+	<npc id="34330" level="85" type="Folk" name="Festival Fairy" title="Event Manager">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -968,7 +968,7 @@
 			<height normal="24.9" />
 		</collision>
 	</npc>
-	<npc id="34350" level="85" type="Folk" name="Memoria" title="Number Card Game Maitre 'D">
+	<npc id="34350" level="85" type="Folk" name="Memoria" title="Number Card Game Maitre �D">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1067,7 +1067,7 @@
 			<height normal="16.006" />
 		</collision>
 	</npc>
-	<npc id="34355" level="85" type="Folk" name="Leona Blackbird" title="Lord of the Blackbird Clan">
+	<npc id="34355" level="85" type="Folk" name="Leona Blackbird" title="Blackbird Clan Leader">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34400-34499.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34400-34499.xml
index 95fbd3d8a1..c3a62cde9b 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34400-34499.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34400-34499.xml
@@ -476,7 +476,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34425" level="85" type="Folk" name="Leona Blackbird" title="Blackbird Clan Lord">
+	<npc id="34425" level="85" type="Folk" name="Leona Blackbird" title="Blackbird Clan Leader">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1129,7 +1129,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34459" level="85" type="Folk" name="Aspiring Orc Ruler of Aden">
+	<npc id="34459" level="85" type="Folk" name="Frederick the Destroyer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1437,7 +1437,7 @@
 			<height normal="29.35" />
 		</collision>
 	</npc>
-	<npc id="34476" level="85" type="Folk" name="Lineage II" title="Cheerleader Captain">
+	<npc id="34476" level="85" type="Folk" name="Lineage 2" title="Cheerleader Captain">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1647,7 +1647,7 @@
 			<height normal="22.2" />
 		</collision>
 	</npc>
-	<npc id="34487" level="85" type="Folk" name="Dimensional Merchant" title="Life Vitality">
+	<npc id="34487" level="85" type="Folk" name="Game Assistant" title="Special">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1781,7 +1781,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="34494" level="85" type="Folk" name="Mammon's Relic Collector" title="Greedy">
+	<npc id="34494" level="85" type="Folk" name="Mammon�s Relic Collector" title="Greedy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1840,7 +1840,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="34497" level="85" type="Folk" name="Happy Snow" title="Celebrating the 15th Anniversary">
+	<npc id="34497" level="85" type="Folk" name="Happy Snow" title="Celebrating Anniversary">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1860,7 +1860,7 @@
 			<height normal="16.2" />
 		</collision>
 	</npc>
-	<npc id="34498" level="85" type="Folk" name="15th Anniversary Cake" title="Sharing happiness">
+	<npc id="34498" level="85" type="Folk" name="Anniversary Cake" title="Sharing happiness">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1879,7 +1879,7 @@
 			<height normal="19.5" />
 		</collision>
 	</npc>
-	<npc id="34499" level="85" type="Folk" name="15th Anniversary Cake" title="Delicious">
+	<npc id="34499" level="85" type="Folk" name="Anniversary Cake" title="Delicious">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34500-34599.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34500-34599.xml
index 0a48c12b4b..84fd2ac96d 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34500-34599.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34500-34599.xml
@@ -76,7 +76,7 @@
 			<height normal="8" />
 		</collision>
 	</npc>
-	<npc id="34504" level="85" type="Folk" name="Leona Blackbird" title="Blackbird Clan Lord">
+	<npc id="34504" level="85" type="Folk" name="Leona Blackbird" title="Blackbird Clan Leader">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -96,7 +96,7 @@
 			<height normal="22.4" />
 		</collision>
 	</npc>
-	<npc id="34505" level="85" type="Folk" name="Tarti">
+	<npc id="34505" level="85" type="Folk" name="Tarti" title="Growth Helper">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -309,7 +309,7 @@
 			<height normal="26.5" />
 		</collision>
 	</npc>
-	<npc id="34516" level="85" type="Folk" name="Unused NPC">
+	<npc id="34516" level="85" type="Folk" name="Azuri" title="Clan Quest Assistant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -328,7 +328,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="34517" level="85" type="Folk" name="Unused NPC">
+	<npc id="34517" level="85" type="Folk" name="Flory" title="Aden Green Squad">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -347,7 +347,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="34518" level="85" type="Folk" name="Unused NPC">
+	<npc id="34518" level="85" type="Folk" name="Zariche Slasher" title="Bloodstained">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -366,7 +366,7 @@
 			<height normal="25.2" />
 		</collision>
 	</npc>
-	<npc id="34519" level="85" type="Folk" name="Unused NPC">
+	<npc id="34519" level="85" type="Folk" name="Akamanah Dual Swords" title="Bloodied">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -385,7 +385,7 @@
 			<height normal="25.2" />
 		</collision>
 	</npc>
-	<npc id="34520" level="85" type="Folk" name="Unused NPC">
+	<npc id="34520" level="85" type="Folk" name="Pathfinder" title="Rim Kamaloka">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -404,7 +404,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34521" level="85" type="Folk" name="Unused NPC">
+	<npc id="34521" level="85" type="Folk" name="Pathfinder" title="Rim Kamaloka">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -423,7 +423,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34522" level="85" type="Folk" name="Unused NPC">
+	<npc id="34522" level="85" type="Folk" name="Full Moon" title="Chuseok Manager">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -442,7 +442,7 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="34523" level="85" type="Folk" name="Unused NPC">
+	<npc id="34523" level="85" type="Folk" name="Evan Graham">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -461,7 +461,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="34524" level="85" type="Teleporter" name="Unused NPC">
+	<npc id="34524" level="85" type="Teleporter" name="Overseer Teleporter" title="Isle of Souls Overseers">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -481,7 +481,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34525" level="85" type="Folk" name="Unused NPC">
+	<npc id="34525" level="85" type="Folk" name="Overseer Marksman" title="Isle of Souls Overseers">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -560,7 +560,7 @@
 			<height normal="21.5" />
 		</collision>
 	</npc>
-	<npc id="34529" level="85" type="Teleporter" name="Investigators Teleporter" title="Storm Isle Investigators">
+	<npc id="34529" level="85" type="Teleporter" name="Investigators' Teleporter" title="Storm Isle Investigators">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -886,7 +886,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34546" level="85" type="Folk" name="Wael" title="Lulu's Dad">
+	<npc id="34546" level="85" type="Folk" name="Wael" title="Lulu�s Dad">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -905,7 +905,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34547" level="85" type="Folk" name="Eileen" title="Lulu's Mom">
+	<npc id="34547" level="85" type="Folk" name="Eileen" title="Lulu�s Mom">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -924,7 +924,7 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="34548" level="85" type="Folk" name="Sentry Scout" title="Scout of Tower of Insolence">
+	<npc id="34548" level="85" type="Folk" name="Sentry Scout" title="Tower of Insolence (1st Floor)">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -944,7 +944,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="34549" level="85" type="Teleporter" name="Teleporter Scout" title="Scout of Tower of Insolence">
+	<npc id="34549" level="85" type="Teleporter" name="Teleporter Scout" title="Tower of Insolence Scout">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -963,7 +963,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="34550" level="85" type="Folk" name="Blue" title="Bodyguard's Twin">
+	<npc id="34550" level="85" type="Folk" name="Blue" title="Bodyguard�s Twin">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -982,7 +982,7 @@
 			<height normal="23.26" />
 		</collision>
 	</npc>
-	<npc id="34551" level="85" type="Teleporter" name="Investigators Teleporter" title="Researcher of Abandoned Coal Mines">
+	<npc id="34551" level="85" type="Teleporter" name="Investigators' Teleporter" title="Researcher of Abandoned Coal Mines">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1213,7 +1213,7 @@
 			<height normal="13" />
 		</collision>
 	</npc>
-	<npc id="34563" level="85" type="Folk" name="Lilly" title="Celebrating Anniversary">
+	<npc id="34563" level="85" type="Folk" name="Lilly" title="Festive">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1291,7 +1291,7 @@
 			<height normal="26" />
 		</collision>
 	</npc>
-	<npc id="34567" level="85" type="Folk" name="Violet" title="White Day's Executioner">
+	<npc id="34567" level="85" type="Folk" name="Violet" title="Valentine's Day Executioner">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1386,7 +1386,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="34572" level="85" type="Folk" name="Anhel" title="Faeron's Protector">
+	<npc id="34572" level="85" type="Folk" name="Irene" title="Growth Manager">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1462,7 +1462,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="34576" level="85" type="Folk" name="Luminous Chuchu" title="New Homunculi Event">
+	<npc id="34576" level="85" type="Folk" name="Luminous Chuchu" title="Lifegiver">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1481,7 +1481,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="34577" level="85" type="Folk" name="Milk Cow" title="New Homunculus">
+	<npc id="34577" level="85" type="Folk" name="Milk Cow" title="Podar">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1500,7 +1500,7 @@
 			<height normal="9" />
 		</collision>
 	</npc>
-	<npc id="34578" level="85" type="Folk" name="Chorong" title="New Homunculus">
+	<npc id="34578" level="85" type="Folk" name="Chorong" title="Kee">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1519,7 +1519,7 @@
 			<height normal="5.5" />
 		</collision>
 	</npc>
-	<npc id="34579" level="85" type="Folk" name="Nymph" title="New Homunculus">
+	<npc id="34579" level="85" type="Folk" name="Nymph" title="Poe">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1538,7 +1538,7 @@
 			<height normal="12" />
 		</collision>
 	</npc>
-	<npc id="34580" level="85" type="Folk" name="Oculus" title="New Homunculus">
+	<npc id="34580" level="85" type="Folk" name="Oculus" title="Lu">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1557,7 +1557,7 @@
 			<height normal="6" />
 		</collision>
 	</npc>
-	<npc id="34581" level="85" type="Folk" name="Fofo" title="New Homunculus">
+	<npc id="34581" level="85" type="Folk" name="Fofo" title="Chai">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1576,7 +1576,7 @@
 			<height normal="4" />
 		</collision>
 	</npc>
-	<npc id="34582" level="85" type="Folk" name="Alice" title="Session Zone">
+	<npc id="34582" level="85" type="Folk" name="Alice" title="Left in the Session Zone">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1691,7 +1691,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="34588" level="85" type="Folk" name="Dreamer of the Legend Tittle" title="Lineage 2">
+	<npc id="34588" level="85" type="Folk" name="Dreamer of the Legend Title" title="Lineage 2">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1745,7 +1745,182 @@
 		<status attackable="false" />
 		<collision>
 			<radius normal="5" />
+			<height normal="9" />
+		</collision>
+	</npc>
+	<npc id="34591" level="85" type="Folk" name="Sentry Scout" title="Tower of Insolence (4th Floor)">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="132" /> <!-- Ultimate Sword -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="100" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7" />
 			<height normal="25" />
 		</collision>
 	</npc>
+	<npc id="34592" level="85" type="Folk" name="Sentry Scout" title="Tower of Insolence (5th Floor)">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="132" /> <!-- Ultimate Sword -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="100" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="34593" level="85" type="Folk" name="Sentry Scout" title="Tower of Insolence (6th Floor)">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="132" /> <!-- Ultimate Sword -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="100" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="7" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="34594" level="85" type="Folk" name="Teleporter Scout" title="Tower of Insolence Scout">
+		<!-- AUTO GENERATED NPC 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="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="8" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="34595" level="85" type="Folk" name="Prophetess" title="Kind">
+		<!-- AUTO GENERATED NPC 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="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="9.1" />
+			<height normal="27.1" />
+		</collision>
+	</npc>
+	<npc id="34596" level="85" type="Folk" name="Teleport Device" title="Conquest">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="1" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="30" />
+			<height normal="57.6" />
+		</collision>
+	</npc>
+	<npc id="34597" level="85" type="Folk" name="Teleport Device" title="Conquest">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<run ground="1" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="30" />
+			<height normal="57.6" />
+		</collision>
+	</npc>
+	<npc id="34598" level="85" type="Folk" name="Ephitany" title="Conquest 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" />
+			<speed>
+				<walk ground="64" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="9" />
+			<height normal="19.5" />
+		</collision>
+	</npc>
+	<npc id="34599" level="85" type="Folk" name="Entropy" title="Conquest Guide">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="17300" /> <!-- Requiem Retributer -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<speed>
+				<walk ground="64" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="9" />
+			<height normal="21.5" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34600-34699.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34600-34699.xml
new file mode 100644
index 0000000000..6603a28503
--- /dev/null
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/34600-34699.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
+	<npc id="34600" level="85" type="Folk" name="Chloe" title="Conquest 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" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="34601" level="85" type="Folk" name="Lilly" title="Congratulating">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15281" /> <!-- Transparent 2HS (NPC) -->
+		<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="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="6.75" />
+			<height normal="16.2" />
+		</collision>
+	</npc>
+	<npc id="34602" level="85" type="Folk" name="Catshi Meow-Meow" title="Conquest Adventurer">
+		<!-- AUTO GENERATED NPC 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="19" />
+				<run ground="80" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="11.9" />
+			<height normal="24.2" />
+		</collision>
+	</npc>
+</list>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/35100-35199.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/35100-35199.xml
index 6fce5eefc9..17c57f94b8 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/35100-35199.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/35100-35199.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="35100" level="75" type="Merchant" name="Chamberlain of Light">
 		<!-- Confirmed CT2.5 -->
@@ -4332,7 +4332,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="35188" level="75" type="Folk" name="Holmes" title="Herald from Giran">
+	<npc id="35188" level="75" type="Folk" name="Holmes" title="Giran Herald">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/35300-35399.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/35300-35399.xml
index cbb6c68905..26ff499ddf 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/35300-35399.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/35300-35399.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="35300" level="89" type="Defender" name="Escort" title="Innadril">
 		<!-- Confirmed CT2.5 -->
@@ -1044,7 +1044,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="35322" level="20" type="Artefact" name="Altar of Fire">
+	<npc id="35322" level="20" type="Artefact" name="Fire Altar">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -1082,7 +1082,7 @@
 			<height normal="65" />
 		</collision>
 	</npc>
-	<npc id="35323" level="20" type="Artefact" name="Altar of Water">
+	<npc id="35323" level="20" type="Artefact" name="Wind Altar">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/35500-35599.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/35500-35599.xml
index 21891f623b..d3f8a4b8b4 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/35500-35599.xml
+++ b/L2J_Mobius_10.0_MasterClass/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">
 		<!-- Confirmed CT2.5 -->
@@ -704,7 +704,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="35514" level="20" type="Artefact" name="Altar of Wind">
+	<npc id="35514" level="20" type="Artefact" name="Wind Altar">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
@@ -741,7 +741,7 @@
 			<height normal="65" />
 		</collision>
 	</npc>
-	<npc id="35515" level="20" type="Artefact" name="Altar of Earth">
+	<npc id="35515" level="20" type="Artefact" name="Earth Altar">
 		<!-- Confirmed CT2.5 -->
 		<race>ETC</race>
 		<sex>ETC</sex>
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/36200-36299.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/36200-36299.xml
index 615630d1c7..42754204d8 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/36200-36299.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/36200-36299.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="36200" level="90" type="Defender" name="Wizard" title="Support Unit">
 		<!-- Confirmed CT2.5 -->
@@ -2677,7 +2677,7 @@
 			<height normal="72.5" />
 		</collision>
 	</npc>
-	<npc id="36248" level="75" type="FortManager" name="Foreman" title="Hunter's Fortress">
+	<npc id="36248" level="75" type="FortManager" name="Foreman" title="Hunters' Fortress">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="fnAgitBuff" value="fortressbuff" />
@@ -2724,7 +2724,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="36249" level="75" type="Folk" name="Suspicious Merchant" title="Hunter's Fortress">
+	<npc id="36249" level="75" type="Folk" name="Suspicious Merchant" title="Hunters' Fortress">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2771,7 +2771,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="36250" level="75" type="Folk" name="Guard Captain" title="Hunter's Fortress">
+	<npc id="36250" level="75" type="Folk" name="Guard Captain" title="Hunters' Fortress">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2820,7 +2820,7 @@
 			<height normal="23.75" />
 		</collision>
 	</npc>
-	<npc id="36251" level="75" type="Folk" name="Archer Captain" title="Hunter's Fortress">
+	<npc id="36251" level="75" type="Folk" name="Archer Captain" title="Hunters' Fortress">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2861,7 +2861,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36252" level="75" type="Folk" name="General" title="Hunter's Fortress">
+	<npc id="36252" level="75" type="Folk" name="General" title="Hunters' Fortress">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2903,7 +2903,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="36253" level="75" type="Folk" name="Support Unit Captain" title="Hunter's Fortress">
+	<npc id="36253" level="75" type="Folk" name="Support Unit Captain" title="Hunters' Fortress">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2944,7 +2944,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36254" level="75" type="Folk" name="Engineering Manager" title="Hunter's Fortress">
+	<npc id="36254" level="75" type="Folk" name="Engineering Manager" title="Hunters' Fortress">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2985,7 +2985,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="36255" level="75" type="FortLogistics" name="Logistics Officer" title="Hunter's Fortress">
+	<npc id="36255" level="75" type="FortLogistics" name="Logistics Officer" title="Hunters' Fortress">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3084,7 +3084,7 @@
 			<height normal="8.5" />
 		</collision>
 	</npc>
-	<npc id="36257" level="75" type="Folk" name="Detention Camp Warden" title="Hunter's Fortress">
+	<npc id="36257" level="75" type="Folk" name="Detention Camp Warden" title="Hunters' Fortress">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3270,7 +3270,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="36261" level="94" type="Defender" name="Rebel Commander" title="Hunter's Fortress">
+	<npc id="36261" level="94" type="Defender" name="Rebel Commander" title="Hunters' Fortress">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3335,7 +3335,7 @@
 			<height normal="26.985" />
 		</collision>
 	</npc>
-	<npc id="36262" level="90" type="Defender" name="Rebel Elite Soldier" title="Hunter's Fortress">
+	<npc id="36262" level="90" type="Defender" name="Rebel Elite Soldier" title="Hunters' Fortress">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3395,7 +3395,7 @@
 			<height normal="45" />
 		</collision>
 	</npc>
-	<npc id="36263" level="89" type="Defender" name="Rebel Private" title="Hunter's Fortress">
+	<npc id="36263" level="89" type="Defender" name="Rebel Private" title="Hunters' Fortress">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3450,7 +3450,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36264" level="86" type="Defender" name="Royal Guard" title="Hunter's Fortress">
+	<npc id="36264" level="86" type="Defender" name="Royal Guard" title="Hunters' Fortress">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3508,7 +3508,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="36265" level="86" type="Defender" name="Escort" title="Hunter's Fortress">
+	<npc id="36265" level="86" type="Defender" name="Escort" title="Hunters' Fortress">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -4525,7 +4525,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="36282" level="80" type="Monster" name="Ballista" title="Hunter's Fortress">
+	<npc id="36282" level="80" type="Monster" name="Ballista" title="Hunters' Fortress">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="FameValue" value="30" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/36400-36499.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/36400-36499.xml
index 5e528fc455..6998461bae 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/36400-36499.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/36400-36499.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="36400" level="75" type="Folk" name="Special Envoy" title="Innadril">
 		<!-- Confirmed CT2.5 -->
@@ -3292,7 +3292,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="36474" level="75" type="Folk" name="Wyvern Manager" title="Hunter's Fortress">
+	<npc id="36474" level="75" type="Folk" name="Wyvern Manager" title="Hunters' Fortress">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/36500-36599.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/36500-36599.xml
index f7005a0c93..ea3ef7c814 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/36500-36599.xml
+++ b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/36500-36599.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="36500" level="80" type="Monster" name="Territory Catapult" title="Dion">
 		<!-- Confirmed CT2.5 -->
@@ -304,7 +304,7 @@
 			<height normal="59" />
 		</collision>
 	</npc>
-	<npc id="36508" level="94" type="Defender" name="Military Association Leader" title="Gludio">
+	<npc id="36508" level="94" type="Defender" name="Chief Commander" title="Gludio">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -618,7 +618,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36514" level="94" type="Defender" name="Military Association Leader" title="Dion">
+	<npc id="36514" level="94" type="Defender" name="Chief Commander" title="Dion">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -932,7 +932,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36520" level="94" type="Defender" name="Military Association Leader" title="Giran">
+	<npc id="36520" level="94" type="Defender" name="Chief Commander" title="Giran">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1246,7 +1246,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36526" level="94" type="Defender" name="Military Association Leader" title="Oren">
+	<npc id="36526" level="94" type="Defender" name="Chief Commander" title="Oren">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1560,7 +1560,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36532" level="94" type="Defender" name="Military Association Leader" title="Aden">
+	<npc id="36532" level="94" type="Defender" name="Chief Commander" title="Aden">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -1874,7 +1874,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36538" level="94" type="Defender" name="Military Association Leader" title="Innadril">
+	<npc id="36538" level="94" type="Defender" name="Chief Commander" title="Innadril">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2188,7 +2188,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36544" level="94" type="Defender" name="Military Association Leader" title="Goddard">
+	<npc id="36544" level="94" type="Defender" name="Chief Commander" title="Goddard">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2502,7 +2502,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36550" level="94" type="Defender" name="Military Association Leader" title="Rune">
+	<npc id="36550" level="94" type="Defender" name="Chief Commander" title="Rune">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -2816,7 +2816,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36556" level="94" type="Defender" name="Military Association Leader" title="Schuttgart">
+	<npc id="36556" level="94" type="Defender" name="Chief Commander" title="Schuttgart">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3130,7 +3130,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36562" level="97" type="FriendlyNpc" name="Seduced Knight" title="Investigator">
+	<npc id="36562" level="97" type="FriendlyNpc" name="Seduced Knight" title="Sacrifice">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3190,7 +3190,7 @@
 			<height normal="23.75" />
 		</collision>
 	</npc>
-	<npc id="36563" level="97" type="FriendlyNpc" name="Seduced Ranger" title="Investigator">
+	<npc id="36563" level="97" type="FriendlyNpc" name="Seduced Ranger" title="Sacrifice">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3248,7 +3248,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36564" level="97" type="FriendlyNpc" name="Seduced Mage" title="Investigator">
+	<npc id="36564" level="97" type="FriendlyNpc" name="Seduced Mage" title="Sacrifice">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3304,7 +3304,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36565" level="97" type="FriendlyNpc" name="Seduced Warrior" title="Investigator">
+	<npc id="36565" level="97" type="FriendlyNpc" name="Seduced Warrior" title="Sacrifice">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3362,7 +3362,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="36566" level="91" type="FriendlyNpc" name="Seduced Knight" title="Investigator">
+	<npc id="36566" level="91" type="FriendlyNpc" name="Seduced Knight" title="Sacrifice">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3422,7 +3422,7 @@
 			<height normal="23.75" />
 		</collision>
 	</npc>
-	<npc id="36567" level="91" type="FriendlyNpc" name="Seduced Ranger" title="Investigator">
+	<npc id="36567" level="91" type="FriendlyNpc" name="Seduced Ranger" title="Sacrifice">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3480,7 +3480,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36568" level="91" type="FriendlyNpc" name="Seduced Mage" title="Investigator">
+	<npc id="36568" level="91" type="FriendlyNpc" name="Seduced Mage" title="Sacrifice">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
@@ -3536,7 +3536,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="36569" level="91" type="FriendlyNpc" name="Seduced Warrior" title="Investigator">
+	<npc id="36569" level="91" type="FriendlyNpc" name="Seduced Warrior" title="Sacrifice">
 		<!-- Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/36700-36799.xml b/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/36700-36799.xml
index e4fc41b3e9..4538edb9e2 100644
--- a/L2J_Mobius_10.0_MasterClass/dist/game/data/stats/npcs/36700-36799.xml
+++ b/L2J_Mobius_10.0_MasterClass/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="36700" level="75" type="Folk" name="Dimensional Emissary" title="Oren">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -1114,7 +1114,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="36752" level="85" type="Folk" name="Marienne" title="Mother Tree Guardians Envoy">
+	<npc id="36752" level="85" type="Folk" name="Marienne" title="Mother Tree Guardians' Envoy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1133,7 +1133,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="36753" level="85" type="Folk" name="Qyuris" title="Unworldly Visitors Envoy">
+	<npc id="36753" level="85" type="Folk" name="Qyuris" title="Unworldly Visitors' Envoy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/09000-09099.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/09000-09099.xml
index a1983592d2..c464a13b0f 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/09000-09099.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/09000-09099.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="9049" level="85" type="Folk" name="Transformed: Part-time Seller Cat">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -624,7 +624,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="9023" level="80" type="Folk" name="Bonfire" title="Made with matchsticks">
+	<npc id="9023" level="80" type="Folk" name="Campfire" title="Made with Matchsticks">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -643,7 +643,7 @@
 			<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="Freezing Match Girl">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/12700-12799.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/12700-12799.xml
index c434aa3960..583dcf49a4 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/12700-12799.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/12700-12799.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="12774" level="1" type="Monster" name="Young Squash">
 		<race>ETC</race>
@@ -34,7 +34,7 @@
 			<height normal="10.5" />
 		</collision>
 	</npc>
-	<npc id="12775" level="1" type="Monster" name="High Quality Squash">
+	<npc id="12775" level="1" type="Monster" name="Ripe Squash">
 		<race>ETC</race>
 		<sex>ETC</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -136,7 +136,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="12778" level="1" type="Monster" name="High Quality Large Squash">
+	<npc id="12778" level="1" type="Monster" name="Large Ripe Squash">
 		<race>ETC</race>
 		<sex>ETC</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/13200-13299.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/13200-13299.xml
index 2f6d9a060a..ea22e7cb46 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/13200-13299.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/13200-13299.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="13271" level="1" type="Folk" name="Young Watermelon">
 		<race>ETC</race>
@@ -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="Prime 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="Large Prime 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_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/13400-13499.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/13400-13499.xml
index 23c583fc0f..8e9ac15b89 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/13400-13499.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/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>
@@ -466,7 +466,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13419" level="1" type="Monster" name="High Quality Squash">
+	<npc id="13419" level="1" type="Monster" name="Ripe Squash">
 		<!-- 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 Ripe Squash">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/13500-13599.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/13500-13599.xml
index 21276e3153..ca2f84b391 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/13500-13599.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/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="13591" level="85" type="Folk" name="Fire Dragon's Agathion Virgo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -601,7 +601,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="13551" level="80" type="Folk" name="Bundle of Magical Firewood">
+	<npc id="13551" level="80" type="Folk" name="Magic Woodpile">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -620,7 +620,7 @@
 			<height normal="14.188" />
 		</collision>
 	</npc>
-	<npc id="13552" level="80" type="Folk" name="Big Bundle of Magical Firewood">
+	<npc id="13552" level="80" type="Folk" name="Large Magic Woodpile">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1494,7 +1494,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13599" level="85" type="Folk" name="Land Dragon's Agathion Virgo">
+	<npc id="13599" level="85" type="Folk" name="Earth Dragon's Agathion Virgo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/13600-13699.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/13600-13699.xml
index 4b84d6bc25..56206a3bf4 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/13600-13699.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/13600-13699.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="13600" level="85" type="Folk" name="Land Dragon's Agathion Capricorn">
+	<npc id="13600" level="85" type="Folk" name="Earth Dragon's Agathion Capricorn">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -19,7 +19,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13601" level="85" type="Folk" name="Land Dragon's Agathion Libra">
+	<npc id="13601" level="85" type="Folk" name="Earth Dragon's Agathion Libra">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -38,7 +38,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13602" level="85" type="Folk" name="Land Dragon's Agathion Taurus">
+	<npc id="13602" level="85" type="Folk" name="Earth Dragon's Agathion Taurus">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -57,7 +57,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13603" level="85" type="Folk" name="Land Dragon's Agathion Leo">
+	<npc id="13603" level="85" type="Folk" name="Earth Dragon's Agathion Leo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -76,7 +76,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13604" level="85" type="Folk" name="Land Dragon's Agathion Scorpio">
+	<npc id="13604" level="85" type="Folk" name="Earth Dragon's Agathion Scorpio">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -95,7 +95,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13605" level="85" type="Folk" name="Land Dragon's Agathion Aquarius">
+	<npc id="13605" level="85" type="Folk" name="Earth Dragon's Agathion Aquarius">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -114,7 +114,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13606" level="85" type="Folk" name="Land Dragon's Agathion Sagittarius">
+	<npc id="13606" level="85" type="Folk" name="Earth Dragon's Agathion Sagittarius">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -133,7 +133,7 @@
 			<height normal="5.15" />
 		</collision>
 	</npc>
-	<npc id="13607" level="85" type="Folk" name="Land Dragon's Agathion Gemini">
+	<npc id="13607" level="85" type="Folk" name="High-grade Agathion Gemini">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/14600-14699.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/14600-14699.xml
index d3a47f81c0..9f202961ad 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/14600-14699.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/14600-14699.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="14600" level="79" type="Pet" name="Soulless">
 		<parameters>
@@ -2905,7 +2905,7 @@
 			<height normal="35.5" />
 		</collision>
 	</npc>
-	<npc id="14663" level="30" type="Pet" name="Mechanic Golem">
+	<npc id="14663" level="30" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="3" />
 			<param name="step1_action01" value="48" />
@@ -2945,7 +2945,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14664" level="38" type="Pet" name="Mechanic Golem">
+	<npc id="14664" level="38" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="3" />
 			<param name="step1_action01" value="48" />
@@ -2985,7 +2985,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14665" level="45" type="Pet" name="Mechanic Golem">
+	<npc id="14665" level="45" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="4" />
 			<param name="step1_action01" value="48" />
@@ -3025,7 +3025,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14666" level="51" type="Pet" name="Mechanic Golem">
+	<npc id="14666" level="51" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="5" />
 			<param name="step1_action01" value="48" />
@@ -3065,7 +3065,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14667" level="57" type="Pet" name="Mechanic Golem">
+	<npc id="14667" level="57" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="5" />
 			<param name="step1_action01" value="48" />
@@ -3105,7 +3105,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14668" level="62" type="Pet" name="Mechanic Golem">
+	<npc id="14668" level="62" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="6" />
 			<param name="step1_action01" value="48" />
@@ -3145,7 +3145,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14669" level="66" type="Pet" name="Mechanic Golem">
+	<npc id="14669" level="66" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="6" />
 			<param name="step1_action01" value="48" />
@@ -3185,7 +3185,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14670" level="70" type="Pet" name="Mechanic Golem">
+	<npc id="14670" level="70" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="7" />
 			<param name="step1_action01" value="48" />
@@ -3225,7 +3225,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14671" level="74" type="Pet" name="Mechanic Golem">
+	<npc id="14671" level="74" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="7" />
 			<param name="step1_action01" value="48" />
@@ -3265,7 +3265,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14672" level="78" type="Pet" name="Mechanic Golem">
+	<npc id="14672" level="78" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="8" />
 			<param name="step1_action01" value="48" />
@@ -3305,7 +3305,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14673" level="78" type="Pet" name="Mechanic Golem">
+	<npc id="14673" level="78" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="8" />
 			<param name="step1_action01" value="48" />
@@ -3345,7 +3345,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14674" level="78" type="Pet" name="Mechanic Golem">
+	<npc id="14674" level="78" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="8" />
 			<param name="step1_action01" value="48" />
@@ -3385,7 +3385,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14675" level="78" type="Pet" name="Mechanic Golem">
+	<npc id="14675" level="78" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="8" />
 			<param name="step1_action01" value="48" />
@@ -3425,7 +3425,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14676" level="78" type="Pet" name="Mechanic Golem">
+	<npc id="14676" level="78" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="8" />
 			<param name="step1_action01" value="48" />
@@ -3465,7 +3465,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14677" level="78" type="Pet" name="Mechanic Golem">
+	<npc id="14677" level="78" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="8" />
 			<param name="step1_action01" value="48" />
@@ -3505,7 +3505,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14678" level="78" type="Pet" name="Mechanic Golem">
+	<npc id="14678" level="78" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="9" />
 			<param name="step1_action01" value="48" />
@@ -3545,7 +3545,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14679" level="78" type="Pet" name="Mechanic Golem">
+	<npc id="14679" level="78" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="9" />
 			<param name="step1_action01" value="48" />
@@ -3585,7 +3585,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14680" level="78" type="Pet" name="Mechanic Golem">
+	<npc id="14680" level="78" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="9" />
 			<param name="step1_action01" value="48" />
@@ -3625,7 +3625,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14681" level="79" type="Pet" name="Mechanic Golem">
+	<npc id="14681" level="79" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="9" />
 			<param name="step1_action01" value="48" />
@@ -3665,7 +3665,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14682" level="79" type="Pet" name="Mechanic Golem">
+	<npc id="14682" level="79" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="9" />
 			<param name="step1_action01" value="48" />
@@ -3705,7 +3705,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14683" level="79" type="Pet" name="Mechanic Golem">
+	<npc id="14683" level="79" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="9" />
 			<param name="step1_action01" value="48" />
@@ -3745,7 +3745,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14684" level="79" type="Pet" name="Mechanic Golem">
+	<npc id="14684" level="79" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="10" />
 			<param name="step1_action01" value="48" />
@@ -3785,7 +3785,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14685" level="79" type="Pet" name="Mechanic Golem">
+	<npc id="14685" level="79" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="10" />
 			<param name="step1_action01" value="48" />
@@ -3825,7 +3825,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14686" level="79" type="Pet" name="Mechanic Golem">
+	<npc id="14686" level="79" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="10" />
 			<param name="step1_action01" value="48" />
@@ -3865,7 +3865,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14687" level="79" type="Pet" name="Mechanic Golem">
+	<npc id="14687" level="79" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="10" />
 			<param name="step1_action01" value="48" />
@@ -3905,7 +3905,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14688" level="79" type="Pet" name="Mechanic Golem">
+	<npc id="14688" level="79" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="10" />
 			<param name="step1_action01" value="48" />
@@ -3945,7 +3945,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14689" level="79" type="Pet" name="Mechanic Golem">
+	<npc id="14689" level="79" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="10" />
 			<param name="step1_action01" value="48" />
@@ -3985,7 +3985,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14690" level="80" type="Pet" name="Mechanic Golem">
+	<npc id="14690" level="80" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="11" />
 			<param name="step1_action01" value="48" />
@@ -4025,7 +4025,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14691" level="80" type="Pet" name="Mechanic Golem">
+	<npc id="14691" level="80" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="11" />
 			<param name="step1_action01" value="48" />
@@ -4065,7 +4065,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14692" level="80" type="Pet" name="Mechanic Golem">
+	<npc id="14692" level="80" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="11" />
 			<param name="step1_action01" value="48" />
@@ -4105,7 +4105,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14693" level="80" type="Pet" name="Mechanic Golem">
+	<npc id="14693" level="80" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="11" />
 			<param name="step1_action01" value="48" />
@@ -4145,7 +4145,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14694" level="80" type="Pet" name="Mechanic Golem">
+	<npc id="14694" level="80" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="11" />
 			<param name="step1_action01" value="48" />
@@ -4185,7 +4185,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14695" level="80" type="Pet" name="Mechanic Golem">
+	<npc id="14695" level="80" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="11" />
 			<param name="step1_action01" value="48" />
@@ -4225,7 +4225,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14696" level="80" type="Pet" name="Mechanic Golem">
+	<npc id="14696" level="80" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="12" />
 			<param name="step1_action01" value="48" />
@@ -4265,7 +4265,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14697" level="80" type="Pet" name="Mechanic Golem">
+	<npc id="14697" level="80" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="12" />
 			<param name="step1_action01" value="48" />
@@ -4305,7 +4305,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14698" level="80" type="Pet" name="Mechanic Golem">
+	<npc id="14698" level="80" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="12" />
 			<param name="step1_action01" value="48" />
@@ -4345,7 +4345,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14699" level="80" type="Pet" name="Mechanic Golem">
+	<npc id="14699" level="80" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="12" />
 			<param name="step1_action01" value="48" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/14700-14799.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/14700-14799.xml
index 4c22917cf5..d627ecad89 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/14700-14799.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/14700-14799.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="14700" level="80" type="Pet" name="Mechanic Golem">
+	<npc id="14700" level="80" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="12" />
 			<param name="step1_action01" value="48" />
@@ -40,7 +40,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="14701" level="80" type="Pet" name="Mechanic Golem">
+	<npc id="14701" level="80" type="Pet" name="Mechanical Golem">
 		<parameters>
 			<skill name="DDMagic" id="4068" level="12" />
 			<param name="step1_action01" value="48" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/14900-14999.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/14900-14999.xml
index 76b962dd25..967c17d381 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/14900-14999.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/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>
@@ -722,7 +722,7 @@
 			<height normal="9.3" />
 		</collision>
 	</npc>
-	<npc id="14917" level="80" type="Folk" name="Advanced Ricky">
+	<npc id="14917" level="80" type="Folk" name="Expert Ricky">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/16000-16099.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/16000-16099.xml
index 5607f5b90e..bdc3ad3778 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/16000-16099.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/16000-16099.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="16049" level="55" type="Folk" name="Agathion Love">
 		<race>ETC</race>
@@ -194,7 +194,7 @@
 			<height normal="9.6" />
 		</collision>
 	</npc>
-	<npc id="16080" level="85" type="Folk" name="Buffalo Lv. 2 Type A">
+	<npc id="16080" level="85" type="Folk" name="Black Buffalo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -213,7 +213,7 @@
 			<height normal="14" />
 		</collision>
 	</npc>
-	<npc id="16081" level="85" type="Folk" name="Buffalo Lv. 2 Type B">
+	<npc id="16081" level="85" type="Folk" name="White Buffalo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -232,7 +232,7 @@
 			<height normal="14" />
 		</collision>
 	</npc>
-	<npc id="16082" level="85" type="Folk" name="Buffalo Lv. 3 Type A">
+	<npc id="16082" level="85" type="Folk" name="Black Combat Buffalo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -251,7 +251,7 @@
 			<height normal="14.85" />
 		</collision>
 	</npc>
-	<npc id="16083" level="85" type="Folk" name="Buffalo Lv. 3 Type B">
+	<npc id="16083" level="85" type="Folk" name="White Combat Buffalo">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -289,7 +289,7 @@
 			<height normal="12.708" />
 		</collision>
 	</npc>
-	<npc id="16085" level="85" type="Folk" name="Tiger Lv. 2 Type A">
+	<npc id="16085" level="85" type="Folk" name="White Tiger">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -308,7 +308,7 @@
 			<height normal="11.4" />
 		</collision>
 	</npc>
-	<npc id="16086" level="85" type="Folk" name="Tiger Lv. 2 Type B">
+	<npc id="16086" level="85" type="Folk" name="Tiger">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -327,7 +327,7 @@
 			<height normal="11.4" />
 		</collision>
 	</npc>
-	<npc id="16087" level="85" type="Folk" name="Tiger Lv. 3 Type A">
+	<npc id="16087" level="85" type="Folk" name="White Sharp-clawed Tiger">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -346,7 +346,7 @@
 			<height normal="12.12" />
 		</collision>
 	</npc>
-	<npc id="16088" level="85" type="Folk" name="Tiger Lv. 3 Type B">
+	<npc id="16088" level="85" type="Folk" name="Steel Sharp-clawed Tiger">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -384,7 +384,7 @@
 			<height normal="11.85" />
 		</collision>
 	</npc>
-	<npc id="16090" level="85" type="Folk" name="Kookaburra Lv. 2 Type A">
+	<npc id="16090" level="85" type="Folk" name="Red Kookaburra">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -403,7 +403,7 @@
 			<height normal="20.1" />
 		</collision>
 	</npc>
-	<npc id="16091" level="85" type="Folk" name="Kookaburra Lv. 2 Type B">
+	<npc id="16091" level="85" type="Folk" name="Blue Kookaburra">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -422,7 +422,7 @@
 			<height normal="20.1" />
 		</collision>
 	</npc>
-	<npc id="16092" level="85" type="Folk" name="Kookaburra Lv. 3 Type A">
+	<npc id="16092" level="85" type="Folk" name="Red Combat Kookaburra">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -441,7 +441,7 @@
 			<height normal="21.255" />
 		</collision>
 	</npc>
-	<npc id="16093" level="85" type="Folk" name="Kookaburra Lv. 3 Type B">
+	<npc id="16093" level="85" type="Folk" name="Blue Combat Kookaburra">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -479,7 +479,7 @@
 			<height normal="8.88" />
 		</collision>
 	</npc>
-	<npc id="16095" level="85" type="Folk" name="Dragon Lv. 2 Type A">
+	<npc id="16095" level="85" type="Folk" name="Green Dragon">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -498,7 +498,7 @@
 			<height normal="16.965" />
 		</collision>
 	</npc>
-	<npc id="16096" level="85" type="Folk" name="Dragon Lv. 2 Type B">
+	<npc id="16096" level="85" type="Folk" name="Red Dragon">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -517,7 +517,7 @@
 			<height normal="16.965" />
 		</collision>
 	</npc>
-	<npc id="16097" level="85" type="Folk" name="Dragon Lv. 3 Type A">
+	<npc id="16097" level="85" type="Folk" name="Earth Dragon">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -536,7 +536,7 @@
 			<height normal="17.945" />
 		</collision>
 	</npc>
-	<npc id="16098" level="85" type="Folk" name="Dragon Lv. 3 Type B">
+	<npc id="16098" level="85" type="Folk" name="Fire Dragon">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/16100-16199.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/16100-16199.xml
index 5e39708521..bebd688f8d 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/16100-16199.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/16100-16199.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="16100" level="85" type="Folk" name="Hawk Lv. 2 Type A">
+	<npc id="16100" level="85" type="Folk" name="Red Hawk">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -19,7 +19,7 @@
 			<height normal="45" />
 		</collision>
 	</npc>
-	<npc id="16101" level="85" type="Folk" name="Hawk Lv. 2 Type B">
+	<npc id="16101" level="85" type="Folk" name="Blue Hawk">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -38,7 +38,7 @@
 			<height normal="45" />
 		</collision>
 	</npc>
-	<npc id="16102" level="85" type="Folk" name="Hawk Lv. 3 Type A">
+	<npc id="16102" level="85" type="Folk" name="Red Combat Hawk">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -57,7 +57,7 @@
 			<height normal="45" />
 		</collision>
 	</npc>
-	<npc id="16103" level="85" type="Folk" name="Hawk Lv. 3 Type B">
+	<npc id="16103" level="85" type="Folk" name="Blue Combat Hawk">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -95,7 +95,7 @@
 			<height normal="9" />
 		</collision>
 	</npc>
-	<npc id="16105" level="85" type="Folk" name="Wolf Lv. 2 Type A">
+	<npc id="16105" level="85" type="Folk" name="Black Wolf">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -114,7 +114,7 @@
 			<height normal="14.52" />
 		</collision>
 	</npc>
-	<npc id="16106" level="85" type="Folk" name="Wolf Lv. 2 Type B">
+	<npc id="16106" level="85" type="Folk" name="While Wolf">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -133,7 +133,7 @@
 			<height normal="14.52" />
 		</collision>
 	</npc>
-	<npc id="16107" level="85" type="Folk" name="Wolf Lv. 3 Type A">
+	<npc id="16107" level="85" type="Folk" name="Black Steel Wolf">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -152,7 +152,7 @@
 			<height normal="15.72" />
 		</collision>
 	</npc>
-	<npc id="16108" level="85" type="Folk" name="Wolf Lv. 3 Type B">
+	<npc id="16108" level="85" type="Folk" name="White Steel Wolf">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18000-18099.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18000-18099.xml
index 5bb594c9ff..5a922895f3 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18000-18099.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/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>
@@ -766,8 +766,8 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="14.5" />
-			<height normal="30" />
+			<radius normal="18.85" />
+			<height normal="39.9" />
 		</collision>
 	</npc>
 	<npc id="18018" level="80" type="Folk" name="">
@@ -808,7 +808,7 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
-	<npc id="18020" level="80" type="RaidBoss" name="Queen Ant">
+	<npc id="18020" level="80" type="RaidBoss" name="Queen Ant" title="Dungeon Queen">
 		<!-- DEFEAT THE QUEEN EVENT -->
 		<parameters>
 			<minions name="Privates">
@@ -1126,7 +1126,7 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="18028" level="80" type="Folk" name="Crazy Mechanic Golem" title="Raid Fighter">
+	<npc id="18028" level="80" type="Folk" name="Crazy Mechanical Golem" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1537,7 +1537,7 @@
 			<height normal="38" />
 		</collision>
 	</npc>
-	<npc id="18049" level="80" type="Folk" name="Shilen's Messenger Cabrio" title="Raid Boss">
+	<npc id="18049" level="80" type="Folk" name="Shillien's Messenger Cabrio" title="Raid Boss">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18100-18199.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18100-18199.xml
index f682a5054c..25a744a1d2 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18100-18199.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/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="85" type="Monster" name="Halisha's Officer">
 		<race>UNDEAD</race>
@@ -740,7 +740,7 @@
 			<skill id="4439" level="4" /> <!-- Greater Hold Resistance -->
 		</skillList>
 	</npc>
-	<npc id="18150" level="80" type="Folk" name="Victim">
+	<npc id="18150" level="80" type="Folk" name="Sacrifice">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -759,7 +759,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18151" level="85" type="Monster" name="Victim">
+	<npc id="18151" level="85" type="Monster" name="Sacrifice">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<acquire exp="5564" sp="0" />
@@ -781,7 +781,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18152" level="80" type="Folk" name="Victim">
+	<npc id="18152" level="80" type="Folk" name="Sacrifice">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -800,7 +800,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18153" level="80" type="Folk" name="Victim">
+	<npc id="18153" level="80" type="Folk" name="Sacrifice">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -819,7 +819,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18154" level="80" type="Folk" name="Victim">
+	<npc id="18154" level="80" type="Folk" name="Sacrifice">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -838,7 +838,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18155" level="80" type="Folk" name="Victim">
+	<npc id="18155" level="80" type="Folk" name="Sacrifice">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -857,7 +857,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18156" level="80" type="Folk" name="Victim">
+	<npc id="18156" level="80" type="Folk" name="Sacrifice">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -876,7 +876,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18157" level="80" type="Folk" name="Victim">
+	<npc id="18157" level="80" type="Folk" name="Sacrifice">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1751,7 +1751,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18195" level="85" type="Monster" name="Signet of Emperor">
+	<npc id="18195" level="85" type="Monster" name="Emperor's Seal Device">
 		<race>BUG</race>
 		<sex>FEMALE</sex>
 		<acquire exp="5564" sp="42845" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18200-18299.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18200-18299.xml
index 7cce25fb16..00ca7c646f 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18200-18299.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/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>
@@ -575,7 +575,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="18222" level="85" type="Monster" name="Assassin of Darkness">
+	<npc id="18222" level="85" type="Monster" name="Dark Assassin">
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="5564" sp="45843" />
@@ -599,7 +599,7 @@
 			<height normal="37.5" />
 		</collision>
 	</npc>
-	<npc id="18223" level="85" type="Monster" name="Assassin of Darkness">
+	<npc id="18223" level="85" type="Monster" name="Dark Assassin">
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="5564" sp="45843" />
@@ -623,7 +623,7 @@
 			<height normal="37.5" />
 		</collision>
 	</npc>
-	<npc id="18224" level="85" type="Monster" name="Assassin of Darkness">
+	<npc id="18224" level="85" type="Monster" name="Dark Assassin">
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="5564" sp="45843" />
@@ -647,7 +647,7 @@
 			<height normal="37.5" />
 		</collision>
 	</npc>
-	<npc id="18225" level="85" type="Monster" name="Assassin of Darkness">
+	<npc id="18225" level="85" type="Monster" name="Dark Assassin">
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="5564" sp="44689" />
@@ -767,7 +767,7 @@
 			<skill id="4416" level="9" /> <!-- Demons -->
 		</skillList>
 	</npc>
-	<npc id="18230" level="85" type="Monster" name="Signet of Emperor">
+	<npc id="18230" level="85" type="Monster" name="Emperor's Seal Device">
 		<race>BUG</race>
 		<sex>FEMALE</sex>
 		<acquire exp="5564" sp="41942" />
@@ -1248,7 +1248,7 @@
 			<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 Chest">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1267,7 +1267,7 @@
 			<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>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18500-18599.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18500-18599.xml
index 7c1f3d6047..0659650cc4 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18500-18599.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18500-18599.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="18500" level="85" type="Folk" name="Royal Guard Ant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -158,7 +158,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="75" /> <!-- Caliburs -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="40000" hpRegen="10.5" mp="747" mpRegen="3.6" />
+			<vitals hp="32328" hpRegen="10.5" mp="747" mpRegen="3.6" />
 			<speed>
 				<walk ground="27" />
 				<run ground="110" />
@@ -178,7 +178,7 @@
 		<sex>FEMALE</sex>
 		<equipment rhand="1472" /> <!-- Dreadbane - Not Available - Not Available -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="40000" hpRegen="10.5" mp="889" mpRegen="3.6" />
+			<vitals hp="32328" hpRegen="10.5" mp="889" mpRegen="3.6" />
 			<speed>
 				<walk ground="100" />
 				<run ground="230" />
@@ -197,7 +197,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="40000" hpRegen="10.5" mp="665" mpRegen="3.6" />
+			<vitals hp="32328" hpRegen="10.5" mp="665" mpRegen="3.6" />
 			<speed>
 				<walk ground="80" />
 				<run ground="120" />
@@ -216,7 +216,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="40000" hpRegen="10.5" mp="637" mpRegen="3.6" />
+			<vitals hp="32328" hpRegen="10.5" mp="637" mpRegen="3.6" />
 			<speed>
 				<walk ground="70" />
 				<run ground="110" />
@@ -254,7 +254,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="40000" hpRegen="10.5" mp="692" mpRegen="3.6" />
+			<vitals hp="32328" hpRegen="10.5" mp="692" mpRegen="3.6" />
 			<speed>
 				<walk ground="20" />
 				<run ground="20" />
@@ -273,7 +273,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="40000" hpRegen="10.5" mp="610" mpRegen="3.6" />
+			<vitals hp="32328" hpRegen="10.5" mp="610" mpRegen="3.6" />
 			<speed>
 				<walk ground="55" />
 				<run ground="110" />
@@ -306,7 +306,7 @@
 			<height normal="174" />
 		</collision>
 	</npc>
-	<npc id="18516" level="85" type="Folk" name="Archangel" title="Guardian of the Tower of Insolence">
+	<npc id="18516" level="85" type="Folk" name="Archangel" title="Tower of Insolence Guardian">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1847,7 +1847,7 @@
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
-			<vitals hp="41" hpRegen="10.5" mp="40" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="1" />
 				<run ground="120" />
@@ -1858,7 +1858,7 @@
 		<status attackable="false" />
 		<collision>
 			<radius normal="50" />
-			<height normal="220" />
+			<height normal="202" />
 		</collision>
 	</npc>
 	<npc id="18597" level="85" type="Folk" name="">
@@ -1899,14 +1899,14 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="18599" level="85" type="Folk" name="Renewed Treasure Chest">
+	<npc id="18599" level="85" type="Folk" name="Genesis">
 		<!-- AUTO GENERATED NPC 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="30" />
+				<walk ground="40" />
 				<run ground="180" />
 			</speed>
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
@@ -1914,8 +1914,8 @@
 		</stats>
 		<status attackable="false" />
 		<collision>
-			<radius normal="22" />
-			<height normal="19" />
+			<radius normal="14" />
+			<height normal="53" />
 		</collision>
 	</npc>
 </list>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18600-18699.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18600-18699.xml
index cdebc32c01..a879de1d49 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18600-18699.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18600-18699.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="18600" level="85" type="Folk" name="Renewed Treasure Chest">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -76,4 +76,1628 @@
 			<height normal="0.1" />
 		</collision>
 	</npc>
+	<npc id="18604" level="85" type="Folk" name="Fountain">
+		<!-- AUTO GENERATED NPC 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="50" />
+			<height normal="202" />
+		</collision>
+	</npc>
+	<npc id="18605" level="85" type="Folk" name="Wizard of Genesis">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2620" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<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="12.35" />
+			<height normal="33.4" />
+		</collision>
+	</npc>
+	<npc id="18606" level="85" type="Folk" name="Soldier of Genesis">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2620" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<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="31.5" />
+			<height normal="41.55" />
+		</collision>
+	</npc>
+	<npc id="18607" level="85" type="Folk" name="Archer of Genesis">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) - Not Available - Not Available -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2620" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<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="19.2" />
+			<height normal="36.6" />
+		</collision>
+	</npc>
+	<npc id="18608" level="85" type="Folk" name="Bit" title="Garden Hunter">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2620" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="39" />
+				<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="8.4" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="18609" level="85" type="Folk" name="Seer" title="Garden Foreman">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2620" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<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="20" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="18610" level="85" type="Folk" name="Mystic of Genesis">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="19282" hpRegen="10.5" mp="11080" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<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="13" />
+			<height normal="33.4" />
+		</collision>
+	</npc>
+	<npc id="18611" level="85" type="Folk" name="Warrior of Genesis">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="19282" hpRegen="10.5" mp="11080" mpRegen="3.6" />
+			<speed>
+				<walk ground="36" />
+				<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="30" />
+			<height normal="35" />
+		</collision>
+	</npc>
+	<npc id="18612" level="85" type="Folk" name="Sniper of Genesis">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) - Not Available - Not Available -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="19282" hpRegen="10.5" mp="11080" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<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="19.2" />
+			<height normal="36.6" />
+		</collision>
+	</npc>
+	<npc id="18613" level="85" type="Folk" name="Yard" title="Garden Hunter">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="19282" hpRegen="10.5" mp="11080" mpRegen="3.6" />
+			<speed>
+				<walk ground="39" />
+				<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="12" />
+			<height normal="42" />
+		</collision>
+	</npc>
+	<npc id="18614" level="85" type="Folk" name="Commander" title="Garden Foreman">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="19282" hpRegen="10.5" mp="11080" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<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="24" />
+			<height normal="67.5" />
+		</collision>
+	</npc>
+	<npc id="18615" level="85" type="Folk" name="Apherus" title="Garden Ruler">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1681168" hpRegen="10.5" mp="3349" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="230" />
+			</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="34.8" />
+			<height normal="93" />
+		</collision>
+	</npc>
+	<npc id="18616" level="85" type="Folk" name="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="20964" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="230" />
+			</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="33" />
+		</collision>
+	</npc>
+	<npc id="18617" level="85" type="Folk" name="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="20964" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="230" />
+			</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="33" />
+		</collision>
+	</npc>
+	<npc id="18618" 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="0.1" />
+			<height normal="0.1" />
+		</collision>
+	</npc>
+	<npc id="18619" 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="0.1" />
+			<height normal="0.1" />
+		</collision>
+	</npc>
+	<npc id="18620" 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="0.1" />
+			<height normal="0.1" />
+		</collision>
+	</npc>
+	<npc id="18621" 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="0.1" />
+			<height normal="0.1" />
+		</collision>
+	</npc>
+	<npc id="18622" 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="0.1" />
+			<height normal="0.1" />
+		</collision>
+	</npc>
+	<npc id="18623" 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="0.1" />
+			<height normal="0.1" />
+		</collision>
+	</npc>
+	<npc id="18624" 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="0.1" />
+			<height normal="0.1" />
+		</collision>
+	</npc>
+	<npc id="18633" 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="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="0.1" />
+			<height normal="0.1" />
+		</collision>
+	</npc>
+	<npc id="18634" level="85" type="Folk" name="Ghost of Trials">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="6611" hpRegen="10.5" mp="1922" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="9" />
+			<height normal="16.5" />
+		</collision>
+	</npc>
+	<npc id="18635" level="85" type="Folk" name="Elder of Trials">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="6611" hpRegen="10.5" mp="1922" 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="30.6" />
+		</collision>
+	</npc>
+	<npc id="18636" level="85" type="Folk" name="Warrior of Trials">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="6611" hpRegen="10.5" mp="1922" mpRegen="3.6" />
+			<speed>
+				<walk ground="27" />
+				<run ground="110" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="12" />
+			<height normal="29" />
+		</collision>
+	</npc>
+	<npc id="18637" level="85" type="Folk" name="Archer of Trials">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="6611" hpRegen="10.5" mp="1922" 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.4" />
+			<height normal="27" />
+		</collision>
+	</npc>
+	<npc id="18638" level="85" type="Folk" name="Elite Daring Raider" title="Elmoreden">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="6611" hpRegen="10.5" mp="1922" mpRegen="3.6" />
+			<speed>
+				<walk ground="46" />
+				<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.5" />
+			<height normal="29" />
+		</collision>
+	</npc>
+	<npc id="18639" level="85" type="Folk" name="Scout of Despair">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="4630" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<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="19.8" />
+			<height normal="30.55" />
+		</collision>
+	</npc>
+	<npc id="18640" level="85" type="Folk" name="Elder of Despair">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="4630" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="70" />
+				<run ground="155" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="12" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="18641" level="85" type="Folk" name="Dragontroop Berserker of Despair">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="4630" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="16.5" />
+			<height normal="36.05" />
+		</collision>
+	</npc>
+	<npc id="18642" level="85" type="Folk" name="Archer of Despair">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="4630" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="15.4" />
+			<height normal="29.45" />
+		</collision>
+	</npc>
+	<npc id="18643" level="85" type="Folk" name="Elite Daring Raider" title="Elmoreden">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="4630" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="18" />
+			<height normal="34.5" />
+		</collision>
+	</npc>
+	<npc id="18644" level="85" type="Folk" name="Spirit of Oblivion">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="19282" hpRegen="10.5" mp="11080" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="165" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="16.8" />
+			<height normal="28.8" />
+		</collision>
+	</npc>
+	<npc id="18645" level="85" type="Folk" name="Priest of Oblivion">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="19282" hpRegen="10.5" mp="11080" 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="13" />
+			<height normal="34.7" />
+		</collision>
+	</npc>
+	<npc id="18646" level="85" type="Folk" name="Assassin of Oblivion">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="19282" hpRegen="10.5" mp="11080" 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="13" />
+			<height normal="37.3" />
+		</collision>
+	</npc>
+	<npc id="18647" level="85" type="Folk" name="Archer of Oblivion">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15302" /> <!-- Transparent Bow (NPC) - Not Available - Not Available -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="19282" hpRegen="10.5" mp="11080" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="23.4" />
+			<height normal="36.65" />
+		</collision>
+	</npc>
+	<npc id="18648" level="85" type="Folk" name="Elite Daring Raider" title="Elmoreden">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="19282" hpRegen="10.5" mp="11080" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="20" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="18649" level="85" type="Folk" name="Tarask Dragon" title="Earth Dragon">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="12000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="46" />
+			<height normal="74.2" />
+		</collision>
+	</npc>
+	<npc id="18650" level="85" type="Folk" name="Tarask Dragon" title="Earth Dragon">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="12000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="46" />
+			<height normal="74.2" />
+		</collision>
+	</npc>
+	<npc id="18651" level="85" type="Folk" name="Tarask Dragon" title="Dreadful Earth Dragon">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="12000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="64" />
+			<height normal="111" />
+		</collision>
+	</npc>
+	<npc id="18652" level="85" type="Folk" name="Tarask Dragon" title="Immortal Earth Dragon">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="12000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="55" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="126" />
+			<height normal="111" />
+		</collision>
+	</npc>
+	<npc id="18653" level="85" type="Folk" name="Antharas Battle's Fighter">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="301" /> <!-- scorpion -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="12000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="195" />
+			</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="24" />
+		</collision>
+	</npc>
+	<npc id="18654" level="85" type="Folk" name="Antharas' Egg">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="31111111" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="24" />
+			<height normal="69" />
+		</collision>
+	</npc>
+	<npc id="18655" 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="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="0.1" />
+			<height normal="0.1" />
+		</collision>
+	</npc>
+	<npc id="18656" level="85" type="Folk" name="Elmoreden Lady" title="Slave of Avarice">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1681168" hpRegen="10.5" mp="3693" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<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="37.5" />
+			<height normal="70.75" />
+		</collision>
+	</npc>
+	<npc id="18657" level="85" type="Folk" name="Elmoreden's Archer">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="284" /> <!-- Dark Elven Longbow -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="20964" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<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="16.9" />
+			<height normal="34.7" />
+		</collision>
+	</npc>
+	<npc id="18658" level="85" type="Folk" name="Elmoreden's Maid">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="5129" lhand="5129" /> <!-- Doll Knife - Not Available - Not Available / Doll Knife - Not Available - Not Available -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="20964" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="22" />
+				<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="10.2" />
+			<height normal="22.5" />
+		</collision>
+	</npc>
+	<npc id="18659" level="85" type="Folk" name="Elmoreden Foreman">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="6611" hpRegen="10.5" mp="1922" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="21.6" />
+			<height normal="42" />
+		</collision>
+	</npc>
+	<npc id="18660" level="85" type="Folk" name="Elmoreden Foreman">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="4630" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="41" />
+		</collision>
+	</npc>
+	<npc id="18661" level="85" type="Folk" name="Elmoreden Foreman">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="19282" hpRegen="10.5" mp="11080" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<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="19.8" />
+			<height normal="51" />
+		</collision>
+	</npc>
+	<npc id="18662" 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="0.1" />
+			<height normal="0.1" />
+		</collision>
+	</npc>
+	<npc id="18663" level="85" type="Folk" name="Elmoreden's Warrior">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="84" /> <!-- Homunkulus' Sword -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="20964" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="160" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="15" />
+			<height normal="39" />
+		</collision>
+	</npc>
+	<npc id="18664" level="85" type="Folk" name="Elmoreden Watcher" title="Slave of Avarice">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="6611" hpRegen="10.5" mp="1658" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="150" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="18" />
+			<height normal="46.2" />
+		</collision>
+	</npc>
+	<npc id="18665" level="85" type="Folk" name="Elmoreden Watcher" title="Slave of Avarice">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="4630" hpRegen="10.5" mp="2512" mpRegen="3.6" />
+			<speed>
+				<walk ground="48" />
+				<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="9.8" />
+			<height normal="47.4" />
+		</collision>
+	</npc>
+	<npc id="18666" level="85" type="Folk" name="Elmoreden Watcher" title="Slave of Avarice">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="20964" hpRegen="10.5" mp="2512" 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="15" />
+			<height normal="44" />
+		</collision>
+	</npc>
+	<npc id="18667" level="85" type="Folk" name="Dummy" title="Received PvE damage">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="41" hpRegen="10.5" mp="40" 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="27" />
+			<height normal="37.5" />
+		</collision>
+	</npc>
+	<npc id="18668" level="85" type="Folk" name="Dummy" title="Received PvP damage">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="41" hpRegen="10.5" mp="40" 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="27" />
+			<height normal="37.5" />
+		</collision>
+	</npc>
+	<npc id="18669" level="85" type="Folk" name="Dummy" title="PvE damage decrease">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="41" hpRegen="10.5" mp="40" 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="27" />
+			<height normal="37.5" />
+		</collision>
+	</npc>
+	<npc id="18670" level="85" type="Folk" name="Dummy" title="PvE damage decrease">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="41" hpRegen="10.5" mp="40" 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="27" />
+			<height normal="37.5" />
+		</collision>
+	</npc>
+	<npc id="18671" 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="0.1" />
+			<height normal="0.1" />
+		</collision>
+	</npc>
+	<npc id="18672" 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="0.1" />
+			<height normal="0.1" />
+		</collision>
+	</npc>
+	<npc id="18673" level="85" type="Folk" name="Wood Horse">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="30" />
+			<height normal="29" />
+		</collision>
+	</npc>
+	<npc id="18674" level="85" type="Folk" name="Holy Grail">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="6.2" />
+			<height normal="7" />
+		</collision>
+	</npc>
+	<npc id="18675" level="85" type="Folk" name="Ballista">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="70" />
+			<height normal="60.5" />
+		</collision>
+	</npc>
+	<npc id="18676" level="85" type="Folk" name="Red Draconid Follower">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="100" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="30" />
+			<height normal="55" />
+		</collision>
+	</npc>
+	<npc id="18677" level="85" type="Folk" name="Elven Elder Cat">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="14" />
+			<height normal="20" />
+		</collision>
+	</npc>
+	<npc id="18678" level="85" type="Folk" name="Gustav" title="Manor 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="5393162" hpRegen="10.5" mp="3834" mpRegen="3.6" />
+			<speed>
+				<walk ground="76" />
+				<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="21" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="18679" level="85" type="Folk" name="Gustav's Steward">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="5393162" hpRegen="10.5" mp="3834" mpRegen="3.6" />
+			<speed>
+				<walk ground="55" />
+				<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="31" />
+		</collision>
+	</npc>
+	<npc id="18680" level="85" type="Folk" name="Gabrielle" title="Archangel">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="5393162" hpRegen="10.5" mp="3834" 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="36.5" />
+		</collision>
+	</npc>
+	<npc id="18681" level="85" type="Folk" name="Gabrielle's Minion">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="5393162" hpRegen="10.5" mp="3834" 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="14" />
+			<height normal="33" />
+		</collision>
+	</npc>
+	<npc id="18682" level="85" type="Folk" name="Ventus" title="Ancient Gladiator">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="5393162" hpRegen="10.5" mp="3834" 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="30" />
+			<height normal="81" />
+		</collision>
+	</npc>
+	<npc id="18683" level="85" type="Folk" name="Gladiator Captive">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="5393162" hpRegen="10.5" mp="3834" 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="30" />
+			<height normal="81" />
+		</collision>
+	</npc>
+	<npc id="18684" level="85" type="Folk" name="Tiat" title="Red Draconid Commander">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="5393162" hpRegen="10.5" mp="3834" 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="55" />
+			<height normal="104" />
+		</collision>
+	</npc>
+	<npc id="18685" level="85" type="Folk" name="Red Draconid Commander Assistant">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="5393162" hpRegen="10.5" mp="3834" mpRegen="3.6" />
+			<speed>
+				<walk ground="100" />
+				<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="55" />
+		</collision>
+	</npc>
+	<npc id="18686" level="85" type="Folk" name="Feline King" title="Cat Guild's Chief">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="5393162" hpRegen="10.5" mp="3834" mpRegen="3.6" />
+			<speed>
+				<walk ground="10" />
+				<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="6" />
+			<height normal="16.006" />
+		</collision>
+	</npc>
+	<npc id="18687" level="85" type="Folk" name="Feline 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="5393162" hpRegen="10.5" mp="3834" mpRegen="3.6" />
+			<speed>
+				<walk ground="25" />
+				<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="8" />
+			<height normal="15" />
+		</collision>
+	</npc>
+	<npc id="18688" level="85" type="Folk" name="Tomb 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="8527" hpRegen="10.5" mp="2584" mpRegen="3.6" />
+			<speed>
+				<walk ground="20" />
+				<run ground="70" />
+			</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="31.5" />
+		</collision>
+	</npc>
+	<npc id="18689" level="85" type="Folk" name="Tomb Warrior">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8527" hpRegen="10.5" mp="2584" mpRegen="3.6" />
+			<speed>
+				<walk ground="39" />
+				<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="16.8" />
+			<height normal="41.1" />
+		</collision>
+	</npc>
+	<npc id="18690" level="85" type="Folk" name="Tomb 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="8527" hpRegen="10.5" mp="2584" mpRegen="3.6" />
+			<speed>
+				<walk ground="39" />
+				<run ground="150" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="18" />
+			<height normal="40.5" />
+		</collision>
+	</npc>
+	<npc id="18691" level="85" type="Folk" name="Grave Zombie">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="96795" /> <!-- Monsters Only_Stone Idol Weapon - One-handed Sword - Not Available - Not Available -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8527" hpRegen="10.5" mp="2584" mpRegen="3.6" />
+			<speed>
+				<walk ground="43" />
+				<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="14.4" />
+			<height normal="48" />
+		</collision>
+	</npc>
+	<npc id="18692" level="85" type="Folk" name="Grave Ghost">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="96794" /> <!-- Monsters Only_Stone Idol Weapon - Spear - Not Available - Not Available -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8527" hpRegen="10.5" mp="2584" mpRegen="3.6" />
+			<speed>
+				<walk ground="43" />
+				<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="14.4" />
+			<height normal="48" />
+		</collision>
+	</npc>
+	<npc id="18693" level="85" type="Folk" name="Krateth" 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="104387" hpRegen="10.5" mp="3349" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="135" />
+			</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="37.5" />
+			<height normal="64.5" />
+		</collision>
+	</npc>
+	<npc id="18694" 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="0.1" />
+			<height normal="0.1" />
+		</collision>
+	</npc>
+	<npc id="18695" level="85" type="Folk" name="Myojik" 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="8527" hpRegen="10.5" mp="2584" mpRegen="3.6" />
+			<speed>
+				<walk ground="20" />
+				<run ground="70" />
+			</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="43" />
+		</collision>
+	</npc>
+	<npc id="18696" level="85" type="Folk" name="Tomb Servant" title="Resurrected">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8527" hpRegen="10.5" mp="2584" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<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="37.5" />
+			<height normal="46.5" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18900-18999.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18900-18999.xml
index 15a7b5f3cb..1aee4f7893 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18900-18999.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/18900-18999.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="18919" level="85" type="Folk" name="">
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="4234" hpRegen="8.5" mp="1846" mpRegen="3" />
+			<vitals hp="2823" hpRegen="8.5" mp="1507" mpRegen="3" />
 			<attack physical="1188.87259499001" magical="811.84586495282" random="10" critical="4" accuracy="5" attackSpeed="253" type="SWORD" range="40" distance="80" width="120" />
 			<defence physical="361.78814" magical="264.74086" />
 			<speed>
@@ -52,7 +52,7 @@
 			<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>
@@ -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_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20000-20099.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20000-20099.xml
index b2902c81b8..d945ed0f6b 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20000-20099.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20000-20099.xml
@@ -987,7 +987,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20022" level="14" type="Monster" name="Misery Skeleton">
+	<npc id="20022" level="14" type="Monster" name="Skeleton Convict">
 		<!-- L2wiki: https://l2wiki.com/classic/Misery_Skeleton -->
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
@@ -3672,7 +3672,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20073" level="28" type="Monster" name="Ol Mahum Legionnaire">
+	<npc id="20073" level="28" type="Monster" name="Ol Mahum Legionary">
 		<!-- Todo: Confirmed CT2.5 -->
 		<parameters>
 			<param name="MoveAroundSocial" value="130" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20200-20299.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20200-20299.xml
index 9adacfb57a..17afe3dcab 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20200-20299.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20200-20299.xml
@@ -1995,7 +1995,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20235" level="77" type="Monster" name="Shackle" element="EARTH">
+	<npc id="20235" level="77" type="Monster" name="Convict" element="EARTH">
 		<parameters>
 			<param name="MoveAroundSocial" value="130" />
 			<param name="MoveAroundSocial1" value="130" />
@@ -2445,7 +2445,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20241" level="77" type="Monster" name="Hunter Gargoyle" element="EARTH">
+	<npc id="20241" level="77" type="Monster" name="Gargoyle Hunter" element="EARTH">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -4467,7 +4467,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20279" level="77" type="Monster" name="Shackle" element="EARTH">
+	<npc id="20279" level="77" type="Monster" name="Convict" element="EARTH">
 		<parameters>
 			<param name="MoveAroundSocial" value="130" />
 			<param name="MoveAroundSocial1" value="130" />
@@ -4941,7 +4941,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20286" level="77" type="Monster" name="Hunter Gargoyle" element="EARTH">
+	<npc id="20286" level="77" type="Monster" name="Gargoyle Hunter" element="EARTH">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20400-20499.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20400-20499.xml
index d113b40792..f5c66f5c67 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20400-20499.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20400-20499.xml
@@ -273,7 +273,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20405" level="85" type="Monster" name="Knoriks" title="Antharas Watchman" element="EARTH">
+	<npc id="20405" level="85" type="Monster" name="Knoriks" title="Antharas' Watchman" element="EARTH">
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
 			<param name="MoveAroundSocial1" value="80" />
@@ -389,7 +389,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20407" level="85" type="Monster" name="Maluk Banshee" element="EARTH">
+	<npc id="20407" level="85" type="Monster" name="Bloody Banshee" element="EARTH">
 		<parameters>
 			<skill name="HealMagic_a" id="4209" level="6" />
 			<skill name="SelfRangeBuff_a" id="4213" level="6" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20500-20599.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20500-20599.xml
index 5d0554f0a0..711615231f 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20500-20599.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20500-20599.xml
@@ -2902,7 +2902,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20558" level="43" type="Monster" name="Rotting tree" element="WATER">
+	<npc id="20558" level="43" type="Monster" name="Rotting Tree" element="WATER">
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="100" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20600-20699.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20600-20699.xml
index cdf8fbb43b..ad284ba2ad 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20600-20699.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20600-20699.xml
@@ -4007,7 +4007,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20665" level="71" type="Monster" name="Taik Orc Supply" element="WATER">
+	<npc id="20665" level="71" type="Monster" name="Taik Orc Elder" element="WATER">
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
 			<param name="MoveAroundSocial1" value="65" />
@@ -4137,7 +4137,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="20667" level="72" type="Monster" name="Farcran" title="Violent" element="WATER">
+	<npc id="20667" level="72" type="Monster" name="Farcran" element="WATER">
 		<parameters>
 			<param name="MoveAroundSocial" value="60" />
 			<param name="MoveAroundSocial1" value="60" />
@@ -5082,7 +5082,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20682" level="61" type="Monster" name="Vanor Silenos Solider" element="WIND">
+	<npc id="20682" level="61" type="Monster" name="Vanor Silenos Soldier" element="WIND">
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="50" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20700-20799.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20700-20799.xml
index 0b8e35065d..7ee0f3a0a8 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20700-20799.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20700-20799.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="20738" level="13" type="Monster" name="Kobold Looter Bepook">
 		<!-- Confirmed CT2.5 -->
@@ -1324,7 +1324,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20761" level="85" type="Monster" name="Pytan" element="EARTH">
+	<npc id="20761" level="85" type="Monster" name="Pytan" title="Earth Dragon's Guardian" element="EARTH">
 		<parameters>
 			<param name="MoveAroundSocial" value="60" />
 			<param name="MoveAroundSocial1" value="60" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20800-20899.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20800-20899.xml
index 07ff3b0f26..bf1413ef97 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20800-20899.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/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="76" type="Monster" name="Eva's Watchman" element="WATER">
 		<parameters>
@@ -70,7 +70,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20801" level="77" type="Monster" name="Piker" element="WATER">
+	<npc id="20801" level="77" type="Monster" name="Pikeman" element="WATER">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -1022,7 +1022,7 @@
 			<height normal="28.5" />
 		</collision>
 	</npc>
-	<npc id="20817" level="62" type="Monster" name="Corrupt Sage" element="WIND">
+	<npc id="20817" level="62" type="Monster" name="Corrupted Sage" element="WIND">
 		<parameters>
 			<param name="MoveAroundSocial" value="114" />
 			<param name="MoveAroundSocial1" value="114" />
@@ -1899,7 +1899,7 @@
 			<height normal="36.5" grown="42.5" />
 		</collision>
 	</npc>
-	<npc id="20831" level="76" type="Monster" name="Seal Angel">
+	<npc id="20831" level="76" type="Monster" name="Sealed Angel">
 		<parameters>
 			<param name="MoveAroundSocial" value="50" />
 			<param name="MoveAroundSocial1" value="50" />
@@ -3788,7 +3788,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20860" level="76" type="Monster" name="Seal Angel">
+	<npc id="20860" level="76" type="Monster" name="Sealed Angel">
 		<parameters>
 			<param name="MoveAroundSocial" value="50" />
 			<param name="MoveAroundSocial1" value="50" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20900-20999.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20900-20999.xml
index f1b71053c9..122575ffde 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20900-20999.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/20900-20999.xml
@@ -1117,7 +1117,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="20937" level="42" type="Monster" name="Tanor Silenos Solider">
+	<npc id="20937" level="42" type="Monster" name="Tanor Silenos Soldier">
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
 			<param name="MoveAroundSocial1" value="50" />
@@ -3463,7 +3463,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20973" level="75" type="Monster" name="Forgotten Ancient People" element="EARTH">
+	<npc id="20973" level="75" type="Monster" name="Forgotten Ancient Creature" element="EARTH">
 		<parameters>
 			<param name="MoveAroundSocial" value="110" />
 			<param name="MoveAroundSocial1" value="110" />
@@ -3723,7 +3723,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="20977" level="66" type="Monster" name="Elmoreden's Lady" title="Slave of Avarice">
+	<npc id="20977" level="66" type="Monster" name="Elmoreden Lady" title="Slave of Avarice">
 		<!-- L2wiki: https://l2wiki.com/classic/Elmoreden%27s_Lady -->
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21000-21099.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21000-21099.xml
index 35c0e2eba3..94628727e2 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21000-21099.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21000-21099.xml
@@ -1945,7 +1945,7 @@
 			<height normal="20" grown="24" />
 		</collision>
 	</npc>
-	<npc id="21037" level="47" type="Monster" name="Ossiud">
+	<npc id="21037" level="47" type="Monster" name="Nova Beast" title="Device Guardian">
 		<parameters>
 			<param name="MoveAroundSocial" value="40" />
 			<param name="MoveAroundSocial1" value="40" />
@@ -2015,7 +2015,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21038" level="49" type="Monster" name="Liangma">
+	<npc id="21038" level="49" type="Monster" name="Nova Giant" title="Device Guardian">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -2877,7 +2877,7 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="21070" level="78" type="Monster" name="Seal Archangel">
+	<npc id="21070" level="78" type="Monster" name="Sealed Archangel">
 		<parameters>
 			<param name="MoveAroundSocial" value="50" />
 			<param name="MoveAroundSocial1" value="50" />
@@ -2937,7 +2937,7 @@
 			<height normal="36.5" grown="42.5" />
 		</collision>
 	</npc>
-	<npc id="21071" level="78" type="Monster" name="Seal Archangel">
+	<npc id="21071" level="78" type="Monster" name="Sealed Archangel">
 		<parameters>
 			<param name="MoveAroundSocial" value="50" />
 			<param name="MoveAroundSocial1" value="50" />
@@ -3756,7 +3756,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21086" level="85" type="Monster" name="Bloody Liviona" element="EARTH">
+	<npc id="21086" level="85" type="Monster" name="Drake Scout" element="EARTH">
 		<parameters>
 			<param name="MoveAroundSocial" value="57" />
 			<param name="MoveAroundSocial1" value="57" />
@@ -3823,7 +3823,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21087" level="85" type="Monster" name="Bloody Knight" element="EARTH">
+	<npc id="21087" level="85" type="Monster" name="Drake Commander" element="EARTH">
 		<!-- L2wiki: https://l2wiki.com/classic/Bloody_Knight -->
 		<parameters>
 			<param name="MoveAroundSocial" value="74" />
@@ -3897,7 +3897,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21088" level="85" type="Monster" name="Bloody Banshee">
+	<npc id="21088" level="85" type="Monster" name="Drake Chief">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -3952,7 +3952,7 @@
 			<height normal="49.9" />
 		</collision>
 	</npc>
-	<npc id="21089" level="85" type="Monster" name="Bloody Lord" element="EARTH">
+	<npc id="21089" level="85" type="Monster" name="Drake Mage" element="EARTH">
 		<parameters>
 			<param name="MoveAroundSocial" value="140" />
 			<param name="MoveAroundSocial1" value="140" />
@@ -4020,7 +4020,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21090" level="75" type="Monster" name="Bloody Guardian">
+	<npc id="21090" level="75" type="Monster" name="Maluk Guardian">
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
 			<param name="MoveAroundSocial1" value="80" />
@@ -4090,7 +4090,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21091" level="74" type="Monster" name="Bloody Keeper">
+	<npc id="21091" level="74" type="Monster" name="Maluk Scout">
 		<parameters>
 			<param name="MoveAroundSocial" value="108" />
 			<param name="MoveAroundSocial1" value="108" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21100-21199.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21100-21199.xml
index b2f18105ba..4a51848f14 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21100-21199.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21100-21199.xml
@@ -4991,7 +4991,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21186" level="80" type="Monster" name="Lilim Royal Knight">
+	<npc id="21186" level="80" type="Monster" name="Lillim Royal Knight">
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
 			<param name="MoveAroundSocial1" value="80" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21400-21499.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21400-21499.xml
index a5fdfa1d36..2b4d0122e8 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21400-21499.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/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>
@@ -248,7 +248,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="Imperial Guard">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="98" />
@@ -285,7 +285,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21409" level="84" type="Monster" name="Imperial Royal Guard">
+	<npc id="21409" level="84" type="Monster" name="Imperial Guard">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="98" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21600-21699.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21600-21699.xml
index 3e00bb88cb..c501b66f4a 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21600-21699.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21600-21699.xml
@@ -3730,7 +3730,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21663" level="77" type="Monster" name="Scarlet Noble" element="FIRE">
+	<npc id="21663" level="77" type="Monster" name="Scarlet Stakato Noble" element="FIRE">
 		<parameters>
 			<param name="IsAggressive" value="1" />
 			<param name="Skill01_AttackSplash" value="1" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21700-21799.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21700-21799.xml
index 70d13ac42c..1f7a41e764 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21700-21799.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21700-21799.xml
@@ -3959,7 +3959,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21787" level="78" type="Monster" name="Breeze Piker" element="WIND">
+	<npc id="21787" level="78" type="Monster" name="Breeze Pikeman" element="WIND">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -4474,7 +4474,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21795" level="71" type="Monster" name="Guardian Spirit">
+	<npc id="21795" level="71" type="Monster" name="Guardian's Spirit">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21800-21899.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21800-21899.xml
index 60315f91e9..a2a72039bf 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21800-21899.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/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>
@@ -1279,7 +1279,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21821" level="80" type="Monster" name="Eye of the Watchman" element="EARTH">
+	<npc id="21821" level="80" type="Monster" name="Eye of Watchman" element="EARTH">
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
 			<param name="MoveAroundSocial1" value="90" />
@@ -2411,7 +2411,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21837" level="81" type="Monster" name="Hot Springs Antelope">
+	<npc id="21837" level="81" type="Monster" name="Hot Springs Anelope">
 		<!-- Classic Seven Sings -->
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
@@ -2610,7 +2610,7 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="21840" level="82" type="Monster" name="Hot Springs Atroxspawn">
+	<npc id="21840" level="82" type="Monster" name="Hot Springs Atrox">
 		<!-- Classic Seven Sings -->
 		<parameters>
 			<param name="MoveAroundSocial" value="100" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21900-21999.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21900-21999.xml
index 135edc1e13..3d6e8eaad4 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21900-21999.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/21900-21999.xml
@@ -1302,7 +1302,7 @@
 			</clanList>
 		</ai>
 	</npc>
-	<npc id="21943" level="83" type="Monster" name="Ryurik">
+	<npc id="21943" level="83" type="Monster" name="Ryurik" title="Ancient Pirate">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<acquire exp="816485" sp="24495" />
@@ -1336,7 +1336,7 @@
 			</clanList>
 		</ai>
 	</npc>
-	<npc id="21944" level="83" type="Monster" name="Eric">
+	<npc id="21944" level="83" type="Monster" name="Eric" title="Ancient Pirate">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="39719" /> 
@@ -1370,7 +1370,7 @@
 			</clanList>
 		</ai>
 	</npc>
-	<npc id="21945" level="83" type="Monster" name="Leif">
+	<npc id="21945" level="83" type="Monster" name="Leif" title="Ancient Pirate">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<acquire exp="836463" sp="25094" />
@@ -1403,7 +1403,7 @@
 			</clanList>
 		</ai>
 	</npc>
-	<npc id="21946" level="83" type="Monster" name="Gunhilde">
+	<npc id="21946" level="83" type="Monster" name="Gunhilde" title="Ancient Pirate">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<acquire exp="827507" sp="24826" />
@@ -1628,7 +1628,7 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="21957" level="85" type="Folk" name="Crokin Commander">
+	<npc id="21957" level="85" type="Folk" name="Crokin Archer">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1735,7 +1735,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="21960" level="80" type="Monster" name="Lord Ishka" title="Apostle of the Valley" element="EARTH">
+	<npc id="21960" level="80" type="Monster" name="Lord Ishka" title="Slayer of the Valley" element="EARTH">
 		<race>UNDEAD</race>
 		<sex>FEMALE</sex>
 		<acquire exp="8444672" sp="4110208" attributeExp="1144" />
@@ -1897,7 +1897,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21964" level="67" type="Monster" name="Pachycephalosaurus" title="Possessed Berserker" element="EARTH">
+	<npc id="21964" level="67" type="Monster" name="Pachycephalosaurus" element="EARTH">
 		<race>NONE</race>
 		<sex>FEMALE</sex>
 		<acquire exp="8126" sp="885" attributeExp="25" />
@@ -1984,7 +1984,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21968" level="69" type="Monster" name="Ornithomimus" title="Possessed Berserker" element="EARTH">
+	<npc id="21968" level="69" type="Monster" name="Ornithomimus" element="EARTH">
 		<race>NONE</race>
 		<sex>FEMALE</sex>
 		<acquire exp="8618" sp="1255" attributeExp="28" />
@@ -2071,7 +2071,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21971" level="80" type="Monster" name="Velociraptor" title="Possessed Berserker" element="EARTH">
+	<npc id="21971" level="80" type="Monster" name="Velociraptor" element="EARTH">
 		<race>NONE</race>
 		<sex>FEMALE</sex>
 		<acquire exp="10374" sp="839" attributeExp="360" />
@@ -2158,7 +2158,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21974" level="80" type="Monster" name="Ornithomimus" title="Possessed Berserker" element="EARTH">
+	<npc id="21974" level="80" type="Monster" name="Ornithomimus" element="EARTH">
 		<race>NONE</race>
 		<sex>FEMALE</sex>
 		<acquire exp="10635" sp="1589" attributeExp="440" />
@@ -2216,7 +2216,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21976" level="80" type="Monster" name="Deinonychus" title="Possessed Berserker" element="EARTH">
+	<npc id="21976" level="80" type="Monster" name="Deinonychus" element="EARTH">
 		<race>NONE</race>
 		<sex>FEMALE</sex>
 		<acquire exp="10723" sp="2467" attributeExp="480" />
@@ -2274,7 +2274,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="21978" level="80" type="Monster" name="Tyrannosaurus" title="Possessed Berserker" element="EARTH">
+	<npc id="21978" level="80" type="Monster" name="Tyrannosaurus" element="EARTH">
 		<race>NONE</race>
 		<sex>FEMALE</sex>
 		<acquire exp="21632" sp="2696" attributeExp="520" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22000-22099.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22000-22099.xml
index eaa60949e7..8edbc6189a 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22000-22099.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22000-22099.xml
@@ -54,7 +54,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="22001" level="80" type="Monster" name="Corrupt Sage" element="WIND">
+	<npc id="22001" level="80" type="Monster" name="Corrupted Sage" element="WIND">
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="15776" sp="4564" attributeExp="880" />
@@ -1792,7 +1792,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="22032" level="85" type="Monster" name="Seal Angel" element="WIND">
+	<npc id="22032" level="85" type="Monster" name="Sealed Angel" element="WIND">
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
 		<acquire exp="80268" sp="3281" attributeExp="1215" />
@@ -1849,7 +1849,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="22033" level="85" type="Monster" name="Seal Guardian Angel" element="WIND">
+	<npc id="22033" level="85" type="Monster" name="Sealed Guardian Angel" element="WIND">
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
 		<acquire exp="80268" sp="3281" attributeExp="1215" />
@@ -1900,7 +1900,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="22034" level="85" type="Monster" name="Seal Archangel" element="WIND">
+	<npc id="22034" level="85" type="Monster" name="Sealed Archangel" element="WIND">
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
 		<acquire exp="127448" sp="6091" attributeExp="1215" />
@@ -2236,7 +2236,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="22040" level="85" type="Monster" name="Tower Guardian Messenger" element="WIND">
+	<npc id="22040" level="85" type="Monster" name="Tower Guardian Leader" element="WIND">
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
 		<acquire exp="127448" sp="6091" attributeExp="1215" />
@@ -3015,7 +3015,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="22053" level="85" type="Monster" name="Seal Archangel" element="WIND">
+	<npc id="22053" level="85" type="Monster" name="Sealed Archangel" element="WIND">
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
 		<acquire exp="21278" sp="6091" attributeExp="1215" />
@@ -3133,7 +3133,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="22055" level="85" type="Monster" name="Tower Guardian Messenger" element="WIND">
+	<npc id="22055" level="85" type="Monster" name="Tower Guardian Leader" element="WIND">
 		<race>DIVINE</race>
 		<sex>FEMALE</sex>
 		<acquire exp="21278" sp="6091" attributeExp="1215" />
@@ -3194,7 +3194,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="22056" level="70" type="Monster" name="Pachycephalosaurus" title="Savage" element="EARTH">
+	<npc id="22056" level="70" type="Monster" name="Pachycephalosaurus" element="EARTH">
 		<race>NONE</race>
 		<sex>FEMALE</sex>
 		<acquire exp="8860" sp="1075" attributeExp="30" />
@@ -3223,7 +3223,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22057" level="75" type="Monster" name="Strider" title="Savage" element="EARTH">
+	<npc id="22057" level="75" type="Monster" name="Strider" element="EARTH">
 		<race>NONE</race>
 		<sex>FEMALE</sex>
 		<acquire exp="10170" sp="1410" attributeExp="41" />
@@ -3252,7 +3252,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22058" level="72" type="Monster" name="Ornithomimus" title="Savage" element="EARTH">
+	<npc id="22058" level="72" type="Monster" name="Ornithomimus" element="EARTH">
 		<race>NONE</race>
 		<sex>FEMALE</sex>
 		<acquire exp="9382" sp="1325" attributeExp="34" />
@@ -3281,7 +3281,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22059" level="80" type="Monster" name="Pterosaur" title="Possessed Berserker" element="EARTH">
+	<npc id="22059" level="80" type="Monster" name="Pterosaur" element="EARTH">
 		<race>NONE</race>
 		<sex>FEMALE</sex>
 		<acquire exp="10530" sp="1475" attributeExp="400" />
@@ -3576,7 +3576,7 @@
 			<height normal="31" />
 		</collision>
 	</npc>
-	<npc id="22068" level="85" type="Folk" name="Shackle">
+	<npc id="22068" level="85" type="Folk" name="Convict">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -3930,7 +3930,7 @@
 			<height normal="46" />
 		</collision>
 	</npc>
-	<npc id="22086" level="85" type="Folk" name="Shackle">
+	<npc id="22086" level="85" type="Folk" name="Convict">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22100-22199.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22100-22199.xml
index 01486520eb..b255338e2d 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22100-22199.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22100-22199.xml
@@ -115,7 +115,7 @@
 			<height normal="44.7" />
 		</collision>
 	</npc>
-	<npc id="22104" level="85" type="Folk" name="Kellow" title="Ruler of Garden">
+	<npc id="22104" level="85" type="Folk" name="Odd">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -134,7 +134,7 @@
 			<height normal="42.6" />
 		</collision>
 	</npc>
-	<npc id="22105" level="85" type="Folk" name="Crokin Commander" title="Ruler of Garden">
+	<npc id="22105" level="85" type="Folk" name="Crokin Commander">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -789,7 +789,7 @@
 			<height normal="63" />
 		</collision>
 	</npc>
-	<npc id="22122" level="45" type="Monster" name="Special Treasure Chest">
+	<npc id="22122" level="45" type="Monster" name="Transcendent Treasure Chest">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="26822" sp="7509" />
@@ -817,7 +817,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22123" level="55" type="Monster" name="Special Treasure Chest">
+	<npc id="22123" level="55" type="Monster" name="Transcendent Treasure Chest">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="44577" sp="12479" />
@@ -845,7 +845,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22124" level="65" type="Monster" name="Special Treasure Chest">
+	<npc id="22124" level="65" type="Monster" name="Transcendent Treasure Chest">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="65074" sp="18219" />
@@ -872,7 +872,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22125" level="75" type="Monster" name="Special Treasure Chest">
+	<npc id="22125" level="75" type="Monster" name="Transcendent Treasure Chest">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="96773" sp="27090" />
@@ -900,7 +900,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22126" level="85" type="Monster" name="Special Treasure Chest">
+	<npc id="22126" level="85" type="Monster" name="Transcendent Treasure Chest">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -1069,7 +1069,7 @@
 			<height normal="34.5" />
 		</collision>
 	</npc>
-	<npc id="22134" level="85" type="Folk" name="Turek Orc Commander" title="Hero of the Past">
+	<npc id="22134" level="85" type="Folk" name="Turek Orc Scout">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1736,7 +1736,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22150" level="80" type="Monster" name="Special Treasure Chest">
+	<npc id="22150" level="80" type="Monster" name="Transcendent Treasure Chest">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="125031" sp="35002" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22200-22299.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22200-22299.xml
index 0fae2d30d1..d8569d7935 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22200-22299.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22200-22299.xml
@@ -1604,7 +1604,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="22248" level="85" type="Monster" name="Sel Mahum Legionnaire" element="FIRE">
+	<npc id="22248" level="85" type="Monster" name="Sel Mahum Legionary" element="FIRE">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="95594" sp="27203" attributeExp="1215" />
@@ -1975,7 +1975,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="22257" level="80" type="Monster" name="Dire Witch" element="FIRE">
+	<npc id="22257" level="80" type="Monster" name="Timo" title="Garden Prowler" element="FIRE">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="123718" sp="13601" attributeExp="1040" />
@@ -2361,7 +2361,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22269" level="80" type="Monster" name="Kalix" title="Ruler of Garden" element="FIRE">
+	<npc id="22269" level="80" type="Monster" name="Kalix" title="Swift Hunter" element="FIRE">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="134052" sp="13601" attributeExp="1040" />
@@ -2396,7 +2396,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22270" level="80" type="Monster" name="Kastia's Elite Captain" title="Ruler of Garden" element="FIRE">
+	<npc id="22270" level="80" type="Monster" name="Kastia's Elite Captain" title="Swift Hunter" element="FIRE">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="149035" sp="13601" attributeExp="1040" />
@@ -2623,7 +2623,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22278" level="85" type="Monster" name="Special Treasure Chest">
+	<npc id="22278" level="85" type="Monster" name="Transcendent Treasure Chest">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="227443" sp="63682" />
@@ -2651,7 +2651,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="22279" level="85" type="Folk" name="Special Treasure Chest">
+	<npc id="22279" level="85" type="Folk" name="Transcendent Treasure Chest">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -2670,7 +2670,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="22280" level="85" type="Folk" name="Special Treasure Chest">
+	<npc id="22280" level="85" type="Folk" name="Transcendent Treasure Chest">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -2688,7 +2688,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="22281" level="85" type="Folk" name="Special Treasure Chest">
+	<npc id="22281" level="85" type="Folk" name="Transcendent Treasure Chest">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -2707,7 +2707,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="22282" level="85" type="Folk" name="Special Treasure Chest">
+	<npc id="22282" level="85" type="Folk" name="Transcendent Treasure Chest">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -2726,7 +2726,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="22283" level="85" type="Folk" name="Special Treasure Chest">
+	<npc id="22283" level="85" type="Folk" name="Transcendent Treasure Chest">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -2745,7 +2745,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="22284" level="85" type="Folk" name="Special Treasure Chest">
+	<npc id="22284" level="85" type="Folk" name="Transcendent Treasure Chest">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -2764,7 +2764,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="22285" level="85" type="Folk" name="Special Treasure Chest">
+	<npc id="22285" level="85" type="Folk" name="Transcendent Treasure Chest">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -2897,7 +2897,7 @@
 			<height normal="91" />
 		</collision>
 	</npc>
-	<npc id="22292" level="85" type="Monster" name="Kura" title="Incredible Guardian">
+	<npc id="22292" level="85" type="Monster" name="Beast Guardian" title="Transcendent Guardian">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<equipment rhand="72" />
@@ -2971,7 +2971,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="22294" level="70" type="Monster" name="Windsus">
+	<npc id="22294" level="70" type="Monster" name="Hog">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="211096" sp="12490" />
@@ -3197,7 +3197,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="22299" level="80" type="Monster" name="Balky Boar">
+	<npc id="22299" level="80" type="Monster" name="Stubborn Hog">
 		<race>ETC</race>
 		<sex>FEMALE</sex>
 		<acquire exp="217600" sp="5815" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22300-22399.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22300-22399.xml
index de010b5328..cdf6a636b4 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22300-22399.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22300-22399.xml
@@ -1047,7 +1047,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="22331" level="45" type="Monster" name="Poison Guard" title="Incredible Guardian">
+	<npc id="22331" level="45" type="Monster" name="Poison Guard" title="Transcendent Guardian">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -1079,7 +1079,7 @@
 			<height normal="31.3" />
 		</collision>
 	</npc>
-	<npc id="22332" level="85" type="Folk" name="Grave Warden" title="Incredible Guardian">
+	<npc id="22332" level="85" type="Folk" name="Grave Warden" title="Transcendent Guardian">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1098,7 +1098,7 @@
 			<height normal="30.6" />
 		</collision>
 	</npc>
-	<npc id="22333" level="85" type="Folk" name="Guard of Honor" title="Incredible Guardian">
+	<npc id="22333" level="85" type="Folk" name="Guard of Honor" title="Transcendent Guardian">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1118,7 +1118,7 @@
 			<height normal="44.25" />
 		</collision>
 	</npc>
-	<npc id="22334" level="85" type="Folk" name="Fierce Guard" title="Incredible Guardian">
+	<npc id="22334" level="85" type="Folk" name="Fierce Guard" title="Transcendent Guardian">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1137,7 +1137,7 @@
 			<height normal="44.7" />
 		</collision>
 	</npc>
-	<npc id="22335" level="85" type="Folk" name="Dragon Warden" title="Incredible Guardian">
+	<npc id="22335" level="85" type="Folk" name="Dragon Warden" title="Transcendent Guardian">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1543,8 +1543,8 @@
 		<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="40" />
-				<run ground="180" />
+				<walk ground="70" />
+				<run ground="150" />
 			</speed>
 			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="20" />
 			<defence physical="405.85106382979" magical="297.0297029703" />
@@ -1557,8 +1557,8 @@
 		<ai type="BALANCED" aggroRange="500" isAggressive="true">
 		</ai>
 		<collision>
-			<radius normal="14" />
-			<height normal="25" />
+			<radius normal="22.5" />
+			<height normal="48" />
 		</collision>
 		<dropLists>
 			<drop>
@@ -1698,8 +1698,8 @@
 		<ai type="ARCHER" aggroRange="600" isAggressive="true">
 		</ai>
 		<collision>
-			<radius normal="14" />
-			<height normal="25" />
+			<radius normal="15" />
+			<height normal="36.75" />
 		</collision>
 		<dropLists>
 			<drop>
@@ -1711,4 +1711,906 @@
 			</drop>
 		</dropLists>
 	</npc>
+	<npc id="22353" level="85" type="Folk" name="Steel Chaser">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" 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="25" />
+			<height normal="36" />
+		</collision>
+	</npc>
+	<npc id="22354" level="85" type="Folk" name="Steel Lord">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" 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="28" />
+			<height normal="46.15" />
+		</collision>
+	</npc>
+	<npc id="22355" level="85" type="Folk" name="Steel 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="23498" hpRegen="10.5" mp="11502" 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="28" />
+			<height normal="46.15" />
+		</collision>
+	</npc>
+	<npc id="22356" level="85" type="Folk" name="Steel Berserker">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" 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="19.8" />
+			<height normal="34.2" />
+		</collision>
+	</npc>
+	<npc id="22357" level="85" type="Folk" name="Dark Chaser">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="35738" hpRegen="10.5" mp="11928" 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="50" />
+		</collision>
+	</npc>
+	<npc id="22358" level="85" type="Folk" name="Dark Ruler">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="35738" hpRegen="10.5" mp="11928" 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="19" />
+			<height normal="43" />
+		</collision>
+	</npc>
+	<npc id="22359" level="85" type="Folk" name="Dark 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="35738" hpRegen="10.5" mp="11928" 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="16" />
+			<height normal="42.5" />
+		</collision>
+	</npc>
+	<npc id="22360" level="85" type="Folk" name="Dark Berserker">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="35738" hpRegen="10.5" mp="11928" 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="35" />
+		</collision>
+	</npc>
+	<npc id="22361" level="85" type="Folk" name="Strider">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="4041" hpRegen="10.5" mp="2227" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="16.1" />
+			<height normal="24.02" />
+		</collision>
+	</npc>
+	<npc id="22362" level="85" type="Folk" name="Strider">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="5253" hpRegen="10.5" mp="2227" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="23" />
+			<height normal="35.6" />
+		</collision>
+	</npc>
+	<npc id="22363" level="85" type="Folk" name="Strider">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="4041" hpRegen="10.5" mp="2227" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="22.4" />
+			<height normal="36.9" />
+		</collision>
+	</npc>
+	<npc id="22364" level="85" type="Folk" name="Dragon" title="Furious">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="6061" hpRegen="10.5" mp="2227" mpRegen="3.6" />
+			<speed>
+				<walk ground="55" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="63" />
+			<height normal="54" />
+		</collision>
+	</npc>
+	<npc id="22365" level="85" type="Folk" name="Strider">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="5371" hpRegen="10.5" mp="2614" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="16.1" />
+			<height normal="24.02" />
+		</collision>
+	</npc>
+	<npc id="22366" level="85" type="Folk" name="Strider">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="5371" hpRegen="10.5" mp="2614" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="23" />
+			<height normal="35.6" />
+		</collision>
+	</npc>
+	<npc id="22367" level="85" type="Folk" name="Strider">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="6982" hpRegen="10.5" mp="2614" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="22.4" />
+			<height normal="36.9" />
+		</collision>
+	</npc>
+	<npc id="22368" level="85" type="Folk" name="Dragon" title="Furious">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8056" hpRegen="10.5" mp="2614" mpRegen="3.6" />
+			<speed>
+				<walk ground="55" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="63" />
+			<height normal="54" />
+		</collision>
+	</npc>
+	<npc id="22369" level="85" type="Folk" name="Giant Mercenary">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="9806" hpRegen="10.5" mp="2770" 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="24" />
+			<height normal="29" />
+		</collision>
+	</npc>
+	<npc id="22370" level="85" type="Folk" name="Mutated 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="9806" hpRegen="10.5" mp="2770" 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="28" />
+			<height normal="46.15" />
+		</collision>
+	</npc>
+	<npc id="22371" level="85" type="Folk" name="Mutated Tracker">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="9806" hpRegen="10.5" mp="2770" 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="28" />
+			<height normal="46.15" />
+		</collision>
+	</npc>
+	<npc id="22372" level="85" type="Folk" name="Mutated Archer">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15304" /> <!-- Transparent Crossbow (NPC) - Not Available - Not Available -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="9806" hpRegen="10.5" mp="2770" 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="28" />
+			<height normal="46.15" />
+		</collision>
+	</npc>
+	<npc id="22373" level="85" type="Folk" name="Kaze" title="Cave Scout">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="13378" hpRegen="10.5" mp="2928" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="49" />
+		</collision>
+	</npc>
+	<npc id="22374" level="85" type="Folk" name="Guard" title="Cave 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="35738" hpRegen="10.5" mp="11928" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="28.8" />
+			<height normal="57" />
+		</collision>
+	</npc>
+	<npc id="22375" level="85" type="Folk" name="Essence of the Lesser Giant">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="13378" hpRegen="10.5" mp="2928" mpRegen="3.6" />
+			<speed>
+				<walk ground="27" />
+				<run ground="150" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="24" />
+			<height normal="42.6" />
+		</collision>
+	</npc>
+	<npc id="22376" level="85" type="Folk" name="Lesser Giant Soldier">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="3937" /> <!-- Monster Only (Lesser Giant) - Not Available - Not Available -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="13378" hpRegen="10.5" mp="2928" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<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="25" />
+			<height normal="44" />
+		</collision>
+	</npc>
+	<npc id="22377" level="85" type="Folk" name="Lesser Giant Bowman">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="4028" /> <!-- Giant Cannon - Not Available - Not Available -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="13378" hpRegen="10.5" mp="2928" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="30" />
+			<height normal="44" />
+		</collision>
+	</npc>
+	<npc id="22378" level="85" type="Folk" name="Lesser Giant Wizard">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="3938" /> <!-- Monster Only (Lesser Giant Wizard's Weapon) - Not Available - Not Available -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="13378" hpRegen="10.5" mp="2928" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="22" />
+			<height normal="48.7" />
+		</collision>
+	</npc>
+	<npc id="22379" level="85" type="Folk" name="Lesser Warrior">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="13378" hpRegen="10.5" mp="2928" mpRegen="3.6" />
+			<speed>
+				<walk ground="55" />
+				<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="24" />
+			<height normal="46" />
+		</collision>
+	</npc>
+	<npc id="22380" level="85" type="Folk" name="Lesser Bowman">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15304" /> <!-- Transparent Crossbow (NPC) - Not Available - Not Available -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="13378" hpRegen="10.5" mp="2928" mpRegen="3.6" />
+			<speed>
+				<walk ground="55" />
+				<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="24" />
+			<height normal="42.5" />
+		</collision>
+	</npc>
+	<npc id="22381" level="85" type="Folk" name="Lesser Mage">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="13378" hpRegen="10.5" mp="2928" mpRegen="3.6" />
+			<speed>
+				<walk ground="55" />
+				<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="26.4" />
+			<height normal="52.55" />
+		</collision>
+	</npc>
+	<npc id="22382" level="85" type="Folk" name="Lesser Hunter">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="13378" hpRegen="10.5" mp="2928" mpRegen="3.6" />
+			<speed>
+				<walk ground="55" />
+				<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="22" />
+			<height normal="40.78" />
+		</collision>
+	</npc>
+	<npc id="22383" level="85" type="Folk" name="Evolved Lesser Giant Mercenary">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="35738" hpRegen="10.5" mp="11928" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="27" />
+			<height normal="52.8" />
+		</collision>
+	</npc>
+	<npc id="22384" level="85" type="Folk" name="Evolved Lesser Giant Commander">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="96718" /> <!-- Monster Only (Lesser Giant A) - Not Available -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="35738" hpRegen="10.5" mp="11928" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<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="29.25" />
+			<height normal="51.99" />
+		</collision>
+	</npc>
+	<npc id="22385" level="85" type="Folk" name="Evolved Lesser Giant Elder">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="96719" /> <!-- Monster Only (Lesser Giant Wizard's Weapon A) - Not Available -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="35738" hpRegen="10.5" mp="11928" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="22" />
+			<height normal="48.7" />
+		</collision>
+	</npc>
+	<npc id="22386" level="85" type="Folk" name="Evolved Lesser Giant Shooter">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="4028" /> <!-- Giant Cannon - Not Available - Not Available -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="35738" hpRegen="10.5" mp="11928" mpRegen="3.6" />
+			<speed>
+				<walk ground="80" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="39" />
+			<height normal="58.1" />
+		</collision>
+	</npc>
+	<npc id="22387" level="85" type="Folk" name="Baron's Warrior">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="35738" hpRegen="10.5" mp="11928" mpRegen="3.6" />
+			<speed>
+				<walk ground="55" />
+				<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="24" />
+			<height normal="46" />
+		</collision>
+	</npc>
+	<npc id="22388" level="85" type="Folk" name="Baron's Templar">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="35738" hpRegen="10.5" mp="11928" mpRegen="3.6" />
+			<speed>
+				<walk ground="55" />
+				<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="26.4" />
+			<height normal="52.55" />
+		</collision>
+	</npc>
+	<npc id="22389" level="85" type="Folk" name="Baron's Ranger">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="15304" /> <!-- Transparent Crossbow (NPC) - Not Available - Not Available -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="35738" hpRegen="10.5" mp="11928" mpRegen="3.6" />
+			<speed>
+				<walk ground="55" />
+				<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="24" />
+			<height normal="42.5" />
+		</collision>
+	</npc>
+	<npc id="22390" level="85" type="Folk" name="Baron's Puncher">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="35738" hpRegen="10.5" mp="11928" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="32" />
+			<height normal="51" />
+		</collision>
+	</npc>
+	<npc id="22391" level="85" type="Folk" name="Mansion 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="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="55" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="15" />
+			<height normal="28.7" />
+		</collision>
+	</npc>
+	<npc id="22392" level="85" type="Folk" name="Touchy Servant">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="25" />
+			<height normal="32" />
+		</collision>
+	</npc>
+	<npc id="22393" level="85" type="Folk" name="Housekeeper">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="33" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="9" />
+			<height normal="21.6" />
+		</collision>
+	</npc>
+	<npc id="22394" level="85" type="Folk" name="Cursed 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="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="18" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="8" />
+			<height normal="17" />
+		</collision>
+	</npc>
+	<npc id="22395" level="85" type="Folk" name="Guardian Angel of the Holy Grail">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="47" />
+		</collision>
+	</npc>
+	<npc id="22396" level="85" type="Folk" name="Guardian Angel of the Holy Grail">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="11" />
+			<height normal="38.5" />
+		</collision>
+	</npc>
+	<npc id="22397" level="85" type="Folk" name="Guardian Angel of the Holy Grail">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="13" />
+			<height normal="47" />
+		</collision>
+	</npc>
+	<npc id="22398" level="85" type="Folk" name="Guardian Angel of the Holy Grail">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="8" />
+			<height normal="30" />
+		</collision>
+	</npc>
+	<npc id="22399" level="85" type="Folk" name="Ancient Swordsman">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="30" />
+			<height normal="51" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22400-22499.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22400-22499.xml
new file mode 100644
index 0000000000..f1a57fe9c3
--- /dev/null
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/22400-22499.xml
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
+	<npc id="22400" level="85" type="Folk" name="Ancient Thrower">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="35" />
+			<height normal="54" />
+		</collision>
+	</npc>
+	<npc id="22401" level="85" type="Folk" name="Ancient 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="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="40" />
+			<height normal="60" />
+		</collision>
+	</npc>
+	<npc id="22402" level="85" type="Folk" name="Ancient Guard 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="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="65" />
+			<height normal="84" />
+		</collision>
+	</npc>
+	<npc id="22403" level="85" type="Folk" name="Red Draconid Mage">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="92" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="28" />
+			<height normal="39.5" />
+		</collision>
+	</npc>
+	<npc id="22404" level="85" type="Folk" name="Red Draconid Warrior">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="55" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="28" />
+			<height normal="46.5" />
+		</collision>
+	</npc>
+	<npc id="22405" level="85" type="Folk" name="Red Draconid Hero">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="89" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="25" />
+			<height normal="46.5" />
+		</collision>
+	</npc>
+	<npc id="22406" level="85" type="Folk" name="Red Draconid Lieutenant">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="36" />
+			<height normal="51" />
+		</collision>
+	</npc>
+	<npc id="22407" level="85" type="Folk" name="Cat 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="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="20" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10" />
+			<height normal="17" />
+		</collision>
+	</npc>
+	<npc id="22408" level="85" type="Folk" name="Cat Mage">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="20" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="10" />
+			<height normal="18.5" />
+		</collision>
+	</npc>
+	<npc id="22409" level="85" type="Folk" name="Cat Warrior">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="12" />
+			<height normal="16.75" />
+		</collision>
+	</npc>
+	<npc id="22410" level="85" type="Folk" name="Cat Warlock">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="23498" hpRegen="10.5" mp="11502" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="12" />
+			<height normal="15.9" />
+		</collision>
+	</npc>
+	<npc id="22411" level="85" type="Folk" name="Baron's Overlord">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="35738" hpRegen="10.5" mp="11928" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="140" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="32" />
+			<height normal="51" />
+		</collision>
+	</npc>
+	<npc id="22412" level="85" type="Folk" name="Evolved Lesser Giant Lord">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="35738" hpRegen="10.5" mp="11928" 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="45" />
+			<height normal="54.15" />
+		</collision>
+	</npc>
+</list>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/23900-23999.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/23900-23999.xml
index 3b48c050ae..a8ffe65a81 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/23900-23999.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/23900-23999.xml
@@ -1415,7 +1415,7 @@
 			<height normal="36.5" />
 		</collision>
 	</npc>
-	<npc id="23962" level="80" type="Folk" name="Baby Golden Pig">
+	<npc id="23962" level="80" type="Folk" name="Golden Piglet">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -1775,7 +1775,7 @@
 			<height normal="36.5" />
 		</collision>
 	</npc>
-	<npc id="23977" level="80" type="Folk" name="Baby Golden Pig">
+	<npc id="23977" level="80" type="Folk" name="Golden Piglet">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -1996,7 +1996,7 @@
 			<height normal="22.4" />
 		</collision>
 	</npc>
-	<npc id="23987" level="80" type="Folk" name="Kain Van Halter" title="Prince of the Second Dimension">
+	<npc id="23987" level="80" type="Folk" name="Kain van Halter" title="Prince of the Second Dimension">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/24000-24099.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/24000-24099.xml
index 1e786dcd56..aebe2e8801 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/24000-24099.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/24000-24099.xml
@@ -23,7 +23,7 @@
 			<height normal="22.4" />
 		</collision>
 	</npc>
-	<npc id="24001" level="80" type="Folk" name="Kain Van Halter" title="Prince of the Second Dimension">
+	<npc id="24001" level="80" type="Folk" name="Kain van Halter" title="Prince of the Second Dimension">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -311,7 +311,7 @@
 			<height normal="37.5" />
 		</collision>
 	</npc>
-	<npc id="24014" level="66" type="Monster" name="Vanor" title="Mercenary of Glory" element="WIND">
+	<npc id="24014" level="66" type="Monster" name="Vanor" element="WIND">
 		<race>HUMANOID</race>
 		<sex>FEMALE</sex>
 		<acquire exp="5007" sp="459" attributeExp="23" />
@@ -708,7 +708,7 @@
 			<skill id="4416" level="2" /> <!-- Magical Creatures -->
 		</skillList>
 	</npc>
-	<npc id="24024" level="80" type="Folk" name="Hunter" title="Ancient Marauder">
+	<npc id="24024" level="80" type="Folk" name="Hunter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1202,7 +1202,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="24033" level="71" type="Monster" name="Guardian Spirit" element="FIRE">
+	<npc id="24033" level="71" type="Monster" name="Guardian's Spirit" element="FIRE">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25000-25099.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25000-25099.xml
index 3205f062f8..fc14b00797 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25000-25099.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25000-25099.xml
@@ -57,7 +57,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25002" level="22" type="Monster" name="Kutus' Escort" title="Raid Fighter">
+	<npc id="25002" level="22" type="Monster" name="Kutus' Escort" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4191" level="2" />
 			<skill name="Debuff_a" id="4198" level="2" />
@@ -98,7 +98,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="25003" level="22" type="Monster" name="Kutus' Pawn" title="Raid Fighter">
+	<npc id="25003" level="22" type="Monster" name="Kutus' Pawn" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4727" level="2" />
 		</parameters>
@@ -137,7 +137,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="25004" level="70" type="RaidBoss" name="Turek Mercenary Captain" title="Raid Boss">
+	<npc id="25004" level="70" type="RaidBoss" name="Turek Mercenary Captain" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25005" count="3" respawnTime="360" weightPoint="1" />
@@ -187,7 +187,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25005" level="69" type="Monster" name="Turek Mercenary Archer" title="Raid Fighter">
+	<npc id="25005" level="69" type="Monster" name="Turek Mercenary Archer" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4754" level="2" />
 		</parameters>
@@ -230,7 +230,7 @@
 			<height normal="39" />
 		</collision>
 	</npc>
-	<npc id="25006" level="69" type="Monster" name="Turek Mercenary Warrior" title="Raid Fighter">
+	<npc id="25006" level="69" type="Monster" name="Turek Mercenary Warrior" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="2" /> <!-- Long Sword -->
@@ -269,7 +269,7 @@
 			<height normal="33" grown="26.4" />
 		</collision>
 	</npc>
-	<npc id="25007" level="50" type="RaidBoss" name="Retreat Spider Cletu" title="Raid Boss">
+	<npc id="25007" level="50" type="RaidBoss" name="Retreat Spider Cletu" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25008" count="2" respawnTime="360" weightPoint="1" />
@@ -312,7 +312,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25008" level="41" type="Monster" name="Cletu's Confidant" title="Raid Fighter">
+	<npc id="25008" level="41" type="Monster" name="Cletu's Confidant" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4780" level="3" />
 			<skill name="SelfRangeBuff_a" id="4214" level="3" />
@@ -352,7 +352,7 @@
 			<height normal="25.5" />
 		</collision>
 	</npc>
-	<npc id="25009" level="41" type="Monster" name="Cletu's Pawn" title="Raid Fighter">
+	<npc id="25009" level="41" type="Monster" name="Cletu's Pawn" title="Minion">
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -386,7 +386,7 @@
 			<height normal="25.5" />
 		</collision>
 	</npc>
-	<npc id="25010" level="55" type="RaidBoss" name="Furious Thieles" title="Raid Boss">
+	<npc id="25010" level="55" type="RaidBoss" name="Furious Thieles" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25011" count="3" respawnTime="360" weightPoint="1" /> <!-- Guard of Thieles -->
@@ -431,7 +431,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25011" level="54" type="Monster" name="Thieles' Escort" title="Raid Fighter">
+	<npc id="25011" level="54" type="Monster" name="Thieles' Escort" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4760" level="5" /> <!-- Stun -->
 		</parameters>
@@ -469,7 +469,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="25012" level="54" type="Monster" name="Thieles' Follower" title="Raid Fighter">
+	<npc id="25012" level="54" type="Monster" name="Thieles' Follower" title="Minion">
 		<race>FAIRY</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -502,7 +502,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="25013" level="80" type="RaidBoss" name="Ghost of Peasant Captain" title="Raid Boss">
+	<npc id="25013" level="80" type="RaidBoss" name="Reber" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25014" count="1" respawnTime="360" weightPoint="1" />
@@ -556,7 +556,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25014" level="49" type="Monster" name="Ghost of Peasant" title="Raid Fighter">
+	<npc id="25014" level="49" type="Monster" name="Ghost of Peasant" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4720" level="4" />
 		</parameters>
@@ -597,7 +597,7 @@
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
-	<npc id="25015" level="49" type="Monster" name="Ghost of Peasant" title="Raid Fighter">
+	<npc id="25015" level="49" type="Monster" name="Ghost of Peasant" title="Minion">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="14" /> <!-- Bow -->
@@ -634,7 +634,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25016" level="60" type="RaidBoss" name="The 3rd Underwater Guardian" title="Raid Boss">
+	<npc id="25016" level="60" type="RaidBoss" name="Third Underwater Guardian" title="Raid Boss">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25017" count="2" respawnTime="360" weightPoint="1" />
@@ -680,7 +680,7 @@
 			<height normal="73" />
 		</collision>
 	</npc>
-	<npc id="25017" level="59" type="Monster" name="Escort of the 3rd Guardian" title="Raid Fighter">
+	<npc id="25017" level="59" type="Monster" name="Escort of the 3rd Guardian" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4784" level="5" />
 			<skill name="SelfRangeBuff_a" id="4213" level="5" />
@@ -720,7 +720,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="25018" level="59" type="Monster" name="Support of the 3rd Guardian" title="Raid Fighter">
+	<npc id="25018" level="59" type="Monster" name="Support of the 3rd Guardian" title="Minion">
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -806,7 +806,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25020" level="50" type="RaidBoss" name="Warlock Pastu" title="Raid Boss">
+	<npc id="25020" level="50" type="RaidBoss" name="Warlock Pastu" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25021" count="2" respawnTime="360" weightPoint="1" />
@@ -851,7 +851,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25021" level="33" type="Monster" name="Pastu's Silhouette" title="Raid Fighter">
+	<npc id="25021" level="33" type="Monster" name="Pastu's Silhouette" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4786" level="3" />
 			<skill name="SelfRangeBuff_a" id="4211" level="3" />
@@ -893,7 +893,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="25022" level="33" type="Monster" name="Pastu's Shadow" title="Raid Fighter">
+	<npc id="25022" level="33" type="Monster" name="Pastu's Shadow" title="Minion">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -992,7 +992,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25024" level="33" type="Monster" name="Jeruna's Escort Captain" title="Raid Fighter">
+	<npc id="25024" level="33" type="Monster" name="Jeruna's Escort Captain" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4730" level="3" />
 		</parameters>
@@ -1031,7 +1031,7 @@
 			<height normal="24" grown="26.4" />
 		</collision>
 	</npc>
-	<npc id="25025" level="33" type="Monster" name="Jeruna's Escort" title="Raid Fighter">
+	<npc id="25025" level="33" type="Monster" name="Jeruna's Escort" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="144" /> <!-- Sword of Occult -->
@@ -1066,7 +1066,7 @@
 			<height normal="25" grown="30.8" />
 		</collision>
 	</npc>
-	<npc id="25026" level="75" type="RaidBoss" name="Atis" title="Raid Boss">
+	<npc id="25026" level="75" type="RaidBoss" name="Atis" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25027" count="3" respawnTime="360" weightPoint="1" />
@@ -1113,7 +1113,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25027" level="74" type="Monster" name="Ketra Marksman" title="Raid Fighter">
+	<npc id="25027" level="74" type="Monster" name="Ketra Marksman" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4761" level="4" />
 		</parameters>
@@ -1152,7 +1152,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25028" level="74" type="Monster" name="Ketra Raider" title="Raid Fighter">
+	<npc id="25028" level="74" type="Monster" name="Ketra Raider" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="128" /> <!-- Knight's Sword -->
@@ -1233,7 +1233,7 @@
 			<height normal="96" />
 		</collision>
 	</npc>
-	<npc id="25030" level="52" type="Monster" name="Atraiban's Top Disciple" title="Raid Fighter">
+	<npc id="25030" level="52" type="Monster" name="Atraiban's Top Disciple" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4784" level="5" />
 			<skill name="SelfRangeBuff_a" id="4212" level="5" />
@@ -1273,7 +1273,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="25031" level="52" type="Monster" name="Atraiban's Disciple" title="Raid Fighter">
+	<npc id="25031" level="52" type="Monster" name="Atraiban's Disciple" title="Minion">
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -1356,7 +1356,7 @@
 			<height normal="38" />
 		</collision>
 	</npc>
-	<npc id="25033" level="57" type="Monster" name="Millenu Escort Wizard" title="Raid Fighter">
+	<npc id="25033" level="57" type="Monster" name="Millenu Escort Wizard" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4193" level="5" />
 			<skill name="Debuff_a" id="4199" level="5" />
@@ -1397,7 +1397,7 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="25034" level="57" type="Monster" name="Millenu Escort Warrior" title="Raid Fighter">
+	<npc id="25034" level="57" type="Monster" name="Millenu Escort Warrior" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4170" level="5" />
 		</parameters>
@@ -1438,7 +1438,7 @@
 			<height normal="28.5" />
 		</collision>
 	</npc>
-	<npc id="25035" level="65" type="RaidBoss" name="Shilen's Messenger Cabrio" title="Raid Boss">
+	<npc id="25035" level="65" type="RaidBoss" name="Shillien's Messenger Cabrio" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25036" count="3" respawnTime="360" weightPoint="1" />
@@ -1499,7 +1499,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25036" level="69" type="Monster" name="Cabrio Captor" title="Raid Fighter">
+	<npc id="25036" level="69" type="Monster" name="Cabrio Captor" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4208" level="6" />
 		</parameters>
@@ -1540,7 +1540,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25037" level="69" type="Monster" name="Cabrio Blader" title="Raid Fighter">
+	<npc id="25037" level="69" type="Monster" name="Cabrio Blader" title="Minion">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<equipment rhand="5129" lhand="5129" /> <!-- Doll Knife / Doll Knife -->
@@ -1639,7 +1639,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25039" level="27" type="Monster" name="Tirak's Escort" title="Raid Fighter">
+	<npc id="25039" level="27" type="Monster" name="Tirak's Escort" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4732" level="2" />
 		</parameters>
@@ -1680,7 +1680,7 @@
 			<height normal="27" grown="34" />
 		</collision>
 	</npc>
-	<npc id="25040" level="27" type="Monster" name="Tirak's Knight" title="Raid Fighter">
+	<npc id="25040" level="27" type="Monster" name="Tirak's Knight" title="Minion">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="2" lhand="945" /> <!-- Long Sword / Skeleton Buckler -->
@@ -1776,7 +1776,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25042" level="34" type="Monster" name="Remmel's Archer" title="Raid Fighter">
+	<npc id="25042" level="34" type="Monster" name="Remmel's Archer" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4757" level="3" />
 		</parameters>
@@ -1815,7 +1815,7 @@
 			<height normal="21.5" />
 		</collision>
 	</npc>
-	<npc id="25043" level="34" type="Monster" name="Remmel's Escort" title="Raid Fighter">
+	<npc id="25043" level="34" type="Monster" name="Remmel's Escort" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="127" /> <!-- Crimson Sword -->
@@ -1850,7 +1850,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="25044" level="75" type="RaidBoss" name="Barion" title="Raid Boss">
+	<npc id="25044" level="75" type="RaidBoss" name="Barion" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25045" count="2" respawnTime="360" weightPoint="1" />
@@ -1902,7 +1902,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25045" level="74" type="Monster" name="Barion's Dark Wizard" title="Raid Fighter">
+	<npc id="25045" level="74" type="Monster" name="Barion's Dark Wizard" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4781" level="4" />
 			<skill name="SelfRangeBuff_a" id="4213" level="4" />
@@ -1943,7 +1943,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="25046" level="74" type="Monster" name="Barion's Soldier" title="Raid Fighter">
+	<npc id="25046" level="74" type="Monster" name="Barion's Soldier" title="Minion">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="129" /> <!-- Sword of Revolution -->
@@ -1980,7 +1980,7 @@
 			<height normal="27" grown="34" />
 		</collision>
 	</npc>
-	<npc id="25047" level="80" type="RaidBoss" name="Karte" title="Raid Boss">
+	<npc id="25047" level="80" type="RaidBoss" name="Karte" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25048" count="1" respawnTime="360" weightPoint="1" />
@@ -2034,7 +2034,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25048" level="48" type="Monster" name="Karte's Chief Knight" title="Raid Fighter">
+	<npc id="25048" level="48" type="Monster" name="Karte's Chief Knight" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4722" level="4" />
 		</parameters>
@@ -2075,7 +2075,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="25049" level="48" type="Monster" name="Karte's Royal Guards" title="Raid Fighter">
+	<npc id="25049" level="48" type="Monster" name="Karte's Royal Guards" title="Minion">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="74" /> <!-- Katana -->
@@ -2112,7 +2112,7 @@
 			<height normal="27" grown="34" />
 		</collision>
 	</npc>
-	<npc id="25050" level="80" type="RaidBoss" name="Verfa" title="Raid Boss">
+	<npc id="25050" level="80" type="RaidBoss" name="Verfa" title="Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm01_A" />
 			<skill name="SelfBuff_a" id="4176" level="5" />
@@ -2159,7 +2159,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25051" level="75" type="RaidBoss" name="Rahha" title="Raid Boss">
+	<npc id="25051" level="75" type="RaidBoss" name="Rahha" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25052" count="2" respawnTime="360" weightPoint="1" />
@@ -2206,7 +2206,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25052" level="74" type="Monster" name="Priestess of Rahha" title="Raid Fighter">
+	<npc id="25052" level="74" type="Monster" name="Priestess of Rahha" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4785" level="6" />
 			<skill name="SelfRangeBuff_a" id="4213" level="6" />
@@ -2246,7 +2246,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="25053" level="74" type="Monster" name="Fanatics of Rahha" title="Raid Fighter">
+	<npc id="25053" level="74" type="Monster" name="Fanatics of Rahha" title="Minion">
 		<race>BEAST</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -2280,7 +2280,7 @@
 			<height normal="42" />
 		</collision>
 	</npc>
-	<npc id="25054" level="83" type="RaidBoss" name="Kernon" title="Raid Boss">
+	<npc id="25054" level="83" type="RaidBoss" name="Kernon" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25055" count="1" respawnTime="360" weightPoint="1" />
@@ -2386,7 +2386,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25055" level="81" type="Monster" name="Taliadon" title="Raid Fighter">
+	<npc id="25055" level="81" type="Monster" name="Taliadon" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4168" level="7" />
 		</parameters>
@@ -2427,7 +2427,7 @@
 			<height normal="45" grown="52" />
 		</collision>
 	</npc>
-	<npc id="25056" level="82" type="Monster" name="Vemsk" title="Raid Fighter">
+	<npc id="25056" level="82" type="Monster" name="Vemsk" title="Minion">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="142" /> <!-- Keshanberk -->
@@ -2464,7 +2464,7 @@
 			<height normal="31" grown="36" />
 		</collision>
 	</npc>
-	<npc id="25057" level="80" type="RaidBoss" name="Beacon of Blue Sky" title="Raid Boss">
+	<npc id="25057" level="80" type="RaidBoss" name="Beacon of Blue Sky" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25058" count="3" respawnTime="360" weightPoint="1" />
@@ -2511,7 +2511,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25058" level="79" type="Monster" name="Beacon's Shooter" title="Raid Fighter">
+	<npc id="25058" level="79" type="Monster" name="Beacon's Shooter" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4757" level="5" />
 		</parameters>
@@ -2552,7 +2552,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25059" level="79" type="Monster" name="Beacon's Warrior" title="Raid Fighter">
+	<npc id="25059" level="79" type="Monster" name="Beacon's Warrior" title="Minion">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="78" /> <!-- Elemental Sword -->
@@ -2637,7 +2637,7 @@
 			<height normal="75" />
 		</collision>
 	</npc>
-	<npc id="25061" level="23" type="Monster" name="Kael's Bead" title="Raid Fighter">
+	<npc id="25061" level="23" type="Monster" name="Kael's Bead" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4194" level="2" />
 			<skill name="Debuff_a" id="4199" level="2" />
@@ -2677,7 +2677,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="25062" level="23" type="Monster" name="Kael's Escort" title="Raid Fighter">
+	<npc id="25062" level="23" type="Monster" name="Kael's Escort" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4728" level="2" />
 		</parameters>
@@ -2715,7 +2715,7 @@
 			<height normal="42" />
 		</collision>
 	</npc>
-	<npc id="25063" level="55" type="RaidBoss" name="Chertuba of Great Soul" title="Raid Boss">
+	<npc id="25063" level="55" type="RaidBoss" name="Chertuba of Great Soul" title="Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm02_A" />
 			<skill name="SelfBuff_a" id="4173" level="3" />
@@ -2829,7 +2829,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25065" level="39" type="Monster" name="Teruk's Escort" title="Raid Fighter">
+	<npc id="25065" level="39" type="Monster" name="Teruk's Escort" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4722" level="3" />
 		</parameters>
@@ -2868,7 +2868,7 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="25066" level="39" type="Monster" name="Teruk's Knight" title="Raid Fighter">
+	<npc id="25066" level="39" type="Monster" name="Teruk's Knight" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="291" /> <!-- Trident -->
@@ -2903,7 +2903,7 @@
 			<height normal="35" grown="42.2" />
 		</collision>
 	</npc>
-	<npc id="25067" level="60" type="RaidBoss" name="Red Flag Captain Shaka" title="Raid Boss">
+	<npc id="25067" level="60" type="RaidBoss" name="Red Flag Captain Shaka" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25068" count="3" respawnTime="360" weightPoint="1" />
@@ -2948,7 +2948,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25068" level="51" type="Monster" name="Shaka's Sniper" title="Raid Fighter">
+	<npc id="25068" level="51" type="Monster" name="Shaka's Sniper" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4755" level="4" />
 		</parameters>
@@ -2987,7 +2987,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="25069" level="51" type="Monster" name="Shaka's Follower" title="Raid Fighter">
+	<npc id="25069" level="51" type="Monster" name="Shaka's Follower" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="128" />
@@ -3022,7 +3022,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 Valley Lookout Ruell" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25071" count="3" respawnTime="360" weightPoint="1" /> <!-- Ruell's Wind -->
@@ -3067,7 +3067,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25071" level="54" type="Monster" name="Ruell's Wind" title="Raid Fighter">
+	<npc id="25071" level="54" type="Monster" name="Ruell's Wind" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4191" level="5" /> <!-- BOSS Windstrike -->
 			<skill name="Debuff_a" id="4200" level="5" /> <!-- Decrease Atk. Spd. -->
@@ -3106,7 +3106,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="25072" level="54" type="Monster" name="Ruell's Unicorn" title="Raid Fighter">
+	<npc id="25072" level="54" type="Monster" name="Ruell's Unicorn" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4727" level="5" /> <!-- Stun -->
 		</parameters>
@@ -3143,7 +3143,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="25073" level="80" type="RaidBoss" name="Bloody Priest Rudelto" title="Raid Boss">
+	<npc id="25073" level="80" type="RaidBoss" name="Bloody Priest Rudelto" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25074" count="2" respawnTime="360" weightPoint="1" />
@@ -3237,7 +3237,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25074" level="79" type="Monster" name="Rudelto's Banshee" title="Raid Fighter">
+	<npc id="25074" level="79" type="Monster" name="Rudelto's Banshee" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4209" level="6" />
 			<skill name="SelfRangeBuff_a" id="4213" level="6" />
@@ -3279,7 +3279,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="25075" level="68" type="Monster" name="Rudelto's Dre Vanul" title="Raid Fighter">
+	<npc id="25075" level="68" type="Monster" name="Rudelto's Dre Vanul" title="Minion">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -3315,7 +3315,7 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="25076" level="30" type="RaidBoss" name="Princess Molrang" title="Raid Boss">
+	<npc id="25076" level="30" type="RaidBoss" name="Princess Molrang" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25077" count="1" respawnTime="360" weightPoint="1" />
@@ -3361,7 +3361,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25077" level="24" type="Monster" name="Escort Captain Dogun" title="Raid Fighter">
+	<npc id="25077" level="24" type="Monster" name="Escort Captain Dogun" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4732" level="2" />
 		</parameters>
@@ -3399,7 +3399,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="25078" level="24" type="Monster" name="Princess' Escort" title="Raid Fighter">
+	<npc id="25078" level="24" type="Monster" name="Princess' Escort" title="Minion">
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -3433,7 +3433,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="25079" level="40" type="RaidBoss" name="Cat's Eye" title="Raid Boss">
+	<npc id="25079" level="40" type="RaidBoss" name="Cat's Eye" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25080" count="2" respawnTime="360" weightPoint="1" />
@@ -3474,7 +3474,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25080" level="29" type="Monster" name="Mercenary" title="Raid Fighter">
+	<npc id="25080" level="29" type="Monster" name="Mercenary" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4785" level="2" />
 			<skill name="SelfRangeBuff_a" id="4211" level="2" />
@@ -3515,7 +3515,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="25081" level="15" type="Monster" name="Cat's Eye Bandit" title="Raid Fighter">
+	<npc id="25081" level="15" type="Monster" name="Cat's Eye Bandit" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="218" /> <!-- Throwing Knife -->
@@ -3619,7 +3619,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25083" level="38" type="Monster" name="Cat Gang" title="Raid Fighter">
+	<npc id="25083" level="38" type="Monster" name="Cat Gang" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4196" level="3" />
 			<skill name="Debuff_a" id="4200" level="3" />
@@ -3659,7 +3659,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="25084" level="38" type="Monster" name="Cat Gang" title="Raid Fighter">
+	<npc id="25084" level="38" type="Monster" name="Cat Gang" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4727" level="3" />
 		</parameters>
@@ -3697,7 +3697,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="25085" level="55" type="RaidBoss" name="Great Spirit Timak" title="Raid Boss">
+	<npc id="25085" level="55" type="RaidBoss" name="Great Spirit Timak" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25086" count="3" respawnTime="360" weightPoint="1" />
@@ -3744,7 +3744,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25086" level="43" type="Monster" name="Timak Orc Ranger" title="Raid Fighter">
+	<npc id="25086" level="43" type="Monster" name="Timak Orc Ranger" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4760" level="4" />
 		</parameters>
@@ -3783,7 +3783,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25087" level="43" type="Monster" name="Timak Orc Ranger" title="Raid Fighter">
+	<npc id="25087" level="43" type="Monster" name="Timak Orc Ranger" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="68" /> <!-- Falchion -->
@@ -3818,7 +3818,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="25088" level="43" type="RaidBoss" name="Crazy Mechanic Golem" title="Raid Boss">
+	<npc id="25088" level="43" type="RaidBoss" name="Crazy Mechanical Golem" title="Raid Boss">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm01_A" />
 			<skill name="SelfBuff_a" id="4176" level="5" />
@@ -3964,7 +3964,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25090" level="58" type="Monster" name="Soulless Wolf" title="Raid Fighter">
+	<npc id="25090" level="58" type="Monster" name="Soulless Wolf" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4193" level="5" />
 			<skill name="Debuff_a" id="4205" level="5" />
@@ -4004,7 +4004,7 @@
 			<height normal="11" />
 		</collision>
 	</npc>
-	<npc id="25091" level="58" type="Monster" name="Soulless Bear" title="Raid Fighter">
+	<npc id="25091" level="58" type="Monster" name="Soulless Bear" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4726" level="5" />
 		</parameters>
@@ -4042,7 +4042,7 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="25092" level="83" type="RaidBoss" name="Korim" title="Raid Boss">
+	<npc id="25092" level="83" type="RaidBoss" name="Korim" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25093" count="1" respawnTime="360" weightPoint="1" />
@@ -4148,7 +4148,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25093" level="79" type="Monster" name="Korim Guard Captain Kaywon" title="Raid Fighter">
+	<npc id="25093" level="79" type="Monster" name="Korim Guard Captain Kaywon" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4720" level="6" />
 		</parameters>
@@ -4187,7 +4187,7 @@
 			<height normal="31" />
 		</collision>
 	</npc>
-	<npc id="25094" level="79" type="Monster" name="Korim Guards" title="Raid Fighter">
+	<npc id="25094" level="79" type="Monster" name="Korim Guards" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="86" /> <!-- Tomahawk -->
@@ -4222,7 +4222,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="25095" level="75" type="RaidBoss" name="Renoa" title="Raid Boss">
+	<npc id="25095" level="75" type="RaidBoss" name="Renoa" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25096" count="3" respawnTime="360" weightPoint="1" />
@@ -4270,7 +4270,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25096" level="74" type="Monster" name="Renoa's Elpy" title="Raid Fighter">
+	<npc id="25096" level="74" type="Monster" name="Renoa's Elpy" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4193" level="2" />
 			<skill name="Debuff_a" id="4199" level="2" />
@@ -4309,7 +4309,7 @@
 			<height normal="4.5" />
 		</collision>
 	</npc>
-	<npc id="25097" level="74" type="Monster" name="Renoa's Hog" title="Raid Fighter">
+	<npc id="25097" level="74" type="Monster" name="Renoa's Hog" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4727" level="2" />
 		</parameters>
@@ -4347,7 +4347,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25098" level="60" type="RaidBoss" name="Sejarr's Servant" title="Raid Boss">
+	<npc id="25098" level="60" type="RaidBoss" name="Sejarr�s Servant" title="Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm03_A" />
 			<skill name="SelfBuff_a" id="4173" level="3" />
@@ -4393,7 +4393,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25099" level="75" type="RaidBoss" name="Repiro" title="Raid Boss">
+	<npc id="25099" level="75" type="RaidBoss" name="Repiro" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25100" count="2" respawnTime="360" weightPoint="1" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25100-25199.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25100-25199.xml
index 51aabb6c43..d45979ff32 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25100-25199.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25100-25199.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="25100" level="55" type="Monster" name="Spirit of the Sea of Spores" title="Raid Fighter">
+	<npc id="25100" level="55" type="Monster" name="Spirit of the Sea of Spores" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4782" level="4" />
 			<skill name="SelfRangeBuff_a" id="4213" level="4" />
@@ -40,7 +40,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="25101" level="55" type="Monster" name="Warrior of the Sea of Spores" title="Raid Fighter">
+	<npc id="25101" level="55" type="Monster" name="Warrior of the Sea of Spores" title="Minion">
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -74,7 +74,7 @@
 			<height normal="35" grown="43" />
 		</collision>
 	</npc>
-	<npc id="25102" level="65" type="RaidBoss" name="Shacram" title="Raid Boss">
+	<npc id="25102" level="65" type="RaidBoss" name="Shacram" title="Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm01_A" />
 			<skill name="SelfBuff_a" id="4175" level="5" />
@@ -119,7 +119,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25103" level="70" type="RaidBoss" name="Wizard Isirr" title="Raid Boss">
+	<npc id="25103" level="70" type="RaidBoss" name="Wizard Isirr" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25104" count="1" respawnTime="360" weightPoint="1" />
@@ -207,7 +207,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25104" level="54" type="Monster" name="Isirr's Escort" title="Raid Fighter">
+	<npc id="25104" level="54" type="Monster" name="Isirr's Escort" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4722" level="5" />
 		</parameters>
@@ -246,7 +246,7 @@
 			<height normal="35" grown="42.2" />
 		</collision>
 	</npc>
-	<npc id="25105" level="54" type="Monster" name="Isirr's Escorts" title="Raid Fighter">
+	<npc id="25105" level="54" type="Monster" name="Isirr's Escorts" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="131" /> <!-- Spirit Sword -->
@@ -378,7 +378,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25107" level="59" type="Monster" name="Lidia's Archer" title="Raid Fighter">
+	<npc id="25107" level="59" type="Monster" name="Lidia's Archer" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4761" level="5" />
 		</parameters>
@@ -419,7 +419,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25108" level="59" type="Monster" name="Lidia's Warrior" title="Raid Fighter">
+	<npc id="25108" level="59" type="Monster" name="Lidia's Warrior" title="Minion">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="1472" /> <!-- Dreadbane -->
@@ -456,7 +456,7 @@
 			<height normal="45" grown="52" />
 		</collision>
 	</npc>
-	<npc id="25109" level="80" type="RaidBoss" name="Antharas Priest Cloe" title="Raid Boss">
+	<npc id="25109" level="80" type="RaidBoss" name="Antharas Priest Cloe" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25110" count="3" respawnTime="360" weightPoint="1" />
@@ -550,7 +550,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25110" level="79" type="Monster" name="Cloe's Servitor" title="Raid Fighter">
+	<npc id="25110" level="79" type="Monster" name="Cloe's Servitor" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4194" level="7" />
 			<skill name="Debuff_a" id="4200" level="7" />
@@ -592,7 +592,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="25111" level="79" type="Monster" name="Cloe's Servitor" title="Raid Fighter">
+	<npc id="25111" level="79" type="Monster" name="Cloe's Servitor" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4170" level="7" />
 		</parameters>
@@ -689,7 +689,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25113" level="29" type="Monster" name="Meana's Maid" title="Raid Fighter">
+	<npc id="25113" level="29" type="Monster" name="Meana's Maid" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4192" level="2" />
 			<skill name="Debuff_a" id="4199" level="2" />
@@ -731,7 +731,7 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="25114" level="29" type="Monster" name="Meana's Guard Doll" title="Raid Fighter">
+	<npc id="25114" level="29" type="Monster" name="Meana's Guard Doll" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4726" level="2" />
 		</parameters>
@@ -816,7 +816,7 @@
 			<height normal="45" />
 		</collision>
 	</npc>
-	<npc id="25116" level="39" type="Monster" name="Icarus Sample 2" title="Raid Fighter">
+	<npc id="25116" level="39" type="Monster" name="Icarus Sample 2" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4755" level="3" />
 		</parameters>
@@ -855,7 +855,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25117" level="39" type="Monster" name="Icarus Sample 3" title="Raid Fighter">
+	<npc id="25117" level="39" type="Monster" name="Icarus Sample 3" title="Minion">
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -889,7 +889,7 @@
 			<height normal="20" grown="24" />
 		</collision>
 	</npc>
-	<npc id="25118" level="35" type="RaidBoss" name="Execution Grounds Watchman Guillotine" title="Raid Boss">
+	<npc id="25118" level="35" type="RaidBoss" name="Execution Grounds Watchman Guillotine" title="Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm02_A" />
 			<skill name="SelfBuff_a" id="4175" level="4" />
@@ -1026,7 +1026,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25120" level="49" type="Monster" name="Berun's Servant" title="Raid Fighter">
+	<npc id="25120" level="49" type="Monster" name="Berun's Servant" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4191" level="4" /> <!-- BOSS Windstrike -->
 			<skill name="Debuff_a" id="4199" level="4" /> <!-- Decrease P. Atk. -->
@@ -1066,7 +1066,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="25121" level="49" type="Monster" name="Berun's Prattler" title="Raid Fighter">
+	<npc id="25121" level="49" type="Monster" name="Berun's Prattler" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4170" level="4" /> <!-- BOSS Mortal Blow -->
 		</parameters>
@@ -1103,7 +1103,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="25122" level="65" type="RaidBoss" name="Refugee Applicant Leo" title="Raid Boss">
+	<npc id="25122" level="65" type="RaidBoss" name="Refugee Applicant Leo" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25123" count="1" respawnTime="360" weightPoint="1" />
@@ -1154,7 +1154,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25123" level="55" type="Monster" name="Leo's Servant" title="Raid Fighter">
+	<npc id="25123" level="55" type="Monster" name="Leo's Servant" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4727" level="5" />
 		</parameters>
@@ -1193,7 +1193,7 @@
 			<height normal="44" />
 		</collision>
 	</npc>
-	<npc id="25124" level="55" type="Monster" name="Leo's Steward" title="Raid Fighter">
+	<npc id="25124" level="55" type="Monster" name="Leo's Steward" title="Minion">
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<equipment rhand="3938" /> <!-- Monster Only (Lesser Giant Wizard's Weapon) -->
@@ -1228,7 +1228,7 @@
 			<height normal="44" />
 		</collision>
 	</npc>
-	<npc id="25125" level="75" type="RaidBoss" name="Fierce Tiger King Angel" title="Raid Boss">
+	<npc id="25125" level="75" type="RaidBoss" name="Tiger King Kata" title="High Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm03_A" />
 			<skill name="SelfBuff_a" id="4176" level="6" />
@@ -1309,7 +1309,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25126" level="83" type="RaidBoss" name="Longhorn Golkonda" title="Raid Boss">
+	<npc id="25126" level="83" type="RaidBoss" name="Longhorn Golkonda" title="High Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm01_A" />
 			<skill name="SelfBuff_a" id="4173" level="7" />
@@ -1409,7 +1409,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25127" level="70" type="RaidBoss" name="Langk Matriarch Rashkos" title="Raid Boss">
+	<npc id="25127" level="70" type="RaidBoss" name="Chief Rashkos" title="High Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm02_A" />
 			<skill name="SelfBuff_a" id="4175" level="3" />
@@ -1494,7 +1494,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25128" level="50" type="RaidBoss" name="Grand Priest Gharmash" title="Raid Boss">
+	<npc id="25128" level="50" type="RaidBoss" name="Grand Priest Gharmash" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25129" count="3" respawnTime="360" weightPoint="1" />
@@ -1539,7 +1539,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25129" level="32" type="Monster" name="Vuku Shaman" title="Raid Fighter">
+	<npc id="25129" level="32" type="Monster" name="Vuku Shaman" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4194" level="3" />
 			<skill name="Debuff_a" id="4203" level="3" />
@@ -1580,7 +1580,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="25130" level="32" type="Monster" name="Gharmash's Pet Trimden" title="Raid Fighter">
+	<npc id="25130" level="32" type="Monster" name="Gharmash's Pet Trimden" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4722" level="3" />
 		</parameters>
@@ -1618,7 +1618,7 @@
 			<height normal="25.5" />
 		</collision>
 	</npc>
-	<npc id="25131" level="60" type="RaidBoss" name="Slaughter Lord Gato" title="Raid Boss">
+	<npc id="25131" level="60" type="RaidBoss" name="Slaughter Lord Gato" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25132" count="3" respawnTime="360" weightPoint="1" />
@@ -1663,7 +1663,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25132" level="49" type="Monster" name="Gato's Sniper" title="Raid Fighter">
+	<npc id="25132" level="49" type="Monster" name="Gato's Sniper" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4761" level="4" />
 		</parameters>
@@ -1702,7 +1702,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="25133" level="49" type="Monster" name="Gato's Troop Captain" title="Raid Fighter">
+	<npc id="25133" level="49" type="Monster" name="Gato's Troop Captain" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="69" /> <!-- Bastard Sword -->
@@ -1737,7 +1737,7 @@
 			<height normal="27" grown="32" />
 		</collision>
 	</npc>
-	<npc id="25134" level="45" type="RaidBoss" name="Spore Talkin" title="Raid Boss">
+	<npc id="25134" level="45" type="RaidBoss" name="Spore Talkin" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25135" count="2" respawnTime="360" weightPoint="1" />
@@ -1779,7 +1779,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25135" level="39" type="Monster" name="Talkin's Priest" title="Raid Fighter">
+	<npc id="25135" level="39" type="Monster" name="Talkin's Priest" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4781" level="4" />
 			<skill name="SelfRangeBuff_a" id="4211" level="4" />
@@ -1820,7 +1820,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="25136" level="39" type="Monster" name="Talkin's Escort" title="Raid Fighter">
+	<npc id="25136" level="39" type="Monster" name="Talkin's Escort" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="16" /> <!-- Great Spear -->
@@ -1924,7 +1924,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25138" level="54" type="Monster" name="Soul Drinker" title="Raid Fighter">
+	<npc id="25138" level="54" type="Monster" name="Soul Drinker" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4191" level="5" />
 			<skill name="Debuff_a" id="4205" level="5" />
@@ -1964,7 +1964,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="25139" level="54" type="Monster" name="Sephia's Salve" title="Raid Fighter">
+	<npc id="25139" level="54" type="Monster" name="Sephia's Salve" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4731" level="5" />
 		</parameters>
@@ -2004,7 +2004,7 @@
 			<height normal="40" grown="48" />
 		</collision>
 	</npc>
-	<npc id="25140" level="80" type="RaidBoss" name="Hekaton Press" title="Raid Boss">
+	<npc id="25140" level="80" type="RaidBoss" name="Hekaton Press" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25141" count="1" respawnTime="360" weightPoint="1" />
@@ -2100,7 +2100,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25141" level="79" type="Monster" name="Hekaton Cottus" title="Raid Fighter">
+	<npc id="25141" level="79" type="Monster" name="Hekaton Cottus" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4720" level="6" />
 		</parameters>
@@ -2138,7 +2138,7 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="25142" level="79" type="Monster" name="Hekaton Chires" title="Raid Fighter">
+	<npc id="25142" level="79" type="Monster" name="Hekaton Chires" title="Minion">
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<equipment rhand="3937" /> <!-- Monster Only (Lesser Giant) -->
@@ -2183,7 +2183,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="25143" level="83" type="RaidBoss" name="Fire of Wrath Shuriel" title="Raid Boss">
+	<npc id="25143" level="83" type="RaidBoss" name="Fire of Wrath Shuriel" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25144" count="2" respawnTime="360" weightPoint="1" />
@@ -2284,7 +2284,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25144" level="79" type="Monster" name="Shuriel's Oracle" title="Raid Fighter">
+	<npc id="25144" level="79" type="Monster" name="Shuriel's Oracle" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4210" level="7" />
 			<skill name="SelfRangeBuff_a" id="4214" level="7" />
@@ -2325,7 +2325,7 @@
 			<height normal="34" />
 		</collision>
 	</npc>
-	<npc id="25145" level="79" type="Monster" name="Shuriel's Paladin" title="Raid Fighter">
+	<npc id="25145" level="79" type="Monster" name="Shuriel's Paladin" title="Minion">
 		<race>DIVINE</race>
 		<sex>MALE</sex>
 		<equipment rhand="73" /> <!-- Tear of Darkness -->
@@ -2360,7 +2360,7 @@
 			<height normal="32" grown="39" />
 		</collision>
 	</npc>
-	<npc id="25146" level="75" type="RaidBoss" name="Cursed Bifrons" title="Raid Boss">
+	<npc id="25146" level="75" type="RaidBoss" name="Cursed Bifrons" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25147" count="3" respawnTime="360" weightPoint="1" />
@@ -2407,7 +2407,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25147" level="20" type="Monster" name="Assassin of Bifrons" title="Raid Fighter">
+	<npc id="25147" level="20" type="Monster" name="Assassin of Bifrons" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4778" level="2" />
 		</parameters>
@@ -2446,7 +2446,7 @@
 			<height normal="22" grown="27" />
 		</collision>
 	</npc>
-	<npc id="25148" level="20" type="Monster" name="Butcher of Bifrons" title="Raid Fighter">
+	<npc id="25148" level="20" type="Monster" name="Butcher of Bifrons" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="16" /> <!-- Great Spear -->
@@ -2481,7 +2481,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="25149" level="65" type="RaidBoss" name="Zombie Lord Crowl" title="Raid Boss">
+	<npc id="25149" level="65" type="RaidBoss" name="Imprisoned Zombie Lord Crowl" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25150" count="3" respawnTime="360" weightPoint="1" />
@@ -2547,7 +2547,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25150" level="24" type="Monster" name="Evil Spirit Archer" title="Raid Fighter">
+	<npc id="25150" level="24" type="Monster" name="Evil Spirit Archer" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4756" level="2" />
 		</parameters>
@@ -2588,7 +2588,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25151" level="24" type="Monster" name="Evil Spirit Warrior" title="Raid Fighter">
+	<npc id="25151" level="24" type="Monster" name="Evil Spirit Warrior" title="Minion">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="946" /> <!-- Skeleton Dagger -->
@@ -2625,7 +2625,7 @@
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
-	<npc id="25152" level="35" type="RaidBoss" name="Cursed Shadir" title="Raid Boss">
+	<npc id="25152" level="35" type="RaidBoss" name="Cursed Shadir" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25153" count="1" respawnTime="360" weightPoint="1" />
@@ -2692,7 +2692,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25153" level="34" type="Monster" name="Claws of Shadar" title="Raid Fighter">
+	<npc id="25153" level="34" type="Monster" name="Claws of Shadar" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4731" level="3" />
 		</parameters>
@@ -2730,7 +2730,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="25154" level="34" type="Monster" name="Whip of Shadar" title="Raid Fighter">
+	<npc id="25154" level="34" type="Monster" name="Whip of Shadar" title="Minion">
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -2766,7 +2766,7 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="25155" level="75" type="RaidBoss" name="Selu" title="Raid Boss">
+	<npc id="25155" level="75" type="RaidBoss" name="Selu" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25156" count="3" respawnTime="360" weightPoint="1" />
@@ -2813,7 +2813,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25156" level="39" type="Monster" name="Fanatic Wizard" title="Raid Fighter">
+	<npc id="25156" level="39" type="Monster" name="Fanatic Wizard" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4194" level="3" />
 			<skill name="Debuff_a" id="4199" level="3" />
@@ -2854,7 +2854,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="25157" level="39" type="Monster" name="Fanatic Soldier" title="Raid Fighter">
+	<npc id="25157" level="39" type="Monster" name="Fanatic Soldier" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4719" level="3" />
 		</parameters>
@@ -2893,7 +2893,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="25158" level="75" type="RaidBoss" name="King Tarlk" title="Raid Boss">
+	<npc id="25158" level="75" type="RaidBoss" name="King Tarlk" title="High Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm01_A" />
 			<skill name="SelfBuff_a" id="4174" level="5" />
@@ -2975,7 +2975,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25159" level="80" type="RaidBoss" name="Paniel the Unicorn" title="Raid Boss">
+	<npc id="25159" level="80" type="RaidBoss" name="Paniel the Unicorn" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25160" count="2" respawnTime="360" weightPoint="1" /> <!-- Rapini the Unicorn -->
@@ -3022,7 +3022,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25160" level="53" type="Monster" name="Rapini the Unicorn" title="Raid Fighter">
+	<npc id="25160" level="53" type="Monster" name="Rapini the Unicorn" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4781" level="5" /> <!-- BOSS Heal -->
 			<skill name="SelfRangeBuff_a" id="4213" level="5" /> <!-- BOSS Haste -->
@@ -3061,7 +3061,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="25161" level="53" type="Monster" name="Ririf the Unicorn" title="Raid Fighter">
+	<npc id="25161" level="53" type="Monster" name="Ririf the Unicorn" title="Minion">
 		<race>ELEMENTAL</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="20">
@@ -3094,7 +3094,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="25162" level="80" type="RaidBoss" name="Giant Marpanak" title="Raid Boss">
+	<npc id="25162" level="80" type="RaidBoss" name="Giant Marpanak" title="High Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm01_A" />
 			<skill name="SelfBuff_a" id="4173" level="6" />
@@ -3186,7 +3186,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25163" level="80" type="RaidBoss" name="Roaring Skylancer" title="Raid Boss">
+	<npc id="25163" level="80" type="RaidBoss" name="Roaring Skylancer" title="Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm01_A" />
 			<skill name="SelfBuff_a" id="4173" level="7" />
@@ -3235,7 +3235,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25166" level="80" type="RaidBoss" name="Ikuntai" title="Raid Boss">
+	<npc id="25166" level="80" type="RaidBoss" name="Ikuntai" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25167" count="2" respawnTime="360" weightPoint="1" />
@@ -3285,7 +3285,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25167" level="24" type="Monster" name="Ikuntai's Servitor" title="Raid Fighter">
+	<npc id="25167" level="24" type="Monster" name="Ikuntai's Servitor" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4780" level="2" />
 			<skill name="SelfRangeBuff_a" id="4214" level="2" />
@@ -3327,7 +3327,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="25168" level="24" type="Monster" name="Ikuntai's Pawn" title="Raid Fighter">
+	<npc id="25168" level="24" type="Monster" name="Ikuntai's Pawn" title="Minion">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="299" /> <!-- Orcish Poleaxe -->
@@ -3364,7 +3364,7 @@
 			<height normal="28" grown="33" />
 		</collision>
 	</npc>
-	<npc id="25169" level="40" type="RaidBoss" name="Ragraman" title="Raid Boss">
+	<npc id="25169" level="40" type="RaidBoss" name="Ragraman" title="Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm02_A" />
 			<skill name="SelfBuff_a" id="4173" level="3" />
@@ -3482,7 +3482,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25171" level="37" type="Monster" name="Hellion's Archers" title="Raid Fighter">
+	<npc id="25171" level="37" type="Monster" name="Hellion's Archers" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4757" level="3" />
 		</parameters>
@@ -3521,7 +3521,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="25172" level="37" type="Monster" name="Hellion's Escort" title="Raid Fighter">
+	<npc id="25172" level="37" type="Monster" name="Hellion's Escort" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="291" /> <!-- Trident -->
@@ -3556,7 +3556,7 @@
 			<height normal="35" grown="42.2" />
 		</collision>
 	</npc>
-	<npc id="25173" level="75" type="RaidBoss" name="Tiger King Karuta" title="Raid Boss">
+	<npc id="25173" level="75" type="RaidBoss" name="Tiger King Karu" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25174" count="2" respawnTime="360" weightPoint="1" />
@@ -3638,7 +3638,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25174" level="44" type="Monster" name="Karuta's Follower" title="Raid Fighter">
+	<npc id="25174" level="44" type="Monster" name="Karu's Follower" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4781" level="4" />
 			<skill name="SelfRangeBuff_a" id="4214" level="4" />
@@ -3679,7 +3679,7 @@
 			<height normal="31.5" grown="38.1" />
 		</collision>
 	</npc>
-	<npc id="25175" level="44" type="Monster" name="Karuta's Subordinate" title="Raid Fighter">
+	<npc id="25175" level="44" type="Monster" name="Karu's Servant" title="Minion">
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -3713,7 +3713,7 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="25176" level="80" type="RaidBoss" name="Black Lily" title="Raid Boss">
+	<npc id="25176" level="80" type="RaidBoss" name="Black Lily" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25177" count="1" respawnTime="360" weightPoint="1" />
@@ -3765,7 +3765,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25177" level="54" type="Monster" name="Guardian Knight of Black Lily" title="Raid Fighter">
+	<npc id="25177" level="54" type="Monster" name="Guardian Knight of Black Lily" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4727" level="5" />
 		</parameters>
@@ -3806,7 +3806,7 @@
 			<height normal="31" grown="36" />
 		</collision>
 	</npc>
-	<npc id="25178" level="54" type="Monster" name="Servitor of Black Lily" title="Raid Fighter">
+	<npc id="25178" level="54" type="Monster" name="Servitor of Black Lily" title="Minion">
 		<race>DEMONIC</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -3889,7 +3889,7 @@
 			<height normal="66" />
 		</collision>
 	</npc>
-	<npc id="25180" level="59" type="Monster" name="Karum's Guard" title="Raid Fighter">
+	<npc id="25180" level="59" type="Monster" name="Karum's Guard" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4193" level="5" />
 			<skill name="Debuff_a" id="4198" level="5" />
@@ -3930,7 +3930,7 @@
 			<height normal="44" />
 		</collision>
 	</npc>
-	<npc id="25181" level="59" type="Monster" name="Karum's Warrior" title="Raid Fighter">
+	<npc id="25181" level="59" type="Monster" name="Karum's Warrior" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4721" level="5" />
 		</parameters>
@@ -4016,7 +4016,7 @@
 			<height normal="180" />
 		</collision>
 	</npc>
-	<npc id="25183" level="58" type="Monster" name="Kuri's Wife" title="Raid Fighter">
+	<npc id="25183" level="58" type="Monster" name="Kuri's Wife" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4786" level="5" />
 			<skill name="SelfRangeBuff_a" id="4213" level="5" />
@@ -4058,7 +4058,7 @@
 			<height normal="40" />
 		</collision>
 	</npc>
-	<npc id="25184" level="58" type="Monster" name="Devil Blader of Chaos" title="Raid Fighter">
+	<npc id="25184" level="58" type="Monster" name="Devil Blader of Chaos" title="Minion">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="1472" /> <!-- Dreadbane -->
@@ -4142,7 +4142,7 @@
 			<height normal="40" grown="48" />
 		</collision>
 	</npc>
-	<npc id="25186" level="34" type="Monster" name="Hellena's Sniper" title="Raid Fighter">
+	<npc id="25186" level="34" type="Monster" name="Hellena's Sniper" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4761" level="3" />
 		</parameters>
@@ -4181,7 +4181,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="25187" level="34" type="Monster" name="Hellena's Soldier" title="Raid Fighter">
+	<npc id="25187" level="34" type="Monster" name="Hellena's Soldier" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="16" /> <!-- Great Spear -->
@@ -4308,7 +4308,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="25190" level="33" type="Monster" name="Mumu's Wizard" title="Raid Fighter">
+	<npc id="25190" level="33" type="Monster" name="Mumu's Wizard" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4194" level="3" />
 			<skill name="Debuff_a" id="4202" level="3" />
@@ -4348,7 +4348,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="25191" level="33" type="Monster" name="Mumu's Warrior" title="Raid Fighter">
+	<npc id="25191" level="33" type="Monster" name="Mumu's Warrior" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4722" level="3" />
 		</parameters>
@@ -4386,7 +4386,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="25192" level="45" type="RaidBoss" name="Earth Protector Panathen" title="Raid Boss">
+	<npc id="25192" level="45" type="RaidBoss" name="Earth Protector Panathen" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25193" count="1" respawnTime="360" weightPoint="1" />
@@ -4433,7 +4433,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25193" level="42" type="Monster" name="Panathen's Knight" title="Raid Fighter">
+	<npc id="25193" level="42" type="Monster" name="Panathen's Knight" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4721" level="4" />
 		</parameters>
@@ -4472,7 +4472,7 @@
 			<height normal="42" grown="50.8" />
 		</collision>
 	</npc>
-	<npc id="25194" level="42" type="Monster" name="Panathen's Protectors" title="Raid Fighter">
+	<npc id="25194" level="42" type="Monster" name="Panathen's Protectors" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="5127" /> <!-- Dailaon Knife -->
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25200-25299.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25200-25299.xml
index 3bc2222958..2b1cb13941 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25200-25299.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25200-25299.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="25200" level="71" type="Monster" name="Sheshark's Family" title="Raid Fighter">
+	<npc id="25200" level="71" type="Monster" name="Sheshark's Family" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4195" level="7" />
 			<skill name="Debuff_a" id="4200" level="7" />
@@ -40,7 +40,7 @@
 			<height normal="50" />
 		</collision>
 	</npc>
-	<npc id="25201" level="71" type="Monster" name="Sheshark's Escort" title="Raid Fighter">
+	<npc id="25201" level="71" type="Monster" name="Sheshark's Escort" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4724" level="7" />
 		</parameters>
@@ -126,7 +126,7 @@
 			<height normal="86" />
 		</collision>
 	</npc>
-	<npc id="25203" level="73" type="Monster" name="Parhit Sha Sobekk" title="Raid Fighter">
+	<npc id="25203" level="73" type="Monster" name="Parhit Sha Sobekk" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4210" level="6" />
 			<skill name="SelfRangeBuff_a" id="4213" level="6" />
@@ -167,7 +167,7 @@
 			<height normal="65" />
 		</collision>
 	</npc>
-	<npc id="25204" level="73" type="Monster" name="Krokian Sha Sobekk" title="Raid Fighter">
+	<npc id="25204" level="73" type="Monster" name="Krokian Sha Sobekk" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="5128" /> <!-- Crokian Blade -->
@@ -254,7 +254,7 @@
 			<height normal="120" />
 		</collision>
 	</npc>
-	<npc id="25206" level="75" type="Monster" name="Ashakiel's Blade" title="Raid Fighter">
+	<npc id="25206" level="75" type="Monster" name="Ashakiel's Blade" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4729" level="8" />
 		</parameters>
@@ -293,7 +293,7 @@
 			<height normal="30" grown="36.5" />
 		</collision>
 	</npc>
-	<npc id="25207" level="75" type="Monster" name="Ashakiel's Rod" title="Raid Fighter">
+	<npc id="25207" level="75" type="Monster" name="Ashakiel's Rod" title="Minion">
 		<race>DIVINE</race>
 		<sex>MALE</sex>
 		<equipment rhand="6718" /> <!-- Monster Only (Einhasad Shaman) -->
@@ -374,7 +374,7 @@
 			<height normal="50" />
 		</collision>
 	</npc>
-	<npc id="25209" level="39" type="Monster" name="Ateka's Shaman" title="Raid Fighter">
+	<npc id="25209" level="39" type="Monster" name="Ateka's Shaman" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4193" level="3" />
 			<skill name="Debuff_a" id="4204" level="3" />
@@ -414,7 +414,7 @@
 			<height normal="50" />
 		</collision>
 	</npc>
-	<npc id="25210" level="39" type="Monster" name="Ateka's Soldier" title="Raid Fighter">
+	<npc id="25210" level="39" type="Monster" name="Ateka's Soldier" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4721" level="3" />
 		</parameters>
@@ -499,7 +499,7 @@
 			<height normal="42" grown="50.8" />
 		</collision>
 	</npc>
-	<npc id="25212" level="35" type="Monster" name="Sebek's Priest" title="Raid Fighter">
+	<npc id="25212" level="35" type="Monster" name="Sebek's Priest" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4756" level="5" />
 		</parameters>
@@ -538,7 +538,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="25213" level="35" type="Monster" name="Sebek's Fanatic" title="Raid Fighter">
+	<npc id="25213" level="35" type="Monster" name="Sebek's Fanatic" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="5127" /> <!-- Dailaon Knife -->
@@ -620,7 +620,7 @@
 			<height normal="44" />
 		</collision>
 	</npc>
-	<npc id="25215" level="39" type="Monster" name="Sika's Mage" title="Raid Fighter">
+	<npc id="25215" level="39" type="Monster" name="Sika's Mage" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4191" level="3" />
 			<skill name="Debuff_a" id="4200" level="3" />
@@ -660,7 +660,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25216" level="39" type="Monster" name="Sika's Warrior" title="Raid Fighter">
+	<npc id="25216" level="39" type="Monster" name="Sika's Warrior" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4732" level="3" />
 		</parameters>
@@ -698,7 +698,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25217" level="75" type="RaidBoss" name="Cursed Kele" title="Raid Boss">
+	<npc id="25217" level="75" type="RaidBoss" name="Cursed Kele" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25218" count="3" respawnTime="360" weightPoint="1" />
@@ -745,7 +745,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25218" level="49" type="Monster" name="Clara's Marksman" title="Raid Fighter">
+	<npc id="25218" level="49" type="Monster" name="Clara's Marksman" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4777" level="4" />
 		</parameters>
@@ -784,7 +784,7 @@
 			<height normal="22" grown="27" />
 		</collision>
 	</npc>
-	<npc id="25219" level="49" type="Monster" name="Clara's Pawn" title="Raid Fighter">
+	<npc id="25219" level="49" type="Monster" name="Clara's Pawn" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="94" /> <!-- Bec de Corbin -->
@@ -819,7 +819,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="25220" level="83" type="RaidBoss" name="Death Lord Hallate" title="Raid Boss">
+	<npc id="25220" level="83" type="RaidBoss" name="Death Lord Hallate" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25221" count="3" respawnTime="360" weightPoint="1" />
@@ -922,7 +922,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25221" level="79" type="Monster" name="Death Mage Krician" title="Raid Fighter">
+	<npc id="25221" level="79" type="Monster" name="Death Mage Krician" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4194" level="7" />
 			<skill name="Debuff_a" id="4204" level="7" />
@@ -965,7 +965,7 @@
 			<height normal="45" grown="52" />
 		</collision>
 	</npc>
-	<npc id="25222" level="79" type="Monster" name="Death Fighter Harik" title="Raid Fighter">
+	<npc id="25222" level="79" type="Monster" name="Death Fighter Harik" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4169" level="7" />
 		</parameters>
@@ -1006,7 +1006,7 @@
 			<height normal="31" grown="36" />
 		</collision>
 	</npc>
-	<npc id="25223" level="65" type="RaidBoss" name="Soul Collector Acheron" title="Raid Boss">
+	<npc id="25223" level="65" type="RaidBoss" name="Soul Collector Acheron" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25224" count="3" respawnTime="360" weightPoint="1" />
@@ -1069,7 +1069,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25224" level="34" type="Monster" name="Soul Slasher" title="Raid Fighter">
+	<npc id="25224" level="34" type="Monster" name="Soul Slasher" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4196" level="3" />
 			<skill name="Debuff_a" id="4203" level="3" />
@@ -1110,7 +1110,7 @@
 			<height normal="35" grown="42" />
 		</collision>
 	</npc>
-	<npc id="25225" level="34" type="Monster" name="Soul Strainer" title="Raid Fighter">
+	<npc id="25225" level="34" type="Monster" name="Soul Strainer" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4727" level="3" />
 		</parameters>
@@ -1149,7 +1149,7 @@
 			<height normal="40" grown="48.5" />
 		</collision>
 	</npc>
-	<npc id="25226" level="65" type="RaidBoss" name="Roaring Lord Kastor" title="Raid Boss">
+	<npc id="25226" level="65" type="RaidBoss" name="Roaring Lord Kastor" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25227" count="2" respawnTime="360" weightPoint="1" />
@@ -1196,7 +1196,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25227" level="61" type="Monster" name="Kastor's Priest" title="Raid Fighter">
+	<npc id="25227" level="61" type="Monster" name="Kastor's Priest" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4779" level="6" />
 			<skill name="SelfRangeBuff_a" id="4213" level="6" />
@@ -1237,7 +1237,7 @@
 			<height normal="34" />
 		</collision>
 	</npc>
-	<npc id="25228" level="61" type="Monster" name="Kastor's Prefect" title="Raid Fighter">
+	<npc id="25228" level="61" type="Monster" name="Kastor's Prefect" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="79" /> <!-- Damascus Sword -->
@@ -1319,7 +1319,7 @@
 			<height normal="108" />
 		</collision>
 	</npc>
-	<npc id="25230" level="70" type="RaidBoss" name="Timak Priest Ragoth" title="Raid Boss">
+	<npc id="25230" level="70" type="RaidBoss" name="Priest Ragoth" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25231" count="1" respawnTime="360" weightPoint="1" />
@@ -1370,7 +1370,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25231" level="56" type="Monster" name="Ragoth' Escort" title="Raid Fighter">
+	<npc id="25231" level="56" type="Monster" name="Ragoth' Escort" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4741" level="5" />
 		</parameters>
@@ -1409,7 +1409,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="25232" level="56" type="Monster" name="Ragoth' Herald" title="Raid Fighter">
+	<npc id="25232" level="56" type="Monster" name="Ragoth' Herald" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="74" /> <!-- Katana -->
@@ -1494,7 +1494,7 @@
 			<height normal="46.5" grown="48.4" />
 		</collision>
 	</npc>
-	<npc id="25234" level="80" type="RaidBoss" name="Ancient Weird Drake" title="Raid Boss">
+	<npc id="25234" level="80" type="RaidBoss" name="Ancient Weird Drake" title="Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm01_A" />
 			<skill name="SelfBuff_a" id="4175" level="6" />
@@ -1588,7 +1588,7 @@
 			<height normal="43.5" />
 		</collision>
 	</npc>
-	<npc id="25236" level="71" type="Monster" name="Kandra's Healer" title="Raid Fighter">
+	<npc id="25236" level="71" type="Monster" name="Kandra's Healer" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4209" level="7" />
 			<skill name="SelfRangeBuff_a" id="4212" level="7" />
@@ -1629,7 +1629,7 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="25237" level="71" type="Monster" name="Kandra's Guard" title="Raid Fighter">
+	<npc id="25237" level="71" type="Monster" name="Kandra's Guard" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="228" /> <!-- Crystal Dagger -->
@@ -1710,7 +1710,7 @@
 			<height normal="150" />
 		</collision>
 	</npc>
-	<npc id="25239" level="58" type="Monster" name="Monstrous Beast of Abyss Brukunt" title="Raid Fighter">
+	<npc id="25239" level="58" type="Monster" name="Monstrous Beast of Abyss Brukunt" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4786" level="5" />
 			<skill name="SelfRangeBuff_a" id="4212" level="5" />
@@ -1749,7 +1749,7 @@
 			<height normal="65" />
 		</collision>
 	</npc>
-	<npc id="25240" level="58" type="Monster" name="Wild Beast of Abyss Brukunt" title="Raid Fighter">
+	<npc id="25240" level="58" type="Monster" name="Wild Beast of Abyss Brukunt" title="Minion">
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -1782,7 +1782,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="25241" level="80" type="RaidBoss" name="Hero Tamash" title="Raid Boss">
+	<npc id="25241" level="80" type="RaidBoss" name="Hero Tamash" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25242" count="3" respawnTime="360" weightPoint="1" />
@@ -1883,7 +1883,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25242" level="54" type="Monster" name="Tamash's Advisor" title="Raid Fighter">
+	<npc id="25242" level="54" type="Monster" name="Tamash's Advisor" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4192" level="5" />
 			<skill name="Debuff_a" id="4204" level="5" />
@@ -1924,7 +1924,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="25243" level="54" type="Monster" name="Tamash's Confidant" title="Raid Fighter">
+	<npc id="25243" level="54" type="Monster" name="Tamash's Confidant" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4730" level="5" />
 		</parameters>
@@ -2061,7 +2061,7 @@
 			<height normal="66" />
 		</collision>
 	</npc>
-	<npc id="25246" level="77" type="Monster" name="Glaki's Henchman" title="Raid Fighter">
+	<npc id="25246" level="77" type="Monster" name="Glaki's Henchman" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4725" level="8" />
 		</parameters>
@@ -2100,7 +2100,7 @@
 			<height normal="44" />
 		</collision>
 	</npc>
-	<npc id="25247" level="77" type="Monster" name="Glaki's Servant" title="Raid Fighter">
+	<npc id="25247" level="77" type="Monster" name="Glaki's Servant" title="Minion">
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<equipment rhand="166" /> <!-- Heavy Mace -->
@@ -2232,7 +2232,7 @@
 			<height normal="47" />
 		</collision>
 	</npc>
-	<npc id="25250" level="74" type="Monster" name="Man-Eating Plant of Palatanos" title="Raid Fighter">
+	<npc id="25250" level="74" type="Monster" name="Man-Eating Plant of Palatanos" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4191" level="7" /> <!-- BOSS Windstrike -->
 			<skill name="Debuff_a" id="4198" level="7" /> <!-- Poison -->
@@ -2272,7 +2272,7 @@
 			<height normal="26" />
 		</collision>
 	</npc>
-	<npc id="25251" level="74" type="Monster" name="Sapling of Palatanos" title="Raid Fighter">
+	<npc id="25251" level="74" type="Monster" name="Sapling of Palatanos" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4739" level="7" /> <!-- BOSS Strike -->
 		</parameters>
@@ -2311,7 +2311,7 @@
 			<height normal="26" />
 		</collision>
 	</npc>
-	<npc id="25252" level="85" type="RaidBoss" name="Palibati Queen Themis" title="Raid Boss">
+	<npc id="25252" level="85" type="RaidBoss" name="Palibati Queen Themis" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25253" count="3" respawnTime="360" weightPoint="1" />
@@ -2393,7 +2393,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25253" level="69" type="Monster" name="Handmaiden of Themis" title="Raid Fighter">
+	<npc id="25253" level="69" type="Monster" name="Handmaiden of Themis" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4192" level="6" />
 			<skill name="Debuff_a" id="4202" level="6" />
@@ -2435,7 +2435,7 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="25254" level="69" type="Monster" name="Themis' Royal Guard" title="Raid Fighter">
+	<npc id="25254" level="69" type="Monster" name="Themis' Royal Guard" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4739" level="6" />
 		</parameters>
@@ -2478,7 +2478,7 @@
 			<height normal="45" grown="52" />
 		</collision>
 	</npc>
-	<npc id="25255" level="80" type="RaidBoss" name="Tiphon" title="Raid Boss">
+	<npc id="25255" level="80" type="RaidBoss" name="Tiphon" title="Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm01_A" />
 			<skill name="SelfBuff_a" id="4175" level="6" />
@@ -2527,7 +2527,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25256" level="70" type="RaidBoss" name="Taik High Prefect Arak" title="Raid Boss">
+	<npc id="25256" level="70" type="RaidBoss" name="High Prefect Arak" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25257" count="3" respawnTime="360" weightPoint="1" />
@@ -2573,7 +2573,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25257" level="59" type="Monster" name="Arak's Archer" title="Raid Fighter">
+	<npc id="25257" level="59" type="Monster" name="Arak's Archer" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4761" level="6" />
 		</parameters>
@@ -2612,7 +2612,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25258" level="59" type="Monster" name="Arak's Footman" title="Raid Fighter">
+	<npc id="25258" level="59" type="Monster" name="Arak's Footman" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="127" /> <!-- Crimson Sword -->
@@ -2693,7 +2693,7 @@
 			<height normal="66" />
 		</collision>
 	</npc>
-	<npc id="25260" level="75" type="RaidBoss" name="Iron Giant Totem" title="Raid Boss">
+	<npc id="25260" level="75" type="RaidBoss" name="Iron Giant Totem" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25261" count="3" respawnTime="360" weightPoint="1" />
@@ -2777,7 +2777,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25261" level="44" type="Monster" name="Totem Guard Archer" title="Raid Fighter">
+	<npc id="25261" level="44" type="Monster" name="Totem Guard Archer" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4760" level="5" />
 		</parameters>
@@ -2816,7 +2816,7 @@
 			<height normal="21.5" />
 		</collision>
 	</npc>
-	<npc id="25262" level="44" type="Monster" name="Totem Guard" title="Raid Fighter">
+	<npc id="25262" level="44" type="Monster" name="Totem Guard" title="Minion">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="215" /> <!-- Doom Dagger -->
@@ -2948,7 +2948,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25264" level="66" type="Monster" name="Kelone's Assassin" title="Raid Fighter">
+	<npc id="25264" level="66" type="Monster" name="Kelone's Assassin" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4191" level="6" /> <!-- BOSS Windstrike -->
 			<skill name="Debuff_a" id="4204" level="6" /> <!-- Bleed -->
@@ -2990,7 +2990,7 @@
 			<height normal="28.5" />
 		</collision>
 	</npc>
-	<npc id="25265" level="66" type="Monster" name="Kelone's Secret Knight" title="Raid Fighter">
+	<npc id="25265" level="66" type="Monster" name="Kelone's Secret Knight" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4725" level="6" /> <!-- Stun -->
 		</parameters>
@@ -3081,7 +3081,7 @@
 			<height normal="31" />
 		</collision>
 	</npc>
-	<npc id="25267" level="74" type="Monster" name="Decarbia's Royal Guard" title="Raid Fighter">
+	<npc id="25267" level="74" type="Monster" name="Decarbia's Royal Guard" title="Minion">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="5286" /> <!-- Berserker Blade -->
@@ -3120,7 +3120,7 @@
 			<height normal="31" grown="36" />
 		</collision>
 	</npc>
-	<npc id="25268" level="74" type="Monster" name="Decarbia's Escort" title="Raid Fighter">
+	<npc id="25268" level="74" type="Monster" name="Decarbia's Escort" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4170" level="7" />
 		</parameters>
@@ -3208,7 +3208,7 @@
 			<height normal="71.5" />
 		</collision>
 	</npc>
-	<npc id="25270" level="69" type="Monster" name="Behemoth Javeliner" title="Raid Fighter">
+	<npc id="25270" level="69" type="Monster" name="Behemoth Javeliner" title="Minion">
 		<parameters>
 			<skill name="LongRangePhysicalSpecial_a" id="4774" level="7" />
 		</parameters>
@@ -3247,7 +3247,7 @@
 			<height normal="22" grown="27" />
 		</collision>
 	</npc>
-	<npc id="25271" level="69" type="Monster" name="Behemoth Flare" title="Raid Fighter">
+	<npc id="25271" level="69" type="Monster" name="Behemoth Flare" title="Minion">
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -3383,7 +3383,7 @@
 			<height normal="46.377" />
 		</collision>
 	</npc>
-	<npc id="25274" level="49" type="Monster" name="Carnabarun" title="Raid Fighter">
+	<npc id="25274" level="49" type="Monster" name="Carnabarun" title="Minion">
 		<parameters>
 			<skill name="DDMagic_a" id="4191" level="4" />
 			<skill name="Debuff_a" id="4198" level="4" />
@@ -3423,7 +3423,7 @@
 			<height normal="20" grown="24" />
 		</collision>
 	</npc>
-	<npc id="25275" level="49" type="Monster" name="Carnassiud" title="Raid Fighter">
+	<npc id="25275" level="49" type="Monster" name="Carnassiud" title="Minion">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4739" level="4" />
 		</parameters>
@@ -3559,7 +3559,7 @@
 			<height normal="64" />
 		</collision>
 	</npc>
-	<npc id="25278" level="49" type="Monster" name="Dead Soul of the Branded" title="Raid Fighter">
+	<npc id="25278" level="49" type="Monster" name="Dead Soul of the Branded" title="Minion">
 		<parameters>
 			<skill name="HealMagic_a" id="4779" level="4" />
 			<skill name="SelfRangeBuff_a" id="4211" level="4" />
@@ -3602,7 +3602,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="25279" level="49" type="Monster" name="Evil Spirit of the Branded" title="Raid Fighter">
+	<npc id="25279" level="49" type="Monster" name="Evil Spirit of the Branded" title="Minion">
 		<race>CONSTRUCT</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25300-25399.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25300-25399.xml
index c5e5309424..b748ece394 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25300-25399.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25300-25399.xml
@@ -1230,7 +1230,7 @@
 			<height normal="25.8" />
 		</collision>
 	</npc>
-	<npc id="25329" level="70" type="Monster" name="Violet" title="Raid Fighter">
+	<npc id="25329" level="70" type="Monster" name="Violette" title="Raid Fighter">
 		<parameters>
 			<skill name="DDMagic_a" id="4193" level="7" />
 			<skill name="Debuff_a" id="4206" level="7" />
@@ -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="Tisha" 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="Tisha's 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="Tisha's 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="Tisha's 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" />
@@ -2861,7 +2861,7 @@
 			<height normal="22" grown="27" />
 		</collision>
 	</npc>
-	<npc id="25365" level="70" type="RaidBoss" name="Patriarch Kuroboros" title="Raid Boss">
+	<npc id="25365" level="70" type="RaidBoss" name="Patriarch Kuroboros" title="High Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm01_A" />
 			<skill name="SelfBuff_a" id="4174" level="2" />
@@ -2945,7 +2945,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25366" level="85" type="RaidBoss" name="Kuroboros' High Priest" title="Raid Boss">
+	<npc id="25366" level="85" type="RaidBoss" name="Kuroboros' High Priest" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25367" count="2" respawnTime="360" weightPoint="1" />
@@ -3102,7 +3102,7 @@
 			<height normal="29" />
 		</collision>
 	</npc>
-	<npc id="25369" level="75" type="RaidBoss" name="Cursed Scavenger" title="Raid Boss">
+	<npc id="25369" level="75" type="RaidBoss" name="Cursed Scavenger" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25370" count="1" respawnTime="360" weightPoint="1" />
@@ -3801,7 +3801,7 @@
 			<height normal="27" grown="34" />
 		</collision>
 	</npc>
-	<npc id="25385" level="75" type="RaidBoss" name="Evil Spirit Tempest" title="Raid Boss">
+	<npc id="25385" level="75" type="RaidBoss" name="Evil Spirit Tempest" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25386" count="1" respawnTime="360" weightPoint="1" />
@@ -3888,7 +3888,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25386" level="35" type="Monster" name="Ghost of the Execution Grounds" title="Raid Fighter">
+	<npc id="25386" level="35" type="Monster" name="Storm Ghost" title="Raid Fighter">
 		<parameters>
 			<skill name="PhysicalSpecial_a" id="4743" level="3" />
 		</parameters>
@@ -3931,7 +3931,7 @@
 			<height normal="31" />
 		</collision>
 	</npc>
-	<npc id="25387" level="35" type="Monster" name="Malignant Spirit of the Execution Grounds" title="Raid Fighter">
+	<npc id="25387" level="35" type="Monster" name="Storm Spirit" title="Raid Fighter">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<equipment rhand="946" /> <!-- Skeleton Dagger -->
@@ -3970,7 +3970,7 @@
 			<height normal="25" grown="31" />
 		</collision>
 	</npc>
-	<npc id="25388" level="60" type="RaidBoss" name="Red Eye Captain Trakia" title="Raid Boss">
+	<npc id="25388" level="60" type="RaidBoss" name="Red Eye Captain Trakia" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25389" count="3" respawnTime="360" weightPoint="1" />
@@ -4140,7 +4140,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25392" level="35" type="RaidBoss" name="Queen's Royal Guard Captain" title="Raid Boss">
+	<npc id="25392" level="35" type="RaidBoss" name="Queen's Royal Guard Captain" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25393" count="3" respawnTime="360" weightPoint="1" />
@@ -4271,7 +4271,7 @@
 			<height normal="39" grown="48" />
 		</collision>
 	</npc>
-	<npc id="25395" level="80" type="RaidBoss" name="Archon Susceptor" title="Raid Boss">
+	<npc id="25395" level="80" type="RaidBoss" name="Archon Susceptor" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25396" count="1" respawnTime="360" weightPoint="1" />
@@ -4441,7 +4441,7 @@
 			<height normal="35" grown="41.5" />
 		</collision>
 	</npc>
-	<npc id="25398" level="80" type="RaidBoss" name="Gaze of Abyss" title="Raid Boss">
+	<npc id="25398" level="80" type="RaidBoss" name="Gaze of Abyss" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25399" count="3" respawnTime="360" weightPoint="1" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25400-25499.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25400-25499.xml
index fe06885dc9..b9599b515e 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25400-25499.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25400-25499.xml
@@ -598,7 +598,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="25412" level="80" type="RaidBoss" name="Crody" title="Raid Boss">
+	<npc id="25412" level="80" type="RaidBoss" name="Crody" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25413" count="3" respawnTime="360" weightPoint="1" />
@@ -728,7 +728,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="25415" level="80" type="RaidBoss" name="Nakondas" title="Raid Boss">
+	<npc id="25415" level="80" type="RaidBoss" name="Nakondas" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25416" count="3" respawnTime="360" weightPoint="1" />
@@ -861,7 +861,7 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="25418" level="80" type="RaidBoss" name="Craven" title="Raid Boss">
+	<npc id="25418" level="80" type="RaidBoss" name="Craven" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25419" count="3" respawnTime="360" weightPoint="1" />
@@ -950,7 +950,7 @@
 			<height normal="14.5" grown="18" />
 		</collision>
 	</npc>
-	<npc id="25420" level="65" type="RaidBoss" name="Orfen's Handmaiden" title="Raid Boss">
+	<npc id="25420" level="65" type="RaidBoss" name="Orfen's Handmaiden" title="Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm03_A" />
 			<skill name="DDMagic_a" id="4196" level="4" />
@@ -1078,7 +1078,7 @@
 			<height normal="80" grown="96" />
 		</collision>
 	</npc>
-	<npc id="25423" level="55" type="RaidBoss" name="Fairy Queen Timiniel" title="Raid Boss">
+	<npc id="25423" level="55" type="RaidBoss" name="Fairy Queen Timiniel" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25424" count="4" respawnTime="360" weightPoint="1" /> <!-- Timiniel's Royal Guards -->
@@ -1426,7 +1426,7 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="25431" level="70" type="RaidBoss" name="Flamestone Golem" title="Raid Boss">
+	<npc id="25431" level="70" type="RaidBoss" name="Flamestone Golem" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25433" count="2" respawnTime="360" weightPoint="1" />
@@ -1555,7 +1555,7 @@
 			<height normal="20" grown="24" />
 		</collision>
 	</npc>
-	<npc id="25434" level="60" type="RaidBoss" name="Bandit Leader Barda" title="Raid Boss">
+	<npc id="25434" level="60" type="RaidBoss" name="Bandit Leader Barda" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25435" count="1" respawnTime="360" weightPoint="1" />
@@ -1680,7 +1680,7 @@
 			<height normal="34" />
 		</collision>
 	</npc>
-	<npc id="25437" level="70" type="RaidBoss" name="Timak Orc Gosmos" title="Raid Boss">
+	<npc id="25437" level="70" type="RaidBoss" name="Evil Orc Gosmos" title="High Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm02_A" />
 			<skill name="SelfBuff_a" id="4175" level="4" />
@@ -1910,7 +1910,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="25441" level="80" type="RaidBoss" name="Cyrion" title="Raid Boss">
+	<npc id="25441" level="80" type="RaidBoss" name="Cyrion" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25442" count="4" respawnTime="360" weightPoint="1" />
@@ -2035,7 +2035,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25444" level="83" type="RaidBoss" name="Enmity Ghost Ramdal" title="Raid Boss">
+	<npc id="25444" level="83" type="RaidBoss" name="Enmity Ghost Ramdal" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25445" count="3" respawnTime="360" weightPoint="1" />
@@ -2216,7 +2216,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25447" level="83" type="RaidBoss" name="Immortal Savior Mardil" title="Raid Boss">
+	<npc id="25447" level="83" type="RaidBoss" name="Immortal Savior Mardil" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25448" count="2" respawnTime="360" weightPoint="1" />
@@ -2397,7 +2397,7 @@
 			<height normal="28" />
 		</collision>
 	</npc>
-	<npc id="25450" level="83" type="RaidBoss" name="Cherub Galaxia" title="Raid Boss">
+	<npc id="25450" level="83" type="RaidBoss" name="Cherub Galaxia" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25451" count="3" respawnTime="360" weightPoint="1" />
@@ -2585,7 +2585,7 @@
 			<height normal="36.5" grown="42.5" />
 		</collision>
 	</npc>
-	<npc id="25453" level="80" type="RaidBoss" name="Meanas Anor" title="Raid Boss">
+	<npc id="25453" level="80" type="RaidBoss" name="Meanas Anor" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25454" count="3" respawnTime="360" weightPoint="1" /> <!-- Wyvern of Marsh -->
@@ -2716,7 +2716,7 @@
 			<height normal="36" />
 		</collision>
 	</npc>
-	<npc id="25456" level="50" type="RaidBoss" name="Mirror of Oblivion" title="Raid Boss">
+	<npc id="25456" level="50" type="RaidBoss" name="Mirror of Oblivion" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25457" count="1" respawnTime="360" weightPoint="1" />
@@ -2881,7 +2881,7 @@
 			<height normal="16.5" />
 		</collision>
 	</npc>
-	<npc id="25460" level="80" type="RaidBoss" name="Ereve" title="Raid Boss">
+	<npc id="25460" level="80" type="RaidBoss" name="Ereve" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25461" count="2" respawnTime="360" weightPoint="1" />
@@ -3019,7 +3019,7 @@
 			<height normal="28" grown="33" />
 		</collision>
 	</npc>
-	<npc id="25463" level="70" type="RaidBoss" name="Harit Guardian Garangky" title="Raid Boss">
+	<npc id="25463" level="70" type="RaidBoss" name="Guardian Garangky" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25464" count="1" respawnTime="360" weightPoint="1" />
@@ -3184,7 +3184,7 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="25467" level="80" type="RaidBoss" name="Gorgolos" title="Raid Boss">
+	<npc id="25467" level="80" type="RaidBoss" name="Gorgolos" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25468" count="4" respawnTime="360" weightPoint="1" />
@@ -3358,7 +3358,7 @@
 			<height normal="30" />
 		</collision>
 	</npc>
-	<npc id="25470" level="80" type="RaidBoss" name="Last Titan Utenus" title="Raid Boss">
+	<npc id="25470" level="80" type="RaidBoss" name="Last Titan Utenus" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25471" count="3" respawnTime="360" weightPoint="1" />
@@ -3538,7 +3538,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="25473" level="55" type="RaidBoss" name="Great Spirit Kim" title="Raid Boss">
+	<npc id="25473" level="55" type="RaidBoss" name="Great Spirit Kim" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25474" count="3" respawnTime="360" weightPoint="1" />
@@ -3623,7 +3623,7 @@
 			<height normal="21.5" />
 		</collision>
 	</npc>
-	<npc id="25475" level="80" type="RaidBoss" name="Kabed" title="Raid Boss">
+	<npc id="25475" level="80" type="RaidBoss" name="Kabed" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25476" count="3" respawnTime="360" weightPoint="1" />
@@ -3754,7 +3754,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25478" level="80" type="RaidBoss" name="Shillien's Priest Hisilrome" title="Raid Boss">
+	<npc id="25478" level="80" type="RaidBoss" name="Shillien's Priest Hisilrome" title="High Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25479" count="3" respawnTime="360" weightPoint="1" />
@@ -4659,7 +4659,7 @@
 			<height normal="25" grown="30.8" />
 		</collision>
 	</npc>
-	<npc id="25498" level="45" type="RaidBoss" name="Fafurion's Henchman Istary" title="Raid Boss">
+	<npc id="25498" level="45" type="RaidBoss" name="Fafurion's Henchman Istary" title="Elite">
 		<parameters>
 			<minions name="Privates">
 				<npc id="25499" count="1" respawnTime="360" weightPoint="1" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25700-25799.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25700-25799.xml
index b9305c52a6..8bfb9f60bb 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25700-25799.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25700-25799.xml
@@ -66,7 +66,7 @@
 			<height normal="120" />
 		</collision>
 	</npc>
-	<npc id="25738" level="80" type="RaidBoss" name="Queen Ant Drone Priest" title="Raid Boss">
+	<npc id="25738" level="80" type="RaidBoss" name="Queen Ant Drone Priest" title="High Elite">
 		<race>BUG</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -155,7 +155,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25739" level="80" type="RaidBoss" name="Angel Priest of Baium" title="Raid Boss">
+	<npc id="25739" level="80" type="RaidBoss" name="Angel Priest of Baium" title="High Elite">
 		<race>DIVINE</race>
 		<sex>MALE</sex>
 		<equipment rhand="98" />
@@ -285,7 +285,7 @@
 			<height normal="38.5" />
 		</collision>
 	</npc>
-	<npc id="25742" level="80" type="RaidBoss" name="Priest of Core Decar" title="Raid Boss">
+	<npc id="25742" level="80" type="RaidBoss" name="Priest of Core Decar" title="High Elite">
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -374,7 +374,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25743" level="80" type="RaidBoss" name="Orfen's Priest Lord Ipos" title="Raid Boss">
+	<npc id="25743" level="80" type="RaidBoss" name="Orfen's Priest Lord Ipos" title="High Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -463,7 +463,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25744" level="60" type="RaidBoss" name="Zombie Lord Dorkhon" title="Raid Boss">
+	<npc id="25744" level="60" type="RaidBoss" name="Zombie Lord Dorkhon" title="Elite">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -496,7 +496,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25745" level="70" type="RaidBoss" name="Orc Timak Darphen" title="Raid Boss">
+	<npc id="25745" level="70" type="RaidBoss" name="Evil Orc Darphen" title="High Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="6719" />
@@ -566,7 +566,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25746" level="75" type="RaidBoss" name="Magikus" title="Raid Boss">
+	<npc id="25746" level="75" type="RaidBoss" name="Magikus" title="Elite">
 		<race>BEAST</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -601,7 +601,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25747" level="70" type="RaidBoss" name="Rael Mahum Radium" title="Raid Boss">
+	<npc id="25747" level="70" type="RaidBoss" name="Rael Mahum Radium" title="Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -633,7 +633,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25748" level="70" type="RaidBoss" name="Rael Mahum Supercium" title="Raid Boss">
+	<npc id="25748" level="70" type="RaidBoss" name="Rael Mahum Supercium" title="Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -665,7 +665,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25749" level="65" type="RaidBoss" name="Tayga Feron King" title="Raid Boss">
+	<npc id="25749" level="65" type="RaidBoss" name="Tayga Feron King" title="Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -696,7 +696,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25750" level="65" type="RaidBoss" name="Tayga Marga Shaman" title="Raid Boss">
+	<npc id="25750" level="65" type="RaidBoss" name="Tayga Marga Shaman" title="Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="38564" lhand="38432" />
@@ -731,7 +731,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25751" level="65" type="RaidBoss" name="Tayga Septon Champion" title="Raid Boss">
+	<npc id="25751" level="65" type="RaidBoss" name="Tayga Septon Champion" title="Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="38429" lhand="38435" />
@@ -806,7 +806,7 @@
 			<height normal="26.6" />
 		</collision>
 	</npc>
-	<npc id="25754" level="70" type="RaidBoss" name="Flamestone Giant" title="Raid Boss">
+	<npc id="25754" level="70" type="RaidBoss" name="Flamestone Giant" title="Elite">
 		<race>ETC</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -838,7 +838,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25755" level="75" type="RaidBoss" name="Gross Salamander" title="Raid Boss">
+	<npc id="25755" level="75" type="RaidBoss" name="Flame Salamander" title="High Elite">
 		<race>ELEMENTAL</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -906,7 +906,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25756" level="75" type="RaidBoss" name="Gross Dre Vanul" title="Raid Boss">
+	<npc id="25756" level="75" type="RaidBoss" name="Fire Dre Vanul" title="High Elite">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -974,7 +974,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25757" level="80" type="RaidBoss" name="Grousse" title="Raid Boss">
+	<npc id="25757" level="80" type="RaidBoss" name="Grousse" title="Elite">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -1007,7 +1007,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25758" level="75" type="RaidBoss" name="Fiend Goblier" title="Raid Boss">
+	<npc id="25758" level="75" type="RaidBoss" name="Fiend Goblier" title="High Elite">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -1074,7 +1074,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25759" level="75" type="RaidBoss" name="Fiend Cherkia" title="Raid Boss">
+	<npc id="25759" level="75" type="RaidBoss" name="Fiend Cherkia" title="High Elite">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -1141,7 +1141,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25760" level="75" type="RaidBoss" name="Fiend Harthemon" title="Raid Boss">
+	<npc id="25760" level="75" type="RaidBoss" name="Fiend Harthemon" title="High Elite">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -1208,7 +1208,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25761" level="75" type="RaidBoss" name="Fiend Sarboth" title="Raid Boss">
+	<npc id="25761" level="75" type="RaidBoss" name="Fiend Sarboth" title="High Elite">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -1275,7 +1275,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25762" level="75" type="RaidBoss" name="Demon Bedukel" title="Raid Boss">
+	<npc id="25762" level="75" type="RaidBoss" name="Demon Bedukel" title="High Elite">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<equipment rhand="8203" lhand="8203" />
@@ -1343,7 +1343,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25763" level="75" type="RaidBoss" name="Bloody Witch Rumilla" title="Raid Boss">
+	<npc id="25763" level="75" type="RaidBoss" name="Bloody Witch Rumilla" title="High Elite">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -1449,7 +1449,7 @@
 			<height normal="26" />
 		</collision>
 	</npc>
-	<npc id="25766" level="80" type="RaidBoss" name="Monster Minotaur" title="Raid Boss">
+	<npc id="25766" level="80" type="RaidBoss" name="Monster Minotaur" title="High Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="38448" />
@@ -1536,7 +1536,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25767" level="85" type="RaidBoss" name="Monster Bulleroth" title="Raid Boss">
+	<npc id="25767" level="85" type="RaidBoss" name="Monster Bulleroth" title="High Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -1598,7 +1598,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25768" level="70" type="RaidBoss" name="Dorcaus" title="Raid Boss">
+	<npc id="25768" level="70" type="RaidBoss" name="Dorcaus" title="High Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -1666,7 +1666,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25769" level="70" type="RaidBoss" name="Kerfaus" title="Raid Boss">
+	<npc id="25769" level="70" type="RaidBoss" name="Kerfaus" title="High Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -1734,7 +1734,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25770" level="70" type="RaidBoss" name="Milinaus" title="Raid Boss">
+	<npc id="25770" level="70" type="RaidBoss" name="Milinaus" title="High Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="38427" />
@@ -1825,7 +1825,7 @@
 			<height normal="34.5" />
 		</collision>
 	</npc>
-	<npc id="25772" level="70" type="RaidBoss" name="Evil Orc Zetahl" title="Raid Boss">
+	<npc id="25772" level="70" type="RaidBoss" name="Evil Orc Zetahl" title="High Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -1894,7 +1894,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25773" level="80" type="RaidBoss" name="Evil Orc Tabris" title="Raid Boss">
+	<npc id="25773" level="80" type="RaidBoss" name="Evil Orc Tabris" title="High Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -1980,7 +1980,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25774" level="70" type="RaidBoss" name="Evil Orc Ravolas" title="Raid Boss">
+	<npc id="25774" level="70" type="RaidBoss" name="Evil Orc Ravolas" title="High Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -2051,7 +2051,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25775" level="85" type="RaidBoss" name="Evil Orc Dephracor" title="Raid Boss">
+	<npc id="25775" level="85" type="RaidBoss" name="Evil Orc Dephracor" title="High Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -2113,7 +2113,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25776" level="70" type="RaidBoss" name="Amden Orc Turahot" title="Raid Boss">
+	<npc id="25776" level="70" type="RaidBoss" name="Evil Orc Turahot" title="High Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -2184,7 +2184,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25777" level="70" type="RaidBoss" name="Amden Orc Turation" title="Raid Boss">
+	<npc id="25777" level="70" type="RaidBoss" name="Evil Orc Turation" title="High Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<equipment rhand="38425" />
@@ -2256,7 +2256,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25778" level="80" type="Folk" name="Puppet Orc Archer" title="Raid Fighter">
+	<npc id="25778" level="80" type="Folk" name="Evil Orc Archer" title="Raid Fighter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -2276,7 +2276,7 @@
 			<height normal="27" />
 		</collision>
 	</npc>
-	<npc id="25779" level="80" type="RaidBoss" name="Gariott" title="Raid Boss">
+	<npc id="25779" level="80" type="RaidBoss" name="Gariott" title="High Elite">
 		<race>ETC</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -2354,7 +2354,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25780" level="75" type="RaidBoss" name="Varbasion" title="Raid Boss">
+	<npc id="25780" level="75" type="RaidBoss" name="Varbasion" title="High Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -2423,7 +2423,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25781" level="75" type="RaidBoss" name="Varmoni" title="Raid Boss">
+	<npc id="25781" level="75" type="RaidBoss" name="Varmoni" title="High Elite">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -2492,7 +2492,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25782" level="75" type="RaidBoss" name="Overlord Muscel" title="Raid Boss">
+	<npc id="25782" level="75" type="RaidBoss" name="Overlord Muscel" title="High Elite">
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -2561,7 +2561,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25783" level="75" type="RaidBoss" name="Bathus Elbogen" title="Raid Boss">
+	<npc id="25783" level="75" type="RaidBoss" name="Bathus Elbogen" title="High Elite">
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -2630,7 +2630,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25784" level="75" type="RaidBoss" name="Daumen Kshana" title="Raid Boss">
+	<npc id="25784" level="75" type="RaidBoss" name="Daumen Kshana" title="High Elite">
 		<race>GIANT</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25800-25899.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25800-25899.xml
index 16dca6282f..c451ef6316 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25800-25899.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25800-25899.xml
@@ -70,7 +70,7 @@
 			</clanList>
 		</ai>
 	</npc>
-	<npc id="25802" level="78" type="Monster" name="Turan" title="Leo Tracker">
+	<npc id="25802" level="78" type="Monster" name="Turan" title="Leo's Tracker">
 		<!-- Source: www.l2wiki.com -->
 		<race>HUMANOID</race>
 		<equipment rhand="91" />
@@ -482,7 +482,7 @@
 			</clanList>
 		</ai>
 	</npc>
-	<npc id="25813" level="80" type="Monster" name="Garaki" title="Shax's Shadow">
+	<npc id="25813" level="80" type="Monster" name="Garaki" title="Shax' Shadow">
 		<!-- Source: www.l2wiki.com -->
 		<race>UNDEAD</race>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -1000,7 +1000,7 @@
 			<skill id="50028" level="23" /> <!-- Raid Boss (Lv. 83) -->
 		</skillList>
 	</npc>
-	<npc id="25837" level="84" type="RaidBoss" name="Cherkya" title="Demon Apostle">
+	<npc id="25837" level="84" type="RaidBoss" name="Cherkia" title="Demon Apostle">
 		<race>DEMONIC</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -1114,7 +1114,7 @@
 			<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>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25900-25999.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25900-25999.xml
index cd66baf2c7..050e8b81ab 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25900-25999.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/25900-25999.xml
@@ -153,7 +153,7 @@
 			<height normal="54.5" />
 		</collision>
 	</npc>
-	<npc id="25909" level="80" type="Monster" name="Carcs">
+	<npc id="25909" level="80" type="Monster" name="Carcs" title="Elite">
 		<race>HUMANOID</race>
 		<equipment rhand="6719" /> <!-- Monster Only (Ketra Orc Chieftain) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -188,7 +188,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25910" level="80" type="Monster" name="Drak">
+	<npc id="25910" level="80" type="Monster" name="Drak" title="Elite">
 		<race>HUMANOID</race>
 		<equipment rhand="38425" /> <!-- Monster Only: Amden Blunt Weapon - Not Available - Not Available -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -223,7 +223,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25911" level="80" type="Monster" name="Ourick">
+	<npc id="25911" level="80" type="Monster" name="Ourick" title="Elite">
 		<race>HUMANOID</race>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="135763.583815029" hpRegen="8.5" mp="4242.24422442244" mpRegen="3" />
@@ -257,7 +257,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25912" level="85" type="Monster" name="Monster">
+	<npc id="25912" level="85" type="Monster" name="Behemoth" title="Antharas' Avatar">
 		<race>DRAGON</race>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="15606936.416185" hpRegen="9.5" mp="22800" mpRegen="3.3" />
@@ -324,7 +324,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25913" level="85" type="Monster" name="Karim">
+	<npc id="25913" level="85" type="Monster" name="Karim" title="Antharas' Follower">
 		<race>DEMONIC</race>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="2623786.12716763" hpRegen="9.5" mp="4677.88778877888" mpRegen="3.3" />
@@ -391,7 +391,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25914" level="82" type="Monster" name="Atingo">
+	<npc id="25914" level="82" type="Monster" name="Atingo" title="Pet Legion's Master">
 		<race>HUMANOID</race>
 		<equipment rhand="95759" /> <!-- Helios Stormer (NPC) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -419,7 +419,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25915" level="82" type="Monster" name="Atingo">
+	<npc id="25915" level="82" type="Monster" name="Atingo" title="Pet Legion's Master">
 		<race>HUMANOID</race>
 		<equipment rhand="95759" /> <!-- Helios Stormer (NPC) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -447,7 +447,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25916" level="82" type="Monster" name="Atingo">
+	<npc id="25916" level="82" type="Monster" name="Atingo" title="Pet Legion's Master">
 		<race>HUMANOID</race>
 		<equipment rhand="95759" /> <!-- Helios Stormer (NPC) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -475,7 +475,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25917" level="82" type="Monster" name="Atingo">
+	<npc id="25917" level="82" type="Monster" name="Atingo" title="Pet Legion's Master">
 		<race>HUMANOID</race>
 		<equipment rhand="95759" /> <!-- Helios Stormer (NPC) -->
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -503,7 +503,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25918" level="82" type="Monster" name="Wolf">
+	<npc id="25918" level="82" type="Monster" name="Wolf" title="Atingo's Pet">
 		<race>BEAST</race>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="46454.3761638734" hpRegen="9.5" mp="3667.20911310008" mpRegen="3.3" />
@@ -527,7 +527,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25919" level="82" type="Monster" name="Buffalo">
+	<npc id="25919" level="82" type="Monster" name="Buffalo" title="Atingo's Pet">
 		<race>BEAST</race>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="60567.0391061452" hpRegen="9.5" mp="3667.20911310008" mpRegen="3.3" />
@@ -551,7 +551,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25920" level="82" type="Monster" name="Tiger">
+	<npc id="25920" level="82" type="Monster" name="Tiger" title="Atingo's Pet">
 		<race>BEAST</race>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="42337.9888268156" hpRegen="9.5" mp="3667.20911310008" mpRegen="3.3" />
@@ -575,7 +575,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25921" level="82" type="Monster" name="Kookaburra">
+	<npc id="25921" level="82" type="Monster" name="Kookaburra" title="Atingo's Pet">
 		<race>BEAST</race>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="30577.2811918063" hpRegen="9.5" mp="4240.032546786" mpRegen="3.3" />
@@ -599,7 +599,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25922" level="82" type="Monster" name="Strider">
+	<npc id="25922" level="82" type="Monster" name="Strider" title="Atingo's Pet">
 		<race>DRAGON</race>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="53804.469273743" hpRegen="9.5" mp="3667.20911310008" mpRegen="3.3" />
@@ -623,7 +623,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25923" level="82" type="Monster" name="Hawk">
+	<npc id="25923" level="82" type="Monster" name="Hawk" title="Atingo's Pet">
 		<race>ANIMAL</race>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="41162.0111731844" hpRegen="9.5" mp="3667.20911310008" mpRegen="3.3" />
@@ -647,7 +647,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25924" level="82" type="Monster" name="Sin Eater">
+	<npc id="25924" level="82" type="Monster" name="Sin Eater" title="Atingo's Favorite">
 		<race>FAIRY</race>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
 			<vitals hp="46454.3761638734" hpRegen="9.5" mp="3494.71114727421" mpRegen="3.3" />
@@ -708,7 +708,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25925" level="85" type="RaidBoss" name="Jisra">
+	<npc id="25925" level="85" type="RaidBoss" name="Jisra" title="Elite">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm02_A" />
 			<skill name="RangeDDMagic_a" id="4178" level="2" />
@@ -746,7 +746,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="25926" level="85" type="Monster" name="Kuka">
+	<npc id="25926" level="85" type="Monster" name="Kuka" title="Jisra's Prefect">
 		<parameters>
 			<param name="RaidSpawnMusic" value="Rm02_A" />
 			<skill name="RangeDDMagic_a" id="4178" level="2" />
@@ -1154,4 +1154,158 @@
 			</drop>
 		</dropLists>
 	</npc>
+	<npc id="25944" level="85" type="Folk" name="Royal Vampire" title="Gatekeeper">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="242088" hpRegen="10.5" mp="3834" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<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="22" />
+			<height normal="43" />
+		</collision>
+	</npc>
+	<npc id="25945" level="85" type="Folk" name="Tower Knight" title="Gatekeeper">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="428" /> <!-- Feriotic Tunic -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="242088" hpRegen="10.5" mp="3834" mpRegen="3.6" />
+			<speed>
+				<walk ground="42" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="22.88" />
+			<height normal="41.6" />
+		</collision>
+	</npc>
+	<npc id="25946" level="85" type="Folk" name="Knight of Darkness" title="Battlefield Nightmare">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="418328" hpRegen="10.5" mp="4047" 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="23" />
+			<height normal="64" />
+		</collision>
+	</npc>
+	<npc id="25947" level="85" type="Folk" name="Dark Banshee" title="Battlefield Nightmare">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="418328" hpRegen="10.5" mp="4047" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<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="49" />
+		</collision>
+	</npc>
+	<npc id="25948" level="85" type="Folk" name="Beoro" title="Bee Hive Emperor">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="420292" hpRegen="10.5" mp="3693" mpRegen="3.6" />
+			<speed>
+				<walk ground="18" />
+				<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="70.4" />
+			<height normal="62.56" />
+		</collision>
+	</npc>
+	<npc id="25949" level="85" type="Folk" name="Hermit Beoro" title="Bee Hive Emperor">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="420292" hpRegen="10.5" mp="3693" mpRegen="3.6" />
+			<speed>
+				<walk ground="105" />
+				<run ground="360" />
+			</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="66" />
+		</collision>
+	</npc>
+	<npc id="25950" level="85" type="Folk" name="Royda" title="Pet Legion's Grand Master">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="95759" /> <!-- Helios Stormer (NPC) -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="521936" hpRegen="10.5" mp="3486" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="19.5" />
+			<height normal="39.9" />
+		</collision>
+	</npc>
+	<npc id="25951" level="85" type="Folk" name="Sin Eater" title="Atingo's Favorite">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="31577" hpRegen="10.5" mp="3486" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<run ground="80" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="12" />
+			<height normal="29.4" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/27200-27299.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/27200-27299.xml
index 60d4de80e4..8029d2ef9e 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/27200-27299.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/27200-27299.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="27200" level="36" type="Monster" name="Krudel Lizardman" title="Quest Monster">
 		<parameters>
@@ -1819,7 +1819,7 @@
 			<height normal="90" grown="109" />
 		</collision>
 	</npc>
-	<npc id="27253" level="76" type="Monster" name="Hell Fire" title="Quest Monster">
+	<npc id="27253" level="76" type="Monster" name="Hellfire" title="Quest Monster">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/27300-27399.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/27300-27399.xml
index 531406e1fd..a38e47b2d6 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/27300-27399.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/27300-27399.xml
@@ -715,7 +715,7 @@
 			<height normal="24" grown="28.8" />
 		</collision>
 	</npc>
-	<npc id="27317" level="70" type="Monster" name="Spirit of a Drowned" title="Quest Monster">
+	<npc id="27317" level="70" type="Monster" name="Spirit of the Drowned" title="Quest Monster">
 		<parameters>
 			<param name="MoveAroundSocial" value="90" />
 			<param name="MoveAroundSocial1" value="74" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/29000-29099.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/29000-29099.xml
index 3f617a6cfd..32bacdd6c1 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/29000-29099.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/29000-29099.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="29001" level="80" type="GrandBoss" name="Queen Ant">
+	<npc id="29001" level="80" type="GrandBoss" name="Queen Ant" title="Dungeon Queen">
 		<parameters>
 			<minions name="Privates">
 				<npc id="29003" count="6" respawnTime="10" weightPoint="1" />
@@ -257,7 +257,7 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="29006" level="80" type="GrandBoss" name="Core">
+	<npc id="29006" level="80" type="GrandBoss" name="Core" title="Cruma Control Device">
 		<parameters>
 			<minions name="Privates">
 				<npc id="29008" count="3" respawnTime="360" weightPoint="1" />
@@ -739,7 +739,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29014" level="80" type="GrandBoss" name="Orfen">
+	<npc id="29014" level="80" type="GrandBoss" name="Orfen" title="Spore Mistress">
 		<parameters>
 			<param name="MoveAroundSocial" value="80" />
 			<param name="MoveAroundSocial1" value="80" />
@@ -1114,7 +1114,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29020" level="80" type="GrandBoss" name="Baium">
+	<npc id="29020" level="80" type="GrandBoss" name="Baium" title="Lord">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -1228,7 +1228,7 @@
 			<height normal="80" />
 		</collision>
 	</npc>
-	<npc id="29022" level="80" type="GrandBoss" name="Zaken">
+	<npc id="29022" level="80" type="GrandBoss" name="Zaken" title="Pirate Captain">
 		<race>UNDEAD</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -1421,7 +1421,7 @@
 			</spoil>
 		</dropLists>
 	</npc>
-	<npc id="29025" level="75" type="Folk" name="Baium">
+	<npc id="29025" level="75" type="Folk" name="Baium" title="Lord">
 		<race>HUMANOID</race>
 		<sex>MALE</sex>
 		<stats str="60" int="76" dex="73" wit="70" con="57" men="80">
@@ -2235,7 +2235,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29068" level="80" type="GrandBoss" name="Antharas" title="Land Dragon">
+	<npc id="29068" level="80" type="GrandBoss" name="Antharas" title="Earth Dragon">
 		<parameters>
 			<param name="ultra_respawn_time" value="3" />
 		</parameters>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/29100-29199.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/29100-29199.xml
index c2d2011d28..a5a498264c 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/29100-29199.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/29100-29199.xml
@@ -41,7 +41,7 @@
 			<height normal="82" />
 		</collision>
 	</npc>
-	<npc id="29102" level="84" type="RaidBoss" name="Antharas" title="Land Dragon">
+	<npc id="29102" level="84" type="RaidBoss" name="Antharas" title="Earth Dragon">
 		<race>DRAGON</race>
 		<sex>MALE</sex>
 		<acquire exp="0" sp="0" raidPoints="1000" />
@@ -106,7 +106,7 @@
 			<skill id="4416" level="10" /> <!-- Dragons -->
 		</skillList>
 	</npc>
-	<npc id="29105" level="80" type="RaidBoss" name="King Ignis" title="Flame Spirit King" element="FIRE">
+	<npc id="29105" level="80" type="RaidBoss" name="King Ignis" element="FIRE">
 		<race>ELEMENTAL</race>
 		<sex>MALE</sex>
 		<acquire exp="0" sp="0" attributeExp="104000" />
@@ -363,7 +363,7 @@
 			</drop>
 		</dropLists>
 	</npc>
-	<npc id="29108" level="80" type="RaidBoss" name="King Petram" title="Earth Spirit King" element="EARTH">
+	<npc id="29108" level="80" type="RaidBoss" name="King Petram" element="EARTH">
 		<race>ELEMENTAL</race>
 		<sex>MALE</sex>
 		<acquire exp="0" sp="0" attributeExp="104000" />
@@ -950,6 +950,253 @@
 			<height normal="94" />
 		</collision>
 	</npc>
+	<npc id="29144" level="85" type="Folk" name="Beleth" title="Demon 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="88888888" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<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="30" />
+			<height normal="60" />
+		</collision>
+	</npc>
+	<npc id="29145" level="85" type="Folk" name="Beleth' Slave">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="170000" hpRegen="10.5" mp="3693" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<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.5" />
+		</collision>
+	</npc>
+	<npc id="29146" level="85" type="Folk" name="Darion" title="Demons">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="22222222" hpRegen="10.5" mp="3349" mpRegen="3.6" />
+			<speed>
+				<walk ground="44" />
+				<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="50" />
+			<height normal="81.217" />
+		</collision>
+	</npc>
+	<npc id="29147" level="85" type="Folk" name="Tarask Dragon" title="Earth Dragon">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="12000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="34.5" />
+			<height normal="54.9" />
+		</collision>
+	</npc>
+	<npc id="29148" level="85" type="Folk" name="Tarask Dragon" title="Earth Dragon">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="51084444" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="40" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="34.5" />
+			<height normal="54.9" />
+		</collision>
+	</npc>
+	<npc id="29149" level="85" type="Folk" name="Tarask Dragon" title="Dreadful Earth Dragon">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="51084444" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="35" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="48" />
+			<height normal="82.5" />
+		</collision>
+	</npc>
+	<npc id="29150" level="85" type="Folk" name="Tarask Dragon" title="Immortal Earth Dragon">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="51084444" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="55" />
+				<run ground="170" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="60" />
+			<height normal="82.5" />
+		</collision>
+	</npc>
+	<npc id="29151" level="85" type="Folk" name="Antharas" title="Earth Dragon">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="666666666" hpRegen="10.5" mp="2025740" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="279" />
+			</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="300" />
+			<height normal="300" />
+		</collision>
+	</npc>
+	<npc id="29152" level="85" type="Folk" name="Antharas" title="Dreadful Earth Dragon">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="888888888" hpRegen="10.5" mp="2025740" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="279" />
+			</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="300" />
+			<height normal="300" />
+		</collision>
+	</npc>
+	<npc id="29153" level="85" type="Folk" name="Antharas" title="Immortal Earth Dragon">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="888888888" hpRegen="10.5" mp="2025740" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="279" />
+			</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="300" />
+			<height normal="300" />
+		</collision>
+	</npc>
+	<npc id="29154" level="85" type="Folk" name="Antharas" title="Earth Dragon">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="60000000" hpRegen="10.5" mp="2025740" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="279" />
+			</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="300" />
+			<height normal="300" />
+		</collision>
+	</npc>
+	<npc id="29155" level="85" type="Folk" name="Antharas" title="Earth Dragon">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="60000000" hpRegen="10.5" mp="2025740" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<run ground="279" />
+			</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="300" />
+			<height normal="300" />
+		</collision>
+	</npc>
+	<npc id="29156" level="85" type="Folk" name="Beleth' 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="400000" hpRegen="10.5" mp="1507" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="180" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="22" />
+			<height normal="19" />
+		</collision>
+	</npc>
 	<npc id="29190" level="84" type="Monster" name="Tarask Dragon">
 		<!-- Todo: CT2.5 -->
 		<parameters>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30000-30099.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30000-30099.xml
index d996e339fa..692293f338 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30000-30099.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30000-30099.xml
@@ -260,7 +260,7 @@
 			<height normal="31.45" />
 		</collision>
 	</npc>
-	<npc id="30009" level="70" type="Folk" name="Newbie Helper">
+	<npc id="30009" level="70" type="Folk" name="Newbie Helper" title="Tutorial Indicator">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="130" />
@@ -566,7 +566,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 Indicator">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="90" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30100-30199.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30100-30199.xml
index 98d54ad764..96f440eac1 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30100-30199.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30100-30199.xml
@@ -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 Indicator">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="106" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30200-30299.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30200-30299.xml
index bad5384213..897aad241e 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30200-30299.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30200-30299.xml
@@ -78,7 +78,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="30202" level="80" type="Merchant" name="Leo" title="Senior Appraiser">
+	<npc id="30202" level="80" type="Merchant" name="Leo" title="Clan Arena Manager">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DWARF</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30300-30399.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30300-30399.xml
index 9134c2dbf9..47614ad5ee 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30300-30399.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30300-30399.xml
@@ -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="Kripi" title="Sentinel">
 		<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="Water Guardian">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30400-30499.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30400-30499.xml
index 8e018b3353..bbee8d1eaf 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30400-30499.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30400-30499.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="30400" level="70" type="Folk" name="Newbie Helper">
+	<npc id="30400" level="70" type="Folk" name="Newbie Helper" title="Tutorial Indicator">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="79" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30500-30599.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30500-30599.xml
index 0723f783ae..230e963c18 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30500-30599.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30500-30599.xml
@@ -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 Indicator">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="60" />
@@ -1151,7 +1151,7 @@
 			<height normal="24.95" />
 		</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="First Elder">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="93" />
@@ -2764,7 +2764,7 @@
 			<height normal="38.6" />
 		</collision>
 	</npc>
-	<npc id="30575" level="70" type="Folk" name="Newbie Helper">
+	<npc id="30575" level="70" type="Folk" name="Newbie Helper" title="Tutorial Indicator">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30600-30699.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30600-30699.xml
index f2245693fc..3172401e0a 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30600-30699.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/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>
@@ -640,7 +640,7 @@
 			<height normal="16.5" />
 		</collision>
 	</npc>
-	<npc id="30622" level="70" type="Folk" name="Box Of Titan">
+	<npc id="30622" level="70" type="Folk" name="Box of Titan">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -1577,7 +1577,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="30647" level="70" type="Folk" name="Chest Of Shyslassys">
+	<npc id="30647" level="70" type="Folk" name="Chest of Shyslassys">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -1912,7 +1912,7 @@
 			<height normal="22.4" />
 		</collision>
 	</npc>
-	<npc id="30656" level="70" type="Folk" name="Spirit Of Sir Talianus">
+	<npc id="30656" level="70" type="Folk" name="Spirit of Sir Talianus">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30700-30799.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30700-30799.xml
index 1bd7c1bfd2..44f0f9a354 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30700-30799.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30700-30799.xml
@@ -76,7 +76,7 @@
 			<height normal="22" />
 		</collision>
 	</npc>
-	<npc id="30702" level="70" type="Folk" name="Bernard" title="Hunter Guild President">
+	<npc id="30702" level="70" type="Folk" name="Bernard" title="Hunters' Guild Leader">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="110" />
@@ -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="Colleen" title="Hunters' Guild">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1699,7 +1699,7 @@
 			<height normal="9" />
 		</collision>
 	</npc>
-	<npc id="30744" level="70" type="Folk" name="Grey" title="Hunter Guild Member">
+	<npc id="30744" level="70" type="Folk" name="Grey" title="Hunters' Guild">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="110" />
@@ -1736,7 +1736,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="30745" level="70" type="Folk" name="Tor" title="Hunter Guild Member">
+	<npc id="30745" level="70" type="Folk" name="Tor" title="Hunters' Guild">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -2075,7 +2075,7 @@
 			<height normal="22.4" />
 		</collision>
 	</npc>
-	<npc id="30754" level="70" type="Folk" name="Gilmore" title="Antharas Watchman">
+	<npc id="30754" level="70" type="Folk" name="Gilmore" title="Antharas' Watchman">
 		<parameters>
 			<param name="MoveAroundSocial" value="215" />
 			<param name="MoveAroundSocial1" value="215" />
@@ -2114,7 +2114,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="30755" level="70" type="Folk" name="Theodric" title="Antharas Watchman">
+	<npc id="30755" level="70" type="Folk" name="Theodric" title="Antharas' Watchman">
 		<parameters>
 			<param name="MoveAroundSocial" value="215" />
 			<param name="MoveAroundSocial1" value="215" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30900-30999.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30900-30999.xml
index 235347ba61..b02f50aae6 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30900-30999.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/30900-30999.xml
@@ -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" title="Heavenly Rift">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -2002,7 +2002,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="30953" level="70" type="Folk" name="Dimensional Vortex 2">
+	<npc id="30953" level="70" type="Folk" name="Dimensional Vortex">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -2040,7 +2040,7 @@
 			<height normal="35" />
 		</collision>
 	</npc>
-	<npc id="30954" level="70" type="Folk" name="Dimensional Vortex 3">
+	<npc id="30954" level="70" type="Folk" name="Dimensional Vortex">
 		<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="Water Chest">
 		<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="Fire Chest">
 		<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="Wind Chest">
 		<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="Earth Chest">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/31000-31099.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/31000-31099.xml
index 804e9b082d..93505687ca 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/31000-31099.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/31000-31099.xml
@@ -279,7 +279,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="31009" level="70" type="Monster" name="Cyclone Thunder">
+	<npc id="31009" level="70" type="Monster" name="Cyclone">
 		<race>ANIMAL</race>
 		<sex>MALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -1043,7 +1043,7 @@
 			<height normal="9" />
 		</collision>
 	</npc>
-	<npc id="31031" level="70" type="BroadcastingTower" name="Broadcasting Tower">
+	<npc id="31031" level="70" type="BroadcastingTower" name="Anchor Crystal">
 		<race>ETC</race>
 		<sex>ETC</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -1425,7 +1425,7 @@
 			<height normal="17.5" />
 		</collision>
 	</npc>
-	<npc id="31046" level="70" type="Folk" name="Marsden" title="Symbol Maker">
+	<npc id="31046" level="70" type="Folk" name="Marsden" title="Tattoo Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1462,7 +1462,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31047" level="70" type="Folk" name="Kell" title="Symbol Maker">
+	<npc id="31047" level="70" type="Folk" name="Kell" title="Tattoo Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1499,7 +1499,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31048" level="70" type="Folk" name="McDermott" title="Symbol Maker">
+	<npc id="31048" level="70" type="Folk" name="McDermott" title="Tattoo Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1536,7 +1536,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31049" level="70" type="Folk" name="Pepper" title="Symbol Maker">
+	<npc id="31049" level="70" type="Folk" name="Pepper" title="Tattoo Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1573,7 +1573,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31050" level="70" type="Folk" name="Thora" title="Symbol Maker">
+	<npc id="31050" level="70" type="Folk" name="Thora" title="Tattoo Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1610,7 +1610,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31051" level="70" type="Folk" name="Keach" title="Symbol Maker">
+	<npc id="31051" level="70" type="Folk" name="Keach" title="Tattoo Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1647,7 +1647,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31052" level="70" type="Folk" name="Heid" title="Symbol Maker">
+	<npc id="31052" level="70" type="Folk" name="Heid" title="Tattoo Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="120" />
@@ -1684,7 +1684,7 @@
 			<height normal="23" />
 		</collision>
 	</npc>
-	<npc id="31053" level="70" type="Folk" name="Kidder" title="Symbol Maker">
+	<npc id="31053" level="70" type="Folk" name="Kidder" title="Tattoo Master">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="133" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/31200-31299.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/31200-31299.xml
index fa26fb3284..8cde1b46a4 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/31200-31299.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/31200-31299.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="31210" level="70" type="Folk" name="Race Track Gatekeeper" title="Monster Race Track">
+	<npc id="31210" level="70" type="Folk" name="Gatekeeper" title="Monster Race Track">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DWARF</race>
 		<sex>FEMALE</sex>
@@ -321,7 +321,7 @@
 			<height normal="21.1" />
 		</collision>
 	</npc>
-	<npc id="31264" level="80" type="Folk" name="Olsun" title="Symbol Maker">
+	<npc id="31264" level="80" type="Folk" name="Olsun" title="Tattoo Master">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/31400-31499.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/31400-31499.xml
index 024b309b87..ce14b4d3ff 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/31400-31499.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/31400-31499.xml
@@ -75,7 +75,7 @@
 			<height normal="21" />
 		</collision>
 	</npc>
-	<npc id="31454" level="80" type="Folk" name="Ghost of Wigoth">
+	<npc id="31454" level="80" type="Folk" name="Imperial Tomb Ghost">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/31600-31699.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/31600-31699.xml
index c05647af1e..8f0957797d 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/31600-31699.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/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>
@@ -76,7 +76,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="31603" level="70" type="Folk" name="Black Cat" title="Hunter Guild Member">
+	<npc id="31603" level="70" type="Folk" name="Black Cat" title="Hunters' Guild">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="107" />
@@ -1135,7 +1135,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="31639" level="70" type="Folk" name="Kain Van Halter">
+	<npc id="31639" level="70" type="Folk" name="Kain van Halter">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="110" />
@@ -1363,7 +1363,7 @@
 			<height normal="21.5" />
 		</collision>
 	</npc>
-	<npc id="31646" level="70" type="Folk" name="Tablet Of Vision">
+	<npc id="31646" level="70" type="Folk" name="Tablet of Vision">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="0" />
@@ -1943,7 +1943,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="31688" level="70" type="Folk" name="Olympiad Manager">
+	<npc id="31688" level="70" type="Folk" name="Saige" title="Olympiad Manager">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="63" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/32400-32499.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/32400-32499.xml
index 28e34d4cd8..1798bc7506 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/32400-32499.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/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="Game Assistant" title="Special">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/33800-33899.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/33800-33899.xml
index 62450a7173..f13d503898 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/33800-33899.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/33800-33899.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="33833" level="80" type="Folk" name="Spirit Thunder" title="Spiritshot Maker">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
@@ -19,7 +19,7 @@
 			<height normal="17.5" />
 		</collision>
 	</npc>
-	<npc id="33888" level="80" type="Folk" name="Santa Claus" title="Merry Christmas 2017">
+	<npc id="33888" level="80" type="Folk" name="Santa Claus" title="Event Manager">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/33900-33999.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/33900-33999.xml
index cc5c1193cc..07ae5fd2c0 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/33900-33999.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/33900-33999.xml
@@ -23,7 +23,7 @@
 			<height normal="10.5" />
 		</collision>
 	</npc>
-	<npc id="33923" level="80" type="Folk" name="Belldandy" title="12th Anniversary Event!">
+	<npc id="33923" level="80" type="Folk" name="Belldandy" title="Anniversary Event">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ANIMAL</race>
 		<sex>FEMALE</sex>
@@ -46,7 +46,7 @@
 			<height normal="32" />
 		</collision>
 	</npc>
-	<npc id="33977" level="80" type="Folk" name="Veruti" title="Alchemist">
+	<npc id="33977" level="80" type="Folk" name="Veruti" title="Anniversary Event">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/34000-34099.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/34000-34099.xml
index 11078f3a28..73a8420654 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/34000-34099.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/34000-34099.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="34011" level="80" type="Folk" name="Dandy" title="Dreaming">
+	<npc id="34011" level="80" type="Folk" name="Dandy" title="Happy">
 		<!-- 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="Happy">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -638,7 +638,7 @@
 			<height normal="19.7" />
 		</collision>
 	</npc>
-	<npc id="34049" level="78" type="Teleporter" name="Tritan" title="Researcher">
+	<npc id="34049" level="78" type="Teleporter" name="Tretan" title="Researcher">
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -727,7 +727,7 @@
 			<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="Mr. Cat" title="Tournament Helper">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -746,7 +746,7 @@
 			<height normal="16" />
 		</collision>
 	</npc>
-	<npc id="34055" level="80" type="Folk" name="God of Fire" title="Attribute Master">
+	<npc id="34055" level="80" type="Folk" name="Queen of Hearts" title="Tournament Helper">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -953,7 +953,7 @@
 			<height normal="19.7" />
 		</collision>
 	</npc>
-	<npc id="34066" level="85" type="Folk" name="Expedition Leader Excalibur" title="Event Manager">
+	<npc id="34066" level="85" type="Folk" name="Expedition Leader Caliburs" title="Event Manager">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -972,7 +972,7 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
-	<npc id="34067" level="85" type="Folk" name="Lord" title="Meow Unit">
+	<npc id="34067" level="85" type="Folk" name="Lord" title="Cat Guild">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -991,7 +991,7 @@
 			<height normal="18.5" />
 		</collision>
 	</npc>
-	<npc id="34068" level="85" type="Folk" name="Elder" title="Meow Unit">
+	<npc id="34068" level="85" type="Folk" name="Elder" title="Cat Guild">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1010,7 +1010,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="34069" level="85" type="Folk" name="Mentor" title="Meow Unit">
+	<npc id="34069" level="85" type="Folk" name="Mentor" title="Cat Guild">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1029,7 +1029,7 @@
 			<height normal="45" />
 		</collision>
 	</npc>
-	<npc id="34070" level="85" type="Folk" name="Merchant" title="Meow Unit">
+	<npc id="34070" level="85" type="Folk" name="Merchant" title="Cat Guild">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1048,7 +1048,7 @@
 			<height normal="20.5" />
 		</collision>
 	</npc>
-	<npc id="34071" level="85" type="Folk" name="Buff Helper" title="Meow Unit">
+	<npc id="34071" level="85" type="Folk" name="Buff Helper" title="Cat Guild">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1067,7 +1067,7 @@
 			<height normal="16.75" />
 		</collision>
 	</npc>
-	<npc id="34072" level="85" type="Folk" name="Recovery Helper" title="Meow Unit">
+	<npc id="34072" level="85" type="Folk" name="Recovery Helper" title="Cat Guild">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1086,7 +1086,7 @@
 			<height normal="15.9" />
 		</collision>
 	</npc>
-	<npc id="34073" level="85" type="Folk" name="Special Goods Trader" title="Meow Unit">
+	<npc id="34073" level="85" type="Folk" name="Special Goods Trader" title="Cat Guild">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1299,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="Captive Tulio" title="Gift Cube">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -1333,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>
@@ -1422,7 +1422,7 @@
 			<height normal="18.5" />
 		</collision>
 	</npc>
-	<npc id="34092" level="85" type="Folk" name="Riptin" title="Merry Christmas 2017">
+	<npc id="34092" level="85" type="Folk" name="Riptin" title="Event Manager">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1441,7 +1441,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="34093" level="85" type="Folk" name="Fioty" title="Event Reward">
+	<npc id="34093" level="85" type="Folk" name="Fioty" title="Reward Master">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1460,7 +1460,7 @@
 			<height normal="34.875" />
 		</collision>
 	</npc>
-	<npc id="34094" level="85" type="Folk" name="Mysterious Cake" title="15th Anniversary">
+	<npc id="34094" level="85" type="Folk" name="Mysterious Cake" title="Anniversary">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1479,7 +1479,7 @@
 			<height normal="82.5" />
 		</collision>
 	</npc>
-	<npc id="34095" level="85" type="Folk" name="Magic Laboratory Assistant" title="Merry Christmas 2017">
+	<npc id="34095" level="85" type="Folk" name="Magic Laboratory Assistant" title="Event Manager">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/34100-34199.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/34100-34199.xml
index 10dd84a1ab..f27e24bdf0 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/34100-34199.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/34100-34199.xml
@@ -38,7 +38,7 @@
 			<height normal="52.8" />
 		</collision>
 	</npc>
-	<npc id="34102" level="85" type="Folk" name="Heppy" title="Merry Christmas 2017">
+	<npc id="34102" level="85" type="Folk" name="Heppy" title="Event Manager">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -57,7 +57,7 @@
 			<height normal="22.25" />
 		</collision>
 	</npc>
-	<npc id="34103" level="85" type="Folk" name="Nuia" title="Event Reward">
+	<npc id="34103" level="85" type="Folk" name="Nuia" title="Reward Master">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -306,7 +306,7 @@
 			<height normal="25" />
 		</collision>
 	</npc>
-	<npc id="34116" level="85" type="Guard" name="Putin" title="Marksman">
+	<npc id="34116" level="85" type="Guard" name="Pugin" title="Marksman">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>KAMAEL</race>
 		<sex>MALE</sex>
@@ -345,7 +345,7 @@
 			<height normal="18" />
 		</collision>
 	</npc>
-	<npc id="34163" level="85" type="Folk" name="Augustina">
+	<npc id="34163" level="85" type="Folk" name="Aylein" title="Baium's Trial Guide">
 		<race>ELF</race>
 		<sex>FEMALE</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -698,7 +698,7 @@
 			<height normal="16.7" />
 		</collision>
 	</npc>
-	<npc id="34136" level="85" type="Folk" name="Artheo Ken Sider" title="Military Association Leader">
+	<npc id="34136" level="85" type="Folk" name="Artheo Ken Sider" title="Chief Commander">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1173,7 +1173,7 @@
 			<height normal="26" />
 		</collision>
 	</npc>
-	<npc id="34161" level="85" type="Teleporter" name="Tarr" title="Teleporter">
+	<npc id="34161" level="85" type="Teleporter" name="Tarr" title="Lair Merchant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -1713,7 +1713,7 @@
 		<sex>FEMALE</sex>
 		<acquire exp="35866" sp="5207" attributeExp="1204"/>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="118446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="40" />
 				<run ground="128" />
@@ -1749,7 +1749,7 @@
 		<sex>FEMALE</sex>
 		<acquire exp="35866" sp="5207" attributeExp="1204"/>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="118446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="36" />
 				<run ground="180" />
@@ -1768,7 +1768,7 @@
 		<sex>FEMALE</sex>
 		<acquire exp="35866" sp="5207" attributeExp="1204"/>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="118446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="3038" hpRegen="10.5" mp="1674" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="1" />
@@ -1804,7 +1804,7 @@
 		<sex>FEMALE</sex>
 		<acquire exp="35866" sp="5207" attributeExp="1204"/>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="118446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2823" hpRegen="10.5" mp="1507" mpRegen="3.6" />
 			<speed>
 				<walk ground="10" />
 				<run ground="1" />
@@ -1916,7 +1916,7 @@
 		<sex>FEMALE</sex>
 		<acquire exp="35866" sp="5207" attributeExp="1204"/>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="118446" hpRegen="10.5" mp="2355" mpRegen="3.6" />
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
 			<speed>
 				<walk ground="50" />
 				<run ground="120" />
@@ -1935,7 +1935,7 @@
 		<sex>FEMALE</sex>
 		<acquire exp="35866" sp="5207" attributeExp="1204"/>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
-			<vitals hp="118446" hpRegen="10.5" mp="2355" 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_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/34200-34299.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/34200-34299.xml
index 27b6d69820..f6c270cc78 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/34200-34299.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/34200-34299.xml
@@ -317,7 +317,7 @@
 			<height normal="20" />
 		</collision>
 	</npc>
-	<npc id="34216" level="85" type="Folk" name="">
+	<npc id="34216" level="85" type="Folk" name="Bonnie" title="Keber Hunter">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
@@ -655,6 +655,462 @@
 			<height normal="20.4" />
 		</collision>
 	</npc>
+	<npc id="34234" level="85" type="Folk" name="Viola" title="Garden 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="2578" hpRegen="10.5" mp="1345" 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="18" />
+			<height normal="31.5" />
+		</collision>
+	</npc>
+	<npc id="34235" level="85" type="Folk" name="Safron" title="Garden 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="2578" hpRegen="10.5" mp="1345" 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="35.25" />
+		</collision>
+	</npc>
+	<npc id="34236" level="85" type="Folk" name="Phiolet" title="Teleport 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="2578" hpRegen="10.5" mp="1345" 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="48" />
+		</collision>
+	</npc>
+	<npc id="34237" level="85" type="Folk" name="Berd" title="Teleport 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="2578" hpRegen="10.5" mp="1345" 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="48" />
+		</collision>
+	</npc>
+	<npc id="34238" level="85" type="Folk" name="Dobi" title="Messenger of Genesis">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2578" hpRegen="10.5" mp="1345" 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.3" />
+			<height normal="29.25" />
+		</collision>
+	</npc>
+	<npc id="34239" level="85" type="Folk" name="Battlefield 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="2578" hpRegen="10.5" mp="1345" 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.5" />
+			<height normal="23.5" />
+		</collision>
+	</npc>
+	<npc id="34240" level="85" type="Folk" name="Lionel Hunter">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<speed>
+				<walk ground="36" />
+				<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="22.5" />
+		</collision>
+	</npc>
+	<npc id="34241" level="85" type="Folk" name="Herphah" title="Antharas' Tracker">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2578" hpRegen="10.5" mp="1345" 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="18" />
+			<height normal="56" />
+		</collision>
+	</npc>
+	<npc id="34242" level="85" type="Folk" name="Hardin">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2578" hpRegen="10.5" mp="1345" 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="10" />
+			<height normal="23" />
+		</collision>
+	</npc>
+	<npc id="34243" level="85" type="Folk" name="Grima" title="Gatekeeper">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2578" hpRegen="10.5" mp="1345" 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="9.6" />
+			<height normal="30.6" />
+		</collision>
+	</npc>
+	<npc id="34244" level="85" type="Folk" name="Teleport">
+		<!-- AUTO GENERATED NPC 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="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="57" />
+			<height normal="74" />
+		</collision>
+	</npc>
+	<npc id="34245" level="85" type="Folk" name="Capture Device">
+		<!-- AUTO GENERATED NPC 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="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="21" />
+			<height normal="53" />
+		</collision>
+	</npc>
+	<npc id="34247" level="85" type="Folk" name="Efri">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2578" hpRegen="10.5" mp="1345" 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="22.5" />
+		</collision>
+	</npc>
+	<npc id="34248" level="85" type="Folk" name="Deton" title="Antharas' Tracker">
+		<!-- AUTO GENERATED NPC 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="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="12" />
+			<height normal="20" />
+		</collision>
+	</npc>
+	<npc id="34249" level="85" type="Folk" name="Juny" title="Special Replenishment">
+		<!-- AUTO GENERATED NPC 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="6.5" />
+			<height normal="17.7" />
+		</collision>
+	</npc>
+	<npc id="34250" level="85" type="Folk" name="Motty" title="1st Floor 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="2578" hpRegen="10.5" mp="1345" 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" />
+		</collision>
+	</npc>
+	<npc id="34251" level="85" type="Folk" name="Drudy" title="2nd Floor 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="2578" hpRegen="10.5" mp="1345" 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="34252" level="85" type="Folk" name="Seechi" title="3rd Floor 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="2578" hpRegen="10.5" mp="1345" 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="19.7" />
+		</collision>
+	</npc>
+	<npc id="34253" level="85" type="Folk" name="Mammon" title="Battlefield Marketeer">
+		<!-- AUTO GENERATED NPC 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="22" />
+			<height normal="18" />
+		</collision>
+	</npc>
+	<npc id="34254" level="85" type="Folk" name="Lionel Hunter">
+		<!-- AUTO GENERATED NPC 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="36" />
+				<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="22.5" />
+		</collision>
+	</npc>
+	<npc id="34255" level="85" type="Folk" name="Treasure Chest" title="Aden Lord's Property">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="347061" hpRegen="10.5" mp="1188" 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="27.5" />
+			<height normal="24.5" />
+		</collision>
+	</npc>
+	<npc id="34256" level="85" type="Folk" name="Holly" title="Grocer">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2578" hpRegen="10.5" mp="1345" 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="23" />
+		</collision>
+	</npc>
+	<npc id="34257" level="85" type="Folk" name="Romp" title="Warehouse Keeper">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2578" hpRegen="10.5" mp="1345" 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" />
+		</collision>
+	</npc>
+	<npc id="34258" level="85" type="Folk" name="Parme" title="Purge Squad 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="28" />
+				<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="23.5" />
+		</collision>
+	</npc>
 	<npc id="34259" level="80" type="Folk" name="Dandy" title="Dreaming">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
@@ -1185,7 +1641,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="34283" level="80" type="Folk" name="2015 Blue Snow Man">
+	<npc id="34283" level="80" type="Folk" name="2015 Blue Snowman">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>HUMAN</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/34300-34399.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/34300-34399.xml
index 493bd2a5cd..2dcb220f71 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/34300-34399.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/34300-34399.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
-	<npc id="34300" level="80" type="Folk" name="Wizards" title="Cupid's Messenger">
+	<npc id="34300" level="80" type="Folk" name="Wizards" title="Event Manager">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
@@ -19,7 +19,179 @@
 			<height normal="15" />
 		</collision>
 	</npc>
-	<npc id="34349" level="80" type="Folk" name="Bliss" title="Magical Flame Merchant">
+	<npc id="34301" level="85" type="Folk" name="Cave Control Device">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="8405840" hpRegen="10.5" mp="3693" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<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="38" />
+			<height normal="40" />
+		</collision>
+	</npc>
+	<npc id="34302" level="85" type="Folk" name="Spirit Chest" title="Krateth">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="2578" hpRegen="10.5" mp="1345" mpRegen="3.6" />
+			<speed>
+				<walk ground="30" />
+				<run ground="120" />
+			</speed>
+			<attack physical="1950.2231755595" magical="1331.5869440987" critical="4" attackSpeed="253" range="40" />
+			<defence physical="405.85106382979" magical="297.0297029703" />
+		</stats>
+		<status attackable="false" />
+		<collision>
+			<radius normal="17" />
+			<height normal="19.5" />
+		</collision>
+	</npc>
+	<npc id="34303" level="85" type="Folk" name="Rampad" title="Tomb 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="2578" hpRegen="10.5" mp="1345" 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="12" />
+			<height normal="29.4" />
+		</collision>
+	</npc>
+	<npc id="34304" level="85" type="Folk" name="Dream Priestess" title="Dream Reader">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="347061" hpRegen="10.5" mp="1188" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<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="8" />
+			<height normal="25" />
+		</collision>
+	</npc>
+	<npc id="34312" level="85" type="Folk" name="Rascal" title="Dream 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="347061" hpRegen="10.5" mp="1188" mpRegen="3.6" />
+			<speed>
+				<walk ground="15" />
+				<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="8" />
+			<height normal="12.8" />
+		</collision>
+	</npc>
+	<npc id="34313" level="85" type="Folk" name="Holy Grail's Raider" title="Dream Guide">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<equipment rhand="95436" /> <!-- Guardian Messenger's Spear -->
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="347061" hpRegen="10.5" mp="1188" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<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="13" />
+			<height normal="37.5" />
+		</collision>
+	</npc>
+	<npc id="34314" level="85" type="Folk" name="Ventus' Maid" title="Dream 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="347061" hpRegen="10.5" mp="1188" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<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="30" />
+			<height normal="36.5" />
+		</collision>
+	</npc>
+	<npc id="34315" level="85" type="Folk" name="Red Draconid Traitor" title="Dream 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="347061" hpRegen="10.5" mp="1188" mpRegen="3.6" />
+			<speed>
+				<walk ground="45" />
+				<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="45" />
+		</collision>
+	</npc>
+	<npc id="34316" level="85" type="Folk" name="Teleporter Cat" title="Dream 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="347061" hpRegen="10.5" mp="1188" mpRegen="3.6" />
+			<speed>
+				<walk ground="50" />
+				<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="20" />
+			<height normal="45" />
+		</collision>
+	</npc>
+	<npc id="34349" level="80" type="Folk" name="Bliss" title="Magic Fire Merchant">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>ETC</race>
 		<sex>FEMALE</sex>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/35100-35199.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/35100-35199.xml
index c70b434c69..414e1083c9 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/35100-35199.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/35100-35199.xml
@@ -3542,7 +3542,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="35179" level="70" type="Folk" name="Mass Gatekeeper" title="Giran">
+	<npc id="35179" level="70" type="Folk" name="Gatekeeper" title="Giran">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="92" />
@@ -3752,7 +3752,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="35184" level="75" type="Merchant" name="Chamberlain of Light">
+	<npc id="35184" level="75" type="Merchant" name="Chamberlain">
 		<parameters>
 			<param name="fnAgitBuff" value="castlebuff" />
 			<param name="MoveAroundSocial" value="0" />
@@ -3922,7 +3922,7 @@
 			<height normal="19" />
 		</collision>
 	</npc>
-	<npc id="35188" level="70" type="Folk" name="Holmes" title="Herald from Giran">
+	<npc id="35188" level="70" type="Folk" name="Holmes" title="Giran Herald">
 		<parameters>
 			<param name="MoveAroundSocial" value="0" />
 			<param name="MoveAroundSocial1" value="92" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/35300-35399.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/35300-35399.xml
index 1928eb0859..d2fa73a1d2 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/35300-35399.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/35300-35399.xml
@@ -951,7 +951,7 @@
 			<height normal="24" />
 		</collision>
 	</npc>
-	<npc id="35322" level="20" type="Artefact" name="Altar of Fire">
+	<npc id="35322" level="20" type="Artefact" name="Goddard Holy Artifact">
 		<race>ETC</race>
 		<sex>ETC</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -985,7 +985,7 @@
 			<height normal="97" />
 		</collision>
 	</npc>
-	<npc id="35323" level="20" type="Artefact" name="Altar of Water">
+	<npc id="35323" level="20" type="Artefact" name="Goddard Holy Artifact">
 		<race>ETC</race>
 		<sex>ETC</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -2780,7 +2780,7 @@
 			<height normal="17" />
 		</collision>
 	</npc>
-	<npc id="35363" level="70" type="Merchant" name="Chamberlain of Light">
+	<npc id="35363" level="70" type="Merchant" name="Chamberlain">
 		<parameters>
 			<param name="fnAgitBuff" value="castlebuff" />
 			<param name="MoveAroundSocial" value="0" />
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/35500-35599.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/35500-35599.xml
index 1e27c47676..061d88175a 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/35500-35599.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/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="Wind Altar">
 		<race>ETC</race>
 		<sex>ETC</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
@@ -680,7 +680,7 @@
 			<height normal="65" />
 		</collision>
 	</npc>
-	<npc id="35515" level="20" type="Artefact" name="Altar of Earth">
+	<npc id="35515" level="20" type="Artefact" name="Earth Altar">
 		<race>ETC</race>
 		<sex>ETC</sex>
 		<stats str="40" int="21" dex="30" wit="20" con="43" men="10">
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/36700-36799.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/36700-36799.xml
index 5cabbe7aca..f2be340ce5 100644
--- a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/36700-36799.xml
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/36700-36799.xml
@@ -777,4 +777,80 @@
 			<height normal="23.5" />
 		</collision>
 	</npc>
+	<npc id="36796" level="85" type="Folk" name="Central Object for Capture">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="12000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<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="25" />
+			<height normal="120" />
+		</collision>
+	</npc>
+	<npc id="36797" level="85" type="Folk" name="Central Object for Capture" title="Captured">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="12000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<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="25" />
+			<height normal="120" />
+		</collision>
+	</npc>
+	<npc id="36798" level="85" type="Folk" name="Inner Object for Capture">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="4000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<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="25" />
+			<height normal="120" />
+		</collision>
+	</npc>
+	<npc id="36799" level="85" type="Folk" name="Inner Object for Capture" title="Captured">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="4000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<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="25" />
+			<height normal="120" />
+		</collision>
+	</npc>
 </list>
diff --git a/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/36800-36899.xml b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/36800-36899.xml
new file mode 100644
index 0000000000..b954f85b05
--- /dev/null
+++ b/L2J_Mobius_Essence_6.0_BattleChronicle/dist/game/data/stats/npcs/36800-36899.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/npcs.xsd">
+	<npc id="36800" level="85" type="Folk" name="Outer Object for Capture">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<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="25" />
+			<height normal="120" />
+		</collision>
+	</npc>
+	<npc id="36801" level="85" type="Folk" name="Outer Object for Capture" title="Captured">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="1000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="1" />
+				<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="25" />
+			<height normal="120" />
+		</collision>
+	</npc>
+	<npc id="36802" level="85" type="Folk" name="Golem Mammoth">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="12000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<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="120" />
+			<height normal="137" />
+		</collision>
+	</npc>
+	<npc id="36803" level="85" type="Folk" name="Golem Mammoth">
+		<!-- AUTO GENERATED NPC TODO: FIX IT -->
+		<race>ETC</race>
+		<sex>FEMALE</sex>
+		<stats str="88" int="79" dex="55" wit="78" con="82" men="78">
+			<vitals hp="12000000" hpRegen="10.5" mp="18000" mpRegen="3.6" />
+			<speed>
+				<walk ground="60" />
+				<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="120" />
+			<height normal="137" />
+		</collision>
+	</npc>
+	<npc id="36804" level="85" type="Folk" name="Hero's Weapon">
+		<!-- AUTO GENERATED NPC 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="0" />
+				<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="35" />
+		</collision>
+	</npc>
+</list>