diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00000-00099.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00000-00099.xml
index 5863943e72..37c2713ceb 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00000-00099.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00000-00099.xml
@@ -370,41 +370,41 @@
 			<value level="35">75</value>
 		</mpConsume>
 		<mpInitialConsume>
-			<value level="1">3</value>
-			<value level="2">3</value>
-			<value level="3">3</value>
-			<value level="4">4</value>
-			<value level="5">4</value>
-			<value level="6">4</value>
-			<value level="7">5</value>
-			<value level="8">5</value>
-			<value level="9">5</value>
-			<value level="10">5</value>
-			<value level="11">6</value>
-			<value level="12">6</value>
-			<value level="13">6</value>
-			<value level="14">6</value>
-			<value level="15">7</value>
-			<value level="16">7</value>
-			<value level="17">7</value>
-			<value level="18">7</value>
-			<value level="19">7</value>
-			<value level="20">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="21">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="22">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="31">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="32">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="33">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="34">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="35">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="1">57</value>
+			<value level="2">58</value>
+			<value level="3">58</value>
+			<value level="4">60</value>
+			<value level="5">61</value>
+			<value level="6">63</value>
+			<value level="7">63</value>
+			<value level="8">64</value>
+			<value level="9">66</value>
+			<value level="10">67</value>
+			<value level="11">67</value>
+			<value level="12">69</value>
+			<value level="13">70</value>
+			<value level="14">72</value>
+			<value level="15">72</value>
+			<value level="16">73</value>
+			<value level="17">75</value>
+			<value level="18">76</value>
+			<value level="19">76</value>
+			<value level="20">78</value>
+			<value level="21">79</value>
+			<value level="22">81</value>
+			<value level="23">81</value>
+			<value level="24">82</value>
+			<value level="25">84</value>
+			<value level="26">85</value>
+			<value level="27">85</value>
+			<value level="28">87</value>
+			<value level="29">90</value>
+			<value level="30">90</value>
+			<value level="31">91</value>
+			<value level="32">91</value>
+			<value level="33">91</value>
+			<value level="34">91</value>
+			<value level="35">91</value>
 		</mpInitialConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>5000</reuseDelay>
@@ -7134,18 +7134,18 @@
 			<value level="26">3</value>
 			<value level="27">3</value>
 			<value level="28">3</value>
-			<value level="29">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="31">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="32">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="33">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="34">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="35">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="36">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="37">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="38">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="39">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="40">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="29">3</value>
+			<value level="30">4</value>
+			<value level="31">4</value>
+			<value level="32">4</value>
+			<value level="33">4</value>
+			<value level="34">4</value>
+			<value level="35">4</value>
+			<value level="36">4</value>
+			<value level="37">4</value>
+			<value level="38">4</value>
+			<value level="39">4</value>
+			<value level="40">4</value>
 		</abnormalLevel>
 		<abnormalTime>20</abnormalTime>
 		<abnormalType>SPEED_DOWN</abnormalType>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00100-00199.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00100-00199.xml
index 0cfda11779..6dcd4dc7b3 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00100-00199.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00100-00199.xml
@@ -340,18 +340,18 @@
 			<value level="16">3</value>
 			<value level="17">3</value>
 			<value level="18">3</value>
-			<value level="19">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="20">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="21">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="22">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="19">4</value>
+			<value level="20">4</value>
+			<value level="21">4</value>
+			<value level="22">4</value>
+			<value level="23">4</value>
+			<value level="24">4</value>
+			<value level="25">4</value>
+			<value level="26">4</value>
+			<value level="27">4</value>
+			<value level="28">4</value>
+			<value level="29">4</value>
+			<value level="30">4</value>
 		</abnormalLevel>
 		<abnormalTime>3</abnormalTime>
 		<abnormalType>SPEED_DOWN</abnormalType>
@@ -1035,17 +1035,17 @@
 			<value level="17">3</value>
 			<value level="18">3</value>
 			<value level="19">3</value>
-			<value level="20">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="21">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="22">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="20">4</value>
+			<value level="21">4</value>
+			<value level="22">4</value>
+			<value level="23">4</value>
+			<value level="24">4</value>
+			<value level="25">4</value>
+			<value level="26">4</value>
+			<value level="27">4</value>
+			<value level="28">4</value>
+			<value level="29">4</value>
+			<value level="30">4</value>
 		</abnormalLevel>
 		<abnormalTime>30</abnormalTime>
 		<abnormalType>PA_DOWN</abnormalType>
@@ -1173,17 +1173,17 @@
 			<value level="17">7</value>
 			<value level="18">8</value>
 			<value level="19">8</value>
-			<value level="20">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="21">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="22">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="20">9</value>
+			<value level="21">9</value>
+			<value level="22">9</value>
+			<value level="23">9</value>
+			<value level="24">9</value>
+			<value level="25">9</value>
+			<value level="26">10</value>
+			<value level="27">10</value>
+			<value level="28">10</value>
+			<value level="29">10</value>
+			<value level="30">10</value>
 		</mpInitialConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>2000</reuseDelay>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00300-00399.xml
index 368323c490..55fa58698c 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00300-00399.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00300-00399.xml
@@ -458,7 +458,7 @@
 			<value level="7">7</value>
 			<value level="8">8</value>
 			<value level="9">9</value>
-			<value level="10">9</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="10">9</value>
 		</abnormalLevel>
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>SNIPE</abnormalType>
@@ -1069,7 +1069,6 @@
 				<chance>80</chance>
 			</effect>
 		</effects>
-		<!-- TODO : Move to effects after A3 skills rework -->
 		<selfEffects>
 			<effect name="Speed">
 				<amount>40</amount>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00400-00499.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00400-00499.xml
index f8f00a5b71..f1327b1032 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00400-00499.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00400-00499.xml
@@ -24,16 +24,16 @@
 			<value level="18">4</value>
 			<value level="19">4</value>
 			<value level="20">4</value>
-			<value level="21">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="22">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="21">5</value>
+			<value level="22">5</value>
+			<value level="23">5</value>
+			<value level="24">5</value>
+			<value level="25">5</value>
+			<value level="26">5</value>
+			<value level="27">5</value>
+			<value level="28">5</value>
+			<value level="29">5</value>
+			<value level="30">5</value>
 		</abnormalLevel>
 		<abnormalTime>30</abnormalTime>
 		<abnormalType>CRITICAL_PROB_DOWN</abnormalType>
@@ -258,16 +258,16 @@
 			<value level="18">4</value>
 			<value level="19">4</value>
 			<value level="20">4</value>
-			<value level="21">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="22">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="21">5</value>
+			<value level="22">5</value>
+			<value level="23">5</value>
+			<value level="24">5</value>
+			<value level="25">5</value>
+			<value level="26">5</value>
+			<value level="27">5</value>
+			<value level="28">5</value>
+			<value level="29">5</value>
+			<value level="30">5</value>
 		</abnormalLevel>
 		<abnormalTime>30</abnormalTime>
 		<abnormalType>CRITICAL_DMG_DOWN</abnormalType>
@@ -1496,7 +1496,7 @@
 			<value level="7">7</value>
 			<value level="8">8</value>
 			<value level="9">9</value>
-			<value level="10">9</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="10">10</value>
 		</abnormalLevel>
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>SNIPE</abnormalType>
@@ -1579,7 +1579,6 @@
 			<value level="7">7</value>
 			<value level="8">8</value>
 			<value level="9">9</value>
-			<value level="10">9</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalLevel>
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>SNIPE</abnormalType>
@@ -4376,7 +4375,6 @@
 		<mpConsume>53</mpConsume>
 		<operateType>A1</operateType>
 		<reuseDelay>5000</reuseDelay>
-		<!-- FIXME: should be AREA -->
 		<magicCriticalRate>5</magicCriticalRate>
 		<trait>DERANGEMENT</trait>
 		<targetType>TARGET</targetType>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00900-00999.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00900-00999.xml
index bf33be8f12..06f54dd71f 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00900-00999.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/00900-00999.xml
@@ -3626,7 +3626,7 @@
 		<magicLevel>85</magicLevel>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
-		<!-- TODO: Implement and use proper effects. -->
+		<!-- not sylph skill -->
 	</skill>
 	<skill id="968" toLevel="1" name="Treykan Claw">
 		<!-- Attack targets with 6960 Power added to P. Atk. -->
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01000-01099.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01000-01099.xml
index 9f9fea6b30..88cfb32304 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01000-01099.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01000-01099.xml
@@ -150,8 +150,7 @@
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="MagicalAttackSpeed">
 				<amount>
@@ -220,8 +219,7 @@
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PLEDGE</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="Reuse">
 				<amount>
@@ -309,15 +307,14 @@
 			<value level="1">3</value>
 			<value level="2">20</value>
 			<value level="3">40</value>
-			<value level="4">95</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="4">76</value>
 		</magicLevel>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="PAtk">
 				<amount>
@@ -366,8 +363,7 @@
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PLEDGE</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="MagicalDefence">
 				<amount>
@@ -405,15 +401,14 @@
 			<value level="1">2</value>
 			<value level="2">20</value>
 			<value level="3">40</value>
-			<value level="4">95</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="4">76</value>
 		</magicLevel>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -602,7 +597,7 @@
 		<operateType>A1</operateType>
 		<reuseDelay>4000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
-		<targetType>TARGET</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="DispelBySlot">
@@ -749,7 +744,7 @@
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
-		<targetType>SELF</targetType>
+		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="MaxMp">
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01100-01199.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01100-01199.xml
index c427e86ed8..86241743f5 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01100-01199.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01100-01199.xml
@@ -1763,36 +1763,36 @@
 			<value level="30">90</value>
 		</magicLevel>
 		<mpConsume>
-			<value level="1">19</value>
-			<value level="2">22</value>
-			<value level="3">24</value>
-			<value level="4">28</value>
-			<value level="5">29</value>
-			<value level="6">31</value>
-			<value level="7">32</value>
-			<value level="8">33</value>
-			<value level="9">35</value>
-			<value level="10">36</value>
-			<value level="11">37</value>
-			<value level="12">38</value>
-			<value level="13">40</value>
-			<value level="14">43</value>
-			<value level="15">45</value>
-			<value level="16">61</value>
-			<value level="17">64</value>
-			<value level="18">67</value>
-			<value level="19">70</value>
-			<value level="20">73</value>
-			<value level="21">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="22">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="1">33</value>
+			<value level="2">35</value>
+			<value level="3">37</value>
+			<value level="4">39</value>
+			<value level="5">41</value>
+			<value level="6">42</value>
+			<value level="7">45</value>
+			<value level="8">46</value>
+			<value level="9">47</value>
+			<value level="10">49</value>
+			<value level="11">50</value>
+			<value level="12">51</value>
+			<value level="13">53</value>
+			<value level="14">54</value>
+			<value level="15">55</value>
+			<value level="16">56</value>
+			<value level="17">57</value>
+			<value level="18">58</value>
+			<value level="19">58</value>
+			<value level="20">59</value>
+			<value level="21">59</value>
+			<value level="22">60</value>
+			<value level="23">60</value>
+			<value level="24">62</value>
+			<value level="25">62</value>
+			<value level="26">63</value>
+			<value level="27">63</value>
+			<value level="28">64</value>
+			<value level="29">64</value>
+			<value level="30">65</value>
 		</mpConsume>
 		<mpInitialConsume>
 			<value level="1">4</value>
