diff --git a/L2J_Mobius_Classic/dist/game/data/stats/items/29000-29099.xml b/L2J_Mobius_Classic/dist/game/data/stats/items/29000-29099.xml
index 4b99a42667..8582defbc6 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/items/29000-29099.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/items/29000-29099.xml
@@ -241,8 +241,13 @@
 		<set name="default_action" val="SOULSHOT" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="weight" val="5" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="SoulShots" />
+		<skills>
+			<skill id="9293" level="1" /> <!-- Player Commendation - No-grade Soulshot -->
+		</skills>
 	</item>
 	<item id="29024" name="Mysterious Blessed No-grade Spiritshot" type="EtcItem">
 		<!-- A Spiritshot bestowed on a weapon increases its M. Atk. Used with a No-grade weapon. -->
@@ -250,8 +255,13 @@
 		<set name="default_action" val="SPIRITSHOT" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="5" />
 		<set name="is_stackable" val="true" />
+		<set name="is_sellable" val="false" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<skills>
+			<skill id="9300" level="1" /> <!-- Player Commendation - No-grade Blessed Spiritshot -->
+		</skills>
 	</item>
 	<item id="29025" name="Mysterious Soulshot (D-grade)" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon, temporarily increasing power of attack. Used with a D-grade weapon. -->
@@ -262,6 +272,10 @@
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="SoulShots" />
+		<skills>
+			<skill id="9294" level="1" /> <!-- Player Commendation - Soulshot (D-grade) -->
+		</skills>
 	</item>
 	<item id="29026" name="Mysterious Blessed Spiritshot (D-grade)" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon causing its M. Atk. to momentarily increase. Used with a D-grade weapon. -->
@@ -270,8 +284,12 @@
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="D" />
 		<set name="material" val="PAPER" />
+		<set name="handler" val="BlessedSpiritShot" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<skills>
+			<skill id="9301" level="1" /> <!-- Player Commendation - Blessed Spiritshot (D-grade) -->
+		</skills>
 	</item>
 	<item id="29027" name="Mysterious Soulshot (C-grade)" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon, temporarily increasing power of attack. Used with a C-grade weapon. -->
@@ -282,6 +300,10 @@
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="SoulShots" />
+		<skills>
+			<skill id="9295" level="1" /> <!-- Player Commendation - Soulshot (C-grade) -->
+		</skills>
 	</item>
 	<item id="29028" name="Mysterious Blessed Spiritshot (C-grade)" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon causing its M. Atk. to momentarily increase. Used with a C-grade weapon. -->
@@ -290,8 +312,12 @@
 		<set name="immediate_effect" val="true" />
 		<set name="crystal_type" val="C" />
 		<set name="material" val="PAPER" />
+		<set name="handler" val="BlessedSpiritShot" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<skills>
+			<skill id="9302" level="1" /> <!-- Player Commendation - Blessed Spiritshot (C-grade) -->
+		</skills>
 	</item>
 	<item id="29029" name="Blessed Scroll of Escape" type="EtcItem">
 		<!-- Magical scroll that relocates you to the nearest village. -->
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/items/29600-29699.xml b/L2J_Mobius_Classic/dist/game/data/stats/items/29600-29699.xml
index f41d822539..832d5cf144 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/items/29600-29699.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/items/29600-29699.xml
@@ -977,7 +977,7 @@
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="LIQUID" />
 		<set name="weight" val="5" />
-		<set name="is_stackable" val="false" />
+		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="false" />
 		<set name="commissionItemType" val="POTION" />
 		<set name="handler" val="ItemSkills" />
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/items/29700-29799.xml b/L2J_Mobius_Classic/dist/game/data/stats/items/29700-29799.xml
index 1e8712145a..cdb51e2580 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/items/29700-29799.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/items/29700-29799.xml
@@ -515,6 +515,10 @@
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="SoulShots" />
+		<skills>
+			<skill id="55139" level="1" /> <!-- Player Commendation - Soulshot (B-grade) -->
+		</skills>
 	</item>
 	<item id="29747" name="Mysterious Blessed Spiritshot (B-grade)" type="EtcItem">
 		<!-- The power of a higher-level spirit is bestowed upon a weapon causing its M. Atk. to momentarily increase. Used with a B-grade weapon. -->
@@ -525,6 +529,12 @@
 		<set name="material" val="PAPER" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="BlessedSpiritShot" />
