diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Dion/DionCastle.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Castles/Dion.xml
similarity index 92%
rename from L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Dion/DionCastle.xml
rename to L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Castles/Dion.xml
index 6cda619779..e003841452 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Dion/DionCastle.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Castles/Dion.xml
@@ -13,9 +13,8 @@
 			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
 			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
 			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
-			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
 			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
 			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
 		</group>
 	</spawn>
-</list>
\ No newline at end of file
+</list>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Dion/TownOfDion.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Dion/TownOfDion.xml
index c51977ef1a..f5dca07ce1 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Dion/TownOfDion.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Dion/TownOfDion.xml
@@ -2,6 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="TownOfDion">
 		<group>
+			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
 			<npc id="30057" x="20777" y="144971" z="-3064" heading="53248" respawnTime="60sec" /> <!-- Amidol -->
 			<npc id="30058" x="20750" y="144432" z="-3064" heading="8192" respawnTime="60sec" /> <!-- Holvas -->
 			<npc id="30059" x="15631" y="142885" z="-2688" heading="16000" respawnTime="60sec" /> <!-- Trisha -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Dion/DionCastle.xml b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Castles/Dion.xml
similarity index 92%
rename from L2J_Mobius_2.5_Underground/dist/game/data/spawns/Dion/DionCastle.xml
rename to L2J_Mobius_2.5_Underground/dist/game/data/spawns/Castles/Dion.xml
index 6cda619779..e003841452 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Dion/DionCastle.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Castles/Dion.xml
@@ -13,9 +13,8 @@
 			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
 			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
 			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
-			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
 			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
 			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
 		</group>
 	</spawn>
-</list>
\ No newline at end of file
+</list>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Dion/TownOfDion.xml b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Dion/TownOfDion.xml
index c51977ef1a..f5dca07ce1 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Dion/TownOfDion.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Dion/TownOfDion.xml
@@ -2,6 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="TownOfDion">
 		<group>
+			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
 			<npc id="30057" x="20777" y="144971" z="-3064" heading="53248" respawnTime="60sec" /> <!-- Amidol -->
 			<npc id="30058" x="20750" y="144432" z="-3064" heading="8192" respawnTime="60sec" /> <!-- Holvas -->
 			<npc id="30059" x="15631" y="142885" z="-2688" heading="16000" respawnTime="60sec" /> <!-- Trisha -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Dion/DionCastle.xml b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Castles/Dion.xml
similarity index 92%
rename from L2J_Mobius_3.0_Helios/dist/game/data/spawns/Dion/DionCastle.xml
rename to L2J_Mobius_3.0_Helios/dist/game/data/spawns/Castles/Dion.xml
index 6cda619779..e003841452 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Dion/DionCastle.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Castles/Dion.xml
@@ -13,9 +13,8 @@
 			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
 			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
 			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
-			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
 			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
 			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
 		</group>
 	</spawn>
-</list>
\ No newline at end of file
+</list>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Dion/TownOfDion.xml b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Dion/TownOfDion.xml
index 767399e4b2..804a094d9b 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Dion/TownOfDion.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Dion/TownOfDion.xml
@@ -2,6 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="TownOfDion">
 		<group>
+			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
 			<npc id="30057" x="20777" y="144971" z="-3064" heading="53248" respawnTime="60sec" /> <!-- Amidol -->
 			<npc id="30058" x="20750" y="144432" z="-3064" heading="8192" respawnTime="60sec" /> <!-- Holvas -->
 			<npc id="30059" x="15631" y="142885" z="-2688" heading="16000" respawnTime="60sec" /> <!-- Trisha -->
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Dion/DionCastle.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Castles/Dion.xml
similarity index 92%
rename from L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Dion/DionCastle.xml
rename to L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Castles/Dion.xml
index 6cda619779..e003841452 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Dion/DionCastle.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Castles/Dion.xml
@@ -13,9 +13,8 @@
 			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
 			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
 			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
-			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
 			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
 			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
 		</group>
 	</spawn>
-</list>
\ No newline at end of file
+</list>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Dion/TownOfDion.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Dion/TownOfDion.xml
index 767399e4b2..804a094d9b 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Dion/TownOfDion.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Dion/TownOfDion.xml
@@ -2,6 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="TownOfDion">
 		<group>
+			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
 			<npc id="30057" x="20777" y="144971" z="-3064" heading="53248" respawnTime="60sec" /> <!-- Amidol -->
 			<npc id="30058" x="20750" y="144432" z="-3064" heading="8192" respawnTime="60sec" /> <!-- Holvas -->
 			<npc id="30059" x="15631" y="142885" z="-2688" heading="16000" respawnTime="60sec" /> <!-- Trisha -->
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..e003841452
--- /dev/null
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<group>
+			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
+			<npc id="35137" x="20492" y="160363" z="-1992" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35138" x="22412" y="156489" z="-2960" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35138" x="22466" y="156837" z="-2960" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35139" x="22239" y="159048" z="-2656" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35139" x="22305" y="159403" z="-2704" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35140" x="21649" y="160199" z="-2848" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35141" x="22100" y="159781" z="-2848" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
+			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
+			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
+			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Dion/DionCastle.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Dion/DionCastle.xml
deleted file mode 100644
index 6cda619779..0000000000
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Dion/DionCastle.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="DionCastle">
-		<group>
-			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
-			<npc id="35137" x="20492" y="160363" z="-1992" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35138" x="22412" y="156489" z="-2960" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35138" x="22466" y="156837" z="-2960" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35139" x="22239" y="159048" z="-2656" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35139" x="22305" y="159403" z="-2704" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35140" x="21649" y="160199" z="-2848" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35141" x="22100" y="159781" z="-2848" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
-			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
-			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
-			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
-			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Dion/TownOfDion.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Dion/TownOfDion.xml
index 767399e4b2..804a094d9b 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Dion/TownOfDion.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Dion/TownOfDion.xml
@@ -2,6 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="TownOfDion">
 		<group>
+			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
 			<npc id="30057" x="20777" y="144971" z="-3064" heading="53248" respawnTime="60sec" /> <!-- Amidol -->
 			<npc id="30058" x="20750" y="144432" z="-3064" heading="8192" respawnTime="60sec" /> <!-- Holvas -->
 			<npc id="30059" x="15631" y="142885" z="-2688" heading="16000" respawnTime="60sec" /> <!-- Trisha -->
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..e003841452
--- /dev/null
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<group>
+			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
+			<npc id="35137" x="20492" y="160363" z="-1992" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35138" x="22412" y="156489" z="-2960" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35138" x="22466" y="156837" z="-2960" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35139" x="22239" y="159048" z="-2656" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35139" x="22305" y="159403" z="-2704" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35140" x="21649" y="160199" z="-2848" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35141" x="22100" y="159781" z="-2848" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
+			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
+			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
+			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Dion/DionCastle.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Dion/DionCastle.xml
deleted file mode 100644
index 6cda619779..0000000000
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Dion/DionCastle.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="DionCastle">
-		<group>
-			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
-			<npc id="35137" x="20492" y="160363" z="-1992" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35138" x="22412" y="156489" z="-2960" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35138" x="22466" y="156837" z="-2960" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35139" x="22239" y="159048" z="-2656" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35139" x="22305" y="159403" z="-2704" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35140" x="21649" y="160199" z="-2848" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35141" x="22100" y="159781" z="-2848" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
-			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
-			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
-			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
-			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Dion/TownOfDion.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Dion/TownOfDion.xml
index 767399e4b2..804a094d9b 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Dion/TownOfDion.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Dion/TownOfDion.xml
@@ -2,6 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="TownOfDion">
 		<group>
