diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java
index 30f05ecfdffc6f396c50eebd66d5567b7e84338f..d6e7de1a46d00187d8c3a1028eb5a8d320c237fd 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeFace.java
@@ -30,9 +30,12 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
  */
 public final class ChangeFace extends AbstractEffect
 {
+	private final int _value;
+	
 	public ChangeFace(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		_value = params != null ? params.getInt("value", 0) : 0;
 	}
 	
 	@Override
@@ -50,7 +53,7 @@ public final class ChangeFace extends AbstractEffect
 		}
 		
 		final L2PcInstance player = info.getEffector().getActingPlayer();
-		player.getAppearance().setFace((int) getValue());
+		player.getAppearance().setFace(_value);
 		player.broadcastUserInfo();
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java
index e7d97d2ab806ee25fc627cb466079d49798dc9e0..581e34d3ba69a4c3dfecdbdda11e5c2a9442c4ea 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairColor.java
@@ -30,9 +30,12 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
  */
 public final class ChangeHairColor extends AbstractEffect
 {
+	private final int _value;
+	
 	public ChangeHairColor(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		_value = params != null ? params.getInt("value", 0) : 0;
 	}
 	
 	@Override
@@ -50,7 +53,7 @@ public final class ChangeHairColor extends AbstractEffect
 		}
 		
 		final L2PcInstance player = info.getEffector().getActingPlayer();
-		player.getAppearance().setHairColor((int) getValue());
+		player.getAppearance().setHairColor(_value);
 		player.broadcastUserInfo();
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java
index 506b17b6ae7d550ef2148184468f5ff1e06b0b95..6b802fb80664e54ada0d11fb445052600c70379f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/ChangeHairStyle.java
@@ -30,9 +30,12 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
  */
 public final class ChangeHairStyle extends AbstractEffect
 {
+	private final int _value;
+	
 	public ChangeHairStyle(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		_value = params != null ? params.getInt("value", 0) : 0;
 	}
 	
 	@Override
@@ -50,7 +53,7 @@ public final class ChangeHairStyle extends AbstractEffect
 		}
 		
 		final L2PcInstance player = info.getEffector().getActingPlayer();