+		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<skills>
+			<skill id="55140" level="1" /> <!-- Player Commendation - Blessed Spiritshot (B-grade) -->
+		</skills>
 	</item>
 	<item id="29748" name="Package: Mysterious Soulshot (C-grade, 100 pcs.)" type="EtcItem">
 		<!-- Double-click on the item to receive 100 Mysterious Soulshots (B-grade). -->
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/items/34600-34699.xml b/L2J_Mobius_Classic/dist/game/data/stats/items/34600-34699.xml
index fe045fcde0..f2509097f1 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/items/34600-34699.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/items/34600-34699.xml
@@ -10,6 +10,7 @@
 		<set name="etcitem_type" val="SOULSHOT" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="SoulShots" />
 		<skills>
 			<skill id="9293" level="1" /> <!-- Player Commendation - Soulshot (No-grade) -->
 		</skills>
@@ -25,6 +26,7 @@
 		<set name="etcitem_type" val="SOULSHOT" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="SoulShots" />
 		<skills>
 			<skill id="9294" level="1" /> <!-- Player Commendation - Soulshot (D-grade) -->
 		</skills>
@@ -40,6 +42,7 @@
 		<set name="etcitem_type" val="SOULSHOT" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="SoulShots" />
 		<skills>
 			<skill id="9295" level="1" /> <!-- Player Commendation - Soulshot (C-grade) -->
 		</skills>
@@ -55,6 +58,7 @@
 		<set name="etcitem_type" val="SOULSHOT" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="SoulShots" />
 		<skills>
 			<skill id="9296" level="1" /> <!-- Player Commendation - Soulshot (B-grade) -->
 		</skills>
@@ -70,6 +74,7 @@
 		<set name="etcitem_type" val="SOULSHOT" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="SoulShots" />
 		<skills>
 			<skill id="9297" level="1" /> <!-- Player Commendation - Soulshot (A-grade) -->
 		</skills>
@@ -84,8 +89,9 @@
 		<set name="etcitem_type" val="SOULSHOT" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="BlessedSpiritShot" />
 		<skills>
-			<skill id="9300" level="1" /> <!-- Player Commendation - Blessed Spiritshot (No-grade) -->
+			<skill id="8910" level="1" /> <!-- Player Commendation - Blessed Spiritshot (No-grade) -->
 		</skills>
 	</item>
 	<item id="34611" name="Mysterious Blessed Spiritshot (D-grade)" type="EtcItem">
@@ -99,8 +105,9 @@
 		<set name="etcitem_type" val="SOULSHOT" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="BlessedSpiritShot" />
 		<skills>
-			<skill id="9301" level="1" /> <!-- Player Commendation - Blessed Spiritshot (D-grade) -->
+			<skill id="8911" level="1" /> <!-- Player Commendation - Blessed Spiritshot (D-grade) -->
 		</skills>
 	</item>
 	<item id="34612" name="Mysterious Blessed Spiritshot (C-grade)" type="EtcItem">
@@ -114,8 +121,9 @@
 		<set name="etcitem_type" val="SOULSHOT" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="BlessedSpiritShot" />
 		<skills>
-			<skill id="9302" level="1" /> <!-- Player Commendation - Blessed Spiritshot (C-grade) -->
+			<skill id="8912" level="1" /> <!-- Player Commendation - Blessed Spiritshot (C-grade) -->
 		</skills>
 	</item>
 	<item id="34613" name="Mysterious Blessed Spiritshot (B-grade)" type="EtcItem">
@@ -129,8 +137,9 @@
 		<set name="etcitem_type" val="SOULSHOT" />
 		<set name="immediate_effect" val="true" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="BlessedSpiritShot" />
 		<skills>
-			<skill id="9303" level="1" /> <!-- Player Commendation - Blessed Spiritshot (B-grade) -->
+			<skill id="8913" level="1" /> <!-- Player Commendation - Blessed Spiritshot (B-grade) -->
 		</skills>
 	</item>
 	<item id="34614" name="Mysterious Blessed Spiritshot (A-grade)" type="EtcItem">
@@ -143,9 +152,11 @@
 		<set name="default_action" val="SPIRITSHOT" />
 		<set name="etcitem_type" val="SOULSHOT" />
 		<set name="immediate_effect" val="true" />
+		<set name="handler" val="BlessedSpiritShot" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="BlessedSpiritShot" />
 		<skills>
-			<skill id="9304" level="1" /> <!-- Player Commendation - Blessed Spiritshot (A-grade) -->
+			<skill id="8907" level="1" /> <!-- Player Commendation - Blessed Spiritshot (A-grade) -->
 		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/items/49000-49099.xml b/L2J_Mobius_Classic/dist/game/data/stats/items/49000-49099.xml
