diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00100-00199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00100-00199.xml
index b4bd010731052b48be87e45c40256e0a22586f58..c038a25b9b71375332cd20ec0156059213edb54f 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00100-00199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00100-00199.xml
@@ -594,7 +594,7 @@
 		<set name="target" val="TARGET_SELF" />
 		<set name="reuseDelay" val="150000" />
 		<set name="hitTime" val="1500" />
-		<set name="skillType" val="DUMMY" />
+		<set name="skillType" val="BUFF" />
 		<set name="operateType" val="A2" />
 		<set name="aggroPoints" val="#aggro" />
 		<enchant1 name="magicLvl" val="#enchantMagicLvl" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml
index 4c05b3956d04247da355d6d29a7c2fa70908d370..90d6c3dd4c1fce493df26cb1c30856a193e5513a 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00200-00299.xml
@@ -1114,21 +1114,21 @@
 			<effect name="Spoil" noicon="1" val="0" />
 		</for>
 		<enchant1for>
-			<effect name="Spoil" noicon="1" val="0" />
 			<effect name="Debuff" abnormalTime="15" val="0" effectPower="#ench123Power" abnormalLvl="3" abnormalType="attack_time_up">
 				<mul order="0x30" stat="pAtkSpd" val="0.77" />
 			</effect>
+			<effect name="Spoil" noicon="1" val="0" />
 		</enchant1for>
 		<enchant2for>
-			<effect name="Spoil" noicon="1" val="0" />
 			<!-- Retail Values CT2.3: 118HP * 3 Sec -->
 			<effect count="5" name="DamOverTime" abnormalTime="3" val="354" effectPower="#ench123Power" abnormalLvl="3" abnormalType="dot_attr" />
+			<effect name="Spoil" noicon="1" val="0" />
 		</enchant2for>
 		<enchant3for>
-			<effect name="Spoil" noicon="1" val="0" />
 			<effect name="Debuff" abnormalTime="15" val="0" effectPower="#ench123Power" abnormalLvl="1" abnormalType="holy_attack">
 				<sub order="0x40" stat="earthPower" val="#ench3EarthPowerVuln" />
 			</effect>
+			<effect name="Spoil" noicon="1" val="0" />
 		</enchant3for>
 	</skill>
 	<skill id="255" levels="15" name="Power Smash">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00300-00399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00300-00399.xml
index 119a0af71051832fbd05a84aefcbf866f243f176..2b5ada198044e48fa068e820d97e477f8a1f355d 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00300-00399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00300-00399.xml
@@ -73,21 +73,21 @@
 			<effect name="Spoil" noicon="1" val="0" />
 		</for>
 		<enchant1for>
-			<effect name="Spoil" noicon="1" val="0" />
 			<effect name="Debuff" abnormalTime="15" val="0" effectPower="#ench123Power" abnormalLvl="3" abnormalType="attack_time_up">
 				<mul order="0x30" stat="pAtkSpd" val="0.77" />
 			</effect>
+			<effect name="Spoil" noicon="1" val="0" />
 		</enchant1for>
 		<enchant2for>
-			<effect name="Spoil" noicon="1" val="0" />
 			<!-- Retail Values CT2.3: 118HP * 3 Sec -->
 			<effect count="5" name="DamOverTime" abnormalTime="3" val="354" effectPower="#ench123Power" abnormalLvl="3" abnormalType="dot_attr" />
+			<effect name="Spoil" noicon="1" val="0" />
 		</enchant2for>
 		<enchant3for>
-			<effect name="Spoil" noicon="1" val="0" />
 			<effect name="Debuff" abnormalTime="15" val="0" effectPower="#ench123Power" abnormalLvl="1" abnormalType="holy_attack">
 				<sub order="0x40" stat="earthPower" val="#ench3EarthPowerVuln" />
 			</effect>
+			<effect name="Spoil" noicon="1" val="0" />
 		</enchant3for>
 	</skill>
 	<skill id="303" levels="4" name="Soul of Sagittarius" enchantGroup1="1">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
index ef06726654e54987b28ccbc59a6e7cae9f1bb0f6..ff4f8902cc3a0f15a572521e8d6a8e923e18be5f 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00400-00499.xml
@@ -2637,12 +2637,12 @@
 			</and>
 		</cond>
 		<for>
