From 8623b7a9216b6b741a7f1191766cbc045a9db7b3 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Wed, 4 Aug 2021 13:07:47 +0000
Subject: [PATCH] Moved Oren castle spawns to a separate file.

---
 .../dist/game/data/spawns/Castles/Oren.xml    |  20 ++
 .../dist/game/data/spawns/old/22_19.xml       |  15 +-
 .../dist/game/data/spawns/Castles/Oren.xml    |  20 ++
 .../dist/game/data/spawns/old/22_19.xml       |  15 +-
 .../dist/game/data/spawns/Castles/Oren.xml    |  20 ++
 .../dist/game/data/spawns/old/22_19.xml       |  15 +-
 .../dist/game/data/spawns/Castles/Oren.xml    |  20 ++
 .../dist/game/data/spawns/old/22_19.xml       |  15 +-
 .../dist/game/data/spawns/Castles/Oren.xml    |  20 ++
 .../dist/game/data/spawns/old/22_19.xml       |  15 +-
 .../dist/game/data/spawns/Castles/Oren.xml    |  20 ++
 .../dist/game/data/spawns/old/22_19.xml       |  15 +-
 .../dist/game/data/spawns/Castles/Oren.xml    |  20 ++
 .../dist/game/data/spawns/old/22_19.xml       |  15 +-
 .../dist/game/data/spawns/Castles/Oren.xml    |  20 ++
 .../dist/game/data/spawns/old/22_19.xml       |  15 +-
 .../dist/game/data/spawns/Castles/Oren.xml    |  20 ++
 .../dist/game/data/spawns/old/22_19.xml       |  15 +-
 .../dist/game/data/spawns/Castles/Oren.xml    |  20 ++
 .../dist/game/data/spawns/old/22_19.xml       |  15 +-
 .../dist/game/data/spawns/Castles/Oren.xml    |  20 ++
 .../dist/game/data/spawns/old/22_19.xml       | 273 +++++++++---------
 .../dist/game/data/spawns/Castles/Oren.xml    |  19 ++
 .../dist/game/data/spawns/EpilogueSpawns.xml  |  14 -
 .../dist/game/data/spawns/Castles/Oren.xml    |  19 ++
 .../dist/game/data/spawns/HighFiveSpawns.xml  |  14 -
 .../dist/game/data/spawns/Castles/Oren.xml    |  18 ++
 .../dist/game/data/spawns/Oren/Oren.xml       |  11 -
 .../dist/game/data/spawns/Castles/Oren.xml    |  18 ++
 .../dist/game/data/spawns/Oren/Oren.xml       |  11 -
 .../dist/game/data/spawns/Castles/Oren.xml    |  18 ++
 .../dist/game/data/spawns/Oren/Oren.xml       |  11 -
 .../dist/game/data/spawns/Castles/Oren.xml    |  18 ++
 .../dist/game/data/spawns/Oren/Oren.xml       |  11 -
 .../dist/game/data/spawns/Castles/Oren.xml    |  18 ++
 .../dist/game/data/spawns/Oren/Oren.xml       |  11 -
 .../dist/game/data/spawns/Castles/Oren.xml    |  18 ++
 .../dist/game/data/spawns/Oren/Oren.xml       |  11 -
 .../dist/game/data/spawns/Castles/Oren.xml    |  18 ++
 .../dist/game/data/spawns/Oren/Oren.xml       |  11 -
 .../dist/game/data/spawns/Castles/Oren.xml    |  18 ++
 .../dist/game/data/spawns/Oren/Oren.xml       |  11 -
 .../dist/game/data/spawns/Castles/Oren.xml    |  18 ++
 .../dist/game/data/spawns/Oren/Oren.xml       |  11 -
 .../dist/game/data/spawns/Castles/Oren.xml    |  18 ++
 .../dist/game/data/spawns/Oren/Oren.xml       |  11 -
 46 files changed, 578 insertions(+), 421 deletions(-)
 create mode 100644 L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_2.5_Underground/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_3.0_Helios/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_Essence_5.0_Sylph/dist/game/data/spawns/Castles/Oren.xml
 create mode 100644 L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Castles/Oren.xml

diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..90c6793301
--- /dev/null
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
+			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
+			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
+			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
+			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/old/22_19.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/old/22_19.xml
index 45df617e81..8862d329cc 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/old/22_19.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/spawns/old/22_19.xml
@@ -2,8 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="22_19">
 		<group>
-			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
 			<npc id="31002" x="92743" y="55523" z="-3416" heading="32768" respawnTime="60sec" /> <!-- Reorin -->
 			<npc id="20767" x="71123" y="36354" z="-3184" heading="60566" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="71170" y="38508" z="-3352" heading="26099" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
@@ -43,17 +41,9 @@
 			<npc id="20767" x="73621" y="59585" z="-2856" heading="10170" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="72186" y="58075" z="-3080" heading="30488" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="66943" y="64289" z="-3704" heading="54998" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
-			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
-			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
 			<npc id="32568" x="88125" y="38448" z="-3368" respawnTime="60sec" /> <!-- Unidentified Body -->
 			<npc id="32569" x="82717" y="47060" z="-3232" heading="33103" respawnTime="60sec" /> <!-- Cain -->
 			<npc id="30750" x="71569" y="44058" z="-1436" respawnTime="60sec" /> <!-- Kalibran -->
-			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
 			<npc id="20585" x="70229" y="60688" z="-3416" heading="49653" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="71318" y="59773" z="-3336" heading="19244" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="70063" y="62240" z="-3392" heading="15926" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
@@ -135,9 +125,6 @@
 			<npc id="20588" x="74280" y="41349" z="-2880" heading="7614" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="67267" y="56367" z="-3712" heading="31350" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="69512" y="57287" z="-3656" heading="35003" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
-			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
 		</group>
 	</spawn>
-</list>
\ No newline at end of file
+</list>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..90c6793301
--- /dev/null
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
+			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
+			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
+			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
+			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/old/22_19.xml b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/old/22_19.xml
index 45df617e81..8862d329cc 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/spawns/old/22_19.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/spawns/old/22_19.xml
@@ -2,8 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="22_19">
 		<group>
-			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
 			<npc id="31002" x="92743" y="55523" z="-3416" heading="32768" respawnTime="60sec" /> <!-- Reorin -->
 			<npc id="20767" x="71123" y="36354" z="-3184" heading="60566" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="71170" y="38508" z="-3352" heading="26099" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
@@ -43,17 +41,9 @@
 			<npc id="20767" x="73621" y="59585" z="-2856" heading="10170" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="72186" y="58075" z="-3080" heading="30488" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="66943" y="64289" z="-3704" heading="54998" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
-			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
-			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
 			<npc id="32568" x="88125" y="38448" z="-3368" respawnTime="60sec" /> <!-- Unidentified Body -->
 			<npc id="32569" x="82717" y="47060" z="-3232" heading="33103" respawnTime="60sec" /> <!-- Cain -->
 			<npc id="30750" x="71569" y="44058" z="-1436" respawnTime="60sec" /> <!-- Kalibran -->
-			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
 			<npc id="20585" x="70229" y="60688" z="-3416" heading="49653" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="71318" y="59773" z="-3336" heading="19244" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="70063" y="62240" z="-3392" heading="15926" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
@@ -135,9 +125,6 @@
 			<npc id="20588" x="74280" y="41349" z="-2880" heading="7614" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="67267" y="56367" z="-3712" heading="31350" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="69512" y="57287" z="-3656" heading="35003" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
-			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
 		</group>
 	</spawn>
-</list>
\ No newline at end of file
+</list>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..90c6793301
--- /dev/null
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
+			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
+			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
+			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
+			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/old/22_19.xml b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/old/22_19.xml
index 45df617e81..8862d329cc 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/spawns/old/22_19.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/spawns/old/22_19.xml
@@ -2,8 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="22_19">
 		<group>
-			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
 			<npc id="31002" x="92743" y="55523" z="-3416" heading="32768" respawnTime="60sec" /> <!-- Reorin -->
 			<npc id="20767" x="71123" y="36354" z="-3184" heading="60566" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="71170" y="38508" z="-3352" heading="26099" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
@@ -43,17 +41,9 @@
 			<npc id="20767" x="73621" y="59585" z="-2856" heading="10170" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="72186" y="58075" z="-3080" heading="30488" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="66943" y="64289" z="-3704" heading="54998" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
-			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
-			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
 			<npc id="32568" x="88125" y="38448" z="-3368" respawnTime="60sec" /> <!-- Unidentified Body -->
 			<npc id="32569" x="82717" y="47060" z="-3232" heading="33103" respawnTime="60sec" /> <!-- Cain -->
 			<npc id="30750" x="71569" y="44058" z="-1436" respawnTime="60sec" /> <!-- Kalibran -->
-			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
 			<npc id="20585" x="70229" y="60688" z="-3416" heading="49653" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="71318" y="59773" z="-3336" heading="19244" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="70063" y="62240" z="-3392" heading="15926" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
@@ -135,9 +125,6 @@
 			<npc id="20588" x="74280" y="41349" z="-2880" heading="7614" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="67267" y="56367" z="-3712" heading="31350" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="69512" y="57287" z="-3656" heading="35003" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
-			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
 		</group>
 	</spawn>
-</list>
\ No newline at end of file
+</list>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..90c6793301
--- /dev/null
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
+			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
+			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
+			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
+			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/old/22_19.xml b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/old/22_19.xml
index 45df617e81..8862d329cc 100644
--- a/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/old/22_19.xml
+++ b/L2J_Mobius_4.0_GrandCrusade/dist/game/data/spawns/old/22_19.xml
@@ -2,8 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="22_19">
 		<group>
-			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
 			<npc id="31002" x="92743" y="55523" z="-3416" heading="32768" respawnTime="60sec" /> <!-- Reorin -->
 			<npc id="20767" x="71123" y="36354" z="-3184" heading="60566" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="71170" y="38508" z="-3352" heading="26099" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
@@ -43,17 +41,9 @@
 			<npc id="20767" x="73621" y="59585" z="-2856" heading="10170" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="72186" y="58075" z="-3080" heading="30488" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="66943" y="64289" z="-3704" heading="54998" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
-			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
-			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
 			<npc id="32568" x="88125" y="38448" z="-3368" respawnTime="60sec" /> <!-- Unidentified Body -->
 			<npc id="32569" x="82717" y="47060" z="-3232" heading="33103" respawnTime="60sec" /> <!-- Cain -->
 			<npc id="30750" x="71569" y="44058" z="-1436" respawnTime="60sec" /> <!-- Kalibran -->
-			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
 			<npc id="20585" x="70229" y="60688" z="-3416" heading="49653" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="71318" y="59773" z="-3336" heading="19244" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="70063" y="62240" z="-3392" heading="15926" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