index 64fea85300..0e596dc0b1 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/items/49000-49099.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/items/49000-49099.xml
@@ -773,6 +773,10 @@
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="SpiritShot" />
+		<skills>
+			<skill id="39029" level="1" /> <!-- Player Commendation - Spiritshot (No-grade) -->
+		</skills>
 	</item>
 	<item id="49063" name="Mysterious Spiritshot (D-grade)" type="EtcItem">
 		<!-- The power of a Spiritshot is bestowed upon a weapon, temporarily increasing power of magic attack. Used with D-grade weapons. Cannot be exchanged, dropped, or sold. The item disappears after the event is over. -->
@@ -786,6 +790,10 @@
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="SpiritShot" />
+		<skills>
+			<skill id="39030" level="1" /> <!-- Player Commendation - Spiritshot (D-grade) -->
+		</skills>
 	</item>
 	<item id="49064" name="Mysterious Spiritshot (C-grade)" type="EtcItem">
 		<!-- The power of a Spiritshot is bestowed upon a weapon, temporarily increasing power of magic attack. Used with C-grade weapons. Cannot be exchanged, dropped, or sold. The item disappears after the event is over. -->
@@ -799,6 +807,10 @@
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="SpiritShot" />
+		<skills>
+			<skill id="39031" level="1" /> <!-- Player Commendation - Spiritshot (C-grade) -->
+		</skills>
 	</item>
 	<item id="49065" name="Lucky Package: Blessed Spiritshots (No-grade)" additionalName="Event" type="EtcItem">
 		<!-- Open the package to get from 100 to 10 000 Mysterious Blessed Spiritshots (No-grade). Cannot be exchanged, dropped, or sold. The item disappears after the event is over. -->
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/items/49700-49799.xml b/L2J_Mobius_Classic/dist/game/data/stats/items/49700-49799.xml
index 55285c4927..b9589c9a5b 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/items/49700-49799.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/items/49700-49799.xml
@@ -556,6 +556,10 @@
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="SpiritShot" />
+		<skills>
+			<skill id="8908" level="1" /> <!-- Player Commendation - Spiritshot (B-grade) -->
+		</skills>
 	</item>
 	<item id="49750" name="Mysterious Spiritshot (A-grade)" type="EtcItem">
 		<!-- The power of a Mysterious Spiritshot is bestowed upon a weapon, temporarily increasing the power of attack. For A-grade weapons. Cannot be exchanged, dropped, sold in the grocery store, or stored in a private warehouse. -->
@@ -569,6 +573,10 @@
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="handler" val="SpiritShot" />
+		<skills>
+			<skill id="8909" level="1" /> <!-- Player Commendation - Spiritshot (A-grade) -->
+		</skills>
 	</item>
 	<item id="49751" name="Recipe: Blessed Soulshot (D)" type="EtcItem">
 		<!-- For Dwarves only. Recipe for creating a Blessed Soulshot (D). Requires Create Item - Skill Lv. 2. The success rate is 100%. -->
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/skills/08900-08999.xml b/L2J_Mobius_Classic/dist/game/data/stats/skills/08900-08999.xml
index dd956a8c65..b6692d5a8b 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/skills/08900-08999.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/skills/08900-08999.xml
@@ -1,39 +1,82 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
-	<skill id="8907" toLevel="1" name="">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
+	<skill id="8907" toLevel="1" name="Mysterious Blessed Spiritshot (A-grade)">
+		<icon>icon.skill8907</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
-	<skill id="8908" toLevel="1" name="">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
+	<skill id="8908" toLevel="1" name="Mysterious Spiritshot (B-grade)">
+		<icon>icon.skill8908</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
-	<skill id="8909" toLevel="1" name="">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
+	<skill id="8909" toLevel="1" name="Mysterious Spiritshot (A-grade)">
+		<icon>icon.skill8909</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
-	<skill id="8910" toLevel="1" name="">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
+	<skill id="8910" toLevel="1" name="Mysterious Blessed No-grade Spiritshot">
+		<icon>icon.skill8910</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
-	<skill id="8911" toLevel="1" name="">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
+	<skill id="8911" toLevel="1" name="Mysterious Blessed Spiritshot (D-grade)">
+		<icon>icon.skill8911</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
-	<skill id="8912" toLevel="1" name="">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
+	<skill id="8912" toLevel="1" name="Mysterious Blessed Spiritshot (C-grade)">
+		<icon>icon.skill8912</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
-	<skill id="8913" toLevel="1" name="">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
+	<skill id="8913" toLevel="1" name="Mysterious Blessed Spiritshot (B-grade)">
+		<icon>icon.skill8913</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
+	</skill>
 	</skill>
 	<skill id="8914" toLevel="1" name="">
 		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/skills/09200-09299.xml b/L2J_Mobius_Classic/dist/game/data/stats/skills/09200-09299.xml