-			<effect name="EnemyCharge" noicon="1" val="0" />
 			<effect name="Stun" abnormalTime="9" val="0" effectPower="70" effectType="STUN" abnormalLvl="1" abnormalType="stun" />
+			<effect name="EnemyCharge" noicon="1" val="0" />
 		</for>
 		<enchant2for>
-			<effect name="EnemyCharge" noicon="1" val="0" />
 			<effect name="Stun" abnormalTime="9" val="0" effectPower="#ench2Chance" effectType="STUN" abnormalLvl="1" abnormalType="stun" />
+			<effect name="EnemyCharge" noicon="1" val="0" />
 		</enchant2for>
 	</skill>
 	<skill id="495" levels="10" name="Blade Rush" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00600-00699.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00600-00699.xml
index d52f6c824497733871e57252affd558a15d273ea..75f180d06d8cef9e316e154af6fac3ad68a8b1ea 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00600-00699.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00600-00699.xml
@@ -1394,10 +1394,10 @@
 			<player hp="30" />
 		</cond>
 		<for>
-			<effect self="1" name="ChanceSkillTrigger" noicon="1" val="0" triggeredId="5602" triggeredLevel="1" chanceType="ON_START" />
 			<effect name="Buff" abnormalTime="30" val="0" abnormalLvl="1" abnormalType="transform_sacrifice">
 				<mul order="0x30" stat="pAtk" val="1.2" />
 			</effect>
+			<effect self="1" name="ChanceSkillTrigger" noicon="1" val="0" triggeredId="5602" triggeredLevel="1" chanceType="ON_START" />
 		</for>
 	</skill>
 	<skill id="680" levels="1" name="Divine Knight Hate">
@@ -1511,10 +1511,10 @@
 			<player hp="30" />
 		</cond>
 		<for>
-			<effect self="1" name="ChanceSkillTrigger" noicon="1" val="0" triggeredId="5602" triggeredLevel="1" chanceType="ON_START" />
 			<effect name="Buff" abnormalTime="30" val="0" abnormalLvl="1" abnormalType="transform_sacrifice">
 				<mul order="0x30" stat="pDef" val="1.2" />
 			</effect>
+			<effect self="1" name="ChanceSkillTrigger" noicon="1" val="0" triggeredId="5602" triggeredLevel="1" chanceType="ON_START" />
 		</for>
 	</skill>
 	<skill id="686" levels="1" name="Divine Rogue Stun Shot">
@@ -1626,10 +1626,10 @@
 			<player hp="30" />
 		</cond>
 		<for>
-			<effect self="1" name="ChanceSkillTrigger" noicon="1" val="0" triggeredId="5602" triggeredLevel="1" chanceType="ON_START" />
 			<effect name="Buff" abnormalTime="30" val="0" abnormalLvl="1" abnormalType="transform_sacrifice">
 				<add order="0x40" stat="rEvas" val="10" />
 			</effect>
+			<effect self="1" name="ChanceSkillTrigger" noicon="1" val="0" triggeredId="5602" triggeredLevel="1" chanceType="ON_START" />
 		</for>
 	</skill>
 	<skill id="692" levels="1" name="Divine Wizard Holy Flare">
@@ -1739,10 +1739,10 @@
 			<player mp="10" />
 		</cond>
 		<for>
-			<effect self="1" name="ChanceSkillTrigger" noicon="1" val="0" triggeredId="5602" triggeredLevel="1" chanceType="ON_START" />
 			<effect name="Buff" abnormalTime="30" val="0" abnormalLvl="1" abnormalType="transform_sacrifice">
 				<mul order="0x30" stat="mAtk" val="1.2" />
 			</effect>
+			<effect self="1" name="ChanceSkillTrigger" noicon="1" val="0" triggeredId="5602" triggeredLevel="1" chanceType="ON_START" />
 		</for>
 	</skill>
 	<skill id="698" levels="1" name="Divine Healer Major Heal">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
index 62df79b446467977f747b3e0858583b8f8d6a320..0117ec02db9f8e308697c6669bc6d5ea16c7cf62 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00700-00799.xml
@@ -8,11 +8,11 @@
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="6000" />
 		<set name="skillRadius" val="1000" />
-		<set name="skillType" val="HEAL" />
+		<set name="skillType" val="DUMMY" />
 		<set name="target" val="TARGET_PARTY" />
 		<for>
