diff --git a/L2J_Mobius_Classic/dist/game/data/mapregion/ancient_arkcan_city_town.xml b/L2J_Mobius_Classic/dist/game/data/mapregion/ancient_arkcan_city_town.xml
deleted file mode 100644
index 2ab7da30e8..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/mapregion/ancient_arkcan_city_town.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- TODO: Remove "castle" attributes from here, it should be loaded from TaxZones -->
-<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/MapRegion.xsd">
-	<!-- Ancient City Arcan -->
-	<region name="ancient_city_arcan_town" town="Ancient City Arcan" castle="0" locId="3566" bbs="13">
-		<respawnPoint X="206912" Y="87004" Z="-1024" />
-		<respawnPoint X="207840" Y="87200" Z="-1024" />	
-		<respawnPoint X="215470" Y="84185" Z="619" isChaotic="true" /> <!-- TODO: custom -->
-		<map X="25" Y="22" />
-		<map X="26" Y="19" />
-		<map X="26" Y="20" />
-		<map X="26" Y="21" />
-	</region>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/mapregion/faeron_town.xml b/L2J_Mobius_Classic/dist/game/data/mapregion/faeron_town.xml
deleted file mode 100644
index c324037244..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/mapregion/faeron_town.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- TODO: Remove "castle" attributes from here, it should be loaded from TaxZones -->
-<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/MapRegion.xsd">
-	<!-- Faeron Town -->
-	<region name="faeron_village" town="Fearon Village" castle="1" locId="910" bbs="1">
-		<respawnPoint X="-78615" Y="248628" Z="-3296" />
-		<respawnPoint X="-80316" Y="248142" Z="-3488" />
-		<respawnPoint X="-78306" Y="244526" Z="-3688" isChaotic="true" />
-		<map X="17" Y="25" />
-	</region>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/mapregion/gainak_town.xml b/L2J_Mobius_Classic/dist/game/data/mapregion/gainak_town.xml
deleted file mode 100644
index 46c4e6169f..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/mapregion/gainak_town.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- TODO: Remove "castle" attributes from here, it should be loaded from TaxZones -->
-<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/MapRegion.xsd">
-	<!-- Gainak Town -->
-	<region name="gainak_town" town="Gainak Town" castle="9" locId="920" bbs="9">
-		<respawnPoint X="16319" Y="-114101" Z="-224" />
-		<respawnPoint X="13612" Y="-113089" Z="-280" isChaotic="true" />
-		<respawnPoint X="14357" Y="-111124" Z="-232" isChaotic="true" />
-		<respawnPoint X="15228" Y="-116870" Z="-232" isChaotic="true" />
-		<map X="19" Y="13" />
-		<map X="19" Y="14" />
-		<map X="19" Y="15" />
-		<map X="19" Y="16" />
-		<map X="20" Y="13" />
-		<map X="20" Y="14" />
-		<map X="20" Y="15" />
-	</region>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/mapregion/heiness_town.xml b/L2J_Mobius_Classic/dist/game/data/mapregion/heiness_town.xml
deleted file mode 100644
index f581cebeff..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/mapregion/heiness_town.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- TODO: Remove "castle" attributes from here, it should be loaded from TaxZones -->
-<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/MapRegion.xsd">
-	<!-- Heiness Town -->
-	<region name="heiness_town" town="Heine Town" castle="6" locId="926" bbs="12">
-		<respawnPoint X="107568" Y="218256" Z="-3624" />
-		<respawnPoint X="107920" Y="218240" Z="-3624" />
-		<respawnPoint X="107808" Y="217856" Z="-3624" />
-		<respawnPoint X="108032" Y="218048" Z="-3624" />
-		<respawnPoint X="107552" Y="218000" Z="-3624" />
-		<respawnPoint X="110912" Y="219584" Z="-3624" />
-		<respawnPoint X="110768" Y="219824" Z="-3624" />
-		<respawnPoint X="110688" Y="220576" Z="-3624" />
-		<respawnPoint X="110896" Y="220768" Z="-3624" />
-		<respawnPoint X="111856" Y="220752" Z="-3624" />
-		<respawnPoint X="112112" Y="220576" Z="-3624" />
-		<respawnPoint X="112064" Y="219792" Z="-3624" />
-		<respawnPoint X="111888" Y="219584" Z="-3624" />
-		<respawnPoint X="117872" Y="225536" Z="-3200" isChaotic="true" />
-		<respawnPoint X="118064" Y="225648" Z="-3200" isChaotic="true" />
-		<respawnPoint X="101696" Y="221808" Z="-3520" isChaotic="true" />
-		<respawnPoint X="101552" Y="221568" Z="-3520" isChaotic="true" />
-		<respawnPoint X="100784" Y="218272" Z="-3420" isChaotic="true" />
-		<respawnPoint X="100928" Y="218560" Z="-3420" isChaotic="true" />
-		<map X="22" Y="23" />
-		<map X="22" Y="24" />
-		<map X="22" Y="25" />
-		<map X="23" Y="23" />
-		<map X="23" Y="24" />
-		<map X="23" Y="25" />
-	</region>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/mapregion/orc_town.xml b/L2J_Mobius_Classic/dist/game/data/mapregion/orc_town.xml
index 542ad511c0..139198ee0e 100644
--- a/L2J_Mobius_Classic/dist/game/data/mapregion/orc_town.xml
+++ b/L2J_Mobius_Classic/dist/game/data/mapregion/orc_town.xml
@@ -32,6 +32,13 @@
 		<respawnPoint X="-39136" Y="-112688" Z="-1844" isChaotic="true" />
 		<respawnPoint X="-37888" Y="-112608" Z="-1772" isChaotic="true" />
 		<map X="18" Y="14" />
