From 963730c00c245896f48dcf91ad14d20bf762d4e3 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 30 Sep 2019 10:59:23 +0000
Subject: [PATCH] First class skilltree changes. Contributed by Liamxroy.

---
 .../game/data/skillTrees/1stClass/Artisan.xml | 101 ++-----------
 .../data/skillTrees/1stClass/Assassin.xml     | 136 ++---------------
 .../game/data/skillTrees/1stClass/Cleric.xml  | 134 ++---------------
 .../data/skillTrees/1stClass/DarkWizard.xml   | 133 ++---------------
 .../data/skillTrees/1stClass/ElvenKnight.xml  | 105 ++------------
 .../data/skillTrees/1stClass/ElvenOracle.xml  | 137 ++----------------
 .../data/skillTrees/1stClass/ElvenScout.xml   | 134 ++---------------
 .../data/skillTrees/1stClass/ElvenWizard.xml  | 127 ++--------------
 .../data/skillTrees/1stClass/HumanKnight.xml  | 105 +-------------
 .../data/skillTrees/1stClass/HumanWizard.xml  | 134 ++---------------
 .../game/data/skillTrees/1stClass/OrcMonk.xml |  90 ++----------
 .../data/skillTrees/1stClass/OrcRaider.xml    | 125 ++--------------
 .../data/skillTrees/1stClass/OrcShaman.xml    | 119 ++-------------
 .../data/skillTrees/1stClass/PalusKnight.xml  | 106 ++------------
 .../game/data/skillTrees/1stClass/Rogue.xml   | 104 ++-----------
 .../data/skillTrees/1stClass/Scavenger.xml    | 110 ++------------
 .../skillTrees/1stClass/ShillienOracle.xml    | 136 ++---------------
 .../game/data/skillTrees/1stClass/Trooper.xml | 125 ++--------------
 .../game/data/skillTrees/1stClass/Warder.xml  | 131 ++---------------
 .../game/data/skillTrees/1stClass/Warrior.xml | 118 ++-------------
 20 files changed, 199 insertions(+), 2211 deletions(-)

diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Artisan.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Artisan.xml
index a49d30aaad..518c24f4d3 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Artisan.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Artisan.xml
@@ -1,96 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="56" parentClassId="53">
-		<skill skillName="Stun Attack" skillId="100" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="205" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Crystallize" skillId="248" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Bandage" skillId="34" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Create Item" skillId="172" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Boost HP" skillId="211" skillLvl="1" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Stun Attack" skillId="100" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Fast HP Recovery" skillId="212" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="205" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Vital Force" skillId="148" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Weight Limit" skillId="150" skillLvl="2" getLevel="24" levelUpSp="6" />
-		
-		<skill skillName="Stun Attack" skillId="100" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="205" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="205" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Summon Mechanic Golem" skillId="25" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Create Item" skillId="172" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Boost HP" skillId="211" skillLvl="2" getLevel="28" levelUpSp="7" />
-		
-		<skill skillName="Stun Attack" skillId="100" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Fast HP Recovery" skillId="212" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="205" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="205" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Vital Force" skillId="148" skillLvl="2" getLevel="32" levelUpSp="10" />
-		
-		<skill skillName="Stun Attack" skillId="100" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="11" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="205" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="205" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="11" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Summon Mechanic Golem" skillId="25" skillLvl="2" getLevel="36" levelUpSp="13" />
-		<skill skillName="Create Item" skillId="172" skillLvl="4" getLevel="36" levelUpSp="13" />
-		<skill skillName="Boost HP" skillId="211" skillLvl="3" getLevel="36" levelUpSp="13" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Weapon Mastery" skillId="30632" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Dual Weapon Mastery" skillId="30633" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Heavy Armor Mastery" skillId="30629" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Novice Mega Strike" skillId="30616" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
+		<skill skillName="Novice Armor Destruction" skillId="30615" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Assassin.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Assassin.xml
index 85e20743a3..4e5b133c3f 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Assassin.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Assassin.xml
@@ -1,131 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="35" parentClassId="31">
-		<skill skillName="Acrobatics" skillId="173" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Defense Aura" skillId="91" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Boost Breath" skillId="195" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Long Shot" skillId="113" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="4" getLevel="20" levelUpSp="4" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="10" getLevel="20" levelUpSp="4" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="11" getLevel="20" levelUpSp="4" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="12" getLevel="20" levelUpSp="4" />
-		<skill skillName="Poison" skillId="129" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="10" getLevel="20" levelUpSp="4" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="11" getLevel="20" levelUpSp="4" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="12" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Sting" skillId="223" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Sting" skillId="223" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Sting" skillId="223" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Confusion" skillId="2" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="7" getLevel="24" levelUpSp="6" />
-		<skill skillName="Critical Damage" skillId="193" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Bleed" skillId="96" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="13" getLevel="24" levelUpSp="6" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="14" getLevel="24" levelUpSp="6" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="15" getLevel="24" levelUpSp="6" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="13" getLevel="24" levelUpSp="6" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="14" getLevel="24" levelUpSp="6" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="15" getLevel="24" levelUpSp="6" />
-		<skill skillName="Accuracy" skillId="256" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Boost Evasion" skillId="198" skillLvl="1" getLevel="24" levelUpSp="6" />
-		
-		<skill skillName="Ultimate Evasion" skillId="111" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Acrobatic Move" skillId="225" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Attack Aura" skillId="77" skillLvl="2" getLevel="28" levelUpSp="7" />
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Quick Step" skillId="169" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sting" skillId="223" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sting" skillId="223" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sting" skillId="223" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Confusion" skillId="2" skillLvl="2" getLevel="28" levelUpSp="7" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="10" getLevel="28" levelUpSp="7" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="16" getLevel="28" levelUpSp="7" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="17" getLevel="28" levelUpSp="7" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="18" getLevel="28" levelUpSp="7" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="16" getLevel="28" levelUpSp="7" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="17" getLevel="28" levelUpSp="7" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="18" getLevel="28" levelUpSp="7" />
-		
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="4" getLevel="32" levelUpSp="10" />
-		<skill skillName="Rapid Shot" skillId="99" skillLvl="1" getLevel="32" levelUpSp="10" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="7" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sting" skillId="223" skillLvl="7" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sting" skillId="223" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sting" skillId="223" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Confusion" skillId="2" skillLvl="3" getLevel="32" levelUpSp="10" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="13" getLevel="32" levelUpSp="10" />
-		<skill skillName="Critical Damage" skillId="193" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Bleed" skillId="96" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="19" getLevel="32" levelUpSp="10" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="20" getLevel="32" levelUpSp="10" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="21" getLevel="32" levelUpSp="10" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="19" getLevel="32" levelUpSp="10" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="20" getLevel="32" levelUpSp="10" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="21" getLevel="32" levelUpSp="10" />
-		<skill skillName="Power Break" skillId="115" skillLvl="1" getLevel="32" levelUpSp="10" />
-		
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="5" getLevel="36" levelUpSp="13" />
-		<skill skillName="Esprit" skillId="171" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="9" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="10" getLevel="36" levelUpSp="13" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sting" skillId="223" skillLvl="10" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sting" skillId="223" skillLvl="11" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sting" skillId="223" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Confusion" skillId="2" skillLvl="4" getLevel="36" levelUpSp="13" />
-		<skill skillName="Freezing Strike" skillId="105" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Freezing Strike" skillId="105" skillLvl="2" getLevel="36" levelUpSp="13" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="16" getLevel="36" levelUpSp="13" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="22" getLevel="36" levelUpSp="13" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="23" getLevel="36" levelUpSp="13" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="24" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stun Shot" skillId="101" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stun Shot" skillId="101" skillLvl="2" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stun Shot" skillId="101" skillLvl="3" getLevel="36" levelUpSp="13" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="22" getLevel="36" levelUpSp="13" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="23" getLevel="36" levelUpSp="13" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="24" getLevel="36" levelUpSp="13" />
-		<skill skillName="Power Break" skillId="115" skillLvl="2" getLevel="36" levelUpSp="13" />
+		<skill skillName="Dagger Mastery" skillId="30634" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Bow/Crossbow Mastery" skillId="30636" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Dual Dagger Mastery" skillId="30635" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Novice Heart Breaker" skillId="30617" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
+		<skill skillName="Novice Quick Shot" skillId="30619" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Cleric.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Cleric.xml
index 5ffba46a6a..1b62ced356 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Cleric.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Cleric.xml
@@ -1,128 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="15" parentClassId="10">
-		<skill skillName="Anti Magic" skillId="146" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="4" getLevel="20" levelUpSp="4" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Quick Recovery" skillId="164" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Resurrection" skillId="1016" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="4" getLevel="20" levelUpSp="4" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Concentration" skillId="1078" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wind Walk" skillId="1204" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heal" skillId="1011" skillLvl="7" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heal" skillId="1011" skillLvl="8" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heal" skillId="1011" skillLvl="9" getLevel="20" levelUpSp="4" />
-		<skill skillName="Might" skillId="1068" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Eva's Kiss" skillId="1073" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Acumen" skillId="1085" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Boost Mana" skillId="213" skillLvl="1" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="7" getLevel="25" levelUpSp="6" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="8" getLevel="25" levelUpSp="6" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="7" getLevel="25" levelUpSp="6" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="8" getLevel="25" levelUpSp="6" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="9" getLevel="25" levelUpSp="6" />
-		<skill skillName="Fast Mana Recovery" skillId="229" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Fast Spell Casting" skillId="228" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="5" getLevel="25" levelUpSp="6" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="7" getLevel="25" levelUpSp="6" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="8" getLevel="25" levelUpSp="6" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="9" getLevel="25" levelUpSp="6" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Heal" skillId="1011" skillLvl="10" getLevel="25" levelUpSp="6" />
-		<skill skillName="Heal" skillId="1011" skillLvl="11" getLevel="25" levelUpSp="6" />
-		<skill skillName="Heal" skillId="1011" skillLvl="12" getLevel="25" levelUpSp="6" />
-		<skill skillName="Mental Shield" skillId="1035" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Holy Weapon" skillId="1043" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Focus" skillId="1077" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Shield" skillId="1040" skillLvl="2" getLevel="25" levelUpSp="6" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="9" getLevel="30" levelUpSp="9" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="10" getLevel="30" levelUpSp="9" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="10" getLevel="30" levelUpSp="9" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="11" getLevel="30" levelUpSp="9" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="12" getLevel="30" levelUpSp="9" />
-		<skill skillName="Quick Recovery" skillId="164" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="7" getLevel="30" levelUpSp="9" />
-		<skill skillName="Resurrection" skillId="1016" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="10" getLevel="30" levelUpSp="9" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="11" getLevel="30" levelUpSp="9" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="12" getLevel="30" levelUpSp="9" />
-		<skill skillName="Concentration" skillId="1078" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Wind Walk" skillId="1204" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Heal" skillId="1011" skillLvl="13" getLevel="30" levelUpSp="9" />
-		<skill skillName="Heal" skillId="1011" skillLvl="14" getLevel="30" levelUpSp="9" />
-		<skill skillName="Heal" skillId="1011" skillLvl="15" getLevel="30" levelUpSp="9" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Fire Resistance" skillId="1191" skillLvl="1" getLevel="30" levelUpSp="9" />
-		<skill skillName="Boost Mana" skillId="213" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="6" getLevel="30" levelUpSp="9" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="11" getLevel="35" levelUpSp="11" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="12" getLevel="35" levelUpSp="11" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="13" getLevel="35" levelUpSp="11" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="14" getLevel="35" levelUpSp="11" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="15" getLevel="35" levelUpSp="11" />
-		<skill skillName="Fast HP Recovery" skillId="212" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Fast Mana Recovery" skillId="229" skillLvl="2" getLevel="35" levelUpSp="11" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="9" getLevel="35" levelUpSp="11" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="13" getLevel="35" levelUpSp="11" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="14" getLevel="35" levelUpSp="11" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="15" getLevel="35" levelUpSp="11" />
-		<skill skillName="Berserker Spirit" skillId="1062" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Cure Poison" skillId="1012" skillLvl="2" getLevel="35" levelUpSp="11" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="9" getLevel="35" levelUpSp="11" />
-		<skill skillName="Heal" skillId="1011" skillLvl="16" getLevel="35" levelUpSp="11" />
-		<skill skillName="Heal" skillId="1011" skillLvl="17" getLevel="35" levelUpSp="11" />
-		<skill skillName="Heal" skillId="1011" skillLvl="18" getLevel="35" levelUpSp="11" />
-		<skill skillName="Peace" skillId="1075" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Acumen" skillId="1085" skillLvl="2" getLevel="35" levelUpSp="11" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Regeneration" skillId="1044" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="9" getLevel="35" levelUpSp="11" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Magic Weapon Mastery" skillId="30638" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Robe Mastery" skillId="30631" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="30802" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Dual Weapon Mastery" skillId="30633" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Novice Resolving Bash" skillId="30624" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
+		<skill skillName="Novice Dark Blast" skillId="30627" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/DarkWizard.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/DarkWizard.xml
index 33ebc2b4af..cbf1f9874d 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/DarkWizard.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/DarkWizard.xml
@@ -1,129 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="39" parentClassId="38">
-		<skill skillName="Anti Magic" skillId="146" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Quick Recovery" skillId="164" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Concentration" skillId="1078" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Ice Bolt" skillId="1184" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Ice Bolt" skillId="1184" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wind Shackle" skillId="1206" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Summon Silhouette" skillId="1228" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Summon Shadow" skillId="1128" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Vampiric Touch" skillId="1147" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Vampiric Touch" skillId="1147" skillLvl="4" getLevel="20" levelUpSp="4" />
-		<skill skillName="Curse Poison" skillId="1168" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Twister" skillId="1178" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Twister" skillId="1178" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Boost Mana" skillId="213" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Flame Strike" skillId="1181" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="2" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="7" getLevel="25" levelUpSp="6" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="8" getLevel="25" levelUpSp="6" />
-		<skill skillName="Fast Mana Recovery" skillId="229" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Fast Spell Casting" skillId="228" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="5" getLevel="25" levelUpSp="6" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Shadow Spark" skillId="1266" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="5" getLevel="25" levelUpSp="6" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="6" getLevel="25" levelUpSp="6" />
-		<skill skillName="Wind Shackle" skillId="1206" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Surrender to Poison" skillId="1224" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Summon Silhouette" skillId="1228" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Summon Shadow" skillId="1128" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Vampiric Touch" skillId="1147" skillLvl="5" getLevel="25" levelUpSp="6" />
-		<skill skillName="Vampiric Touch" skillId="1147" skillLvl="6" getLevel="25" levelUpSp="6" />
-		<skill skillName="Body To Mind" skillId="1157" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Twister" skillId="1178" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Twister" skillId="1178" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Flame Strike" skillId="1181" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Poisonous Cloud" skillId="1167" skillLvl="1" getLevel="25" levelUpSp="6" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="9" getLevel="30" levelUpSp="9" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="10" getLevel="30" levelUpSp="9" />
-		<skill skillName="Quick Recovery" skillId="164" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="7" getLevel="30" levelUpSp="9" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="3" getLevel="30" levelUpSp="9" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Shadow Spark" skillId="1266" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Concentration" skillId="1078" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="7" getLevel="30" levelUpSp="9" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="8" getLevel="30" levelUpSp="9" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="9" getLevel="30" levelUpSp="9" />
-		<skill skillName="Wind Shackle" skillId="1206" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Corpse Life Drain" skillId="1151" skillLvl="1" getLevel="30" levelUpSp="9" />
-		<skill skillName="Surrender to Poison" skillId="1224" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Summon Silhouette" skillId="1228" skillLvl="3" getLevel="30" levelUpSp="9" />
-		<skill skillName="Summon Shadow" skillId="1128" skillLvl="3" getLevel="30" levelUpSp="9" />
-		<skill skillName="Curse Poison" skillId="1168" skillLvl="3" getLevel="30" levelUpSp="9" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Twister" skillId="1178" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Twister" skillId="1178" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Boost Mana" skillId="213" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Flame Strike" skillId="1181" skillLvl="3" getLevel="30" levelUpSp="9" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="6" getLevel="30" levelUpSp="9" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="11" getLevel="35" levelUpSp="11" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="12" getLevel="35" levelUpSp="11" />
-		<skill skillName="Fast HP Recovery" skillId="212" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Fast Mana Recovery" skillId="229" skillLvl="2" getLevel="35" levelUpSp="11" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="9" getLevel="35" levelUpSp="11" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="5" getLevel="35" levelUpSp="11" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="6" getLevel="35" levelUpSp="11" />
-		<skill skillName="Shadow Spark" skillId="1266" skillLvl="3" getLevel="35" levelUpSp="11" />
-		<skill skillName="Decrease Speed" skillId="1160" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="10" getLevel="35" levelUpSp="11" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="11" getLevel="35" levelUpSp="11" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="12" getLevel="35" levelUpSp="11" />
-		<skill skillName="Mighty Servitor" skillId="1146" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Wind Shackle" skillId="1206" skillLvl="5" getLevel="35" levelUpSp="11" />
-		<skill skillName="Corpse Life Drain" skillId="1151" skillLvl="2" getLevel="35" levelUpSp="11" />
-		<skill skillName="Surrender to Poison" skillId="1224" skillLvl="3" getLevel="35" levelUpSp="11" />
-		<skill skillName="Summon Silhouette" skillId="1228" skillLvl="4" getLevel="35" levelUpSp="11" />
-		<skill skillName="Summon Shadow" skillId="1128" skillLvl="4" getLevel="35" levelUpSp="11" />
-		<skill skillName="Curse Chaos" skillId="1222" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Twister" skillId="1178" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Twister" skillId="1178" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="9" getLevel="35" levelUpSp="11" />
-		<skill skillName="Poisonous Cloud" skillId="1167" skillLvl="2" getLevel="35" levelUpSp="11" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Robe Mastery" skillId="30631" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Weapon Mastery" skillId="30637" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Novice Invoke" skillId="30625" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
+		<skill skillName="Novice Elemental Crash" skillId="30621" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ElvenKnight.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ElvenKnight.xml
index 51ac663d4b..1ac8902d31 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ElvenKnight.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ElvenKnight.xml
@@ -1,100 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="19" parentClassId="18">
-		<skill skillName="Ultimate Defense" skillId="110" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Defense Aura" skillId="91" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Shield Mastery" skillId="153" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Poison Recovery" skillId="21" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Charm" skillId="15" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Charm" skillId="15" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Charm" skillId="15" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="4" getLevel="20" levelUpSp="4" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="6" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Aggression" skillId="28" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Aggression" skillId="28" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Aggression" skillId="28" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Cure Bleeding" skillId="61" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Deflect Arrow" skillId="112" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Charm" skillId="15" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Charm" skillId="15" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Charm" skillId="15" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="7" getLevel="24" levelUpSp="6" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="8" getLevel="24" levelUpSp="6" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="9" getLevel="24" levelUpSp="6" />
-		
-		<skill skillName="Aggression" skillId="28" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Aggression" skillId="28" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Aggression" skillId="28" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Attack Aura" skillId="77" skillLvl="2" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Shield Mastery" skillId="153" skillLvl="2" getLevel="28" levelUpSp="7" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Charm" skillId="15" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Charm" skillId="15" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Charm" skillId="15" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="10" getLevel="28" levelUpSp="7" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="11" getLevel="28" levelUpSp="7" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="12" getLevel="28" levelUpSp="7" />
-		
-		<skill skillName="Aggression" skillId="28" skillLvl="7" getLevel="32" levelUpSp="10" />
-		<skill skillName="Aggression" skillId="28" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Aggression" skillId="28" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Deflect Arrow" skillId="112" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Charm" skillId="15" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Charm" skillId="15" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Charm" skillId="15" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="13" getLevel="32" levelUpSp="10" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="14" getLevel="32" levelUpSp="10" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="15" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sprint" skillId="230" skillLvl="1" getLevel="32" levelUpSp="10" />
-		
-		<skill skillName="Aggression" skillId="28" skillLvl="10" getLevel="36" levelUpSp="13" />
-		<skill skillName="Aggression" skillId="28" skillLvl="11" getLevel="36" levelUpSp="13" />
-		<skill skillName="Aggression" skillId="28" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Entangle" skillId="102" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Charm" skillId="15" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Charm" skillId="15" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Charm" skillId="15" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="16" getLevel="36" levelUpSp="13" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="17" getLevel="36" levelUpSp="13" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="18" getLevel="36" levelUpSp="13" />
-		<skill skillName="Focus Mind" skillId="191" skillLvl="1" getLevel="36" levelUpSp="13" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="30802" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Dual Weapon Mastery" skillId="30633" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Heavy Armor Mastery" skillId="30629" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Newbie's Rising Smash" skillId="30613" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
+		<skill skillName="Novice Resolving Bash" skillId="30624" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ElvenOracle.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ElvenOracle.xml
index 670d5a7917..467a8f53bc 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ElvenOracle.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ElvenOracle.xml
@@ -1,133 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="29" parentClassId="25">
-		<skill skillName="Anti Magic" skillId="146" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="4" getLevel="20" levelUpSp="4" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Quick Recovery" skillId="164" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Resurrection" skillId="1016" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="4" getLevel="20" levelUpSp="4" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Concentration" skillId="1078" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wind Walk" skillId="1204" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heal" skillId="1011" skillLvl="7" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heal" skillId="1011" skillLvl="8" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heal" skillId="1011" skillLvl="9" getLevel="20" levelUpSp="4" />
-		<skill skillName="Might" skillId="1068" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wind Shackle" skillId="1206" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Eva's Kiss" skillId="1073" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Boost Mana" skillId="213" skillLvl="1" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="7" getLevel="25" levelUpSp="6" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="8" getLevel="25" levelUpSp="6" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="7" getLevel="25" levelUpSp="6" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="8" getLevel="25" levelUpSp="6" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="9" getLevel="25" levelUpSp="6" />
-		<skill skillName="Fast Mana Recovery" skillId="229" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Fast Spell Casting" skillId="228" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="5" getLevel="25" levelUpSp="6" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="7" getLevel="25" levelUpSp="6" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="8" getLevel="25" levelUpSp="6" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="9" getLevel="25" levelUpSp="6" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Heal" skillId="1011" skillLvl="10" getLevel="25" levelUpSp="6" />
-		<skill skillName="Heal" skillId="1011" skillLvl="11" getLevel="25" levelUpSp="6" />
-		<skill skillName="Heal" skillId="1011" skillLvl="12" getLevel="25" levelUpSp="6" />
-		<skill skillName="Mental Shield" skillId="1035" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Wind Shackle" skillId="1206" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Agility" skillId="1087" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Holy Weapon" skillId="1043" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Shield" skillId="1040" skillLvl="2" getLevel="25" levelUpSp="6" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="9" getLevel="30" levelUpSp="9" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="10" getLevel="30" levelUpSp="9" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="10" getLevel="30" levelUpSp="9" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="11" getLevel="30" levelUpSp="9" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="12" getLevel="30" levelUpSp="9" />
-		<skill skillName="Quick Recovery" skillId="164" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="7" getLevel="30" levelUpSp="9" />
-		<skill skillName="Resurrection" skillId="1016" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="10" getLevel="30" levelUpSp="9" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="11" getLevel="30" levelUpSp="9" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="12" getLevel="30" levelUpSp="9" />
-		<skill skillName="Concentration" skillId="1078" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Wind Walk" skillId="1204" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Heal" skillId="1011" skillLvl="13" getLevel="30" levelUpSp="9" />
-		<skill skillName="Heal" skillId="1011" skillLvl="14" getLevel="30" levelUpSp="9" />
-		<skill skillName="Heal" skillId="1011" skillLvl="15" getLevel="30" levelUpSp="9" />
-		<skill skillName="Wind Shackle" skillId="1206" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Recharge" skillId="1013" skillLvl="1" getLevel="30" levelUpSp="9" />
-		<skill skillName="Recharge" skillId="1013" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Boost Mana" skillId="213" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="6" getLevel="30" levelUpSp="9" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="11" getLevel="35" levelUpSp="11" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="12" getLevel="35" levelUpSp="11" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="13" getLevel="35" levelUpSp="11" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="14" getLevel="35" levelUpSp="11" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="15" getLevel="35" levelUpSp="11" />
-		<skill skillName="Fast HP Recovery" skillId="212" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Fast Mana Recovery" skillId="229" skillLvl="2" getLevel="35" levelUpSp="11" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="9" getLevel="35" levelUpSp="11" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="13" getLevel="35" levelUpSp="11" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="14" getLevel="35" levelUpSp="11" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="15" getLevel="35" levelUpSp="11" />
-		<skill skillName="Cure Poison" skillId="1012" skillLvl="2" getLevel="35" levelUpSp="11" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="9" getLevel="35" levelUpSp="11" />
-		<skill skillName="Decrease Weight" skillId="1257" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Heal" skillId="1011" skillLvl="16" getLevel="35" levelUpSp="11" />
-		<skill skillName="Heal" skillId="1011" skillLvl="17" getLevel="35" levelUpSp="11" />
-		<skill skillName="Heal" skillId="1011" skillLvl="18" getLevel="35" levelUpSp="11" />
-		<skill skillName="Wind Shackle" skillId="1206" skillLvl="5" getLevel="35" levelUpSp="11" />
-		<skill skillName="Recharge" skillId="1013" skillLvl="3" getLevel="35" levelUpSp="11" />
-		<skill skillName="Recharge" skillId="1013" skillLvl="4" getLevel="35" levelUpSp="11" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Regeneration" skillId="1044" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Poison Resistance" skillId="1033" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="9" getLevel="35" levelUpSp="11" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Magic Weapon Mastery" skillId="30638" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Robe Mastery" skillId="30631" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Novice Dark Veil" skillId="30628" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
+		<skill skillName="Novice Dark Blast" skillId="30627" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ElvenScout.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ElvenScout.xml
index 21f0cff205..9e61c63d9a 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ElvenScout.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ElvenScout.xml
@@ -1,129 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="22" parentClassId="18">
-		<skill skillName="Acrobatics" skillId="173" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Defense Aura" skillId="91" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Boost Breath" skillId="195" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Long Shot" skillId="113" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="10" getLevel="20" levelUpSp="4" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="11" getLevel="20" levelUpSp="4" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="12" getLevel="20" levelUpSp="4" />
-		<skill skillName="Charm" skillId="15" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Charm" skillId="15" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Charm" skillId="15" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="4" getLevel="20" levelUpSp="4" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="10" getLevel="20" levelUpSp="4" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="11" getLevel="20" levelUpSp="4" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="12" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Poison Recovery" skillId="21" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Bleed" skillId="96" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="13" getLevel="24" levelUpSp="6" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="14" getLevel="24" levelUpSp="6" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="15" getLevel="24" levelUpSp="6" />
-		<skill skillName="Cure Bleeding" skillId="61" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Charm" skillId="15" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Charm" skillId="15" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Charm" skillId="15" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="7" getLevel="24" levelUpSp="6" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="8" getLevel="24" levelUpSp="6" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="9" getLevel="24" levelUpSp="6" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="13" getLevel="24" levelUpSp="6" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="14" getLevel="24" levelUpSp="6" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="15" getLevel="24" levelUpSp="6" />
-		<skill skillName="Accuracy" skillId="256" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Boost Evasion" skillId="198" skillLvl="1" getLevel="24" levelUpSp="6" />
-		
-		<skill skillName="Ultimate Evasion" skillId="111" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Acrobatic Move" skillId="225" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Attack Aura" skillId="77" skillLvl="2" getLevel="28" levelUpSp="7" />
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Quick Step" skillId="169" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="16" getLevel="28" levelUpSp="7" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="17" getLevel="28" levelUpSp="7" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="18" getLevel="28" levelUpSp="7" />
-		<skill skillName="Charm" skillId="15" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Charm" skillId="15" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Charm" skillId="15" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="10" getLevel="28" levelUpSp="7" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="11" getLevel="28" levelUpSp="7" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="12" getLevel="28" levelUpSp="7" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="16" getLevel="28" levelUpSp="7" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="17" getLevel="28" levelUpSp="7" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="18" getLevel="28" levelUpSp="7" />
-		
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="4" getLevel="32" levelUpSp="10" />
-		<skill skillName="Rapid Shot" skillId="99" skillLvl="1" getLevel="32" levelUpSp="10" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="7" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Bleed" skillId="96" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="19" getLevel="32" levelUpSp="10" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="20" getLevel="32" levelUpSp="10" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="21" getLevel="32" levelUpSp="10" />
-		<skill skillName="Charm" skillId="15" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Charm" skillId="15" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Charm" skillId="15" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="13" getLevel="32" levelUpSp="10" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="14" getLevel="32" levelUpSp="10" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="15" getLevel="32" levelUpSp="10" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="19" getLevel="32" levelUpSp="10" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="20" getLevel="32" levelUpSp="10" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="21" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sprint" skillId="230" skillLvl="1" getLevel="32" levelUpSp="10" />
-		<skill skillName="Critical Chance" skillId="137" skillLvl="1" getLevel="32" levelUpSp="10" />
-		
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="5" getLevel="36" levelUpSp="13" />
-		<skill skillName="Esprit" skillId="171" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="9" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="10" getLevel="36" levelUpSp="13" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="22" getLevel="36" levelUpSp="13" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="23" getLevel="36" levelUpSp="13" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="24" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stun Shot" skillId="101" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stun Shot" skillId="101" skillLvl="2" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stun Shot" skillId="101" skillLvl="3" getLevel="36" levelUpSp="13" />
-		<skill skillName="Entangle" skillId="102" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Charm" skillId="15" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Charm" skillId="15" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Charm" skillId="15" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="16" getLevel="36" levelUpSp="13" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="17" getLevel="36" levelUpSp="13" />
-		<skill skillName="Elemental Heal" skillId="58" skillLvl="18" getLevel="36" levelUpSp="13" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="22" getLevel="36" levelUpSp="13" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="23" getLevel="36" levelUpSp="13" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="24" getLevel="36" levelUpSp="13" />
+		<skill skillName="Dagger Mastery" skillId="30634" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Bow/Crossbow Mastery" skillId="30636" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Dual Dagger Mastery" skillId="30635" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Novice Heart Breaker" skillId="30617" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
+		<skill skillName="Novice Quick Shot" skillId="30619" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ElvenWizard.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ElvenWizard.xml
index f519f24f59..b138fe4f53 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ElvenWizard.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ElvenWizard.xml
@@ -1,123 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="26" parentClassId="25">
-		<skill skillName="Anti Magic" skillId="146" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Quick Recovery" skillId="164" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Aqua Swirl" skillId="1175" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Aqua Swirl" skillId="1175" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Concentration" skillId="1078" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Ice Bolt" skillId="1184" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Ice Bolt" skillId="1184" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wind Shackle" skillId="1206" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Summon Boxer the Unicorn" skillId="1226" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Summon Mirage the Unicorn" skillId="1227" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Curse Weakness" skillId="1164" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Boost Mana" skillId="213" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Flame Strike" skillId="1181" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Energy Bolt" skillId="1274" skillLvl="1" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="7" getLevel="25" levelUpSp="6" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="8" getLevel="25" levelUpSp="6" />
-		<skill skillName="Fast Mana Recovery" skillId="229" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Fast Spell Casting" skillId="228" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="5" getLevel="25" levelUpSp="6" />
-		<skill skillName="Aqua Swirl" skillId="1175" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Aqua Swirl" skillId="1175" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="5" getLevel="25" levelUpSp="6" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="6" getLevel="25" levelUpSp="6" />
-		<skill skillName="Wind Shackle" skillId="1206" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Summon Boxer the Unicorn" skillId="1226" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Summon Mirage the Unicorn" skillId="1227" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Curse Weakness" skillId="1164" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Solar Spark" skillId="1264" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Water Resistance" skillId="1182" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Flame Strike" skillId="1181" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Energy Bolt" skillId="1274" skillLvl="2" getLevel="25" levelUpSp="6" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="9" getLevel="30" levelUpSp="9" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="10" getLevel="30" levelUpSp="9" />
-		<skill skillName="Quick Recovery" skillId="164" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="7" getLevel="30" levelUpSp="9" />
-		<skill skillName="Aqua Swirl" skillId="1175" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Aqua Swirl" skillId="1175" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="3" getLevel="30" levelUpSp="9" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Concentration" skillId="1078" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="7" getLevel="30" levelUpSp="9" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="8" getLevel="30" levelUpSp="9" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="9" getLevel="30" levelUpSp="9" />
-		<skill skillName="Wind Shackle" skillId="1206" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Summon Boxer the Unicorn" skillId="1226" skillLvl="3" getLevel="30" levelUpSp="9" />
-		<skill skillName="Summon Mirage the Unicorn" skillId="1227" skillLvl="3" getLevel="30" levelUpSp="9" />
-		<skill skillName="Curse Weakness" skillId="1164" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Solar Spark" skillId="1264" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Boost Mana" skillId="213" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Flame Strike" skillId="1181" skillLvl="3" getLevel="30" levelUpSp="9" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Energy Bolt" skillId="1274" skillLvl="3" getLevel="30" levelUpSp="9" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="11" getLevel="35" levelUpSp="11" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="12" getLevel="35" levelUpSp="11" />
-		<skill skillName="Fast HP Recovery" skillId="212" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Fast Mana Recovery" skillId="229" skillLvl="2" getLevel="35" levelUpSp="11" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="9" getLevel="35" levelUpSp="11" />
-		<skill skillName="Aqua Swirl" skillId="1175" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Aqua Swirl" skillId="1175" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="5" getLevel="35" levelUpSp="11" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="6" getLevel="35" levelUpSp="11" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="10" getLevel="35" levelUpSp="11" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="11" getLevel="35" levelUpSp="11" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="12" getLevel="35" levelUpSp="11" />
-		<skill skillName="Wind Shackle" skillId="1206" skillLvl="5" getLevel="35" levelUpSp="11" />
-		<skill skillName="Surrender to Earth" skillId="1223" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Summon Boxer the Unicorn" skillId="1226" skillLvl="4" getLevel="35" levelUpSp="11" />
-		<skill skillName="Summon Mirage the Unicorn" skillId="1227" skillLvl="4" getLevel="35" levelUpSp="11" />
-		<skill skillName="Curse Weakness" skillId="1164" skillLvl="5" getLevel="35" levelUpSp="11" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Solar Spark" skillId="1264" skillLvl="3" getLevel="35" levelUpSp="11" />
-		<skill skillName="Servitor Magic Boost" skillId="1145" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="9" getLevel="35" levelUpSp="11" />
-		<skill skillName="Energy Bolt" skillId="1274" skillLvl="4" getLevel="35" levelUpSp="11" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Robe Mastery" skillId="30631" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Weapon Mastery" skillId="30637" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Novice Invoke" skillId="30625" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
+		<skill skillName="Novice Elemental Crash" skillId="30621" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/HumanKnight.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/HumanKnight.xml
index 94ffb7150f..6b73254bb7 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/HumanKnight.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/HumanKnight.xml
@@ -1,102 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="4" parentClassId="0">
-		<skill skillName="Ultimate Defense" skillId="110" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Majesty" skillId="82" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Shield Mastery" skillId="153" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Shield Stun" skillId="92" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Shield Stun" skillId="92" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Shield Stun" skillId="92" skillLvl="3" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Aggression" skillId="28" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Aggression" skillId="28" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Aggression" skillId="28" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Shield Stun" skillId="92" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Shield Stun" skillId="92" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Shield Stun" skillId="92" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Deflect Arrow" skillId="112" skillLvl="1" getLevel="24" levelUpSp="6" />
-		
-		<skill skillName="Aggression" skillId="28" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Aggression" skillId="28" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Aggression" skillId="28" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Shield Mastery" skillId="153" skillLvl="2" getLevel="28" levelUpSp="7" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Shield Stun" skillId="92" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Shield Stun" skillId="92" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Shield Stun" skillId="92" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Divine Heal" skillId="45" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Divine Heal" skillId="45" skillLvl="2" getLevel="28" levelUpSp="7" />
-		<skill skillName="Divine Heal" skillId="45" skillLvl="3" getLevel="28" levelUpSp="7" />
-		
-		<skill skillName="Aggression" skillId="28" skillLvl="7" getLevel="32" levelUpSp="10" />
-		<skill skillName="Aggression" skillId="28" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Aggression" skillId="28" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Shield Stun" skillId="92" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Shield Stun" skillId="92" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Shield Stun" skillId="92" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Deflect Arrow" skillId="112" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Divine Heal" skillId="45" skillLvl="4" getLevel="32" levelUpSp="10" />
-		<skill skillName="Divine Heal" skillId="45" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Divine Heal" skillId="45" skillLvl="6" getLevel="32" levelUpSp="10" />
-		
-		<skill skillName="Aggression" skillId="28" skillLvl="10" getLevel="36" levelUpSp="13" />
-		<skill skillName="Aggression" skillId="28" skillLvl="11" getLevel="36" levelUpSp="13" />
-		<skill skillName="Aggression" skillId="28" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="11" getLevel="36" levelUpSp="13" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Shield Stun" skillId="92" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Shield Stun" skillId="92" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Shield Stun" skillId="92" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Divine Heal" skillId="45" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Divine Heal" skillId="45" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Divine Heal" skillId="45" skillLvl="9" getLevel="36" levelUpSp="13" />
-		<skill skillName="Focus Mind" skillId="191" skillLvl="1" getLevel="36" levelUpSp="13" />
+		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="30802" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Heavy Armor Mastery" skillId="30629" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Newbie's Rising Smash" skillId="30613" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
+		<skill skillName="Novice Chain Gust" skillId="30614" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/HumanWizard.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/HumanWizard.xml
index 755c212082..2a62c1bd53 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/HumanWizard.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/HumanWizard.xml
@@ -1,130 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="11" parentClassId="10">
-		<skill skillName="Anti Magic" skillId="146" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Quick Recovery" skillId="164" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Blaze" skillId="1220" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Blaze" skillId="1220" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Concentration" skillId="1078" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Ice Bolt" skillId="1184" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Ice Bolt" skillId="1184" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Summon Kat the Cat" skillId="1111" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Summon Mew the Cat" skillId="1225" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Vampiric Touch" skillId="1147" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Vampiric Touch" skillId="1147" skillLvl="4" getLevel="20" levelUpSp="4" />
-		<skill skillName="Curse Weakness" skillId="1164" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Curse Poison" skillId="1168" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Boost Mana" skillId="213" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Flame Strike" skillId="1181" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Energy Bolt" skillId="1274" skillLvl="1" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="7" getLevel="25" levelUpSp="6" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="8" getLevel="25" levelUpSp="6" />
-		<skill skillName="Fast Mana Recovery" skillId="229" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Fast Spell Casting" skillId="228" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="5" getLevel="25" levelUpSp="6" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Blaze" skillId="1220" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Blaze" skillId="1220" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="5" getLevel="25" levelUpSp="6" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="6" getLevel="25" levelUpSp="6" />
-		<skill skillName="Surrender to Fire" skillId="1083" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Summon Kat the Cat" skillId="1111" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Summon Mew the Cat" skillId="1225" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Vampiric Touch" skillId="1147" skillLvl="5" getLevel="25" levelUpSp="6" />
-		<skill skillName="Vampiric Touch" skillId="1147" skillLvl="6" getLevel="25" levelUpSp="6" />
-		<skill skillName="Curse Weakness" skillId="1164" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Body To Mind" skillId="1157" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Flame Strike" skillId="1181" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Energy Bolt" skillId="1274" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Poisonous Cloud" skillId="1167" skillLvl="1" getLevel="25" levelUpSp="6" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="9" getLevel="30" levelUpSp="9" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="10" getLevel="30" levelUpSp="9" />
-		<skill skillName="Quick Recovery" skillId="164" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="7" getLevel="30" levelUpSp="9" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="3" getLevel="30" levelUpSp="9" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Blaze" skillId="1220" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Blaze" skillId="1220" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Concentration" skillId="1078" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="7" getLevel="30" levelUpSp="9" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="8" getLevel="30" levelUpSp="9" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="9" getLevel="30" levelUpSp="9" />
-		<skill skillName="Corpse Life Drain" skillId="1151" skillLvl="1" getLevel="30" levelUpSp="9" />
-		<skill skillName="Surrender to Fire" skillId="1083" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Summon Kat the Cat" skillId="1111" skillLvl="3" getLevel="30" levelUpSp="9" />
-		<skill skillName="Summon Mew the Cat" skillId="1225" skillLvl="3" getLevel="30" levelUpSp="9" />
-		<skill skillName="Curse Weakness" skillId="1164" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Curse Poison" skillId="1168" skillLvl="3" getLevel="30" levelUpSp="9" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Boost Mana" skillId="213" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Flame Strike" skillId="1181" skillLvl="3" getLevel="30" levelUpSp="9" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Energy Bolt" skillId="1274" skillLvl="3" getLevel="30" levelUpSp="9" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="11" getLevel="35" levelUpSp="11" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="12" getLevel="35" levelUpSp="11" />
-		<skill skillName="Fast HP Recovery" skillId="212" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Fast Mana Recovery" skillId="229" skillLvl="2" getLevel="35" levelUpSp="11" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Robe Mastery" skillId="234" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="9" getLevel="35" levelUpSp="11" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="5" getLevel="35" levelUpSp="11" />
-		<skill skillName="Servitor Recharge" skillId="1126" skillLvl="6" getLevel="35" levelUpSp="11" />
-		<skill skillName="Blaze" skillId="1220" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Blaze" skillId="1220" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Decrease Speed" skillId="1160" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Servitor Wind Walk" skillId="1144" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="10" getLevel="35" levelUpSp="11" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="11" getLevel="35" levelUpSp="11" />
-		<skill skillName="Servitor Heal" skillId="1127" skillLvl="12" getLevel="35" levelUpSp="11" />
-		<skill skillName="Corpse Life Drain" skillId="1151" skillLvl="2" getLevel="35" levelUpSp="11" />
-		<skill skillName="Surrender to Fire" skillId="1083" skillLvl="3" getLevel="35" levelUpSp="11" />
-		<skill skillName="Summon Kat the Cat" skillId="1111" skillLvl="4" getLevel="35" levelUpSp="11" />
-		<skill skillName="Summon Mew the Cat" skillId="1225" skillLvl="4" getLevel="35" levelUpSp="11" />
-		<skill skillName="Curse Weakness" skillId="1164" skillLvl="5" getLevel="35" levelUpSp="11" />
-		<skill skillName="Curse Chaos" skillId="1222" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Aura Burn" skillId="1172" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Higher Mana Gain" skillId="285" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="9" getLevel="35" levelUpSp="11" />
-		<skill skillName="Energy Bolt" skillId="1274" skillLvl="4" getLevel="35" levelUpSp="11" />
-		<skill skillName="Poisonous Cloud" skillId="1167" skillLvl="2" getLevel="35" levelUpSp="11" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Robe Mastery" skillId="30631" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Weapon Mastery" skillId="30637" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Novice Invoke" skillId="30625" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
+		<skill skillName="Novice Elemental Crash" skillId="30621" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/OrcMonk.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/OrcMonk.xml
index e7af4f9510..e9b6addb67 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/OrcMonk.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/OrcMonk.xml
@@ -1,85 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="47" parentClassId="44">
-		<skill skillName="Agile Movement" skillId="319" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Fist Weapon Mastery" skillId="210" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Iron Punch" skillId="29" skillLvl="10" getLevel="20" levelUpSp="4" />
-		<skill skillName="Iron Punch" skillId="29" skillLvl="11" getLevel="20" levelUpSp="4" />
-		<skill skillName="Iron Punch" skillId="29" skillLvl="12" getLevel="20" levelUpSp="4" />
-		<skill skillName="Stunning Fist" skillId="120" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Stunning Fist" skillId="120" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Stunning Fist" skillId="120" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wolf Spirit Totem" skillId="83" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Cripple" skillId="95" skillLvl="1" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Fist Weapon Mastery" skillId="210" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Force Mastery" skillId="993" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Iron Punch" skillId="29" skillLvl="13" getLevel="24" levelUpSp="6" />
-		<skill skillName="Iron Punch" skillId="29" skillLvl="14" getLevel="24" levelUpSp="6" />
-		<skill skillName="Iron Punch" skillId="29" skillLvl="15" getLevel="24" levelUpSp="6" />
-		<skill skillName="Force Blaster" skillId="54" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Force Blaster" skillId="54" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Force Blaster" skillId="54" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Stunning Fist" skillId="120" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Stunning Fist" skillId="120" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Stunning Fist" skillId="120" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Focus Force" skillId="50" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Cripple" skillId="95" skillLvl="2" getLevel="24" levelUpSp="6" />
-		
-		<skill skillName="Fist Weapon Mastery" skillId="210" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Fist Weapon Mastery" skillId="210" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Iron Punch" skillId="29" skillLvl="16" getLevel="28" levelUpSp="7" />
-		<skill skillName="Iron Punch" skillId="29" skillLvl="17" getLevel="28" levelUpSp="7" />
-		<skill skillName="Iron Punch" skillId="29" skillLvl="18" getLevel="28" levelUpSp="7" />
-		<skill skillName="Force Blaster" skillId="54" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Force Blaster" skillId="54" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Force Blaster" skillId="54" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Stunning Fist" skillId="120" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Stunning Fist" skillId="120" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Stunning Fist" skillId="120" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Bear Spirit Totem" skillId="76" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Cripple" skillId="95" skillLvl="3" getLevel="28" levelUpSp="7" />
-		
-		<skill skillName="Fist Weapon Mastery" skillId="210" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Fist Weapon Mastery" skillId="210" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="7" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Force Mastery" skillId="993" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Iron Punch" skillId="29" skillLvl="19" getLevel="32" levelUpSp="10" />
-		<skill skillName="Iron Punch" skillId="29" skillLvl="20" getLevel="32" levelUpSp="10" />
-		<skill skillName="Iron Punch" skillId="29" skillLvl="21" getLevel="32" levelUpSp="10" />
-		<skill skillName="Force Blaster" skillId="54" skillLvl="7" getLevel="32" levelUpSp="10" />
-		<skill skillName="Force Blaster" skillId="54" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Force Blaster" skillId="54" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Stunning Fist" skillId="120" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Stunning Fist" skillId="120" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Stunning Fist" skillId="120" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Focus Force" skillId="50" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Cripple" skillId="95" skillLvl="4" getLevel="32" levelUpSp="10" />
-		
-		<skill skillName="Fist Weapon Mastery" skillId="210" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Fist Weapon Mastery" skillId="210" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="9" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="10" getLevel="36" levelUpSp="13" />
-		<skill skillName="Iron Punch" skillId="29" skillLvl="22" getLevel="36" levelUpSp="13" />
-		<skill skillName="Iron Punch" skillId="29" skillLvl="23" getLevel="36" levelUpSp="13" />
-		<skill skillName="Iron Punch" skillId="29" skillLvl="24" getLevel="36" levelUpSp="13" />
-		<skill skillName="Force Blaster" skillId="54" skillLvl="10" getLevel="36" levelUpSp="13" />
-		<skill skillName="Force Blaster" skillId="54" skillLvl="11" getLevel="36" levelUpSp="13" />
-		<skill skillName="Force Blaster" skillId="54" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stunning Fist" skillId="120" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stunning Fist" skillId="120" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stunning Fist" skillId="120" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Boost Atk. Spd." skillId="168" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Hurricane Assault" skillId="284" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Hurricane Assault" skillId="284" skillLvl="2" getLevel="36" levelUpSp="13" />
-		<skill skillName="Hurricane Assault" skillId="284" skillLvl="3" getLevel="36" levelUpSp="13" />
-		<skill skillName="Cripple" skillId="95" skillLvl="5" getLevel="36" levelUpSp="13" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Weapon Mastery" skillId="30632" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Dual Weapon Mastery" skillId="30633" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Heavy Armor Mastery" skillId="30629" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Novice Mega Strike" skillId="30616" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
+		<skill skillName="Novice Armor Destruction" skillId="30615" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/OrcRaider.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/OrcRaider.xml
index e0b59a87e3..ff63dca926 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/OrcRaider.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/OrcRaider.xml
@@ -1,120 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="45" parentClassId="44">
-		<skill skillName="Stun Attack" skillId="100" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Two-handed Weapon Mastery" skillId="293" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="257" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Bandage" skillId="34" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Boost HP" skillId="211" skillLvl="1" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Stun Attack" skillId="100" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Fast HP Recovery" skillId="212" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Two-handed Weapon Mastery" skillId="293" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="257" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Rage" skillId="94" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Vital Force" skillId="148" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Accuracy" skillId="256" skillLvl="1" getLevel="24" levelUpSp="6" />
-		
-		<skill skillName="Stun Attack" skillId="100" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Battle Roar" skillId="121" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Two-handed Weapon Mastery" skillId="293" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="257" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="257" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Boost HP" skillId="211" skillLvl="2" getLevel="28" levelUpSp="7" />
-		
-		<skill skillName="Stun Attack" skillId="100" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Frenzy" skillId="176" skillLvl="1" getLevel="32" levelUpSp="10" />
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="4" getLevel="32" levelUpSp="10" />
-		<skill skillName="Fast HP Recovery" skillId="212" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Two-handed Weapon Mastery" skillId="293" skillLvl="4" getLevel="32" levelUpSp="10" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="257" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="257" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Vital Force" skillId="148" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="12" getLevel="32" levelUpSp="10" />
-		
-		<skill skillName="Stun Attack" skillId="100" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="5" getLevel="36" levelUpSp="13" />
-		<skill skillName="Two-handed Weapon Mastery" skillId="293" skillLvl="5" getLevel="36" levelUpSp="13" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="11" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="257" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="257" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="11" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Lionheart" skillId="287" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Guts" skillId="139" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Boost HP" skillId="211" skillLvl="3" getLevel="36" levelUpSp="13" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Weapon Mastery" skillId="30632" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Dual Weapon Mastery" skillId="30633" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Heavy Armor Mastery" skillId="30629" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Novice Mega Strike" skillId="30616" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
+		<skill skillName="Novice Armor Destruction" skillId="30615" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/OrcShaman.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/OrcShaman.xml
index 60858f141c..769c4575eb 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/OrcShaman.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/OrcShaman.xml
@@ -1,113 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="50" parentClassId="49">
-		<skill skillName="Anti Magic" skillId="146" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Quick Recovery" skillId="164" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="252" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="252" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Robe Mastery" skillId="251" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Robe Mastery" skillId="251" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Weapon Mastery" skillId="250" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="253" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="253" skillLvl="4" getLevel="20" levelUpSp="4" />
-		<skill skillName="Life Drain" skillId="1090" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Frost Flame" skillId="1107" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Chant of Life" skillId="1229" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Chant of Shielding" skillId="1009" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Chant of Fire" skillId="1006" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Venom" skillId="1095" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Seal of Poison" skillId="1209" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Dreaming Spirit" skillId="1097" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Fear" skillId="1092" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Madness" skillId="1105" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Boost Mana" skillId="213" skillLvl="1" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="7" getLevel="25" levelUpSp="6" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="8" getLevel="25" levelUpSp="6" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="5" getLevel="25" levelUpSp="6" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="6" getLevel="25" levelUpSp="6" />
-		<skill skillName="Fast Mana Recovery" skillId="229" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Fast Spell Casting" skillId="228" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="252" skillLvl="7" getLevel="25" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="252" skillLvl="8" getLevel="25" levelUpSp="6" />
-		<skill skillName="Robe Mastery" skillId="251" skillLvl="7" getLevel="25" levelUpSp="6" />
-		<skill skillName="Robe Mastery" skillId="251" skillLvl="8" getLevel="25" levelUpSp="6" />
-		<skill skillName="Weapon Mastery" skillId="250" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Weapon Mastery" skillId="250" skillLvl="5" getLevel="25" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="253" skillLvl="5" getLevel="25" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="253" skillLvl="6" getLevel="25" levelUpSp="6" />
-		<skill skillName="Blaze Quake" skillId="1101" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Life Drain" skillId="1090" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Soul Cry" skillId="1001" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Chant of Battle" skillId="1007" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Chant of Life" skillId="1229" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Aura Sink" skillId="1102" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Seal of Binding" skillId="1208" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Dreaming Spirit" skillId="1097" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Fear" skillId="1092" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Madness" skillId="1105" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Soul Shield" skillId="1010" skillLvl="2" getLevel="25" levelUpSp="6" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="9" getLevel="30" levelUpSp="9" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="10" getLevel="30" levelUpSp="9" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="7" getLevel="30" levelUpSp="9" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="8" getLevel="30" levelUpSp="9" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="9" getLevel="30" levelUpSp="9" />
-		<skill skillName="Quick Recovery" skillId="164" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Light Armor Mastery" skillId="252" skillLvl="9" getLevel="30" levelUpSp="9" />
-		<skill skillName="Light Armor Mastery" skillId="252" skillLvl="10" getLevel="30" levelUpSp="9" />
-		<skill skillName="Robe Mastery" skillId="251" skillLvl="9" getLevel="30" levelUpSp="9" />
-		<skill skillName="Robe Mastery" skillId="251" skillLvl="10" getLevel="30" levelUpSp="9" />
-		<skill skillName="Weapon Mastery" skillId="250" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Weapon Mastery" skillId="250" skillLvl="7" getLevel="30" levelUpSp="9" />
-		<skill skillName="Heavy Armor Mastery" skillId="253" skillLvl="7" getLevel="30" levelUpSp="9" />
-		<skill skillName="Heavy Armor Mastery" skillId="253" skillLvl="8" getLevel="30" levelUpSp="9" />
-		<skill skillName="Pa'agrio's Gift" skillId="1003" skillLvl="1" getLevel="30" levelUpSp="9" />
-		<skill skillName="Life Drain" skillId="1090" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Frost Flame" skillId="1107" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Chant of Life" skillId="1229" skillLvl="3" getLevel="30" levelUpSp="9" />
-		<skill skillName="Chant of Shielding" skillId="1009" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Chant of Flame" skillId="1002" skillLvl="1" getLevel="30" levelUpSp="9" />
-		<skill skillName="Seal of Binding" skillId="1208" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Seal of Chaos" skillId="1096" skillLvl="1" getLevel="30" levelUpSp="9" />
-		<skill skillName="Seal of Poison" skillId="1209" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Dreaming Spirit" skillId="1097" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Fear" skillId="1092" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Madness" skillId="1105" skillLvl="3" getLevel="30" levelUpSp="9" />
-		<skill skillName="Boost Mana" skillId="213" skillLvl="2" getLevel="30" levelUpSp="9" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="11" getLevel="35" levelUpSp="11" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="12" getLevel="35" levelUpSp="11" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="10" getLevel="35" levelUpSp="11" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="11" getLevel="35" levelUpSp="11" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="12" getLevel="35" levelUpSp="11" />
-		<skill skillName="Pa'agrio's Blessing" skillId="1005" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Fast HP Recovery" skillId="212" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Fast Mana Recovery" skillId="229" skillLvl="2" getLevel="35" levelUpSp="11" />
-		<skill skillName="Light Armor Mastery" skillId="252" skillLvl="11" getLevel="35" levelUpSp="11" />
-		<skill skillName="Light Armor Mastery" skillId="252" skillLvl="12" getLevel="35" levelUpSp="11" />
-		<skill skillName="Robe Mastery" skillId="251" skillLvl="11" getLevel="35" levelUpSp="11" />
-		<skill skillName="Robe Mastery" skillId="251" skillLvl="12" getLevel="35" levelUpSp="11" />
-		<skill skillName="Weapon Mastery" skillId="250" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Weapon Mastery" skillId="250" skillLvl="9" getLevel="35" levelUpSp="11" />
-		<skill skillName="Heavy Armor Mastery" skillId="253" skillLvl="9" getLevel="35" levelUpSp="11" />
-		<skill skillName="Heavy Armor Mastery" skillId="253" skillLvl="10" getLevel="35" levelUpSp="11" />
-		<skill skillName="Blaze Quake" skillId="1101" skillLvl="2" getLevel="35" levelUpSp="11" />
-		<skill skillName="Life Drain" skillId="1090" skillLvl="6" getLevel="35" levelUpSp="11" />
-		<skill skillName="Soul Cry" skillId="1001" skillLvl="4" getLevel="35" levelUpSp="11" />
-		<skill skillName="Chant of Life" skillId="1229" skillLvl="4" getLevel="35" levelUpSp="11" />
-		<skill skillName="Aura Sink" skillId="1102" skillLvl="2" getLevel="35" levelUpSp="11" />
-		<skill skillName="Seal of Slow" skillId="1099" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Seal of Binding" skillId="1208" skillLvl="3" getLevel="35" levelUpSp="11" />
-		<skill skillName="Seal of Chaos" skillId="1096" skillLvl="2" getLevel="35" levelUpSp="11" />
-		<skill skillName="Dreaming Spirit" skillId="1097" skillLvl="6" getLevel="35" levelUpSp="11" />
-		<skill skillName="Fear" skillId="1092" skillLvl="5" getLevel="35" levelUpSp="11" />
-		<skill skillName="Madness" skillId="1105" skillLvl="4" getLevel="35" levelUpSp="11" />
-		<skill skillName="Soul Shield" skillId="1010" skillLvl="3" getLevel="35" levelUpSp="11" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Robe Mastery" skillId="30631" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Weapon Mastery" skillId="30637" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Dual Weapon Mastery" skillId="30633" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Heavy Armor Mastery" skillId="30629" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Novice Radiant Crash" skillId="30623" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
+		<skill skillName="Novice Resolving Bash" skillId="30624" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/PalusKnight.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/PalusKnight.xml
index ca908e0ccc..2f7b6a7e78 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/PalusKnight.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/PalusKnight.xml
@@ -1,101 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="32" parentClassId="31">
-		<skill skillName="Ultimate Defense" skillId="110" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Defense Aura" skillId="91" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Shield Mastery" skillId="153" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="4" getLevel="20" levelUpSp="4" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Poison" skillId="129" skillLvl="1" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Aggression" skillId="28" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Aggression" skillId="28" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Aggression" skillId="28" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Sting" skillId="223" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Sting" skillId="223" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Sting" skillId="223" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Confusion" skillId="2" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="7" getLevel="24" levelUpSp="6" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Deflect Arrow" skillId="112" skillLvl="1" getLevel="24" levelUpSp="6" />
-		
-		<skill skillName="Aggression" skillId="28" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Aggression" skillId="28" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Aggression" skillId="28" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Attack Aura" skillId="77" skillLvl="2" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Shield Mastery" skillId="153" skillLvl="2" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sting" skillId="223" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sting" skillId="223" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sting" skillId="223" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Confusion" skillId="2" skillLvl="2" getLevel="28" levelUpSp="7" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="10" getLevel="28" levelUpSp="7" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="8" getLevel="28" levelUpSp="7" />
-		
-		<skill skillName="Aggression" skillId="28" skillLvl="7" getLevel="32" levelUpSp="10" />
-		<skill skillName="Aggression" skillId="28" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Aggression" skillId="28" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sting" skillId="223" skillLvl="7" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sting" skillId="223" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sting" skillId="223" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Confusion" skillId="2" skillLvl="3" getLevel="32" levelUpSp="10" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="13" getLevel="32" levelUpSp="10" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Deflect Arrow" skillId="112" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Power Break" skillId="115" skillLvl="1" getLevel="32" levelUpSp="10" />
-		
-		<skill skillName="Aggression" skillId="28" skillLvl="10" getLevel="36" levelUpSp="13" />
-		<skill skillName="Aggression" skillId="28" skillLvl="11" getLevel="36" levelUpSp="13" />
-		<skill skillName="Aggression" skillId="28" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="217" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="232" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sting" skillId="223" skillLvl="10" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sting" skillId="223" skillLvl="11" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sting" skillId="223" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Confusion" skillId="2" skillLvl="4" getLevel="36" levelUpSp="13" />
-		<skill skillName="Freezing Strike" skillId="105" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Freezing Strike" skillId="105" skillLvl="2" getLevel="36" levelUpSp="13" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Drain Energy" skillId="70" skillLvl="16" getLevel="36" levelUpSp="13" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Magic Resistance" skillId="147" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Power Break" skillId="115" skillLvl="2" getLevel="36" levelUpSp="13" />
-		<skill skillName="Focus Mind" skillId="191" skillLvl="1" getLevel="36" levelUpSp="13" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="30802" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Dual Weapon Mastery" skillId="30633" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Heavy Armor Mastery" skillId="30629" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Newbie's Rising Smash" skillId="30613" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
+		<skill skillName="Novice Resolving Bash" skillId="30624" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Rogue.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Rogue.xml
index 44bc2757a6..d57a349e53 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Rogue.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Rogue.xml
@@ -1,99 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="7" parentClassId="0">
-		<skill skillName="Acrobatics" skillId="173" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Boost Breath" skillId="195" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Long Shot" skillId="113" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="10" getLevel="20" levelUpSp="4" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="11" getLevel="20" levelUpSp="4" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="12" getLevel="20" levelUpSp="4" />
-		<skill skillName="Dash" skillId="4" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="10" getLevel="20" levelUpSp="4" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="11" getLevel="20" levelUpSp="4" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="12" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Vital Force" skillId="148" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Critical Damage" skillId="193" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Bleed" skillId="96" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="13" getLevel="24" levelUpSp="6" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="14" getLevel="24" levelUpSp="6" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="15" getLevel="24" levelUpSp="6" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="13" getLevel="24" levelUpSp="6" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="14" getLevel="24" levelUpSp="6" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="15" getLevel="24" levelUpSp="6" />
-		<skill skillName="Accuracy" skillId="256" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Boost Evasion" skillId="198" skillLvl="1" getLevel="24" levelUpSp="6" />
-		
-		<skill skillName="Ultimate Evasion" skillId="111" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Acrobatic Move" skillId="225" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Quick Step" skillId="169" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="16" getLevel="28" levelUpSp="7" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="17" getLevel="28" levelUpSp="7" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="18" getLevel="28" levelUpSp="7" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="16" getLevel="28" levelUpSp="7" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="17" getLevel="28" levelUpSp="7" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="18" getLevel="28" levelUpSp="7" />
-		<skill skillName="Critical Chance" skillId="137" skillLvl="1" getLevel="28" levelUpSp="7" />
-		
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="4" getLevel="32" levelUpSp="10" />
-		<skill skillName="Rapid Shot" skillId="99" skillLvl="1" getLevel="32" levelUpSp="10" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="7" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Vital Force" skillId="148" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Critical Damage" skillId="193" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Bleed" skillId="96" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="19" getLevel="32" levelUpSp="10" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="20" getLevel="32" levelUpSp="10" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="21" getLevel="32" levelUpSp="10" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="19" getLevel="32" levelUpSp="10" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="20" getLevel="32" levelUpSp="10" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="21" getLevel="32" levelUpSp="10" />
-		
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="5" getLevel="36" levelUpSp="13" />
-		<skill skillName="Esprit" skillId="171" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="9" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="233" skillLvl="10" getLevel="36" levelUpSp="13" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Bow Mastery" skillId="208" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="22" getLevel="36" levelUpSp="13" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="23" getLevel="36" levelUpSp="13" />
-		<skill skillName="Power Shot" skillId="56" skillLvl="24" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stun Shot" skillId="101" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stun Shot" skillId="101" skillLvl="2" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stun Shot" skillId="101" skillLvl="3" getLevel="36" levelUpSp="13" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="22" getLevel="36" levelUpSp="13" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="23" getLevel="36" levelUpSp="13" />
-		<skill skillName="Mortal Blow" skillId="16" skillLvl="24" getLevel="36" levelUpSp="13" />
-		<skill skillName="Boost Atk. Spd." skillId="168" skillLvl="1" getLevel="36" levelUpSp="13" />
+		<skill skillName="Dagger Mastery" skillId="30634" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Bow/Crossbow Mastery" skillId="30636" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Dual Dagger Mastery" skillId="30635" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Novice Heart Breaker" skillId="30617" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
+		<skill skillName="Novice Quick Shot" skillId="30619" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Scavenger.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Scavenger.xml
index c87989d287..8f0eae9b9d 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Scavenger.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Scavenger.xml
@@ -1,106 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="54" parentClassId="53">
-		<skill skillName="Stun Attack" skillId="100" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="205" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Crystallize" skillId="248" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Spoil" skillId="254" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Bandage" skillId="34" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Boost HP" skillId="211" skillLvl="1" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Stun Attack" skillId="100" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Fast HP Recovery" skillId="212" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="205" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Vital Force" skillId="148" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Weight Limit" skillId="150" skillLvl="2" getLevel="24" levelUpSp="6" />
-		
-		<skill skillName="Stun Attack" skillId="100" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="205" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="205" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Spoil Festival" skillId="302" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sweeper Festival" skillId="444" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Spoil" skillId="254" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Potential Ability" skillId="1559" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Boost HP" skillId="211" skillLvl="2" getLevel="28" levelUpSp="7" />
-		
-		<skill skillName="Stun Attack" skillId="100" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Fast HP Recovery" skillId="212" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="205" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="205" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Vital Force" skillId="148" skillLvl="2" getLevel="32" levelUpSp="10" />
-		
-		<skill skillName="Stun Attack" skillId="100" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Dagger Mastery" skillId="209" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="11" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="205" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="205" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="11" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Spoil Festival" skillId="302" skillLvl="2" getLevel="36" levelUpSp="13" />
-		<skill skillName="Spoil" skillId="254" skillLvl="4" getLevel="36" levelUpSp="13" />
-		<skill skillName="Boost HP" skillId="211" skillLvl="3" getLevel="36" levelUpSp="13" />
+		<skill skillName="Dagger Mastery" skillId="30634" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Dual Dagger Mastery" skillId="30635" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Novice Blood Stab" skillId="30618" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
+		<skill skillName="Novice Heart Breaker" skillId="30617" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ShillienOracle.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ShillienOracle.xml
index caafdf201b..39a6836480 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ShillienOracle.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/ShillienOracle.xml
@@ -1,132 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="42" parentClassId="38">
-		<skill skillName="Anti Magic" skillId="146" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="4" getLevel="20" levelUpSp="4" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Quick Recovery" skillId="164" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Resurrection" skillId="1016" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="4" getLevel="20" levelUpSp="4" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="5" getLevel="20" levelUpSp="4" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Concentration" skillId="1078" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wind Walk" skillId="1204" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heal" skillId="1011" skillLvl="7" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heal" skillId="1011" skillLvl="8" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heal" skillId="1011" skillLvl="9" getLevel="20" levelUpSp="4" />
-		<skill skillName="Might" skillId="1068" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wind Shackle" skillId="1206" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Eva's Kiss" skillId="1073" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Boost Mana" skillId="213" skillLvl="1" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="7" getLevel="25" levelUpSp="6" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="8" getLevel="25" levelUpSp="6" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="7" getLevel="25" levelUpSp="6" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="8" getLevel="25" levelUpSp="6" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="9" getLevel="25" levelUpSp="6" />
-		<skill skillName="Fast Mana Recovery" skillId="229" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Fast Spell Casting" skillId="228" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="5" getLevel="25" levelUpSp="6" />
-		<skill skillName="Empower" skillId="1059" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="7" getLevel="25" levelUpSp="6" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="8" getLevel="25" levelUpSp="6" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="9" getLevel="25" levelUpSp="6" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Heal" skillId="1011" skillLvl="10" getLevel="25" levelUpSp="6" />
-		<skill skillName="Heal" skillId="1011" skillLvl="11" getLevel="25" levelUpSp="6" />
-		<skill skillName="Heal" skillId="1011" skillLvl="12" getLevel="25" levelUpSp="6" />
-		<skill skillName="Mental Shield" skillId="1035" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Wind Shackle" skillId="1206" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="4" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="2" getLevel="25" levelUpSp="6" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="3" getLevel="25" levelUpSp="6" />
-		<skill skillName="Focus" skillId="1077" skillLvl="1" getLevel="25" levelUpSp="6" />
-		<skill skillName="Shield" skillId="1040" skillLvl="2" getLevel="25" levelUpSp="6" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="9" getLevel="30" levelUpSp="9" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="10" getLevel="30" levelUpSp="9" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="10" getLevel="30" levelUpSp="9" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="11" getLevel="30" levelUpSp="9" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="12" getLevel="30" levelUpSp="9" />
-		<skill skillName="Quick Recovery" skillId="164" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="7" getLevel="30" levelUpSp="9" />
-		<skill skillName="Resurrection" skillId="1016" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Vampiric Rage" skillId="1268" skillLvl="1" getLevel="30" levelUpSp="9" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="10" getLevel="30" levelUpSp="9" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="11" getLevel="30" levelUpSp="9" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="12" getLevel="30" levelUpSp="9" />
-		<skill skillName="Concentration" skillId="1078" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Wind Walk" skillId="1204" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Heal" skillId="1011" skillLvl="13" getLevel="30" levelUpSp="9" />
-		<skill skillName="Heal" skillId="1011" skillLvl="14" getLevel="30" levelUpSp="9" />
-		<skill skillName="Heal" skillId="1011" skillLvl="15" getLevel="30" levelUpSp="9" />
-		<skill skillName="Wind Shackle" skillId="1206" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Recharge" skillId="1013" skillLvl="1" getLevel="30" levelUpSp="9" />
-		<skill skillName="Recharge" skillId="1013" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="6" getLevel="30" levelUpSp="9" />
-		<skill skillName="Boost Mana" skillId="213" skillLvl="2" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="4" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="5" getLevel="30" levelUpSp="9" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="6" getLevel="30" levelUpSp="9" />
-		
-		<skill skillName="Anti Magic" skillId="146" skillLvl="11" getLevel="35" levelUpSp="11" />
-		<skill skillName="Anti Magic" skillId="146" skillLvl="12" getLevel="35" levelUpSp="11" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="13" getLevel="35" levelUpSp="11" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="14" getLevel="35" levelUpSp="11" />
-		<skill skillName="Battle Heal" skillId="1015" skillLvl="15" getLevel="35" levelUpSp="11" />
-		<skill skillName="Fast HP Recovery" skillId="212" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Fast Mana Recovery" skillId="229" skillLvl="2" getLevel="35" levelUpSp="11" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Light Armor Mastery" skillId="236" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Robe Mastery" skillId="235" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Weapon Mastery" skillId="249" skillLvl="9" getLevel="35" levelUpSp="11" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="13" getLevel="35" levelUpSp="11" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="14" getLevel="35" levelUpSp="11" />
-		<skill skillName="Group Heal" skillId="1027" skillLvl="15" getLevel="35" levelUpSp="11" />
-		<skill skillName="Cure Poison" skillId="1012" skillLvl="2" getLevel="35" levelUpSp="11" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Dryad Root" skillId="1201" skillLvl="9" getLevel="35" levelUpSp="11" />
-		<skill skillName="Heal" skillId="1011" skillLvl="16" getLevel="35" levelUpSp="11" />
-		<skill skillName="Heal" skillId="1011" skillLvl="17" getLevel="35" levelUpSp="11" />
-		<skill skillName="Heal" skillId="1011" skillLvl="18" getLevel="35" levelUpSp="11" />
-		<skill skillName="Wind Shackle" skillId="1206" skillLvl="5" getLevel="35" levelUpSp="11" />
-		<skill skillName="Recharge" skillId="1013" skillLvl="3" getLevel="35" levelUpSp="11" />
-		<skill skillName="Recharge" skillId="1013" skillLvl="4" getLevel="35" levelUpSp="11" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Disrupt Undead" skillId="1031" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Wind Resistance" skillId="1189" skillLvl="1" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="7" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="8" getLevel="35" levelUpSp="11" />
-		<skill skillName="Sleep" skillId="1069" skillLvl="9" getLevel="35" levelUpSp="11" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Magic Weapon Mastery" skillId="30638" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Robe Mastery" skillId="30631" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Novice Dark Veil" skillId="30628" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
+		<skill skillName="Novice Dark Blast" skillId="30627" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Trooper.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Trooper.xml
index f9e071f1a8..2a6eacf365 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Trooper.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Trooper.xml
@@ -1,117 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="125" parentClassId="123">
-		<skill skillName="Ancient Sword Mastery" skillId="472" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Soul Mastery" skillId="467" skillLvl="4" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Rapier Mastery" skillId="474" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="7" getLevel="20" levelUpSp="4" />
-		<skill skillName="Strike Back" skillId="475" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Dark Strike" skillId="476" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Dark Strike" skillId="476" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Dark Strike" skillId="476" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Change Weapon" skillId="1473" skillLvl="1" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Ancient Sword Mastery" skillId="472" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Soul Mastery" skillId="467" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Rapier Mastery" skillId="474" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="8" getLevel="24" levelUpSp="6" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="9" getLevel="24" levelUpSp="6" />
-		<skill skillName="Death Mark" skillId="1435" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Erase Mark" skillId="1475" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Dark Explosion" skillId="1434" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Dark Strike" skillId="476" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Dark Strike" skillId="476" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Dark Strike" skillId="476" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Furious Soul" skillId="482" skillLvl="1" getLevel="24" levelUpSp="6" />
-		
-		<skill skillName="Ancient Sword Mastery" skillId="472" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Ancient Sword Mastery" skillId="472" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Soul Mastery" skillId="467" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Rapier Mastery" skillId="474" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Rapier Mastery" skillId="474" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="10" getLevel="28" levelUpSp="7" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="11" getLevel="28" levelUpSp="7" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="12" getLevel="28" levelUpSp="7" />
-		<skill skillName="Surrender to Dark" skillId="1445" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Dark Explosion" skillId="1434" skillLvl="2" getLevel="28" levelUpSp="7" />
-		<skill skillName="Increase Power" skillId="1432" skillLvl="2" getLevel="28" levelUpSp="7" />
-		<skill skillName="Dark Strike" skillId="476" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Dark Strike" skillId="476" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Dark Strike" skillId="476" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Hard March" skillId="479" skillLvl="1" getLevel="28" levelUpSp="7" />
-		
-		<skill skillName="Dark Armor" skillId="481" skillLvl="1" getLevel="32" levelUpSp="10" />
-		<skill skillName="Ancient Sword Mastery" skillId="472" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Ancient Sword Mastery" skillId="472" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Soul Mastery" skillId="467" skillLvl="7" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Rapier Mastery" skillId="474" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Rapier Mastery" skillId="474" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="13" getLevel="32" levelUpSp="10" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="14" getLevel="32" levelUpSp="10" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="15" getLevel="32" levelUpSp="10" />
-		<skill skillName="Death Mark" skillId="1435" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Elementary Rush" skillId="484" skillLvl="1" getLevel="32" levelUpSp="10" />
-		<skill skillName="Surrender to Dark" skillId="1445" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="7" getLevel="32" levelUpSp="10" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Dark Explosion" skillId="1434" skillLvl="3" getLevel="32" levelUpSp="10" />
-		<skill skillName="Dark Strike" skillId="476" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Dark Strike" skillId="476" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Dark Strike" skillId="476" skillLvl="12" getLevel="32" levelUpSp="10" />
-		
-		<skill skillName="Ancient Sword Mastery" skillId="472" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Ancient Sword Mastery" skillId="472" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Soul Mastery" skillId="467" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="11" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Rapier Mastery" skillId="474" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Rapier Mastery" skillId="474" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sword Shield" skillId="483" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="16" getLevel="36" levelUpSp="13" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="17" getLevel="36" levelUpSp="13" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="18" getLevel="36" levelUpSp="13" />
-		<skill skillName="Courage" skillId="499" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Surrender to Dark" skillId="1445" skillLvl="3" getLevel="36" levelUpSp="13" />
-		<skill skillName="Disarm" skillId="485" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="9" getLevel="36" levelUpSp="13" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="10" getLevel="36" levelUpSp="13" />
-		<skill skillName="Dark Blade" skillId="480" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Dark Explosion" skillId="1434" skillLvl="4" getLevel="36" levelUpSp="13" />
-		<skill skillName="Dark Strike" skillId="476" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Dark Strike" skillId="476" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Dark Strike" skillId="476" skillLvl="15" getLevel="36" levelUpSp="13" />
+		<skill skillName="Robe Mastery" skillId="30631" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Weapon Mastery" skillId="30632" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Weapon Mastery" skillId="30637" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Dual Weapon Mastery" skillId="30633" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Heavy Armor Mastery" skillId="30629" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Novice Armor Destruction" skillId="30615" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
+		<skill skillName="Novice Elemental Crash" skillId="30621" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Warder.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Warder.xml
index d46de75526..11416e407e 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Warder.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Warder.xml
@@ -1,124 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="126" parentClassId="124">
-		<skill skillName="Crossbow Mastery" skillId="473" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Soul Mastery" skillId="467" skillLvl="4" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Rapier Mastery" skillId="474" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="6" getLevel="20" levelUpSp="4" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="7" getLevel="20" levelUpSp="4" />
-		<skill skillName="Penetrating Shot" skillId="487" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Penetrating Shot" skillId="487" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Penetrating Shot" skillId="487" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Change Weapon" skillId="1473" skillLvl="1" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Crossbow Mastery" skillId="473" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Soul Mastery" skillId="467" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Rapier Mastery" skillId="474" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="8" getLevel="24" levelUpSp="6" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="9" getLevel="24" levelUpSp="6" />
-		<skill skillName="Death Mark" skillId="1435" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Defuse Trap" skillId="471" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Detect Trap" skillId="470" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Penetrating Shot" skillId="487" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Penetrating Shot" skillId="487" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Penetrating Shot" skillId="487" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Erase Mark" skillId="1475" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Dark Explosion" skillId="1434" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Increase Range" skillId="486" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Hard March" skillId="479" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Furious Soul" skillId="482" skillLvl="1" getLevel="24" levelUpSp="6" />
-		
-		<skill skillName="Crossbow Mastery" skillId="473" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Crossbow Mastery" skillId="473" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Soul Mastery" skillId="467" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Rapier Mastery" skillId="474" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Rapier Mastery" skillId="474" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="10" getLevel="28" levelUpSp="7" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="11" getLevel="28" levelUpSp="7" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="12" getLevel="28" levelUpSp="7" />
-		<skill skillName="Fire Trap" skillId="514" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Surrender to Dark" skillId="1445" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Penetrating Shot" skillId="487" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Penetrating Shot" skillId="487" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Penetrating Shot" skillId="487" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Dark Explosion" skillId="1434" skillLvl="2" getLevel="28" levelUpSp="7" />
-		
-		<skill skillName="Dark Armor" skillId="481" skillLvl="1" getLevel="32" levelUpSp="10" />
-		<skill skillName="Fast Shot" skillId="490" skillLvl="1" getLevel="32" levelUpSp="10" />
-		<skill skillName="Crossbow Mastery" skillId="473" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Crossbow Mastery" skillId="473" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Soul Mastery" skillId="467" skillLvl="7" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Rapier Mastery" skillId="474" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Rapier Mastery" skillId="474" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="13" getLevel="32" levelUpSp="10" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="14" getLevel="32" levelUpSp="10" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="15" getLevel="32" levelUpSp="10" />
-		<skill skillName="Death Mark" skillId="1435" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Surrender to Dark" skillId="1445" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Penetrating Shot" skillId="487" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Penetrating Shot" skillId="487" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Penetrating Shot" skillId="487" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Warp" skillId="628" skillLvl="1" getLevel="32" levelUpSp="10" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="7" getLevel="32" levelUpSp="10" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Dark Explosion" skillId="1434" skillLvl="3" getLevel="32" levelUpSp="10" />
-		
-		<skill skillName="Crossbow Mastery" skillId="473" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Crossbow Mastery" skillId="473" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Soul Mastery" skillId="467" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="11" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="465" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Rapier Mastery" skillId="474" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Rapier Mastery" skillId="474" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Double Thrust" skillId="478" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Ultimate Escape" skillId="622" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="16" getLevel="36" levelUpSp="13" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="17" getLevel="36" levelUpSp="13" />
-		<skill skillName="Magic Immunity" skillId="466" skillLvl="18" getLevel="36" levelUpSp="13" />
-		<skill skillName="Defuse Trap" skillId="471" skillLvl="3" getLevel="36" levelUpSp="13" />
-		<skill skillName="Detect Trap" skillId="470" skillLvl="3" getLevel="36" levelUpSp="13" />
-		<skill skillName="Fire Trap" skillId="514" skillLvl="2" getLevel="36" levelUpSp="13" />
-		<skill skillName="Surrender to Dark" skillId="1445" skillLvl="3" getLevel="36" levelUpSp="13" />
-		<skill skillName="Penetrating Shot" skillId="487" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Penetrating Shot" skillId="487" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Penetrating Shot" skillId="487" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="9" getLevel="36" levelUpSp="13" />
-		<skill skillName="Abyssal Blaze" skillId="1433" skillLvl="10" getLevel="36" levelUpSp="13" />
-		<skill skillName="Dark Blade" skillId="480" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Dark Explosion" skillId="1434" skillLvl="4" getLevel="36" levelUpSp="13" />
-		<skill skillName="Soul Shock" skillId="627" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Soul Shock" skillId="627" skillLvl="2" getLevel="36" levelUpSp="13" />
-		<skill skillName="Soul Shock" skillId="627" skillLvl="3" getLevel="36" levelUpSp="13" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Bow/Crossbow Mastery" skillId="30636" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Robe Mastery" skillId="30631" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Weapon Mastery" skillId="30637" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Novice Quick Shot" skillId="30619" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
+		<skill skillName="Novice Elemental Crash" skillId="30621" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+			<removeSkill id="30797" /> <!-- Wind Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Warrior.xml b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Warrior.xml
index c7f7c9228e..c66db63c06 100644
--- a/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Warrior.xml
+++ b/L2J_Mobius_7.0_PreludeOfWar/dist/game/data/skillTrees/1stClass/Warrior.xml
@@ -1,113 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skillTrees.xsd">
 	<skillTree type="classSkillTree" classId="1" parentClassId="0">