index 7c2faf3a15..deb5a9819f 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/skills/09200-09299.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/skills/09200-09299.xml
@@ -185,8 +185,7 @@
 		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="9293" toLevel="1" name="Mysterious No-grade Soulshot">
-		<!-- AUTO GENERATED SKILL -->
-		<icon>icon.skill0000</icon>
+		<icon>icon.skill9293</icon>
 		<operateType>A1</operateType>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -197,8 +196,7 @@
 		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="9294" toLevel="1" name="Mysterious Soulshot (D-grade)">
-		<!-- AUTO GENERATED SKILL -->
-		<icon>icon.skill0000</icon>
+		<icon>icon.skill9294</icon>
 		<operateType>A1</operateType>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -209,8 +207,7 @@
 		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="9295" toLevel="1" name="Mysterious Soulshot (C-grade)">
-		<!-- AUTO GENERATED SKILL -->
-		<icon>icon.skill0000</icon>
+		<icon>icon.skill9295</icon>
 		<operateType>A1</operateType>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
@@ -221,8 +218,7 @@
 		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="9297" toLevel="1" name="Player Commendation - Soulshot (A-grade)">
-		<!-- AUTO GENERATED SKILL -->
-		<icon>icon.skill0000</icon>
+		<icon>icon.skill9297</icon>
 		<operateType>A1</operateType>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/skills/09300-09399.xml b/L2J_Mobius_Classic/dist/game/data/stats/skills/09300-09399.xml
index d119cf931b..68031cced1 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/skills/09300-09399.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/skills/09300-09399.xml
@@ -1,38 +1,36 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/skills.xsd">
 	<skill id="9300" toLevel="1" name="Mysterious Blessed No-grade Spiritshot">
-		<!-- AUTO GENERATED SKILL -->
-		<icon>icon.skill0000</icon>
+		<icon>icon.skill9300</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<magicLvl>1</magicLvl>
-		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="9301" toLevel="1" name="Mysterious Blessed Spiritshot (D-grade)">
 		<!-- AUTO GENERATED SKILL -->
-		<icon>icon.skill0000</icon>
+		<icon>icon.skill9301</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<magicLvl>1</magicLvl>
-		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="9302" toLevel="1" name="Mysterious Blessed Spiritshot (C-grade)">
-		<!-- AUTO GENERATED SKILL -->
-		<icon>icon.skill0000</icon>
+		<icon>icon.skill9302</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
 		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
-		<magicLvl>1</magicLvl>
-		<isMagic>2</isMagic>
 		<targetType>SELF</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/skills/39000-39099.xml b/L2J_Mobius_Classic/dist/game/data/stats/skills/39000-39099.xml
index 1e720cd6f6..af36acf5de 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/skills/39000-39099.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/skills/39000-39099.xml
@@ -165,19 +165,37 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="39029" toLevel="1" name="Mysterious Spiritshot (No-grade)">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
+		<icon>icon.skill39029</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="39030" toLevel="1" name="Mysterious Spiritshot (D-grade)">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
+		<icon>icon.skill39030</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="39031" toLevel="1" name="Mysterious Spiritshot (C-grade)">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
+		<icon>icon.skill39031</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="39032" toLevel="1" name="Lucky Package: Soulshots (No-grade)">
 		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/skills/55100-55199.xml b/L2J_Mobius_Classic/dist/game/data/stats/skills/55100-55199.xml
index 7a6a2c719f..5f2a6153f9 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/skills/55100-55199.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/skills/55100-55199.xml
@@ -223,14 +223,26 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="55139" toLevel="1" name="Mysterious Soulshot (B-grade)">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
+		<icon>icon.skill55139</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="55140" toLevel="1" name="Mysterious Blessed Spiritshot (B-grade)">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
+		<icon>icon.skill55140</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="55141" toLevel="1" name="Elite Fishing Rod of Golden Mermaid">
 		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
diff --git a/L2J_Mobius_Classic/dist/game/data/stats/skills/55300-55399.xml b/L2J_Mobius_Classic/dist/game/data/stats/skills/55300-55399.xml
index dd1bf7f014..e898c2e09e 100644
--- a/L2J_Mobius_Classic/dist/game/data/stats/skills/55300-55399.xml
+++ b/L2J_Mobius_Classic/dist/game/data/stats/skills/55300-55399.xml
@@ -435,10 +435,16 @@
 		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 	</skill>
-	<skill id="55387" toLevel="1" name="">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
+	<skill id="55387" toLevel="1" name="Mysterious Blessed Spiritshot (B-grade)">
+		<icon>icon.skill55387</icon>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<rideState>NONE;STRIDER;WYVERN;WOLF</rideState>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>SELF</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="55388" toLevel="1" name="">
 		<!-- AUTO GENERATED SKILL TODO: FIX IT -->