@@ -135,9 +125,6 @@
 			<npc id="20588" x="74280" y="41349" z="-2880" heading="7614" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="67267" y="56367" z="-3712" heading="31350" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="69512" y="57287" z="-3656" heading="35003" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
-			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
 		</group>
 	</spawn>
-</list>
\ No newline at end of file
+</list>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..90c6793301
--- /dev/null
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
+			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
+			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
+			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
+			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/old/22_19.xml b/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/old/22_19.xml
index 45df617e81..8862d329cc 100644
--- a/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/old/22_19.xml
+++ b/L2J_Mobius_5.0_Salvation/dist/game/data/spawns/old/22_19.xml
@@ -2,8 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="22_19">
 		<group>
-			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
 			<npc id="31002" x="92743" y="55523" z="-3416" heading="32768" respawnTime="60sec" /> <!-- Reorin -->
 			<npc id="20767" x="71123" y="36354" z="-3184" heading="60566" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="71170" y="38508" z="-3352" heading="26099" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
@@ -43,17 +41,9 @@
 			<npc id="20767" x="73621" y="59585" z="-2856" heading="10170" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="72186" y="58075" z="-3080" heading="30488" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="66943" y="64289" z="-3704" heading="54998" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
-			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
-			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
 			<npc id="32568" x="88125" y="38448" z="-3368" respawnTime="60sec" /> <!-- Unidentified Body -->
 			<npc id="32569" x="82717" y="47060" z="-3232" heading="33103" respawnTime="60sec" /> <!-- Cain -->
 			<npc id="30750" x="71569" y="44058" z="-1436" respawnTime="60sec" /> <!-- Kalibran -->
-			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
 			<npc id="20585" x="70229" y="60688" z="-3416" heading="49653" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="71318" y="59773" z="-3336" heading="19244" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="70063" y="62240" z="-3392" heading="15926" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
@@ -135,9 +125,6 @@
 			<npc id="20588" x="74280" y="41349" z="-2880" heading="7614" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="67267" y="56367" z="-3712" heading="31350" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="69512" y="57287" z="-3656" heading="35003" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
-			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
 		</group>
 	</spawn>
-</list>
\ No newline at end of file
+</list>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..90c6793301
--- /dev/null
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
+			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
+			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
+			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
+			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/old/22_19.xml b/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/old/22_19.xml
index 45df617e81..8862d329cc 100644
--- a/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/old/22_19.xml
+++ b/L2J_Mobius_5.5_EtinasFate/dist/game/data/spawns/old/22_19.xml
@@ -2,8 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="22_19">
 		<group>
-			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
 			<npc id="31002" x="92743" y="55523" z="-3416" heading="32768" respawnTime="60sec" /> <!-- Reorin -->
 			<npc id="20767" x="71123" y="36354" z="-3184" heading="60566" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="71170" y="38508" z="-3352" heading="26099" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
@@ -43,17 +41,9 @@
 			<npc id="20767" x="73621" y="59585" z="-2856" heading="10170" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="72186" y="58075" z="-3080" heading="30488" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="66943" y="64289" z="-3704" heading="54998" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
-			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
-			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
 			<npc id="32568" x="88125" y="38448" z="-3368" respawnTime="60sec" /> <!-- Unidentified Body -->
 			<npc id="32569" x="82717" y="47060" z="-3232" heading="33103" respawnTime="60sec" /> <!-- Cain -->
 			<npc id="30750" x="71569" y="44058" z="-1436" respawnTime="60sec" /> <!-- Kalibran -->
-			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
 			<npc id="20585" x="70229" y="60688" z="-3416" heading="49653" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="71318" y="59773" z="-3336" heading="19244" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="70063" y="62240" z="-3392" heading="15926" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
@@ -135,9 +125,6 @@
 			<npc id="20588" x="74280" y="41349" z="-2880" heading="7614" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="67267" y="56367" z="-3712" heading="31350" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="69512" y="57287" z="-3656" heading="35003" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
-			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
 		</group>
 	</spawn>
-</list>
\ No newline at end of file
+</list>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..90c6793301
--- /dev/null
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
+			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
+			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
+			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
+			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/old/22_19.xml b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/old/22_19.xml
index 45df617e81..8862d329cc 100644
--- a/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/old/22_19.xml
+++ b/L2J_Mobius_6.0_Fafurion/dist/game/data/spawns/old/22_19.xml
@@ -2,8 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="22_19">
 		<group>
-			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
 			<npc id="31002" x="92743" y="55523" z="-3416" heading="32768" respawnTime="60sec" /> <!-- Reorin -->
 			<npc id="20767" x="71123" y="36354" z="-3184" heading="60566" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="71170" y="38508" z="-3352" heading="26099" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
@@ -43,17 +41,9 @@
 			<npc id="20767" x="73621" y="59585" z="-2856" heading="10170" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="72186" y="58075" z="-3080" heading="30488" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="66943" y="64289" z="-3704" heading="54998" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
-			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
-			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
 			<npc id="32568" x="88125" y="38448" z="-3368" respawnTime="60sec" /> <!-- Unidentified Body -->
 			<npc id="32569" x="82717" y="47060" z="-3232" heading="33103" respawnTime="60sec" /> <!-- Cain -->
 			<npc id="30750" x="71569" y="44058" z="-1436" respawnTime="60sec" /> <!-- Kalibran -->
-			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
 			<npc id="20585" x="70229" y="60688" z="-3416" heading="49653" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="71318" y="59773" z="-3336" heading="19244" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="70063" y="62240" z="-3392" heading="15926" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
@@ -135,9 +125,6 @@
 			<npc id="20588" x="74280" y="41349" z="-2880" heading="7614" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="67267" y="56367" z="-3712" heading="31350" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="69512" y="57287" z="-3656" heading="35003" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
-			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
 		</group>
 	</spawn>
-</list>
\ No newline at end of file
+</list>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..90c6793301
--- /dev/null
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
+			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
+			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
+			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
+			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/old/22_19.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/old/22_19.xml
index 45df617e81..8862d329cc 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/old/22_19.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/spawns/old/22_19.xml
@@ -2,8 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="22_19">
 		<group>
-			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
 			<npc id="31002" x="92743" y="55523" z="-3416" heading="32768" respawnTime="60sec" /> <!-- Reorin -->
 			<npc id="20767" x="71123" y="36354" z="-3184" heading="60566" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="71170" y="38508" z="-3352" heading="26099" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
@@ -43,17 +41,9 @@
 			<npc id="20767" x="73621" y="59585" z="-2856" heading="10170" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="72186" y="58075" z="-3080" heading="30488" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="66943" y="64289" z="-3704" heading="54998" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
-			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
-			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
 			<npc id="32568" x="88125" y="38448" z="-3368" respawnTime="60sec" /> <!-- Unidentified Body -->
 			<npc id="32569" x="82717" y="47060" z="-3232" heading="33103" respawnTime="60sec" /> <!-- Cain -->
 			<npc id="30750" x="71569" y="44058" z="-1436" respawnTime="60sec" /> <!-- Kalibran -->
-			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
 			<npc id="20585" x="70229" y="60688" z="-3416" heading="49653" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="71318" y="59773" z="-3336" heading="19244" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="70063" y="62240" z="-3392" heading="15926" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
@@ -135,9 +125,6 @@
 			<npc id="20588" x="74280" y="41349" z="-2880" heading="7614" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="67267" y="56367" z="-3712" heading="31350" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="69512" y="57287" z="-3656" heading="35003" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
-			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
 		</group>
 	</spawn>
-</list>
\ No newline at end of file
+</list>
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..90c6793301
--- /dev/null
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
+			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
+			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
+			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
+			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/old/22_19.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/old/22_19.xml
index 45df617e81..8862d329cc 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/old/22_19.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/spawns/old/22_19.xml
@@ -2,8 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="22_19">
 		<group>
-			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
 			<npc id="31002" x="92743" y="55523" z="-3416" heading="32768" respawnTime="60sec" /> <!-- Reorin -->
 			<npc id="20767" x="71123" y="36354" z="-3184" heading="60566" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="71170" y="38508" z="-3352" heading="26099" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
@@ -43,17 +41,9 @@
 			<npc id="20767" x="73621" y="59585" z="-2856" heading="10170" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="72186" y="58075" z="-3080" heading="30488" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="66943" y="64289" z="-3704" heading="54998" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
-			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
-			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
 			<npc id="32568" x="88125" y="38448" z="-3368" respawnTime="60sec" /> <!-- Unidentified Body -->
 			<npc id="32569" x="82717" y="47060" z="-3232" heading="33103" respawnTime="60sec" /> <!-- Cain -->
 			<npc id="30750" x="71569" y="44058" z="-1436" respawnTime="60sec" /> <!-- Kalibran -->
-			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
 			<npc id="20585" x="70229" y="60688" z="-3416" heading="49653" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="71318" y="59773" z="-3336" heading="19244" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="70063" y="62240" z="-3392" heading="15926" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
@@ -135,9 +125,6 @@
 			<npc id="20588" x="74280" y="41349" z="-2880" heading="7614" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="67267" y="56367" z="-3712" heading="31350" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="69512" y="57287" z="-3656" heading="35003" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
-			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
 		</group>
 	</spawn>
-</list>
\ No newline at end of file
+</list>
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..90c6793301
--- /dev/null
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
+			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
+			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
+			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
+			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/old/22_19.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/old/22_19.xml
index 45df617e81..8862d329cc 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/old/22_19.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/spawns/old/22_19.xml
@@ -2,8 +2,6 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
 	<spawn name="22_19">
 		<group>
-			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
 			<npc id="31002" x="92743" y="55523" z="-3416" heading="32768" respawnTime="60sec" /> <!-- Reorin -->
 			<npc id="20767" x="71123" y="36354" z="-3184" heading="60566" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="71170" y="38508" z="-3352" heading="26099" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
@@ -43,17 +41,9 @@
 			<npc id="20767" x="73621" y="59585" z="-2856" heading="10170" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="72186" y="58075" z="-3080" heading="30488" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
 			<npc id="20767" x="66943" y="64289" z="-3704" heading="54998" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
-			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
-			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
 			<npc id="32568" x="88125" y="38448" z="-3368" respawnTime="60sec" /> <!-- Unidentified Body -->
 			<npc id="32569" x="82717" y="47060" z="-3232" heading="33103" respawnTime="60sec" /> <!-- Cain -->
 			<npc id="30750" x="71569" y="44058" z="-1436" respawnTime="60sec" /> <!-- Kalibran -->
-			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
 			<npc id="20585" x="70229" y="60688" z="-3416" heading="49653" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="71318" y="59773" z="-3336" heading="19244" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
 			<npc id="20585" x="70063" y="62240" z="-3392" heading="15926" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
@@ -135,9 +125,6 @@
 			<npc id="20588" x="74280" y="41349" z="-2880" heading="7614" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="67267" y="56367" z="-3712" heading="31350" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
 			<npc id="20588" x="69512" y="57287" z="-3656" heading="35003" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
