diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml
index d135410cb4..78c16afd8e 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml
@@ -3,6 +3,7 @@
 	<!-- Tyrr Maestro -->
 	<skillTree type="classSkillTree" classId="156" parentClassId="118">
 		<skill skillName="Superior Shield Mastery" skillId="11620" skillLevel="1" getLevel="85" autoGet="true" />
+		<skill skillName="Dwarven Craft" skillId="1321" skillLevel="1" getLevel="85" autoGet="true" />
 		<skill skillName="Berserker" skillId="10274" skillLevel="1" getLevel="85" levelUpSp="0" />
 		<skill skillName="Hurricane Rush" skillId="10267" skillLevel="1" getLevel="85" levelUpSp="0">
 			<removeSkill id="30738" /> <!-- Novice Hurricane Rush -->
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/Commons.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/Commons.xml
index e1fe5561d1..8dad56627e 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/Commons.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/Commons.xml
@@ -36,9 +36,6 @@
 		<skill skillName="Create Item" skillId="172" skillLevel="13" getLevel="95" levelUpSp="0" />
 		<skill skillName="Create Item" skillId="172" skillLevel="14" getLevel="99" levelUpSp="0" />
 		
-		<skill skillName="Aura Bird - Falcon" skillId="841" skillLevel="1" getLevel="75" />
-		<skill skillName="Aura Bird - Owl" skillId="842" skillLevel="1" getLevel="75" />
-		
 		<!-- Hair accessory hide / show -->
 		<skill skillName="Change Hair Accessory" skillId="17192" skillLevel="1" getLevel="1" autoGet="true" />
 		
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/ErtheiaClass/ErtheiaFighter.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/ErtheiaClass/ErtheiaFighter.xml
index 1d05682ca4..980f49b922 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/ErtheiaClass/ErtheiaFighter.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/ErtheiaClass/ErtheiaFighter.xml
@@ -3,6 +3,9 @@
 	<!-- Ertheia Fighter -->
 	<skillTree type="classSkillTree" classId="182">
 		<skill skillName="Lateral Hit" skillId="30500" skillLevel="1" getLevel="5" levelUpSp="2" />
+		<skill skillName="Divine Wind" skillId="30400" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Tenacity" skillId="30401" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Efficacy" skillId="30402" skillLevel="1" getLevel="1" autoGet="true" />
 		<skill skillName="Eminent Fist Weapon Mastery" skillId="30540" skillLevel="1" getLevel="5" levelUpSp="2" />
 		<skill skillName="Eminent Light Armor Mastery" skillId="30541" skillLevel="1" getLevel="5" levelUpSp="2" />
 		
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/ErtheiaClass/ErtheiaWizard.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/ErtheiaClass/ErtheiaWizard.xml
index 98a965deb4..fadbec36ab 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/ErtheiaClass/ErtheiaWizard.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/ErtheiaClass/ErtheiaWizard.xml
@@ -3,6 +3,9 @@
 	<!-- Ertheia Wizard -->
 	<skillTree type="classSkillTree" classId="183">
 		<skill skillName="Hydro Attack" skillId="30001" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Divine Wind" skillId="30400" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Tenacity" skillId="30401" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Efficacy" skillId="30402" skillLevel="1" getLevel="1" autoGet="true" />
 		
 		<skill skillName="Eminent Blunt Weapon Mastery" skillId="30040" skillLevel="1" getLevel="5" levelUpSp="2" />
 		<skill skillName="Eminent Robe Mastery" skillId="30041" skillLevel="1" getLevel="5" levelUpSp="2" />
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/DarkFighter.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/DarkFighter.xml
index 2313427ef6..cd471b3910 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/DarkFighter.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/DarkFighter.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="31">
 		<skill skillName="Power Strike" skillId="30798" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Sharpness" skillId="1909" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Blessing of Wind" skillId="1911" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/DarkMystic.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/DarkMystic.xml
index e9d3a4be51..9d945eb927 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/DarkMystic.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/DarkMystic.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="38">
 		<skill skillName="Wind Strike" skillId="30797" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Sharpness" skillId="1909" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Blessing of Wind" skillId="1911" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/DwarvenFighter.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/DwarvenFighter.xml