-			<effect name="Heal" noicon="1" val="400" />
 			<effect count="15" name="HealOverTime" val="27" abnormalLvl="5" abnormalType="life_force_others" />
+			<effect name="Heal" noicon="1" val="400" />
 		</for>
 	</skill>
 	<skill id="701" levels="1" name="Divine Healer Resurrection">
@@ -48,7 +48,7 @@
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1800000" />
 		<set name="skillRadius" val="300" />
-		<set name="skillType" val="HEAL_PERCENT" />
+		<set name="skillType" val="DUMMY" />
 		<set name="staticReuse" val="true" />
 		<set name="target" val="TARGET_PARTY" />
 		<cond msgId="113" addName="1">
@@ -214,7 +214,6 @@
 			<player mp="10" />
 		</cond>
 		<for>
-			<effect self="1" name="ChanceSkillTrigger" noicon="1" val="0" triggeredId="5602" triggeredLevel="1" chanceType="ON_START" />
 			<effect name="Buff" abnormalTime="30" val="0" abnormalLvl="1" abnormalType="transform_sacrifice">
 				<add order="0x40" stat="runSpd" val="10" />
 				<add order="0x40" stat="accCombat" val="2" />
@@ -227,6 +226,7 @@
 				<mul order="0x30" stat="mAtk" val="1.1" />
 				<mul order="0x30" stat="mAtkSpd" val="1.1" />
 			</effect>
+			<effect self="1" name="ChanceSkillTrigger" noicon="1" val="0" triggeredId="5602" triggeredLevel="1" chanceType="ON_START" />
 		</for>
 	</skill>
 	<skill id="710" levels="1" name="Divine Summoner Summon Divine Beast">
@@ -322,11 +322,11 @@
 			<player mp="10" />
 		</cond>
 		<for>
-			<effect self="1" name="ChanceSkillTrigger" noicon="1" val="0" triggeredId="5602" triggeredLevel="1" chanceType="ON_START" />
 			<effect name="Buff" abnormalTime="30" val="0" abnormalLvl="1" abnormalType="transform_sacrifice">
 				<basemul order="0x30" stat="rCrit" val="0.2" />
 				<mul order="0x30" stat="cAtk" val="1.2" />
 			</effect>
+			<effect self="1" name="ChanceSkillTrigger" noicon="1" val="0" triggeredId="5602" triggeredLevel="1" chanceType="ON_START" />
 		</for>
 	</skill>
 	<skill id="715" levels="4" name="Zaken Energy Drain">
@@ -496,7 +496,7 @@
 		<set name="skillRadius" val="1000" />
 		<set name="reuseDelay" val="3000" />
 		<set name="hitTime" val="4000" />
-		<set name="skillType" val="HEAL" />
+		<set name="skillType" val="DUMMY" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A1" />
 		<set name="aggroPoints" val="624" />
@@ -1795,7 +1795,7 @@
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="150000" />
 		<set name="skillRadius" val="1000" />
-		<set name="skillType" val="HEAL_PERCENT" />
+		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_PARTY" />
 		<cond msgId="113" addName="1">
 			<player active_effect_id_lvl="5563,3" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml
index 79b5566cfea3cee7117c6ea8c9570710d7ee76a3..a8e224b4fa740869de48bdefed232ce4d1d7ca8d 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00900-00999.xml
@@ -1505,8 +1505,8 @@
 			<target mindistance="200" />
 		</cond>
 		<for>
-			<effect name="EnemyCharge" noicon="1" val="0" />
 			<effect name="Stun" abnormalTime="9" val="0" effectPower="80" effectType="STUN" abnormalLvl="1" abnormalType="stun" />
+			<effect name="EnemyCharge" noicon="1" val="0" />
 		</for>
 	</skill>
 	<skill id="979" levels="6" name="Aggression">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01000-01099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01000-01099.xml
index e0ce2341d757aa775dea8784752e847dee164d9a..bf6cc87eead22658e1d148c3e3646850fb97bf01 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01000-01099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01000-01099.xml
@@ -517,7 +517,7 @@
 		<set name="skillRadius" val="1000" />
 		<set name="reuseDelay" val="6000" />
 		<set name="hitTime" val="7000" />
-		<set name="skillType" val="HEAL" />
+		<set name="skillType" val="DUMMY" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A1" />
 		<set name="aggroPoints" val="#amount" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01200-01299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01200-01299.xml
