diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/39400-39499.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/39400-39499.xml
index 479ca430d1..19637ce780 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/39400-39499.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/items/39400-39499.xml
@@ -547,132 +547,232 @@
 	<item id="39466" name="Windy Healing Potion" type="EtcItem">
 		<!-- Quickly restores HP for 15 sec. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_scarlet_i00" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="10000" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="2" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17904" level="1" /> <!-- Windy Healing Potion -->
+		</skills>
 	</item>
 	<item id="39467" name="Greater Windy Healing Potion" type="EtcItem">
 		<!-- Quickly restores HP for 15 sec. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_scarlet_i00" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="10000" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="2" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17905" level="1" /> <!-- Greater Windy Healing Potion -->
+		</skills>
 	</item>
 	<item id="39468" name="Major Windy Healing Potion" type="EtcItem">
 		<!-- Quickly restores HP for 15 sec. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_scarlet_i00" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="10000" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="2" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17906" level="1" /> <!-- Major Windy Healing Potion -->
+		</skills>
 	</item>
 	<item id="39469" name="Superior Windy Healing Potion" type="EtcItem">
 		<!-- Quickly restores HP for 15 sec. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_scarlet_i00" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="10000" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="2" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17907" level="1" /> <!-- Superior Windy Healing Potion -->
+		</skills>
 	</item>
 	<item id="39470" name="Supreme Windy Healing Potion" type="EtcItem">
 		<!-- Quickly restores HP for 15 sec. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_scarlet_i00" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="10000" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="2" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17908" level="1" /> <!-- Supreme Windy Healing Potion -->
+		</skills>
 	</item>
 	<item id="39471" name="Windy Quick Healing Potion" type="EtcItem">
 		<!-- Restores 625 HP. If HP is full, CP is restored. No duration. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="weight" val="20" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17909" level="1" /> <!-- Windy Quick Healing Potion -->
+		</skills>
 	</item>
 	<item id="39472" name="Greater Windy Quick Healing Potion" type="EtcItem">
 		<!-- Restores 1250 HP. If HP is full, CP is restored. No duration. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="weight" val="20" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17910" level="1" /> <!-- Greater Windy Quick Healing Potion -->
+		</skills>
 	</item>
 	<item id="39473" name="Major Windy Quick Healing Potion" type="EtcItem">
 		<!-- Restores 2500 HP. If HP is full, CP is restored. No duration. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="weight" val="20" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17911" level="1" /> <!-- Major Windy Quick Healing Potion -->
+		</skills>
 	</item>
 	<item id="39474" name="Superior Windy Quick Healing Potion" type="EtcItem">
 		<!-- Restores 3750 HP. If HP is full, CP is restored. No duration. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="weight" val="20" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17912" level="1" /> <!-- Superior Windy Quick Healing Potion -->
+		</skills>
 	</item>
 	<item id="39475" name="Supreme Windy Quick Healing Potion" type="EtcItem">
 		<!-- Restores 5000 HP. If HP is full, CP is restored. No duration. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="weight" val="20" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17913" level="1" /> <!-- Supreme Windy Quick Healing Potion -->
+		</skills>
 	</item>
 	<item id="39476" name="Low-grade Love Potion" type="EtcItem">
 		<!-- For 15 sec., P./M. Atk. and Atk./Casting Spd. are increased. A strange power changes the appearance of your weapon. Cannot be used in the Olympiad. -->
diff --git a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17900-17999.xml b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17900-17999.xml
index 7fc4859541..a0de54a7df 100644
--- a/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17900-17999.xml
+++ b/L2J_Mobius_1.0_Ertheia/dist/game/data/stats/skills/17900-17999.xml
@@ -21,39 +21,123 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="17904" toLevel="1" name="Windy Healing Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Quickly restores HP. Lasts 15 sec. -->
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>HP_RECOVER</abnormalType>
 		<icon>icon.etc_potion_scarlet_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealOverTime">
+				<power>24</power>
+				<ticks>1</ticks>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17905" toLevel="1" name="Major Windy Healing Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Quickly restores HP. Lasts 15 sec. -->
 		<icon>icon.etc_potion_scarlet_i00</icon>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>HP_RECOVER</abnormalType>
+		<icon>icon.etc_potion_scarlet_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealOverTime">
+				<power>48</power>
+				<ticks>1</ticks>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17906" toLevel="1" name="Greater Windy Healing Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Quickly restores HP. Lasts 15 sec. -->
 		<icon>icon.etc_potion_scarlet_i00</icon>