index f86bdb47e0..7505ea04f4 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/DwarvenFighter.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/DwarvenFighter.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="53">
 		<skill skillName="Power Strike" skillId="30798" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Dexterity" skillId="1919" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Blessing of Earth" skillId="1921" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/ElvenFighter.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/ElvenFighter.xml
index 3c38604f96..abc9db7cfa 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/ElvenFighter.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/ElvenFighter.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="18">
 		<skill skillName="Power Strike" skillId="30798" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Blessing of Water" skillId="1906" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Delicacy" skillId="1908" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/ElvenMystic.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/ElvenMystic.xml
index 826378fb6f..198ad83679 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/ElvenMystic.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/ElvenMystic.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="25">
 		<skill skillName="Wind Strike" skillId="30797" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Blessing of Water" skillId="1906" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Delicacy" skillId="1908" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/HumanFighter.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/HumanFighter.xml
index a9bfcc07e6..2f1740caeb 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/HumanFighter.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/HumanFighter.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="0">
 		<skill skillName="Power Strike" skillId="30798" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Aim" skillId="1901" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Mental Fortress" skillId="1902" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/HumanMystic.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/HumanMystic.xml
index 30dd89dfb5..79dc8bdb82 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/HumanMystic.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/HumanMystic.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="10">
 		<skill skillName="Wind Strike" skillId="30797" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Aim" skillId="1901" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Mental Fortress" skillId="1902" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/KamaelFemaleSoldier.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/KamaelFemaleSoldier.xml
index 4030e06652..fcb34e5260 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/KamaelFemaleSoldier.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/KamaelFemaleSoldier.xml
@@ -3,5 +3,9 @@
 	<skillTree type="classSkillTree" classId="124">
 		<skill skillName="Power Strike" skillId="30798" skillLevel="1" getLevel="1" autoGet="true" />
 		<skill skillName="Wind Strike" skillId="30797" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Battle Instinct" skillId="1923" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Dark Silence" skillId="1924" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Body Reinforcement" skillId="1926" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Flying Body Reinforcement" skillId="1954" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/KamaelMaleSoldier.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/KamaelMaleSoldier.xml
index 45a8d512a6..010f12ca2c 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/KamaelMaleSoldier.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/KamaelMaleSoldier.xml
@@ -3,5 +3,9 @@
 	<skillTree type="classSkillTree" classId="123">
 		<skill skillName="Power Strike" skillId="30798" skillLevel="1" getLevel="1" autoGet="true" />
 		<skill skillName="Wind Strike" skillId="30797" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Battle Instinct" skillId="1923" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Dark Silence" skillId="1924" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Body Reinforcement" skillId="1926" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Flying Body Reinforcement" skillId="1954" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/OrcFighter.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/OrcFighter.xml
index 70e5a651f3..5233c421b5 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/OrcFighter.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/OrcFighter.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="44">
 		<skill skillName="Power Strike" skillId="30798" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Blessing of Fire" skillId="1915" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Energetic" skillId="1916" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/OrcMystic.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/OrcMystic.xml
index 549516a243..371a68cbad 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/OrcMystic.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/StartingClass/OrcMystic.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="49">
 		<skill skillName="Wind Strike" skillId="30797" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Blessing of Fire" skillId="1915" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Energetic" skillId="1916" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/alchemySkillTree.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/alchemySkillTree.xml
index dc304c5021..39a8ba28dd 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/alchemySkillTree.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/alchemySkillTree.xml
@@ -105,7 +105,7 @@
 			<item id="39476" count="50" />
 		</skill>
 		<!-- LEVEL 90 -->
