diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Giran/Giran.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Giran/Giran.xml
index f301813411..8f330be2ce 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Giran/Giran.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/spawns/Giran/Giran.xml
@@ -96,6 +96,8 @@
 			<npc id="35459" x="81920" y="151968" z="-3512" heading="0" respawnTime="60sec" /> <!-- Regina - Clan Hall Manager -->
 			<npc id="35460" x="81808" y="151776" z="-3528" heading="32000" respawnTime="60sec" /> <!-- Trey - Clan Hall Gatekeeper -->
 			<npc id="34053" x="81749" y="147485" z="-3471" heading="16500" respawnTime="60sec" /> <!-- Svein - Attribute Master -->
+			<npc id="18424" x="82215" y="148643" z="-3416" heading="64265" respawnTime="60sec" /> <!-- Hermit -->
+			<npc id="18423" x="82194" y="148595" z="-3416" heading="2902" respawnTime="60sec" /> <!-- Flaming Sword -->
 		</group>
 	</spawn>
 </list>
diff --git a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/npcs/18400-18499.xml b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/npcs/18400-18499.xml
index 94c2ddfaeb..16d27a7f06 100644
--- a/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/npcs/18400-18499.xml
+++ b/L2J_Mobius_Essence_4.2_DwellingOfSpirits/dist/game/data/stats/npcs/18400-18499.xml
@@ -772,7 +772,7 @@
 			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
 		</skillList>
 	</npc>
-	<npc id="18423" level="75" type="Monster" name="">
+	<npc id="18423" level="75" type="Folk" name="">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>ETC</sex>
@@ -806,7 +806,7 @@
 			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="18424" level="75" type="Monster" name="Hermit">
+	<npc id="18424" level="75" type="Folk" name="Hermit">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DIVINE</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Giran/Giran.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Giran/Giran.xml
index fc0a759bff..8ba4a82afb 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Giran/Giran.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Giran/Giran.xml
@@ -111,6 +111,8 @@
 			<npc id="35459" x="81920" y="151968" z="-3512" heading="0" respawnTime="60sec" /> <!-- Regina - Clan Hall Manager -->
 			<npc id="35460" x="81808" y="151776" z="-3528" heading="32000" respawnTime="60sec" /> <!-- Trey - Clan Hall Gatekeeper -->
 			<npc id="34053" x="81749" y="147485" z="-3471" heading="16500" respawnTime="60sec" /> <!-- Svein - Attribute Master -->
+			<npc id="18424" x="82215" y="148643" z="-3416" heading="64265" respawnTime="60sec" /> <!-- Hermit -->
+			<npc id="18423" x="82194" y="148595" z="-3416" heading="2902" respawnTime="60sec" /> <!-- Flaming Sword -->
 		</group>
 	</spawn>
 </list>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/npcs/18400-18499.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/npcs/18400-18499.xml
index 48d4e96af6..8447c8c2dd 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/npcs/18400-18499.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/stats/npcs/18400-18499.xml
@@ -772,7 +772,7 @@
 			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
 		</skillList>
 	</npc>
-	<npc id="18423" level="75" type="Monster" name="">
+	<npc id="18423" level="75" type="Folk" name="">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>ETC</sex>
@@ -806,7 +806,7 @@
 			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="18424" level="75" type="Monster" name="Hermit">
+	<npc id="18424" level="75" type="Folk" name="Hermit">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DIVINE</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Giran/Giran.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Giran/Giran.xml
index fc0a759bff..8ba4a82afb 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Giran/Giran.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/spawns/Giran/Giran.xml
@@ -111,6 +111,8 @@
 			<npc id="35459" x="81920" y="151968" z="-3512" heading="0" respawnTime="60sec" /> <!-- Regina - Clan Hall Manager -->
 			<npc id="35460" x="81808" y="151776" z="-3528" heading="32000" respawnTime="60sec" /> <!-- Trey - Clan Hall Gatekeeper -->
 			<npc id="34053" x="81749" y="147485" z="-3471" heading="16500" respawnTime="60sec" /> <!-- Svein - Attribute Master -->
+			<npc id="18424" x="82215" y="148643" z="-3416" heading="64265" respawnTime="60sec" /> <!-- Hermit -->
+			<npc id="18423" x="82194" y="148595" z="-3416" heading="2902" respawnTime="60sec" /> <!-- Flaming Sword -->
 		</group>
 	</spawn>
 </list>
diff --git a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/npcs/18400-18499.xml b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/npcs/18400-18499.xml
index aef249ef6e..9e53a36044 100644
--- a/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/npcs/18400-18499.xml
+++ b/L2J_Mobius_Essence_6.2_Vanguard/dist/game/data/stats/npcs/18400-18499.xml
@@ -772,7 +772,7 @@
 			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
 		</skillList>
 	</npc>
-	<npc id="18423" level="75" type="Monster" name="">
+	<npc id="18423" level="75" type="Folk" name="">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>ETC</sex>
@@ -806,7 +806,7 @@
 			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="18424" level="75" type="Monster" name="Hermit">
+	<npc id="18424" level="75" type="Folk" name="Hermit">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DIVINE</race>
 		<sex>MALE</sex>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/spawns/Giran/Giran.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/spawns/Giran/Giran.xml
index fc0a759bff..8ba4a82afb 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/spawns/Giran/Giran.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/spawns/Giran/Giran.xml
@@ -111,6 +111,8 @@
 			<npc id="35459" x="81920" y="151968" z="-3512" heading="0" respawnTime="60sec" /> <!-- Regina - Clan Hall Manager -->
 			<npc id="35460" x="81808" y="151776" z="-3528" heading="32000" respawnTime="60sec" /> <!-- Trey - Clan Hall Gatekeeper -->
 			<npc id="34053" x="81749" y="147485" z="-3471" heading="16500" respawnTime="60sec" /> <!-- Svein - Attribute Master -->
+			<npc id="18424" x="82215" y="148643" z="-3416" heading="64265" respawnTime="60sec" /> <!-- Hermit -->
+			<npc id="18423" x="82194" y="148595" z="-3416" heading="2902" respawnTime="60sec" /> <!-- Flaming Sword -->
 		</group>
 	</spawn>
 </list>
diff --git a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/npcs/18400-18499.xml b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/npcs/18400-18499.xml
index 67bbce0bff..4862547de2 100644
--- a/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/npcs/18400-18499.xml
+++ b/L2J_Mobius_Essence_6.3_Crusader/dist/game/data/stats/npcs/18400-18499.xml
@@ -772,7 +772,7 @@
 			<skill id="4390" level="1" /> <!-- Mystic Immunity -->
 		</skillList>
 	</npc>
-	<npc id="18423" level="75" type="Monster" name="">
+	<npc id="18423" level="75" type="Folk" name="">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>CONSTRUCT</race>
 		<sex>ETC</sex>
@@ -806,7 +806,7 @@
 			<skill id="4045" level="1" /> <!-- Full Magic Attack Resistance -->
 		</skillList>
 	</npc>
-	<npc id="18424" level="75" type="Monster" name="Hermit">
+	<npc id="18424" level="75" type="Folk" name="Hermit">
 		<!-- AUTO GENERATED NPC TODO: FIX IT -->
 		<race>DIVINE</race>
 		<sex>MALE</sex>