+			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
 			<npc id="30057" x="20777" y="144971" z="-3064" heading="53248" respawnTime="60sec" /> <!-- Amidol -->
 			<npc id="30058" x="20750" y="144432" z="-3064" heading="8192" respawnTime="60sec" /> <!-- Holvas -->
 			<npc id="30059" x="15631" y="142885" z="-2688" heading="16000" respawnTime="60sec" /> <!-- Trisha -->
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..e003841452
--- /dev/null
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<group>
+			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
+			<npc id="35137" x="20492" y="160363" z="-1992" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35138" x="22412" y="156489" z="-2960" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35138" x="22466" y="156837" z="-2960" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35139" x="22239" y="159048" z="-2656" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35139" x="22305" y="159403" z="-2704" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35140" x="21649" y="160199" z="-2848" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35141" x="22100" y="159781" z="-2848" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
+			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
+			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
+			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Dion/DionCastle.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Dion/DionCastle.xml
deleted file mode 100644
index 6cda619779..0000000000
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Dion/DionCastle.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="DionCastle">
-		<group>
-			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
-			<npc id="35137" x="20492" y="160363" z="-1992" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35138" x="22412" y="156489" z="-2960" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35138" x="22466" y="156837" z="-2960" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35139" x="22239" y="159048" z="-2656" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35139" x="22305" y="159403" z="-2704" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35140" x="21649" y="160199" z="-2848" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35141" x="22100" y="159781" z="-2848" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
-			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
-			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
-			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
-			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Dion/TownOfDion.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Dion/TownOfDion.xml
index 767399e4b2..804a094d9b 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Dion/TownOfDion.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Dion/TownOfDion.xml
@@ -2,6 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="TownOfDion">
 		<group>
+			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
 			<npc id="30057" x="20777" y="144971" z="-3064" heading="53248" respawnTime="60sec" /> <!-- Amidol -->
 			<npc id="30058" x="20750" y="144432" z="-3064" heading="8192" respawnTime="60sec" /> <!-- Holvas -->
 			<npc id="30059" x="15631" y="142885" z="-2688" heading="16000" respawnTime="60sec" /> <!-- Trisha -->
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..e003841452
--- /dev/null
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<group>
+			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
+			<npc id="35137" x="20492" y="160363" z="-1992" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35138" x="22412" y="156489" z="-2960" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35138" x="22466" y="156837" z="-2960" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35139" x="22239" y="159048" z="-2656" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35139" x="22305" y="159403" z="-2704" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35140" x="21649" y="160199" z="-2848" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35141" x="22100" y="159781" z="-2848" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
+			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
+			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
+			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Dion/DionCastle.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Dion/DionCastle.xml
deleted file mode 100644
index 6cda619779..0000000000
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Dion/DionCastle.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="DionCastle">
-		<group>
-			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
-			<npc id="35137" x="20492" y="160363" z="-1992" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35138" x="22412" y="156489" z="-2960" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35138" x="22466" y="156837" z="-2960" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35139" x="22239" y="159048" z="-2656" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35139" x="22305" y="159403" z="-2704" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35140" x="21649" y="160199" z="-2848" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35141" x="22100" y="159781" z="-2848" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
-			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
-			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
-			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
-			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Dion/TownOfDion.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Dion/TownOfDion.xml
index 767399e4b2..804a094d9b 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Dion/TownOfDion.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Dion/TownOfDion.xml
@@ -2,6 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="TownOfDion">
 		<group>
+			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
 			<npc id="30057" x="20777" y="144971" z="-3064" heading="53248" respawnTime="60sec" /> <!-- Amidol -->
 			<npc id="30058" x="20750" y="144432" z="-3064" heading="8192" respawnTime="60sec" /> <!-- Holvas -->
 			<npc id="30059" x="15631" y="142885" z="-2688" heading="16000" respawnTime="60sec" /> <!-- Trisha -->
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..e003841452
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<group>
+			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
+			<npc id="35137" x="20492" y="160363" z="-1992" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35138" x="22412" y="156489" z="-2960" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35138" x="22466" y="156837" z="-2960" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35139" x="22239" y="159048" z="-2656" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35139" x="22305" y="159403" z="-2704" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35140" x="21649" y="160199" z="-2848" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35141" x="22100" y="159781" z="-2848" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
+			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
+			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
+			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Dion/DionCastle.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Dion/DionCastle.xml
deleted file mode 100644
index 6cda619779..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Dion/DionCastle.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="DionCastle">
-		<group>
-			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
-			<npc id="35137" x="20492" y="160363" z="-1992" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35138" x="22412" y="156489" z="-2960" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35138" x="22466" y="156837" z="-2960" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35139" x="22239" y="159048" z="-2656" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35139" x="22305" y="159403" z="-2704" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35140" x="21649" y="160199" z="-2848" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35141" x="22100" y="159781" z="-2848" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
-			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
-			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
-			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
-			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Dion/TownOfDion.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Dion/TownOfDion.xml
index 767399e4b2..804a094d9b 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Dion/TownOfDion.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Dion/TownOfDion.xml
@@ -2,6 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="TownOfDion">
 		<group>
+			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
 			<npc id="30057" x="20777" y="144971" z="-3064" heading="53248" respawnTime="60sec" /> <!-- Amidol -->
 			<npc id="30058" x="20750" y="144432" z="-3064" heading="8192" respawnTime="60sec" /> <!-- Holvas -->
 			<npc id="30059" x="15631" y="142885" z="-2688" heading="16000" respawnTime="60sec" /> <!-- Trisha -->
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..e003841452
--- /dev/null
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<group>
+			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
+			<npc id="35137" x="20492" y="160363" z="-1992" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35138" x="22412" y="156489" z="-2960" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35138" x="22466" y="156837" z="-2960" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35139" x="22239" y="159048" z="-2656" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35139" x="22305" y="159403" z="-2704" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35140" x="21649" y="160199" z="-2848" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35141" x="22100" y="159781" z="-2848" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
+			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
+			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
+			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Dion/DionCastle.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Dion/DionCastle.xml
deleted file mode 100644
index 6cda619779..0000000000
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Dion/DionCastle.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="DionCastle">
-		<group>
-			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
-			<npc id="35137" x="20492" y="160363" z="-1992" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35138" x="22412" y="156489" z="-2960" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35138" x="22466" y="156837" z="-2960" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35139" x="22239" y="159048" z="-2656" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35139" x="22305" y="159403" z="-2704" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35140" x="21649" y="160199" z="-2848" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35141" x="22100" y="159781" z="-2848" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
-			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
-			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
-			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
-			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Dion/TownOfDion.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Dion/TownOfDion.xml
index 767399e4b2..804a094d9b 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Dion/TownOfDion.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Dion/TownOfDion.xml
@@ -2,6 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="TownOfDion">
 		<group>
+			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
 			<npc id="30057" x="20777" y="144971" z="-3064" heading="53248" respawnTime="60sec" /> <!-- Amidol -->
 			<npc id="30058" x="20750" y="144432" z="-3064" heading="8192" respawnTime="60sec" /> <!-- Holvas -->
 			<npc id="30059" x="15631" y="142885" z="-2688" heading="16000" respawnTime="60sec" /> <!-- Trisha -->
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..e003841452
--- /dev/null
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<group>
+			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
+			<npc id="35137" x="20492" y="160363" z="-1992" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35138" x="22412" y="156489" z="-2960" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35138" x="22466" y="156837" z="-2960" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35139" x="22239" y="159048" z="-2656" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35139" x="22305" y="159403" z="-2704" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35140" x="21649" y="160199" z="-2848" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35141" x="22100" y="159781" z="-2848" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
+			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
+			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
+			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/Dion/DionCastle.xml b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/Dion/DionCastle.xml
deleted file mode 100644
index 6cda619779..0000000000
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/Dion/DionCastle.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="DionCastle">
-		<group>
-			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
-			<npc id="35137" x="20492" y="160363" z="-1992" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35138" x="22412" y="156489" z="-2960" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35138" x="22466" y="156837" z="-2960" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35139" x="22239" y="159048" z="-2656" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35139" x="22305" y="159403" z="-2704" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35140" x="21649" y="160199" z="-2848" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35141" x="22100" y="159781" z="-2848" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35143" x="21912" y="161608" z="-2224" respawnTime="60sec" /> <!-- Hodler -->
-			<npc id="35144" x="21836" y="160806" z="-2688" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
-			<npc id="35146" x="19132" y="153027" z="-3128" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
-			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
-			<npc id="35649" x="22303" y="160806" z="-2688" heading="45796" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36404" x="22114" y="160675" z="-2848" heading="48698" respawnTime="60sec" /> <!-- Warden -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/Dion/TownOfDion.xml b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/Dion/TownOfDion.xml
index 767399e4b2..804a094d9b 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/Dion/TownOfDion.xml
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/Dion/TownOfDion.xml
@@ -2,6 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="TownOfDion">
 		<group>