-			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
 		</group>
 	</spawn>
-</list>
\ No newline at end of file
+</list>
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..90c6793301
--- /dev/null
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
+			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
+			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
+			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
+			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
+			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/old/22_19.xml b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/old/22_19.xml
index 45df617e81..7d2a740691 100644
--- a/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/old/22_19.xml
+++ b/L2J_Mobius_9.2_ReturnOfTheQueenAnt_Ch2/dist/game/data/spawns/old/22_19.xml
@@ -1,143 +1,130 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
-	<spawn name="22_19">
-		<group>
-			<npc id="35228" x="83056" y="37425" z="-2288" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
-			<npc id="31002" x="92743" y="55523" z="-3416" heading="32768" respawnTime="60sec" /> <!-- Reorin -->
-			<npc id="20767" x="71123" y="36354" z="-3184" heading="60566" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="71170" y="38508" z="-3352" heading="26099" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="69127" y="38435" z="-3576" heading="27762" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="67180" y="36564" z="-3640" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="66395" y="41284" z="-3744" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="68049" y="41006" z="-3688" heading="61624" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="67300" y="47847" z="-3816" heading="44707" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="66623" y="47009" z="-3912" heading="41353" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="66200" y="45164" z="-3800" heading="43055" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="66731" y="46414" z="-3904" heading="46860" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="68266" y="48494" z="-3704" heading="59487" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="69632" y="48708" z="-3660" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="72150" y="48567" z="-3512" heading="60437" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="70872" y="49119" z="-3648" heading="65249" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="67161" y="50056" z="-3544" heading="28357" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="72876" y="45372" z="-3620" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="72574" y="45550" z="-3620" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="72674" y="45728" z="-3620" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="80626" y="44690" z="-3168" heading="7067" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="76711" y="41696" z="-3000" heading="53883" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="75498" y="44841" z="-2896" heading="20144" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="74885" y="38449" z="-3000" heading="54089" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="73179" y="42342" z="-2656" heading="62749" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="74909" y="42453" z="-2912" heading="31434" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="65591" y="56340" z="-3520" heading="29843" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="70921" y="57560" z="-3424" heading="54121" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="69522" y="60748" z="-3520" heading="27695" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="70013" y="58739" z="-3624" heading="38227" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="71541" y="58990" z="-3320" heading="24718" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="72386" y="62548" z="-3352" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="72303" y="63099" z="-3376" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="72843" y="62873" z="-3440" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="72487" y="62726" z="-3376" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="72710" y="60536" z="-3112" heading="25052" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="73971" y="61230" z="-3008" heading="19183" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="73621" y="59585" z="-2856" heading="10170" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="72186" y="58075" z="-3080" heading="30488" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="20767" x="66943" y="64289" z="-3704" heading="54998" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
-			<npc id="35227" x="83853" y="37192" z="-1832" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
-			<npc id="35222" x="78737" y="36852" z="-2560" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35222" x="79085" y="36798" z="-2560" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35223" x="81296" y="37025" z="-2256" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35223" x="81651" y="36959" z="-2304" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35232" x="75275" y="40132" z="-3200" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
-			<npc id="35221" x="82611" y="38772" z="-1592" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="32568" x="88125" y="38448" z="-3368" respawnTime="60sec" /> <!-- Unidentified Body -->
-			<npc id="32569" x="82717" y="47060" z="-3232" heading="33103" respawnTime="60sec" /> <!-- Cain -->
-			<npc id="30750" x="71569" y="44058" z="-1436" respawnTime="60sec" /> <!-- Kalibran -->
-			<npc id="35225" x="82043" y="37132" z="-2448" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="20585" x="70229" y="60688" z="-3416" heading="49653" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
-			<npc id="20585" x="71318" y="59773" z="-3336" heading="19244" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
-			<npc id="20585" x="70063" y="62240" z="-3392" heading="15926" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
-			<npc id="20585" x="72386" y="62548" z="-3352" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
-			<npc id="20585" x="72440" y="63522" z="-3448" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
-			<npc id="20585" x="74290" y="57804" z="-2808" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
-			<npc id="20585" x="74592" y="57982" z="-2792" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
-			<npc id="20585" x="71829" y="65092" z="-3624" heading="449" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
-			<npc id="20585" x="67122" y="65284" z="-3680" heading="59201" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
-			<npc id="20585" x="69044" y="64755" z="-3712" heading="28928" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
-			<npc id="20585" x="67746" y="64004" z="-3704" heading="45174" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
-			<npc id="20586" x="73122" y="36486" z="-3288" heading="62434" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="71054" y="36866" z="-3564" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="66878" y="36742" z="-3672" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="67769" y="37364" z="-3696" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="66797" y="41284" z="-3728" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="65784" y="45924" z="-3904" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="68623" y="46274" z="-3240" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="66603" y="48160" z="-3832" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="69378" y="51795" z="-3456" heading="26274" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="69428" y="53273" z="-3624" heading="15703" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="71421" y="49839" z="-3520" heading="57772" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="68033" y="53211" z="-3648" heading="16116" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="71763" y="51296" z="-3512" heading="16268" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="69935" y="49598" z="-3660" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="73379" y="45550" z="-3620" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="75197" y="43485" z="-2896" heading="41917" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="77913" y="42546" z="-2920" heading="3365" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="68918" y="55740" z="-3576" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="69220" y="55918" z="-3592" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="68817" y="55918" z="-3576" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="71361" y="60584" z="-3296" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="70555" y="60228" z="-3432" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="70876" y="58498" z="-3456" heading="46634" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="72789" y="62192" z="-3312" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="74690" y="58903" z="-2664" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="74693" y="58160" z="-2696" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="74243" y="58205" z="-2688" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="70537" y="64265" z="-3560" heading="57413" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="68652" y="63390" z="-3656" heading="47912" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20586" x="69676" y="63307" z="-3520" heading="52989" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
-			<npc id="20587" x="70752" y="36332" z="-3564" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="74268" y="34065" z="-3712" heading="55143" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="67703" y="36751" z="-3672" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="67568" y="37364" z="-3688" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="66194" y="41284" z="-3760" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="65571" y="44078" z="-3712" heading="943" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="67516" y="45740" z="-3816" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="68321" y="46096" z="-3352" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="70888" y="50801" z="-3512" heading="3421" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="70008" y="52184" z="-3472" heading="9088" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="67756" y="51746" z="-3632" heading="46430" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="69632" y="48708" z="-3660" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="68689" y="49496" z="-3664" heading="25437" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="72876" y="45372" z="-3620" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="74952" y="42856" z="-3168" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="74522" y="40508" z="-3120" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="68314" y="56452" z="-3672" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="68515" y="56452" z="-3648" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="70656" y="59694" z="-3472" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="70454" y="60406" z="-3424" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="72688" y="63082" z="-3448" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="74066" y="63679" z="-3544" heading="32471" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="75096" y="58516" z="-2672" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20587" x="74893" y="57804" z="-2832" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
-			<npc id="20588" x="72588" y="35178" z="-3576" heading="48923" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="20588" x="73119" y="34079" z="-3704" heading="51999" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="20588" x="72645" y="38567" z="-3280" heading="6790" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="20588" x="67367" y="37720" z="-3696" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="20588" x="67840" y="47587" z="-3824" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="20588" x="66402" y="48872" z="-3720" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="20588" x="68939" y="50884" z="-3664" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="20588" x="67844" y="50506" z="-3592" heading="45874" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="20588" x="67098" y="50945" z="-3528" heading="1243" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="20588" x="68573" y="54368" z="-3592" heading="51338" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="20588" x="69300" y="49027" z="-3656" heading="37939" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="20588" x="73078" y="45728" z="-3620" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="20588" x="80045" y="42226" z="-3232" heading="556" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="20588" x="74280" y="41349" z="-2880" heading="7614" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="20588" x="67267" y="56367" z="-3712" heading="31350" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="20588" x="69512" y="57287" z="-3656" heading="35003" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
-			<npc id="35651" x="83061" y="36962" z="-2288" heading="22020" respawnTime="60sec" /> <!-- Court Wizard -->
-			<npc id="36406" x="82916" y="37108" z="-2448" heading="32073" respawnTime="60sec" /> <!-- Warden -->
-			<npc id="35224" x="82464" y="37592" z="-2448" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
-		</group>
-	</spawn>
-</list>
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/spawns.xsd">
+	<spawn name="22_19">
+		<group>
+			<npc id="31002" x="92743" y="55523" z="-3416" heading="32768" respawnTime="60sec" /> <!-- Reorin -->
+			<npc id="20767" x="71123" y="36354" z="-3184" heading="60566" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="71170" y="38508" z="-3352" heading="26099" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="69127" y="38435" z="-3576" heading="27762" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="67180" y="36564" z="-3640" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="66395" y="41284" z="-3744" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="68049" y="41006" z="-3688" heading="61624" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="67300" y="47847" z="-3816" heading="44707" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="66623" y="47009" z="-3912" heading="41353" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="66200" y="45164" z="-3800" heading="43055" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="66731" y="46414" z="-3904" heading="46860" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="68266" y="48494" z="-3704" heading="59487" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="69632" y="48708" z="-3660" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="72150" y="48567" z="-3512" heading="60437" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="70872" y="49119" z="-3648" heading="65249" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="67161" y="50056" z="-3544" heading="28357" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="72876" y="45372" z="-3620" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="72574" y="45550" z="-3620" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="72674" y="45728" z="-3620" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="80626" y="44690" z="-3168" heading="7067" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="76711" y="41696" z="-3000" heading="53883" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="75498" y="44841" z="-2896" heading="20144" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="74885" y="38449" z="-3000" heading="54089" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="73179" y="42342" z="-2656" heading="62749" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="74909" y="42453" z="-2912" heading="31434" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="65591" y="56340" z="-3520" heading="29843" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="70921" y="57560" z="-3424" heading="54121" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="69522" y="60748" z="-3520" heading="27695" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="70013" y="58739" z="-3624" heading="38227" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="71541" y="58990" z="-3320" heading="24718" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="72386" y="62548" z="-3352" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="72303" y="63099" z="-3376" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="72843" y="62873" z="-3440" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="72487" y="62726" z="-3376" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="72710" y="60536" z="-3112" heading="25052" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="73971" y="61230" z="-3008" heading="19183" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="73621" y="59585" z="-2856" heading="10170" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="72186" y="58075" z="-3080" heading="30488" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="20767" x="66943" y="64289" z="-3704" heading="54998" respawnTime="40sec" /> <!-- Timak Orc Troop Captain -->
+			<npc id="32568" x="88125" y="38448" z="-3368" respawnTime="60sec" /> <!-- Unidentified Body -->
+			<npc id="32569" x="82717" y="47060" z="-3232" heading="33103" respawnTime="60sec" /> <!-- Cain -->
+			<npc id="30750" x="71569" y="44058" z="-1436" respawnTime="60sec" /> <!-- Kalibran -->
+			<npc id="20585" x="70229" y="60688" z="-3416" heading="49653" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
+			<npc id="20585" x="71318" y="59773" z="-3336" heading="19244" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
+			<npc id="20585" x="70063" y="62240" z="-3392" heading="15926" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
+			<npc id="20585" x="72386" y="62548" z="-3352" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
+			<npc id="20585" x="72440" y="63522" z="-3448" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
+			<npc id="20585" x="74290" y="57804" z="-2808" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
+			<npc id="20585" x="74592" y="57982" z="-2792" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
+			<npc id="20585" x="71829" y="65092" z="-3624" heading="449" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
+			<npc id="20585" x="67122" y="65284" z="-3680" heading="59201" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
+			<npc id="20585" x="69044" y="64755" z="-3712" heading="28928" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
+			<npc id="20585" x="67746" y="64004" z="-3704" heading="45174" respawnTime="40sec" /> <!-- Timak Orc Soldier -->
+			<npc id="20586" x="73122" y="36486" z="-3288" heading="62434" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="71054" y="36866" z="-3564" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="66878" y="36742" z="-3672" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="67769" y="37364" z="-3696" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="66797" y="41284" z="-3728" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="65784" y="45924" z="-3904" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="68623" y="46274" z="-3240" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="66603" y="48160" z="-3832" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="69378" y="51795" z="-3456" heading="26274" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="69428" y="53273" z="-3624" heading="15703" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="71421" y="49839" z="-3520" heading="57772" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="68033" y="53211" z="-3648" heading="16116" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="71763" y="51296" z="-3512" heading="16268" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="69935" y="49598" z="-3660" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="73379" y="45550" z="-3620" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="75197" y="43485" z="-2896" heading="41917" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="77913" y="42546" z="-2920" heading="3365" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="68918" y="55740" z="-3576" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="69220" y="55918" z="-3592" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="68817" y="55918" z="-3576" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="71361" y="60584" z="-3296" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="70555" y="60228" z="-3432" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="70876" y="58498" z="-3456" heading="46634" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="72789" y="62192" z="-3312" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="74690" y="58903" z="-2664" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="74693" y="58160" z="-2696" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="74243" y="58205" z="-2688" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="70537" y="64265" z="-3560" heading="57413" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="68652" y="63390" z="-3656" heading="47912" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20586" x="69676" y="63307" z="-3520" heading="52989" respawnTime="40sec" /> <!-- Timak Orc Warrior -->
+			<npc id="20587" x="70752" y="36332" z="-3564" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="74268" y="34065" z="-3712" heading="55143" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="67703" y="36751" z="-3672" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="67568" y="37364" z="-3688" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="66194" y="41284" z="-3760" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="65571" y="44078" z="-3712" heading="943" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="67516" y="45740" z="-3816" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="68321" y="46096" z="-3352" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="70888" y="50801" z="-3512" heading="3421" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="70008" y="52184" z="-3472" heading="9088" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="67756" y="51746" z="-3632" heading="46430" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="69632" y="48708" z="-3660" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="68689" y="49496" z="-3664" heading="25437" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="72876" y="45372" z="-3620" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="74952" y="42856" z="-3168" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="74522" y="40508" z="-3120" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="68314" y="56452" z="-3672" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="68515" y="56452" z="-3648" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="70656" y="59694" z="-3472" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="70454" y="60406" z="-3424" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="72688" y="63082" z="-3448" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="74066" y="63679" z="-3544" heading="32471" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="75096" y="58516" z="-2672" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20587" x="74893" y="57804" z="-2832" respawnTime="40sec" /> <!-- Timak Orc Shaman -->
+			<npc id="20588" x="72588" y="35178" z="-3576" heading="48923" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
+			<npc id="20588" x="73119" y="34079" z="-3704" heading="51999" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
+			<npc id="20588" x="72645" y="38567" z="-3280" heading="6790" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
+			<npc id="20588" x="67367" y="37720" z="-3696" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
+			<npc id="20588" x="67840" y="47587" z="-3824" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
+			<npc id="20588" x="66402" y="48872" z="-3720" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
+			<npc id="20588" x="68939" y="50884" z="-3664" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
+			<npc id="20588" x="67844" y="50506" z="-3592" heading="45874" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
+			<npc id="20588" x="67098" y="50945" z="-3528" heading="1243" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
+			<npc id="20588" x="68573" y="54368" z="-3592" heading="51338" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
+			<npc id="20588" x="69300" y="49027" z="-3656" heading="37939" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
+			<npc id="20588" x="73078" y="45728" z="-3620" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
+			<npc id="20588" x="80045" y="42226" z="-3232" heading="556" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
+			<npc id="20588" x="74280" y="41349" z="-2880" heading="7614" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
+			<npc id="20588" x="67267" y="56367" z="-3712" heading="31350" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
+			<npc id="20588" x="69512" y="57287" z="-3656" heading="35003" respawnTime="40sec" /> <!-- Timak Orc Prefect -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..3313658090
--- /dev/null
+++ b/L2J_Mobius_CT_2.4_Epilogue/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnDelay="60" />
+		<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnDelay="60" />
+		<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnDelay="10800" />
+		<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnDelay="10800" />
+		<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnDelay="10800" />
+		<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnDelay="10800" />
+		<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnDelay="60" />
+		<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnDelay="60" />
+		<npc id="35226" x="83171" y="37092" z="-2266" heading="32768" respawnDelay="60" />
+		<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnDelay="60" />
+		<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnDelay="60" />
+		<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnDelay="60" />
+		<npc id="35651" x="83061" y="36962" z="-2293" heading="22020" respawnDelay="60" />
+		<npc id="36406" x="82916" y="37108" z="-2451" heading="32073" 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 2002c50428..1c6d56f606 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
@@ -16882,7 +16882,6 @@
 		<npc id="22659" x="75253" y="219787" z="-3760" heading="0" respawnDelay="60" />
 		<npc id="22621" x="75259" y="-47542" z="-5128" heading="3556" respawnDelay="60" />
 		<npc id="22701" x="75266" y="-129261" z="-3464" heading="14517" respawnDelay="60" />