index 4709f89da19f206ffbe0dfd98770d56f49fc1cf2..815182ee74c95061d3c9da7387e7b162c7638042 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01200-01299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01200-01299.xml
@@ -277,12 +277,12 @@
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="Heal" noicon="1" val="#amount" />
 			<effect count="15" name="HealOverTime" val="#hotValue" abnormalLvl="#abnormalLvl" abnormalType="life_force_others" />
+			<effect name="Heal" noicon="1" val="#amount" />
 		</for>
 		<enchant1for>
-			<effect name="Heal" noicon="1" val="#ench1amount" />
 			<effect count="15" name="HealOverTime" val="32" abnormalLvl="7" abnormalType="life_force_others" />
+			<effect name="Heal" noicon="1" val="#ench1amount" />
 		</enchant1for>
 	</skill>
 	<skill id="1218" levels="33" name="Greater Battle Heal" enchantGroup1="2" enchantGroup2="2">
@@ -341,19 +341,19 @@
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="6000" />
 		<set name="skillRadius" val="1000" />
-		<set name="skillType" val="HEAL" />
+		<set name="skillType" val="DUMMY" />
 		<set name="target" val="TARGET_PARTY" />
 		<enchant1 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="Heal" noicon="1" val="#amount" />
 			<effect count="15" name="HealOverTime" val="#hotValue" abnormalLvl="#abnormalLvl" abnormalType="life_force_others" />
+			<effect name="Heal" noicon="1" val="#amount" />
 		</for>
 		<enchant1for>
-			<effect name="Heal" noicon="1" val="#ench1amount" />
 			<effect count="15" name="HealOverTime" val="26" abnormalLvl="5" abnormalType="life_force_others" />
+			<effect name="Heal" noicon="1" val="#ench1amount" />
 		</enchant1for>
 	</skill>
 	<skill id="1220" levels="8" name="Blaze">
@@ -670,7 +670,7 @@
 		<set name="skillRadius" val="1000" />
 		<set name="reuseDelay" val="5000" />
 		<set name="hitTime" val="7000" />
-		<set name="skillType" val="HOT" />
+		<set name="skillType" val="DUMMY" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A2" />
 		<set name="aggroPoints" val="#aggroPoints" />
@@ -1615,7 +1615,7 @@
 		<set name="skillRadius" val="900" />
 		<set name="reuseDelay" val="5000" />
 		<set name="hitTime" val="2500" />
-		<set name="skillType" val="HEAL" />
+		<set name="skillType" val="DUMMY" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A2" />
 		<set name="aggroPoints" val="#aggroPoints" />
@@ -1624,14 +1624,14 @@
 		<enchant2 name="mpConsume" val="#ench2mpConsume" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
 		<for>
-			<effect name="Heal" noicon="1" val="#amount" />
 			<!-- retail value: "#hot"/sec; stat update every time unit (2/3 sec) -->
 			<!-- Verified by slyce - Interlude - Aug 2007 -->
 			<effect count="15" name="HealOverTime" val="#hot" abnormalLvl="#abnormalLvl" abnormalType="life_force_orc" />
+			<effect name="Heal" noicon="1" val="#amount" />
 		</for>
 		<enchant1for>
-			<effect name="Heal" noicon="1" val="172" />
 			<effect count="15" name="HealOverTime" val="#ench1hot" abnormalLvl="#ench1abnormalLvl" abnormalType="life_force_orc" />
+			<effect name="Heal" noicon="1" val="172" />
 		</enchant1for>
 	</skill>
 	<skill id="1257" levels="3" name="Decrease Weight" enchantGroup1="1" enchantGroup2="1">
@@ -2114,7 +2114,7 @@
 		<set name="skillRadius" val="1000" />
 		<set name="reuseDelay" val="900000" />
 		<set name="hitTime" val="7000" />
-		<set name="skillType" val="HEAL_PERCENT" />
+		<set name="skillType" val="DUMMY" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A1" />
 		<set name="aggroPoints" val="560" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml
index ebbe317f805d16d6cf92a2b5c580a22342014374..2c443ae4d365e0740260ce7d0ab97dd0d16ed3a5 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01300-01399.xml
@@ -122,7 +122,7 @@
 		<set name="skillRadius" val="900" />
 		<set name="reuseDelay" val="5000" />
 		<set name="hitTime" val="2500" />
