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 2060a4c79a42ea266d1c577731e8e3ce0cafb951..52005c8a930d2de6978167566a5b1d6316a8f980 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
@@ -755,9 +755,6 @@
 			<using kind="Dagger,Dual Dagger" />
 		</cond>
 		<for>
-			<effect self="1" name="Buff">
-				<add order="0x40" stat="runSpd" val="40" />
-			</effect>
 			<effect name="FatalBlow" />
 			<effect name="Bluff">
 				<param chance="80" />
@@ -766,6 +763,11 @@
 				<param halfLethal="5" />
 			</effect>
 		</for>
+		<selfEffects>
+			<effect name="Buff">
+				<add order="0x40" stat="runSpd" val="40" />
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="322" levels="6" name="Shield Fortress" enchantGroup1="1" enchantGroup2="1">
 		<table name="#magicLvl"> 64 66 68 70 72 74 </table>
@@ -1413,8 +1415,10 @@
 		</cond>
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect self="1" name="FocusEnergy" val="8" />
 		</for>
+		<selfEffects>
+			<effect name="FocusEnergy" val="8" />
+		</selfEffects>
 	</skill>
 	<skill id="346" levels="1" name="Raging Force">
 		<!-- Confirmed CT2.5 and Updated to H5 -->
@@ -1436,8 +1440,10 @@
 		</cond>
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect self="1" name="FocusEnergy" val="8" />
 		</for>
+		<selfEffects>
+			<effect name="FocusEnergy" val="8" />
+		</selfEffects>
 	</skill>
 	<skill id="347" levels="1" name="Earthquake" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6">
 		<table name="#ench1Power"> 5201 5228 5254 5281 5307 5334 5360 5387 5413 5440 5466 5693 5519 5546 5572 </table>
@@ -2398,23 +2404,27 @@
 			<effect name="TargetMeProbability">
 				<param chance="40" />
 			</effect>
-			<effect self="1" name="ImmobileBuff">
+		</for>
+		<selfEffects>
+			<effect name="ImmobileBuff">
 				<add order="0x40" stat="pDef" val="5400" />
 				<add order="0x40" stat="mDef" val="4050" />
 				<sub order="0x40" stat="cancelVuln" val="80" />
 			</effect>
-		</for>
+		</selfEffects>
 		<enchant2for>
 			<effect name="TargetMeProbability">
 				<param chance="40" />
 			</effect>
-			<effect self="1" name="Buff">
+		</enchant2for>
+		<enchant2selfEffects>
+			<effect name="Buff">
 				<add order="0x40" stat="pDef" val="5400" />
 				<add order="0x40" stat="mDef" val="4050" />
 				<sub order="0x40" stat="cancelVuln" val="80" />
 				<mul order="0x30" stat="runSpd" val="#ench2decreasePenalty" />
 			</effect>
-		</enchant2for>
+		</enchant2selfEffects>
 	</skill>
 	<skill id="369" levels="1" name="Evade Shot" enchantGroup1="6" enchantGroup2="6" enchantGroup3="6" enchantGroup4="6" enchantGroup5="6" enchantGroup6="6" enchantGroup7="6" enchantGroup8="6">
 		<table name="#ench1Power"> 2168 2179 2190 2201 2212 2223 2234 2245 2256 2267 2278 2289 2300 2311 2322 </table>
@@ -2462,16 +2472,20 @@
 		</cond>
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect self="1" name="Buff">
+		</for>
+		<selfEffects>
+			<effect name="Buff">
 				<add order="0x40" stat="rEvas" val="6" />
 			</effect>
-		</for>
+		</selfEffects>
 		<enchant2for>
 			<effect name="PhysicalAttack" />
-			<effect self="1" name="Buff">
+		</enchant2for>
+		<enchant2selfEffects>
+			<effect name="Buff">
 				<add order="0x40" stat="rEvas" val="#ench2rEvas" />
 			</effect>
-		</enchant2for>
+		</enchant2selfEffects>
 	</skill>
 	<skill id="370" levels="3" name="Clan Body">
 		<!-- Confirmed CT2.5 -->
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 d355f5b7f141a374d209f72d86a1278d45721657..a9913a8830ba367345bf685575bb58aae685098f 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
@@ -576,14 +576,16 @@
 			<using kind="Dagger,Dual Dagger" />
 		</cond>
 		<for>
-			<effect self="1" name="Buff">
-				<mul order="0x30" stat="blowRate" val="#blowRate" />
-			</effect>
 			<effect name="FatalBlow" />
 			<effect name="Lethal">
 				<param halfLethal="5" />
 			</effect>
 		</for>