+			<npc id="35403" x="17621" y="144920" z="-3032" heading="12288" respawnTime="60sec" /> <!-- Ron -->
 			<npc id="30057" x="20777" y="144971" z="-3064" heading="53248" respawnTime="60sec" /> <!-- Amidol -->
 			<npc id="30058" x="20750" y="144432" z="-3064" heading="8192" respawnTime="60sec" /> <!-- Holvas -->
 			<npc id="30059" x="15631" y="142885" z="-2688" heading="16000" respawnTime="60sec" /> <!-- Trisha -->
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..58e1013205
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnDelay="60" />
+		<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnDelay="60" />
+		<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnDelay="10800" />
+		<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnDelay="10800" />
+		<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnDelay="10800" />
+		<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnDelay="10800" />
+		<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnDelay="60" />
+		<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnDelay="60" />
+		<npc id="35142" x="22172" y="160923" z="-2666" heading="49152" respawnDelay="60" />
+		<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnDelay="60" />
+		<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnDelay="60" />
+		<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnDelay="60" />
+		<npc id="35649" x="22303" y="160806" z="-2690" heading="45796" respawnDelay="60" />
+		<npc id="36404" x="22114" y="160675" z="-2851" heading="48698" respawnDelay="60" />
+	</spawn>
+</list>
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/EpilogueSpawns.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/EpilogueSpawns.xml
index 526421d4aa..6db3ba1458 100644
--- a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/EpilogueSpawns.xml
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/EpilogueSpawns.xml
@@ -10709,7 +10709,6 @@
 		<npc id="30672" x="19092" y="-117187" z="-3136" heading="32768" respawnDelay="60" />
 		<npc id="20456" x="19105" y="8293" z="-3656" heading="35007" respawnDelay="15" />
 		<npc id="22223" x="19118" y="-17877" z="-3208" heading="38291" respawnDelay="60" />
-		<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnDelay="60" />
 		<npc id="21103" x="19137" y="164992" z="-3429" heading="64612" respawnDelay="30" />
 		<npc id="20504" x="19150" y="77170" z="-4409" heading="2366" respawnDelay="71" />
 		<npc id="20504" x="19151" y="78882" z="-4352" heading="57724" respawnDelay="71" />
@@ -10917,7 +10916,6 @@
 		<npc id="21035" x="20479" y="120281" z="-12131" heading="0" respawnDelay="35" />
 		<npc id="22218" x="20481" y="-11899" z="-2792" heading="0" respawnDelay="60" />
 		<npc id="18345" x="20481" y="-9820" z="-2864" heading="0" respawnDelay="60" />
-		<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnDelay="60" />
 		<npc id="21255" x="20504" y="-243694" z="-9586" heading="51304" respawnDelay="120" />
 		<npc id="20930" x="20534" y="184628" z="-2874" heading="16504" respawnDelay="32" />
 		<npc id="22219" x="20541" y="-21785" z="-2912" heading="0" respawnDelay="60" />
@@ -11141,7 +11139,6 @@
 		<npc id="20230" x="21636" y="116035" z="-3758" heading="19725" respawnDelay="25" />
 		<npc id="20157" x="21638" y="117612" z="-3722" heading="57040" respawnDelay="25" />
 		<npc id="21186" x="21639" y="-248545" z="-9584" heading="22361" respawnDelay="120" />
-		<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnDelay="60" />
 		<npc id="20136" x="21655" y="117347" z="-9044" heading="20022" respawnDelay="38" />
 		<npc id="20221" x="21657" y="114330" z="-9045" heading="18596" respawnDelay="38" />
 		<npc id="21186" x="21664" y="-244065" z="-9586" heading="29053" respawnDelay="120" />
@@ -11176,13 +11173,11 @@
 		<npc id="20222" x="21798" y="117516" z="-9044" heading="0" respawnDelay="38" />
 		<npc id="20230" x="21816" y="112322" z="-3703" heading="7133" respawnDelay="25" />
 		<npc id="20478" x="21832" y="-130885" z="-1672" heading="0" respawnDelay="21" />
-		<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnDelay="60" />
 		<npc id="20329" x="21844" y="-111725" z="-3344" heading="0" respawnDelay="68" />
 		<npc id="32108" x="21845" y="-7732" z="-1000" heading="0" respawnDelay="60" />
 		<npc id="20532" x="21861" y="9129" z="-3608" heading="20352" respawnDelay="15" />
 		<npc id="20222" x="21895" y="117202" z="-9044" heading="5856" respawnDelay="38" />
 		<npc id="20341" x="21897" y="-107729" z="-3084" heading="0" respawnDelay="68" />
-		<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnDelay="60" />
 		<npc id="20013" x="21929" y="44838" z="-3632" heading="0" respawnDelay="15" />
 		<npc id="18346" x="21936" y="-17592" z="-2952" heading="0" respawnDelay="60" />
 		<npc id="20222" x="21952" y="113328" z="-9043" heading="60384" respawnDelay="38" />
@@ -11198,16 +11193,13 @@
 		<npc id="22225" x="22032" y="-15872" z="-3016" heading="0" respawnDelay="60" />
 		<npc id="20230" x="22038" y="111590" z="-3728" heading="51862" respawnDelay="25" />
 		<npc id="20543" x="22041" y="-120251" z="-3292" heading="35891" respawnDelay="68" />
-		<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnDelay="60" />
 		<npc id="20543" x="22080" y="-112159" z="-3300" heading="0" respawnDelay="68" />
 		<npc id="18346" x="22088" y="-14407" z="-3096" heading="0" respawnDelay="60" />
 		<npc id="18344" x="22088" y="-13789" z="-3160" heading="0" respawnDelay="60" />
 		<npc id="21038" x="22089" y="113572" z="-9044" heading="0" respawnDelay="38" />
 		<npc id="22223" x="22097" y="-9952" z="-2792" heading="47915" respawnDelay="60" />
-		<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnDelay="60" />
 		<npc id="20265" x="22103" y="146901" z="-3369" heading="61907" respawnDelay="24" />
 		<npc id="20473" x="22108" y="39695" z="-3640" heading="0" respawnDelay="15" />
-		<npc id="36404" x="22114" y="160675" z="-2851" heading="48698" respawnDelay="60" />
 		<npc id="21038" x="22121" y="117812" z="-9044" heading="0" respawnDelay="38" />
 		<npc id="20341" x="22138" y="-107994" z="-3072" heading="0" respawnDelay="68" />
 		<npc id="20473" x="22140" y="40509" z="-3536" heading="0" respawnDelay="15" />
@@ -11218,7 +11210,6 @@
 		<npc id="20222" x="22159" y="114225" z="-9065" heading="856" respawnDelay="38" />
 		<npc id="20205" x="22168" y="148551" z="-3184" heading="30731" respawnDelay="24" />
 		<npc id="20456" x="22172" y="21773" z="-3368" heading="36902" respawnDelay="15" />
-		<npc id="35142" x="22172" y="160923" z="-2666" heading="49152" respawnDelay="60" />
 		<npc id="20504" x="22177" y="79204" z="-4096" heading="29325" respawnDelay="71" />
 		<npc id="20473" x="22190" y="45532" z="-3608" heading="0" respawnDelay="15" />
 		<npc id="20472" x="22190" y="46573" z="-3568" heading="0" respawnDelay="15" />
@@ -11232,7 +11223,6 @@
 		<npc id="20509" x="22218" y="37769" z="-3512" heading="0" respawnDelay="15" />
 		<npc id="20781" x="22236" y="167496" z="-3341" heading="0" respawnDelay="30" />
 		<npc id="20205" x="22238" y="149815" z="-3298" heading="24877" respawnDelay="24" />
-		<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnDelay="10800" />
 		<npc id="22215" x="22253" y="-17062" z="-2976" heading="47449" respawnDelay="1800" />
 		<npc id="20476" x="22265" y="-122640" z="-584" heading="0" respawnDelay="21" />
 		<npc id="21036" x="22267" y="108375" z="-12082" heading="0" respawnDelay="35" />