+		<map X="19" Y="13" />
+		<map X="19" Y="14" />
+		<map X="19" Y="15" />
+		<map X="19" Y="16" />
+		<map X="20" Y="13" />
+		<map X="20" Y="14" />
+		<map X="20" Y="15" />
 	</region>
 	<!-- Temple Of Paagrio -->
 	<region name="Temple_of_Paagrio" town="Orc Town" castle="9" locId="920" bbs="9">
diff --git a/L2J_Mobius_Classic/dist/game/data/mapregion/parnassus.xml b/L2J_Mobius_Classic/dist/game/data/mapregion/parnassus.xml
deleted file mode 100644
index 0000b08141..0000000000
--- a/L2J_Mobius_Classic/dist/game/data/mapregion/parnassus.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- TODO: Remove "castle" attributes from here, it should be loaded from TaxZones -->
-<list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/MapRegion.xsd">
-	<!-- Parnassus -->
-	<region name="parnassus" town="Parnassus" castle="6" locId="390" bbs="12">
-		<respawnPoint X="149369" Y="172352" Z="-946" /> <!-- custom -->
-		<respawnPoint X="153755" Y="170726" Z="-3694" isChaotic="true" /> <!-- custom -->
-		<respawnPoint X="145509" Y="179500" Z="-3334" isChaotic="true" /> <!-- custom -->
-		<map X="24" Y="22" />
-		<map X="24" Y="23" />
-	</region>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic/dist/game/data/mapregion/talking_island_town.xml b/L2J_Mobius_Classic/dist/game/data/mapregion/talking_island_town.xml
index 37eebbfed1..f86c780c9c 100644
--- a/L2J_Mobius_Classic/dist/game/data/mapregion/talking_island_town.xml
+++ b/L2J_Mobius_Classic/dist/game/data/mapregion/talking_island_town.xml
@@ -3,12 +3,40 @@
 <list enabled="true" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/MapRegion.xsd">
 	<!-- Talking Island Town -->
 	<region name="talking_island_town" town="Talking Island Town" castle="1" locId="910" bbs="1">