+		<selfEffects>
+			<effect name="Buff">
+				<mul order="0x30" stat="blowRate" val="#blowRate" />
+			</effect>
+		</selfEffects>
 	</skill>
 	<skill id="410" levels="3" name="Mortal Strike" enchantGroup1="2" enchantGroup2="2">
 		<!-- NOTE: This skill increases "Blow Rate" and description in client says "Critical Rate" but is client typo, so please don't change this skill -->
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 000a8446e08bec3fda80150b07bd83237011a8e6..6b8a821dc49367bc224574a873073e5720f87ad6 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
@@ -2154,8 +2154,10 @@
 		<set name="targetType" val="ONE" />
 		<for>
 			<effect name="PhysicalAttack" />
-			<effect self="1" name="FocusEnergy" val="#maxCharges" />
 		</for>
+		<selfEffects>
+			<effect name="FocusEnergy" val="#maxCharges" />
+		</selfEffects>
 	</skill>
 	<skill id="571" levels="4" name="Poison Dust">
 		<!-- Confirmed CT2.5 -->
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 84e6edef3451f65a829f9dc62a4cb7d6dfa1aa8c..cfe89f1c8e93a448679c9d802ccd0df734bfa6e5 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
@@ -1491,10 +1491,12 @@
 			<effect name="Buff">
 				<mul order="0x30" stat="pAtk" val="1.2" />
 			</effect>
-			<effect self="1" name="CallSkill">
+		</for>
+		<selfEffects>
+			<effect name="CallSkill">
 				<param skillId="5602" skillLevel="1" />
 			</effect>
-		</for>
+		</selfEffects>
 	</skill>
 	<skill id="680" levels="1" name="Divine Knight Hate">
 		<!-- Confirmed CT2.5 -->
@@ -1648,10 +1650,12 @@
 			<effect name="Buff">
 				<mul order="0x30" stat="pDef" val="1.2" />
 			</effect>
-			<effect self="1" name="CallSkill">
+		</for>
+		<selfEffects>
+			<effect name="CallSkill">
 				<param skillId="5602" skillLevel="1" />
 			</effect>
-		</for>
+		</selfEffects>
 	</skill>
 	<skill id="686" levels="1" name="Divine Rogue Stun Shot">
 		<set name="abnormalLvl" val="1" />
@@ -1798,10 +1802,12 @@
 			<effect name="Buff">
 				<add order="0x40" stat="rEvas" val="10" />
 			</effect>
-			<effect self="1" name="CallSkill">
+		</for>
+		<selfEffects>
+			<effect name="CallSkill">
 				<param skillId="5602" skillLevel="1" />
 			</effect>
-		</for>
+		</selfEffects>
 	</skill>
 	<skill id="692" levels="1" name="Divine Wizard Holy Flare">
 		<set name="abnormalLvl" val="0" />
@@ -1821,10 +1827,12 @@
 		<set name="targetType" val="ONE" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect self="1" name="Buff">
+		</for>
+		<selfEffects>
+			<effect name="Buff">
 				<mul order="0x30" stat="pvpMagicalDmg" val="0.5" />
 			</effect>
-		</for>
+		</selfEffects>
 	</skill>
 	<skill id="693" levels="1" name="Divine Wizard Holy Strike">
 		<set name="castRange" val="900" />
@@ -1949,10 +1957,12 @@
 			<effect name="Buff">
 				<mul order="0x30" stat="mAtk" val="1.2" />
 			</effect>
-			<effect self="1" name="CallSkill">
+		</for>
+		<selfEffects>
+			<effect name="CallSkill">
 				<param skillId="5602" skillLevel="1" />
 			</effect>
-		</for>
+		</selfEffects>
 	</skill>
 	<skill id="698" levels="1" name="Divine Healer Major Heal">
 		<set name="castRange" val="600" />
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 5c03c4769a38f33ed289f4d7cfdfbf34d2317972..97ce0f662b1d1cda21f3bfd10a90f0d42c75f22b 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
@@ -74,10 +74,12 @@
 		<for>
 			<effect name="HealPercent" val="100" />
 			<effect name="ManaHealPercent" val="100" />
-			<effect self="1" name="CallSkill">
+		</for>
+		<selfEffects>
+			<effect name="CallSkill">
 				<param skillId="5602" skillLevel="1" />
 			</effect>