@@ -11241,8 +11231,6 @@
 		<npc id="20221" x="22291" y="114284" z="-9044" heading="0" respawnDelay="38" />
 		<npc id="20935" x="22292" y="182849" z="-2939" heading="51033" respawnDelay="32" />
 		<npc id="22218" x="22298" y="-12492" z="-2600" heading="0" respawnDelay="60" />
-		<npc id="35649" x="22303" y="160806" z="-2690" heading="45796" respawnDelay="60" />
-		<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnDelay="10800" />
 		<npc id="20751" x="22306" y="107868" z="-12082" heading="3705" respawnDelay="45" />
 		<npc id="20329" x="22308" y="-119712" z="-3292" heading="28672" respawnDelay="68" />
 		<npc id="20930" x="22314" y="177384" z="-3479" heading="57109" respawnDelay="32" />
@@ -11259,7 +11247,6 @@
 		<npc id="20136" x="22391" y="114106" z="-9044" heading="0" respawnDelay="38" />
 		<npc id="21105" x="22401" y="166097" z="-3364" heading="64271" respawnDelay="30" />
 		<npc id="20062" x="22408" y="147650" z="-3267" heading="48877" respawnDelay="24" />
-		<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnDelay="10800" />
 		<npc id="20214" x="22430" y="118923" z="-12082" heading="27132" respawnDelay="35" />
 		<npc id="20213" x="22438" y="120072" z="-12082" heading="16103" respawnDelay="35" />
 		<npc id="21035" x="22444" y="117210" z="-12082" heading="52365" respawnDelay="35" />
@@ -11267,7 +11254,6 @@
 		<npc id="20214" x="22447" y="118347" z="-12082" heading="15918" respawnDelay="35" />
 		<npc id="20473" x="22451" y="43103" z="-3648" heading="0" respawnDelay="15" />
 		<npc id="20341" x="22459" y="-118984" z="-3332" heading="0" respawnDelay="68" />
-		<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnDelay="10800" />
 		<npc id="20472" x="22468" y="46377" z="-3600" heading="0" respawnDelay="15" />
 		<npc id="20935" x="22471" y="187997" z="-3664" heading="0" respawnDelay="32" />
 		<npc id="20543" x="22474" y="-112201" z="-3339" heading="52079" respawnDelay="68" />
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..58e1013205
--- /dev/null
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnDelay="60" />
+		<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnDelay="60" />
+		<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnDelay="10800" />
+		<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnDelay="10800" />
+		<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnDelay="10800" />
+		<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnDelay="10800" />
+		<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnDelay="60" />
+		<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnDelay="60" />
+		<npc id="35142" x="22172" y="160923" z="-2666" heading="49152" respawnDelay="60" />
+		<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnDelay="60" />
+		<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnDelay="60" />
+		<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnDelay="60" />
+		<npc id="35649" x="22303" y="160806" z="-2690" heading="45796" respawnDelay="60" />
+		<npc id="36404" x="22114" y="160675" z="-2851" heading="48698" respawnDelay="60" />
+	</spawn>
+</list>
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/HighFiveSpawns.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/HighFiveSpawns.xml
index 6242051f18..50ce1dca4e 100644
--- a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/HighFiveSpawns.xml
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/HighFiveSpawns.xml
@@ -10756,7 +10756,6 @@
 		<npc id="30672" x="19092" y="-117187" z="-3136" heading="32768" respawnDelay="60" />
 		<npc id="20456" x="19105" y="8293" z="-3656" heading="35007" respawnDelay="15" />
 		<npc id="22223" x="19118" y="-17877" z="-3208" heading="38291" respawnDelay="60" />
-		<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnDelay="60" />
 		<npc id="21103" x="19137" y="164992" z="-3429" heading="64612" respawnDelay="30" />
 		<npc id="20504" x="19150" y="77170" z="-4409" heading="2366" respawnDelay="71" />
 		<npc id="20504" x="19151" y="78882" z="-4352" heading="57724" respawnDelay="71" />
@@ -10965,7 +10964,6 @@
 		<npc id="21035" x="20479" y="120281" z="-12131" heading="0" respawnDelay="35" />
 		<npc id="22218" x="20481" y="-11899" z="-2792" heading="0" respawnDelay="60" />
 		<npc id="18345" x="20481" y="-9820" z="-2864" heading="0" respawnDelay="60" />
-		<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnDelay="60" />
 		<npc id="21255" x="20504" y="-243694" z="-9586" heading="51304" respawnDelay="120" />
 		<npc id="20930" x="20534" y="184628" z="-2874" heading="16504" respawnDelay="32" />
 		<npc id="22219" x="20541" y="-21785" z="-2912" heading="0" respawnDelay="60" />
@@ -11189,7 +11187,6 @@
 		<npc id="20230" x="21636" y="116035" z="-3758" heading="19725" respawnDelay="25" />
 		<npc id="20157" x="21638" y="117612" z="-3722" heading="57040" respawnDelay="25" />
 		<npc id="21186" x="21639" y="-248545" z="-9584" heading="22361" respawnDelay="120" />
-		<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnDelay="60" />
 		<npc id="20136" x="21655" y="117347" z="-9044" heading="20022" respawnDelay="38" />
 		<npc id="20221" x="21657" y="114330" z="-9045" heading="18596" respawnDelay="38" />
 		<npc id="21186" x="21664" y="-244065" z="-9586" heading="29053" respawnDelay="120" />
@@ -11224,13 +11221,11 @@
 		<npc id="20222" x="21798" y="117516" z="-9044" heading="0" respawnDelay="38" />
 		<npc id="20230" x="21816" y="112322" z="-3703" heading="7133" respawnDelay="25" />
 		<npc id="20478" x="21832" y="-130885" z="-1672" heading="0" respawnDelay="21" />
-		<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnDelay="60" />
 		<npc id="20329" x="21844" y="-111725" z="-3344" heading="0" respawnDelay="68" />
 		<npc id="32108" x="21845" y="-7732" z="-1000" heading="0" respawnDelay="60" />
 		<npc id="20532" x="21861" y="9129" z="-3608" heading="20352" respawnDelay="15" />
 		<npc id="20222" x="21895" y="117202" z="-9044" heading="5856" respawnDelay="38" />
 		<npc id="20341" x="21897" y="-107729" z="-3084" heading="0" respawnDelay="68" />
-		<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnDelay="60" />
 		<npc id="20013" x="21929" y="44838" z="-3632" heading="0" respawnDelay="15" />
 		<npc id="18346" x="21936" y="-17592" z="-2952" heading="0" respawnDelay="60" />
 		<npc id="20222" x="21952" y="113328" z="-9043" heading="60384" respawnDelay="38" />
@@ -11246,16 +11241,13 @@
 		<npc id="22225" x="22032" y="-15872" z="-3016" heading="0" respawnDelay="60" />
 		<npc id="20230" x="22038" y="111590" z="-3728" heading="51862" respawnDelay="25" />
 		<npc id="20543" x="22041" y="-120251" z="-3292" heading="35891" respawnDelay="68" />
-		<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnDelay="60" />
 		<npc id="20543" x="22080" y="-112159" z="-3300" heading="0" respawnDelay="68" />
 		<npc id="18346" x="22088" y="-14407" z="-3096" heading="0" respawnDelay="60" />
 		<npc id="18344" x="22088" y="-13789" z="-3160" heading="0" respawnDelay="60" />
 		<npc id="21038" x="22089" y="113572" z="-9044" heading="0" respawnDelay="38" />
 		<npc id="22223" x="22097" y="-9952" z="-2792" heading="47915" respawnDelay="60" />
-		<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnDelay="60" />
 		<npc id="20265" x="22103" y="146901" z="-3369" heading="61907" respawnDelay="24" />
 		<npc id="20473" x="22108" y="39695" z="-3640" heading="0" respawnDelay="15" />