+		<abnormalLvl>3</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>HP_RECOVER</abnormalType>
+		<icon>icon.etc_potion_scarlet_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealOverTime">
+				<power>72</power>
+				<ticks>1</ticks>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17907" toLevel="1" name="Superior Windy Healing Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Quickly restores HP. Lasts 15 sec. -->
 		<icon>icon.etc_potion_scarlet_i00</icon>
+		<abnormalLvl>4</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>HP_RECOVER</abnormalType>
+		<icon>icon.etc_potion_scarlet_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealOverTime">
+				<power>96</power>
+				<ticks>1</ticks>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17908" toLevel="1" name="Supreme Windy Healing Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Quickly restores HP. Lasts 15 sec. -->
 		<icon>icon.etc_potion_scarlet_i00</icon>
+		<abnormalLvl>5</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>HP_RECOVER</abnormalType>
+		<icon>icon.etc_potion_scarlet_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealOverTime">
+				<power>120</power>
+				<ticks>1</ticks>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17909" toLevel="1" name="Windy Quick Healing Potion">
 		<!-- Restores 625 HP and restores CP with remaining power. No duration. -->
@@ -62,20 +146,14 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>1000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="Cp">
-				<amount>300</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="Hp">
-				<amount>625</amount>
-				<mode>DIFF</mode>
+			<effect name="HpCpHeal">
+				<power>625</power>
 			</effect>
 		</effects>
 	</skill>
@@ -86,20 +164,14 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>1000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="Cp">
-				<amount>600</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="Hp">
-				<amount>1250</amount>
-				<mode>DIFF</mode>
+			<effect name="HpCpHeal">
+				<power>1250</power>
 			</effect>
 		</effects>
 	</skill>
@@ -110,20 +182,14 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>1000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="Cp">
-				<amount>1200</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="Hp">
-				<amount>2500</amount>
-				<mode>DIFF</mode>
+			<effect name="HpCpHeal">
+				<power>2500</power>
 			</effect>
 		</effects>
 	</skill>
@@ -134,20 +200,14 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>1000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="Cp">
-				<amount>2400</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="Hp">
-				<amount>3750</amount>
-				<mode>DIFF</mode>
+			<effect name="HpCpHeal">
+				<power>3750</power>
 			</effect>
 		</effects>
 	</skill>
@@ -158,20 +218,14 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>1000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="Cp">
-				<amount>3200</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="Hp">
-				<amount>5000</amount>
-				<mode>DIFF</mode>
+			<effect name="HpCpHeal">
+				<power>5000</power>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/39400-39499.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/39400-39499.xml
index 15ec817ea2..f9ce77d14c 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/39400-39499.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/items/39400-39499.xml
@@ -547,132 +547,232 @@
 	<item id="39466" name="Windy Healing Potion" type="EtcItem">
 		<!-- Quickly restores HP for 15 sec. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_scarlet_i00" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="10000" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="2" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17904" level="1" /> <!-- Windy Healing Potion -->
+		</skills>
 	</item>
 	<item id="39467" name="Greater Windy Healing Potion" type="EtcItem">
 		<!-- Quickly restores HP for 15 sec. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_scarlet_i00" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="10000" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="2" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17905" level="1" /> <!-- Greater Windy Healing Potion -->
+		</skills>
 	</item>
 	<item id="39468" name="Major Windy Healing Potion" type="EtcItem">
 		<!-- Quickly restores HP for 15 sec. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_scarlet_i00" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="10000" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="2" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17906" level="1" /> <!-- Major Windy Healing Potion -->
+		</skills>
 	</item>
 	<item id="39469" name="Superior Windy Healing Potion" type="EtcItem">
 		<!-- Quickly restores HP for 15 sec. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_scarlet_i00" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="10000" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="2" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17907" level="1" /> <!-- Superior Windy Healing Potion -->
+		</skills>
 	</item>
 	<item id="39470" name="Supreme Windy Healing Potion" type="EtcItem">
 		<!-- Quickly restores HP for 15 sec. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_scarlet_i00" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="10000" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="2" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17908" level="1" /> <!-- Supreme Windy Healing Potion -->
+		</skills>
 	</item>
 	<item id="39471" name="Windy Quick Healing Potion" type="EtcItem">
 		<!-- Restores 625 HP. If HP is full, CP is restored. No duration. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="weight" val="20" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17909" level="1" /> <!-- Windy Quick Healing Potion -->
