diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/CombinationItems.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/CombinationItems.xml
index 9850223caf..7693222b31 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/CombinationItems.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/CombinationItems.xml
@@ -3608,6 +3608,10 @@
 		<reward id="47689" count="1" type="ON_SUCCESS" /> <!-- Greater Sapphire Lv. 1 -->
 		<reward id="38931" count="1" type="ON_FAILURE" /> <!-- Sapphire Lv. 5 -->
 	</item>
+	<item one="29462" two="29462" chance="100"> <!-- Greater Amethyst Lv. 5 / Greater Amethyst Lv. 5 -->
+		<reward id="29796" count="1" type="ON_SUCCESS" /> <!-- Superior Amethyst Lv. 1 -->
+		<reward id="29796" count="1" type="ON_FAILURE" /> <!-- Superior Amethyst Lv. 1 -->
+	</item>
 	<item one="29796" two="48831" chance="35"> <!-- Superior Amethyst Lv. 1 / Jewel Energy -->
 		<reward id="29797" count="1" type="ON_SUCCESS" /> <!-- Superior Amethyst Lv. 2 -->
 		<reward id="29796" count="1" type="ON_FAILURE" /> <!-- Superior Amethyst Lv. 1 -->
@@ -3644,6 +3648,10 @@
 		<reward id="29805" count="1" type="ON_SUCCESS" /> <!-- Superior Amethyst Lv. 10 -->
 		<reward id="29796" count="1" type="ON_FAILURE" /> <!-- Superior Amethyst Lv. 1 -->
 	</item>
+	<item one="29458" two="29458" chance="100"> <!-- Greater Cat's Eye Lv. 5 / Greater Cat's Eye Lv. 5 -->
+		<reward id="29806" count="1" type="ON_SUCCESS" /> <!-- Superior Cat's Eye Lv. 1 -->
+		<reward id="29806" count="1" type="ON_FAILURE" /> <!-- Superior Cat's Eye Lv. 1 -->
+	</item>
 	<item one="29806" two="48831" chance="35"> <!-- Superior Cat's Eye Lv. 1 / Jewel Energy -->
 		<reward id="29807" count="1" type="ON_SUCCESS" /> <!-- Superior Cat's Eye Lv. 2 -->
 		<reward id="29806" count="1" type="ON_FAILURE" /> <!-- Superior Cat's Eye Lv. 1 -->
@@ -3680,6 +3688,10 @@
 		<reward id="29815" count="1" type="ON_SUCCESS" /> <!-- Superior Cat's Eye Lv. 10 -->
 		<reward id="29806" count="1" type="ON_FAILURE" /> <!-- Superior Cat's Eye Lv. 1 -->
 	</item>
+	<item one="48770" two="48770" chance="100"> <!-- Greater Topaz Lv. 5 / Greater Topaz Lv. 5 -->
+		<reward id="81495" count="1" type="ON_SUCCESS" /> <!-- Superior Topaz Lv. 1 -->
+		<reward id="81495" count="1" type="ON_FAILURE" /> <!-- Superior Topaz Lv. 1 -->
+	</item>
 	<item one="81495" two="48831" chance="35"> <!-- Superior Topaz Lv. 1 / Jewel Energy -->
 		<reward id="81496" count="1" type="ON_SUCCESS" /> <!-- Superior Topaz Lv. 2 -->
 		<reward id="81495" count="1" type="ON_FAILURE" /> <!-- Superior Topaz Lv. 1 -->
@@ -3716,6 +3728,10 @@
 		<reward id="81504" count="1" type="ON_SUCCESS" /> <!-- Superior Topaz Lv. 10 -->
 		<reward id="81495" count="1" type="ON_FAILURE" /> <!-- Superior Topaz Lv. 1 -->
 	</item>
+	<item one="48774" two="48774" chance="100"> <!-- Greater Ruby Lv. 5 / Greater Ruby Lv. 5 -->
+		<reward id="81505" count="1" type="ON_SUCCESS" /> <!-- Superior Ruby Lv. 1 -->
+		<reward id="81505" count="1" type="ON_FAILURE" /> <!-- Superior Ruby Lv. 1 -->
+	</item>
 	<item one="81505" two="48831" chance="35"> <!-- Superior Ruby Lv. 1 / Jewel Energy -->
 		<reward id="81506" count="1" type="ON_SUCCESS" /> <!-- Superior Ruby Lv. 2 -->
 		<reward id="81505" count="1" type="ON_FAILURE" /> <!-- Superior Ruby Lv. 1 -->
