From 51d45f82612533eb8fa0366a32760d4df8335dd6 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Sun, 9 Jun 2019 05:14:33 +0000
Subject: [PATCH] Adjustments for level 30-39 raidbosses. Contributed by
 Minzee.

---
 .../html/admin/teleports/raid/raid_30.htm     | 16 ++--
 .../dist/game/data/spawns/RaidbossSpawns.xml  | 88 ++++++++++++-------
 .../html/admin/teleports/raid/raid_30.htm     | 16 ++--
 .../dist/game/data/spawns/RaidbossSpawns.xml  | 88 ++++++++++++-------
 .../html/admin/teleports/raid/raid_30.htm     | 16 ++--
 .../dist/game/data/spawns/RaidbossSpawns.xml  | 88 ++++++++++++-------
 .../html/admin/teleports/raid/raid_30.htm     | 16 ++--
 .../dist/game/data/spawns/RaidbossSpawns.xml  | 88 ++++++++++++-------
 .../html/admin/teleports/raid/raid_30.htm     | 16 ++--
 .../dist/game/data/spawns/RaidbossSpawns.xml  | 88 ++++++++++++-------
 10 files changed, 315 insertions(+), 205 deletions(-)

diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/teleports/raid/raid_30.htm b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/teleports/raid/raid_30.htm
index e4950f7080..24607a2d4e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/teleports/raid/raid_30.htm
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/html/admin/teleports/raid/raid_30.htm
@@ -14,29 +14,23 @@
 <button action="bypass -h admin_move_to 53712 102656 -1072" value="Cat's Eye (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 116128 139392 -3640" value="Beleth' Agent Meana (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -54464 170288 -3136" value="Ragraman (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 127076 214973 -3100" value="Apepi (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -16912 174912 -3264" value="Giant Wasteland Basilisk (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 48575 -106191 -1568" value="Grave Robber Leader Akata (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 29928 107160 -3708" value="Queen's Royal Guard Captain (32)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 17696 179056 -3520" value="Vuku Grand Seer Gharmash (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 117336 102840 -3622" value="Skyla (32)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 17696 179056 -3520" value="Vuku Grand Priest Gharmash (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 45600 120592 -2455" value="Nurka's Messenger (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 35992 191312 -3104" value="Corsair Captain Kylon (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 27280 101744 -3696" value="Marsh Stakato Queen Zyrnna (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 127837 200661 -3792" value="Cronos's Servitor Mumu (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 90384 125568 -2128" value="Breka Warlock Pastu (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 51632 153920 -3552" value="Revenant of Sir Calibus (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 10416 126880 -3676" value="Remmel (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -91024 116304 -3466" value="Chertuba of Great Soul (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 123536 133504 -3584" value="Sejarr's Servitor (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 43872 123968 -2928" value="Flame Lord Shadar (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 99732 204331 -3784" value="Tasaba Patriarch Hellena (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -16096 184288 -3817" value="Gargoyle Lord Sirocco (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 40128 101920 -1241" value="Red Eye Captain Trakia (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 5000 189000 -3728" value="Beleth' Eye (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 113456 198118 -3689" value="Sebek (36)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 127900 -160600 -1100" value="Rayito the Looter (37)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 51032 146632 -3643" value="Execution Grounds Watchman Guillotine (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 43304 152352 -2848" value="Soul Collector Acheron (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 53640 143864 -3854" value="Evil Spirit Tempest (36)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 26064 121808 -3738" value="Lizardmen Captain Hellion (38)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 129025 219237 -3678" value="Premo Prime (38)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 88512 140576 -3483" value="Leader of Cat Gang (39)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 123000 -141000 -1100" value="Nellis' Vengeful Spirit (39)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/RaidbossSpawns.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/RaidbossSpawns.xml
index 653565622a..8697772660 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/RaidbossSpawns.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/spawns/RaidbossSpawns.xml
@@ -68,13 +68,11 @@
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="gludio04_mb1823_01" minZ="-3788" maxZ="-3088">
-				<node x="-55023" y="172477" />
-				<node x="-54417" y="171840" />
-				<node x="-53308" y="172132" />
-				<node x="-53269" y="172696" />
-				<node x="-53577" y="173504" />
-				<node x="-54440" y="173010" />
+			<territory name="gludio04_mb1823_01" minZ="-3300" maxZ="-2700">
+				<node x="-54788" y="169384" />
+				<node x="-53992" y="170104" />
+				<node x="-54024" y="170920" />
+				<node x="-55264" y="170876" />
 			</territory>
 		</territories>
 		<npc id="25169" x="-54127" y="172510" z="-3632" dbSave="true" dbName="ragraman" respawnTime="24hour" respawnRandom="12hour" /> <!-- Ragraman -->
@@ -161,27 +159,26 @@
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="gludio04_mb1923_01" minZ="-3305" maxZ="-2805">
-				<node x="-17304" y="174316" />
-				<node x="-16671" y="174203" />
-				<node x="-16329" y="174872" />
-				<node x="-16557" y="175322" />
-				<node x="-17215" y="175234" />
+			<territory name="gludio04_mb1923_01" minZ="-3584" maxZ="-2984">
+				<node x="-17460" y="174700" />
+				<node x="-16872" y="174032" />
+				<node x="-16212" y="174712" />
+				<node x="-16368" y="175456" />
+				<node x="-17304" y="175548" />
 			</territory>
 		</territories>
 		<npc id="25352" dbSave="true" dbName="giant_wasteland_basil" respawnTime="24hour" respawnRandom="12hour" /> <!-- Giant Wasteland Basilisk -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="gludio04_mb1923_02" minZ="-3961" maxZ="-3361">
-				<node x="-16700" y="183404" />
-				<node x="-16055" y="183047" />
-				<node x="-15421" y="183852" />
-				<node x="-15753" y="184318" />
-				<node x="-16423" y="184242" />
+			<territory name="gludio04_mb1923_02" minZ="-3964" maxZ="-3364">
+				<node x="-16560" y="183800" />
+				<node x="-15540" y="183892" />
+				<node x="-15552" y="184648" />
+				<node x="-16704" y="184840" />
 			</territory>
 		</territories>