-		<npc id="36404" x="22114" y="160675" z="-2851" heading="48698" respawnDelay="60" />
 		<npc id="21038" x="22121" y="117812" z="-9044" heading="0" respawnDelay="38" />
 		<npc id="20341" x="22138" y="-107994" z="-3072" heading="0" respawnDelay="68" />
 		<npc id="20473" x="22140" y="40509" z="-3536" heading="0" respawnDelay="15" />
@@ -11266,7 +11258,6 @@
 		<npc id="20222" x="22159" y="114225" z="-9065" heading="856" respawnDelay="38" />
 		<npc id="20205" x="22168" y="148551" z="-3184" heading="30731" respawnDelay="24" />
 		<npc id="20456" x="22172" y="21773" z="-3368" heading="36902" respawnDelay="15" />
-		<npc id="35142" x="22172" y="160923" z="-2666" heading="49152" respawnDelay="60" />
 		<npc id="20504" x="22177" y="79204" z="-4096" heading="29325" respawnDelay="71" />
 		<npc id="20473" x="22190" y="45532" z="-3608" heading="0" respawnDelay="15" />
 		<npc id="20472" x="22190" y="46573" z="-3568" heading="0" respawnDelay="15" />
@@ -11280,7 +11271,6 @@
 		<npc id="20509" x="22218" y="37769" z="-3512" heading="0" respawnDelay="15" />
 		<npc id="20781" x="22236" y="167496" z="-3341" heading="0" respawnDelay="30" />
 		<npc id="20205" x="22238" y="149815" z="-3298" heading="24877" respawnDelay="24" />
-		<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnDelay="10800" />
 		<npc id="22215" x="22253" y="-17062" z="-2976" heading="47449" respawnDelay="1800" />
 		<npc id="20476" x="22265" y="-122640" z="-584" heading="0" respawnDelay="21" />
 		<npc id="21036" x="22267" y="108375" z="-12082" heading="0" respawnDelay="35" />
@@ -11289,8 +11279,6 @@
 		<npc id="20221" x="22291" y="114284" z="-9044" heading="0" respawnDelay="38" />
 		<npc id="20935" x="22292" y="182849" z="-2939" heading="51033" respawnDelay="32" />
 		<npc id="22218" x="22298" y="-12492" z="-2600" heading="0" respawnDelay="60" />
-		<npc id="35649" x="22303" y="160806" z="-2690" heading="45796" respawnDelay="60" />
-		<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnDelay="10800" />
 		<npc id="20751" x="22306" y="107868" z="-12082" heading="3705" respawnDelay="45" />
 		<npc id="20329" x="22308" y="-119712" z="-3292" heading="28672" respawnDelay="68" />
 		<npc id="20930" x="22314" y="177384" z="-3479" heading="57109" respawnDelay="32" />
@@ -11307,7 +11295,6 @@
 		<npc id="20136" x="22391" y="114106" z="-9044" heading="0" respawnDelay="38" />
 		<npc id="21105" x="22401" y="166097" z="-3364" heading="64271" respawnDelay="30" />
 		<npc id="20062" x="22408" y="147650" z="-3267" heading="48877" respawnDelay="24" />
-		<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnDelay="10800" />
 		<npc id="20214" x="22430" y="118923" z="-12082" heading="27132" respawnDelay="35" />
 		<npc id="20213" x="22438" y="120072" z="-12082" heading="16103" respawnDelay="35" />
 		<npc id="21035" x="22444" y="117210" z="-12082" heading="52365" respawnDelay="35" />
@@ -11315,7 +11302,6 @@
 		<npc id="20214" x="22447" y="118347" z="-12082" heading="15918" respawnDelay="35" />
 		<npc id="20473" x="22451" y="43103" z="-3648" heading="0" respawnDelay="15" />
 		<npc id="20341" x="22459" y="-118984" z="-3332" heading="0" respawnDelay="68" />
-		<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnDelay="10800" />
 		<npc id="20472" x="22468" y="46377" z="-3600" heading="0" respawnDelay="15" />
 		<npc id="20935" x="22471" y="187997" z="-3664" heading="0" respawnDelay="32" />
 		<npc id="20543" x="22474" y="-112201" z="-3339" heading="52079" respawnDelay="68" />
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..cad66b1b60
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<group>
+			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" />
+			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" />
+			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" />
+			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" />
+			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" />
+			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" />
+			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" />
+			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" />
+			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" />
+			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" />
+			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" />
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Dion/Dion.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Dion/Dion.xml
index e194debc30..c9e68fdd82 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Dion/Dion.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Dion/Dion.xml
@@ -9,12 +9,6 @@
 			<npc id="30622" x="15443" y="119719" z="-12086" heading="32325" respawnTime="60sec" />
 			<npc id="30637" x="23066" y="118944" z="-3705" heading="8192" respawnTime="60sec" />
 			<npc id="30621" x="10580" y="118027" z="-3672" heading="59000" respawnTime="60sec" />
-			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" />
-			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" />
-			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" />
-			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" />
-			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" />
-			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" />
 			<npc id="30595" x="19712" y="143307" z="-3025" heading="47152" respawnTime="60sec" />
 			<npc id="30594" x="21017" y="144481" z="-3065" heading="32768" respawnTime="60sec" />
 			<npc id="30067" x="16269" y="142461" z="-2688" heading="48400" respawnTime="60sec" />
@@ -76,12 +70,8 @@
 			<npc id="30074" x="16937" y="144041" z="-3014" heading="36864" respawnTime="60sec" />
 			<npc id="30073" x="15757" y="144638" z="-3079" heading="36864" respawnTime="60sec" />
 			<npc id="30458" x="19737" y="143122" z="-3028" heading="29500" respawnTime="60sec" />
-			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" />
 			<npc id="30627" x="10133" y="157155" z="-2383" heading="0" respawnTime="60sec" />
-			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" />
 			<npc id="31031" x="20368" y="144912" z="-3088" heading="16384" respawnTime="5sec" />
-			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" />
-			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" />
 			<npc id="30079" x="17836" y="169853" z="-3494" heading="20000" respawnTime="60sec" />
 			<npc id="31773" x="17788" y="169842" z="-3496" heading="20000" respawnTime="60sec" />
 			<npc id="30078" x="16970" y="170391" z="-3496" heading="61440" respawnTime="60sec" />
@@ -98,7 +88,6 @@
 			<npc id="31031" x="13582" y="181667" z="-3500" heading="16384" respawnTime="5sec" />
 			<npc id="30751" x="62008" y="107589" z="-1893" heading="0" respawnTime="60sec" />
 			<npc id="30979" x="50693" y="158674" z="376" heading="0" respawnTime="60sec" />
-			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" />
 			<npc id="30646" x="20360" y="186488" z="-3369" heading="23065" respawnTime="60sec" />
 		</group>
 	</spawn>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..cad66b1b60
--- /dev/null
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<group>
+			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" />
+			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" />
+			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" />
+			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" />
+			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" />
+			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" />
+			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" />
+			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" />
+			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" />
+			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" />
+			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" />
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/Dion/Dion.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/Dion/Dion.xml
index e194debc30..c9e68fdd82 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/Dion/Dion.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/Dion/Dion.xml
@@ -9,12 +9,6 @@
 			<npc id="30622" x="15443" y="119719" z="-12086" heading="32325" respawnTime="60sec" />
 			<npc id="30637" x="23066" y="118944" z="-3705" heading="8192" respawnTime="60sec" />
 			<npc id="30621" x="10580" y="118027" z="-3672" heading="59000" respawnTime="60sec" />
-			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" />
-			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" />
-			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" />
-			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" />
-			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" />
-			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" />
 			<npc id="30595" x="19712" y="143307" z="-3025" heading="47152" respawnTime="60sec" />
 			<npc id="30594" x="21017" y="144481" z="-3065" heading="32768" respawnTime="60sec" />
 			<npc id="30067" x="16269" y="142461" z="-2688" heading="48400" respawnTime="60sec" />
@@ -76,12 +70,8 @@
 			<npc id="30074" x="16937" y="144041" z="-3014" heading="36864" respawnTime="60sec" />
 			<npc id="30073" x="15757" y="144638" z="-3079" heading="36864" respawnTime="60sec" />
 			<npc id="30458" x="19737" y="143122" z="-3028" heading="29500" respawnTime="60sec" />