+		</skills>
 	</item>
 	<item id="39472" name="Greater Windy Quick Healing Potion" type="EtcItem">
 		<!-- Restores 1250 HP. If HP is full, CP is restored. No duration. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="weight" val="20" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17910" level="1" /> <!-- Greater Windy Quick Healing Potion -->
+		</skills>
 	</item>
 	<item id="39473" name="Major Windy Quick Healing Potion" type="EtcItem">
 		<!-- Restores 2500 HP. If HP is full, CP is restored. No duration. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="weight" val="20" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17911" level="1" /> <!-- Major Windy Quick Healing Potion -->
+		</skills>
 	</item>
 	<item id="39474" name="Superior Windy Quick Healing Potion" type="EtcItem">
 		<!-- Restores 3750 HP. If HP is full, CP is restored. No duration. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="weight" val="20" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17912" level="1" /> <!-- Superior Windy Quick Healing Potion -->
+		</skills>
 	</item>
 	<item id="39475" name="Supreme Windy Quick Healing Potion" type="EtcItem">
 		<!-- Restores 5000 HP. If HP is full, CP is restored. No duration. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="weight" val="20" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17913" level="1" /> <!-- Supreme Windy Quick Healing Potion -->
+		</skills>
 	</item>
 	<item id="39476" name="Low-grade Love Potion" type="EtcItem">
 		<!-- For 15 sec., P./M. Atk. and Atk./Casting Spd. are increased. A strange power changes the appearance of your weapon. Cannot be used in the Olympiad. Cannot be stacked with Battle Rhapsody Dance. -->
diff --git a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17900-17999.xml b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17900-17999.xml
index fca0da0952..98dd934921 100644
--- a/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17900-17999.xml
+++ b/L2J_Mobius_2.5_Underground/dist/game/data/stats/skills/17900-17999.xml
@@ -21,39 +21,123 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="17904" toLevel="1" name="Windy Healing Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Quickly restores HP. Lasts 15 sec. -->
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>HP_RECOVER</abnormalType>
 		<icon>icon.etc_potion_scarlet_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealOverTime">
+				<power>24</power>
+				<ticks>1</ticks>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17905" toLevel="1" name="Major Windy Healing Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Quickly restores HP. Lasts 15 sec. -->
 		<icon>icon.etc_potion_scarlet_i00</icon>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>HP_RECOVER</abnormalType>
+		<icon>icon.etc_potion_scarlet_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealOverTime">
+				<power>48</power>
+				<ticks>1</ticks>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17906" toLevel="1" name="Greater Windy Healing Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Quickly restores HP. Lasts 15 sec. -->
 		<icon>icon.etc_potion_scarlet_i00</icon>
+		<abnormalLvl>3</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>HP_RECOVER</abnormalType>
+		<icon>icon.etc_potion_scarlet_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealOverTime">
+				<power>72</power>
+				<ticks>1</ticks>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17907" toLevel="1" name="Superior Windy Healing Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Quickly restores HP. Lasts 15 sec. -->
 		<icon>icon.etc_potion_scarlet_i00</icon>
+		<abnormalLvl>4</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>HP_RECOVER</abnormalType>
+		<icon>icon.etc_potion_scarlet_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealOverTime">
+				<power>96</power>
+				<ticks>1</ticks>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17908" toLevel="1" name="Supreme Windy Healing Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Quickly restores HP. Lasts 15 sec. -->
 		<icon>icon.etc_potion_scarlet_i00</icon>
+		<abnormalLvl>5</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>HP_RECOVER</abnormalType>
+		<icon>icon.etc_potion_scarlet_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealOverTime">
+				<power>120</power>
+				<ticks>1</ticks>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17909" toLevel="1" name="Windy Quick Healing Potion">
 		<!-- Restores 625 HP and restores CP with remaining power. No duration. -->
@@ -62,20 +146,14 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>1000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="Cp">
-				<amount>300</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="Hp">
-				<amount>625</amount>
-				<mode>DIFF</mode>
+			<effect name="HpCpHeal">
+				<power>625</power>
 			</effect>
 		</effects>
 	</skill>
@@ -86,20 +164,14 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>1000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="Cp">
-				<amount>600</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="Hp">
-				<amount>1250</amount>
-				<mode>DIFF</mode>
+			<effect name="HpCpHeal">
+				<power>1250</power>
 			</effect>
 		</effects>
 	</skill>
@@ -110,20 +182,14 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>1000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="Cp">
-				<amount>1200</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="Hp">
-				<amount>2500</amount>
-				<mode>DIFF</mode>
+			<effect name="HpCpHeal">
+				<power>2500</power>
 			</effect>
 		</effects>
 	</skill>
