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 2b5ada198044e48fa068e820d97e477f8a1f355d..2f0997efc018677db2f0307045b3ceb96bf81475 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
@@ -1145,7 +1145,7 @@
 		<set name="magicLvl" val="78" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="300000" />
-		<set name="skillType" val="HEAL_PERCENT" />
+		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_ONE" />
 		<enchant1 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant1 name="hpConsume" val="#ench1Cost" />
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 051323f0e4e10be400b39003b3f7ca0c3c73f010..eafdfd313b8250e91ee12835152fff61ea053c8a 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
@@ -1479,7 +1479,7 @@
 		<set name="mpConsume" val="43" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="150000" />
-		<set name="skillType" val="DUMMY" />
+		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
 		<for>
 			<effect name="ChanceSkillTrigger" abnormalTime="60" val="0" activationChance="80" chanceType="ON_ATTACKED_HIT" triggeredId="5144" abnormalLvl="1" abnormalType="mirage" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml
index 9409815c66f011536d84faedc3d85eaf2f5f81d2..aaf43fa090715b6b24122c20f40ca7597ffd5daf 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00500-00599.xml
@@ -890,7 +890,7 @@
 		<set name="mpConsume" val="43" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="150000" />
-		<set name="skillType" val="DUMMY" />
+		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
 		<for>
 			<effect name="ChanceSkillTrigger" abnormalTime="1200" val="0" activationChance="30" activationMinDamage="100" chanceType="ON_ATTACKED_HIT" triggeredId="5425" abnormalLvl="1" abnormalType="iron_shield" />
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 8a0b11d0d607795fa032790311f231d934f8c056..c0ed462e30d95b660ada24a75c85d3d2cb5dcdcd 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,7 +8,7 @@
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="6000" />
 		<set name="skillRadius" val="1000" />
-		<set name="skillType" val="DUMMY" />
+		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_PARTY" />
 		<for>
 			<effect count="15" name="HealOverTime" val="27" abnormalLvl="5" abnormalType="life_force_others" />
@@ -48,7 +48,7 @@
 		<set name="operateType" val="A1" />
 		<set name="reuseDelay" val="1800000" />
 		<set name="skillRadius" val="300" />
-		<set name="skillType" val="DUMMY" />
+		<set name="skillType" val="BUFF" />
 		<set name="staticReuse" val="true" />
 		<set name="target" val="TARGET_PARTY" />
 		<cond msgId="113" addName="1">
@@ -1709,7 +1709,7 @@
 		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_SELF" />
 		<for>
-			<effect name="ChanceSkillTrigger" abnormalTime="60" val="0" activationChance="20" chanceType="ON_ATTACKED_HIT" triggeredId="5562" abnormalLvl="1" abnormalType="seed_of_knight" >
+			<effect name="ChanceSkillTrigger" abnormalTime="60" val="0" activationChance="20" chanceType="ON_ATTACKED_HIT" triggeredId="5562" abnormalLvl="1" abnormalType="seed_of_knight">
 				<add order="0x40" stat="pDef" val="200" />
 			</effect>
 		</for>
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 815182ee74c95061d3c9da7387e7b162c7638042..54440cf3724d6336377512b12b42eb50900e73a0 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
@@ -270,7 +270,7 @@
 		<set name="mpInitialConsume" val="#mpInitialConsume" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="3000" />
-		<set name="skillType" val="HEAL" />
+		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_ONE" />
 		<enchant1 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchantMagicLvl" />
@@ -341,7 +341,7 @@
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="6000" />
 		<set name="skillRadius" val="1000" />
-		<set name="skillType" val="DUMMY" />
+		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_PARTY" />
 		<enchant1 name="magicLvl" val="#enchantMagicLvl" />
 		<enchant2 name="magicLvl" val="#enchantMagicLvl" />
@@ -670,7 +670,7 @@
 		<set name="skillRadius" val="1000" />
 		<set name="reuseDelay" val="5000" />
 		<set name="hitTime" val="7000" />
-		<set name="skillType" val="DUMMY" />
+		<set name="skillType" val="BUFF" />
 		<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="DUMMY" />
+		<set name="skillType" val="BUFF" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A2" />
 		<set name="aggroPoints" val="#aggroPoints" />
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 d4292801098ef6236e5f05d640bd7b3fc3f83d16..073333078444516cc952294695a326fb021655c7 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
@@ -2554,7 +2554,7 @@
 		<set name="operateType" val="A2" />
 		<set name="isMagic" val="true" />
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="HOT" />
+		<set name="skillType" val="BUFF" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
 		<set name="reuseDelay" val="3000" />
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 f3cf8c054369d745a6d3493af7d813123fa9da40..fa15d46dc006094af9f635da6a8313ab24ba915a 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
@@ -1523,7 +1523,7 @@
 		<!-- High Five Skill -->
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
-		<set name="skillType" val="BUFF" />
+		<set name="skillType" val="DUMMY" />
 		<set name="target" val="TARGET_SELF" />
 		<for>
 			<!-- FIXME: activationChance unconfirmed -->
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02200-02299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02200-02299.xml
index 0d7e780b9e72d93359205fd5366400f84e793199..a6249d57bfa57ac818de36549fc8cfaac3630750 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02200-02299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02200-02299.xml
@@ -611,7 +611,7 @@
 		<set name="operateType" val="A1" />
 	</skill>
 	<skill id="2231" levels="1" name="Amulet: Protection of Valakas">