-		<skill skillName="High-grade Spirit Stone" skillId="18370" skillLevel="1" getLevel="90" learnedByNpc="true">
+		<skill skillName="High-grade Spirit Stone" skillId="18371" skillLevel="1" getLevel="90" learnedByNpc="true">
 			<item id="57" count="16520000" />
 		</skill>
 		<skill skillName="Lv. 2 Legendary MEN Dye (Luck)" skillId="17929" skillLevel="1" getLevel="90" learnedByNpc="true">
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/raceSkillTree.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/raceSkillTree.xml
deleted file mode 100644
index 10f5b6d526..0000000000
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/skillTrees/raceSkillTree.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/skillTrees.xsd">
-	<!-- Available only to Awaken characters. -->
-	<skillTree type="raceSkillTree" race="HUMAN">
-		<skill skillName="Aim" skillId="1901" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Mental Fortress" skillId="1902" skillLevel="1" getLevel="85" autoGet="true" />
-	</skillTree>
-	<skillTree type="raceSkillTree" race="ELF">
-		<skill skillName="Blessing of Water" skillId="1906" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Delicacy" skillId="1908" skillLevel="1" getLevel="85" autoGet="true" />
-	</skillTree>
-	<skillTree type="raceSkillTree" race="DARK_ELF">
-		<skill skillName="Sharpness" skillId="1909" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Blessing of Wind" skillId="1911" skillLevel="1" getLevel="85" autoGet="true" />
-	</skillTree>
-	<skillTree type="raceSkillTree" race="ORC">
-		<skill skillName="Blessing of Fire" skillId="1915" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Energetic" skillId="1916" skillLevel="1" getLevel="85" autoGet="true" />
-	</skillTree>
-	<skillTree type="raceSkillTree" race="DWARF">
-		<skill skillName="Dexterity" skillId="1919" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Blessing of Earth" skillId="1921" skillLevel="1" getLevel="85" autoGet="true" />
-	</skillTree>
-	<skillTree type="raceSkillTree" race="KAMAEL">
-		<skill skillName="Battle Instinct" skillId="1923" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Dark Silence" skillId="1924" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Body Reinforcement" skillId="1926" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Flying Body Reinforcement" skillId="1954" skillLevel="1" getLevel="85" autoGet="true" />
-	</skillTree>
-	<skillTree type="raceSkillTree" race="ERTHEIA">
-		<skill skillName="Divine Wind" skillId="30400" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Tenacity" skillId="30401" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Efficacy" skillId="30402" skillLevel="1" getLevel="85" autoGet="true" />
-	</skillTree>
-</list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml
index d135410cb4..78c16afd8e 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/4rthClass/TyrrMaestro.xml
@@ -3,6 +3,7 @@
 	<!-- Tyrr Maestro -->
 	<skillTree type="classSkillTree" classId="156" parentClassId="118">
 		<skill skillName="Superior Shield Mastery" skillId="11620" skillLevel="1" getLevel="85" autoGet="true" />
+		<skill skillName="Dwarven Craft" skillId="1321" skillLevel="1" getLevel="85" autoGet="true" />
 		<skill skillName="Berserker" skillId="10274" skillLevel="1" getLevel="85" levelUpSp="0" />
 		<skill skillName="Hurricane Rush" skillId="10267" skillLevel="1" getLevel="85" levelUpSp="0">
 			<removeSkill id="30738" /> <!-- Novice Hurricane Rush -->
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/Commons.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/Commons.xml
index e1fe5561d1..8dad56627e 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/Commons.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/Commons.xml
@@ -36,9 +36,6 @@
 		<skill skillName="Create Item" skillId="172" skillLevel="13" getLevel="95" levelUpSp="0" />
 		<skill skillName="Create Item" skillId="172" skillLevel="14" getLevel="99" levelUpSp="0" />
 		
-		<skill skillName="Aura Bird - Falcon" skillId="841" skillLevel="1" getLevel="75" />
-		<skill skillName="Aura Bird - Owl" skillId="842" skillLevel="1" getLevel="75" />
-		
 		<!-- Hair accessory hide / show -->
 		<skill skillName="Change Hair Accessory" skillId="17192" skillLevel="1" getLevel="1" autoGet="true" />
 		
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/ErtheiaClass/ErtheiaFighter.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/ErtheiaClass/ErtheiaFighter.xml
index 1d05682ca4..980f49b922 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/ErtheiaClass/ErtheiaFighter.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/ErtheiaClass/ErtheiaFighter.xml
@@ -3,6 +3,9 @@
 	<!-- Ertheia Fighter -->
 	<skillTree type="classSkillTree" classId="182">
 		<skill skillName="Lateral Hit" skillId="30500" skillLevel="1" getLevel="5" levelUpSp="2" />