-		<set name="skillType" val="COMBATPOINTHEAL" />
+		<set name="skillType" val="DUMMY" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A1" />
 		<set name="aggroPoints" val="#aggro" />
@@ -323,7 +323,7 @@
 		<set name="skillRadius" val="1000" />
 		<set name="reuseDelay" val="150000" />
 		<set name="hitTime" val="4000" />
-		<set name="skillType" val="DUMMY" />
+		<set name="skillType" val="BUFF" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A2" />
 		<set name="aggroPoints" val="#aggro" />
@@ -1907,7 +1907,7 @@
 		<set name="skillRadius" val="1000" />
 		<set name="reuseDelay" val="300000" />
 		<set name="hitTime" val="2500" />
-		<set name="skillType" val="DUMMY" />
+		<set name="skillType" val="BUFF" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A2" />
 		<set name="aggroPoints" val="669" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml
index ad97194602f3c578b4f2bb3491f3979991352f5d..d7076f484653ab612bac99572f4daf8ea82e82fe 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01400-01499.xml
@@ -116,7 +116,7 @@
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="3000" />
 		<set name="skillRadius" val="1000" />
-		<set name="skillType" val="HEAL" />
+		<set name="skillType" val="DUMMY" />
 		<set name="target" val="TARGET_PARTY" />
 		<enchant1 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchantMagicLvl" />
@@ -397,7 +397,7 @@
 		<set name="skillRadius" val="900" />
 		<set name="reuseDelay" val="300000" />
 		<set name="hitTime" val="2500" />
-		<set name="skillType" val="HEAL_PERCENT" />
+		<set name="skillType" val="BUFF" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A2" />
 		<set name="aggroPoints" val="669" />
@@ -499,7 +499,7 @@
 		<set name="skillRadius" val="900" />
 		<set name="reuseDelay" val="300000" />
 		<set name="hitTime" val="2500" />
-		<set name="skillType" val="COMBATPOINTHEAL" />
+		<set name="skillType" val="BUFF" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A2" />
 		<enchant2 name="mpInitialConsume" val="#ench2mpInitialConsume" />
@@ -755,7 +755,7 @@
 		<set name="magicLvl" val="80" />
 		<set name="target" val="TARGET_CLAN" />
 		<set name="skillRadius" val="900" />
-		<set name="skillType" val="HEAL_PERCENT" />
+		<set name="skillType" val="DUMMY" />
 		<set name="operateType" val="A1" />
 		<set name="hitTime" val="5000" />
 		<set name="reuseDelay" val="3600000" />
@@ -797,7 +797,7 @@
 		<set name="target" val="TARGET_PARTY" />
 		<set name="staticReuse" val="true" />
 		<set name="skillRadius" val="1000" />
-		<set name="skillType" val="MANA_BY_LEVEL" />
+		<set name="skillType" val="DUMMY" />
 		<set name="hitTime" val="5000" />
 		<set name="reuseDelay" val="3600000" />
 		<set name="isMagic" val="true" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml
index 89cf07ebfcc4ff0f78175ab8c54f286668769aea..9757dd526d72e68f2d2911b72cec3df72866a24f 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01500-01599.xml
@@ -113,7 +113,7 @@
 		<set name="removedOnAnyActionExceptMove" val="true" />
 		<set name="reuseDelay" val="3600000" />
 		<set name="skillRadius" val="1000" />
-		<set name="skillType" val="HEAL_PERCENT" />
+		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_PARTY_NOTME" />
 		<for>
 			<effect name="Invincible" abnormalTime="15" val="0" special="invincible" abnormalLvl="2" abnormalType="invincibility" />
@@ -1251,7 +1251,7 @@
 		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
 		<set name="reuseDelay" val="9000" />
 		<set name="skillRadius" val="1000" />
-		<set name="skillType" val="HEAL" />
+		<set name="skillType" val="DUMMY" />
 		<set name="target" val="TARGET_PARTY" />
 		<for>
 			<effect name="Heal" noicon="1" val="796" />
@@ -1441,7 +1441,7 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="operateType" val="A1" /> <!-- FIXME: value unconfirmed -->
 		<set name="reuseDelay" val="150000" />
-		<set name="skillType" val="DUMMY" />
+		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
 		<for>
 			<effect name="Buff" abnormalTime="600" val="0" abnormalLvl="#stackOrder" abnormalType="max_hp_up">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml
index a57c52d985a0ff90c799838d26a710e1aea9e7e0..c149b3794a58128b5125240362611fefac0c9264 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/03100-03199.xml
@@ -395,7 +395,7 @@
 		<set name="reuseDelay" val="300000" />
 		<set name="staticReuse" val="true" />
 		<set name="hitTime" val="4000" />
-		<set name="skillType" val="DUMMY" />
+		<set name="skillType" val="BUFF" />
 		<set name="operateType" val="A2" />
 		<set name="staticHitTime" val="true" />
 		<for>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04000-04099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04000-04099.xml
index 32787167e9167ccae80d677f793dcf6422989ea1..39b4c1b3859904434b69c6768c22be807e86145a 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04000-04099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04000-04099.xml
@@ -1314,8 +1314,8 @@
 		<set name="saveVs" val="NULL" />
 		<set name="killByDOT" val="true" />
 		<for>
-			<effect name="Root" abnormalTime="4200" val="0" />
 			<effect count="1400" name="DamOverTime" abnormalTime="3" val="60" abnormalVisualEffect="poison" abnormalLvl="1" abnormalType="fatal_poison" noicon="1" />
+			<effect name="Root" abnormalTime="4200" val="0" />
 			<effect name="ImmobileBuff" abnormalTime="4200" val="0" noicon="1" />
 		</for>
 	</skill>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04500-04599.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04500-04599.xml
index 2e24b3c61a9fe79a21d705f0ee0c71c651e3bf67..cfabf5489cc1a2824f1f841221dbb27250456058 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04500-04599.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04500-04599.xml
@@ -276,7 +276,7 @@
 		<set name="isMagic" val="true" />
 		<set name="magicLvl" val="76" />
 		<set name="operateType" val="A2" />
-		<set name="skillType" val="HEAL_PERCENT" />
+		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
 			<effect name="Buff" abnormalTime="120" val="0" abnormalLvl="1" abnormalType="public_slot">
@@ -316,7 +316,7 @@
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="skillRadius" val="200" />
-		<set name="skillType" val="HEAL_PERCENT" />
+		<set name="skillType" val="DUMMY" />
 		<set name="target" val="TARGET_AURA" />
 		<for>
 			<effect name="HealPercent" noicon="1" val="5" />
@@ -328,7 +328,7 @@
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="8000" />
 		<set name="skillRadius" val="200" />
-		<set name="skillType" val="HEAL_PERCENT" />
+		<set name="skillType" val="DUMMY" />
 		<set name="target" val="TARGET_AURA" />
 		<for>
 			<effect name="ManaHealPercent" noicon="1" val="5" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04600-04699.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04600-04699.xml
index dd6edac714aed21883ce6bfa753d3b2daf2b1abb..f30cba0d5cc81a2f33a96a37e6abf324e08f94e6 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04600-04699.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04600-04699.xml
@@ -314,7 +314,7 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="target" val="TARGET_CLAN" />
 		<set name="skillRadius" val="900" />
-		<set name="skillType" val="HEAL" />
+		<set name="skillType" val="DUMMY" />
 		<set name="reuseDelay" val="8000" />
 		<set name="hitTime" val="2000" />
 		<set name="magicLvl" val="#magicLvl" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05000-05099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05000-05099.xml
index cf6446fdff6cc1f3398b435ac25430efcca4b0ce..e10b99289df109ee117d9787a893056c10d730b1 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05000-05099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05000-05099.xml
@@ -124,7 +124,7 @@
 		<table name="#isMagic"> true false false true true </table>
 		<table name="#power"> 0 0 0 10 10 </table>
 		<table name="#saveVs"> NULL NULL NULL MEN MEN </table>
-		<table name="#skillType"> HEAL_PERCENT DUMMY BUFF DEBUFF STUN </table>
+		<table name="#skillType"> BUFF DUMMY BUFF DEBUFF STUN </table>
 		<table name="#abnormalLvl"> 0 0 1 1 1 </table>
 		<table name="#abnormalType"> none none ultimate_buff heal_effect_down stun </table>
 		<table name="#attackAndSpeed"> 1 1 1.2 1 1 </table>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05400-05499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05400-05499.xml