-		<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnDelay="60" />
 		<npc id="20552" x="75278" y="100277" z="-3248" heading="26996" respawnDelay="60" />
 		<npc id="20574" x="75281" y="-8483" z="-2860" heading="47345" respawnDelay="41" />
 		<npc id="22701" x="75282" y="-129780" z="-3288" heading="0" respawnDelay="60" />
@@ -17375,7 +17374,6 @@
 		<npc id="22651" x="78726" y="206490" z="-3584" heading="0" respawnDelay="60" />
 		<npc id="20800" x="78726" y="252715" z="-10359" heading="6954" respawnDelay="94" />
 		<npc id="21513" x="78735" y="-63712" z="-2300" heading="45140" respawnDelay="42" />
-		<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnDelay="10800" />
 		<npc id="21521" x="78740" y="-85420" z="-3567" heading="46355" respawnDelay="48" />
 		<npc id="21511" x="78761" y="-42050" z="-3319" heading="0" respawnDelay="42" />
 		<npc id="21510" x="78761" y="-41694" z="-3319" heading="0" respawnDelay="42" />
@@ -17435,7 +17433,6 @@
 		<npc id="22617" x="79070" y="-44755" z="-5128" heading="18023" respawnDelay="60" />
 		<npc id="30184" x="79077" y="56694" z="-1510" heading="0" respawnDelay="60" />
 		<npc id="21526" x="79080" y="-75121" z="-3552" heading="24309" respawnDelay="48" />
-		<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnDelay="10800" />
 		<npc id="22659" x="79098" y="221387" z="-3568" heading="22746" respawnDelay="60" />
 		<npc id="21532" x="79101" y="-93201" z="-3190" heading="54038" respawnDelay="48" />
 		<npc id="30178" x="79111" y="53657" z="-1548" heading="0" respawnDelay="60" />
@@ -17925,7 +17922,6 @@
 		<npc id="20798" x="81282" y="257833" z="-9335" heading="2948" respawnDelay="94" />
 		<npc id="20800" x="81286" y="248039" z="-10352" heading="0" respawnDelay="94" />
 		<npc id="22651" x="81289" y="195067" z="-3400" heading="0" respawnDelay="60" />
-		<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnDelay="10800" />
 		<npc id="30753" x="81296" y="149728" z="-3469" heading="49152" respawnDelay="60" />
 		<npc id="20566" x="81299" y="15642" z="-5286" heading="48206" respawnDelay="24" />
 		<npc id="21517" x="81305" y="-60129" z="-2335" heading="59214" respawnDelay="42" />
@@ -18011,7 +18007,6 @@
 		<npc id="20570" x="81636" y="2846" z="-3052" heading="0" respawnDelay="25" />
 		<npc id="31809" x="81636" y="152645" z="-3528" heading="49000" respawnDelay="60" />
 		<npc id="22658" x="81648" y="218037" z="-3760" heading="9822" respawnDelay="60" />
-		<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnDelay="10800" />
 		<npc id="21514" x="81652" y="-64790" z="-2312" heading="0" respawnDelay="42" />
 		<npc id="27098" x="81653" y="20057" z="-5286" heading="16608" respawnDelay="180" />
 		<npc id="30676" x="81655" y="54736" z="-1504" heading="16384" respawnDelay="60" />
@@ -18079,7 +18074,6 @@
 		<npc id="20570" x="82002" y="27544" z="-3780" heading="0" respawnDelay="25" />
 		<npc id="22654" x="82002" y="183144" z="-3600" heading="47079" respawnDelay="60" />
 		<npc id="20564" x="82020" y="13626" z="-5286" heading="17795" respawnDelay="24" />
-		<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnDelay="60" />
 		<npc id="31688" x="82053" y="147526" z="-3464" heading="16500" respawnDelay="60" />
 		<npc id="20800" x="82054" y="256115" z="-10352" heading="0" respawnDelay="94" />
 		<npc id="22650" x="82055" y="188785" z="-3744" heading="0" respawnDelay="60" />
@@ -18159,7 +18153,6 @@
 		<npc id="22633" x="82453" y="-48327" z="-4632" heading="34958" respawnDelay="60" />
 		<npc id="22618" x="82463" y="-49400" z="-4640" heading="4496" respawnDelay="60" />
 		<npc id="22652" x="82463" y="192619" z="-3568" heading="0" respawnDelay="60" />
-		<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnDelay="60" />
 		<npc id="20563" x="82469" y="12576" z="-5287" heading="18843" respawnDelay="24" />
 		<npc id="20565" x="82482" y="11691" z="-5278" heading="49476" respawnDelay="24" />
 		<npc id="22652" x="82484" y="189774" z="-3760" heading="0" respawnDelay="60" />