@@ -1815,16 +1815,16 @@
 			<value level="18">11</value>
 			<value level="19">12</value>
 			<value level="20">12</value>
-			<value level="21">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="22">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="21">12</value>
+			<value level="22">12</value>
+			<value level="23">12</value>
+			<value level="24">13</value>
+			<value level="25">13</value>
+			<value level="26">13</value>
+			<value level="27">13</value>
+			<value level="28">13</value>
+			<value level="29">13</value>
+			<value level="30">13</value>
 		</mpInitialConsume>
 		<operateType>A1</operateType>
 		<reuseDelay>1000</reuseDelay>
@@ -2705,7 +2705,6 @@
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<!-- FIXME: this should be "Distrust" effect -->
 			<effect name="Confuse" abnormalTime="20">
 				<chance>20</chance>
 			</effect>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01200-01299.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01200-01299.xml
index 9a95a3e5f5..057ae264c4 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01200-01299.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01200-01299.xml
@@ -1741,46 +1741,46 @@
 			<value level="40">90</value>
 		</magicLevel>
 		<mpConsume>
-			<value level="1">14</value>
-			<value level="2">16</value>
-			<value level="3">17</value>
-			<value level="4">18</value>
-			<value level="5">20</value>
-			<value level="6">21</value>
-			<value level="7">23</value>
-			<value level="8">24</value>
-			<value level="9">30</value> <!-- Guessed -->
-			<value level="10">39</value> <!-- Guessed -->
-			<value level="11">40</value> <!-- Guessed -->
-			<value level="12">42</value> <!-- Guessed -->
-			<value level="13">43</value> <!-- Guessed -->
-			<value level="14">44</value> <!-- Guessed -->
-			<value level="15">46</value> <!-- Guessed -->
-			<value level="16">48</value> <!-- Guessed -->
-			<value level="17">48</value> <!-- Guessed -->
-			<value level="18">50</value> <!-- Guessed -->
-			<value level="19">51</value> <!-- Guessed -->
-			<value level="20">52</value> <!-- Guessed -->
-			<value level="21">54</value> <!-- Guessed -->
-			<value level="22">55</value> <!-- Guessed -->
-			<value level="23">56</value> <!-- Guessed -->
-			<value level="24">58</value> <!-- Guessed -->
-			<value level="25">59</value> <!-- Guessed -->
-			<value level="26">60</value> <!-- Guessed -->
-			<value level="27">66</value> <!-- Guessed -->
-			<value level="28">67</value> <!-- Guessed -->
-			<value level="29">68</value> <!-- Guessed -->
-			<value level="30">70</value> <!-- Guessed -->
-			<value level="31">71</value> <!-- Guessed -->
-			<value level="32">72</value> <!-- Guessed -->
-			<value level="33">74</value> <!-- Guessed -->
-			<value level="34">74</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="35">74</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="36">74</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="37">74</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="38">74</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="39">74</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="40">74</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="1">18</value>
+			<value level="2">20</value>
+			<value level="3">22</value>
+			<value level="4">23</value>
+			<value level="5">26</value>
+			<value level="6">27</value>
+			<value level="7">28</value>
+			<value level="8">30</value>
+			<value level="9">33</value>
+			<value level="10">35</value>
+			<value level="11">36</value>
+			<value level="12">37</value>
+			<value level="13">38</value>
+			<value level="14">40</value>
+			<value level="15">41</value>
+			<value level="16">42</value>
+			<value level="17">44</value>
+			<value level="18">45</value>
+			<value level="19">46</value>
+			<value level="20">47</value>
+			<value level="21">49</value>
+			<value level="22">50</value>
+			<value level="23">51</value>
+			<value level="24">53</value>
+			<value level="25">54</value>
+			<value level="26">55</value>
+			<value level="27">56</value>
+			<value level="28">58</value>
+			<value level="29">58</value>
+			<value level="30">59</value>
+			<value level="31">59</value>
+			<value level="32">60</value>
+			<value level="33">60</value>
+			<value level="34">62</value>
+			<value level="35">62</value>
+			<value level="36">63</value>
+			<value level="37">63</value>
+			<value level="38">64</value>
+			<value level="39">64</value>
+			<value level="40">65</value>
 		</mpConsume>
 		<mpInitialConsume>
 			<value level="1">4</value>
@@ -1791,38 +1791,38 @@
 			<value level="6">6</value>
 			<value level="7">6</value>
 			<value level="8">6</value>
-			<value level="9">6</value> <!-- Guessed -->
-			<value level="10">6</value> <!-- Guessed -->
-			<value level="11">6</value> <!-- Guessed -->
-			<value level="12">6</value> <!-- Guessed -->
-			<value level="13">6</value> <!-- Guessed -->
-			<value level="14">6</value> <!-- Guessed -->
-			<value level="15">6</value> <!-- Guessed -->
-			<value level="16">6</value> <!-- Guessed -->
-			<value level="17">6</value> <!-- Guessed -->
-			<value level="18">6</value> <!-- Guessed -->
-			<value level="19">6</value> <!-- Guessed -->
-			<value level="20">6</value> <!-- Guessed -->
-			<value level="21">6</value> <!-- Guessed -->
-			<value level="22">6</value> <!-- Guessed -->
-			<value level="23">6</value> <!-- Guessed -->
-			<value level="24">6</value> <!-- Guessed -->
-			<value level="25">6</value> <!-- Guessed -->
-			<value level="26">6</value> <!-- Guessed -->
-			<value level="27">6</value> <!-- Guessed -->
-			<value level="28">6</value> <!-- Guessed -->
-			<value level="29">6</value> <!-- Guessed -->
-			<value level="30">6</value> <!-- Guessed -->
-			<value level="31">6</value> <!-- Guessed -->
-			<value level="32">6</value> <!-- Guessed -->
-			<value level="33">6</value> <!-- Guessed -->
-			<value level="34">6</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="35">6</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="36">6</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="37">6</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="38">6</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="39">6</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="40">6</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="9">6</value>
+			<value level="10">6</value>
+			<value level="11">6</value>
+			<value level="12">6</value>
+			<value level="13">6</value>
+			<value level="14">6</value>
+			<value level="15">6</value>
+			<value level="16">6</value>
+			<value level="17">6</value>
+			<value level="18">6</value>
+			<value level="19">6</value>
+			<value level="20">6</value>
+			<value level="21">6</value>
+			<value level="22">6</value>
+			<value level="23">6</value>
+			<value level="24">6</value>
+			<value level="25">6</value>
+			<value level="26">6</value>
+			<value level="27">6</value>
+			<value level="28">6</value>
+			<value level="29">6</value>
+			<value level="30">6</value>
+			<value level="31">6</value>
+			<value level="32">6</value>
+			<value level="33">6</value>
+			<value level="34">6</value>
+			<value level="35">6</value>
+			<value level="36">6</value>
+			<value level="37">6</value>
+			<value level="38">6</value>
+			<value level="39">6</value>
+			<value level="40">6</value>
 		</mpInitialConsume>
 		<operateType>A1</operateType>
 		<reuseDelay>1000</reuseDelay>
@@ -3108,35 +3108,35 @@
 			<value level="45">90</value>
 		</magicLevel>
 		<mpConsume>
-			<value level="1">22</value>
-			<value level="2">23</value>
-			<value level="3">26</value>
-			<value level="4">26</value>
-			<value level="5">28</value>
-			<value level="6">29</value>
-			<value level="7">30</value>
-			<value level="8">32</value>
-			<value level="9">33</value>
-			<value level="10">34</value>
-			<value level="11">35</value>
-			<value level="12">36</value>
-			<value level="13">36</value>
-			<value level="14">36</value>
-			<value level="15">38</value>
-			<value level="16">38</value>
-			<value level="17">39</value>
-			<value level="18">39</value>
-			<value level="19">39</value>
-			<value level="20">41</value>
-			<value level="21">42</value>
-			<value level="22">42</value>
-			<value level="23">42</value>
-			<value level="24">43</value>
-			<value level="25">44</value>
-			<value level="26">44</value>
-			<value level="27">45</value>
-			<value level="28">46</value>
-			<value level="29">54</value>
+			<value level="1">32</value>
+			<value level="2">33</value>
+			<value level="3">35</value>
+			<value level="4">36</value>
+			<value level="5">37</value>
+			<value level="6">38</value>
+			<value level="7">40</value>
+			<value level="8">41</value>
+			<value level="9">42</value>
+			<value level="10">42</value>
+			<value level="11">44</value>
+			<value level="12">44</value>
+			<value level="13">45</value>
+			<value level="14">45</value>
+			<value level="15">46</value>
+			<value level="16">46</value>
+			<value level="17">47</value>
+			<value level="18">48</value>
+			<value level="19">49</value>
+			<value level="20">49</value>
+			<value level="21">50</value>
+			<value level="22">50</value>
+			<value level="23">51</value>
+			<value level="24">51</value>
+			<value level="25">53</value>
+			<value level="26">53</value>
+			<value level="27">54</value>
+			<value level="28">54</value>
+			<value level="29">55</value>
 			<value level="30">55</value>
 			<value level="31">56</value>
 			<value level="32">57</value>
@@ -3144,15 +3144,15 @@
 			<value level="34">58</value>
 			<value level="35">59</value>
 			<value level="36">59</value>
-			<value level="37">60</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="38">60</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="39">62</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="40">62</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="41">63</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="42">63</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="43">64</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="44">64</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="45">65</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="37">60</value>
+			<value level="38">60</value>
+			<value level="39">62</value>
+			<value level="40">62</value>
+			<value level="41">63</value>
+			<value level="42">63</value>
+			<value level="43">64</value>
+			<value level="44">64</value>
+			<value level="45">65</value>
 		</mpConsume>
 		<mpInitialConsume>
 			<value level="1">6</value>
@@ -3191,15 +3191,15 @@
 			<value level="34">15</value>
 			<value level="35">15</value>
 			<value level="36">15</value>
-			<value level="37">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="38">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="39">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="40">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="41">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="42">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="43">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="44">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="45">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="37">15</value>
+			<value level="38">15</value>
+			<value level="39">15</value>
+			<value level="40">15</value>
+			<value level="41">15</value>
+			<value level="42">15</value>
+			<value level="43">15</value>
+			<value level="44">15</value>
+			<value level="45">15</value>
 		</mpInitialConsume>
 		<operateType>A1</operateType>
 		<reuseDelay>1200</reuseDelay>