-			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" />
 			<npc id="30627" x="10133" y="157155" z="-2383" heading="0" respawnTime="60sec" />
-			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" />
 			<npc id="31031" x="20368" y="144912" z="-3088" heading="16384" respawnTime="5sec" />
-			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" />
-			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" />
 			<npc id="30079" x="17836" y="169853" z="-3494" heading="20000" respawnTime="60sec" />
 			<npc id="31773" x="17788" y="169842" z="-3496" heading="20000" respawnTime="60sec" />
 			<npc id="30078" x="16970" y="170391" z="-3496" heading="61440" respawnTime="60sec" />
@@ -98,7 +88,6 @@
 			<npc id="31031" x="13582" y="181667" z="-3500" heading="16384" respawnTime="5sec" />
 			<npc id="30751" x="62008" y="107589" z="-1893" heading="0" respawnTime="60sec" />
 			<npc id="30979" x="50693" y="158674" z="376" heading="0" respawnTime="60sec" />
-			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" />
 			<npc id="30646" x="20360" y="186488" z="-3369" heading="23065" respawnTime="60sec" />
 		</group>
 	</spawn>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..cad66b1b60
--- /dev/null
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<group>
+			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" />
+			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" />
+			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" />
+			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" />
+			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" />
+			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" />
+			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" />
+			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" />
+			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" />
+			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" />
+			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" />
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/Dion/Dion.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/Dion/Dion.xml
index e194debc30..c9e68fdd82 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/Dion/Dion.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/Dion/Dion.xml
@@ -9,12 +9,6 @@
 			<npc id="30622" x="15443" y="119719" z="-12086" heading="32325" respawnTime="60sec" />
 			<npc id="30637" x="23066" y="118944" z="-3705" heading="8192" respawnTime="60sec" />
 			<npc id="30621" x="10580" y="118027" z="-3672" heading="59000" respawnTime="60sec" />
-			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" />
-			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" />
-			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" />
-			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" />
-			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" />
-			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" />
 			<npc id="30595" x="19712" y="143307" z="-3025" heading="47152" respawnTime="60sec" />
 			<npc id="30594" x="21017" y="144481" z="-3065" heading="32768" respawnTime="60sec" />
 			<npc id="30067" x="16269" y="142461" z="-2688" heading="48400" respawnTime="60sec" />
@@ -76,12 +70,8 @@
 			<npc id="30074" x="16937" y="144041" z="-3014" heading="36864" respawnTime="60sec" />
 			<npc id="30073" x="15757" y="144638" z="-3079" heading="36864" respawnTime="60sec" />
 			<npc id="30458" x="19737" y="143122" z="-3028" heading="29500" respawnTime="60sec" />
-			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" />
 			<npc id="30627" x="10133" y="157155" z="-2383" heading="0" respawnTime="60sec" />
-			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" />
 			<npc id="31031" x="20368" y="144912" z="-3088" heading="16384" respawnTime="5sec" />
-			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" />
-			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" />
 			<npc id="30079" x="17836" y="169853" z="-3494" heading="20000" respawnTime="60sec" />
 			<npc id="31773" x="17788" y="169842" z="-3496" heading="20000" respawnTime="60sec" />
 			<npc id="30078" x="16970" y="170391" z="-3496" heading="61440" respawnTime="60sec" />
@@ -98,7 +88,6 @@
 			<npc id="31031" x="13582" y="181667" z="-3500" heading="16384" respawnTime="5sec" />
 			<npc id="30751" x="62008" y="107589" z="-1893" heading="0" respawnTime="60sec" />
 			<npc id="30979" x="50693" y="158674" z="376" heading="0" respawnTime="60sec" />
-			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" />
 			<npc id="30646" x="20360" y="186488" z="-3369" heading="23065" respawnTime="60sec" />
 		</group>
 	</spawn>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..cad66b1b60
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<group>
+			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" />
+			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" />
+			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" />
+			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" />
+			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" />
+			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" />
+			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" />
+			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" />
+			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" />
+			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" />
+			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" />
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Dion/Dion.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Dion/Dion.xml
index e194debc30..c9e68fdd82 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Dion/Dion.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Dion/Dion.xml
@@ -9,12 +9,6 @@
 			<npc id="30622" x="15443" y="119719" z="-12086" heading="32325" respawnTime="60sec" />
 			<npc id="30637" x="23066" y="118944" z="-3705" heading="8192" respawnTime="60sec" />
 			<npc id="30621" x="10580" y="118027" z="-3672" heading="59000" respawnTime="60sec" />
-			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" />
-			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" />
-			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" />
-			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" />
-			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" />
-			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" />
 			<npc id="30595" x="19712" y="143307" z="-3025" heading="47152" respawnTime="60sec" />
 			<npc id="30594" x="21017" y="144481" z="-3065" heading="32768" respawnTime="60sec" />
 			<npc id="30067" x="16269" y="142461" z="-2688" heading="48400" respawnTime="60sec" />
@@ -76,12 +70,8 @@
 			<npc id="30074" x="16937" y="144041" z="-3014" heading="36864" respawnTime="60sec" />
 			<npc id="30073" x="15757" y="144638" z="-3079" heading="36864" respawnTime="60sec" />
 			<npc id="30458" x="19737" y="143122" z="-3028" heading="29500" respawnTime="60sec" />
-			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" />
 			<npc id="30627" x="10133" y="157155" z="-2383" heading="0" respawnTime="60sec" />
-			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" />
 			<npc id="31031" x="20368" y="144912" z="-3088" heading="16384" respawnTime="5sec" />
-			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" />
-			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" />
 			<npc id="30079" x="17836" y="169853" z="-3494" heading="20000" respawnTime="60sec" />
 			<npc id="31773" x="17788" y="169842" z="-3496" heading="20000" respawnTime="60sec" />
 			<npc id="30078" x="16970" y="170391" z="-3496" heading="61440" respawnTime="60sec" />
@@ -98,7 +88,6 @@
 			<npc id="31031" x="13582" y="181667" z="-3500" heading="16384" respawnTime="5sec" />
 			<npc id="30751" x="62008" y="107589" z="-1893" heading="0" respawnTime="60sec" />
 			<npc id="30979" x="50693" y="158674" z="376" heading="0" respawnTime="60sec" />
-			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" />
 			<npc id="30646" x="20360" y="186488" z="-3369" heading="23065" respawnTime="60sec" />
 		</group>
 	</spawn>
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..cad66b1b60
--- /dev/null
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<group>
+			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" />
+			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" />
+			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" />
+			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" />
+			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" />
+			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" />
+			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" />
+			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" />
+			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" />
+			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" />
+			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" />
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/Dion/Dion.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/Dion/Dion.xml
index e194debc30..c9e68fdd82 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/Dion/Dion.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/Dion/Dion.xml
@@ -9,12 +9,6 @@
 			<npc id="30622" x="15443" y="119719" z="-12086" heading="32325" respawnTime="60sec" />
 			<npc id="30637" x="23066" y="118944" z="-3705" heading="8192" respawnTime="60sec" />
 			<npc id="30621" x="10580" y="118027" z="-3672" heading="59000" respawnTime="60sec" />
-			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" />
-			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" />
-			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" />
-			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" />
-			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" />
-			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" />
 			<npc id="30595" x="19712" y="143307" z="-3025" heading="47152" respawnTime="60sec" />
 			<npc id="30594" x="21017" y="144481" z="-3065" heading="32768" respawnTime="60sec" />
 			<npc id="30067" x="16269" y="142461" z="-2688" heading="48400" respawnTime="60sec" />
@@ -76,12 +70,8 @@
 			<npc id="30074" x="16937" y="144041" z="-3014" heading="36864" respawnTime="60sec" />
 			<npc id="30073" x="15757" y="144638" z="-3079" heading="36864" respawnTime="60sec" />
 			<npc id="30458" x="19737" y="143122" z="-3028" heading="29500" respawnTime="60sec" />
-			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" />
 			<npc id="30627" x="10133" y="157155" z="-2383" heading="0" respawnTime="60sec" />