-		<npc id="25354" x="-15909" y="183768" z="-3872" dbSave="true" dbName="gargoyle_lord_sirocco" respawnTime="24hour" respawnRandom="12hour" /> <!-- Gargoyle Lord Sirocco -->
+		<npc id="25354" x="-16072" y="184361" z="-3807" dbSave="true" dbName="gargoyle_lord_sirocco" respawnTime="24hour" respawnRandom="12hour" /> <!-- Gargoyle Lord Sirocco -->
 	</spawn>
 	<spawn>
 		<territories>
@@ -411,7 +408,7 @@
 				<node x="9952" y="127352" />
 			</territory>
 		</territories>
-		<npc id="25041" dbSave="true" dbName="ikuntai" respawnTime="24hour" respawnRandom="12hour" /> <!-- Remmel -->
+		<npc id="25041" dbSave="true" dbName="remmel" respawnTime="24hour" respawnRandom="12hour" /> <!-- Remmel -->
 	</spawn>
 	<spawn>
 		<territories>
@@ -422,7 +419,7 @@
 				<node x="25290" y="122425" />
 			</territory>
 		</territories>
-		<npc id="25170" dbSave="true" dbName="remmel" respawnTime="24hour" respawnRandom="12hour" /> <!-- Lizardmen Captain Hellion -->
+		<npc id="25170" dbSave="true" dbName="lizardman_leader_hellion" respawnTime="24hour" respawnRandom="12hour" /> <!-- Lizardmen Captain Hellion -->
 	</spawn>
 	<spawn>
 		<territories>
@@ -928,21 +925,52 @@
 		</territories>
 		<npc id="25149" dbSave="true" dbName="zombie_lord_crowl" respawnTime="24hour" respawnRandom="12hour" /> <!-- Zombie Lord Crowl -->
 	</spawn>
-	<!-- Skyla -->
 	<spawn>
-		<npc id="25401" x="117808" y="102880" z="-3592" heading="0" dbSave="true" dbName="Skyla" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="giran03_mb2321_03" minZ="-3740" maxZ="-3140">
+				<node x="116704" y="103332" />
+				<node x="117488" y="101996" />
+				<node x="119064" y="102712" />
+				<node x="117992" y="103752" />
+			</territory>
+		</territories>
+		<npc id="25401" dbSave="true" dbName="antaras_adherent_skyla" respawnTime="24hour" respawnRandom="12hour" /> <!-- Skyla -->
 	</spawn>
-	<!-- Execution Grounds Watchman Guillotine -->
 	<spawn>
-		<npc id="25118" x="50872" y="146616" z="-3632" heading="0" dbSave="true" dbName="Execution Grounds Watchman Guillotine" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="dion02_mb2122_02" minZ="-3677" maxZ="-3077">
+				<node x="50325" y="146283" />
+				<node x="50978" y="145946" />
+				<node x="51400" y="146676" />
+				<node x="51137" y="147486" />
+				<node x="50574" y="147430" />
+			</territory>
+		</territories>
+		<npc id="25118" dbSave="true" dbName="warden_guillotine" respawnTime="24hour" respawnRandom="12hour" /> <!-- Execution Grounds Watchman Guillotine -->
 	</spawn>
-	<!-- Soul Collector Acheron -->
 	<spawn>
-		<npc id="25223" x="43152" y="152352" z="-2840" heading="0" dbSave="true" dbName="Soul Collector Acheron" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="dion02_mb2122_03" minZ="-2894" maxZ="-2294">
+				<node x="42227" y="152067" />
+				<node x="43611" y="152017" />
+				<node x="43446" y="152927" />
+				<node x="42965" y="152958" />
+			</territory>
+		</territories>
+		<npc id="25223" dbSave="true" dbName="soul_collector_acheron" respawnTime="24hour" respawnRandom="12hour" /> <!-- Soul Collector Acheron -->
 	</spawn>
-	<!-- Evil Spirit Tempest -->
 	<spawn>
-		<npc id="25385" x="53600" y="143472" z="-3864" heading="0" dbSave="true" dbName="Evil Spirit Tempest" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="dion02_mb2122_01" minZ="-3932" maxZ="-3332">
+				<node x="53151" y="142897" />
+				<node x="53548" y="142749" />
+				<node x="54119" y="142852" />
+				<node x="53643" y="144591" />
+				<node x="53200" y="144369" />
+				<node x="52850" y="143748" />
+			</territory>
+		</territories>
+		<npc id="25385" dbSave="true" dbName="demon_tempest" respawnTime="24hour" respawnRandom="12hour" /> <!-- Evil Spirit Tempest -->
 	</spawn>
 	<!-- Necrosentinel Royal Guard -->
 	<spawn>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/teleports/raid/raid_30.htm b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/teleports/raid/raid_30.htm
index e4950f7080..24607a2d4e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/teleports/raid/raid_30.htm
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/html/admin/teleports/raid/raid_30.htm
@@ -14,29 +14,23 @@
 <button action="bypass -h admin_move_to 53712 102656 -1072" value="Cat's Eye (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 116128 139392 -3640" value="Beleth' Agent Meana (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -54464 170288 -3136" value="Ragraman (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 127076 214973 -3100" value="Apepi (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -16912 174912 -3264" value="Giant Wasteland Basilisk (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 48575 -106191 -1568" value="Grave Robber Leader Akata (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 29928 107160 -3708" value="Queen's Royal Guard Captain (32)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 17696 179056 -3520" value="Vuku Grand Seer Gharmash (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 117336 102840 -3622" value="Skyla (32)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 17696 179056 -3520" value="Vuku Grand Priest Gharmash (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 45600 120592 -2455" value="Nurka's Messenger (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 35992 191312 -3104" value="Corsair Captain Kylon (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 27280 101744 -3696" value="Marsh Stakato Queen Zyrnna (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 127837 200661 -3792" value="Cronos's Servitor Mumu (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 90384 125568 -2128" value="Breka Warlock Pastu (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 51632 153920 -3552" value="Revenant of Sir Calibus (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 10416 126880 -3676" value="Remmel (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -91024 116304 -3466" value="Chertuba of Great Soul (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 123536 133504 -3584" value="Sejarr's Servitor (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 43872 123968 -2928" value="Flame Lord Shadar (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 99732 204331 -3784" value="Tasaba Patriarch Hellena (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -16096 184288 -3817" value="Gargoyle Lord Sirocco (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 40128 101920 -1241" value="Red Eye Captain Trakia (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 5000 189000 -3728" value="Beleth' Eye (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 113456 198118 -3689" value="Sebek (36)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 127900 -160600 -1100" value="Rayito the Looter (37)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 51032 146632 -3643" value="Execution Grounds Watchman Guillotine (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 43304 152352 -2848" value="Soul Collector Acheron (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 53640 143864 -3854" value="Evil Spirit Tempest (36)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 26064 121808 -3738" value="Lizardmen Captain Hellion (38)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 129025 219237 -3678" value="Premo Prime (38)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 88512 140576 -3483" value="Leader of Cat Gang (39)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 123000 -141000 -1100" value="Nellis' Vengeful Spirit (39)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/RaidbossSpawns.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/RaidbossSpawns.xml