@@ -3742,15 +3742,15 @@
 			<value level="34">25</value>
 			<value level="35">25</value>
 			<value level="36">25</value>
-			<value level="37">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="38">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="39">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="40">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="41">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="42">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="43">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="44">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="45">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="37">25</value>
+			<value level="38">25</value>
+			<value level="39">25</value>
+			<value level="40">25</value>
+			<value level="41">25</value>
+			<value level="42">25</value>
+			<value level="43">25</value>
+			<value level="44">25</value>
+			<value level="45">25</value>
 		</mpInitialConsume>
 		<operateType>A1</operateType>
 		<reuseDelay>2000</reuseDelay>
@@ -3999,15 +3999,15 @@
 			<value level="34">15</value>
 			<value level="35">15</value>
 			<value level="36">15</value>
-			<value level="37">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="38">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="39">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="40">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="41">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="42">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="43">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="44">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="45">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="37">15</value>
+			<value level="38">15</value>
+			<value level="39">15</value>
+			<value level="40">15</value>
+			<value level="41">15</value>
+			<value level="42">15</value>
+			<value level="43">15</value>
+			<value level="44">15</value>
+			<value level="45">15</value>
 		</mpInitialConsume>
 		<operateType>A1</operateType>
 		<reuseDelay>1000</reuseDelay>
@@ -4217,20 +4217,20 @@
 			<value level="19">14</value>
 			<value level="20">14</value>
 			<value level="21">15</value>
-			<value level="22">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="31">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="32">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="33">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="34">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="35">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="22">15</value>
+			<value level="23">15</value>
+			<value level="24">15</value>
+			<value level="25">15</value>
+			<value level="26">15</value>
+			<value level="27">15</value>
+			<value level="28">15</value>
+			<value level="29">16</value>
+			<value level="30">16</value>
+			<value level="31">16</value>
+			<value level="32">16</value>
+			<value level="33">16</value>
+			<value level="34">16</value>
+			<value level="35">16</value>
 		</mpInitialConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
@@ -4698,15 +4698,15 @@
 			<value level="34">15</value>
 			<value level="35">15</value>
 			<value level="36">15</value>
-			<value level="37">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="38">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="39">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="40">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="41">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="42">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="43">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="44">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="45">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="37">15</value>
+			<value level="38">15</value>
+			<value level="39">15</value>
+			<value level="40">15</value>
+			<value level="41">15</value>
+			<value level="42">16</value>
+			<value level="43">16</value>
+			<value level="44">16</value>
+			<value level="45">16</value>
 		</mpInitialConsume>
 		<operateType>A1</operateType>
 		<reuseDelay>1000</reuseDelay>
@@ -5141,10 +5141,10 @@
 					<value level="11">279</value>
 					<value level="12">286</value>
 					<value level="13">294</value>
-					<value level="14">520</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="15">520</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="16">520</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="17">520</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="14">520</value>
+					<value level="15">532</value>
+					<value level="16">539</value>
+					<value level="17">546</value>
 				</power>
 				<ticks>1</ticks>
 			</effect>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01300-01399.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01300-01399.xml
index f823c788f3..92347da129 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01300-01399.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01300-01399.xml
@@ -4363,12 +4363,23 @@
 	<skill id="1392" toLevel="4" name="Swap Defense">
 		<!-- M. Def. -$s1, P. Def. +$s2. When activated, constantly spends MP. Note! When Battle Switch, Swap Defense and Convert are used simultaneous, MP Consumption is increased according to the number of active skills. -->
 		<icon>icon.skill1392</icon>
-		<operateType>T</operateType>
+		<operateType>A2</operateType>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
-		<targetType>NONE</targetType>
+		<hitTime>1</hitTime>
+		<reuseDelay>10000</reuseDelay>
+		<coolTime>1</coolTime>
 		<abnormalType>ARMOR_HOLY</abnormalType>
-		<isMagic>1</isMagic> <!-- Magic Skill -->
+		<abnormalTime>1200</abnormalTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<isMagic>4</isMagic> <!-- Magic Skill -->
+		<mpConsume>
+			<value level="1">65</value>
+			<value level="2">75</value>
+			<value level="3">83</value>
+			<value level="4">91</value>
+		</mpConsume>
 		<abnormalLevel>
 			<value level="1">1</value>
 			<value level="2">2</value>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01500-01599.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01500-01599.xml
index ee39980591..9d5b64efdc 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01500-01599.xml
@@ -2524,10 +2524,10 @@
 			<value level="9">9</value>
 			<value level="10">10</value>
 			<value level="11">11</value>
-			<value level="12">11</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="13">11</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="14">11</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="15">11</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="12">12</value>
+			<value level="13">13</value>
+			<value level="14">14</value>
+			<value level="15">15</value>
 		</abnormalLevel>
 		<abnormalTime>30</abnormalTime>
 		<abnormalType>STIGMA_OF_SILEN</abnormalType>
@@ -2562,10 +2562,10 @@
 			<value level="9">1500</value>
 			<value level="10">1500</value>
 			<value level="11">1500</value>
-			<value level="12">1500</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="13">1500</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="14">1500</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="15">1500</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="12">1500</value>
+			<value level="13">1600</value>
+			<value level="14">1600</value>
+			<value level="15">1600</value>
 		</effectRange>
 		<hitTime>1500</hitTime>
 		<isDebuff>true</isDebuff>
@@ -2598,10 +2598,10 @@
 			<value level="9">43</value>
 			<value level="10">45</value>
 			<value level="11">47</value>
-			<value level="12">49</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="13">51</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="14">53</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="15">55</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="12">49</value>
+			<value level="13">51</value>
+			<value level="14">53</value>
+			<value level="15">55</value>
 		</mpConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>3000</reuseDelay>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01800-01899.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01800-01899.xml
index f1030e7229..dd0650ff96 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01800-01899.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/01800-01899.xml
@@ -1282,20 +1282,20 @@
 			<effect name="MagicalDefence">
 				<amount>
 					<value level="1">-10</value>
-					<value level="2">-12</value>
-					<value level="3">-14</value>
-					<value level="4">-16</value>
-					<value level="5">-17</value>
-					<value level="6">-18</value>
-					<value level="7">-19</value>
-					<value level="8">-20</value>
-					<value level="9">-21</value>
-					<value level="10">-22</value>
-					<value level="11">-23</value>
-					<value level="12">-23</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="13">-23</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="14">-23</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="15">-23</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="2">-15</value>
+					<value level="3">-15</value>
+					<value level="4">-20</value>
+					<value level="5">-20</value>
+					<value level="6">-25</value>
+					<value level="7">-25</value>
+					<value level="8">-25</value>
+					<value level="9">-25</value>
+					<value level="10">-25</value>
+					<value level="11">-30</value>
+					<value level="12">-30</value>
+					<value level="13">-30</value>
+					<value level="14">-30</value>
+					<value level="15">-30</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/02200-02299.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/02200-02299.xml
index 76e9f2a322..6ea233ace3 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/02200-02299.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/02200-02299.xml
@@ -86,7 +86,7 @@
 					<value level="12">147087</value>
 					<value level="13">82916</value>
 					<value level="14">85289</value>
-					<value level="15">85289</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="15">85289</value>
 				</x>
 				<y>
 					<value level="1">244566</value>
@@ -103,7 +103,7 @@
 					<value level="12">25751</value>
 					<value level="13">53210</value>
 					<value level="14">16225</value>
-					<value level="15">16225</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="15">16225</value>
 				</y>
 				<z>
 					<value level="1">-3728</value>
@@ -120,7 +120,7 @@
 					<value level="12">-2018</value>
 					<value level="13">-1488</value>
 					<value level="14">-3672</value>
-					<value level="15">-3672</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="15">-3672</value>
 				</z>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/03000-03099.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/03000-03099.xml
index 0433fa7c6d..0c003b1c47 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/03000-03099.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/03000-03099.xml
@@ -150,9 +150,9 @@
 			<value level="4">55</value>
 			<value level="5">58</value>
 			<value level="6">61</value>
-			<value level="7">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="8">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="9">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="7">63</value>
+			<value level="8">65</value>
+			<value level="9">67</value>
 		</magicLevel>
 		<effects>
 			<effect name="CriticalRate">
@@ -163,9 +163,9 @@
 					<value level="4">73.3</value>
 					<value level="5">68.9</value>
 					<value level="6">64.5</value>
-					<value level="7">64.5</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="8">64.5</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="9">64.5</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="7">64.5</value>
+					<value level="8">67.5</value>
+					<value level="9">69.5</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -183,7 +183,7 @@
 			<value level="4">55</value>
 			<value level="5">58</value>
 			<value level="6">61</value>
-			<value level="7">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="7">63</value>
 		</magicLevel>
 		<effects>
 			<effect name="CriticalRate">
@@ -194,7 +194,7 @@
 					<value level="4">76.6</value>
 					<value level="5">71.9</value>
 					<value level="6">67.3</value>
-					<value level="7">67.3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="7">70.3</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -325,7 +325,7 @@
 			<value level="4">29</value>
 			<value level="5">27</value>
 			<value level="6">25</value>
-			<value level="7">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="7">30</value>
 		</activateRate>
 		<basicProperty>PHYSICAL</basicProperty>
 		<effectPoint>-92</effectPoint>
@@ -338,7 +338,7 @@
 			<value level="4">55</value>
 			<value level="5">58</value>
 			<value level="6">61</value>
-			<value level="7">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="7">63</value>
 		</magicLevel>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
@@ -580,9 +580,9 @@
 			<value level="4">55</value>
 			<value level="5">58</value>
 			<value level="6">61</value>
-			<value level="7">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="8">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="9">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="7">63</value>
+			<value level="8">65</value>
+			<value level="9">67</value>
 		</magicLevel>
 		<effects>
 			<effect name="CriticalDamage">
@@ -593,9 +593,9 @@
 					<value level="4">231.29</value>
 					<value level="5">247.98</value>
 					<value level="6">262.57</value>
-					<value level="7">262.57</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="8">262.57</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="9">262.57</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="7">269.57</value>
+					<value level="8">275.57</value>
+					<value level="9">290.57</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1466,8 +1466,8 @@
 			<value level="4">55</value>
 			<value level="5">58</value>
 			<value level="6">61</value>
-			<value level="7">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="8">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="7">63</value>
+			<value level="8">65</value>
 		</magicLevel>
 		<effects>
 			<effect name="CriticalDamage">
@@ -1478,8 +1478,8 @@
 					<value level="4">140.87</value>
 					<value level="5">151.04</value>
 					<value level="6">159.93</value>
-					<value level="7">159.93</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="8">159.93</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="7">169.93</value>
+					<value level="8">189.93</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -2352,9 +2352,9 @@
 			<value level="4">55</value>
 			<value level="5">28</value>
 			<value level="6">61</value>
-			<value level="7">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="8">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="9">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="7">63</value>
+			<value level="8">65</value>
+			<value level="9">67</value>
 		</magicLevel>
 		<effects>
 			<effect name="MAtk">