@@ -3752,6 +3768,10 @@
 		<reward id="81514" count="1" type="ON_SUCCESS" /> <!-- Superior Ruby Lv. 10 -->
 		<reward id="81505" count="1" type="ON_FAILURE" /> <!-- Superior Ruby Lv. 1 -->
 	</item>
+	<item one="48778" two="48778" chance="100"> <!-- Greater Sapphire Lv. 5 / Greater Sapphire Lv. 5 -->
+		<reward id="81515" count="1" type="ON_SUCCESS" /> <!-- Superior Sapphire Lv. 1 -->
+		<reward id="81515" count="1" type="ON_FAILURE" /> <!-- Superior Sapphire Lv. 1 -->
+	</item>
 	<item one="81515" two="48831" chance="35"> <!-- Superior Sapphire Lv. 1 / Jewel Energy -->
 		<reward id="81516" count="1" type="ON_SUCCESS" /> <!-- Superior Sapphire Lv. 2 -->
 		<reward id="81515" count="1" type="ON_FAILURE" /> <!-- Superior Sapphire Lv. 1 -->
@@ -3788,6 +3808,10 @@
 		<reward id="81524" count="1" type="ON_SUCCESS" /> <!-- Superior Sapphire Lv. 10 -->
 		<reward id="81515" count="1" type="ON_FAILURE" /> <!-- Superior Sapphire Lv. 1 -->
 	</item>
+	<item one="48782" two="48782" chance="100"> <!-- Greater Obsidian Lv. 5 / Greater Obsidian Lv. 5 -->
+		<reward id="81525" count="1" type="ON_SUCCESS" /> <!-- Superior Obsidian Lv. 1 -->
+		<reward id="81525" count="1" type="ON_FAILURE" /> <!-- Superior Obsidian Lv. 1 -->
+	</item>
 	<item one="81525" two="48831" chance="35"> <!-- Superior Obsidian Lv. 1 / Jewel Energy -->
 		<reward id="81526" count="1" type="ON_SUCCESS" /> <!-- Superior Obsidian Lv. 2 -->
 		<reward id="81525" count="1" type="ON_FAILURE" /> <!-- Superior Obsidian Lv. 1 -->
@@ -3824,6 +3848,10 @@
 		<reward id="81534" count="1" type="ON_SUCCESS" /> <!-- Superior Obsidian Lv. 10 -->
 		<reward id="81525" count="1" type="ON_FAILURE" /> <!-- Superior Obsidian Lv. 1 -->
 	</item>
+	<item one="48786" two="48786" chance="100"> <!-- Greater Opal Lv. 5 / Greater Opal Lv. 5 -->
+		<reward id="81535" count="1" type="ON_SUCCESS" /> <!-- Superior Opal Lv. 1 -->
+		<reward id="81535" count="1" type="ON_FAILURE" /> <!-- Superior Opal Lv. 1 -->
+	</item>
 	<item one="81535" two="48831" chance="35"> <!-- Superior Opal Lv. 1 / Jewel Energy -->
 		<reward id="81536" count="1" type="ON_SUCCESS" /> <!-- Superior Opal Lv. 2 -->
 		<reward id="81535" count="1" type="ON_FAILURE" /> <!-- Superior Opal Lv. 1 -->
@@ -3860,6 +3888,10 @@
 		<reward id="81544" count="1" type="ON_SUCCESS" /> <!-- Superior Opal Lv. 10 -->
 		<reward id="81535" count="1" type="ON_FAILURE" /> <!-- Superior Opal Lv. 1 -->
 	</item>
+	<item one="48790" two="48790" chance="100"> <!-- Greater Emerald Lv. 5 / Greater Emerald Lv. 5 -->
+		<reward id="81545" count="1" type="ON_SUCCESS" /> <!-- Superior Emerald Lv. 1 -->
+		<reward id="81545" count="1" type="ON_FAILURE" /> <!-- Superior Emerald Lv. 1 -->
+	</item>
 	<item one="81545" two="48831" chance="35"> <!-- Superior Emerald Lv. 1 / Jewel Energy -->
 		<reward id="81546" count="1" type="ON_SUCCESS" /> <!-- Superior Emerald Lv. 2 -->
 		<reward id="81545" count="1" type="ON_FAILURE" /> <!-- Superior Emerald Lv. 1 -->