-			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" />
 			<npc id="31031" x="20368" y="144912" z="-3088" heading="16384" respawnTime="5sec" />
-			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" />
-			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" />
 			<npc id="30079" x="17836" y="169853" z="-3494" heading="20000" respawnTime="60sec" />
 			<npc id="31773" x="17788" y="169842" z="-3496" heading="20000" respawnTime="60sec" />
 			<npc id="30078" x="16970" y="170391" z="-3496" heading="61440" respawnTime="60sec" />
@@ -98,7 +88,6 @@
 			<npc id="31031" x="13582" y="181667" z="-3500" heading="16384" respawnTime="5sec" />
 			<npc id="30751" x="62008" y="107589" z="-1893" heading="0" respawnTime="60sec" />
 			<npc id="30979" x="50693" y="158674" z="376" heading="0" respawnTime="60sec" />
-			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" />
 			<npc id="30646" x="20360" y="186488" z="-3369" heading="23065" respawnTime="60sec" />
 		</group>
 	</spawn>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..cad66b1b60
--- /dev/null
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<group>
+			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" />
+			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" />
+			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" />
+			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" />
+			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" />
+			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" />
+			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" />
+			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" />
+			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" />
+			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" />
+			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" />
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/spawns/Dion/Dion.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/spawns/Dion/Dion.xml
index e194debc30..c9e68fdd82 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/spawns/Dion/Dion.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/spawns/Dion/Dion.xml
@@ -9,12 +9,6 @@
 			<npc id="30622" x="15443" y="119719" z="-12086" heading="32325" respawnTime="60sec" />
 			<npc id="30637" x="23066" y="118944" z="-3705" heading="8192" respawnTime="60sec" />
 			<npc id="30621" x="10580" y="118027" z="-3672" heading="59000" respawnTime="60sec" />
-			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" />
-			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" />
-			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" />
-			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" />
-			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" />
-			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" />
 			<npc id="30595" x="19712" y="143307" z="-3025" heading="47152" respawnTime="60sec" />
 			<npc id="30594" x="21017" y="144481" z="-3065" heading="32768" respawnTime="60sec" />
 			<npc id="30067" x="16269" y="142461" z="-2688" heading="48400" respawnTime="60sec" />
@@ -76,12 +70,8 @@
 			<npc id="30074" x="16937" y="144041" z="-3014" heading="36864" respawnTime="60sec" />
 			<npc id="30073" x="15757" y="144638" z="-3079" heading="36864" respawnTime="60sec" />
 			<npc id="30458" x="19737" y="143122" z="-3028" heading="29500" respawnTime="60sec" />
-			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" />
 			<npc id="30627" x="10133" y="157155" z="-2383" heading="0" respawnTime="60sec" />
-			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" />
 			<npc id="31031" x="20368" y="144912" z="-3088" heading="16384" respawnTime="5sec" />
-			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" />
-			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" />
 			<npc id="30079" x="17836" y="169853" z="-3494" heading="20000" respawnTime="60sec" />
 			<npc id="31773" x="17788" y="169842" z="-3496" heading="20000" respawnTime="60sec" />
 			<npc id="30078" x="16970" y="170391" z="-3496" heading="61440" respawnTime="60sec" />
@@ -98,7 +88,6 @@
 			<npc id="31031" x="13582" y="181667" z="-3500" heading="16384" respawnTime="5sec" />
 			<npc id="30751" x="62008" y="107589" z="-1893" heading="0" respawnTime="60sec" />
 			<npc id="30979" x="50693" y="158674" z="376" heading="0" respawnTime="60sec" />
-			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" />
 			<npc id="30646" x="20360" y="186488" z="-3369" heading="23065" respawnTime="60sec" />
 		</group>
 	</spawn>
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..cad66b1b60
--- /dev/null
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<group>
+			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" />
+			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" />
+			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" />
+			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" />
+			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" />
+			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" />
+			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" />
+			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" />
+			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" />
+			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" />
+			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" />
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Dion/Dion.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Dion/Dion.xml
index e194debc30..c9e68fdd82 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Dion/Dion.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Dion/Dion.xml
@@ -9,12 +9,6 @@
 			<npc id="30622" x="15443" y="119719" z="-12086" heading="32325" respawnTime="60sec" />
 			<npc id="30637" x="23066" y="118944" z="-3705" heading="8192" respawnTime="60sec" />
 			<npc id="30621" x="10580" y="118027" z="-3672" heading="59000" respawnTime="60sec" />
-			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" />
-			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" />
-			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" />
-			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" />
-			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" />
-			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" />
 			<npc id="30595" x="19712" y="143307" z="-3025" heading="47152" respawnTime="60sec" />
 			<npc id="30594" x="21017" y="144481" z="-3065" heading="32768" respawnTime="60sec" />
 			<npc id="30067" x="16269" y="142461" z="-2688" heading="48400" respawnTime="60sec" />
@@ -76,12 +70,8 @@
 			<npc id="30074" x="16937" y="144041" z="-3014" heading="36864" respawnTime="60sec" />
 			<npc id="30073" x="15757" y="144638" z="-3079" heading="36864" respawnTime="60sec" />
 			<npc id="30458" x="19737" y="143122" z="-3028" heading="29500" respawnTime="60sec" />
-			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" />
 			<npc id="30627" x="10133" y="157155" z="-2383" heading="0" respawnTime="60sec" />
-			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" />
 			<npc id="31031" x="20368" y="144912" z="-3088" heading="16384" respawnTime="5sec" />
-			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" />
-			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" />
 			<npc id="30079" x="17836" y="169853" z="-3494" heading="20000" respawnTime="60sec" />
 			<npc id="31773" x="17788" y="169842" z="-3496" heading="20000" respawnTime="60sec" />
 			<npc id="30078" x="16970" y="170391" z="-3496" heading="61440" respawnTime="60sec" />
@@ -98,7 +88,6 @@
 			<npc id="31031" x="13582" y="181667" z="-3500" heading="16384" respawnTime="5sec" />
 			<npc id="30751" x="62008" y="107589" z="-1893" heading="0" respawnTime="60sec" />
 			<npc id="30979" x="50693" y="158674" z="376" heading="0" respawnTime="60sec" />
-			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" />
 			<npc id="30646" x="20360" y="186488" z="-3369" heading="23065" respawnTime="60sec" />
 		</group>
 	</spawn>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..cad66b1b60
--- /dev/null
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<group>
+			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" />
+			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" />
+			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" />
+			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" />
+			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" />
+			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" />
+			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" />
+			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" />
+			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" />
+			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" />
+			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" />
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/spawns/Dion/Dion.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/spawns/Dion/Dion.xml
index e194debc30..c9e68fdd82 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/spawns/Dion/Dion.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/spawns/Dion/Dion.xml
@@ -9,12 +9,6 @@
 			<npc id="30622" x="15443" y="119719" z="-12086" heading="32325" respawnTime="60sec" />
 			<npc id="30637" x="23066" y="118944" z="-3705" heading="8192" respawnTime="60sec" />
 			<npc id="30621" x="10580" y="118027" z="-3672" heading="59000" respawnTime="60sec" />
-			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" />
-			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" />
-			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" />
-			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" />
-			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" />
-			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" />
 			<npc id="30595" x="19712" y="143307" z="-3025" heading="47152" respawnTime="60sec" />
 			<npc id="30594" x="21017" y="144481" z="-3065" heading="32768" respawnTime="60sec" />
 			<npc id="30067" x="16269" y="142461" z="-2688" heading="48400" respawnTime="60sec" />
@@ -76,12 +70,8 @@
 			<npc id="30074" x="16937" y="144041" z="-3014" heading="36864" respawnTime="60sec" />
 			<npc id="30073" x="15757" y="144638" z="-3079" heading="36864" respawnTime="60sec" />
 			<npc id="30458" x="19737" y="143122" z="-3028" heading="29500" respawnTime="60sec" />
-			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" />
 			<npc id="30627" x="10133" y="157155" z="-2383" heading="0" respawnTime="60sec" />
-			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" />
 			<npc id="31031" x="20368" y="144912" z="-3088" heading="16384" respawnTime="5sec" />