@@ -18179,7 +18172,6 @@
 		<npc id="21512" x="82582" y="-42299" z="-3370" heading="0" respawnDelay="42" />
 		<npc id="20573" x="82582" y="-697" z="-3720" heading="55172" respawnDelay="41" />
 		<npc id="21511" x="82583" y="-41943" z="-3370" heading="0" respawnDelay="42" />
-		<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnDelay="60" />
 		<npc id="22625" x="82638" y="-44937" z="-4640" heading="13722" respawnDelay="60" />
 		<npc id="22651" x="82653" y="214463" z="-3736" heading="58856" respawnDelay="60" />
 		<npc id="21508" x="82658" y="-41696" z="-3291" heading="0" respawnDelay="42" />
@@ -18238,7 +18230,6 @@
 		<npc id="22658" x="82910" y="214157" z="-3696" heading="50719" respawnDelay="60" />
 		<npc id="21531" x="82913" y="-84560" z="-3559" heading="57428" respawnDelay="48" />
 		<npc id="31673" x="82916" y="-139472" z="-2282" heading="16384" respawnDelay="60" />
-		<npc id="36406" x="82916" y="37108" z="-2451" heading="32073" respawnDelay="60" />
 		<npc id="21513" x="82919" y="-51643" z="-2323" heading="0" respawnDelay="42" />
 		<npc id="20994" x="82920" y="250050" z="-10871" heading="29618" respawnDelay="110" />
 		<npc id="22625" x="82923" y="-48757" z="-4640" heading="45847" respawnDelay="60" />
@@ -18270,11 +18261,9 @@
 		<npc id="22658" x="83041" y="221264" z="-3760" heading="16595" respawnDelay="60" />
 		<npc id="22617" x="83043" y="-45282" z="-4640" heading="61213" respawnDelay="60" />
 		<npc id="21508" x="83049" y="-45338" z="-3173" heading="28800" respawnDelay="42" />
-		<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnDelay="60" />
 		<npc id="22652" x="83056" y="189548" z="-3760" heading="0" respawnDelay="60" />
 		<npc id="22653" x="83056" y="190000" z="-3712" heading="47368" respawnDelay="60" />
 		<npc id="22653" x="83056" y="190339" z="-3704" heading="0" respawnDelay="60" />
-		<npc id="35651" x="83061" y="36962" z="-2293" heading="22020" respawnDelay="60" />
 		<npc id="22628" x="83071" y="-49949" z="-4640" heading="60015" respawnDelay="60" />
 		<npc id="31756" x="83076" y="147912" z="-3467" heading="32000" respawnDelay="60" />
 		<npc id="31757" x="83082" y="147845" z="-3467" heading="32000" respawnDelay="60" />
@@ -18297,7 +18286,6 @@
 		<npc id="22633" x="83162" y="-49755" z="-4640" heading="7017" respawnDelay="60" />
 		<npc id="22658" x="83163" y="222409" z="-3704" heading="60547" respawnDelay="60" />
 		<npc id="31665" x="83168" y="-54320" z="-2328" heading="0" respawnDelay="60" />
-		<npc id="35226" x="83171" y="37092" z="-2266" heading="32768" respawnDelay="60" />
 		<npc id="20801" x="83174" y="255876" z="-10352" heading="0" respawnDelay="94" />
 		<npc id="22658" x="83177" y="215068" z="-3616" heading="65195" respawnDelay="60" />
 		<npc id="30657" x="83183" y="53715" z="-1452" heading="32768" respawnDelay="60" />
@@ -18455,7 +18443,6 @@
 		<npc id="20271" x="83828" y="126012" z="-2592" heading="13309" respawnDelay="33" />
 		<npc id="22651" x="83846" y="205960" z="-3760" heading="54342" respawnDelay="60" />
 		<npc id="20566" x="83849" y="11948" z="-5277" heading="53870" respawnDelay="24" />
-		<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnDelay="60" />
 		<npc id="22621" x="83867" y="-42761" z="-4640" heading="48940" respawnDelay="60" />
 		<npc id="22650" x="83874" y="193666" z="-3760" heading="4250" respawnDelay="60" />
 		<npc id="22650" x="83877" y="184416" z="-3648" heading="55833" respawnDelay="60" />
@@ -18483,7 +18470,6 @@
 		<npc id="20799" x="84016" y="246202" z="-9337" heading="26628" respawnDelay="94" />
 		<npc id="21516" x="84017" y="-53602" z="-2316" heading="37189" respawnDelay="42" />
 		<npc id="21515" x="84024" y="-61536" z="-2314" heading="30213" respawnDelay="42" />
-		<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnDelay="60" />
 		<npc id="21516" x="84029" y="-62882" z="-2335" heading="63943" respawnDelay="42" />
 		<npc id="21515" x="84030" y="-55029" z="-2279" heading="4688" respawnDelay="42" />
 		<npc id="21514" x="84034" y="-62478" z="-2335" heading="62774" respawnDelay="42" />
diff --git a/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..3313658090
--- /dev/null
+++ b/L2J_Mobius_CT_2.6_HighFive/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnDelay="60" />
+		<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnDelay="60" />
+		<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnDelay="10800" />
+		<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnDelay="10800" />
+		<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnDelay="10800" />
+		<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnDelay="10800" />
+		<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnDelay="60" />
+		<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnDelay="60" />
+		<npc id="35226" x="83171" y="37092" z="-2266" heading="32768" respawnDelay="60" />
+		<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnDelay="60" />
+		<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnDelay="60" />
+		<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnDelay="60" />
+		<npc id="35651" x="83061" y="36962" z="-2293" heading="22020" respawnDelay="60" />
+		<npc id="36406" x="82916" y="37108" z="-2451" heading="32073" 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 810f03dac9..62b0c904a8 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
@@ -17617,7 +17617,6 @@
 		<npc id="22659" x="75253" y="219787" z="-3760" heading="0" respawnDelay="60" />
 		<npc id="22621" x="75259" y="-47542" z="-5128" heading="3556" respawnDelay="60" />
 		<npc id="22701" x="75266" y="-129261" z="-3464" heading="14517" respawnDelay="60" />
-		<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnDelay="60" />
 		<npc id="20552" x="75278" y="100277" z="-3248" heading="26996" respawnDelay="60" />
 		<npc id="20574" x="75281" y="-8483" z="-2860" heading="47345" respawnDelay="41" />
 		<npc id="22701" x="75282" y="-129780" z="-3288" heading="0" respawnDelay="60" />
@@ -18171,7 +18170,6 @@
 		<npc id="22651" x="78726" y="206490" z="-3584" heading="0" respawnDelay="60" />
 		<npc id="20800" x="78726" y="252715" z="-10359" heading="6954" respawnDelay="94" />
 		<npc id="21513" x="78735" y="-63712" z="-2300" heading="45140" respawnDelay="42" />
-		<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnDelay="10800" />
 		<npc id="21521" x="78740" y="-85420" z="-3567" heading="46355" respawnDelay="48" />
 		<npc id="20246" x="78754" y="106471" z="-3000" heading="27101" respawnDelay="60" />
 		<npc id="21511" x="78761" y="-42050" z="-3319" heading="0" respawnDelay="42" />
@@ -18236,7 +18234,6 @@
 		<npc id="22617" x="79070" y="-44755" z="-5128" heading="18023" respawnDelay="60" />
 		<npc id="30184" x="79077" y="56694" z="-1510" heading="0" respawnDelay="60" />
 		<npc id="21526" x="79080" y="-75121" z="-3552" heading="24309" respawnDelay="48" />
-		<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnDelay="10800" />
 		<npc id="22659" x="79098" y="221387" z="-3568" heading="22746" respawnDelay="60" />
 		<npc id="21532" x="79101" y="-93201" z="-3190" heading="54038" respawnDelay="48" />
 		<npc id="30178" x="79111" y="53657" z="-1548" heading="0" respawnDelay="60" />
@@ -18787,7 +18784,6 @@
 		<npc id="22858" x="81286" y="111719" z="-3608" heading="20959" respawnDelay="60" />
 		<npc id="20800" x="81286" y="248039" z="-10352" heading="0" respawnDelay="94" />
 		<npc id="22651" x="81289" y="195067" z="-3400" heading="0" respawnDelay="60" />
-		<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnDelay="10800" />
 		<npc id="30753" x="81296" y="149728" z="-3469" heading="49152" respawnDelay="60" />
 		<npc id="20566" x="81299" y="15642" z="-5286" heading="48206" respawnDelay="24" />
 		<npc id="22771" x="81300" y="76597" z="-3549" heading="59969" respawnDelay="60" />
@@ -18889,7 +18885,6 @@
 		<npc id="20570" x="81636" y="2846" z="-3052" heading="0" respawnDelay="25" />
 		<npc id="31809" x="81636" y="152645" z="-3528" heading="49000" respawnDelay="60" />
 		<npc id="22658" x="81648" y="218037" z="-3760" heading="9822" respawnDelay="60" />
-		<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnDelay="10800" />
 		<npc id="21514" x="81652" y="-64790" z="-2312" heading="0" respawnDelay="42" />
 		<npc id="27098" x="81653" y="20057" z="-5286" heading="16608" respawnDelay="180" />
 		<npc id="30676" x="81655" y="54736" z="-1504" heading="16384" respawnDelay="60" />
@@ -18977,7 +18972,6 @@
 		<npc id="20235" x="82014" y="14402" z="-5269" heading="61069" respawnDelay="24" />
 		<npc id="20564" x="82020" y="13626" z="-5286" heading="17795" respawnDelay="24" />
 		<npc id="22820" x="82028" y="113982" z="-3176" heading="25886" respawnDelay="240" />
-		<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnDelay="60" />
 		<npc id="22769" x="82050" y="77453" z="-3616" heading="10662" respawnDelay="60" />
 		<npc id="22858" x="82052" y="110574" z="-3712" heading="53345" respawnDelay="60" />
 		<npc id="31688" x="82053" y="147526" z="-3464" heading="16500" respawnDelay="60" />
@@ -19077,7 +19071,6 @@
 		<npc id="22633" x="82453" y="-48327" z="-4632" heading="34958" respawnDelay="60" />
 		<npc id="22618" x="82463" y="-49400" z="-4640" heading="4496" respawnDelay="60" />
 		<npc id="22652" x="82463" y="192619" z="-3568" heading="0" respawnDelay="60" />
-		<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnDelay="60" />
 		<npc id="20563" x="82469" y="12576" z="-5287" heading="18843" respawnDelay="24" />
 		<npc id="22772" x="82478" y="79670" z="-3624" heading="42725" respawnDelay="60" />
 		<npc id="18866" x="82481" y="82014" z="-3320" heading="481" respawnDelay="60" />