@@ -2365,9 +2365,9 @@
 					<value level="4">26.53</value>
 					<value level="5">28.27</value>
 					<value level="6">29.7</value>
-					<value level="7">29.7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="8">29.7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="9">29.7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="7">30.7</value>
+					<value level="8">32.7</value>
+					<value level="9">34.7</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/03500-03599.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/03500-03599.xml
index 66a9ac7072..20e9a5513b 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/03500-03599.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/03500-03599.xml
@@ -1149,9 +1149,9 @@
 			<value level="4">55</value>
 			<value level="5">58</value>
 			<value level="6">61</value>
-			<value level="7">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="8">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="9">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="7">63</value>
+			<value level="8">65</value>
+			<value level="9">67</value>
 		</magicLevel>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -1164,9 +1164,9 @@
 					<value level="4">269.91</value>
 					<value level="5">289.4</value>
 					<value level="6">306.42</value>
-					<value level="7">306.42</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="8">306.42</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="9">306.42</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="7">309.2</value>
+					<value level="8">312.56</value>
+					<value level="9">316.65</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/04000-04099.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/04000-04099.xml
index 95edd71aeb..a4ef53a240 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/04000-04099.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/04000-04099.xml
@@ -641,7 +641,7 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 			<value level="3">3</value>
-			<value level="4">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="4">4</value>
 		</abnormalLevel>
 		<abnormalTime>300</abnormalTime>
 		<abnormalType>PD_UP</abnormalType>
@@ -654,7 +654,7 @@
 			<value level="1">20</value>
 			<value level="2">40</value>
 			<value level="3">70</value>
-			<value level="4">70</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="4">76</value>
 		</magicLevel>
 		<mpConsume>
 			<value level="1">10</value>
@@ -674,7 +674,7 @@
 					<value level="1">8</value>
 					<value level="2">12</value>
 					<value level="3">15</value>
-					<value level="4">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="4">30</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
@@ -1353,7 +1353,6 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<effects>
-			<!-- TODO p_abnormal_rate_limit -->
 			<effect name="DefenceTrait">
 				<HOLD>100</HOLD>
 				<DERANGEMENT>100</DERANGEMENT>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/04200-04299.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/04200-04299.xml
index 1491bd8da6..cadef5ac98 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/04200-04299.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/04200-04299.xml
@@ -3219,8 +3219,8 @@
 					<value level="3">30</value>
 					<value level="4">40</value>
 					<value level="5">50</value>
-					<value level="6">50</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="7">50</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="6">60</value>
+					<value level="7">70</value>
 				</HOLD>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/04400-04499.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/04400-04499.xml
index 5f0bfe4c77..266a383d71 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/04400-04499.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/04400-04499.xml
@@ -746,7 +746,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<effects>
-			<effect name="DefenceTrait"> <!-- TODO: Verify me! -->
+			<effect name="DefenceTrait">
 				<CONSTRUCT_WEAKNESS>
 					<value level="1">0</value>
 					<value level="2">-15</value>
@@ -1132,7 +1132,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<effects>
-			<effect name="DefenceTrait"> <!-- TODO: Verify me! -->
+			<effect name="DefenceTrait">
 				<BOW>
 					<value level="1">0</value>
 					<value level="2">0</value>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/05100-05199.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/05100-05199.xml
index 200e6786f0..afc56eeb35 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/05100-05199.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/05100-05199.xml
@@ -2578,8 +2578,11 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="BlockControl" />
-			<effect name="Fear" />
-			<!-- FIXME: We need an instant effect that will work only vs monsters and fear them with 40% chance for 20 seconds here -->
+			<effect name="Fear">
+				<targetType>ENEMY_ONLY</targetType>
+				<chance>40</chance>
+				<time>20</time>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="5174" toLevel="15" name="Poison">
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/05800-05899.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/05800-05899.xml
index f5e6e4c41a..0c5f40334d 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/05800-05899.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/05800-05899.xml
@@ -2425,7 +2425,6 @@
 	<skill id="5895" toLevel="1" name="Mark of Cowardice">
 		<!-- Significantly decreases Max HP, P./ M. Def. and P. Evasion. The use of attack and skills, HP Recovery Bonus are limited, but Speed is slightly increased. -->
 		<icon>icon.skill1337</icon>
-	<!-- TODO JEY -->
 		<abnormalLevel>1</abnormalLevel>
 		<abnormalTime>10</abnormalTime>
 		<abnormalType>MULTI_DEBUFF_B</abnormalType>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/05900-05999.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/05900-05999.xml
index be26335419..ede55f9644 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/05900-05999.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/05900-05999.xml
@@ -287,8 +287,7 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="PhysicalAttack">
-				<!-- FIXME: value unconfirmed -->
-				<power>3000</power>
+				<power>3100</power>
 			</effect>
 		</effects>
 	</skill>
@@ -305,8 +304,7 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="PhysicalAttack">
-				<!-- FIXME: value unconfirmed -->
-				<power>5000</power>
+				<power>5200</power>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06300-06399.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06300-06399.xml
index cf49c7cfad..c39c56e925 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06300-06399.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06300-06399.xml
@@ -477,7 +477,6 @@
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<!-- FIXME: Aura Friendly ? -->
 		<targetType>SELF</targetType>
 		<affectScope>RANGE</affectScope>
 		<affectObject>FRIEND</affectObject>
@@ -506,7 +505,6 @@
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<!-- FIXME: Aura Friendly ? -->
 		<targetType>SELF</targetType>
 		<affectScope>RANGE</affectScope>
 		<affectObject>FRIEND</affectObject>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06600-06699.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06600-06699.xml
index a1671f21a0..412284f1b8 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06600-06699.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06600-06699.xml
@@ -3328,11 +3328,14 @@
 		<affectScope>RANGE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<effects>
-			<!-- TODO i_hp_drain 131 40 -->
 			<effect name="Mp">
 				<amount>-491</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="Hp">
+				<amount>-131</amount>
+				<mode>DIFF</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="6690" toLevel="1" name="Hold">
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06700-06799.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06700-06799.xml
index 360c19abf4..0bb762745e 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06700-06799.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06700-06799.xml
@@ -63,7 +63,7 @@
 		<abnormalLevel>3</abnormalLevel>
 		<abnormalTime>10</abnormalTime>
 		<abnormalType>PD_DOWN</abnormalType>
-		<activateRate>80</activateRate> <!-- FIXME: Base Land Rate unconformed -->
+		<activateRate>70</activateRate>
 		<castRange>100</castRange>
 		<effectRange>200</effectRange>
 		<isDebuff>true</isDebuff>
@@ -80,7 +80,6 @@
 		<affectScope>SQUARE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<effects>
-			<!-- FIXME: Time value is unconfirmed -->
 			<effect name="PhysicalDefence">
 				<amount>-23</amount>
 				<mode>PER</mode>
@@ -1751,7 +1750,7 @@
 		<!-- Paralyzed. -->
 		<icon>icon.skill1170</icon>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>10</abnormalTime> <!-- FIXME: value unconfirmed -->
+		<abnormalTime>10</abnormalTime>
 		<abnormalType>PARALYZE</abnormalType>
 		<isDebuff>true</isDebuff>
 		<isMagic>2</isMagic> <!-- Static Skill -->
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06800-06899.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06800-06899.xml
index 2ab35692f6..54b446585f 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06800-06899.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06800-06899.xml
@@ -326,7 +326,7 @@
 			<value level="7">70</value>
 			<value level="8">79</value>
 		</magicLevel>
-		<operateType>A1</operateType> <!-- FIXME: value unconfirmed -->
+		<operateType>A1</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
@@ -380,7 +380,7 @@
 			<value level="7">72</value>
 			<value level="8">79</value>
 		</magicLevel>
-		<operateType>A1</operateType> <!-- FIXME: value unconfirmed -->
+		<operateType>A1</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06900-06999.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06900-06999.xml
index 3a58c10497..44b3e77af5 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06900-06999.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/06900-06999.xml
@@ -239,7 +239,7 @@
 		<blockedInOlympiad>false</blockedInOlympiad>
 		<isTriggeredSkill>true</isTriggeredSkill>
 		<magicLevel>0</magicLevel>
-		<operateType>A2</operateType> <!-- FIXME: value unconfirmed -->
+		<operateType>A2</operateType>
 		<abnormalType>PATIENCE</abnormalType>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>-5</magicCriticalRate>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/18000-18099.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/18000-18099.xml
index 9bc5dfb51a..077c93ac8a 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/18000-18099.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/18000-18099.xml
@@ -207,7 +207,13 @@
 				</amount>
 				<chance>30</chance>
 			</effect>
-			<!-- TODO: Vampiric attack for MP -->
+			<effect name="MpVampiricAttack">
+				<amount>
+					<value fromLevel="1" toLevel="25">0</value>
+					<value level="26">16</value>
+				</amount>
+				<chance>30</chance>
+			</effect>
 		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/45200-45299.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/45200-45299.xml
index 309904e760..29791c52d5 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/45200-45299.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/45200-45299.xml
@@ -1792,11 +1792,22 @@
 	</skill>
 	<skill id="45237" toLevel="4" name="Swap Attack">
 		<!-- M. Atk. -$s1, P. Atk. +$s2. When activated, constantly spends MP. Note! When Battle Switch, Swap Defense and Convert are used simultaneous, MP Consumption is increased according to the number of active skills. -->
+		<operateType>A2</operateType>
 		<magicLevel>78</magicLevel>
-		<mpConsume>36</mpConsume>
-		<operateType>T</operateType>
+		<mpConsume>
+			<value level="1">65</value>
+			<value level="2">75</value>
+			<value level="3">83</value>
+			<value level="4">91</value>
+		</mpConsume>
+		<abnormalTime>1200</abnormalTime>
 		<magicCriticalRate>5</magicCriticalRate>
-		<targetType>NONE</targetType>
+		<hitTime>1</hitTime>
+		<reuseDelay>10000</reuseDelay>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<abnormalTime>1200</abnormalTime>
+		<isMagic>4</isMagic>
 		<effects>
 			<effect name="MpConsumePerLevel">
 				<power>1</power>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00000-00099.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00000-00099.xml
index a53f48620b..3ce57bebc6 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00000-00099.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00000-00099.xml
@@ -370,41 +370,41 @@
 			<value level="35">75</value>
 		</mpConsume>
 		<mpInitialConsume>