@@ -3896,6 +3928,10 @@
 		<reward id="81554" count="1" type="ON_SUCCESS" /> <!-- Superior Emerald Lv. 10 -->
 		<reward id="81545" count="1" type="ON_FAILURE" /> <!-- Superior Emerald Lv. 1 -->
 	</item>
+	<item one="48794" two="48794" chance="100"> <!-- Greater Aquamarine Lv. 5 / Greater Aquamarine Lv. 5 -->
+		<reward id="81555" count="1" type="ON_SUCCESS" /> <!-- Superior Aquamarine Lv. 1 -->
+		<reward id="81555" count="1" type="ON_FAILURE" /> <!-- Superior Aquamarine Lv. 1 -->
+	</item>
 	<item one="81555" two="48831" chance="35"> <!-- Superior Aquamarine Lv. 1 / Jewel Energy -->
 		<reward id="81556" count="1" type="ON_SUCCESS" /> <!-- Superior Aquamarine Lv. 2 -->
 		<reward id="81555" count="1" type="ON_FAILURE" /> <!-- Superior Aquamarine Lv. 1 -->
@@ -3932,6 +3968,10 @@
 		<reward id="81556" count="1" type="ON_SUCCESS" /> <!-- Superior Aquamarine Lv. 10 -->
 		<reward id="81555" count="1" type="ON_FAILURE" /> <!-- Superior Aquamarine Lv. 1 -->
 	</item>
+	<item one="48798" two="48798" chance="100"> <!-- Greater Diamond Lv. 5 / Greater Diamond Lv. 5 -->
+		<reward id="81565" count="1" type="ON_SUCCESS" /> <!-- Superior Diamond Lv. 1 -->
+		<reward id="81565" count="1" type="ON_FAILURE" /> <!-- Superior Diamond Lv. 1 -->
+	</item>
 	<item one="81565" two="48831" chance="35"> <!-- Superior Diamond Lv. 1 / Jewel Energy -->
 		<reward id="81566" count="1" type="ON_SUCCESS" /> <!-- Superior Diamond Lv. 2 -->
 		<reward id="81565" count="1" type="ON_FAILURE" /> <!-- Superior Diamond Lv. 1 -->
@@ -3968,6 +4008,10 @@
 		<reward id="81574" count="1" type="ON_SUCCESS" /> <!-- Superior Diamond Lv. 10 -->
 		<reward id="81565" count="1" type="ON_FAILURE" /> <!-- Superior Diamond Lv. 1 -->
 	</item>
+	<item one="48802" two="48802" chance="100"> <!-- Greater Pearl Lv. 5 / Greater Pearl Lv. 5 -->
+		<reward id="81575" count="1" type="ON_SUCCESS" /> <!-- Superior Pearl Lv. 1 -->
+		<reward id="81575" count="1" type="ON_FAILURE" /> <!-- Superior Pearl Lv. 1 -->
+	</item>
 	<item one="81575" two="48831" chance="35"> <!-- Superior Pearl Lv. 1 / Jewel Energy -->
 		<reward id="81576" count="1" type="ON_SUCCESS" /> <!-- Superior Pearl Lv. 2 -->
 		<reward id="81575" count="1" type="ON_FAILURE" /> <!-- Superior Pearl Lv. 1 -->
@@ -4004,6 +4048,10 @@
 		<reward id="81584" count="1" type="ON_SUCCESS" /> <!-- Superior Pearl Lv. 10 -->
 		<reward id="81575" count="1" type="ON_FAILURE" /> <!-- Superior Pearl Lv. 1 -->
 	</item>
+	<item one="48806" two="48806" chance="100"> <!-- Greater Vital Stone Lv. 5 / Greater Vital Stone Lv. 5 -->
+		<reward id="81585" count="1" type="ON_SUCCESS" /> <!-- Superior Vital Stone Lv. 1 -->
+		<reward id="81585" count="1" type="ON_FAILURE" /> <!-- Superior Vital Stone Lv. 1 -->
+	</item>
 	<item one="81585" two="48831" chance="35"> <!-- Superior Vital Stone Lv. 1 / Jewel Energy -->
 		<reward id="81586" count="1" type="ON_SUCCESS" /> <!-- Superior Vital Stone Lv. 2 -->
 		<reward id="81585" count="1" type="ON_FAILURE" /> <!-- Superior Vital Stone Lv. 1 -->