@@ -19104,7 +19097,6 @@
 		<npc id="21512" x="82582" y="-42299" z="-3370" heading="0" respawnDelay="42" />
 		<npc id="20573" x="82582" y="-697" z="-3720" heading="55172" respawnDelay="41" />
 		<npc id="21511" x="82583" y="-41943" z="-3370" heading="0" respawnDelay="42" />
-		<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnDelay="60" />
 		<npc id="22770" x="82611" y="76423" z="-3656" heading="16224" respawnDelay="60" />
 		<npc id="22625" x="82638" y="-44937" z="-4640" heading="13722" respawnDelay="60" />
 		<npc id="22772" x="82646" y="76024" z="-3616" heading="64493" respawnDelay="60" />
@@ -19172,7 +19164,6 @@
 		<npc id="22658" x="82910" y="214157" z="-3696" heading="50719" respawnDelay="60" />
 		<npc id="21531" x="82913" y="-84560" z="-3559" heading="57428" respawnDelay="48" />
 		<npc id="31673" x="82916" y="-139472" z="-2282" heading="16384" respawnDelay="60" />
-		<npc id="36406" x="82916" y="37108" z="-2451" heading="32073" respawnDelay="60" />
 		<npc id="21513" x="82919" y="-51643" z="-2323" heading="0" respawnDelay="42" />
 		<npc id="20994" x="82920" y="250050" z="-10871" heading="29618" respawnDelay="110" />
 		<npc id="22625" x="82923" y="-48757" z="-4640" heading="45847" respawnDelay="60" />
@@ -19212,11 +19203,9 @@
 		<npc id="22658" x="83041" y="221264" z="-3760" heading="16595" respawnDelay="60" />
 		<npc id="22617" x="83043" y="-45282" z="-4640" heading="61213" respawnDelay="60" />
 		<npc id="21508" x="83049" y="-45338" z="-3173" heading="28800" respawnDelay="42" />
-		<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnDelay="60" />
 		<npc id="22652" x="83056" y="189548" z="-3760" heading="0" respawnDelay="60" />
 		<npc id="22653" x="83056" y="190000" z="-3712" heading="47368" respawnDelay="60" />
 		<npc id="22653" x="83056" y="190339" z="-3704" heading="0" respawnDelay="60" />
-		<npc id="35651" x="83061" y="36962" z="-2293" heading="22020" respawnDelay="60" />
 		<npc id="20241" x="83062" y="-3372" z="-3440" heading="34015" respawnDelay="41" />
 		<npc id="22628" x="83071" y="-49949" z="-4640" heading="60015" respawnDelay="60" />
 		<npc id="31756" x="83076" y="147912" z="-3467" heading="32000" respawnDelay="60" />
@@ -19244,7 +19233,6 @@
 		<npc id="22633" x="83162" y="-49755" z="-4640" heading="7017" respawnDelay="60" />
 		<npc id="22658" x="83163" y="222409" z="-3704" heading="60547" respawnDelay="60" />
 		<npc id="31665" x="83168" y="-54320" z="-2328" heading="0" respawnDelay="60" />
-		<npc id="35226" x="83171" y="37092" z="-2266" heading="32768" respawnDelay="60" />
 		<npc id="20801" x="83174" y="255876" z="-10352" heading="0" respawnDelay="94" />
 		<npc id="22658" x="83177" y="215068" z="-3616" heading="65195" respawnDelay="60" />
 		<npc id="30657" x="83183" y="53715" z="-1452" heading="32768" respawnDelay="60" />
@@ -19429,7 +19417,6 @@
 		<npc id="20271" x="83828" y="126012" z="-2592" heading="13309" respawnDelay="33" />
 		<npc id="22651" x="83846" y="205960" z="-3760" heading="54342" respawnDelay="60" />
 		<npc id="20566" x="83849" y="11948" z="-5277" heading="53870" respawnDelay="24" />
-		<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnDelay="60" />
 		<npc id="22858" x="83858" y="117142" z="-2992" heading="56519" respawnDelay="60" />
 		<npc id="22815" x="83864" y="112262" z="-3048" heading="14368" respawnDelay="60" />
 		<npc id="22815" x="83864" y="112990" z="-3056" heading="21755" respawnDelay="60" />
@@ -19469,7 +19456,6 @@
 		<npc id="20799" x="84016" y="246202" z="-9337" heading="26628" respawnDelay="94" />
 		<npc id="21516" x="84017" y="-53602" z="-2316" heading="37189" respawnDelay="42" />
 		<npc id="21515" x="84024" y="-61536" z="-2314" heading="30213" respawnDelay="42" />
-		<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnDelay="60" />
 		<npc id="21516" x="84029" y="-62882" z="-2335" heading="63943" respawnDelay="42" />
 		<npc id="21515" x="84030" y="-55029" z="-2279" heading="4688" respawnDelay="42" />
 		<npc id="22771" x="84032" y="80928" z="-3640" heading="44780" respawnDelay="60" />
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..f9a0e5ed67
--- /dev/null
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" />
+			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" />
+			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" />
+			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" />
+			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" />
+			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" />
+			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" />
+			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" />
+			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" />
+			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" />
+			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" />
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Oren/Oren.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Oren/Oren.xml
index 9c2b8226d4..d968d9de73 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Oren/Oren.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/Oren/Oren.xml
@@ -283,13 +283,6 @@
 			<npc id="30934" x="85881" y="14126" z="-5257" heading="46752" respawnTime="60sec" />
 			<npc id="30935" x="82234" y="22257" z="-5257" heading="54112" respawnTime="60sec" />
 			<npc id="31606" x="85731" y="16380" z="-4299" heading="46905" respawnTime="60sec" />
-			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" />
-			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" />
-			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" />
-			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" />
-			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" />
-			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" />
-			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" />
 			<npc id="30750" x="71569" y="44058" z="-1436" heading="0" respawnTime="60sec" />
 			<npc id="30760" x="80036" y="56568" z="-1557" heading="57344" respawnTime="60sec" />
 			<npc id="30657" x="83183" y="53715" z="-1452" heading="32768" respawnTime="60sec" />
@@ -331,10 +324,7 @@
 			<npc id="30681" x="83760" y="56096" z="-1523" heading="32500" respawnTime="60sec" />
 			<npc id="31688" x="82688" y="53056" z="-1494" heading="16500" respawnTime="60sec" />
 			<npc id="31690" x="82752" y="53056" z="-1494" heading="16500" respawnTime="60sec" />
-			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" />
 			<npc id="31031" x="79998" y="55455" z="-1568" heading="16384" respawnTime="5sec" />
-			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" />
-			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" />
 			<npc id="30886" x="111468" y="-12224" z="-1781" heading="20480" respawnTime="60sec" />
 			<npc id="30882" x="112668" y="-17960" z="-1793" heading="20480" respawnTime="60sec" />
 			<npc id="30881" x="112740" y="-17944" z="-1797" heading="20480" respawnTime="60sec" />
@@ -412,7 +402,6 @@
 			<npc id="30132" x="28225" y="12998" z="-3725" heading="16500" respawnTime="60sec" />
 			<npc id="30133" x="27921" y="12991" z="-3728" heading="16500" respawnTime="60sec" />
 			<npc id="30130" x="25856" y="10832" z="-3724" heading="24576" respawnTime="60sec" />
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" />
 		</group>
 	</spawn>
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..f9a0e5ed67
--- /dev/null
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" />
+			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" />
+			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" />
+			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" />
+			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" />
+			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" />
+			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" />
+			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" />
+			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" />
+			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" />
+			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" />
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/Oren/Oren.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/Oren/Oren.xml
index 56a24e0540..54b4c008ba 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/Oren/Oren.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/Oren/Oren.xml
@@ -282,13 +282,6 @@
 			<npc id="30724" x="85143" y="14911" z="-3511" heading="49152" respawnTime="60sec" />
 			<npc id="30934" x="85881" y="14126" z="-5257" heading="46752" respawnTime="60sec" />
 			<npc id="30935" x="82234" y="22257" z="-5257" heading="54112" respawnTime="60sec" />
-			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" />
-			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" />
-			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" />
-			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" />
-			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" />
-			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" />
-			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" />
 			<npc id="30750" x="71569" y="44058" z="-1436" heading="0" respawnTime="60sec" />
 			<npc id="30760" x="80036" y="56568" z="-1557" heading="57344" respawnTime="60sec" />
 			<npc id="30657" x="83183" y="53715" z="-1452" heading="32768" respawnTime="60sec" />
@@ -330,10 +323,7 @@
 			<npc id="30681" x="83760" y="56096" z="-1523" heading="32500" respawnTime="60sec" />
 			<npc id="31688" x="82688" y="53056" z="-1494" heading="16500" respawnTime="60sec" />
 			<npc id="31690" x="82752" y="53056" z="-1494" heading="16500" respawnTime="60sec" />
-			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" />
 			<npc id="31031" x="79998" y="55455" z="-1568" heading="16384" respawnTime="5sec" />
-			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" />
-			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" />
 			<npc id="30886" x="111468" y="-12224" z="-1781" heading="20480" respawnTime="60sec" />
 			<npc id="30882" x="112668" y="-17960" z="-1793" heading="20480" respawnTime="60sec" />
 			<npc id="30881" x="112740" y="-17944" z="-1797" heading="20480" respawnTime="60sec" />
@@ -410,7 +400,6 @@
 			<npc id="30132" x="28225" y="12998" z="-3725" heading="16500" respawnTime="60sec" />
 			<npc id="30133" x="27921" y="12991" z="-3728" heading="16500" respawnTime="60sec" />
 			<npc id="30130" x="25856" y="10832" z="-3724" heading="24576" respawnTime="60sec" />
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" />
 		</group>
 	</spawn>
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..f9a0e5ed67
--- /dev/null
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" />
+			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" />
+			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" />
+			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" />
+			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" />
+			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" />
+			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" />
+			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" />
+			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" />
+			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" />
+			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" />
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/Oren/Oren.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/Oren/Oren.xml
index 56a24e0540..54b4c008ba 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/Oren/Oren.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/Oren/Oren.xml
@@ -282,13 +282,6 @@
 			<npc id="30724" x="85143" y="14911" z="-3511" heading="49152" respawnTime="60sec" />
 			<npc id="30934" x="85881" y="14126" z="-5257" heading="46752" respawnTime="60sec" />
 			<npc id="30935" x="82234" y="22257" z="-5257" heading="54112" respawnTime="60sec" />
-			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" />
-			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" />
-			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" />
-			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" />
-			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" />
-			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" />
-			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" />
 			<npc id="30750" x="71569" y="44058" z="-1436" heading="0" respawnTime="60sec" />
 			<npc id="30760" x="80036" y="56568" z="-1557" heading="57344" respawnTime="60sec" />
 			<npc id="30657" x="83183" y="53715" z="-1452" heading="32768" respawnTime="60sec" />