-			<value level="1">3</value>
-			<value level="2">3</value>
-			<value level="3">3</value>
-			<value level="4">4</value>
-			<value level="5">4</value>
-			<value level="6">4</value>
-			<value level="7">5</value>
-			<value level="8">5</value>
-			<value level="9">5</value>
-			<value level="10">5</value>
-			<value level="11">6</value>
-			<value level="12">6</value>
-			<value level="13">6</value>
-			<value level="14">6</value>
-			<value level="15">7</value>
-			<value level="16">7</value>
-			<value level="17">7</value>
-			<value level="18">7</value>
-			<value level="19">7</value>
-			<value level="20">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="21">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="22">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="31">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="32">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="33">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="34">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="35">7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="1">57</value>
+			<value level="2">58</value>
+			<value level="3">58</value>
+			<value level="4">60</value>
+			<value level="5">61</value>
+			<value level="6">63</value>
+			<value level="7">63</value>
+			<value level="8">64</value>
+			<value level="9">66</value>
+			<value level="10">67</value>
+			<value level="11">67</value>
+			<value level="12">69</value>
+			<value level="13">70</value>
+			<value level="14">72</value>
+			<value level="15">72</value>
+			<value level="16">73</value>
+			<value level="17">75</value>
+			<value level="18">76</value>
+			<value level="19">76</value>
+			<value level="20">78</value>
+			<value level="21">79</value>
+			<value level="22">81</value>
+			<value level="23">81</value>
+			<value level="24">82</value>
+			<value level="25">84</value>
+			<value level="26">85</value>
+			<value level="27">85</value>
+			<value level="28">87</value>
+			<value level="29">90</value>
+			<value level="30">90</value>
+			<value level="31">91</value>
+			<value level="32">91</value>
+			<value level="33">91</value>
+			<value level="34">91</value>
+			<value level="35">91</value>
 		</mpInitialConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>5000</reuseDelay>
@@ -7134,18 +7134,18 @@
 			<value level="26">3</value>
 			<value level="27">3</value>
 			<value level="28">3</value>
-			<value level="29">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="31">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="32">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="33">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="34">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="35">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="36">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="37">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="38">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="39">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="40">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="29">3</value>
+			<value level="30">4</value>
+			<value level="31">4</value>
+			<value level="32">4</value>
+			<value level="33">4</value>
+			<value level="34">4</value>
+			<value level="35">4</value>
+			<value level="36">4</value>
+			<value level="37">4</value>
+			<value level="38">4</value>
+			<value level="39">4</value>
+			<value level="40">4</value>
 		</abnormalLevel>
 		<abnormalTime>20</abnormalTime>
 		<abnormalType>SPEED_DOWN</abnormalType>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00100-00199.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00100-00199.xml
index bb0934d6f9..a96fc358db 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00100-00199.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00100-00199.xml
@@ -340,18 +340,18 @@
 			<value level="16">3</value>
 			<value level="17">3</value>
 			<value level="18">3</value>
-			<value level="19">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="20">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="21">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="22">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="19">4</value>
+			<value level="20">4</value>
+			<value level="21">4</value>
+			<value level="22">4</value>
+			<value level="23">4</value>
+			<value level="24">4</value>
+			<value level="25">4</value>
+			<value level="26">4</value>
+			<value level="27">4</value>
+			<value level="28">4</value>
+			<value level="29">4</value>
+			<value level="30">4</value>
 		</abnormalLevel>
 		<abnormalTime>3</abnormalTime>
 		<abnormalType>SPEED_DOWN</abnormalType>
@@ -1035,17 +1035,17 @@
 			<value level="17">3</value>
 			<value level="18">3</value>
 			<value level="19">3</value>
-			<value level="20">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="21">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="22">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="20">4</value>
+			<value level="21">4</value>
+			<value level="22">4</value>
+			<value level="23">4</value>
+			<value level="24">4</value>
+			<value level="25">4</value>
+			<value level="26">4</value>
+			<value level="27">4</value>
+			<value level="28">4</value>
+			<value level="29">4</value>
+			<value level="30">4</value>
 		</abnormalLevel>
 		<abnormalTime>30</abnormalTime>
 		<abnormalType>PA_DOWN</abnormalType>
@@ -1173,17 +1173,17 @@
 			<value level="17">7</value>
 			<value level="18">8</value>
 			<value level="19">8</value>
-			<value level="20">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="21">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="22">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">8</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="20">9</value>
+			<value level="21">9</value>
+			<value level="22">9</value>
+			<value level="23">9</value>
+			<value level="24">9</value>
+			<value level="25">9</value>
+			<value level="26">10</value>
+			<value level="27">10</value>
+			<value level="28">10</value>
+			<value level="29">10</value>
+			<value level="30">10</value>
 		</mpInitialConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>2000</reuseDelay>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00300-00399.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00300-00399.xml
index d192bc0513..6609ae1634 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00300-00399.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00300-00399.xml
@@ -458,7 +458,7 @@
 			<value level="7">7</value>
 			<value level="8">8</value>
 			<value level="9">9</value>
-			<value level="10">9</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="10">9</value>
 		</abnormalLevel>
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>SNIPE</abnormalType>
@@ -1069,7 +1069,6 @@
 				<chance>80</chance>
 			</effect>
 		</effects>
-		<!-- TODO : Move to effects after A3 skills rework -->
 		<selfEffects>
 			<effect name="Speed">
 				<amount>40</amount>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00400-00499.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00400-00499.xml
index e0c7f213e0..70362eb7ab 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00400-00499.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00400-00499.xml
@@ -24,16 +24,16 @@
 			<value level="18">4</value>
 			<value level="19">4</value>
 			<value level="20">4</value>
-			<value level="21">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="22">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="21">5</value>
+			<value level="22">5</value>
+			<value level="23">5</value>
+			<value level="24">5</value>
+			<value level="25">5</value>
+			<value level="26">5</value>
+			<value level="27">5</value>
+			<value level="28">5</value>
+			<value level="29">5</value>
+			<value level="30">5</value>
 		</abnormalLevel>
 		<abnormalTime>30</abnormalTime>
 		<abnormalType>CRITICAL_PROB_DOWN</abnormalType>
@@ -258,16 +258,16 @@
 			<value level="18">4</value>
 			<value level="19">4</value>
 			<value level="20">4</value>
-			<value level="21">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="22">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">4</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="21">5</value>
+			<value level="22">5</value>
+			<value level="23">5</value>
+			<value level="24">5</value>
+			<value level="25">5</value>
+			<value level="26">5</value>
+			<value level="27">5</value>
+			<value level="28">5</value>
+			<value level="29">5</value>
+			<value level="30">5</value>
 		</abnormalLevel>
 		<abnormalTime>30</abnormalTime>
 		<abnormalType>CRITICAL_DMG_DOWN</abnormalType>
@@ -1496,7 +1496,7 @@
 			<value level="7">7</value>
 			<value level="8">8</value>
 			<value level="9">9</value>
-			<value level="10">9</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="10">10</value>
 		</abnormalLevel>
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>SNIPE</abnormalType>
@@ -1579,7 +1579,6 @@
 			<value level="7">7</value>
 			<value level="8">8</value>
 			<value level="9">9</value>
-			<value level="10">9</value> <!-- FIXME: AUTO GENERATED LEVEL -->
 		</abnormalLevel>
 		<abnormalTime>1200</abnormalTime>
 		<abnormalType>SNIPE</abnormalType>
@@ -4376,7 +4375,6 @@
 		<mpConsume>53</mpConsume>
 		<operateType>A1</operateType>
 		<reuseDelay>5000</reuseDelay>
-		<!-- FIXME: should be AREA -->
 		<magicCriticalRate>5</magicCriticalRate>
 		<trait>DERANGEMENT</trait>
 		<targetType>TARGET</targetType>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00900-00999.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00900-00999.xml
index 640c3e7f21..3df099da18 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00900-00999.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/00900-00999.xml
@@ -3626,7 +3626,7 @@
 		<magicLevel>85</magicLevel>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
-		<!-- TODO: Implement and use proper effects. -->
+		<!-- not sylph skill -->
 	</skill>
 	<skill id="968" toLevel="1" name="Treykan Claw">
 		<!-- Attack targets with 6960 Power added to P. Atk. -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01000-01099.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01000-01099.xml
index 6d517e1187..c5ca0011d9 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01000-01099.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01000-01099.xml
@@ -150,8 +150,7 @@
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="MagicalAttackSpeed">
 				<amount>
@@ -220,8 +219,7 @@
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PLEDGE</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="Reuse">
 				<amount>
@@ -309,15 +307,14 @@
 			<value level="1">3</value>
 			<value level="2">20</value>
 			<value level="3">40</value>
-			<value level="4">95</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="4">76</value>
 		</magicLevel>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="PAtk">
 				<amount>
@@ -366,8 +363,7 @@
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PLEDGE</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="MagicalDefence">
 				<amount>
@@ -405,15 +401,14 @@
 			<value level="1">2</value>
 			<value level="2">20</value>
 			<value level="3">40</value>
-			<value level="4">95</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="4">76</value>
 		</magicLevel>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
 		<targetType>SELF</targetType>
-		<affectScope>PARTY</affectScope>
-		<affectObject>FRIEND</affectObject>
+		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="PhysicalDefence">
 				<amount>
@@ -602,7 +597,7 @@
 		<operateType>A1</operateType>
 		<reuseDelay>4000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
-		<targetType>TARGET</targetType>
+		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="DispelBySlot">
@@ -749,7 +744,7 @@
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<magicCriticalRate>5</magicCriticalRate>
-		<targetType>SELF</targetType>
+		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="MaxMp">
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01100-01199.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01100-01199.xml
index a5f87cc5d4..44eeec3d11 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01100-01199.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01100-01199.xml
@@ -1763,36 +1763,36 @@
 			<value level="30">90</value>
 		</magicLevel>
 		<mpConsume>
-			<value level="1">19</value>
-			<value level="2">22</value>
-			<value level="3">24</value>
-			<value level="4">28</value>
-			<value level="5">29</value>
-			<value level="6">31</value>
-			<value level="7">32</value>
-			<value level="8">33</value>
-			<value level="9">35</value>
-			<value level="10">36</value>
-			<value level="11">37</value>
-			<value level="12">38</value>
-			<value level="13">40</value>
-			<value level="14">43</value>
-			<value level="15">45</value>
-			<value level="16">61</value>
-			<value level="17">64</value>
-			<value level="18">67</value>
-			<value level="19">70</value>
-			<value level="20">73</value>
-			<value level="21">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="22">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">73</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="1">33</value>
+			<value level="2">35</value>
+			<value level="3">37</value>
+			<value level="4">39</value>
+			<value level="5">41</value>
+			<value level="6">42</value>
+			<value level="7">45</value>
+			<value level="8">46</value>
+			<value level="9">47</value>
+			<value level="10">49</value>
+			<value level="11">50</value>
+			<value level="12">51</value>
+			<value level="13">53</value>
+			<value level="14">54</value>
+			<value level="15">55</value>
+			<value level="16">56</value>
+			<value level="17">57</value>
+			<value level="18">58</value>
+			<value level="19">58</value>
+			<value level="20">59</value>
+			<value level="21">59</value>
+			<value level="22">60</value>
+			<value level="23">60</value>
+			<value level="24">62</value>
+			<value level="25">62</value>
+			<value level="26">63</value>
+			<value level="27">63</value>
+			<value level="28">64</value>
+			<value level="29">64</value>
+			<value level="30">65</value>
 		</mpConsume>
 		<mpInitialConsume>
 			<value level="1">4</value>