@@ -4040,6 +4088,10 @@
 		<reward id="81594" count="1" type="ON_SUCCESS" /> <!-- Superior Vital Stone Lv. 10 -->
 		<reward id="81585" count="1" type="ON_FAILURE" /> <!-- Superior Vital Stone Lv. 1 -->
 	</item>
+	<item one="48810" two="48810" chance="100"> <!-- Greater Garnet Lv. 5 / Greater Garnet Lv. 5 -->
+		<reward id="81595" count="1" type="ON_SUCCESS" /> <!-- Superior Garnet Lv. 1 -->
+		<reward id="81595" count="1" type="ON_FAILURE" /> <!-- Superior Garnet Lv. 1 -->
+	</item>
 	<item one="81595" two="48831" chance="35"> <!-- Superior Garnet Lv. 1 / Jewel Energy -->
 		<reward id="81596" count="1" type="ON_SUCCESS" /> <!-- Superior Garnet Lv. 2 -->
 		<reward id="81595" count="1" type="ON_FAILURE" /> <!-- Superior Garnet Lv. 1 -->
@@ -4076,6 +4128,10 @@
 		<reward id="81604" count="1" type="ON_SUCCESS" /> <!-- Superior Garnet Lv. 10 -->
 		<reward id="81595" count="1" type="ON_FAILURE" /> <!-- Superior Garnet Lv. 1 -->
 	</item>
+	<item one="48814" two="48814" chance="100"> <!-- Greater Tanzanite Lv. 5 / Greater Tanzanite Lv. 5 -->
+		<reward id="81605" count="1" type="ON_SUCCESS" /> <!-- Superior Tanzanite Lv. 1 -->
+		<reward id="81605" count="1" type="ON_FAILURE" /> <!-- Superior Tanzanite Lv. 1 -->
+	</item>
 	<item one="81605" two="48831" chance="35"> <!-- Superior Tanzanite Lv. 1 / Jewel Energy -->
 		<reward id="81606" count="1" type="ON_SUCCESS" /> <!-- Superior Tanzanite Lv. 2 -->
 		<reward id="81605" count="1" type="ON_FAILURE" /> <!-- Superior Tanzanite Lv. 1 -->
@@ -4112,6 +4168,10 @@
 		<reward id="81614" count="1" type="ON_SUCCESS" /> <!-- Superior Tanzanite Lv. 10 -->
 		<reward id="81605" count="1" type="ON_FAILURE" /> <!-- Superior Tanzanite Lv. 1 -->
 	</item>
+	<item one="48818" two="48818" chance="100"> <!-- Greater Red Cat's Eye Lv. 5 / Greater Red Cat's Eye Lv. 5 -->
+		<reward id="81615" count="1" type="ON_SUCCESS" /> <!-- Superior Red Cat's Eye Lv. 1 -->
+		<reward id="81615" count="1" type="ON_FAILURE" /> <!-- Superior Red Cat's Eye Lv. 1 -->
+	</item>
 	<item one="81615" two="48831" chance="35"> <!-- Superior Red Cat's Eye Lv. 1 / Jewel Energy -->
 		<reward id="81616" count="1" type="ON_SUCCESS" /> <!-- Superior Red Cat's Eye Lv. 2 -->
 		<reward id="81615" count="1" type="ON_FAILURE" /> <!-- Superior Red Cat's Eye Lv. 1 -->
@@ -4148,6 +4208,10 @@
 		<reward id="81624" count="1" type="ON_SUCCESS" /> <!-- Superior Red Cat's Eye Lv. 10 -->
 		<reward id="81615" count="1" type="ON_FAILURE" /> <!-- Superior Red Cat's Eye Lv. 1 -->
 	</item>
+	<item one="48822" two="48822" chance="100"> <!-- Greater Blue Cat's Eye Lv. 5 / Greater Blue Cat's Eye Lv. 5 -->
+		<reward id="81625" count="1" type="ON_SUCCESS" /> <!-- Superior Blue Cat's Eye Lv. 1 -->
+		<reward id="81625" count="1" type="ON_FAILURE" /> <!-- Superior Blue Cat's Eye Lv. 1 -->
+	</item>
 	<item one="81625" two="48831" chance="35"> <!-- Superior Blue Cat's Eye Lv. 1 / Jewel Energy -->
 		<reward id="81626" count="1" type="ON_SUCCESS" /> <!-- Superior Blue Cat's Eye Lv. 2 -->
 		<reward id="81625" count="1" type="ON_FAILURE" /> <!-- Superior Blue Cat's Eye Lv. 1 -->
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/26400-26499.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/26400-26499.xml
index f70f9efcc6..f7364e0d81 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/26400-26499.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/26400-26499.xml
@@ -1279,7 +1279,7 @@
 		<set name="is_mailable" val="true" />
 		<set name="is_commissionable" val="false" />
 		<capsuled_items>