index 176421b4a312f045ec69fc4c0064c548cb84ba87..78ca298237819732e3bf94cd6fd8148c97a41f14 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05400-05499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05400-05499.xml
@@ -27,8 +27,8 @@
 		<set name="isDebuff" val="true" />
 		<set name="trait" val="SHOCK" />
 		<for>
-			<effect name="Stun" abnormalTime="2" val="0" />
 			<effect name="ThrowUp" noicon="1" val="0" abnormalLvl="1" abnormalType="fly_away" />
+			<effect name="Stun" abnormalTime="2" val="0" />
 		</for>
 	</skill>
 	<skill id="5402" levels="1" name="Presentation - Balor 2">
@@ -430,7 +430,7 @@
 		<set name="skillRadius" val="900" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="target" val="TARGET_CLAN" />
-		<set name="skillType" val="HEAL" />
+		<set name="skillType" val="DUMMY" />
 		<set name="reuseDelay" val="8000" />
 		<set name="operateType" val="A1" />
 		<set name="hitTime" val="2000" />
@@ -449,7 +449,7 @@
 		<set name="skillRadius" val="900" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="target" val="TARGET_CLAN" />
-		<set name="skillType" val="HEAL" />
+		<set name="skillType" val="DUMMY" />
 		<set name="reuseDelay" val="8000" />
 		<set name="operateType" val="A1" />
 		<set name="hitTime" val="2000" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml
index c865ec45be88db1ac8993fc6019a326ad819b711..3dda41a7f9ba40319d4292620382588b81861fcd 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05600-05699.xml
@@ -244,7 +244,7 @@
 		<set name="isMagic" val="true" />
 		<set name="magicLvl" val="#magicLvl" />
 		<set name="operateType" val="A1" />
-		<set name="skillType" val="MANAHEAL" />
+		<set name="skillType" val="DUMMY" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
 			<effect name="ManaHeal" noicon="1" val="#amount" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05800-05899.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05800-05899.xml
index 86e2742630010e1832c64fa4de00c6e85e92c987..1cf52cc57ab7bb25e8eefd602e190ae12e9742f1 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05800-05899.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05800-05899.xml
@@ -362,7 +362,7 @@
 		<set name="mpInitialConsume" val="52" />
 		<set name="reuseDelay" val="8000" />
 		<set name="target" val="TARGET_CLAN" />
-		<set name="skillType" val="HEAL_PERCENT" />
+		<set name="skillType" val="DUMMY" />
 		<set name="operateType" val="A2" />
 		<set name="hitTime" val="6000" />
 		<set name="skillRadius" val="600" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/06200-06299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/06200-06299.xml
index 2905b6549cf2e8dc13fd76b2045282163304ad1e..4ab7ab3f51718c096aa42a3b36509f3d8dce7999 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/06200-06299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/06200-06299.xml
@@ -761,7 +761,7 @@
 		<set name="magicLvl" val="85" />
 		<set name="operateType" val="A1" />
 		<set name="skillRadius" val="1100" />
-		<set name="skillType" val="HEAL_PERCENT" />
+		<set name="skillType" val="DUMMY" />
 		<set name="target" val="TARGET_AURA" />
 		<for>
 			<effect name="CpHealPercent" noicon="1" val="100" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/06700-06799.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/06700-06799.xml
index 30ac4616e8992594c136ec4ad63a3ac38735cd8e..6cbc4a5ce7ae7e71017656e710ad4d6f98c69357 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/06700-06799.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/06700-06799.xml
@@ -253,8 +253,8 @@
 		<set name="skillType" val="HEAL" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
-			<effect name="Heal" noicon="1" val="450" />
 			<effect count="15" name="HealOverTime" val="30" abnormalLvl="6" abnormalType="life_force_others" />
+			<effect name="Heal" noicon="1" val="450" />
 		</for>
 	</skill>
 	<skill id="6725" levels="1" name="Bless the Blood of Elcadia">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/07000-07099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/07000-07099.xml
index 1f9690e98962d4bc14fa292a329930001144310c..379d7674967ef1c911252a5476ee3d2801bf09cd 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/07000-07099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/07000-07099.xml
@@ -768,7 +768,7 @@
 		<set name="isMagic" val="true" />
 		<set name="mpConsume" val="2" />
 		<set name="operateType" val="A2" />
-		<set name="skillType" val="HEAL_PERCENT" />
+		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
 			<effect name="Buff" abnormalTime="3600" val="0" abnormalLvl="2" abnormalType="multi_buff">