@@ -330,10 +323,7 @@
 			<npc id="30681" x="83760" y="56096" z="-1523" heading="32500" respawnTime="60sec" />
 			<npc id="31688" x="82688" y="53056" z="-1494" heading="16500" respawnTime="60sec" />
 			<npc id="31690" x="82752" y="53056" z="-1494" heading="16500" respawnTime="60sec" />
-			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" />
 			<npc id="31031" x="79998" y="55455" z="-1568" heading="16384" respawnTime="5sec" />
-			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" />
-			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" />
 			<npc id="30886" x="111468" y="-12224" z="-1781" heading="20480" respawnTime="60sec" />
 			<npc id="30882" x="112668" y="-17960" z="-1793" heading="20480" respawnTime="60sec" />
 			<npc id="30881" x="112740" y="-17944" z="-1797" heading="20480" respawnTime="60sec" />
@@ -410,7 +400,6 @@
 			<npc id="30132" x="28225" y="12998" z="-3725" heading="16500" respawnTime="60sec" />
 			<npc id="30133" x="27921" y="12991" z="-3728" heading="16500" respawnTime="60sec" />
 			<npc id="30130" x="25856" y="10832" z="-3724" heading="24576" respawnTime="60sec" />
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" />
 		</group>
 	</spawn>
 </list>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..f9a0e5ed67
--- /dev/null
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" />
+			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" />
+			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" />
+			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" />
+			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" />
+			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" />
+			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" />
+			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" />
+			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" />
+			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" />
+			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" />
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Oren/Oren.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Oren/Oren.xml
index 1e75e97533..3b997537cb 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Oren/Oren.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/Oren/Oren.xml
@@ -282,13 +282,6 @@
 			<npc id="30724" x="85143" y="14911" z="-3511" heading="49152" respawnTime="60sec" />
 			<npc id="30934" x="85881" y="14126" z="-5257" heading="46752" respawnTime="60sec" />
 			<npc id="30935" x="82234" y="22257" z="-5257" heading="54112" respawnTime="60sec" />
-			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" />
-			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" />
-			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" />
-			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" />
-			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" />
-			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" />
-			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" />
 			<npc id="30750" x="71569" y="44058" z="-1436" heading="0" respawnTime="60sec" />
 			<npc id="30760" x="80036" y="56568" z="-1557" heading="57344" respawnTime="60sec" />
 			<npc id="30657" x="83183" y="53715" z="-1452" heading="32768" respawnTime="60sec" />
@@ -330,10 +323,7 @@
 			<npc id="30681" x="83760" y="56096" z="-1523" heading="32500" respawnTime="60sec" />
 			<npc id="31688" x="82688" y="53056" z="-1494" heading="16500" respawnTime="60sec" />
 			<npc id="31690" x="82752" y="53056" z="-1494" heading="16500" respawnTime="60sec" />
-			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" />
 			<npc id="31031" x="79998" y="55455" z="-1568" heading="16384" respawnTime="5sec" />
-			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" />
-			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" />
 			<npc id="30886" x="111468" y="-12224" z="-1781" heading="20480" respawnTime="60sec" />
 			<npc id="30882" x="112668" y="-17960" z="-1793" heading="20480" respawnTime="60sec" />
 			<npc id="30881" x="112740" y="-17944" z="-1797" heading="20480" respawnTime="60sec" />
@@ -410,7 +400,6 @@
 			<npc id="30132" x="28225" y="12998" z="-3725" heading="16500" respawnTime="60sec" />
 			<npc id="30133" x="27921" y="12991" z="-3728" heading="16500" respawnTime="60sec" />
 			<npc id="30130" x="25856" y="10832" z="-3724" heading="24576" respawnTime="60sec" />
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" />
 			<npc id="31651" x="65976" y="29864" z="-3744" heading="0" respawnTime="360sec" />
 		</group>
 	</spawn>
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..f9a0e5ed67
--- /dev/null
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" />
+			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" />
+			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" />
+			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" />
+			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" />
+			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" />
+			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" />
+			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" />
+			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" />
+			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" />
+			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" />
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/Oren/Oren.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/Oren/Oren.xml
index 1e75e97533..3b997537cb 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/Oren/Oren.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/Oren/Oren.xml
@@ -282,13 +282,6 @@
 			<npc id="30724" x="85143" y="14911" z="-3511" heading="49152" respawnTime="60sec" />
 			<npc id="30934" x="85881" y="14126" z="-5257" heading="46752" respawnTime="60sec" />
 			<npc id="30935" x="82234" y="22257" z="-5257" heading="54112" respawnTime="60sec" />
-			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" />
-			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" />
-			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" />
-			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" />
-			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" />
-			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" />
-			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" />
 			<npc id="30750" x="71569" y="44058" z="-1436" heading="0" respawnTime="60sec" />
 			<npc id="30760" x="80036" y="56568" z="-1557" heading="57344" respawnTime="60sec" />
 			<npc id="30657" x="83183" y="53715" z="-1452" heading="32768" respawnTime="60sec" />
@@ -330,10 +323,7 @@
 			<npc id="30681" x="83760" y="56096" z="-1523" heading="32500" respawnTime="60sec" />
 			<npc id="31688" x="82688" y="53056" z="-1494" heading="16500" respawnTime="60sec" />
 			<npc id="31690" x="82752" y="53056" z="-1494" heading="16500" respawnTime="60sec" />
-			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" />
 			<npc id="31031" x="79998" y="55455" z="-1568" heading="16384" respawnTime="5sec" />
-			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" />
-			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" />
 			<npc id="30886" x="111468" y="-12224" z="-1781" heading="20480" respawnTime="60sec" />
 			<npc id="30882" x="112668" y="-17960" z="-1793" heading="20480" respawnTime="60sec" />
 			<npc id="30881" x="112740" y="-17944" z="-1797" heading="20480" respawnTime="60sec" />
@@ -410,7 +400,6 @@
 			<npc id="30132" x="28225" y="12998" z="-3725" heading="16500" respawnTime="60sec" />
 			<npc id="30133" x="27921" y="12991" z="-3728" heading="16500" respawnTime="60sec" />
 			<npc id="30130" x="25856" y="10832" z="-3724" heading="24576" respawnTime="60sec" />
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" />
 			<npc id="31651" x="65976" y="29864" z="-3744" heading="0" respawnTime="360sec" />
 		</group>
 	</spawn>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..f9a0e5ed67
--- /dev/null
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" />
+			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" />
+			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" />
+			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" />
+			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" />
+			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" />
+			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" />
+			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" />
+			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" />
+			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" />
+			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" />
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/spawns/Oren/Oren.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/spawns/Oren/Oren.xml
index 1e75e97533..3b997537cb 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/spawns/Oren/Oren.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/spawns/Oren/Oren.xml
@@ -282,13 +282,6 @@
 			<npc id="30724" x="85143" y="14911" z="-3511" heading="49152" respawnTime="60sec" />
 			<npc id="30934" x="85881" y="14126" z="-5257" heading="46752" respawnTime="60sec" />
 			<npc id="30935" x="82234" y="22257" z="-5257" heading="54112" respawnTime="60sec" />
-			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" />
-			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" />
-			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" />
-			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" />
-			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" />
-			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" />
-			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" />
 			<npc id="30750" x="71569" y="44058" z="-1436" heading="0" respawnTime="60sec" />
 			<npc id="30760" x="80036" y="56568" z="-1557" heading="57344" respawnTime="60sec" />
 			<npc id="30657" x="83183" y="53715" z="-1452" heading="32768" respawnTime="60sec" />
@@ -330,10 +323,7 @@
 			<npc id="30681" x="83760" y="56096" z="-1523" heading="32500" respawnTime="60sec" />
 			<npc id="31688" x="82688" y="53056" z="-1494" heading="16500" respawnTime="60sec" />
 			<npc id="31690" x="82752" y="53056" z="-1494" heading="16500" respawnTime="60sec" />
-			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" />
 			<npc id="31031" x="79998" y="55455" z="-1568" heading="16384" respawnTime="5sec" />
-			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" />
-			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" />
 			<npc id="30886" x="111468" y="-12224" z="-1781" heading="20480" respawnTime="60sec" />
 			<npc id="30882" x="112668" y="-17960" z="-1793" heading="20480" respawnTime="60sec" />
 			<npc id="30881" x="112740" y="-17944" z="-1797" heading="20480" respawnTime="60sec" />
@@ -410,7 +400,6 @@
 			<npc id="30132" x="28225" y="12998" z="-3725" heading="16500" respawnTime="60sec" />
 			<npc id="30133" x="27921" y="12991" z="-3728" heading="16500" respawnTime="60sec" />
 			<npc id="30130" x="25856" y="10832" z="-3724" heading="24576" respawnTime="60sec" />
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" />
 			<npc id="31651" x="65976" y="29864" z="-3744" heading="0" respawnTime="360sec" />
 		</group>
 	</spawn>
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..f9a0e5ed67
--- /dev/null
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" />
+			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" />
+			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" />
+			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" />
+			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" />
+			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" />
+			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" />
+			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" />
+			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" />
+			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" />
+			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" />
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Oren/Oren.xml b/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Oren/Oren.xml
index e73719487f..d7ce5ad8f3 100644
--- a/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Oren/Oren.xml
+++ b/L2J_Mobius_Classic_Interlude/dist/game/data/spawns/Oren/Oren.xml
@@ -281,13 +281,6 @@
 			<npc id="30724" x="85143" y="14911" z="-3511" heading="49152" respawnTime="60sec" />
 			<npc id="30934" x="85881" y="14126" z="-5257" heading="46752" respawnTime="60sec" />
 			<npc id="30935" x="82234" y="22257" z="-5257" heading="54112" respawnTime="60sec" />
-			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" />
-			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" />
-			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" />
-			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" />
-			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" />
-			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" />
-			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" />
 			<npc id="30750" x="71569" y="44058" z="-1436" heading="0" respawnTime="60sec" />
 			<npc id="30760" x="80036" y="56568" z="-1557" heading="57344" respawnTime="60sec" />
 			<npc id="30657" x="83183" y="53715" z="-1452" heading="32768" respawnTime="60sec" />
@@ -329,10 +322,7 @@
 			<npc id="30681" x="83760" y="56096" z="-1523" heading="32500" respawnTime="60sec" />
 			<npc id="31688" x="82688" y="53056" z="-1494" heading="16500" respawnTime="60sec" />
 			<npc id="31690" x="82752" y="53056" z="-1494" heading="16500" respawnTime="60sec" />
-			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" />
 			<npc id="31031" x="79998" y="55455" z="-1568" heading="16384" respawnTime="5sec" />
-			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" />
-			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" />
 			<npc id="30886" x="111468" y="-12224" z="-1781" heading="20480" respawnTime="60sec" />
 			<npc id="30882" x="112668" y="-17960" z="-1793" heading="20480" respawnTime="60sec" />
 			<npc id="30881" x="112740" y="-17944" z="-1797" heading="20480" respawnTime="60sec" />