-			<item id="26481" min="1" max="1" chance="100" /> <!-- Garnet Lv. 1 - Not available -->
+			<item id="46675" min="1" max="1" chance="100" /> <!-- Garnet Lv. 1 -->
 		</capsuled_items>
 	</item>
 	<item id="26493" name="La Vie En Rose's Tanzanite Box" type="EtcItem">
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/27400-27499.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/27400-27499.xml
index f07deedba7..bcc63b33e0 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/27400-27499.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/27400-27499.xml
@@ -1106,7 +1106,7 @@
 		<set name="is_mailable" val="true" />
 		<set name="is_commissionable" val="false" />
 		<capsuled_items>
-			<item id="26486" min="1" max="1" chance="100" /> <!-- Tanzanite Lv. 1 - Not available -->
+			<item id="46680" min="1" max="1" chance="100" /> <!-- Tanzanite Lv. 1 -->
 		</capsuled_items>
 	</item>
 	<item id="27480" name="Vital Stone" additionalName="Lv. 1" type="Armor">
@@ -1165,7 +1165,7 @@
 		<set name="is_mailable" val="true" />
 		<set name="is_commissionable" val="false" />
 		<capsuled_items>
-			<item id="26476" min="1" max="1" chance="100" /> <!-- Vital Stone Lv. 1 - Not available -->
+			<item id="46670" min="1" max="1" chance="100" /> <!-- Vital Stone Lv. 1 -->
 		</capsuled_items>
 	</item>
 	<item id="27484" name="Maphr's Wind Scroll" additionalName="Event" type="EtcItem">
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/80300-80399.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/80300-80399.xml
index 8bc56b0778..c31a0dacb9 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/80300-80399.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/items/80300-80399.xml
@@ -523,6 +523,11 @@
 		<set name="is_depositable" val="false" />
 		<set name="commissionItemType" val="DAGGER" />
 		<set name="damage_range" val="0;0;40;120" />
+		<skills>
+			<skill id="8849" level="1" /> <!-- PvE Damage Increase -->
+			<skill id="13787" level="1" /> <!-- Additional Ability Health -->
+			<skill id="13282" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Dagger Special Ability -->
+		</skills>
 		<stats>
 			<stat type="pAtk">629</stat>
 			<stat type="mAtk">313</stat>
@@ -550,6 +555,11 @@
 		<set name="is_depositable" val="false" />
 		<set name="commissionItemType" val="ONE_HAND_SWORD" />
 		<set name="damage_range" val="0;0;40;120" />
+		<skills>
+			<skill id="8850" level="1" /> <!-- PvE Damage Increase -->
+			<skill id="13788" level="1" /> <!-- Additional Ability Health -->
+			<skill id="13252" level="3" type="ON_ENCHANT" type_value="4" /> <!-- One-handed Sword Special Ability -->
+		</skills>
 		<stats>
 			<stat type="pAtk">719</stat>
 			<stat type="mAtk">313</stat>
@@ -576,6 +586,11 @@
 		<set name="is_depositable" val="false" />
 		<set name="commissionItemType" val="TWO_HAND_SWORD" />
 		<set name="damage_range" val="0;0;40;120" />
+		<skills>
+			<skill id="8851" level="1" /> <!-- PvE Damage Increase -->
+			<skill id="13789" level="1" /> <!-- Additional Ability Health -->
+			<skill id="13261" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Two-handed Sword Special Ability -->
+		</skills>
 		<stats>
 			<stat type="pAtk">875</stat>
 			<stat type="mAtk">313</stat>
@@ -602,6 +617,11 @@
 		<set name="is_depositable" val="false" />
 		<set name="commissionItemType" val="BLUNT_WEAPON" />
 		<set name="damage_range" val="0;0;40;120" />
+		<skills>
+			<skill id="8852" level="1" /> <!-- PvE Damage Increase -->
+			<skill id="13790" level="1" /> <!-- Additional Ability Health -->
+			<skill id="13256" level="3" type="ON_ENCHANT" type_value="4" /> <!-- One-handed Blunt Special Ability -->
+		</skills>
 		<skills>
 			<skill id="3599" level="1" /> <!-- Polearm Multi-attack -->
 		</skills>