@@ -1815,16 +1815,16 @@
 			<value level="18">11</value>
 			<value level="19">12</value>
 			<value level="20">12</value>
-			<value level="21">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="22">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">12</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="21">12</value>
+			<value level="22">12</value>
+			<value level="23">12</value>
+			<value level="24">13</value>
+			<value level="25">13</value>
+			<value level="26">13</value>
+			<value level="27">13</value>
+			<value level="28">13</value>
+			<value level="29">13</value>
+			<value level="30">13</value>
 		</mpInitialConsume>
 		<operateType>A1</operateType>
 		<reuseDelay>1000</reuseDelay>
@@ -2705,7 +2705,6 @@
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<!-- FIXME: this should be "Distrust" effect -->
 			<effect name="Confuse" abnormalTime="20">
 				<chance>20</chance>
 			</effect>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01200-01299.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01200-01299.xml
index 5bd2ef1a23..5e7bbf6e63 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01200-01299.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01200-01299.xml
@@ -1741,46 +1741,46 @@
 			<value level="40">90</value>
 		</magicLevel>
 		<mpConsume>
-			<value level="1">14</value>
-			<value level="2">16</value>
-			<value level="3">17</value>
-			<value level="4">18</value>
-			<value level="5">20</value>
-			<value level="6">21</value>
-			<value level="7">23</value>
-			<value level="8">24</value>
-			<value level="9">30</value> <!-- Guessed -->
-			<value level="10">39</value> <!-- Guessed -->
-			<value level="11">40</value> <!-- Guessed -->
-			<value level="12">42</value> <!-- Guessed -->
-			<value level="13">43</value> <!-- Guessed -->
-			<value level="14">44</value> <!-- Guessed -->
-			<value level="15">46</value> <!-- Guessed -->
-			<value level="16">48</value> <!-- Guessed -->
-			<value level="17">48</value> <!-- Guessed -->
-			<value level="18">50</value> <!-- Guessed -->
-			<value level="19">51</value> <!-- Guessed -->
-			<value level="20">52</value> <!-- Guessed -->
-			<value level="21">54</value> <!-- Guessed -->
-			<value level="22">55</value> <!-- Guessed -->
-			<value level="23">56</value> <!-- Guessed -->
-			<value level="24">58</value> <!-- Guessed -->
-			<value level="25">59</value> <!-- Guessed -->
-			<value level="26">60</value> <!-- Guessed -->
-			<value level="27">66</value> <!-- Guessed -->
-			<value level="28">67</value> <!-- Guessed -->
-			<value level="29">68</value> <!-- Guessed -->
-			<value level="30">70</value> <!-- Guessed -->
-			<value level="31">71</value> <!-- Guessed -->
-			<value level="32">72</value> <!-- Guessed -->
-			<value level="33">74</value> <!-- Guessed -->
-			<value level="34">74</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="35">74</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="36">74</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="37">74</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="38">74</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="39">74</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="40">74</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="1">18</value>
+			<value level="2">20</value>
+			<value level="3">22</value>
+			<value level="4">23</value>
+			<value level="5">26</value>
+			<value level="6">27</value>
+			<value level="7">28</value>
+			<value level="8">30</value>
+			<value level="9">33</value>
+			<value level="10">35</value>
+			<value level="11">36</value>
+			<value level="12">37</value>
+			<value level="13">38</value>
+			<value level="14">40</value>
+			<value level="15">41</value>
+			<value level="16">42</value>
+			<value level="17">44</value>
+			<value level="18">45</value>
+			<value level="19">46</value>
+			<value level="20">47</value>
+			<value level="21">49</value>
+			<value level="22">50</value>
+			<value level="23">51</value>
+			<value level="24">53</value>
+			<value level="25">54</value>
+			<value level="26">55</value>
+			<value level="27">56</value>
+			<value level="28">58</value>
+			<value level="29">58</value>
+			<value level="30">59</value>
+			<value level="31">59</value>
+			<value level="32">60</value>
+			<value level="33">60</value>
+			<value level="34">62</value>
+			<value level="35">62</value>
+			<value level="36">63</value>
+			<value level="37">63</value>
+			<value level="38">64</value>
+			<value level="39">64</value>
+			<value level="40">65</value>
 		</mpConsume>
 		<mpInitialConsume>
 			<value level="1">4</value>
@@ -1791,38 +1791,38 @@
 			<value level="6">6</value>
 			<value level="7">6</value>
 			<value level="8">6</value>
-			<value level="9">6</value> <!-- Guessed -->
-			<value level="10">6</value> <!-- Guessed -->
-			<value level="11">6</value> <!-- Guessed -->
-			<value level="12">6</value> <!-- Guessed -->
-			<value level="13">6</value> <!-- Guessed -->
-			<value level="14">6</value> <!-- Guessed -->
-			<value level="15">6</value> <!-- Guessed -->
-			<value level="16">6</value> <!-- Guessed -->
-			<value level="17">6</value> <!-- Guessed -->
-			<value level="18">6</value> <!-- Guessed -->
-			<value level="19">6</value> <!-- Guessed -->
-			<value level="20">6</value> <!-- Guessed -->
-			<value level="21">6</value> <!-- Guessed -->
-			<value level="22">6</value> <!-- Guessed -->
-			<value level="23">6</value> <!-- Guessed -->
-			<value level="24">6</value> <!-- Guessed -->
-			<value level="25">6</value> <!-- Guessed -->
-			<value level="26">6</value> <!-- Guessed -->
-			<value level="27">6</value> <!-- Guessed -->
-			<value level="28">6</value> <!-- Guessed -->
-			<value level="29">6</value> <!-- Guessed -->
-			<value level="30">6</value> <!-- Guessed -->
-			<value level="31">6</value> <!-- Guessed -->
-			<value level="32">6</value> <!-- Guessed -->
-			<value level="33">6</value> <!-- Guessed -->
-			<value level="34">6</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="35">6</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="36">6</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="37">6</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="38">6</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="39">6</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="40">6</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="9">6</value>
+			<value level="10">6</value>
+			<value level="11">6</value>
+			<value level="12">6</value>
+			<value level="13">6</value>
+			<value level="14">6</value>
+			<value level="15">6</value>
+			<value level="16">6</value>
+			<value level="17">6</value>
+			<value level="18">6</value>
+			<value level="19">6</value>
+			<value level="20">6</value>
+			<value level="21">6</value>
+			<value level="22">6</value>
+			<value level="23">6</value>
+			<value level="24">6</value>
+			<value level="25">6</value>
+			<value level="26">6</value>
+			<value level="27">6</value>
+			<value level="28">6</value>
+			<value level="29">6</value>
+			<value level="30">6</value>
+			<value level="31">6</value>
+			<value level="32">6</value>
+			<value level="33">6</value>
+			<value level="34">6</value>
+			<value level="35">6</value>
+			<value level="36">6</value>
+			<value level="37">6</value>
+			<value level="38">6</value>
+			<value level="39">6</value>
+			<value level="40">6</value>
 		</mpInitialConsume>
 		<operateType>A1</operateType>
 		<reuseDelay>1000</reuseDelay>
@@ -3108,35 +3108,35 @@
 			<value level="45">90</value>
 		</magicLevel>
 		<mpConsume>
-			<value level="1">22</value>
-			<value level="2">23</value>
-			<value level="3">26</value>
-			<value level="4">26</value>
-			<value level="5">28</value>
-			<value level="6">29</value>
-			<value level="7">30</value>
-			<value level="8">32</value>
-			<value level="9">33</value>
-			<value level="10">34</value>
-			<value level="11">35</value>
-			<value level="12">36</value>
-			<value level="13">36</value>
-			<value level="14">36</value>
-			<value level="15">38</value>
-			<value level="16">38</value>
-			<value level="17">39</value>
-			<value level="18">39</value>
-			<value level="19">39</value>
-			<value level="20">41</value>
-			<value level="21">42</value>
-			<value level="22">42</value>
-			<value level="23">42</value>
-			<value level="24">43</value>
-			<value level="25">44</value>
-			<value level="26">44</value>
-			<value level="27">45</value>
-			<value level="28">46</value>
-			<value level="29">54</value>
+			<value level="1">32</value>
+			<value level="2">33</value>
+			<value level="3">35</value>
+			<value level="4">36</value>
+			<value level="5">37</value>
+			<value level="6">38</value>
+			<value level="7">40</value>
+			<value level="8">41</value>
+			<value level="9">42</value>
+			<value level="10">42</value>
+			<value level="11">44</value>
+			<value level="12">44</value>
+			<value level="13">45</value>
+			<value level="14">45</value>
+			<value level="15">46</value>
+			<value level="16">46</value>
+			<value level="17">47</value>
+			<value level="18">48</value>
+			<value level="19">49</value>
+			<value level="20">49</value>
+			<value level="21">50</value>
+			<value level="22">50</value>
+			<value level="23">51</value>
+			<value level="24">51</value>
+			<value level="25">53</value>
+			<value level="26">53</value>
+			<value level="27">54</value>
+			<value level="28">54</value>
+			<value level="29">55</value>
 			<value level="30">55</value>
 			<value level="31">56</value>
 			<value level="32">57</value>
@@ -3144,15 +3144,15 @@
 			<value level="34">58</value>
 			<value level="35">59</value>
 			<value level="36">59</value>
-			<value level="37">60</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="38">60</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="39">62</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="40">62</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="41">63</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="42">63</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="43">64</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="44">64</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="45">65</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="37">60</value>
+			<value level="38">60</value>
+			<value level="39">62</value>
+			<value level="40">62</value>
+			<value level="41">63</value>
+			<value level="42">63</value>
+			<value level="43">64</value>
+			<value level="44">64</value>
+			<value level="45">65</value>
 		</mpConsume>
 		<mpInitialConsume>
 			<value level="1">6</value>
@@ -3191,15 +3191,15 @@
 			<value level="34">15</value>
 			<value level="35">15</value>
 			<value level="36">15</value>
-			<value level="37">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="38">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="39">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="40">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="41">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="42">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="43">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="44">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="45">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="37">15</value>
+			<value level="38">15</value>
+			<value level="39">15</value>
+			<value level="40">15</value>
+			<value level="41">15</value>
+			<value level="42">15</value>
+			<value level="43">15</value>
+			<value level="44">15</value>
+			<value level="45">15</value>
 		</mpInitialConsume>
 		<operateType>A1</operateType>
 		<reuseDelay>1200</reuseDelay>
@@ -3742,15 +3742,15 @@
 			<value level="34">25</value>
 			<value level="35">25</value>
 			<value level="36">25</value>