@@ -134,20 +200,14 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>1000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="Cp">
-				<amount>2400</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="Hp">
-				<amount>3750</amount>
-				<mode>DIFF</mode>
+			<effect name="HpCpHeal">
+				<power>3750</power>
 			</effect>
 		</effects>
 	</skill>
@@ -158,20 +218,14 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>1000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="Cp">
-				<amount>3200</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="Hp">
-				<amount>5000</amount>
-				<mode>DIFF</mode>
+			<effect name="HpCpHeal">
+				<power>5000</power>
 			</effect>
 		</effects>
 	</skill>
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/39400-39499.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/39400-39499.xml
index 15ec817ea2..f9ce77d14c 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/39400-39499.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/items/39400-39499.xml
@@ -547,132 +547,232 @@
 	<item id="39466" name="Windy Healing Potion" type="EtcItem">
 		<!-- Quickly restores HP for 15 sec. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_scarlet_i00" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="10000" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="2" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17904" level="1" /> <!-- Windy Healing Potion -->
+		</skills>
 	</item>
 	<item id="39467" name="Greater Windy Healing Potion" type="EtcItem">
 		<!-- Quickly restores HP for 15 sec. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_scarlet_i00" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="10000" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="2" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17905" level="1" /> <!-- Greater Windy Healing Potion -->
+		</skills>
 	</item>
 	<item id="39468" name="Major Windy Healing Potion" type="EtcItem">
 		<!-- Quickly restores HP for 15 sec. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_scarlet_i00" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="10000" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="2" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17906" level="1" /> <!-- Major Windy Healing Potion -->
+		</skills>
 	</item>
 	<item id="39469" name="Superior Windy Healing Potion" type="EtcItem">
 		<!-- Quickly restores HP for 15 sec. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_scarlet_i00" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="10000" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="2" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17907" level="1" /> <!-- Superior Windy Healing Potion -->
+		</skills>
 	</item>
 	<item id="39470" name="Supreme Windy Healing Potion" type="EtcItem">
 		<!-- Quickly restores HP for 15 sec. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_scarlet_i00" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="reuse_delay" val="10000" />
+		<set name="handler" val="ItemSkills" />
 		<set name="weight" val="2" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17908" level="1" /> <!-- Supreme Windy Healing Potion -->
+		</skills>
 	</item>
 	<item id="39471" name="Windy Quick Healing Potion" type="EtcItem">
 		<!-- Restores 625 HP. If HP is full, CP is restored. No duration. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="weight" val="20" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17909" level="1" /> <!-- Windy Quick Healing Potion -->
+		</skills>
 	</item>
 	<item id="39472" name="Greater Windy Quick Healing Potion" type="EtcItem">
 		<!-- Restores 1250 HP. If HP is full, CP is restored. No duration. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="weight" val="20" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17910" level="1" /> <!-- Greater Windy Quick Healing Potion -->
+		</skills>
 	</item>
 	<item id="39473" name="Major Windy Quick Healing Potion" type="EtcItem">
 		<!-- Restores 2500 HP. If HP is full, CP is restored. No duration. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="weight" val="20" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17911" level="1" /> <!-- Major Windy Quick Healing Potion -->
+		</skills>
 	</item>
 	<item id="39474" name="Superior Windy Quick Healing Potion" type="EtcItem">
 		<!-- Restores 3750 HP. If HP is full, CP is restored. No duration. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="weight" val="20" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17912" level="1" /> <!-- Superior Windy Quick Healing Potion -->
+		</skills>
 	</item>
 	<item id="39475" name="Supreme Windy Quick Healing Potion" type="EtcItem">
 		<!-- Restores 5000 HP. If HP is full, CP is restored. No duration. Cannot be used in the Olympiad / Ceremony of Chaos. -->
 		<set name="icon" val="icon.etc_potion_gold_i00" />
 		<set name="weight" val="20" />
+		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="LIQUID" />
+		<set name="handler" val="ItemSkills" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="is_oly_restricted" val="true" />
 		<set name="is_commissionable" val="false" />
 		<set name="is_private_storeable" val="false" />
 		<set name="etcitem_type" val="POTION" />
+		<set name="commissionItemType" val="POTION" />
 		<set name="is_stackable" val="true" />
+		<set name="is_freightable" val="false" />
+		<skills>
+			<skill id="17913" level="1" /> <!-- Supreme Windy Quick Healing Potion -->
+		</skills>
 	</item>
 	<item id="39476" name="Low-grade Love Potion" type="EtcItem">
 		<!-- For 15 sec., P./M. Atk. and Atk./Casting Spd. are increased. A strange power changes the appearance of your weapon. Cannot be used in the Olympiad. Cannot be stacked with Battle Rhapsody Dance. -->