-		</for>
+		</selfEffects>
 	</skill>
 	<skill id="704" levels="1" name="Divine Enchanter Water Spirit">
 		<set name="abnormalLvl" val="1" />
@@ -274,10 +276,12 @@
 				<mul order="0x30" stat="mAtk" val="1.1" />
 				<mul order="0x30" stat="mAtkSpd" val="1.1" />
 			</effect>
-			<effect self="1" name="CallSkill">
+		</for>
+		<selfEffects>
+			<effect name="CallSkill">
 				<param skillId="5602" skillLevel="1" />
 			</effect>
-		</for>
+		</selfEffects>
 	</skill>
 	<skill id="710" levels="1" name="Divine Summoner Summon Divine Beast">
 		<set name="hitTime" val="15000" />
@@ -391,10 +395,12 @@
 				<basemul order="0x30" stat="rCrit" val="0.2" />
 				<mul order="0x30" stat="cAtk" val="1.2" />
 			</effect>
-			<effect self="1" name="CallSkill">
+		</for>
+		<selfEffects>
+			<effect name="CallSkill">
 				<param skillId="5602" skillLevel="1" />
 			</effect>
-		</for>
+		</selfEffects>
 	</skill>
 	<skill id="715" levels="4" name="Zaken Energy Drain">
 		<!-- Confirmed CT2.5 -->
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/00800-00899.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/00800-00899.xml
index fdac0a765442fb801d74e223c53501f6e6cc18ea..422af13ac98d9fb69ed80f2cbe4857010bfaf966 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/00800-00899.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/00800-00899.xml
@@ -1757,10 +1757,12 @@
 		<set name="simultaneousCast" val="true" />
 		<set name="targetType" val="AURA" />
 		<for>
-			<effect self="1" name="Blink" />
 			<effect name="PhysicalAttack" />
 			<effect name="Stun" />
 		</for>
+		<selfEffects>
+			<effect name="Blink" />
+		</selfEffects>
 	</skill>
 	<skill id="886" levels="11" name="Air Shock Bomb">
 		<!-- Aurabird Falcon -->
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 a6e5016acdcc9d2244b9e9c0da155109149001ad..98145753766c6203e16a6fab8ccd8b315d76879b 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
@@ -960,9 +960,11 @@
 		<set name="overHit" val="true" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect self="1" name="FocusSouls" val="1" />
 			<effect name="PhysicalAttack" />
 		</for>
+		<selfEffects>
+			<effect name="FocusSouls" val="1" />
+		</selfEffects>
 	</skill>
 	<skill id="940" levels="1" name="Fake Attack">
 		<set name="hitTime" val="1000" />
@@ -1958,8 +1960,10 @@
 		<for>
 			<effect name="TargetMe" />
 			<effect name="GetAgro" />
-			<effect self="1" name="ChanceSkillTrigger" activationChance="30" chanceType="ON_ATTACKED_HIT" triggeredId="6913" />
 		</for>
+		<selfEffects>
+			<effect name="ChanceSkillTrigger" activationChance="30" chanceType="ON_ATTACKED_HIT" triggeredId="6913" />
+		</selfEffects>
 	</skill>
 	<skill id="986" levels="25" name="Deadly Strike">
 		<!-- High Five Skill -->
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml
index e4c9f5eadf747ba970de9776e0151a2cf7243d34..ec8c49acc6929f5b297927912371488b7b7afa24 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/01100-01199.xml
@@ -716,9 +716,11 @@
 		</for>
 		<enchant2for>
 			<effect name="HpByLevel" val="#ench1Drain" />
-			<effect self="1" name="CpHeal" val="#ench2Bravery" />
 			<effect name="ConsumeBody" />
 		</enchant2for>
+		<enchant2selfEffects>
+			<effect name="CpHeal" val="#ench2Bravery" />
+		</enchant2selfEffects>
 	</skill>
 	<skill id="1154" levels="6" name="Summon Corrupted Man" enchantGroup1="1">
 		<table name="#itemConsumeCount"> 3 3 3 3 3 3 </table>
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 fff7376692e5c5e6af08ac3237f3e4717d215938..b68280b5159941dd884e4e673630e0d2eab0bba1 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
@@ -853,10 +853,12 @@
 		<enchant2 name="power" val="#ench2Power" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect self="1" name="Buff">
+		</for>
+		<selfEffects>
+			<effect name="Buff">
 				<mul order="0x30" stat="pvpMagicalDmg" val="0.5" />
 			</effect>