@@ -409,7 +399,6 @@
 			<npc id="30132" x="28225" y="12998" z="-3725" heading="16500" respawnTime="60sec" />
 			<npc id="30133" x="27921" y="12991" z="-3728" heading="16500" respawnTime="60sec" />
 			<npc id="30130" x="25856" y="10832" z="-3724" heading="24576" respawnTime="60sec" />
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" />
 		</group>
 	</spawn>
 </list>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..f9a0e5ed67
--- /dev/null
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" />
+			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" />
+			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" />
+			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" />
+			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" />
+			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" />
+			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" />
+			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" />
+			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" />
+			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" />
+			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" />
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/spawns/Oren/Oren.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/spawns/Oren/Oren.xml
index 1e75e97533..3b997537cb 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/spawns/Oren/Oren.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/spawns/Oren/Oren.xml
@@ -282,13 +282,6 @@
 			<npc id="30724" x="85143" y="14911" z="-3511" heading="49152" respawnTime="60sec" />
 			<npc id="30934" x="85881" y="14126" z="-5257" heading="46752" respawnTime="60sec" />
 			<npc id="30935" x="82234" y="22257" z="-5257" heading="54112" respawnTime="60sec" />
-			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" />
-			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" />
-			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" />
-			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" />
-			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" />
-			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" />
-			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" />
 			<npc id="30750" x="71569" y="44058" z="-1436" heading="0" respawnTime="60sec" />
 			<npc id="30760" x="80036" y="56568" z="-1557" heading="57344" respawnTime="60sec" />
 			<npc id="30657" x="83183" y="53715" z="-1452" heading="32768" respawnTime="60sec" />
@@ -330,10 +323,7 @@
 			<npc id="30681" x="83760" y="56096" z="-1523" heading="32500" respawnTime="60sec" />
 			<npc id="31688" x="82688" y="53056" z="-1494" heading="16500" respawnTime="60sec" />
 			<npc id="31690" x="82752" y="53056" z="-1494" heading="16500" respawnTime="60sec" />
-			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" />
 			<npc id="31031" x="79998" y="55455" z="-1568" heading="16384" respawnTime="5sec" />
-			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" />
-			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" />
 			<npc id="30886" x="111468" y="-12224" z="-1781" heading="20480" respawnTime="60sec" />
 			<npc id="30882" x="112668" y="-17960" z="-1793" heading="20480" respawnTime="60sec" />
 			<npc id="30881" x="112740" y="-17944" z="-1797" heading="20480" respawnTime="60sec" />
@@ -410,7 +400,6 @@
 			<npc id="30132" x="28225" y="12998" z="-3725" heading="16500" respawnTime="60sec" />
 			<npc id="30133" x="27921" y="12991" z="-3728" heading="16500" respawnTime="60sec" />
 			<npc id="30130" x="25856" y="10832" z="-3724" heading="24576" respawnTime="60sec" />
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" />
 			<npc id="31651" x="65976" y="29864" z="-3744" heading="0" respawnTime="360sec" />
 		</group>
 	</spawn>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..b758abd6d1
--- /dev/null
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
+			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
+			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
+			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/spawns/Oren/Oren.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/spawns/Oren/Oren.xml
index dd8d046cfa..529cf982e6 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/spawns/Oren/Oren.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/spawns/Oren/Oren.xml
@@ -282,13 +282,6 @@
 			<npc id="30724" x="85143" y="14911" z="-3511" heading="49152" respawnTime="60sec" /> <!-- Tavillian -->
 			<npc id="30934" x="85881" y="14126" z="-5257" heading="46752" respawnTime="60sec" /> <!-- Marsha -->
 			<npc id="30935" x="82234" y="22257" z="-5257" heading="54112" respawnTime="60sec" /> <!-- Trumpin -->
-			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
-			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
 			<npc id="30750" x="71569" y="44058" z="-1436" heading="0" respawnTime="60sec" /> <!-- Kalibran -->
 			<npc id="30760" x="80036" y="56568" z="-1557" heading="57344" respawnTime="60sec" /> <!-- Sir Gustav Athebaldt -->
 			<npc id="30657" x="83183" y="53715" z="-1452" heading="32768" respawnTime="60sec" /> <!-- Seresin -->
@@ -330,10 +323,7 @@
 			<npc id="30681" x="83760" y="56096" z="-1523" heading="32500" respawnTime="60sec" /> <!-- Karia -->
 			<npc id="31688" x="82688" y="53056" z="-1494" heading="16500" respawnTime="60sec" /> <!-- Saige -->
 			<npc id="31690" x="82752" y="53056" z="-1494" heading="16500" respawnTime="60sec" /> <!-- Monument of Heroes -->
-			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
 			<npc id="31031" x="79998" y="55455" z="-1568" heading="16384" respawnTime="5sec" /> <!-- Anchor Crystal -->
-			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
 			<npc id="30886" x="111468" y="-12224" z="-1781" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="30882" x="112668" y="-17960" z="-1793" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="30881" x="112740" y="-17944" z="-1797" heading="20480" respawnTime="60sec" /> <!-- Sanders -->
@@ -410,7 +400,6 @@
 			<npc id="30132" x="28225" y="12998" z="-3725" heading="16500" respawnTime="60sec" /> <!-- Cecktinon -->
 			<npc id="30133" x="27921" y="12991" z="-3728" heading="16500" respawnTime="60sec" /> <!-- Kartia -->
 			<npc id="30130" x="25856" y="10832" z="-3724" heading="24576" respawnTime="60sec" /> <!-- Undrias -->
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
 			<npc id="31651" x="65976" y="29864" z="-3744" heading="0" respawnTime="360sec" /> <!-- Tablet Of Vision -->
 			<npc id="32478" x="81788" y="55387" z="-1520" heading="16383" respawnTime="60sec" /> <!-- Game Assistant -->
 			<npc id="30012" x="79774" y="54746" z="-1544" heading="16383" respawnTime="60sec" /> <!-- Fishing Guildsman -->
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Castles/Oren.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Castles/Oren.xml
new file mode 100644
index 0000000000..b758abd6d1
--- /dev/null
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Castles/Oren.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="OrenCastle">
+		<group>
+			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
+			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
+			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
+			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
+			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
+			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
+			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
+			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
+			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
+		</group>
+	</spawn>
+</list>
diff --git a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Oren/Oren.xml b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Oren/Oren.xml
index dd8d046cfa..529cf982e6 100644
--- a/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Oren/Oren.xml
+++ b/L2J_Mobius_Essence_5.2_FrostLord/dist/game/data/spawns/Oren/Oren.xml
@@ -282,13 +282,6 @@
 			<npc id="30724" x="85143" y="14911" z="-3511" heading="49152" respawnTime="60sec" /> <!-- Tavillian -->
 			<npc id="30934" x="85881" y="14126" z="-5257" heading="46752" respawnTime="60sec" /> <!-- Marsha -->
 			<npc id="30935" x="82234" y="22257" z="-5257" heading="54112" respawnTime="60sec" /> <!-- Trumpin -->
-			<npc id="35232" x="75275" y="40132" z="-3150" heading="32768" respawnTime="60sec" /> <!-- Sherwood -->
-			<npc id="35222" x="78737" y="36852" z="-2544" heading="32768" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35222" x="79085" y="36798" z="-2544" heading="49152" respawnTime="10800sec" /> <!-- Outer Castle Gatekeeper -->
-			<npc id="35223" x="81296" y="37025" z="-2254" heading="32768" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35223" x="81651" y="36959" z="-2294" heading="49152" respawnTime="10800sec" /> <!-- Inner Castle Gatekeeper -->
-			<npc id="35221" x="82611" y="38772" z="-1578" heading="49152" respawnTime="60sec" /> <!-- Mass Gatekeeper -->
-			<npc id="35228" x="83056" y="37425" z="-2280" heading="32768" respawnTime="60sec" /> <!-- Morrison -->
 			<npc id="30750" x="71569" y="44058" z="-1436" heading="0" respawnTime="60sec" /> <!-- Kalibran -->
 			<npc id="30760" x="80036" y="56568" z="-1557" heading="57344" respawnTime="60sec" /> <!-- Sir Gustav Athebaldt -->
 			<npc id="30657" x="83183" y="53715" z="-1452" heading="32768" respawnTime="60sec" /> <!-- Seresin -->
@@ -330,10 +323,7 @@
 			<npc id="30681" x="83760" y="56096" z="-1523" heading="32500" respawnTime="60sec" /> <!-- Karia -->
 			<npc id="31688" x="82688" y="53056" z="-1494" heading="16500" respawnTime="60sec" /> <!-- Saige -->
 			<npc id="31690" x="82752" y="53056" z="-1494" heading="16500" respawnTime="60sec" /> <!-- Monument of Heroes -->
-			<npc id="35227" x="83853" y="37192" z="-1835" heading="49000" respawnTime="60sec" /> <!-- Finrod -->
 			<npc id="31031" x="79998" y="55455" z="-1568" heading="16384" respawnTime="5sec" /> <!-- Anchor Crystal -->
-			<npc id="35225" x="82043" y="37132" z="-2450" heading="65001" respawnTime="60sec" /> <!-- Warehouse Keeper -->
-			<npc id="35224" x="82464" y="37592" z="-2450" heading="44984" respawnTime="60sec" /> <!-- Blacksmith -->
 			<npc id="30886" x="111468" y="-12224" z="-1781" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="30882" x="112668" y="-17960" z="-1793" heading="20480" respawnTime="60sec" /> <!-- Border Patrol -->
 			<npc id="30881" x="112740" y="-17944" z="-1797" heading="20480" respawnTime="60sec" /> <!-- Sanders -->
@@ -410,7 +400,6 @@
 			<npc id="30132" x="28225" y="12998" z="-3725" heading="16500" respawnTime="60sec" /> <!-- Cecktinon -->
 			<npc id="30133" x="27921" y="12991" z="-3728" heading="16500" respawnTime="60sec" /> <!-- Kartia -->
 			<npc id="30130" x="25856" y="10832" z="-3724" heading="24576" respawnTime="60sec" /> <!-- Undrias -->
-			<npc id="35189" x="84026" y="37191" z="-2272" heading="32768" respawnTime="60sec" /> <!-- Oren Holy Artifact -->
 			<npc id="31651" x="65976" y="29864" z="-3744" heading="0" respawnTime="360sec" /> <!-- Tablet Of Vision -->
 			<npc id="32478" x="81788" y="55387" z="-1520" heading="16383" respawnTime="60sec" /> <!-- Game Assistant -->
 			<npc id="30012" x="79774" y="54746" z="-1544" heading="16383" respawnTime="60sec" /> <!-- Fishing Guildsman -->