-		<!--  Confirmed CT2.5 -->
+		<!-- Confirmed CT2.5 -->
 		<set name="hitTime" val="1000" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="magicLvl" val="75" />
@@ -626,7 +626,7 @@
 		</for>
 	</skill>
 	<skill id="2232" levels="1" name="Amulet: Slay Valakas">
-		<!--  Confirmed CT2.5 -->
+		<!-- Confirmed CT2.5 -->
 		<set name="hitTime" val="1000" />
 		<set name="itemConsumeCount" val="1" />
 		<set name="magicLvl" val="75" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/03400-03499.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/03400-03499.xml
index e49f9d377c8f94268ae87193da4e6cd31a97d815..a644f89c88ea26d9a36f95148e1b27debb5543c4 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/03400-03499.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/03400-03499.xml
@@ -294,7 +294,7 @@
 		<!-- Confirmed CT2.5 and Updated to H5 -->
 		<set name="magicLvl" val="80" />
 		<set name="operateType" val="P" />
-		<set name="skillType" val="BUFF" />
+		<set name="skillType" val="DUMMY" />
 		<set name="target" val="TARGET_SELF" />
 		<for>
 			<mul order="0x30" stat="maxHp" val="1.25" /> <!-- HP +25% -->
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/03600-03699.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/03600-03699.xml
index 225af885f18356a28b8812b91f52c20c2e9e5d99..4933b3291d720878431dfde5b06bc95ab9406a20 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/03600-03699.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/03600-03699.xml
@@ -1014,7 +1014,7 @@
 		</for>
 	</skill>
 	<skill id="3666" levels="1" name="Yellow Talisman - Increase Force">
-                <!-- Confirmed CT2.5 -->
+		<!-- Confirmed CT2.5 -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
 		<set name="skillType" val="DUMMY" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04200-04299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04200-04299.xml
index 38b05bcabd9b1418cf658e6686f024bd2e547962..fba8eceff1070492bab5c9a889be6fdb5c0c6eaf 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04200-04299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04200-04299.xml
@@ -213,7 +213,7 @@
 		<set name="target" val="TARGET_ONE" />
 		<set name="reuseDelay" val="8000" />
 		<set name="hitTime" val="2000" />
-		<set name="skillType" val="HEAL_PERCENT" />
+		<set name="skillType" val="BUFF" />
 		<set name="operateType" val="A2" />
 		<set name="castRange" val="700" />
 		<set name="effectRange" val="1200" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04300-04399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04300-04399.xml
index 89fc10b12461da56138f7853f3ca8eb0093ff72d..7bbf31ee14ef70cd194c1ed8a7c9bb53d6516aa6 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04300-04399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04300-04399.xml
@@ -1047,7 +1047,7 @@
 	<skill id="4367" levels="1" name="Clan Hall Manager Buff">
 		<!-- Freya retail confirmed -->
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="MPHOT" />
+		<set name="skillType" val="BUFF" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A2" />
 		<for>
@@ -1057,7 +1057,7 @@
 	<skill id="4368" levels="1" name="Clan Hall Manager Buff">
 		<!-- Freya retail confirmed -->
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="MPHOT" />
+		<set name="skillType" val="BUFF" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A2" />
 		<for>
@@ -1069,7 +1069,7 @@
 	<skill id="4369" levels="1" name="Clan Hall Manager Buff">
 		<!-- Freya retail confirmed -->
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="MPHOT" />
+		<set name="skillType" val="BUFF" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A2" />
 		<for>
@@ -1081,7 +1081,7 @@
 	<skill id="4370" levels="1" name="Clan Hall Manager Buff">
 		<!-- Freya retail confirmed -->
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="MPHOT" />
+		<set name="skillType" val="BUFF" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A2" />
 		<for>
@@ -1093,7 +1093,7 @@
 	<skill id="4371" levels="1" name="Clan Hall Manager Buff">
 		<!-- Freya retail confirmed -->
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="MPHOT" />
+		<set name="skillType" val="BUFF" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A2" />
 		<for>
@@ -1105,7 +1105,7 @@
 	<skill id="4372" levels="1" name="Clan Hall Manager Buff">
 		<!-- Freya retail confirmed -->
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="MPHOT" />
+		<set name="skillType" val="BUFF" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A2" />
 		<for>