index faeaddf28e..17495e3688 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/RaidbossSpawns.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/spawns/RaidbossSpawns.xml
@@ -68,13 +68,11 @@
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="gludio04_mb1823_01" minZ="-3788" maxZ="-3088">
-				<node x="-55023" y="172477" />
-				<node x="-54417" y="171840" />
-				<node x="-53308" y="172132" />
-				<node x="-53269" y="172696" />
-				<node x="-53577" y="173504" />
-				<node x="-54440" y="173010" />
+			<territory name="gludio04_mb1823_01" minZ="-3300" maxZ="-2700">
+				<node x="-54788" y="169384" />
+				<node x="-53992" y="170104" />
+				<node x="-54024" y="170920" />
+				<node x="-55264" y="170876" />
 			</territory>
 		</territories>
 		<npc id="25169" x="-54127" y="172510" z="-3632" dbSave="true" dbName="ragraman" respawnTime="24hour" respawnRandom="12hour" /> <!-- Ragraman -->
@@ -161,27 +159,26 @@
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="gludio04_mb1923_01" minZ="-3305" maxZ="-2805">
-				<node x="-17304" y="174316" />
-				<node x="-16671" y="174203" />
-				<node x="-16329" y="174872" />
-				<node x="-16557" y="175322" />
-				<node x="-17215" y="175234" />
+			<territory name="gludio04_mb1923_01" minZ="-3584" maxZ="-2984">
+				<node x="-17460" y="174700" />
+				<node x="-16872" y="174032" />
+				<node x="-16212" y="174712" />
+				<node x="-16368" y="175456" />
+				<node x="-17304" y="175548" />
 			</territory>
 		</territories>
 		<npc id="25352" dbSave="true" dbName="giant_wasteland_basil" respawnTime="24hour" respawnRandom="12hour" /> <!-- Giant Wasteland Basilisk -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="gludio04_mb1923_02" minZ="-3961" maxZ="-3361">
-				<node x="-16700" y="183404" />
-				<node x="-16055" y="183047" />
-				<node x="-15421" y="183852" />
-				<node x="-15753" y="184318" />
-				<node x="-16423" y="184242" />
+			<territory name="gludio04_mb1923_02" minZ="-3964" maxZ="-3364">
+				<node x="-16560" y="183800" />
+				<node x="-15540" y="183892" />
+				<node x="-15552" y="184648" />
+				<node x="-16704" y="184840" />
 			</territory>
 		</territories>
-		<npc id="25354" x="-15909" y="183768" z="-3872" dbSave="true" dbName="gargoyle_lord_sirocco" respawnTime="24hour" respawnRandom="12hour" /> <!-- Gargoyle Lord Sirocco -->
+		<npc id="25354" x="-16072" y="184361" z="-3807" dbSave="true" dbName="gargoyle_lord_sirocco" respawnTime="24hour" respawnRandom="12hour" /> <!-- Gargoyle Lord Sirocco -->
 	</spawn>
 	<spawn>
 		<territories>
@@ -411,7 +408,7 @@
 				<node x="9952" y="127352" />
 			</territory>
 		</territories>
-		<npc id="25041" dbSave="true" dbName="ikuntai" respawnTime="24hour" respawnRandom="12hour" /> <!-- Remmel -->
+		<npc id="25041" dbSave="true" dbName="remmel" respawnTime="24hour" respawnRandom="12hour" /> <!-- Remmel -->
 	</spawn>
 	<spawn>
 		<territories>
@@ -422,7 +419,7 @@
 				<node x="25290" y="122425" />
 			</territory>
 		</territories>
-		<npc id="25170" dbSave="true" dbName="remmel" respawnTime="24hour" respawnRandom="12hour" /> <!-- Lizardmen Captain Hellion -->
+		<npc id="25170" dbSave="true" dbName="lizardman_leader_hellion" respawnTime="24hour" respawnRandom="12hour" /> <!-- Lizardmen Captain Hellion -->
 	</spawn>
 	<spawn>
 		<territories>
@@ -928,21 +925,52 @@
 		</territories>
 		<npc id="25149" dbSave="true" dbName="zombie_lord_crowl" respawnTime="24hour" respawnRandom="12hour" /> <!-- Zombie Lord Crowl -->
 	</spawn>
-	<!-- Skyla -->
 	<spawn>
-		<npc id="25401" x="117808" y="102880" z="-3592" heading="0" dbSave="true" dbName="Skyla" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="giran03_mb2321_03" minZ="-3740" maxZ="-3140">
+				<node x="116704" y="103332" />
+				<node x="117488" y="101996" />
+				<node x="119064" y="102712" />
+				<node x="117992" y="103752" />
+			</territory>
+		</territories>
+		<npc id="25401" dbSave="true" dbName="antaras_adherent_skyla" respawnTime="24hour" respawnRandom="12hour" /> <!-- Skyla -->
 	</spawn>
-	<!-- Execution Grounds Watchman Guillotine -->
 	<spawn>
-		<npc id="25118" x="50872" y="146616" z="-3632" heading="0" dbSave="true" dbName="Execution Grounds Watchman Guillotine" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="dion02_mb2122_02" minZ="-3677" maxZ="-3077">
+				<node x="50325" y="146283" />
+				<node x="50978" y="145946" />
+				<node x="51400" y="146676" />
+				<node x="51137" y="147486" />
+				<node x="50574" y="147430" />
+			</territory>
+		</territories>
+		<npc id="25118" dbSave="true" dbName="warden_guillotine" respawnTime="24hour" respawnRandom="12hour" /> <!-- Execution Grounds Watchman Guillotine -->
 	</spawn>