-			<value level="37">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="38">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="39">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="40">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="41">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="42">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="43">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="44">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="45">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="37">25</value>
+			<value level="38">25</value>
+			<value level="39">25</value>
+			<value level="40">25</value>
+			<value level="41">25</value>
+			<value level="42">25</value>
+			<value level="43">25</value>
+			<value level="44">25</value>
+			<value level="45">25</value>
 		</mpInitialConsume>
 		<operateType>A1</operateType>
 		<reuseDelay>2000</reuseDelay>
@@ -3999,15 +3999,15 @@
 			<value level="34">15</value>
 			<value level="35">15</value>
 			<value level="36">15</value>
-			<value level="37">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="38">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="39">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="40">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="41">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="42">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="43">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="44">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="45">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="37">15</value>
+			<value level="38">15</value>
+			<value level="39">15</value>
+			<value level="40">15</value>
+			<value level="41">15</value>
+			<value level="42">15</value>
+			<value level="43">15</value>
+			<value level="44">15</value>
+			<value level="45">15</value>
 		</mpInitialConsume>
 		<operateType>A1</operateType>
 		<reuseDelay>1000</reuseDelay>
@@ -4217,20 +4217,20 @@
 			<value level="19">14</value>
 			<value level="20">14</value>
 			<value level="21">15</value>
-			<value level="22">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="23">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="24">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="25">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="26">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="27">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="28">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="29">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="30">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="31">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="32">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="33">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="34">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="35">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="22">15</value>
+			<value level="23">15</value>
+			<value level="24">15</value>
+			<value level="25">15</value>
+			<value level="26">15</value>
+			<value level="27">15</value>
+			<value level="28">15</value>
+			<value level="29">16</value>
+			<value level="30">16</value>
+			<value level="31">16</value>
+			<value level="32">16</value>
+			<value level="33">16</value>
+			<value level="34">16</value>
+			<value level="35">16</value>
 		</mpInitialConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
@@ -4698,15 +4698,15 @@
 			<value level="34">15</value>
 			<value level="35">15</value>
 			<value level="36">15</value>
-			<value level="37">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="38">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="39">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="40">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="41">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="42">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="43">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="44">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="45">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="37">15</value>
+			<value level="38">15</value>
+			<value level="39">15</value>
+			<value level="40">15</value>
+			<value level="41">15</value>
+			<value level="42">16</value>
+			<value level="43">16</value>
+			<value level="44">16</value>
+			<value level="45">16</value>
 		</mpInitialConsume>
 		<operateType>A1</operateType>
 		<reuseDelay>1000</reuseDelay>
@@ -5141,10 +5141,10 @@
 					<value level="11">279</value>
 					<value level="12">286</value>
 					<value level="13">294</value>
-					<value level="14">520</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="15">520</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="16">520</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="17">520</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="14">520</value>
+					<value level="15">532</value>
+					<value level="16">539</value>
+					<value level="17">546</value>
 				</power>
 				<ticks>1</ticks>
 			</effect>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01300-01399.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01300-01399.xml
index 9d0325621c..9dda816f61 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01300-01399.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01300-01399.xml
@@ -4363,12 +4363,23 @@
 	<skill id="1392" toLevel="4" name="Swap Defense">
 		<!-- M. Def. $s1 P. Def. $s2 Note! Cannot be used with Convert. -->
 		<icon>icon.skill1392</icon>
-		<operateType>T</operateType>
+		<operateType>A2</operateType>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>5</magicCriticalRate>
-		<targetType>NONE</targetType>
+		<hitTime>1</hitTime>
+		<reuseDelay>10000</reuseDelay>
+		<coolTime>1</coolTime>
 		<abnormalType>ARMOR_HOLY</abnormalType>
-		<isMagic>1</isMagic> <!-- Magic Skill -->
+		<abnormalTime>1200</abnormalTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<isMagic>4</isMagic> <!-- Magic Skill -->
+		<mpConsume>
+			<value level="1">65</value>
+			<value level="2">75</value>
+			<value level="3">83</value>
+			<value level="4">91</value>
+		</mpConsume>
 		<abnormalLevel>
 			<value level="1">1</value>
 			<value level="2">2</value>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01500-01599.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01500-01599.xml
index 2dfe6cc2c7..d886ff0ae8 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01500-01599.xml
@@ -2524,10 +2524,10 @@
 			<value level="9">9</value>
 			<value level="10">10</value>
 			<value level="11">11</value>
-			<value level="12">11</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="13">11</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="14">11</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="15">11</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="12">12</value>
+			<value level="13">13</value>
+			<value level="14">14</value>
+			<value level="15">15</value>
 		</abnormalLevel>
 		<abnormalTime>30</abnormalTime>
 		<abnormalType>STIGMA_OF_SILEN</abnormalType>
@@ -2562,10 +2562,10 @@
 			<value level="9">1500</value>
 			<value level="10">1500</value>
 			<value level="11">1500</value>
-			<value level="12">1500</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="13">1500</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="14">1500</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="15">1500</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="12">1500</value>
+			<value level="13">1600</value>
+			<value level="14">1600</value>
+			<value level="15">1600</value>
 		</effectRange>
 		<hitTime>1500</hitTime>
 		<isDebuff>true</isDebuff>
@@ -2598,10 +2598,10 @@
 			<value level="9">43</value>
 			<value level="10">45</value>
 			<value level="11">47</value>
-			<value level="12">49</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="13">51</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="14">53</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="15">55</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="12">49</value>
+			<value level="13">51</value>
+			<value level="14">53</value>
+			<value level="15">55</value>
 		</mpConsume>
 		<operateType>A2</operateType>
 		<reuseDelay>3000</reuseDelay>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01800-01899.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01800-01899.xml
index 506cf4c7a0..217fe79102 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01800-01899.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/01800-01899.xml
@@ -1282,20 +1282,20 @@
 			<effect name="MagicalDefence">
 				<amount>
 					<value level="1">-10</value>
-					<value level="2">-12</value>
-					<value level="3">-14</value>
-					<value level="4">-16</value>
-					<value level="5">-17</value>
-					<value level="6">-18</value>
-					<value level="7">-19</value>
-					<value level="8">-20</value>
-					<value level="9">-21</value>
-					<value level="10">-22</value>
-					<value level="11">-23</value>
-					<value level="12">-23</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="13">-23</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="14">-23</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="15">-23</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="2">-15</value>
+					<value level="3">-15</value>
+					<value level="4">-20</value>
+					<value level="5">-20</value>
+					<value level="6">-25</value>
+					<value level="7">-25</value>
+					<value level="8">-25</value>
+					<value level="9">-25</value>
+					<value level="10">-25</value>
+					<value level="11">-30</value>
+					<value level="12">-30</value>
+					<value level="13">-30</value>
+					<value level="14">-30</value>
+					<value level="15">-30</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/02200-02299.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/02200-02299.xml
index 76e9f2a322..6ea233ace3 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/02200-02299.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/02200-02299.xml
@@ -86,7 +86,7 @@
 					<value level="12">147087</value>
 					<value level="13">82916</value>
 					<value level="14">85289</value>
-					<value level="15">85289</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="15">85289</value>
 				</x>
 				<y>
 					<value level="1">244566</value>
@@ -103,7 +103,7 @@
 					<value level="12">25751</value>
 					<value level="13">53210</value>
 					<value level="14">16225</value>
-					<value level="15">16225</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="15">16225</value>
 				</y>
 				<z>
 					<value level="1">-3728</value>
@@ -120,7 +120,7 @@
 					<value level="12">-2018</value>
 					<value level="13">-1488</value>
 					<value level="14">-3672</value>
-					<value level="15">-3672</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="15">-3672</value>
 				</z>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/03000-03099.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/03000-03099.xml
index a87833d5ba..a8a6910ec5 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/03000-03099.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/03000-03099.xml
@@ -150,9 +150,9 @@
 			<value level="4">55</value>
 			<value level="5">58</value>
 			<value level="6">61</value>
-			<value level="7">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="8">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="9">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="7">63</value>
+			<value level="8">65</value>
+			<value level="9">67</value>
 		</magicLevel>
 		<effects>
 			<effect name="CriticalRate">
@@ -163,9 +163,9 @@
 					<value level="4">73.3</value>
 					<value level="5">68.9</value>
 					<value level="6">64.5</value>
-					<value level="7">64.5</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="8">64.5</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="9">64.5</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="7">64.5</value>
+					<value level="8">67.5</value>
+					<value level="9">69.5</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -183,7 +183,7 @@
 			<value level="4">55</value>
 			<value level="5">58</value>
 			<value level="6">61</value>
-			<value level="7">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="7">63</value>
 		</magicLevel>
 		<effects>
 			<effect name="CriticalRate">
@@ -194,7 +194,7 @@
 					<value level="4">76.6</value>
 					<value level="5">71.9</value>
 					<value level="6">67.3</value>
-					<value level="7">67.3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="7">70.3</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -325,7 +325,7 @@
 			<value level="4">29</value>
 			<value level="5">27</value>
 			<value level="6">25</value>
-			<value level="7">25</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="7">30</value>
 		</activateRate>
 		<basicProperty>PHYSICAL</basicProperty>
 		<effectPoint>-92</effectPoint>
@@ -338,7 +338,7 @@
 			<value level="4">55</value>
 			<value level="5">58</value>
 			<value level="6">61</value>
-			<value level="7">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="7">63</value>
 		</magicLevel>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
@@ -580,9 +580,9 @@
 			<value level="4">55</value>
 			<value level="5">58</value>
 			<value level="6">61</value>
-			<value level="7">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="8">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="9">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="7">63</value>
+			<value level="8">65</value>
+			<value level="9">67</value>
 		</magicLevel>
 		<effects>
 			<effect name="CriticalDamage">
@@ -593,9 +593,9 @@
 					<value level="4">231.29</value>
 					<value level="5">247.98</value>
 					<value level="6">262.57</value>
-					<value level="7">262.57</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="8">262.57</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="9">262.57</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="7">269.57</value>
+					<value level="8">275.57</value>
+					<value level="9">290.57</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -1466,8 +1466,8 @@
 			<value level="4">55</value>
 			<value level="5">58</value>
 			<value level="6">61</value>
-			<value level="7">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="8">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="7">63</value>
+			<value level="8">65</value>
 		</magicLevel>
 		<effects>
 			<effect name="CriticalDamage">
@@ -1478,8 +1478,8 @@
 					<value level="4">140.87</value>
 					<value level="5">151.04</value>
 					<value level="6">159.93</value>
-					<value level="7">159.93</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="8">159.93</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="7">169.93</value>
+					<value level="8">189.93</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
@@ -2352,9 +2352,9 @@
 			<value level="4">55</value>
 			<value level="5">28</value>
 			<value level="6">61</value>
-			<value level="7">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="8">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="9">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="7">63</value>
+			<value level="8">65</value>
+			<value level="9">67</value>
 		</magicLevel>
 		<effects>
 			<effect name="MAtk">