-			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" />
-			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" />
 			<npc id="30079" x="17836" y="169853" z="-3494" heading="20000" respawnTime="60sec" />
 			<npc id="31773" x="17788" y="169842" z="-3496" heading="20000" respawnTime="60sec" />
 			<npc id="30078" x="16970" y="170391" z="-3496" heading="61440" respawnTime="60sec" />
@@ -98,7 +88,6 @@
 			<npc id="31031" x="13582" y="181667" z="-3500" heading="16384" respawnTime="5sec" />
 			<npc id="30751" x="62008" y="107589" z="-1893" heading="0" respawnTime="60sec" />
 			<npc id="30979" x="50693" y="158674" z="376" heading="0" respawnTime="60sec" />
-			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" />
 			<npc id="30646" x="20360" y="186488" z="-3369" heading="23065" respawnTime="60sec" />
 		</group>
 	</spawn>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..9cff5e931b
--- /dev/null
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<group>
+			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
+			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" /> <!-- Hodler -->
+			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
+			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/spawns/Dion/Dion.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/spawns/Dion/Dion.xml
index 7a73c84291..6488b6b4d3 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/spawns/Dion/Dion.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/spawns/Dion/Dion.xml
@@ -9,12 +9,6 @@
 			<npc id="30622" x="15443" y="119719" z="-12086" heading="32325" respawnTime="60sec" /> <!-- Box of Titan -->
 			<npc id="30637" x="23066" y="118944" z="-3705" heading="8192" respawnTime="60sec" /> <!-- Belthus -->
 			<npc id="30621" x="10580" y="118027" z="-3672" heading="59000" respawnTime="60sec" /> <!-- Nikola -->
-			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
-			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
 			<npc id="30595" x="19712" y="143307" z="-3025" heading="47152" respawnTime="60sec" /> <!-- Opix -->
 			<npc id="30594" x="21017" y="144481" z="-3065" heading="32768" respawnTime="60sec" /> <!-- Ranspo -->
 			<npc id="30067" x="16269" y="142461" z="-2688" heading="48400" respawnTime="60sec" /> <!-- Glyvka -->
@@ -76,12 +70,8 @@
 			<npc id="30074" x="16937" y="144041" z="-3014" heading="36864" respawnTime="60sec" /> <!-- Harlan -->
 			<npc id="30073" x="15757" y="144638" z="-3079" heading="36864" respawnTime="60sec" /> <!-- Jacob -->
 			<npc id="30458" x="19737" y="143122" z="-3028" heading="29500" respawnTime="60sec" /> <!-- Poitan -->
-			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
 			<npc id="30627" x="10133" y="157155" z="-2383" heading="0" respawnTime="60sec" /> <!-- Tree -->
-			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" /> <!-- Hodler -->
 			<npc id="31031" x="20368" y="144912" z="-3088" heading="16384" respawnTime="5sec" /> <!-- Anchor Crystal -->
-			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
 			<npc id="30079" x="17836" y="169853" z="-3494" heading="20000" respawnTime="60sec" /> <!-- Barder -->
 			<npc id="31773" x="17788" y="169842" z="-3496" heading="20000" respawnTime="60sec" /> <!-- Sonin -->
 			<npc id="30078" x="16970" y="170391" z="-3496" heading="61440" respawnTime="60sec" /> <!-- Pano -->
@@ -98,7 +88,6 @@
 			<npc id="31031" x="13582" y="181667" z="-3500" heading="16384" respawnTime="5sec" /> <!-- Anchor Crystal -->
 			<npc id="30751" x="62008" y="107589" z="-1893" heading="0" respawnTime="60sec" /> <!-- Suzet -->
 			<npc id="30979" x="50693" y="158674" z="376" heading="0" respawnTime="60sec" /> <!-- Holy Ark of Secrecy 3 -->
-			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
 			<npc id="30646" x="20360" y="186488" z="-3369" heading="23065" respawnTime="60sec" /> <!-- Raldo -->
 		</group>
 	</spawn>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Castles/Dion.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Castles/Dion.xml
new file mode 100644
index 0000000000..9cff5e931b
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Castles/Dion.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="DionCastle">
+		<group>
+			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
+			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" /> <!-- Hodler -->
+			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
+			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Dion/Dion.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Dion/Dion.xml
index 7a73c84291..6488b6b4d3 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Dion/Dion.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Dion/Dion.xml
@@ -9,12 +9,6 @@
 			<npc id="30622" x="15443" y="119719" z="-12086" heading="32325" respawnTime="60sec" /> <!-- Box of Titan -->
 			<npc id="30637" x="23066" y="118944" z="-3705" heading="8192" respawnTime="60sec" /> <!-- Belthus -->
 			<npc id="30621" x="10580" y="118027" z="-3672" heading="59000" respawnTime="60sec" /> <!-- Nikola -->
-			<npc id="35146" x="19132" y="153027" z="-3120" heading="49152" respawnTime="60sec" /> <!-- Gibbson -->
-			<npc id="35138" x="22412" y="156489" z="-2944" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35138" x="22466" y="156837" z="-2944" heading="0" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35139" x="22239" y="159048" z="-2654" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35139" x="22305" y="159403" z="-2694" heading="0" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35137" x="20492" y="160363" z="-1978" heading="0" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
 			<npc id="30595" x="19712" y="143307" z="-3025" heading="47152" respawnTime="60sec" /> <!-- Opix -->
 			<npc id="30594" x="21017" y="144481" z="-3065" heading="32768" respawnTime="60sec" /> <!-- Ranspo -->
 			<npc id="30067" x="16269" y="142461" z="-2688" heading="48400" respawnTime="60sec" /> <!-- Glyvka -->
@@ -76,12 +70,8 @@
 			<npc id="30074" x="16937" y="144041" z="-3014" heading="36864" respawnTime="60sec" /> <!-- Harlan -->
 			<npc id="30073" x="15757" y="144638" z="-3079" heading="36864" respawnTime="60sec" /> <!-- Jacob -->
 			<npc id="30458" x="19737" y="143122" z="-3028" heading="29500" respawnTime="60sec" /> <!-- Poitan -->
-			<npc id="35144" x="21836" y="160806" z="-2679" heading="49152" respawnTime="60sec" /> <!-- Mercenary Manager Sanford -->
 			<npc id="30627" x="10133" y="157155" z="-2383" heading="0" respawnTime="60sec" /> <!-- Tree -->
-			<npc id="35143" x="21912" y="161608" z="-2226" heading="0" respawnTime="60sec" /> <!-- Hodler -->
 			<npc id="31031" x="20368" y="144912" z="-3088" heading="16384" respawnTime="5sec" /> <!-- Anchor Crystal -->
-			<npc id="35140" x="21649" y="160199" z="-2850" heading="61379" respawnTime="60sec" /> <!-- Blacksmith -->
-			<npc id="35141" x="22100" y="159781" z="-2877" heading="6134" respawnTime="60sec" /> <!-- Warehouse Keeper -->
 			<npc id="30079" x="17836" y="169853" z="-3494" heading="20000" respawnTime="60sec" /> <!-- Barder -->
 			<npc id="31773" x="17788" y="169842" z="-3496" heading="20000" respawnTime="60sec" /> <!-- Sonin -->
 			<npc id="30078" x="16970" y="170391" z="-3496" heading="61440" respawnTime="60sec" /> <!-- Pano -->
@@ -98,7 +88,6 @@
 			<npc id="31031" x="13582" y="181667" z="-3500" heading="16384" respawnTime="5sec" /> <!-- Anchor Crystal -->
 			<npc id="30751" x="62008" y="107589" z="-1893" heading="0" respawnTime="60sec" /> <!-- Suzet -->
 			<npc id="30979" x="50693" y="158674" z="376" heading="0" respawnTime="60sec" /> <!-- Holy Ark of Secrecy 3 -->
-			<npc id="35105" x="22073" y="161778" z="-2672" heading="49152" respawnTime="60sec" /> <!-- Dion Holy Artifact -->
 			<npc id="30646" x="20360" y="186488" z="-3369" heading="23065" respawnTime="60sec" /> <!-- Raldo -->
 		</group>
 	</spawn>