-	<!-- Soul Collector Acheron -->
 	<spawn>
-		<npc id="25223" x="43152" y="152352" z="-2840" heading="0" dbSave="true" dbName="Soul Collector Acheron" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="dion02_mb2122_03" minZ="-2894" maxZ="-2294">
+				<node x="42227" y="152067" />
+				<node x="43611" y="152017" />
+				<node x="43446" y="152927" />
+				<node x="42965" y="152958" />
+			</territory>
+		</territories>
+		<npc id="25223" dbSave="true" dbName="soul_collector_acheron" respawnTime="24hour" respawnRandom="12hour" /> <!-- Soul Collector Acheron -->
 	</spawn>
-	<!-- Evil Spirit Tempest -->
 	<spawn>
-		<npc id="25385" x="53600" y="143472" z="-3864" heading="0" dbSave="true" dbName="Evil Spirit Tempest" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="dion02_mb2122_01" minZ="-3932" maxZ="-3332">
+				<node x="53151" y="142897" />
+				<node x="53548" y="142749" />
+				<node x="54119" y="142852" />
+				<node x="53643" y="144591" />
+				<node x="53200" y="144369" />
+				<node x="52850" y="143748" />
+			</territory>
+		</territories>
+		<npc id="25385" dbSave="true" dbName="demon_tempest" respawnTime="24hour" respawnRandom="12hour" /> <!-- Evil Spirit Tempest -->
 	</spawn>
 	<!-- Necrosentinel Royal Guard -->
 	<spawn>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/teleports/raid/raid_30.htm b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/teleports/raid/raid_30.htm
index e4950f7080..24607a2d4e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/teleports/raid/raid_30.htm
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/html/admin/teleports/raid/raid_30.htm
@@ -14,29 +14,23 @@
 <button action="bypass -h admin_move_to 53712 102656 -1072" value="Cat's Eye (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 116128 139392 -3640" value="Beleth' Agent Meana (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -54464 170288 -3136" value="Ragraman (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 127076 214973 -3100" value="Apepi (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -16912 174912 -3264" value="Giant Wasteland Basilisk (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 48575 -106191 -1568" value="Grave Robber Leader Akata (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 29928 107160 -3708" value="Queen's Royal Guard Captain (32)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 17696 179056 -3520" value="Vuku Grand Seer Gharmash (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 117336 102840 -3622" value="Skyla (32)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 17696 179056 -3520" value="Vuku Grand Priest Gharmash (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 45600 120592 -2455" value="Nurka's Messenger (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 35992 191312 -3104" value="Corsair Captain Kylon (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 27280 101744 -3696" value="Marsh Stakato Queen Zyrnna (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 127837 200661 -3792" value="Cronos's Servitor Mumu (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 90384 125568 -2128" value="Breka Warlock Pastu (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 51632 153920 -3552" value="Revenant of Sir Calibus (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 10416 126880 -3676" value="Remmel (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -91024 116304 -3466" value="Chertuba of Great Soul (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 123536 133504 -3584" value="Sejarr's Servitor (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 43872 123968 -2928" value="Flame Lord Shadar (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 99732 204331 -3784" value="Tasaba Patriarch Hellena (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -16096 184288 -3817" value="Gargoyle Lord Sirocco (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 40128 101920 -1241" value="Red Eye Captain Trakia (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 5000 189000 -3728" value="Beleth' Eye (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 113456 198118 -3689" value="Sebek (36)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 127900 -160600 -1100" value="Rayito the Looter (37)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 51032 146632 -3643" value="Execution Grounds Watchman Guillotine (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 43304 152352 -2848" value="Soul Collector Acheron (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 53640 143864 -3854" value="Evil Spirit Tempest (36)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 26064 121808 -3738" value="Lizardmen Captain Hellion (38)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 129025 219237 -3678" value="Premo Prime (38)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 88512 140576 -3483" value="Leader of Cat Gang (39)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 123000 -141000 -1100" value="Nellis' Vengeful Spirit (39)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/RaidbossSpawns.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/RaidbossSpawns.xml
index faeaddf28e..17495e3688 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/RaidbossSpawns.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/spawns/RaidbossSpawns.xml
@@ -68,13 +68,11 @@
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="gludio04_mb1823_01" minZ="-3788" maxZ="-3088">
-				<node x="-55023" y="172477" />
-				<node x="-54417" y="171840" />
-				<node x="-53308" y="172132" />
-				<node x="-53269" y="172696" />
-				<node x="-53577" y="173504" />
-				<node x="-54440" y="173010" />
+			<territory name="gludio04_mb1823_01" minZ="-3300" maxZ="-2700">
+				<node x="-54788" y="169384" />
+				<node x="-53992" y="170104" />
+				<node x="-54024" y="170920" />
+				<node x="-55264" y="170876" />
 			</territory>
 		</territories>
 		<npc id="25169" x="-54127" y="172510" z="-3632" dbSave="true" dbName="ragraman" respawnTime="24hour" respawnRandom="12hour" /> <!-- Ragraman -->
@@ -161,27 +159,26 @@
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="gludio04_mb1923_01" minZ="-3305" maxZ="-2805">
-				<node x="-17304" y="174316" />
-				<node x="-16671" y="174203" />
-				<node x="-16329" y="174872" />
-				<node x="-16557" y="175322" />
-				<node x="-17215" y="175234" />
+			<territory name="gludio04_mb1923_01" minZ="-3584" maxZ="-2984">
+				<node x="-17460" y="174700" />
+				<node x="-16872" y="174032" />
+				<node x="-16212" y="174712" />
+				<node x="-16368" y="175456" />
+				<node x="-17304" y="175548" />
 			</territory>
 		</territories>
 		<npc id="25352" dbSave="true" dbName="giant_wasteland_basil" respawnTime="24hour" respawnRandom="12hour" /> <!-- Giant Wasteland Basilisk -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="gludio04_mb1923_02" minZ="-3961" maxZ="-3361">