@@ -1117,7 +1117,7 @@
 	<skill id="4373" levels="1" name="Clan Hall Manager Buff">
 		<!-- Freya retail confirmed -->
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="MPHOT" />
+		<set name="skillType" val="BUFF" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A2" />
 		<for>
@@ -1129,7 +1129,7 @@
 	<skill id="4374" levels="1" name="Clan Hall Manager Buff">
 		<!-- Freya retail confirmed -->
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="MPHOT" />
+		<set name="skillType" val="BUFF" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A2" />
 		<for>
@@ -1141,7 +1141,7 @@
 	<skill id="4375" levels="1" name="Clan Hall Manager Buff">
 		<!-- Freya retail confirmed -->
 		<set name="target" val="TARGET_ONE" />
-		<set name="skillType" val="MPHOT" />
+		<set name="skillType" val="BUFF" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A2" />
 		<for>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/04700-04799.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/04700-04799.xml
index 00fe36d08e095e040fbb4399263f4453a074057f..237df7ceba8adc23ccfc2f275ccd4bc80c159fd9 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/04700-04799.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/04700-04799.xml
@@ -1521,7 +1521,7 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
-		<set name="skillType" val="HOT" />
+		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_CLAN_MEMBER" />
 		<for>
 			<effect count="15" name="HealOverTime" val="#hot" abnormalLvl="#abnormalLvl" abnormalType="life_force_others" />
@@ -1542,7 +1542,7 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
-		<set name="skillType" val="HOT" />
+		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_CLAN_MEMBER" />
 		<for>
 			<effect count="15" name="HealOverTime" val="#hot" abnormalLvl="#abnormalLvl" abnormalType="life_force_others" />
@@ -1563,7 +1563,7 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
-		<set name="skillType" val="HOT" />
+		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_CLAN_MEMBER" />
 		<for>
 			<effect count="15" name="HealOverTime" val="#hot" abnormalLvl="#abnormalLvl" abnormalType="life_force_others" />
@@ -1584,7 +1584,7 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
-		<set name="skillType" val="HOT" />
+		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_CLAN_MEMBER" />
 		<for>
 			<effect count="15" name="HealOverTime" val="#hot" abnormalLvl="#abnormalLvl" abnormalType="life_force_others" />
@@ -1605,7 +1605,7 @@
 		<set name="mpConsume" val="#mpConsume" />
 		<set name="operateType" val="A2" />
 		<set name="reuseDelay" val="8000" />
-		<set name="skillType" val="HOT" />
+		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_CLAN_MEMBER" />
 		<for>
 			<effect count="15" name="HealOverTime" val="#hot" abnormalLvl="#abnormalLvl" abnormalType="life_force_others" />
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 e10b99289df109ee117d9787a893056c10d730b1..573c23f8910c436570915867bfe12d43137df9ab 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
@@ -504,7 +504,7 @@
 		<set name="target" val="TARGET_ONE" />
 		<set name="skillRadius" val="1000" />
 		<set name="reuseDelay" val="8000" />
-		<set name="skillType" val="HOT" />
+		<set name="skillType" val="DUMMY" />
 		<set name="isMagic" val="true" />
 		<set name="castRange" val="600" />
 		<set name="effectRange" val="1100" />
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 5f75b64192b9ccdcddd6ceb3183ad1e349dccba7..e53f977addd2696fdc01e18e3f7f39f17caddb01 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="DUMMY" />
+		<set name="skillType" val="BUFF" />
 		<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/06700-06799.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/06700-06799.xml
index 7d1e0828890a5fbad4c1f8d4b83908d670d096af..3eac1808361d89dbf832f1343721ef17aa48e504 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
@@ -250,7 +250,7 @@
 		<set name="hitTime" val="1500" />
 		<set name="isMagic" val="true" />
 		<set name="operateType" val="A2" />
-		<set name="skillType" val="HEAL" />
+		<set name="skillType" val="BUFF" />
 		<set name="target" val="TARGET_ONE" />
 		<for>
 			<effect count="15" name="HealOverTime" val="30" abnormalLvl="6" abnormalType="life_force_others" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/22100-22199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/22100-22199.xml
index d4d4d19b0a05f16e85fa8f524eaedf964c7f08db..04d6efda8291bfbe60ef941e43cf34002b089c10 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/22100-22199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/22100-22199.xml
@@ -966,7 +966,7 @@
 		<!-- Confirmed CT2.5 -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
-		<set name="skillType" val="BUFF" />
+		<set name="skillType" val="DUMMY" />
 		<set name="target" val="TARGET_SELF" />
 		<cond>
 			<player hp="30" />
@@ -979,7 +979,7 @@
 		<!-- Confirmed CT2.5 -->
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="P" />
-		<set name="skillType" val="BUFF" />
+		<set name="skillType" val="DUMMY" />
 		<set name="target" val="TARGET_SELF" />
 		<cond>
 			<player mp="10" />