-		<respawnPoint X="-114336" Y="255654" Z="-1512" />
-		<respawnPoint X="-114742" Y="255603" Z="-1512" />
-		<respawnPoint X="-113990" Y="255700" Z="-1504" />
-		<respawnPoint X="-114359" Y="256482" Z="-1280" />
-		<respawnPoint X="-119602" Y="246335" Z="-1232" isChaotic="true" />
-		<respawnPoint X="-119756" Y="246335" Z="-1232" isChaotic="true" />
+		<respawnPoint X="-83990" Y="243336" Z="-3700" />
+		<respawnPoint X="-83964" Y="242680" Z="-3700" />
+		<respawnPoint X="-84512" Y="242679" Z="-3700" />
+		<respawnPoint X="-84623" Y="243193" Z="-3700" />
+		<respawnPoint X="-83742" Y="242214" Z="-3700" />
+		<respawnPoint X="-83537" Y="242537" Z="-3700" />
+		<respawnPoint X="-83700" Y="242896" Z="-3700" />
+		<respawnPoint X="-83646" Y="243397" Z="-3700" />
+		<respawnPoint X="-83808" Y="243637" Z="-3700" />
+		<respawnPoint X="-84903" Y="243489" Z="-3700" />
+		<respawnPoint X="-84852" Y="243174" Z="-3700" />
+		<respawnPoint X="-84892" Y="242479" Z="-3700" />
+		<respawnPoint X="-84756" Y="242155" Z="-3700" />
+		<respawnPoint X="-83761" Y="243620" Z="-3700" />
+		<respawnPoint X="-79411" Y="240677" Z="-3450" isChaotic="true" />
+		<respawnPoint X="-80480" Y="242640" Z="-3690" isChaotic="true" />
+		<respawnPoint X="-80336" Y="244656" Z="-3680" isChaotic="true" />
+		<respawnPoint X="-82464" Y="247248" Z="-3570" isChaotic="true" />
+		<respawnPoint X="-89522" Y="241696" Z="-3530" isChaotic="true" />
+		<respawnPoint X="-87056" Y="237952" Z="-3580" isChaotic="true" />
+		<respawnPoint X="-89536" Y="240336" Z="-3560" isChaotic="true" />
+		<respawnPoint X="-88208" Y="241360" Z="-3560" isChaotic="true" />
+		<respawnPoint X="-85328" Y="238080" Z="-3660" isChaotic="true" />
+		<respawnPoint X="-89760" Y="237408" Z="-3660" isChaotic="true" />
+		<respawnPoint X="-92976" Y="240560" Z="-3380" isChaotic="true" />
+		<respawnPoint X="-94448" Y="240944" Z="-3300" isChaotic="true" />
+		<respawnPoint X="-93552" Y="245296" Z="-3530" isChaotic="true" />
+		<respawnPoint X="-91584" Y="238480" Z="-3650" isChaotic="true" />
+		<respawnPoint X="-88720" Y="238976" Z="-3650" isChaotic="true" />
+		<respawnPoint X="-91760" Y="243664" Z="-3440" isChaotic="true" />
+		<respawnPoint X="-81680" Y="249696" Z="-3630" isChaotic="true" />
+		<respawnPoint X="-83808" Y="251264" Z="-3630" isChaotic="true" />
+		<respawnPoint X="-83328" Y="238304" Z="-3700" isChaotic="true" />
+		<respawnPoint X="-91296" Y="236272" Z="-3690" isChaotic="true" />
 		<map X="15" Y="23" />
 		<map X="15" Y="24" />
 		<map X="15" Y="25" />
@@ -16,6 +44,61 @@
 		<map X="16" Y="24" />
 		<map X="16" Y="25" />
 		<map X="17" Y="24" />
+		<map X="17" Y="25" />
 		<map X="18" Y="25" />
 	</region>