-				<node x="-16700" y="183404" />
-				<node x="-16055" y="183047" />
-				<node x="-15421" y="183852" />
-				<node x="-15753" y="184318" />
-				<node x="-16423" y="184242" />
+			<territory name="gludio04_mb1923_02" minZ="-3964" maxZ="-3364">
+				<node x="-16560" y="183800" />
+				<node x="-15540" y="183892" />
+				<node x="-15552" y="184648" />
+				<node x="-16704" y="184840" />
 			</territory>
 		</territories>
-		<npc id="25354" x="-15909" y="183768" z="-3872" dbSave="true" dbName="gargoyle_lord_sirocco" respawnTime="24hour" respawnRandom="12hour" /> <!-- Gargoyle Lord Sirocco -->
+		<npc id="25354" x="-16072" y="184361" z="-3807" dbSave="true" dbName="gargoyle_lord_sirocco" respawnTime="24hour" respawnRandom="12hour" /> <!-- Gargoyle Lord Sirocco -->
 	</spawn>
 	<spawn>
 		<territories>
@@ -411,7 +408,7 @@
 				<node x="9952" y="127352" />
 			</territory>
 		</territories>
-		<npc id="25041" dbSave="true" dbName="ikuntai" respawnTime="24hour" respawnRandom="12hour" /> <!-- Remmel -->
+		<npc id="25041" dbSave="true" dbName="remmel" respawnTime="24hour" respawnRandom="12hour" /> <!-- Remmel -->
 	</spawn>
 	<spawn>
 		<territories>
@@ -422,7 +419,7 @@
 				<node x="25290" y="122425" />
 			</territory>
 		</territories>
-		<npc id="25170" dbSave="true" dbName="remmel" respawnTime="24hour" respawnRandom="12hour" /> <!-- Lizardmen Captain Hellion -->
+		<npc id="25170" dbSave="true" dbName="lizardman_leader_hellion" respawnTime="24hour" respawnRandom="12hour" /> <!-- Lizardmen Captain Hellion -->
 	</spawn>
 	<spawn>
 		<territories>
@@ -928,21 +925,52 @@
 		</territories>
 		<npc id="25149" dbSave="true" dbName="zombie_lord_crowl" respawnTime="24hour" respawnRandom="12hour" /> <!-- Zombie Lord Crowl -->
 	</spawn>
-	<!-- Skyla -->
 	<spawn>
-		<npc id="25401" x="117808" y="102880" z="-3592" heading="0" dbSave="true" dbName="Skyla" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="giran03_mb2321_03" minZ="-3740" maxZ="-3140">
+				<node x="116704" y="103332" />
+				<node x="117488" y="101996" />
+				<node x="119064" y="102712" />
+				<node x="117992" y="103752" />
+			</territory>
+		</territories>
+		<npc id="25401" dbSave="true" dbName="antaras_adherent_skyla" respawnTime="24hour" respawnRandom="12hour" /> <!-- Skyla -->
 	</spawn>
-	<!-- Execution Grounds Watchman Guillotine -->
 	<spawn>
-		<npc id="25118" x="50872" y="146616" z="-3632" heading="0" dbSave="true" dbName="Execution Grounds Watchman Guillotine" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="dion02_mb2122_02" minZ="-3677" maxZ="-3077">
+				<node x="50325" y="146283" />
+				<node x="50978" y="145946" />
+				<node x="51400" y="146676" />
+				<node x="51137" y="147486" />
+				<node x="50574" y="147430" />
+			</territory>
+		</territories>
+		<npc id="25118" dbSave="true" dbName="warden_guillotine" respawnTime="24hour" respawnRandom="12hour" /> <!-- Execution Grounds Watchman Guillotine -->
 	</spawn>
-	<!-- Soul Collector Acheron -->
 	<spawn>
-		<npc id="25223" x="43152" y="152352" z="-2840" heading="0" dbSave="true" dbName="Soul Collector Acheron" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="dion02_mb2122_03" minZ="-2894" maxZ="-2294">
+				<node x="42227" y="152067" />
+				<node x="43611" y="152017" />
+				<node x="43446" y="152927" />
+				<node x="42965" y="152958" />
+			</territory>
+		</territories>
+		<npc id="25223" dbSave="true" dbName="soul_collector_acheron" respawnTime="24hour" respawnRandom="12hour" /> <!-- Soul Collector Acheron -->
 	</spawn>
-	<!-- Evil Spirit Tempest -->
 	<spawn>
-		<npc id="25385" x="53600" y="143472" z="-3864" heading="0" dbSave="true" dbName="Evil Spirit Tempest" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="dion02_mb2122_01" minZ="-3932" maxZ="-3332">
+				<node x="53151" y="142897" />
+				<node x="53548" y="142749" />
+				<node x="54119" y="142852" />
+				<node x="53643" y="144591" />
+				<node x="53200" y="144369" />
+				<node x="52850" y="143748" />
+			</territory>
+		</territories>
+		<npc id="25385" dbSave="true" dbName="demon_tempest" respawnTime="24hour" respawnRandom="12hour" /> <!-- Evil Spirit Tempest -->
 	</spawn>
 	<!-- Necrosentinel Royal Guard -->
 	<spawn>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/teleports/raid/raid_30.htm b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/teleports/raid/raid_30.htm