@@ -631,6 +651,11 @@
 		<set name="is_depositable" val="false" />
 		<set name="commissionItemType" val="FIST_WEAPON" />
 		<set name="damage_range" val="0;0;32;120" />
+		<skills>
+			<skill id="8853" level="1" /> <!-- PvE Damage Increase -->
+			<skill id="13791" level="1" /> <!-- Additional Ability Health -->
+			<skill id="13267" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Fist Weapon Special Ability -->
+		</skills>
 		<stats>
 			<stat type="pAtk">875</stat>
 			<stat type="mAtk">313</stat>
@@ -658,6 +683,12 @@
 		<set name="is_depositable" val="false" />
 		<set name="commissionItemType" val="SPEAR" />
 		<set name="damage_range" val="0;0;66;120" />
+		<skills>
+			<skill id="3599" level="1" /> <!-- Polearm Multi-attack -->
+			<skill id="8854" level="1" /> <!-- PvE Damage Increase -->
+			<skill id="13792" level="1" /> <!-- Additional Ability Health -->
+			<skill id="13263" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Spear Special Ability -->
+		</skills>
 		<skills>
 			<skill id="3599" level="1" /> <!-- Polearm Multi-attack -->
 		</skills>
@@ -688,6 +719,11 @@
 		<set name="is_depositable" val="false" />
 		<set name="commissionItemType" val="BOW" />
 		<set name="damage_range" val="0;0;10;0" />
+		<skills>
+			<skill id="8855" level="1" /> <!-- PvE Damage Increase -->
+			<skill id="13793" level="1" /> <!-- Additional Ability Health -->
+			<skill id="13292" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Bow Special Ability -->
+		</skills>
 		<stats>
 			<stat type="pAtk">1415</stat>
 			<stat type="mAtk">313</stat>
@@ -713,6 +749,11 @@
 		<set name="is_depositable" val="false" />
 		<set name="commissionItemType" val="CROSSBOW" />
 		<set name="damage_range" val="0;0;40;120" />
+		<skills>
+			<skill id="8856" level="1" /> <!-- PvE Damage Increase -->
+			<skill id="13794" level="1" /> <!-- Additional Ability Health -->
+			<skill id="13294" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Crossbow Special Ability -->
+		</skills>
 		<stats>
 			<stat type="pAtk">1274</stat>
 			<stat type="mAtk">313</stat>
@@ -741,6 +782,11 @@
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_SWORD" />
 		<set name="is_magic_weapon" val="true" />
 		<set name="damage_range" val="0;0;40;120" />
+		<skills>
+			<skill id="8857" level="1" /> <!-- PvE Damage Increase -->
+			<skill id="13795" level="1" /> <!-- Additional Ability Health -->
+			<skill id="13295" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Sword Special Ability -->
+		</skills>
 		<stats>
 			<stat type="pAtk">575</stat>
 			<stat type="mAtk">417</stat>
@@ -767,6 +813,11 @@
 		<set name="commissionItemType" val="ONE_HAND_MAGIC_BLUNT_WEAPON" />
 		<set name="is_magic_weapon" val="true" />
 		<set name="damage_range" val="0;0;40;120" />
+		<skills>
+			<skill id="8858" level="1" /> <!-- PvE Damage Increase -->
+			<skill id="13796" level="1" /> <!-- Additional Ability Health -->
+			<skill id="13299" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic One-handed Blunt Special Ability -->
+		</skills>
 		<stats>
 			<stat type="pAtk">575</stat>
 			<stat type="mAtk">417</stat>
@@ -795,6 +846,11 @@
 		<set name="commissionItemType" val="TWO_HAND_MAGIC_BLUNT_WEAPON" />
 		<set name="is_magic_weapon" val="true" />
 		<set name="damage_range" val="0;0;40;120" />
+		<skills>
+			<skill id="8859" level="1" /> <!-- PvE Damage Increase -->
+			<skill id="13797" level="1" /> <!-- Additional Ability Health -->
+			<skill id="13304" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Magic Two-handed Blunt Special Ability -->
+		</skills>
 		<stats>
 			<stat type="pAtk">700</stat>
 			<stat type="mAtk">459</stat>
@@ -822,6 +878,11 @@
 		<set name="is_depositable" val="false" />
 		<set name="commissionItemType" val="DUALSWORD" />
 		<set name="damage_range" val="0;0;40;120" />
