diff --git a/trunk/dist/game/data/stats/items/37700-37799.xml b/trunk/dist/game/data/stats/items/37700-37799.xml
index b085c5efa2..d6697102e3 100644
--- a/trunk/dist/game/data/stats/items/37700-37799.xml
+++ b/trunk/dist/game/data/stats/items/37700-37799.xml
@@ -85,12 +85,20 @@
 	</item>
 	<item id="37704" name="Love Potion" type="EtcItem">
 		<!-- Herb that modifies the appearance of weapons for Valentine's Day. -->
+		<set name="immediate_effect" val="true" />
+		<set name="ex_immediate_effect" val="true" />
+		<set name="material" val="PAPER" />
 		<set name="is_depositable" val="false" />
+		<set name="handler" val="ItemSkills" />
 		<set name="is_clan_depositable" val="false" />
 		<set name="is_mailable" val="false" />
 		<set name="is_freightable" val="false" />
 		<set name="is_commissionable" val="false" />
 		<set name="icon" val="icon.etc_whiteday_herb" />
+		<set name="for_npc" val="true" />
+		<skills>
+			<skill id="17154" level="1" /> <!-- Love Potion -->
+		</skills>
 	</item>
 	<item id="37705" name="Chocolate Truffle" type="EtcItem">
 		<!-- Recovers vitality in peace zones. Double click to cast Decadence on the entire party. Can be stacked with Sugar Rush and Forever Alone effects. Cannot be stored in a warehouse. -->
diff --git a/trunk/dist/game/data/stats/skills/17100-17199.xml b/trunk/dist/game/data/stats/skills/17100-17199.xml
index 132e588d75..167546e8fb 100644
--- a/trunk/dist/game/data/stats/skills/17100-17199.xml
+++ b/trunk/dist/game/data/stats/skills/17100-17199.xml
@@ -392,14 +392,14 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="17154" toLevel="1" name="Love Potion">
-		<!-- A strange sensation fogs your brain. Your heart is racing. Your weapon seems to be changing shape. Is that a lady orc? Her muscles are mesmerizing...\nFor 2 minutes, P. Atk. / M. Atk. / Atk. Spd. / Casting Spd. x 2. Effect disappears upon logout. -->
+		<!-- A strange sensation fogs your brain. Your heart is racing. Your weapon seems to be changing shape. Is that a lady orc? Her muscles are mesmerizing... For 2 minutes, P. Atk. / M. Atk. / Atk. Spd. / Casting Spd. x 2. Effect disappears upon logout. -->
 		<icon>icon.etc_whiteday_herb</icon>
 		<itemConsumeId>37704</itemConsumeId>
 		<itemConsumeCount>1</itemConsumeCount>
-		<operateType>A1</operateType>
+		<operateType>A2</operateType>
 		<basicProperty>NONE</basicProperty>
 		<abnormalLvl>1</abnormalLvl>
-		<abnormalTime>300</abnormalTime>
+		<abnormalTime>120</abnormalTime>
 		<abnormalType>TRANSFORM</abnormalType>
 		<abnormalVisualEffect>CHANGE_VALENTINE</abnormalVisualEffect>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -432,10 +432,13 @@
 	<skill id="17155" toLevel="1" name="Coco's Magic">
 		<!-- Equipped weapon changes shape. Is it the sweet magic Coco emits? The effect disappears upon logout. -->
 		<icon>icon.etc_whiteday_herb</icon>
+		<operateType>A2</operateType>
 		<abnormalTime>300</abnormalTime>
-		<targetType>ONE</targetType>
+		<abnormalType>TRANSFORM</abnormalType>
+		<abnormalVisualEffect>CHANGE_VALENTINE</abnormalVisualEffect>
 		<hitCancelTime>0</hitCancelTime>
 		<reuseDelay>2000</reuseDelay>
+		<targetType>TARGET</targetType>
 		<affectScope>SINGLE</affectScope>
 		<effects>
 			<effect name="PAtk">