-		player.getAppearance().setHairStyle((int) getValue());
+		player.getAppearance().setHairStyle(_value);
 		player.broadcastUserInfo();
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java
index 273eff3e71a09234030767d6975cc291665d83b3..7b5135190da68b247ed366e0ba1f98d66dea988f 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/CrystalGradeModify.java
@@ -30,9 +30,12 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
  */
 public final class CrystalGradeModify extends AbstractEffect
 {
+	private final int _grade;
+	
 	public CrystalGradeModify(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		_grade = params != null ? params.getInt("grade", 0) : 0;
 	}
 	
 	@Override
@@ -54,6 +57,6 @@ public final class CrystalGradeModify extends AbstractEffect
 	@Override
 	public void onStart(BuffInfo info)
 	{
-		info.getEffected().getActingPlayer().setExpertisePenaltyBonus((int) getValue());
+		info.getEffected().getActingPlayer().setExpertisePenaltyBonus(_grade);
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java
index 1c9a05ec378df68fb4a09fd28e2ab6e714688015..bcebc5daf1a226efddd50c26da0563939fe60968 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/GiveSp.java
@@ -29,9 +29,12 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
  */
 public final class GiveSp extends AbstractEffect
 {
+	private final int _sp;
+	
 	public GiveSp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		_sp = params != null ? params.getInt("sp", 0) : 0;
 	}
 	
 	@Override
@@ -48,6 +51,6 @@ public final class GiveSp extends AbstractEffect
 			return;
 		}
 		
-		info.getEffector().getActingPlayer().addExpAndSp(0, (int) getValue());
+		info.getEffector().getActingPlayer().addExpAndSp(0, _sp);
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java
index 5d1149410e9000bf8c81219fcbc0df3fb07ce277..3695e6bcac1481ed5390061053fdf7b97878bd77 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/HeadquarterCreate.java
@@ -40,7 +40,7 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
 public class HeadquarterCreate extends AbstractEffect
 {
 	private static final int HQ_NPC_ID = 35062;
-	private static boolean _isAdvanced;
+	private final boolean _isAdvanced;
 	
 	public HeadquarterCreate(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java
index 9c93ae7e6dcc6fd01d8ffdcfa7980491d9448469..b8d746ffa3e2502c2ede84233d3719a93a3c58aa 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/RefuelAirship.java
@@ -31,9 +31,12 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
  */
 public final class RefuelAirship extends AbstractEffect
 {
+	private final int _value;
+	
 	public RefuelAirship(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		_value = params != null ? params.getInt("value", 0) : 0;
 	}
 	
 	@Override
@@ -52,7 +55,7 @@ public final class RefuelAirship extends AbstractEffect
 	public void onStart(BuffInfo info)
 	{
 		final L2AirShipInstance ship = info.getEffector().getActingPlayer().getAirShip();
-		ship.setFuel(ship.getFuel() + (int) getValue());
+		ship.setFuel(ship.getFuel() + _value);
 		ship.updateAbnormalEffect();
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java
index 302ce8c5a670236b971d680a9c894a68ca490f5b..0e80fe1a477b54b2f836ff99cf3b951ff2fb20e2 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StaticDamage.java
@@ -30,9 +30,12 @@ import com.l2jserver.gameserver.model.skills.BuffInfo;
  */
 public final class StaticDamage extends AbstractEffect
 {
+	private final int _power;
+	
 	public StaticDamage(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		_power = params != null ? params.getInt("power", 0) : 0;
 	}
 	
 	@Override
@@ -55,12 +58,12 @@ public final class StaticDamage extends AbstractEffect
 			return;
 		}
 		
-		info.getEffected().reduceCurrentHp(getValue(), info.getEffector(), info.getSkill());
-		info.getEffected().notifyDamageReceived(getValue(), info.getEffector(), info.getSkill(), false, false);
+		info.getEffected().reduceCurrentHp(_power, info.getEffector(), info.getSkill());
+		info.getEffected().notifyDamageReceived(_power, info.getEffector(), info.getSkill(), false, false);
 		
 		if (info.getEffector().isPlayer())
 		{
-			info.getEffector().sendDamageMessage(info.getEffected(), (int) getValue(), false, false, false);
+			info.getEffector().sendDamageMessage(info.getEffected(), _power, false, false, false);
 		}
 	}
 }
\ No newline at end of file
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java
index 27a54c42bdd40093885d31afdb1b52eb44d453c5..70205106ad5aa2a3f123b0015a30537109df1599 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/StealAbnormal.java
@@ -36,7 +36,6 @@ import com.l2jserver.gameserver.model.stats.Formulas;
 public final class StealAbnormal extends AbstractEffect
 {
 	private final String _slot;
-	
 	private final int _rate;
 	private final int _max;
 	
diff --git a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java
index b41f9943c060fb9e34f8f69dea0878b9ab4324ac..624816e769f3ea2ec390d1422b1b88d1cfbd1c0c 100644
--- a/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java
+++ b/L2J_DataPack_BETA/dist/game/data/scripts/handlers/effecthandlers/VitalityPointUp.java
@@ -30,9 +30,12 @@ import com.l2jserver.gameserver.network.serverpackets.UserInfo;
  */
 public final class VitalityPointUp extends AbstractEffect
 {
+	private final float _value;
+	
 	public VitalityPointUp(Condition attachCond, Condition applyCond, StatsSet set, StatsSet params)
 	{
 		super(attachCond, applyCond, set, params);
+		_value = params != null ? params.getFloat("value", 0) : 0;
 	}
 	
 	@Override
@@ -50,7 +53,7 @@ public final class VitalityPointUp extends AbstractEffect
 	@Override
 	public void onStart(BuffInfo info)
 	{
-		info.getEffected().getActingPlayer().updateVitalityPoints((float) getValue(), false, false);
+		info.getEffected().getActingPlayer().updateVitalityPoints(_value, false, false);
 		info.getEffected().getActingPlayer().sendPacket(new UserInfo(info.getEffected().getActingPlayer()));
 	}
 }
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02100-02199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02100-02199.xml
index d72733b9fed586af5ec64a06dc48370084459b2c..ee119e61e38d5f4f56ca01da1ceb60131f5c64b0 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02100-02199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02100-02199.xml
@@ -419,7 +419,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeFace" val="1" />
+			<effect name="ChangeFace">
+				<param value="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2124" levels="1" name="Facelifting Potion">
@@ -431,7 +433,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeFace" val="2" />
+			<effect name="ChangeFace">
+				<param value="2" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2125" levels="1" name="Dye Potion">
@@ -455,7 +459,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeHairColor" val="1" />
+			<effect name="ChangeHairColor">
+				<param value="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2127" levels="1" name="Dye Potion">
@@ -467,7 +473,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeHairColor" val="2" />
+			<effect name="ChangeHairColor">
+				<param value="2" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2128" levels="1" name="Dye Potion">
@@ -479,7 +487,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeHairColor" val="3" />
+			<effect name="ChangeHairColor">
+				<param value="3" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2129" levels="1" name="Hair Style Change Potion">
@@ -503,7 +513,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeHairStyle" val="1" />
+			<effect name="ChangeHairStyle">
+				<param value="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2131" levels="1" name="Hair Style Change Potion">
@@ -515,7 +527,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeHairStyle" val="2" />
+			<effect name="ChangeHairStyle">
+				<param value="2" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2132" levels="1" name="Hair Style Change Potion">
@@ -527,7 +541,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeHairStyle" val="3" />
+			<effect name="ChangeHairStyle">
+				<param value="3" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2133" levels="1" name="Hair Style Change Potion">
@@ -539,7 +555,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeHairStyle" val="4" />
+			<effect name="ChangeHairStyle">
+				<param value="4" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2134" levels="1" name="Hair Style Change Potion">
@@ -550,12 +568,14 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
-		<for>
-			<effect name="ChangeHairStyle" val="5" />
-		</for>
 		<cond msgId="1518">
 			<player sex="1" />
 		</cond>
+		<for>
+			<effect name="ChangeHairStyle">
+				<param value="5" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="2135" levels="1" name="Hair Style Change Potion">
 		<!-- Confirmed CT2.5 -->
@@ -565,12 +585,14 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
-		<for>
-			<effect name="ChangeHairStyle" val="6" />
-		</for>
 		<cond msgId="1518">
 			<player sex="1" />
 		</cond>
+		<for>
+			<effect name="ChangeHairStyle">
+				<param value="6" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="2136" levels="1" name="Rice Cake">
 		<!-- Confirmed CT2.5 -->
@@ -821,7 +843,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="GiveSp" val="#amount" />
+			<effect name="GiveSp">
+				<param sp="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2168" levels="6" name="Raid Blessing">
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 d81ecede9ba735844084064fd759daf2a69709d0..562ec0f83118f09d086558da72e785e792917319 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
@@ -1870,7 +1870,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeFace" val="1" />
+			<effect name="ChangeFace">
+				<param value="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2293" levels="1" name="Facelifting Potion">
@@ -1882,7 +1884,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeFace" val="2" />
+			<effect name="ChangeFace">
+				<param value="2" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2294" levels="1" name="Dye Potion">
@@ -1906,7 +1910,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeHairColor" val="1" />
+			<effect name="ChangeHairColor">
+				<param value="1" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2296" levels="1" name="Dye Potion">
@@ -1918,7 +1924,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeHairColor" val="2" />
+			<effect name="ChangeHairColor">
+				<param value="2" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2297" levels="1" name="Dye Potion">
@@ -1930,7 +1938,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeHairColor" val="3" />
+			<effect name="ChangeHairColor">
+				<param value="3" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2298" levels="1" name="Hair Style Change Potion">
@@ -1954,7 +1964,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeHairStyle" val="1" />
+			<effect name="ChangeHairStyle">
+				<param value="1" />
+			</effect>
 		</for>
 	</skill>
 </list>
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02300-02399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02300-02399.xml
index c34335b43adc730aa6c2e2452d9be32ee3744eb5..ac9697b11a285a173899bb5e0e167dd0787105ec 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02300-02399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02300-02399.xml
@@ -9,7 +9,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeHairStyle" val="2" />
+			<effect name="ChangeHairStyle">
+				<param value="2" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2301" levels="1" name="Hair Style Change Potion">
@@ -21,7 +23,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeHairStyle" val="3" />
+			<effect name="ChangeHairStyle">
+				<param value="3" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2302" levels="1" name="Hair Style Change Potion">
@@ -33,7 +37,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="ChangeHairStyle" val="4" />
+			<effect name="ChangeHairStyle">
+				<param value="4" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2303" levels="1" name="Hair Style Change Potion">
@@ -44,12 +50,14 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
-		<for>
-			<effect name="ChangeHairStyle" val="5" />
-		</for>
 		<cond msgId="1518">
 			<player sex="1" />
 		</cond>
+		<for>
+			<effect name="ChangeHairStyle">
+				<param value="5" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="2304" levels="1" name="Hair Style Change Potion">
 		<!-- Confirmed CT2.5 -->
@@ -59,12 +67,14 @@
 		<set name="magicLvl" val="1" />
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
-		<for>
-			<effect name="ChangeHairStyle" val="6" />
-		</for>
 		<cond msgId="1518">
 			<player sex="1" />
 		</cond>
+		<for>
+			<effect name="ChangeHairStyle">
+				<param value="6" />
+			</effect>
+		</for>
 	</skill>
 	<skill id="2305" levels="1" name="Primeval Potion">
 		<!-- Confirmed CT2.5 -->
@@ -98,7 +108,9 @@
 			<player levelRange="76;85" />
 		</cond>
 		<for>
-			<effect name="GiveSp" val="#amount" />
+			<effect name="GiveSp">
+				<param sp="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2307" levels="1" name="Remove Petrification Scroll">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02500-02599.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02500-02599.xml
index 74b28573d34d28a25899b7ddd3264cd4311167a2..4983c8fe05089fda27363a837a6a3dd1677778ad 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02500-02599.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02500-02599.xml
@@ -1563,7 +1563,9 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="VitalityPointUp" val="#value" />
+			<effect name="VitalityPointUp">
+				<param value="#value" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2587" levels="1" name="Increase number of teleport slots.">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02600-02699.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02600-02699.xml
index 9a04e3745f3be63c9134f5a9e455ff876e897eeb..60cb640ae43b13615a5a6e3e904c5e9c3f4255da 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02600-02699.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02600-02699.xml
@@ -97,7 +97,9 @@
 			<player level="76" />
 		</cond>
 		<for>
-			<effect name="GiveSp" val="#amount" />
+			<effect name="GiveSp">
+				<param sp="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2609" levels="20" name="Escape">
@@ -610,7 +612,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="VitalityPointUp" val="20000" />
+			<effect name="VitalityPointUp">
+				<param value="20000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2646" levels="1" name="Honey Wheat Cake">
@@ -622,7 +626,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="VitalityPointUp" val="20000" />
+			<effect name="VitalityPointUp">
+				<param value="20000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2647" levels="1" name="Energy Star Stone">
@@ -637,7 +643,9 @@
 			<player canRefuelAirship="25" />
 		</cond>
 		<for>
-			<effect name="RefuelAirship" val="25" />
+			<effect name="RefuelAirship">
+				<param value="25" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2648" levels="1" name="High Quality Energy Star Stone">
@@ -652,7 +660,9 @@
 			<player canRefuelAirship="100" />
 		</cond>
 		<for>
-			<effect name="RefuelAirship" val="100" />
+			<effect name="RefuelAirship">
+				<param value="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2649" levels="9" name="Escape - Gludin Village">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/02800-02899.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/02800-02899.xml
index e7295f8857cc4e0108f7d307eba571c4b8b5b065..77be825dae976b3069b6599b206febf531ec4a17 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/02800-02899.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/02800-02899.xml
@@ -1810,7 +1810,9 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="VitalityPointUp" val="20000" />
+			<effect name="VitalityPointUp">
+				<param value="20000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="2895" levels="1" name="Special White Day Candy Basket">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml
index 4576d3324d7e0b6e08cf5f6a027a19c9832991a3..1b29e6c64c23de4a1e394b6b70812174da71c405 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/03200-03299.xml
@@ -1011,7 +1011,9 @@
 			<target npcId="13031,13032,13033,13034,13035,13120,13121,13122,13123,13124" />
 		</cond>
 		<for>
-			<effect name="StaticDamage" val="100" />
+			<effect name="StaticDamage">
+				<param power="100" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3261" levels="1" name="Forgiveness">
@@ -1047,7 +1049,9 @@
 			<target npcId="13031,13032,13033,13034,13035,13120,13121,13122,13123,13124" />
 		</cond>
 		<for>
-			<effect name="StaticDamage" val="200" />
+			<effect name="StaticDamage">
+				<param power="200" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="3263" levels="1" name="Blessed Resurrection">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/05700-05799.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/05700-05799.xml
index 9a991063ac9bb6bc2d3ea3405a0b226d670798b8..d688eef85eab77df7d10722856fe0945d2cef595 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/05700-05799.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/05700-05799.xml
@@ -1279,7 +1279,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="ONE" />
 		<for>
-			<effect name="VitalityPointUp" val="#value" />
+			<effect name="VitalityPointUp">
+				<param value="#value" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="5775" levels="1" name="Great Blessing of Pathfinder">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/08300-08399.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/08300-08399.xml
index 7e37bde411aba6927dee479b6a4405be3d8cde11..822abe9cdb0a4d1e1c503e55c2b744cbee505b25 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/08300-08399.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/08300-08399.xml
@@ -975,7 +975,9 @@
 		<set name="reuseDelay" val="4000" />
 		<set name="targetType" val="FRONT_AREA" />
 		<for>
-			<effect name="StaticDamage" val="10000" />
+			<effect name="StaticDamage">
+				<param power="10000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="8358" levels="1" name="Remove the seal of an Agathion - Towbat">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/09000-09099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/09000-09099.xml
index ffcd0d3759c2f0e0d72ece75669dbd3a642583e4..2db674c1f249746a838295021c62eb1b587544ea 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/09000-09099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/09000-09099.xml
@@ -550,7 +550,9 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="VitalityPointUp" val="20000" />
+			<effect name="VitalityPointUp">
+				<param value="20000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="9039" levels="1" name="Steamed Rice Cake">
@@ -563,7 +565,9 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="VitalityPointUp" val="20000" />
+			<effect name="VitalityPointUp">
+				<param value="20000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="9040" levels="1" name="PC Cafe Points">
@@ -1086,7 +1090,9 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="GiveSp" val="10000" />
+			<effect name="GiveSp">
+				<param sp="10000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="9070" levels="1" name="Halloween Pumpkin">
@@ -1328,7 +1334,9 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="VitalityPointUp" val="20000" />
+			<effect name="VitalityPointUp">
+				<param value="20000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="9082" levels="1" name="White Christmas Petition">
@@ -1364,7 +1372,9 @@
 		<set name="reuseDelay" val="3600000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="VitalityPointUp" val="20000" />
+			<effect name="VitalityPointUp">
+				<param value="20000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="9084" levels="1" name="White Christmas Petition - event">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/09100-09199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/09100-09199.xml
index e064e4d81f1b30ea7841a637804b38087e0f532e..f0f510f0f7d184e15ea6fd07c899f9bfa50a4919 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/09100-09199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/09100-09199.xml
@@ -1106,7 +1106,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="GiveSp" val="500000" />
+			<effect name="GiveSp">
+				<param sp="500000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="9175" levels="1" name="1,000,000 SP scroll">
@@ -1118,7 +1120,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="GiveSp" val="1000000" />
+			<effect name="GiveSp">
+				<pamam sp="1000000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="9176" levels="1" name="Provided gift of cheers">
@@ -1182,7 +1186,9 @@
 		<set name="reuseDelay" val="3000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="GiveSp" val="#amount" />
+			<effect name="GiveSp">
+				<param sp="#amount" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="9181" levels="1" name="Nevit's Hourglass - 4 hour(s)">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/21100-21199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/21100-21199.xml
index fcba9143da963e22ee16b9fd4d350b779d2aa4d1..b1fc8a0841041f32c905f66e5c8e6e52aa5c5c83 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/21100-21199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/21100-21199.xml
@@ -1638,7 +1638,9 @@
 		<set name="reuseDelay" val="1800000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="VitalityPointUp" val="20000" />
+			<effect name="VitalityPointUp">
+				<param value="20000" />
+			</effect>
 			<effect name="Buff">
 				<sub order="0x40" stat="vitalityConsumeRate" val="0" />
 			</effect>
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 c1a0a84621cf5a04b62dff267794a5fb524739f1..fae86e405b2175f70f1350f5bda930babee6c9e4 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
@@ -89,7 +89,9 @@
 		<set name="reuseDelay" val="2000" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="VitalityPointUp" val="600" />
+			<effect name="VitalityPointUp">
+				<param value="600" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="22006" levels="1" name="Halloween Candy">
@@ -99,7 +101,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="VitalityPointUp" val="20000" />
+			<effect name="VitalityPointUp">
+				<param value="20000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="22007" levels="1" name="Good Luck Lucky Bag">
@@ -539,7 +543,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="VitalityPointUp" val="20000" />
+			<effect name="VitalityPointUp">
+				<param value="20000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="22029" levels="1" name="Baguette Herb">
@@ -740,7 +746,9 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="CrystalGradeModify" val="#bonus" />
+			<effect name="CrystalGradeModify">
+				<param grade="#bonus" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="22042" levels="1" name="High Grade Potion of Will">
@@ -997,7 +1005,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="VitalityPointUp" val="5000" />
+			<effect name="VitalityPointUp">
+				<param value="5000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="22056" levels="1" name="Wind Walk">
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 18676f420e4a88b3459e5e4707e6c4fffc421fd4..b7c988b74ce8290c29e629ee39622130d1f0e467 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
@@ -707,7 +707,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="VitalityPointUp" val="20000" />
+			<effect name="VitalityPointUp">
+				<param value="20000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="22138" levels="1" name="Mango Dessert">
@@ -720,7 +722,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="VitalityPointUp" val="20000" />
+			<effect name="VitalityPointUp">
+				<param value="20000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="22139" levels="1" name="Branding Wind Walk">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/23100-23199.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/23100-23199.xml
index 24604c7e3e0d075a5bf07ab008a88c734adc86a7..616b04138e0d48510f0ea679bb3acab94e431c27 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/23100-23199.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/23100-23199.xml
@@ -699,7 +699,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="VitalityPointUp" val="20000" />
+			<effect name="VitalityPointUp">
+				<param value="20000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="23163" levels="1" name="Turkey's Big Mistake">
@@ -754,7 +756,9 @@
 		<set name="targetType" val="ONE" />
 		<for>
 			<!-- TODO: Need new effect i_dispel_by_name. -->
-			<effect name="VitalityPointUp" val="5000" />
+			<effect name="VitalityPointUp">
+				<param value="5000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="23167" levels="1" name="Rosy Seduction">
@@ -974,7 +978,9 @@
 		<set name="operateType" val="A1" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="VitalityPointUp" val="20000" />
+			<effect name="VitalityPointUp">
+				<param value="20000" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="23181" levels="1" name="Three-headed Dragon Agathion Cute Trick">
diff --git a/L2J_DataPack_BETA/dist/game/data/stats/skills/26000-26099.xml b/L2J_DataPack_BETA/dist/game/data/stats/skills/26000-26099.xml
index 0eb9645adf44513a4277416191a7d538e86f59fc..fa6597ac555d5e098c19c9d6faf4fbc134acfc7a 100644
--- a/L2J_DataPack_BETA/dist/game/data/stats/skills/26000-26099.xml
+++ b/L2J_DataPack_BETA/dist/game/data/stats/skills/26000-26099.xml
@@ -648,7 +648,9 @@
 		<set name="operateType" val="P" />
 		<set name="targetType" val="SELF" />
 		<for>
-			<effect name="CrystalGradeModify" val="#bonus" />
+			<effect name="CrystalGradeModify">
+				<param grade="#bonus" />
+			</effect>
 		</for>
 	</skill>
 	<skill id="26049" levels="1" name="Rune of Feather">