+		<skills>
+			<skill id="8860" level="1" /> <!-- PvE Damage Increase -->
+			<skill id="13798" level="1" /> <!-- Additional Ability Health -->
+			<skill id="13277" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Dualsword Special Ability -->
+		</skills>
 		<stats>
 			<stat type="pAtk">875</stat>
 			<stat type="mAtk">313</stat>
@@ -846,6 +907,11 @@
 		<set name="is_depositable" val="false" />
 		<set name="commissionItemType" val="DUAL_DAGGER" />
 		<set name="damage_range" val="0;0;44;120" />
+		<skills>
+			<skill id="8861" level="1" /> <!-- PvE Damage Increase -->
+			<skill id="13799" level="1" /> <!-- Additional Ability Health -->
+			<skill id="13287" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Dual Dagger Special Ability -->
+		</skills>
 		<stats>
 			<stat type="pAtk">719</stat>
 			<stat type="mAtk">313</stat>
@@ -871,6 +937,11 @@
 		<set name="is_depositable" val="false" />
 		<set name="commissionItemType" val="DUAL_BLUNT_WEAPON" />
 		<set name="damage_range" val="0;0;40;120" />
+		<skills>
+			<skill id="8862" level="1" /> <!-- PvE Damage Increase -->
+			<skill id="13800" level="1" /> <!-- Additional Ability Health -->
+			<skill id="13272" level="3" type="ON_ENCHANT" type_value="4" /> <!-- Dual Blunt Weapon Special Ability -->
+		</skills>
 		<stats>
 			<stat type="pAtk">875</stat>
 			<stat type="mAtk">313</stat>
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/npcs/24400-24499.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/npcs/24400-24499.xml
index 9aec1a0d65..553cdfcadb 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/npcs/24400-24499.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/npcs/24400-24499.xml
@@ -1555,9 +1555,11 @@
 		<dropLists>
 			<drop>
 				<item id="57" min="4315" max="10063" chance="70" /> <!-- Adena -->
-				<item id="48211" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Circlet -->
-				<item id="48498" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Dragon Shirt -->
 				<item id="80838" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Kaliel's Bracelet -->
+				<item id="48211" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Circlet -->
+				<item id="48498" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Dragon Shirt -->
+				<item id="81361" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Brooch -->
+				<item id="81694" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Artifact Book -->
 				<item id="48212" min="1" max="1" chance="0.0009" /> <!-- Noble Circlet Upgrade Stone -->
 				<item id="48213" min="1" max="1" chance="0.0009" /> <!-- Radiant Circlet Upgrade Stone -->
 				<item id="80839" min="1" max="1" chance="0.0009" /> <!-- Crystal of Dawn -->
@@ -1590,9 +1592,11 @@
 		<dropLists>
 			<drop>
 				<item id="57" min="4315" max="10063" chance="70" /> <!-- Adena -->
-				<item id="48211" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Circlet -->
-				<item id="48498" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Dragon Shirt -->
 				<item id="80838" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Kaliel's Bracelet -->
+				<item id="48211" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Circlet -->
+				<item id="48498" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Dragon Shirt -->
+				<item id="81361" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Brooch -->
+				<item id="81694" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Artifact Book -->
 				<item id="48212" min="1" max="1" chance="0.0009" /> <!-- Noble Circlet Upgrade Stone -->
 				<item id="48213" min="1" max="1" chance="0.0009" /> <!-- Radiant Circlet Upgrade Stone -->
 				<item id="80839" min="1" max="1" chance="0.0009" /> <!-- Crystal of Dawn -->
@@ -1625,9 +1629,11 @@
 		<dropLists>
 			<drop>
 				<item id="57" min="4315" max="10063" chance="70" /> <!-- Adena -->
-				<item id="48211" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Circlet -->
-				<item id="48498" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Dragon Shirt -->
 				<item id="80838" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Kaliel's Bracelet -->
+				<item id="48211" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Circlet -->
+				<item id="48498" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Dragon Shirt -->
+				<item id="81361" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Brooch -->
+				<item id="81694" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Artifact Book -->
 				<item id="48212" min="1" max="1" chance="0.0009" /> <!-- Noble Circlet Upgrade Stone -->
 				<item id="48213" min="1" max="1" chance="0.0009" /> <!-- Radiant Circlet Upgrade Stone -->
 				<item id="80839" min="1" max="1" chance="0.0009" /> <!-- Crystal of Dawn -->