diff --git a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17900-17999.xml b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17900-17999.xml
index 026711989e..87317cf691 100644
--- a/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17900-17999.xml
+++ b/L2J_Mobius_3.0_Helios/dist/game/data/stats/skills/17900-17999.xml
@@ -21,39 +21,123 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="17904" toLevel="1" name="Windy Healing Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Quickly restores HP. Lasts 15 sec. -->
+		<abnormalLvl>1</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>HP_RECOVER</abnormalType>
 		<icon>icon.etc_potion_scarlet_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealOverTime">
+				<power>24</power>
+				<ticks>1</ticks>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17905" toLevel="1" name="Major Windy Healing Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Quickly restores HP. Lasts 15 sec. -->
 		<icon>icon.etc_potion_scarlet_i00</icon>
+		<abnormalLvl>2</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>HP_RECOVER</abnormalType>
+		<icon>icon.etc_potion_scarlet_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealOverTime">
+				<power>48</power>
+				<ticks>1</ticks>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17906" toLevel="1" name="Greater Windy Healing Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Quickly restores HP. Lasts 15 sec. -->
 		<icon>icon.etc_potion_scarlet_i00</icon>
+		<abnormalLvl>3</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>HP_RECOVER</abnormalType>
+		<icon>icon.etc_potion_scarlet_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealOverTime">
+				<power>72</power>
+				<ticks>1</ticks>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17907" toLevel="1" name="Superior Windy Healing Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Quickly restores HP. Lasts 15 sec. -->
 		<icon>icon.etc_potion_scarlet_i00</icon>
+		<abnormalLvl>4</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>HP_RECOVER</abnormalType>
+		<icon>icon.etc_potion_scarlet_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealOverTime">
+				<power>96</power>
+				<ticks>1</ticks>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17908" toLevel="1" name="Supreme Windy Healing Potion">
-		<!-- AUTO GENERATED SKILL -->
 		<!-- Quickly restores HP. Lasts 15 sec. -->
 		<icon>icon.etc_potion_scarlet_i00</icon>
+		<abnormalLvl>5</abnormalLvl>
+		<abnormalTime>15</abnormalTime>
+		<abnormalType>HP_RECOVER</abnormalType>
+		<icon>icon.etc_potion_scarlet_i00</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A2</operateType>
 		<reuseDelay>10000</reuseDelay>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<basicProperty>NONE</basicProperty>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+		<effects>
+			<effect name="HealOverTime">
+				<power>120</power>
+				<ticks>1</ticks>
+			</effect>
+		</effects>
 	</skill>
 	<skill id="17909" toLevel="1" name="Windy Quick Healing Potion">
 		<!-- Restores 625 HP and restores CP with remaining power. No duration. -->
@@ -62,20 +146,14 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>1000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="Cp">
-				<amount>300</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="Hp">
-				<amount>625</amount>
-				<mode>DIFF</mode>
+			<effect name="HpCpHeal">
+				<power>625</power>
 			</effect>
 		</effects>
 	</skill>
@@ -86,20 +164,14 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>1000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="Cp">
-				<amount>600</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="Hp">
-				<amount>1250</amount>
-				<mode>DIFF</mode>
+			<effect name="HpCpHeal">
+				<power>1250</power>
 			</effect>
 		</effects>
 	</skill>
@@ -110,20 +182,14 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>1000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="Cp">
-				<amount>1200</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="Hp">
-				<amount>2500</amount>
-				<mode>DIFF</mode>
+			<effect name="HpCpHeal">
+				<power>2500</power>
 			</effect>
 		</effects>
 	</skill>
@@ -134,20 +200,14 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>1000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="Cp">
-				<amount>2400</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="Hp">
-				<amount>3750</amount>
-				<mode>DIFF</mode>
+			<effect name="HpCpHeal">
+				<power>3750</power>
 			</effect>
 		</effects>
 	</skill>
@@ -158,20 +218,14 @@
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
-		<reuseDelay>1000</reuseDelay>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
-			<effect name="Cp">
-				<amount>3200</amount>
-				<mode>DIFF</mode>
-			</effect>
-			<effect name="Hp">
-				<amount>5000</amount>
-				<mode>DIFF</mode>
+			<effect name="HpCpHeal">
+				<power>5000</power>
 			</effect>
 		</effects>
 	</skill>