-		<skill skillName="Stun Attack" skillId="100" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="257" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="War Cry" skillId="78" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="1" getLevel="20" levelUpSp="4" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="2" getLevel="20" levelUpSp="4" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="3" getLevel="20" levelUpSp="4" />
-		<skill skillName="Boost HP" skillId="211" skillLvl="1" getLevel="20" levelUpSp="4" />
-		
-		<skill skillName="Stun Attack" skillId="100" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Fast HP Recovery" skillId="212" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="257" skillLvl="2" getLevel="24" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="3" getLevel="24" levelUpSp="6" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Vital Force" skillId="148" skillLvl="1" getLevel="24" levelUpSp="6" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="4" getLevel="24" levelUpSp="6" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="5" getLevel="24" levelUpSp="6" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="6" getLevel="24" levelUpSp="6" />
-		<skill skillName="Accuracy" skillId="256" skillLvl="1" getLevel="24" levelUpSp="6" />
-		
-		<skill skillName="Stun Attack" skillId="100" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Battle Roar" skillId="121" skillLvl="1" getLevel="28" levelUpSp="7" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="257" skillLvl="3" getLevel="28" levelUpSp="7" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="257" skillLvl="4" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="5" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="6" getLevel="28" levelUpSp="7" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="7" getLevel="28" levelUpSp="7" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="8" getLevel="28" levelUpSp="7" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="9" getLevel="28" levelUpSp="7" />
-		<skill skillName="Boost HP" skillId="211" skillLvl="2" getLevel="28" levelUpSp="7" />
-		
-		<skill skillName="Stun Attack" skillId="100" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="4" getLevel="32" levelUpSp="10" />
-		<skill skillName="Fast HP Recovery" skillId="212" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="257" skillLvl="5" getLevel="32" levelUpSp="10" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="257" skillLvl="6" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="8" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="9" getLevel="32" levelUpSp="10" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Vital Force" skillId="148" skillLvl="2" getLevel="32" levelUpSp="10" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="10" getLevel="32" levelUpSp="10" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="11" getLevel="32" levelUpSp="10" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="12" getLevel="32" levelUpSp="10" />
-		<skill skillName="Detect Insect Weakness" skillId="75" skillLvl="1" getLevel="32" levelUpSp="10" />
-		
-		<skill skillName="Stun Attack" skillId="100" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Stun Attack" skillId="100" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Vicious Stance" skillId="312" skillLvl="5" getLevel="36" levelUpSp="13" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Polearm Mastery" skillId="216" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="11" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Light Armor Mastery" skillId="227" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="257" skillLvl="7" getLevel="36" levelUpSp="13" />
-		<skill skillName="Sword/ Blunt Weapon Mastery" skillId="257" skillLvl="8" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="11" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="12" getLevel="36" levelUpSp="13" />
-		<skill skillName="Heavy Armor Mastery" skillId="231" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Wild Sweep" skillId="245" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Lionheart" skillId="287" skillLvl="1" getLevel="36" levelUpSp="13" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="13" getLevel="36" levelUpSp="13" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="14" getLevel="36" levelUpSp="13" />
-		<skill skillName="Power Smash" skillId="255" skillLvl="15" getLevel="36" levelUpSp="13" />
-		<skill skillName="Boost HP" skillId="211" skillLvl="3" getLevel="36" levelUpSp="13" />
+		<skill skillName="Light Armor Mastery" skillId="30630" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Weapon Mastery" skillId="30632" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Dual Weapon Mastery" skillId="30633" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Heavy Armor Mastery" skillId="30629" skillLvl="1" getLevel="20" levelUpSp="4" />
+		<skill skillName="Novice Mega Strike" skillId="30616" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
+		<skill skillName="Novice Armor Destruction" skillId="30615" skillLvl="1" getLevel="20" levelUpSp="4">
+			<removeSkill id="30798" /> <!-- Power Strike -->
+		</skill>
 	</skillTree>
 </list>
\ No newline at end of file