index e4950f7080..24607a2d4e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/teleports/raid/raid_30.htm
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/html/admin/teleports/raid/raid_30.htm
@@ -14,29 +14,23 @@
 <button action="bypass -h admin_move_to 53712 102656 -1072" value="Cat's Eye (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 116128 139392 -3640" value="Beleth' Agent Meana (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -54464 170288 -3136" value="Ragraman (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 127076 214973 -3100" value="Apepi (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -16912 174912 -3264" value="Giant Wasteland Basilisk (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 48575 -106191 -1568" value="Grave Robber Leader Akata (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 29928 107160 -3708" value="Queen's Royal Guard Captain (32)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 17696 179056 -3520" value="Vuku Grand Seer Gharmash (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 117336 102840 -3622" value="Skyla (32)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 17696 179056 -3520" value="Vuku Grand Priest Gharmash (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 45600 120592 -2455" value="Nurka's Messenger (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 35992 191312 -3104" value="Corsair Captain Kylon (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 27280 101744 -3696" value="Marsh Stakato Queen Zyrnna (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 127837 200661 -3792" value="Cronos's Servitor Mumu (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 90384 125568 -2128" value="Breka Warlock Pastu (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 51632 153920 -3552" value="Revenant of Sir Calibus (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 10416 126880 -3676" value="Remmel (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -91024 116304 -3466" value="Chertuba of Great Soul (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 123536 133504 -3584" value="Sejarr's Servitor (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 43872 123968 -2928" value="Flame Lord Shadar (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 99732 204331 -3784" value="Tasaba Patriarch Hellena (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -16096 184288 -3817" value="Gargoyle Lord Sirocco (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 40128 101920 -1241" value="Red Eye Captain Trakia (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 5000 189000 -3728" value="Beleth' Eye (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 113456 198118 -3689" value="Sebek (36)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 127900 -160600 -1100" value="Rayito the Looter (37)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 51032 146632 -3643" value="Execution Grounds Watchman Guillotine (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 43304 152352 -2848" value="Soul Collector Acheron (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 53640 143864 -3854" value="Evil Spirit Tempest (36)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 26064 121808 -3738" value="Lizardmen Captain Hellion (38)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 129025 219237 -3678" value="Premo Prime (38)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 88512 140576 -3483" value="Leader of Cat Gang (39)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 123000 -141000 -1100" value="Nellis' Vengeful Spirit (39)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/RaidbossSpawns.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/RaidbossSpawns.xml
index 6d71f191ab..a0b064e1c1 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/RaidbossSpawns.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/spawns/RaidbossSpawns.xml
@@ -68,13 +68,11 @@
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="gludio04_mb1823_01" minZ="-3788" maxZ="-3088">
-				<node x="-55023" y="172477" />
-				<node x="-54417" y="171840" />
-				<node x="-53308" y="172132" />
-				<node x="-53269" y="172696" />
-				<node x="-53577" y="173504" />
-				<node x="-54440" y="173010" />
+			<territory name="gludio04_mb1823_01" minZ="-3300" maxZ="-2700">
+				<node x="-54788" y="169384" />
+				<node x="-53992" y="170104" />
+				<node x="-54024" y="170920" />
+				<node x="-55264" y="170876" />
 			</territory>
 		</territories>
 		<npc id="25169" x="-54127" y="172510" z="-3632" dbSave="true" dbName="ragraman" respawnTime="24hour" respawnRandom="12hour" /> <!-- Ragraman -->
@@ -161,27 +159,26 @@
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="gludio04_mb1923_01" minZ="-3305" maxZ="-2805">
-				<node x="-17304" y="174316" />
-				<node x="-16671" y="174203" />
-				<node x="-16329" y="174872" />
-				<node x="-16557" y="175322" />
-				<node x="-17215" y="175234" />
+			<territory name="gludio04_mb1923_01" minZ="-3584" maxZ="-2984">
+				<node x="-17460" y="174700" />
+				<node x="-16872" y="174032" />
+				<node x="-16212" y="174712" />
+				<node x="-16368" y="175456" />
+				<node x="-17304" y="175548" />
 			</territory>
 		</territories>
 		<npc id="25352" dbSave="true" dbName="giant_wasteland_basil" respawnTime="24hour" respawnRandom="12hour" /> <!-- Giant Wasteland Basilisk -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="gludio04_mb1923_02" minZ="-3961" maxZ="-3361">
-				<node x="-16700" y="183404" />
-				<node x="-16055" y="183047" />
-				<node x="-15421" y="183852" />
-				<node x="-15753" y="184318" />
-				<node x="-16423" y="184242" />
+			<territory name="gludio04_mb1923_02" minZ="-3964" maxZ="-3364">
+				<node x="-16560" y="183800" />
+				<node x="-15540" y="183892" />
+				<node x="-15552" y="184648" />
+				<node x="-16704" y="184840" />
 			</territory>
 		</territories>
-		<npc id="25354" x="-15909" y="183768" z="-3872" dbSave="true" dbName="gargoyle_lord_sirocco" respawnTime="24hour" respawnRandom="12hour" /> <!-- Gargoyle Lord Sirocco -->
+		<npc id="25354" x="-16072" y="184361" z="-3807" dbSave="true" dbName="gargoyle_lord_sirocco" respawnTime="24hour" respawnRandom="12hour" /> <!-- Gargoyle Lord Sirocco -->
 	</spawn>
 	<spawn>
 		<territories>
@@ -411,7 +408,7 @@
 				<node x="9952" y="127352" />
 			</territory>
 		</territories>
-		<npc id="25041" dbSave="true" dbName="ikuntai" respawnTime="24hour" respawnRandom="12hour" /> <!-- Remmel -->
+		<npc id="25041" dbSave="true" dbName="remmel" respawnTime="24hour" respawnRandom="12hour" /> <!-- Remmel -->
 	</spawn>
 	<spawn>
 		<territories>
@@ -422,7 +419,7 @@
 				<node x="25290" y="122425" />
 			</territory>
 		</territories>
-		<npc id="25170" dbSave="true" dbName="remmel" respawnTime="24hour" respawnRandom="12hour" /> <!-- Lizardmen Captain Hellion -->
+		<npc id="25170" dbSave="true" dbName="lizardman_leader_hellion" respawnTime="24hour" respawnRandom="12hour" /> <!-- Lizardmen Captain Hellion -->
 	</spawn>
 	<spawn>
 		<territories>
@@ -928,21 +925,52 @@
 		</territories>
 		<npc id="25149" dbSave="true" dbName="zombie_lord_crowl" respawnTime="24hour" respawnRandom="12hour" /> <!-- Zombie Lord Crowl -->
 	</spawn>
-	<!-- Skyla -->
 	<spawn>
-		<npc id="25401" x="117808" y="102880" z="-3592" heading="0" dbSave="true" dbName="Skyla" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="giran03_mb2321_03" minZ="-3740" maxZ="-3140">
+				<node x="116704" y="103332" />
+				<node x="117488" y="101996" />
+				<node x="119064" y="102712" />
+				<node x="117992" y="103752" />
+			</territory>
+		</territories>
+		<npc id="25401" dbSave="true" dbName="antaras_adherent_skyla" respawnTime="24hour" respawnRandom="12hour" /> <!-- Skyla -->
 	</spawn>