+	<!-- Cedric's Training Hall -->
+	<region name="Cedric's_Training_Hall" town="Talking Island Town" castle="1" locId="910" bbs="1">
+		<respawnPoint X="-71338" Y="258271" Z="-3104" />
+		<respawnPoint X="-71417" Y="258270" Z="-3104" />
+		<respawnPoint X="-71453" Y="258305" Z="-3104" />
+		<respawnPoint X="-71467" Y="258378" Z="-3104" />
+		<respawnPoint X="-79411" Y="240677" Z="-3450" isChaotic="true" />
+		<respawnPoint X="-80480" Y="242640" Z="-3690" isChaotic="true" />
+		<respawnPoint X="-80336" Y="244656" Z="-3680" isChaotic="true" />
+		<respawnPoint X="-82464" Y="247248" Z="-3570" isChaotic="true" />
+		<respawnPoint X="-89522" Y="241696" Z="-3530" isChaotic="true" />
+		<respawnPoint X="-87056" Y="237952" Z="-3580" isChaotic="true" />
+		<respawnPoint X="-89536" Y="240336" Z="-3560" isChaotic="true" />
+		<respawnPoint X="-88208" Y="241360" Z="-3560" isChaotic="true" />
+		<respawnPoint X="-85328" Y="238080" Z="-3660" isChaotic="true" />
+		<respawnPoint X="-89760" Y="237408" Z="-3660" isChaotic="true" />
+		<respawnPoint X="-92976" Y="240560" Z="-3380" isChaotic="true" />
+		<respawnPoint X="-94448" Y="240944" Z="-3300" isChaotic="true" />
+		<respawnPoint X="-93552" Y="245296" Z="-3530" isChaotic="true" />
+		<respawnPoint X="-91584" Y="238480" Z="-3650" isChaotic="true" />
+		<respawnPoint X="-88720" Y="238976" Z="-3650" isChaotic="true" />
+		<respawnPoint X="-91760" Y="243664" Z="-3440" isChaotic="true" />
+		<respawnPoint X="-81680" Y="249696" Z="-3630" isChaotic="true" />
+		<respawnPoint X="-83808" Y="251264" Z="-3630" isChaotic="true" />
+		<respawnPoint X="-83328" Y="238304" Z="-3700" isChaotic="true" />
+		<respawnPoint X="-91296" Y="236272" Z="-3690" isChaotic="true" />
+	</region>
+	<!-- Einhovant's School Of Magic -->
+	<region name="Einhovant's_School_of_Magic" town="Talking Island Town" castle="1" locId="910" bbs="1">
+		<respawnPoint X="-90875" Y="248162" Z="-3570" />
+		<respawnPoint X="-90954" Y="248118" Z="-3570" />
+		<respawnPoint X="-90918" Y="248070" Z="-3570" />
+		<respawnPoint X="-90890" Y="248027" Z="-3570" />
+		<respawnPoint X="-79411" Y="240677" Z="-3450" isChaotic="true" />
+		<respawnPoint X="-80480" Y="242640" Z="-3690" isChaotic="true" />
+		<respawnPoint X="-80336" Y="244656" Z="-3680" isChaotic="true" />
+		<respawnPoint X="-82464" Y="247248" Z="-3570" isChaotic="true" />
+		<respawnPoint X="-89522" Y="241696" Z="-3530" isChaotic="true" />
+		<respawnPoint X="-87056" Y="237952" Z="-3580" isChaotic="true" />
+		<respawnPoint X="-89536" Y="240336" Z="-3560" isChaotic="true" />
+		<respawnPoint X="-88208" Y="241360" Z="-3560" isChaotic="true" />
+		<respawnPoint X="-85328" Y="238080" Z="-3660" isChaotic="true" />
+		<respawnPoint X="-89760" Y="237408" Z="-3660" isChaotic="true" />
+		<respawnPoint X="-92976" Y="240560" Z="-3380" isChaotic="true" />
+		<respawnPoint X="-94448" Y="240944" Z="-3300" isChaotic="true" />
+		<respawnPoint X="-93552" Y="245296" Z="-3530" isChaotic="true" />
+		<respawnPoint X="-91584" Y="238480" Z="-3650" isChaotic="true" />
+		<respawnPoint X="-88720" Y="238976" Z="-3650" isChaotic="true" />
+		<respawnPoint X="-91760" Y="243664" Z="-3440" isChaotic="true" />
+		<respawnPoint X="-81680" Y="249696" Z="-3630" isChaotic="true" />
+		<respawnPoint X="-83808" Y="251264" Z="-3630" isChaotic="true" />
+		<respawnPoint X="-83328" Y="238304" Z="-3700" isChaotic="true" />
+		<respawnPoint X="-91296" Y="236272" Z="-3690" isChaotic="true" />
+	</region>
 </list>
\ No newline at end of file