+		<skill skillName="Divine Wind" skillId="30400" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Tenacity" skillId="30401" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Efficacy" skillId="30402" skillLevel="1" getLevel="1" autoGet="true" />
 		<skill skillName="Eminent Fist Weapon Mastery" skillId="30540" skillLevel="1" getLevel="5" levelUpSp="2" />
 		<skill skillName="Eminent Light Armor Mastery" skillId="30541" skillLevel="1" getLevel="5" levelUpSp="2" />
 		
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/ErtheiaClass/ErtheiaWizard.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/ErtheiaClass/ErtheiaWizard.xml
index 98a965deb4..fadbec36ab 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/ErtheiaClass/ErtheiaWizard.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/ErtheiaClass/ErtheiaWizard.xml
@@ -3,6 +3,9 @@
 	<!-- Ertheia Wizard -->
 	<skillTree type="classSkillTree" classId="183">
 		<skill skillName="Hydro Attack" skillId="30001" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Divine Wind" skillId="30400" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Tenacity" skillId="30401" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Efficacy" skillId="30402" skillLevel="1" getLevel="1" autoGet="true" />
 		
 		<skill skillName="Eminent Blunt Weapon Mastery" skillId="30040" skillLevel="1" getLevel="5" levelUpSp="2" />
 		<skill skillName="Eminent Robe Mastery" skillId="30041" skillLevel="1" getLevel="5" levelUpSp="2" />
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/DarkFighter.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/DarkFighter.xml
index 2313427ef6..cd471b3910 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/DarkFighter.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/DarkFighter.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="31">
 		<skill skillName="Power Strike" skillId="30798" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Sharpness" skillId="1909" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Blessing of Wind" skillId="1911" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/DarkMystic.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/DarkMystic.xml
index e9d3a4be51..9d945eb927 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/DarkMystic.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/DarkMystic.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="38">
 		<skill skillName="Wind Strike" skillId="30797" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Sharpness" skillId="1909" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Blessing of Wind" skillId="1911" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/DwarvenFighter.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/DwarvenFighter.xml
index f86bdb47e0..7505ea04f4 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/DwarvenFighter.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/DwarvenFighter.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="53">
 		<skill skillName="Power Strike" skillId="30798" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Dexterity" skillId="1919" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Blessing of Earth" skillId="1921" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/ElvenFighter.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/ElvenFighter.xml
index 3c38604f96..abc9db7cfa 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/ElvenFighter.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/ElvenFighter.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="18">
 		<skill skillName="Power Strike" skillId="30798" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Blessing of Water" skillId="1906" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Delicacy" skillId="1908" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/ElvenMystic.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/ElvenMystic.xml
index 826378fb6f..198ad83679 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/ElvenMystic.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/ElvenMystic.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="25">
 		<skill skillName="Wind Strike" skillId="30797" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Blessing of Water" skillId="1906" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Delicacy" skillId="1908" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/HumanFighter.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/HumanFighter.xml
index a9bfcc07e6..2f1740caeb 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/HumanFighter.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/HumanFighter.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="0">
 		<skill skillName="Power Strike" skillId="30798" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Aim" skillId="1901" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Mental Fortress" skillId="1902" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/HumanMystic.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/HumanMystic.xml
index 30dd89dfb5..79dc8bdb82 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/HumanMystic.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/HumanMystic.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="10">
 		<skill skillName="Wind Strike" skillId="30797" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Aim" skillId="1901" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Mental Fortress" skillId="1902" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/KamaelFemaleSoldier.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/KamaelFemaleSoldier.xml
index 4030e06652..fcb34e5260 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/KamaelFemaleSoldier.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/KamaelFemaleSoldier.xml
@@ -3,5 +3,9 @@
 	<skillTree type="classSkillTree" classId="124">
 		<skill skillName="Power Strike" skillId="30798" skillLevel="1" getLevel="1" autoGet="true" />
 		<skill skillName="Wind Strike" skillId="30797" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Battle Instinct" skillId="1923" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Dark Silence" skillId="1924" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Body Reinforcement" skillId="1926" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Flying Body Reinforcement" skillId="1954" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/KamaelMaleSoldier.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/KamaelMaleSoldier.xml