-	<!-- Execution Grounds Watchman Guillotine -->
 	<spawn>
-		<npc id="25118" x="50872" y="146616" z="-3632" heading="0" dbSave="true" dbName="Execution Grounds Watchman Guillotine" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="dion02_mb2122_02" minZ="-3677" maxZ="-3077">
+				<node x="50325" y="146283" />
+				<node x="50978" y="145946" />
+				<node x="51400" y="146676" />
+				<node x="51137" y="147486" />
+				<node x="50574" y="147430" />
+			</territory>
+		</territories>
+		<npc id="25118" dbSave="true" dbName="warden_guillotine" respawnTime="24hour" respawnRandom="12hour" /> <!-- Execution Grounds Watchman Guillotine -->
 	</spawn>
-	<!-- Soul Collector Acheron -->
 	<spawn>
-		<npc id="25223" x="43152" y="152352" z="-2840" heading="0" dbSave="true" dbName="Soul Collector Acheron" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="dion02_mb2122_03" minZ="-2894" maxZ="-2294">
+				<node x="42227" y="152067" />
+				<node x="43611" y="152017" />
+				<node x="43446" y="152927" />
+				<node x="42965" y="152958" />
+			</territory>
+		</territories>
+		<npc id="25223" dbSave="true" dbName="soul_collector_acheron" respawnTime="24hour" respawnRandom="12hour" /> <!-- Soul Collector Acheron -->
 	</spawn>
-	<!-- Evil Spirit Tempest -->
 	<spawn>
-		<npc id="25385" x="53600" y="143472" z="-3864" heading="0" dbSave="true" dbName="Evil Spirit Tempest" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="dion02_mb2122_01" minZ="-3932" maxZ="-3332">
+				<node x="53151" y="142897" />
+				<node x="53548" y="142749" />
+				<node x="54119" y="142852" />
+				<node x="53643" y="144591" />
+				<node x="53200" y="144369" />
+				<node x="52850" y="143748" />
+			</territory>
+		</territories>
+		<npc id="25385" dbSave="true" dbName="demon_tempest" respawnTime="24hour" respawnRandom="12hour" /> <!-- Evil Spirit Tempest -->
 	</spawn>
 	<!-- Necrosentinel Royal Guard -->
 	<spawn>
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/teleports/raid/raid_30.htm b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/teleports/raid/raid_30.htm
index e4950f7080..24607a2d4e 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/teleports/raid/raid_30.htm
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/html/admin/teleports/raid/raid_30.htm
@@ -14,29 +14,23 @@
 <button action="bypass -h admin_move_to 53712 102656 -1072" value="Cat's Eye (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 116128 139392 -3640" value="Beleth' Agent Meana (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -54464 170288 -3136" value="Ragraman (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 127076 214973 -3100" value="Apepi (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -16912 174912 -3264" value="Giant Wasteland Basilisk (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 48575 -106191 -1568" value="Grave Robber Leader Akata (30)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 29928 107160 -3708" value="Queen's Royal Guard Captain (32)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 17696 179056 -3520" value="Vuku Grand Seer Gharmash (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 117336 102840 -3622" value="Skyla (32)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 17696 179056 -3520" value="Vuku Grand Priest Gharmash (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 45600 120592 -2455" value="Nurka's Messenger (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 35992 191312 -3104" value="Corsair Captain Kylon (33)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 27280 101744 -3696" value="Marsh Stakato Queen Zyrnna (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 127837 200661 -3792" value="Cronos's Servitor Mumu (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 90384 125568 -2128" value="Breka Warlock Pastu (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 51632 153920 -3552" value="Revenant of Sir Calibus (34)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 10416 126880 -3676" value="Remmel (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -91024 116304 -3466" value="Chertuba of Great Soul (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 123536 133504 -3584" value="Sejarr's Servitor (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 43872 123968 -2928" value="Flame Lord Shadar (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 99732 204331 -3784" value="Tasaba Patriarch Hellena (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to -16096 184288 -3817" value="Gargoyle Lord Sirocco (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 40128 101920 -1241" value="Red Eye Captain Trakia (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 5000 189000 -3728" value="Beleth' Eye (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 113456 198118 -3689" value="Sebek (36)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 127900 -160600 -1100" value="Rayito the Looter (37)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 51032 146632 -3643" value="Execution Grounds Watchman Guillotine (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 43304 152352 -2848" value="Soul Collector Acheron (35)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
+<button action="bypass -h admin_move_to 53640 143864 -3854" value="Evil Spirit Tempest (36)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 26064 121808 -3738" value="Lizardmen Captain Hellion (38)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 129025 219237 -3678" value="Premo Prime (38)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 <button action="bypass -h admin_move_to 88512 140576 -3483" value="Leader of Cat Gang (39)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
-<button action="bypass -h admin_move_to 123000 -141000 -1100" value="Nellis' Vengeful Spirit (39)" width=240 height=21 back="L2UI_CT1.Button_DF_Down" fore="L2UI_CT1.Button_DF"><br1>
 </center></body></html>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/RaidbossSpawns.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/RaidbossSpawns.xml
index 6d71f191ab..a0b064e1c1 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/RaidbossSpawns.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/spawns/RaidbossSpawns.xml
@@ -68,13 +68,11 @@
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="gludio04_mb1823_01" minZ="-3788" maxZ="-3088">
-				<node x="-55023" y="172477" />
-				<node x="-54417" y="171840" />
-				<node x="-53308" y="172132" />
-				<node x="-53269" y="172696" />
-				<node x="-53577" y="173504" />
-				<node x="-54440" y="173010" />
+			<territory name="gludio04_mb1823_01" minZ="-3300" maxZ="-2700">
+				<node x="-54788" y="169384" />
+				<node x="-53992" y="170104" />
+				<node x="-54024" y="170920" />
+				<node x="-55264" y="170876" />
 			</territory>
 		</territories>
 		<npc id="25169" x="-54127" y="172510" z="-3632" dbSave="true" dbName="ragraman" respawnTime="24hour" respawnRandom="12hour" /> <!-- Ragraman -->