-		</for>
+		</selfEffects>
 	</skill>
 	<skill id="1232" levels="3" name="Blazing Skin" enchantGroup1="1" enchantGroup2="1" enchantGroup3="1" enchantGroup4="1">
 		<table name="#abnormalLvls"> 1 2 3 </table>
@@ -986,10 +988,12 @@
 		</enchant3for>
 		<enchant4for>
 			<effect name="HpDrain" val="0.4" />
-			<effect self="1" name="Buff">
+		</enchant4for>
+		<enchant4selfEffects>
+			<effect name="Buff">
 				<add order="0x40" stat="darkPower" val="#enchElementPower" />
 			</effect>
-		</enchant4for>
+		</enchant4selfEffects>
 	</skill>
 	<skill id="1235" levels="28" name="Hydro Blast" enchantGroup1="2" enchantGroup2="2" enchantGroup3="2" enchantGroup4="2">
 		<!-- Confirmed CT2.5 -->
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 d1d4cefbe4bf8f607f13c3a692e700eefd4cf0b7..3d98ea614854bb7537aa314976e6d475328bbd1f 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
@@ -1684,10 +1684,12 @@
 		<enchant2 name="flyRadius" val="#ench2Radius" />
 		<enchant2 name="magicLvl" val="#enchMagicLvl" />
 		<for>
-			<effect self="1" name="Blink" />
 			<effect name="PhysicalSoulAttack" />
 			<effect name="Stun" />
 		</for>
+		<selfEffects>
+			<effect name="Blink" />
+		</selfEffects>
 	</skill>
 	<skill id="1449" levels="1" name="Transfer Soul">
 		<!-- Confirmed CT2.5 -->
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 12884ca2c7abc13a0651ebeaf8d996e78e6974d6..dcd7bc17e95b1811e316020ab7a8cb5f8f512c10 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
@@ -1634,8 +1634,10 @@
 		<set name="targetType" val="AREA" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect self="1" name="ManaHeal" val="10" /> <!-- FIXME: value unconfirmed -->
 		</for>
+		<selfEffects>
+			<effect name="ManaHeal" val="10" /> <!-- FIXME: value unconfirmed -->
+		</selfEffects>
 	</skill>
 	<skill id="1555" levels="1" name="Aura Cannon">
 		<!-- High Five Skill -->
@@ -1655,8 +1657,10 @@
 		<set name="targetType" val="ONE" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect self="1" name="ManaHeal" val="10" /> <!-- FIXME: value unconfirmed -->
 		</for>
+		<selfEffects>
+			<effect name="ManaHeal" val="10" /> <!-- FIXME: value unconfirmed -->
+		</selfEffects>
 	</skill>
 	<skill id="1556" levels="1" name="Arcane Shield">
 		<!-- High Five Skill -->
@@ -1695,7 +1699,6 @@
 		<set name="targetType" val="SERVITOR" />
 		<for>
 			<!-- Note: 0.5 means 50% of owner's patk! -->
-			<effect self="1" name="ServitorShare" /> <!-- This effect is used to cancel pet's effect when player's have been canceled. -->
 			<effect name="ServitorShare">
 				<share order="0x40" stat="pAtk" val="0.5" />
 				<share order="0x40" stat="pDef" val="0.5" />
@@ -1708,6 +1711,9 @@
 				<share order="0x40" stat="mAtkSpd" val="0.03" />
 			</effect>
 		</for>
+		<selfEffects>
+			<effect name="ServitorShare" /> <!-- This effect is used to cancel pet's effect when player's have been canceled. -->
+		</selfEffects>
 	</skill>
 	<skill id="1558" levels="24" name="Dimension Spiral">
 		<!-- High Five Skill -->
@@ -1731,8 +1737,10 @@
 		<set name="targetType" val="ONE" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect self="1" name="ChanceSkillTrigger" activationChance="5" chanceType="ON_START" triggeredId="5571" />
 		</for>
+		<selfEffects>
+			<effect name="ChanceSkillTrigger" activationChance="5" chanceType="ON_START" triggeredId="5571" />
+		</selfEffects>
 	</skill>
 	<skill id="1559" levels="3" name="Potential Ability">
 		<!-- High Five Skill -->
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 052c276688f89a228583be65db4b241d92f369cc..16aa58df746576bc6b8bc558c6ab298d69daaac9 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
@@ -1309,11 +1309,13 @@
 		<set name="targetType" val="ONE" />
 		<for>
 			<effect name="FatalBlow" />