index 45a8d512a6..010f12ca2c 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/KamaelMaleSoldier.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/KamaelMaleSoldier.xml
@@ -3,5 +3,9 @@
 	<skillTree type="classSkillTree" classId="123">
 		<skill skillName="Power Strike" skillId="30798" skillLevel="1" getLevel="1" autoGet="true" />
 		<skill skillName="Wind Strike" skillId="30797" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Battle Instinct" skillId="1923" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Dark Silence" skillId="1924" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Body Reinforcement" skillId="1926" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Flying Body Reinforcement" skillId="1954" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/OrcFighter.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/OrcFighter.xml
index 70e5a651f3..5233c421b5 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/OrcFighter.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/OrcFighter.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="44">
 		<skill skillName="Power Strike" skillId="30798" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Blessing of Fire" skillId="1915" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Energetic" skillId="1916" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/OrcMystic.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/OrcMystic.xml
index 549516a243..371a68cbad 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/OrcMystic.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/StartingClass/OrcMystic.xml
@@ -2,5 +2,7 @@
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="49">
 		<skill skillName="Wind Strike" skillId="30797" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Blessing of Fire" skillId="1915" skillLevel="1" getLevel="1" autoGet="true" />
+		<skill skillName="Energetic" skillId="1916" skillLevel="1" getLevel="1" autoGet="true" />
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/alchemySkillTree.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/alchemySkillTree.xml
index dc304c5021..39a8ba28dd 100644
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/alchemySkillTree.xml
+++ b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/alchemySkillTree.xml
@@ -105,7 +105,7 @@
 			<item id="39476" count="50" />
 		</skill>
 		<!-- LEVEL 90 -->
-		<skill skillName="High-grade Spirit Stone" skillId="18370" skillLevel="1" getLevel="90" learnedByNpc="true">
+		<skill skillName="High-grade Spirit Stone" skillId="18371" skillLevel="1" getLevel="90" learnedByNpc="true">
 			<item id="57" count="16520000" />
 		</skill>
 		<skill skillName="Lv. 2 Legendary MEN Dye (Luck)" skillId="17929" skillLevel="1" getLevel="90" learnedByNpc="true">
diff --git a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/raceSkillTree.xml b/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/raceSkillTree.xml
deleted file mode 100644
index 10f5b6d526..0000000000
--- a/L2J_Mobius_9.0_ReturnOfTheQueenAnt/dist/game/data/skillTrees/raceSkillTree.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../xsd/skillTrees.xsd">
-	<!-- Available only to Awaken characters. -->
-	<skillTree type="raceSkillTree" race="HUMAN">
-		<skill skillName="Aim" skillId="1901" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Mental Fortress" skillId="1902" skillLevel="1" getLevel="85" autoGet="true" />
-	</skillTree>
-	<skillTree type="raceSkillTree" race="ELF">
-		<skill skillName="Blessing of Water" skillId="1906" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Delicacy" skillId="1908" skillLevel="1" getLevel="85" autoGet="true" />
-	</skillTree>
-	<skillTree type="raceSkillTree" race="DARK_ELF">
-		<skill skillName="Sharpness" skillId="1909" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Blessing of Wind" skillId="1911" skillLevel="1" getLevel="85" autoGet="true" />
-	</skillTree>
-	<skillTree type="raceSkillTree" race="ORC">
-		<skill skillName="Blessing of Fire" skillId="1915" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Energetic" skillId="1916" skillLevel="1" getLevel="85" autoGet="true" />
-	</skillTree>
-	<skillTree type="raceSkillTree" race="DWARF">
-		<skill skillName="Dexterity" skillId="1919" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Blessing of Earth" skillId="1921" skillLevel="1" getLevel="85" autoGet="true" />
-	</skillTree>
-	<skillTree type="raceSkillTree" race="KAMAEL">
-		<skill skillName="Battle Instinct" skillId="1923" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Dark Silence" skillId="1924" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Body Reinforcement" skillId="1926" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Flying Body Reinforcement" skillId="1954" skillLevel="1" getLevel="85" autoGet="true" />
-	</skillTree>
-	<skillTree type="raceSkillTree" race="ERTHEIA">
-		<skill skillName="Divine Wind" skillId="30400" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Tenacity" skillId="30401" skillLevel="1" getLevel="85" autoGet="true" />
-		<skill skillName="Efficacy" skillId="30402" skillLevel="1" getLevel="85" autoGet="true" />
-	</skillTree>
-</list>
\ No newline at end of file