@@ -1660,9 +1666,11 @@
 		<dropLists>
 			<drop>
 				<item id="57" min="4315" max="10063" chance="70" /> <!-- Adena -->
-				<item id="48211" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Circlet -->
-				<item id="48498" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Dragon Shirt -->
 				<item id="80838" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Kaliel's Bracelet -->
+				<item id="48211" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Circlet -->
+				<item id="48498" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Dragon Shirt -->
+				<item id="81361" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Brooch -->
+				<item id="81694" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Artifact Book -->
 				<item id="48212" min="1" max="1" chance="0.0009" /> <!-- Noble Circlet Upgrade Stone -->
 				<item id="48213" min="1" max="1" chance="0.0009" /> <!-- Radiant Circlet Upgrade Stone -->
 				<item id="80839" min="1" max="1" chance="0.0009" /> <!-- Crystal of Dawn -->
@@ -1695,9 +1703,11 @@
 		<dropLists>
 			<drop>
 				<item id="57" min="4315" max="10063" chance="70" /> <!-- Adena -->
-				<item id="48211" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Circlet -->
-				<item id="48498" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Dragon Shirt -->
 				<item id="80838" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Kaliel's Bracelet -->
+				<item id="48211" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Circlet -->
+				<item id="48498" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Dragon Shirt -->
+				<item id="81361" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Brooch -->
+				<item id="81694" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Artifact Book -->
 				<item id="48212" min="1" max="1" chance="0.0009" /> <!-- Noble Circlet Upgrade Stone -->
 				<item id="48213" min="1" max="1" chance="0.0009" /> <!-- Radiant Circlet Upgrade Stone -->
 				<item id="80839" min="1" max="1" chance="0.0009" /> <!-- Crystal of Dawn -->
@@ -1730,9 +1740,11 @@
 		<dropLists>
 			<drop>
 				<item id="57" min="4315" max="10063" chance="70" /> <!-- Adena -->
-				<item id="48211" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Circlet -->
-				<item id="48498" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Dragon Shirt -->
 				<item id="80838" min="1" max="1" chance="0.075" /> <!-- Blessed Scroll: Enchant Kaliel's Bracelet -->
+				<item id="48211" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Circlet -->
+				<item id="48498" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Dragon Shirt -->
+				<item id="81361" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Brooch -->
+				<item id="81694" min="1" max="1" chance="0.03" /> <!-- Blessed Scroll: Enchant Artifact Book -->
 				<item id="48212" min="1" max="1" chance="0.0009" /> <!-- Noble Circlet Upgrade Stone -->
 				<item id="48213" min="1" max="1" chance="0.0009" /> <!-- Radiant Circlet Upgrade Stone -->
 				<item id="80839" min="1" max="1" chance="0.0009" /> <!-- Crystal of Dawn -->
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/01900-01999.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/01900-01999.xml
index 204a8ec9a2..aac59d5dca 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/01900-01999.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/01900-01999.xml
@@ -2546,8 +2546,9 @@
 		<basicProperty>NONE</basicProperty>
 		<magicCriticalRate>-5</magicCriticalRate>
 		<specialLevel>-2</specialLevel>
-		<targetType>TARGET</targetType>
+		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
+		<affectObject>NOT_FRIEND_PC</affectObject>
 		<staticReuse>true</staticReuse>
 		<excludedFromCheck>true</excludedFromCheck>
 		<canBeDispelled>false</canBeDispelled>
diff --git a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/19100-19199.xml b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/19100-19199.xml
index e3e24716b6..8bcbee189b 100644
--- a/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/19100-19199.xml
+++ b/L2J_Mobius_8.0_Homunculus/dist/game/data/stats/skills/19100-19199.xml
@@ -329,7 +329,7 @@
 		<itemConsumeCount>300</itemConsumeCount>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
-		<affectObject>NOT_FRIEND</affectObject>
+		<affectObject>NOT_FRIEND_PC</affectObject>
 		<stayAfterDeath>true</stayAfterDeath>
 		<staticReuse>true</staticReuse>
 		<conditions>
@@ -360,7 +360,7 @@
 		<itemConsumeCount>300</itemConsumeCount>
 		<targetType>ENEMY_ONLY</targetType>
 		<affectScope>SINGLE</affectScope>
-		<affectObject>NOT_FRIEND</affectObject>
+		<affectObject>NOT_FRIEND_PC</affectObject>
 		<stayAfterDeath>true</stayAfterDeath>
 		<staticReuse>true</staticReuse>
 		<isMagic>1</isMagic>