@@ -2365,9 +2365,9 @@
 					<value level="4">26.53</value>
 					<value level="5">28.27</value>
 					<value level="6">29.7</value>
-					<value level="7">29.7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="8">29.7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="9">29.7</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="7">30.7</value>
+					<value level="8">32.7</value>
+					<value level="9">34.7</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/03500-03599.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/03500-03599.xml
index 06d7efb13b..36e5b8e307 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/03500-03599.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/03500-03599.xml
@@ -1149,9 +1149,9 @@
 			<value level="4">55</value>
 			<value level="5">58</value>
 			<value level="6">61</value>
-			<value level="7">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="8">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-			<value level="9">61</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="7">63</value>
+			<value level="8">65</value>
+			<value level="9">67</value>
 		</magicLevel>
 		<operateType>P</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -1164,9 +1164,9 @@
 					<value level="4">269.91</value>
 					<value level="5">289.4</value>
 					<value level="6">306.42</value>
-					<value level="7">306.42</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="8">306.42</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="9">306.42</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="7">309.2</value>
+					<value level="8">312.56</value>
+					<value level="9">316.65</value>
 				</amount>
 				<mode>DIFF</mode>
 			</effect>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/04000-04099.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/04000-04099.xml
index 4c3fd2615a..ac2375473c 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/04000-04099.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/04000-04099.xml
@@ -641,7 +641,7 @@
 			<value level="1">1</value>
 			<value level="2">2</value>
 			<value level="3">3</value>
-			<value level="4">3</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="4">4</value>
 		</abnormalLevel>
 		<abnormalTime>300</abnormalTime>
 		<abnormalType>PD_UP</abnormalType>
@@ -654,7 +654,7 @@
 			<value level="1">20</value>
 			<value level="2">40</value>
 			<value level="3">70</value>
-			<value level="4">70</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+			<value level="4">76</value>
 		</magicLevel>
 		<mpConsume>
 			<value level="1">10</value>
@@ -674,7 +674,7 @@
 					<value level="1">8</value>
 					<value level="2">12</value>
 					<value level="3">15</value>
-					<value level="4">15</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="4">30</value>
 				</amount>
 				<mode>PER</mode>
 			</effect>
@@ -1353,7 +1353,6 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<effects>
-			<!-- TODO p_abnormal_rate_limit -->
 			<effect name="DefenceTrait">
 				<HOLD>100</HOLD>
 				<DERANGEMENT>100</DERANGEMENT>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/04200-04299.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/04200-04299.xml
index 0de9207f88..dbda9384a7 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/04200-04299.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/04200-04299.xml
@@ -3220,8 +3220,8 @@
 					<value level="3">30</value>
 					<value level="4">40</value>
 					<value level="5">50</value>
-					<value level="6">50</value> <!-- FIXME: AUTO GENERATED LEVEL -->
-					<value level="7">50</value> <!-- FIXME: AUTO GENERATED LEVEL -->
+					<value level="6">60</value>
+					<value level="7">70</value>
 				</HOLD>
 			</effect>
 		</effects>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/04400-04499.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/04400-04499.xml
index 70871d6e7d..7e011d665c 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/04400-04499.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/04400-04499.xml
@@ -746,7 +746,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<effects>
-			<effect name="DefenceTrait"> <!-- TODO: Verify me! -->
+			<effect name="DefenceTrait">
 				<CONSTRUCT_WEAKNESS>
 					<value level="1">0</value>
 					<value level="2">-15</value>
@@ -1132,7 +1132,7 @@
 		<operateType>P</operateType>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<effects>
-			<effect name="DefenceTrait"> <!-- TODO: Verify me! -->
+			<effect name="DefenceTrait">
 				<BOW>
 					<value level="1">0</value>
 					<value level="2">0</value>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/05100-05199.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/05100-05199.xml
index c09d5a42d3..745e0611d4 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/05100-05199.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/05100-05199.xml
@@ -2578,8 +2578,11 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="BlockControl" />
-			<effect name="Fear" />
-			<!-- FIXME: We need an instant effect that will work only vs monsters and fear them with 40% chance for 20 seconds here -->
+			<effect name="Fear">
+				<targetType>ENEMY_ONLY</targetType>
+				<chance>40</chance>
+				<time>20</time>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="5174" toLevel="15" name="Poison">
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/05800-05899.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/05800-05899.xml
index c3b6c76e9a..b8a146f63e 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/05800-05899.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/05800-05899.xml
@@ -2425,7 +2425,6 @@
 	<skill id="5895" toLevel="1" name="Mark of Cowardice">
 		<!-- Significantly decreases Max HP, P./ M. Def. and P. Evasion. The use of attack and skills, HP Recovery Bonus are limited, but Speed is slightly increased. -->
 		<icon>icon.skill1337</icon>
-	<!-- TODO JEY -->
 		<abnormalLevel>1</abnormalLevel>
 		<abnormalTime>10</abnormalTime>
 		<abnormalType>MULTI_DEBUFF_B</abnormalType>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/05900-05999.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/05900-05999.xml
index b231ba919d..76d2ab32aa 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/05900-05999.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/05900-05999.xml
@@ -287,8 +287,7 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="PhysicalAttack">
-				<!-- FIXME: value unconfirmed -->
-				<power>3000</power>
+				<power>3100</power>
 			</effect>
 		</effects>
 	</skill>
@@ -305,8 +304,7 @@
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="PhysicalAttack">
-				<!-- FIXME: value unconfirmed -->
-				<power>5000</power>
+				<power>5200</power>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06300-06399.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06300-06399.xml
index d9c9ed0556..ebcd15a2eb 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06300-06399.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06300-06399.xml
@@ -477,7 +477,6 @@
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<!-- FIXME: Aura Friendly ? -->
 		<targetType>SELF</targetType>
 		<affectScope>RANGE</affectScope>
 		<affectObject>FRIEND</affectObject>
@@ -506,7 +505,6 @@
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<specialLevel>-1</specialLevel>
-		<!-- FIXME: Aura Friendly ? -->
 		<targetType>SELF</targetType>
 		<affectScope>RANGE</affectScope>
 		<affectObject>FRIEND</affectObject>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06600-06699.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06600-06699.xml
index 3e93c48238..ff1d9a1cda 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06600-06699.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06600-06699.xml
@@ -3328,11 +3328,14 @@
 		<affectScope>RANGE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<effects>
-			<!-- TODO i_hp_drain 131 40 -->
 			<effect name="Mp">
 				<amount>-491</amount>
 				<mode>DIFF</mode>
 			</effect>
+			<effect name="Hp">
+				<amount>-131</amount>
+				<mode>DIFF</mode>
+			</effect>
 		</effects>
 	</skill>
 	<skill id="6690" toLevel="1" name="Hold">
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06700-06799.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06700-06799.xml
index a99ad0086a..f48eb59e2a 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06700-06799.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06700-06799.xml
@@ -63,7 +63,7 @@
 		<abnormalLevel>3</abnormalLevel>
 		<abnormalTime>10</abnormalTime>
 		<abnormalType>PD_DOWN</abnormalType>
-		<activateRate>80</activateRate> <!-- FIXME: Base Land Rate unconformed -->
+		<activateRate>70</activateRate>
 		<castRange>100</castRange>
 		<effectRange>200</effectRange>
 		<isDebuff>true</isDebuff>
@@ -80,7 +80,6 @@
 		<affectScope>SQUARE</affectScope>
 		<affectObject>NOT_FRIEND</affectObject>
 		<effects>
-			<!-- FIXME: Time value is unconfirmed -->
 			<effect name="PhysicalDefence">
 				<amount>-23</amount>
 				<mode>PER</mode>
@@ -1751,7 +1750,7 @@
 		<!-- Paralyzed. -->
 		<icon>icon.skill1170</icon>
 		<abnormalLevel>1</abnormalLevel>
-		<abnormalTime>10</abnormalTime> <!-- FIXME: value unconfirmed -->
+		<abnormalTime>10</abnormalTime>
 		<abnormalType>PARALYZE</abnormalType>
 		<isDebuff>true</isDebuff>
 		<isMagic>2</isMagic> <!-- Static Skill -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06800-06899.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06800-06899.xml
index 5ced394f9d..c9f09c93b2 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06800-06899.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06800-06899.xml
@@ -326,7 +326,7 @@
 			<value level="7">70</value>
 			<value level="8">79</value>
 		</magicLevel>
-		<operateType>A1</operateType> <!-- FIXME: value unconfirmed -->
+		<operateType>A1</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
@@ -380,7 +380,7 @@
 			<value level="7">72</value>
 			<value level="8">79</value>
 		</magicLevel>
-		<operateType>A1</operateType> <!-- FIXME: value unconfirmed -->
+		<operateType>A1</operateType>
 		<reuseDelay>10000</reuseDelay>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06900-06999.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06900-06999.xml
index 3a58c10497..44b3e77af5 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06900-06999.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/06900-06999.xml
@@ -239,7 +239,7 @@
 		<blockedInOlympiad>false</blockedInOlympiad>
 		<isTriggeredSkill>true</isTriggeredSkill>
 		<magicLevel>0</magicLevel>
-		<operateType>A2</operateType> <!-- FIXME: value unconfirmed -->
+		<operateType>A2</operateType>
 		<abnormalType>PATIENCE</abnormalType>
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>-5</magicCriticalRate>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/18000-18099.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/18000-18099.xml
index bc950e03d3..009eb5e27f 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/18000-18099.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/18000-18099.xml
@@ -207,7 +207,13 @@
 				</amount>
 				<chance>30</chance>
 			</effect>
-			<!-- TODO: Vampiric attack for MP -->
+			<effect name="MpVampiricAttack">
+				<amount>
+					<value fromLevel="1" toLevel="25">0</value>
+					<value level="26">16</value>
+				</amount>
+				<chance>30</chance>
+			</effect>
 		</effects>
 	</skill>
 </list>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/45200-45299.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/45200-45299.xml
index fae3fb0e55..413a565089 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/45200-45299.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/45200-45299.xml
@@ -5363,11 +5363,22 @@
 	</skill>
 	<skill id="45237" toLevel="4" name="Swap Attack">
 		<!-- M. Atk. $s1 P. Atk. $s2 -->
+		<operateType>A2</operateType>
 		<magicLevel>78</magicLevel>
-		<mpConsume>36</mpConsume>
-		<operateType>T</operateType>
+		<mpConsume>
+			<value level="1">65</value>
+			<value level="2">75</value>
+			<value level="3">83</value>
+			<value level="4">91</value>
+		</mpConsume>
+		<abnormalTime>1200</abnormalTime>
 		<magicCriticalRate>5</magicCriticalRate>
-		<targetType>NONE</targetType>
+		<hitTime>1</hitTime>
+		<reuseDelay>10000</reuseDelay>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<abnormalTime>1200</abnormalTime>
+		<isMagic>4</isMagic>
 		<effects>
 			<effect name="MpConsumePerLevel">
 				<power>1</power>