@@ -161,27 +159,26 @@
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="gludio04_mb1923_01" minZ="-3305" maxZ="-2805">
-				<node x="-17304" y="174316" />
-				<node x="-16671" y="174203" />
-				<node x="-16329" y="174872" />
-				<node x="-16557" y="175322" />
-				<node x="-17215" y="175234" />
+			<territory name="gludio04_mb1923_01" minZ="-3584" maxZ="-2984">
+				<node x="-17460" y="174700" />
+				<node x="-16872" y="174032" />
+				<node x="-16212" y="174712" />
+				<node x="-16368" y="175456" />
+				<node x="-17304" y="175548" />
 			</territory>
 		</territories>
 		<npc id="25352" dbSave="true" dbName="giant_wasteland_basil" respawnTime="24hour" respawnRandom="12hour" /> <!-- Giant Wasteland Basilisk -->
 	</spawn>
 	<spawn>
 		<territories>
-			<territory name="gludio04_mb1923_02" minZ="-3961" maxZ="-3361">
-				<node x="-16700" y="183404" />
-				<node x="-16055" y="183047" />
-				<node x="-15421" y="183852" />
-				<node x="-15753" y="184318" />
-				<node x="-16423" y="184242" />
+			<territory name="gludio04_mb1923_02" minZ="-3964" maxZ="-3364">
+				<node x="-16560" y="183800" />
+				<node x="-15540" y="183892" />
+				<node x="-15552" y="184648" />
+				<node x="-16704" y="184840" />
 			</territory>
 		</territories>
-		<npc id="25354" x="-15909" y="183768" z="-3872" dbSave="true" dbName="gargoyle_lord_sirocco" respawnTime="24hour" respawnRandom="12hour" /> <!-- Gargoyle Lord Sirocco -->
+		<npc id="25354" x="-16072" y="184361" z="-3807" dbSave="true" dbName="gargoyle_lord_sirocco" respawnTime="24hour" respawnRandom="12hour" /> <!-- Gargoyle Lord Sirocco -->
 	</spawn>
 	<spawn>
 		<territories>
@@ -411,7 +408,7 @@
 				<node x="9952" y="127352" />
 			</territory>
 		</territories>
-		<npc id="25041" dbSave="true" dbName="ikuntai" respawnTime="24hour" respawnRandom="12hour" /> <!-- Remmel -->
+		<npc id="25041" dbSave="true" dbName="remmel" respawnTime="24hour" respawnRandom="12hour" /> <!-- Remmel -->
 	</spawn>
 	<spawn>
 		<territories>
@@ -422,7 +419,7 @@
 				<node x="25290" y="122425" />
 			</territory>
 		</territories>
-		<npc id="25170" dbSave="true" dbName="remmel" respawnTime="24hour" respawnRandom="12hour" /> <!-- Lizardmen Captain Hellion -->
+		<npc id="25170" dbSave="true" dbName="lizardman_leader_hellion" respawnTime="24hour" respawnRandom="12hour" /> <!-- Lizardmen Captain Hellion -->
 	</spawn>
 	<spawn>
 		<territories>
@@ -928,21 +925,52 @@
 		</territories>
 		<npc id="25149" dbSave="true" dbName="zombie_lord_crowl" respawnTime="24hour" respawnRandom="12hour" /> <!-- Zombie Lord Crowl -->
 	</spawn>
-	<!-- Skyla -->
 	<spawn>
-		<npc id="25401" x="117808" y="102880" z="-3592" heading="0" dbSave="true" dbName="Skyla" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="giran03_mb2321_03" minZ="-3740" maxZ="-3140">
+				<node x="116704" y="103332" />
+				<node x="117488" y="101996" />
+				<node x="119064" y="102712" />
+				<node x="117992" y="103752" />
+			</territory>
+		</territories>
+		<npc id="25401" dbSave="true" dbName="antaras_adherent_skyla" respawnTime="24hour" respawnRandom="12hour" /> <!-- Skyla -->
 	</spawn>
-	<!-- Execution Grounds Watchman Guillotine -->
 	<spawn>
-		<npc id="25118" x="50872" y="146616" z="-3632" heading="0" dbSave="true" dbName="Execution Grounds Watchman Guillotine" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="dion02_mb2122_02" minZ="-3677" maxZ="-3077">
+				<node x="50325" y="146283" />
+				<node x="50978" y="145946" />
+				<node x="51400" y="146676" />
+				<node x="51137" y="147486" />
+				<node x="50574" y="147430" />
+			</territory>
+		</territories>
+		<npc id="25118" dbSave="true" dbName="warden_guillotine" respawnTime="24hour" respawnRandom="12hour" /> <!-- Execution Grounds Watchman Guillotine -->
 	</spawn>
-	<!-- Soul Collector Acheron -->
 	<spawn>
-		<npc id="25223" x="43152" y="152352" z="-2840" heading="0" dbSave="true" dbName="Soul Collector Acheron" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="dion02_mb2122_03" minZ="-2894" maxZ="-2294">
+				<node x="42227" y="152067" />
+				<node x="43611" y="152017" />
+				<node x="43446" y="152927" />
+				<node x="42965" y="152958" />
+			</territory>
+		</territories>
+		<npc id="25223" dbSave="true" dbName="soul_collector_acheron" respawnTime="24hour" respawnRandom="12hour" /> <!-- Soul Collector Acheron -->
 	</spawn>
-	<!-- Evil Spirit Tempest -->
 	<spawn>
-		<npc id="25385" x="53600" y="143472" z="-3864" heading="0" dbSave="true" dbName="Evil Spirit Tempest" respawnTime="24hour" respawnRandom="12hour" />
+		<territories>
+			<territory name="dion02_mb2122_01" minZ="-3932" maxZ="-3332">
+				<node x="53151" y="142897" />
+				<node x="53548" y="142749" />
+				<node x="54119" y="142852" />
+				<node x="53643" y="144591" />
+				<node x="53200" y="144369" />
+				<node x="52850" y="143748" />
+			</territory>
+		</territories>
+		<npc id="25385" dbSave="true" dbName="demon_tempest" respawnTime="24hour" respawnRandom="12hour" /> <!-- Evil Spirit Tempest -->
 	</spawn>
 	<!-- Necrosentinel Royal Guard -->
 	<spawn>