-			<effect self="1" name="Buff">
+		</for>
+		<selfEffects>
+			<effect name="Buff">
 				<param chance="80" />
 				<add order="0x40" stat="runSpd" val="40" />
 			</effect>
-		</for>
+		</selfEffects>
 	</skill>
 	<skill id="5085" levels="1" name="Anesthesia">
 		<!-- Confirmed CT2.5 -->
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 c410fea487e21299fde40a6816af64480178f581..2ff7e208371076fd43eef861e1e24b22975bdf30 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
@@ -979,10 +979,12 @@
 		<set name="targetType" val="ONE" />
 		<for>
 			<effect name="MagicalAttack" />
-			<effect self="1" name="Debuff">
+		</for>
+		<selfEffects>
+			<effect name="Debuff">
 				<mul order="0x30" stat="pvpMagicalDmg" val="0.5" />
 			</effect>
-		</for>
+		</selfEffects>
 	</skill>
 	<skill id="5657" levels="85" name="Gatekeeper Prominence">
 		<table name="#effectPoints"> -92 -97 -101 -106 -111 -116 -121 -126 -132 -138 -143 -149 -156 -162 -168 -175 -182 -189 -196 -204 -211 -219 -227 -235 -243 -251 -259 -268 -277 -285 -294 -303 -313 -322 -331 -341 -350 -360 -369 -379 -389 -399 -408 -418 -428 -438 -448 -457 -467 -477 -486 -495 -505 -514 -523 -532 -541 -549 -558 -566 -574 -582 -590 -597 -604 -611 -617 -624 -630 -635 -641 -646 -650 -655 -659 -662 -666 -669 -673 -676 -679 -681 -684 -687 -689 </table>
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 135e72f906ba1b6ffbd91a05b8fff51223c40516..b663a4a4fa77fbc9a6f8928def06cc0f0b15bae6 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
@@ -1152,9 +1152,11 @@
 		<set name="targetType" val="AURA" />
 		<set name="trait" val="SHOCK" />
 		<for>
-			<effect self="1" name="Blink" />
 			<effect name="Stun" />
 		</for>
+		<selfEffects>
+			<effect name="Blink" />
+		</selfEffects>
 	</skill>
 	<skill id="7079" levels="1" name="Test - Party Damage Absorb">
 		<set name="abnormalLvl" val="1" />
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/22000-22099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/22000-22099.xml
index 0408afb7723f64fdc277aa04724c942eaf6cac06..f698b522d115442bd53e176feef9f4236374e115 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/22000-22099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/22000-22099.xml
@@ -1706,7 +1706,10 @@
 		<set name="reuseDelay" val="5000" />
 		<set name="targetType" val="CORPSE_MOB" />
 		<for>
-			<effect self="1" name="Buff">
+			<effect name="ConsumeBody" />
+		</for>
+		<selfEffects>
+			<effect name="Buff">
 				<mul order="0x30" stat="maxHp" val="1.6" />
 				<mul order="0x30" stat="maxMp" val="1.6" />
 				<mul order="0x30" stat="maxCp" val="1.6" />
@@ -1718,7 +1721,6 @@
 				<mul order="0x30" stat="MagicalMpConsumeRate" val="0.9" />
 				<mul order="0x30" stat="DanceMpConsumeRate" val="0.9" />
 			</effect>
-			<effect name="ConsumeBody" />
-		</for>
+		</selfEffects>
 	</skill>
 </list>
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 e1ce8189599cffcc378069d79c4892fe7513f5f3..d4fc1e0246ad66570adf72f0880210d9c8a91960 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
@@ -16,7 +16,10 @@
 		<set name="reuseDelay" val="5000" />
 		<set name="targetType" val="CORPSE_MOB" />
 		<for>
-			<effect self="1" name="Buff">
+			<effect name="ConsumeBody" />
+		</for>
+		<selfEffects>
+			<effect name="Buff">
 				<mul order="0x30" stat="maxHp" val="1.4" />
 				<mul order="0x30" stat="maxMp" val="1.4" />
 				<mul order="0x30" stat="maxCp" val="1.4" />
@@ -28,8 +31,7 @@
 				<mul order="0x30" stat="PhysicalMpConsumeRate" val="0.9" />
 				<mul order="0x30" stat="DanceMpConsumeRate" val="0.9" />
 			</effect>
-			<effect name="ConsumeBody" />
-		</for>
+		</selfEffects>
 	</skill>
 	<skill id="22101" levels="1" name="Fortune of Love Box">
 		<!-- Confirmed CT2.5 -->