From 5e4a1f32fdf321bd3b02c5a6688cd3076df905e2 Mon Sep 17 00:00:00 2001
From: MobiusDevelopment <8391001+MobiusDevelopment@users.noreply.github.com>
Date: Mon, 10 May 2021 22:18:23 +0000
Subject: [PATCH] Repair and add missing enhancement scrolls. Contributed by
 musicgyz.

---
 .../dist/game/data/EnchantItemData.xml        | 217 ++++++++++++--
 .../game/data/stats/items/48000-48099.xml     |   7 +-
 .../game/data/stats/items/49400-49499.xml     |   2 +-
 .../game/data/stats/items/49600-49699.xml     |   2 +-
 .../game/data/stats/items/90100-90199.xml     |  17 ++
 .../game/data/stats/items/90900-90999.xml     |  39 ++-
 .../game/data/stats/items/91100-91199.xml     |  17 +-
 .../game/data/stats/items/91200-91299.xml     |  14 +-
 .../game/data/stats/items/91500-91599.xml     |   5 +
 .../game/data/stats/items/91600-91699.xml     |   5 +
 .../game/data/stats/items/91700-91799.xml     |   2 +-
 .../game/data/stats/items/91800-91899.xml     |  10 +
 .../game/data/stats/items/91900-91999.xml     |   2 +-
 .../game/data/stats/items/93200-93299.xml     |  28 +-
 .../game/data/stats/items/93900-93999.xml     |   2 +-
 .../game/data/stats/skills/39200-39299.xml    |  20 +-
 .../game/data/stats/skills/39300-39399.xml    |  12 +
 .../game/data/stats/skills/40100-40199.xml    |  28 +-
 .../game/data/stats/skills/50100-50199.xml    |  11 +-
 .../game/data/stats/skills/51000-51099.xml    |  42 ++-
 .../game/data/stats/skills/51100-51199.xml    |  26 +-
 .../dist/game/data/EnchantItemData.xml        | 270 +++++++++++++++---
 .../game/data/stats/items/48000-48099.xml     |   7 +-
 .../game/data/stats/items/49400-49499.xml     |   2 +-
 .../game/data/stats/items/49600-49699.xml     |   2 +-
 .../game/data/stats/items/90100-90199.xml     |  17 ++
 .../game/data/stats/items/90900-90999.xml     |  39 ++-
 .../game/data/stats/items/91100-91199.xml     |  17 +-
 .../game/data/stats/items/91200-91299.xml     |  14 +-
 .../game/data/stats/items/91500-91599.xml     |   5 +
 .../game/data/stats/items/91600-91699.xml     |   5 +
 .../game/data/stats/items/91700-91799.xml     |   2 +-
 .../game/data/stats/items/91800-91899.xml     |  10 +
 .../game/data/stats/items/91900-91999.xml     |   2 +-
 .../game/data/stats/items/93200-93299.xml     |  28 +-
 .../game/data/stats/items/93900-93999.xml     |   2 +-
 .../game/data/stats/items/95500-95599.xml     |   7 +-
 .../game/data/stats/items/95600-95699.xml     |   6 +
 .../game/data/stats/items/95700-95799.xml     |  12 +
 .../game/data/stats/skills/39200-39299.xml    |  22 +-
 .../game/data/stats/skills/39300-39399.xml    |  12 +
 .../game/data/stats/skills/40100-40199.xml    |  28 +-
 .../game/data/stats/skills/40200-40299.xml    |   6 +-
 .../game/data/stats/skills/40300-40399.xml    |  32 ++-
 .../game/data/stats/skills/50100-50199.xml    |  11 +-
 .../game/data/stats/skills/51000-51099.xml    |  42 ++-
 .../game/data/stats/skills/51100-51199.xml    |  26 +-
 47 files changed, 985 insertions(+), 149 deletions(-)

diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/EnchantItemData.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/EnchantItemData.xml
index 16eb0bae81..d112ae4a2b 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/EnchantItemData.xml
@@ -87,6 +87,86 @@
 		<item id="49467" />
 		<item id="49468" />
 	</enchant>
+	<!-- Pendant Matte Varnish -->
+	<enchant id="90137" maxEnchant="6" safeEnchant="3">
+		<item id="49467" />
+		<item id="49468" />
+	</enchant>
+	<!-- Pendant Shiny Varnish -->
+	<enchant id="90138" maxEnchant="9" safeEnchant="3">
+		<item id="49467" />
+		<item id="49468" />
+	</enchant>
+
+	<!-- Savior Scroll: Enchant Weapon -->
+	<enchant id="90149" targetGrade="C" maxEnchant="10">
+		<item id="90150" />
+		<item id="90151" />
+		<item id="90152" />
+		<item id="90153" />
+		<item id="90154" />
+		<item id="90867" />
+		<item id="90868" />
+		<item id="90869" />
+		<item id="90870" />
+		<item id="90871" />
+	</enchant>
+
+	<!-- Scroll: Enchant Fishing Weapon -->
+	<enchant id="90958" maxEnchant="17">
+		<item id="90957" />
+	</enchant>
+
+	<!-- Improved Scroll: Enchant Fishing Weapon -->
+	<enchant id="90959" maxEnchant="17" randomEnchantMin="1" randomEnchantMax="3">
+		<item id="90957" />
+	</enchant>
+
+	<!-- Scroll: Enchant Savior's Earring -->
+	<enchant id="90990" maxEnchant="7">
+		<item id="90987" />
+		<item id="90988" />
+		<item id="91243" />
+	</enchant>
+
+	<!-- Balthus Knights' Varnish -->
+	<enchant id="90995" maxEnchant="10">
+		<item id="90993" />
+		<item id="90994" />
+		<item id="91006" />
+	</enchant>
+	<!-- Balthus Knights' Shining Varnish -->
+	<enchant id="90997" maxEnchant="8">
+		<item id="90993" />
+		<item id="90994" />
+		<item id="91006" />
+	</enchant>
+	<!-- Balthus Knights' Glittering Varnish -->
+	<enchant id="90998" maxEnchant="9">
+		<item id="90993" />
+		<item id="90994" />
+		<item id="91006" />
+	</enchant>
+
+	<!-- Sibi's Weapon Enchant Scroll -->
+	<enchant id="91155" maxEnchant="23">
+		<item id="91154" />
+	</enchant>
+
+	<!-- Radiant Spirit's Varnish -->
+	<enchant id="91124" maxEnchant="9">
+		<item id="94682" />
+	</enchant>
+
+	<!-- Spirit's Varnish -->
+	<enchant id="91187" maxEnchant="10">
+		<item id="94682" />
+	</enchant>
+
+	<!-- Blessed Spirit's Varnish -->
+	<enchant id="91188" maxEnchant="10">
+		<item id="94682" />
+	</enchant>
 
 	<!-- Sayha's Cloak -->
 	<enchant id="91213" maxEnchant="10">
@@ -104,12 +184,32 @@
 
 	<!-- Sayha's Cloak -->
 	<enchant id="91215" maxEnchant="7">
-		<item id="49467" />
-		<item id="49467" />
-		<item id="49468" />
+		<item id="91210" />
+		<item id="91211" />
+		<item id="91212" />
 	</enchant>
 
-	<!-- Special Sayha's Cloak -->
+	<!-- Dragon Varnish -->
+	<enchant id="91249" maxEnchant="5">
+		<item id="91244" />
+		<item id="91245" />
+		<item id="91246" />
+		<item id="91247" />
+	</enchant>
+	<!-- Radiant Dragon Varnish -->
+	<enchant id="91250" maxEnchant="5">
+		<item id="91244" />
+		<item id="91245" />
+		<item id="91246" />
+		<item id="91247" />
+	</enchant>
+
+	<!-- Scroll: Enchant Excalibur -->
+	<enchant id="91575" maxEnchant="15">
+		<item id="91574" />
+	</enchant>
+
+	<!-- Scroll: Enchant Special Sayha's Cloak -->
 	<enchant id="91722" maxEnchant="10">
 		<item id="91719" />
 		<item id="91720" />
@@ -126,7 +226,35 @@
 		<item id="91862" />
 	</enchant>
 
-	<!-- Talisman of Eva -->
+	<!-- Enchant Scroll (PA Event) -->
+	<enchant id="91867" maxEnchant="10">
+		<item id="91866" />
+	</enchant>
+
+	<!-- Special Enchant Scroll (PA Event) -->
+	<enchant id="91868" maxEnchant="7">
+		<item id="91866" />
+	</enchant>
+
+	<!-- Talisman of Baium -->
+	<enchant id="91951" maxEnchant="5">
+		<item id="49683" />
+		<item id="94119" />
+	</enchant>
+
+	<!-- Scroll: Enchant Ring of Insolence -->
+	<enchant id="91966" maxEnchant="10">
+		<item id="91952" />
+		<item id="95718" />
+	</enchant>
+
+	<!-- Scroll: Enchant Dragon Valley's Earring -->
+	<enchant id="91967" maxEnchant="10">
+		<item id="91953" />
+		<item id="95719" />
+	</enchant>
+
+	<!-- Scroll: Enchant Talisman of Eva -->
 	<enchant id="92017" maxEnchant="10">
 		<item id="92018" />
 	</enchant>
@@ -180,6 +308,14 @@
 		<item id="91061" />
 	</enchant>
 
+	<!-- Scroll: Enchant Death Knight's Flame Sword -->
+	<enchant id="93931" targetGrade="A" maxEnchant="10">
+		<item id="93864" /> <!-- Death Knight's Flame Sword-->
+	</enchant>
+	<enchant id="93932" targetGrade="A" maxEnchant="10">
+		<item id="93864" /> <!-- Death Knight's Flame Sword -->
+	</enchant>
+
 	<!-- Circlet of Hero -->
 	<enchant id="94169" maxEnchant="10">
 		<item id="94166" />
@@ -238,6 +374,58 @@
 		<item id="48056" /> <!-- Agathion Aquarius -->
 		<item id="48058" /> <!-- Agathion Sagittarius -->
 	</enchant>
+	<!-- Quality Agathion Enchant Scroll -->
+	<enchant id="48047" maxEnchant="8" safeEnchant="3" randomEnchantMin="1" randomEnchantMax="3">
+		<item id="93128" /> <!-- Agathion Ignis -->
+		<item id="93129" /> <!-- Agathion Nebula -->
+		<item id="93130" /> <!-- Agathion Procella -->
+		<item id="93131" /> <!-- Agathion Petram -->
+		<item id="93132" /> <!-- Agathion Joy -->
+		<item id="48048" /> <!-- Agathion Virgo -->
+		<item id="48049" /> <!-- Agathion Capricorn -->
+		<item id="48050" /> <!-- Agathion Libra -->
+		<item id="48052" /> <!-- Agathion Taurus -->
+		<item id="48053" /> <!-- Agathion Leo -->
+		<item id="48054" /> <!-- Agathion Gemini -->
+		<item id="48055" /> <!-- Agathion Scorpio -->
+		<item id="48056" /> <!-- Agathion Aquarius -->
+		<item id="48058" /> <!-- Agathion Sagittarius -->
+	</enchant>
+	<!-- Solid Scroll: Enchant Agathion -->
+	<enchant id="90963" maxEnchant="10" safeEnchant="3">
+		<item id="93128" /> <!-- Agathion Ignis -->
+		<item id="93129" /> <!-- Agathion Nebula -->
+		<item id="93130" /> <!-- Agathion Procella -->
+		<item id="93131" /> <!-- Agathion Petram -->
+		<item id="93132" /> <!-- Agathion Joy -->
+		<item id="48048" /> <!-- Agathion Virgo -->
+		<item id="48049" /> <!-- Agathion Capricorn -->
+		<item id="48050" /> <!-- Agathion Libra -->
+		<item id="48052" /> <!-- Agathion Taurus -->
+		<item id="48053" /> <!-- Agathion Leo -->
+		<item id="48054" /> <!-- Agathion Gemini -->
+		<item id="48055" /> <!-- Agathion Scorpio -->
+		<item id="48056" /> <!-- Agathion Aquarius -->
+		<item id="48058" /> <!-- Agathion Sagittarius -->
+	</enchant>
+	<!-- Stable Scroll: Enchant High Quality Agathion -->
+	<enchant id="91623" maxEnchant="10" safeEnchant="3">
+		<item id="93128" /> <!-- Agathion Ignis -->
+		<item id="93129" /> <!-- Agathion Nebula -->
+		<item id="93130" /> <!-- Agathion Procella -->
+		<item id="93131" /> <!-- Agathion Petram -->
+		<item id="93132" /> <!-- Agathion Joy -->
+		<item id="48048" /> <!-- Agathion Virgo -->
+		<item id="48049" /> <!-- Agathion Capricorn -->
+		<item id="48050" /> <!-- Agathion Libra -->
+		<item id="48052" /> <!-- Agathion Taurus -->
+		<item id="48053" /> <!-- Agathion Leo -->
+		<item id="48054" /> <!-- Agathion Gemini -->
+		<item id="48055" /> <!-- Agathion Scorpio -->
+		<item id="48056" /> <!-- Agathion Aquarius -->
+		<item id="48058" /> <!-- Agathion Sagittarius -->
+	</enchant>
+	<!-- Scroll: Enchant Agathion -->
 	<enchant id="93133" maxEnchant="10" safeEnchant="3">
 		<item id="93128" /> <!-- Agathion Ignis -->
 		<item id="93129" /> <!-- Agathion Nebula -->
@@ -254,23 +442,4 @@
 		<item id="48056" /> <!-- Agathion Aquarius -->
 		<item id="48058" /> <!-- Agathion Sagittarius -->
 	</enchant>
-
-	<!-- Talisman of Baium -->
-	<enchant id="91951" maxEnchant="5">
-		<item id="49683" />
-	</enchant>
-
-	<!-- Sibi's Weapon Enchant Scroll -->
-	<enchant id="91155" maxEnchant="23">
-		<item id="91154" />
-	</enchant>
-
-	<!-- Scroll: Enchant Death Knight's Flame Sword -->
-	<enchant id="93931" targetGrade="A" maxEnchant="10">
-		<item id="93864" /> <!-- Death Knight's Flame Sword-->
-	</enchant>
-
-	<enchant id="93932" targetGrade="A" maxEnchant="10">
-		<item id="93864" /> <!-- Death Knight's Flame Sword -->
-	</enchant>
 </list>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/48000-48099.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/48000-48099.xml
index 36ec8cf8a5..5e0707e9ae 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/48000-48099.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/48000-48099.xml
@@ -71,13 +71,13 @@
 	<item id="48046" name="Agathion Enchant Scroll" type="EtcItem">
 		<!-- Only for Zodiac agathions. Increases M. Def. The enchanting is safe up to +3, the maximum enchant value is +10. Starting from +1, the agathion's secondary skills are enhanced with each enchant value. -->
 		<set name="icon" val="icon.star_scrl_of_ench_ag" />
-		<set name="etcitem_type" val="ENCHT_AM" /> <!-- BLESS_ENCHT_AM -->
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="handler" val="EnchantScrolls" />
 		<skills>
-			<skill id="51047" level="1" /> <!-- Agathion Enchant Scroll Lv.1 -->
+			<skill id="51047" level="1" /> <!-- Scroll: Enchant Agathion -->
 		</skills>
 	</item>
 	<item id="48047" name="Quality Agathion Enchant Scroll" type="EtcItem">
@@ -86,9 +86,10 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="handler" val="EnchantScrolls" />
 		<skills>
-			<skill id="51048" level="1" /> <!-- Agathion Enchant Scroll Lv.1 -->
+			<skill id="51048" level="1" /> <!-- Scroll: Enchant High-grade Agathion-->
 		</skills>
 	</item>
 	<item id="48048" name="Agathion - Virgo" type="Armor">
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/49400-49499.xml
index eb6550f083..09d45afb1a 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/49400-49499.xml
@@ -1105,7 +1105,7 @@
 		<!-- Enhances pendants' parameters. Up to +3, the enchanting chance is 100%. The maximum enchantment level is +10. Starting from +4, activates special effects depending on the item type. -->
 		<set name="icon" val="icon.bm_pendant_varnish" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="price" val="0" />
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/49600-49699.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/49600-49699.xml
index 681dd139f2..d62a698058 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/49600-49699.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/49600-49699.xml
@@ -989,7 +989,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="120" />
 		<set name="is_sellable" val="false" />
-        <set name="enchant_enabled" val="true" />
+ 		<set name="enchant_enabled" val="true" />
 		<set name="enchant_limit" val="5" />
 		<cond msgId="113" addName="1">
 			<player level="60" />
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/90100-90199.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/90100-90199.xml
index 7d6f7418cd..eea9a08dbb 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/90100-90199.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/90100-90199.xml
@@ -286,6 +286,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="39208" level="1" /> <!-- Matte Pendant Polish -->
+		</skills>
 	</item>
 	<item id="90138" name="Pendant Shiny Varnish" type="EtcItem">
 		<!-- Enhances pendants' parameters. Can be used with Fire/ Earth Dragon Pendant up to +9. In case of failure, the pendant does not disappear, and its enchant value remains the same. Starting from +4, activates special effects depending on the item type. -->
@@ -296,6 +301,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="39209" level="1" /> <!-- Glittering Pendant Polish -->
+		</skills>
 	</item>
 	<item id="90139" name="Silver Bait" type="EtcItem">
 		<!-- Fishing Bait. Can be used for fishing Whales. -->
@@ -412,12 +422,19 @@
 		<!-- Only for Savior s weapons. In the case of failure, the item does not disappear, and its enchantment level remains the same. -->
 		<set name="icon" val="icon.yogi_scroll_of_enchant_weapon_grade_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="39213" level="1" /> <!-- Radiant Sayha's Cloak Enchantment Scroll -->
+		</skills>
 	</item>
 	<item id="90150" name="Savior’s Dualsword" additionalName="30-day" type="Weapon">
 		<!-- Available for 30 days. <Soul Crystal Enhancement>. Atk. Spd. +5%. -->
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/90900-90999.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/90900-90999.xml
index fcdfcac923..c69643d2fc 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/90900-90999.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/90900-90999.xml
@@ -688,6 +688,7 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="weight" val="2530" />
+		<set name="enchant_enabled" val="true" />
 		<stats>
 			<stat type="pAtk">38</stat>
 			<stat type="mAtk">21</stat>
@@ -704,6 +705,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="39365" level="1" /> <!-- Scroll: Enchant Fishing Weapon -->
+		</skills>
 	</item>
 	<item id="90959" name="Improved Scroll: Enchant Fishing Weapon" type="EtcItem">
 		<!-- For Blue Mackerel: Dual Swords. The enchanting is random from +1 to +3. Cannot be used on weapons enchanted to +17 or higher. Blue Mackerel: Dual Swords can be obtainned through the Fishing Guild. -->
@@ -712,6 +718,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="39366" level="1" /> <!-- Improved Scroll: Enchant Fishing Weapon -->
+		</skills>
 	</item>
 	<item id="90960" name="Transformation Scroll: Teddy Bear" type="EtcItem">
 		<!-- Changes the appearance to that of a teddy bear. <Transformation effect>. Max HP +20%. Max MP +20%. Acquired XP +20%. Acquired SP +20%. Duration: 20 min. Cooldown: 1 min. The effect remains after death. <font color=ff6666>(When Sayha's Grace is active, acquired XP/ SP are increased.)</font>. <font color=eeaa22>(The effect is cancelled when transforming into Kat the Cat/ cat/ panda, or changing the armor appearance to that of Blue Dynasty.)</font> -->
@@ -766,9 +777,10 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
 		<set name="handler" val="EnchantScrolls" />
 		<skills>
-			<skill id="51049" level="1" /> <!-- Stable Scroll: Agathion Enchant Scroll Lv.1 -->
+			<skill id="51049" level="1" /> <!-- Stable Scroll: Enchant Agathion -->
 		</skills>
 	</item>
 	<item id="90964" name="Sealed Doll of Border Box" type="EtcItem">
@@ -1120,6 +1132,11 @@
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51059" level="1" /> <!-- Scroll: Enchant Savior's Earring -->
+		</skills>
 	</item>
 	<item id="90991" name="Lucky Hat" additionalName="30-day" type="Armor">
 		<!-- A leather hat. Available for 30 days. Allows use of the Burglar's Blessing and Burglar's Luck skills. Occupies 2 hair accessory slots. -->
@@ -1190,6 +1207,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51062" level="1" /> <!-- Balthus Knights' Varnish -->
+		</skills>
 	</item>
 	<item id="90996" name="Balthus Knights' Matte Varnish" additionalName="Not Available" type="EtcItem">
 		<!-- Enhances characteristics of damaged rare accessories. Can be used on a item enchanted up to +6. If an enchantment is failed, the item doesn't disappear and keep the previous level of enchantment. Depending on the item type, activates special options from level +4 and higher. -->
@@ -1198,6 +1220,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51063" level="1" /> <!-- Balthus Knights' Matte Varnish -->
+		</skills>
 	</item>
 	<item id="90997" name="Balthus Knights' Shining Varnish" type="EtcItem">
 		<!-- Enhances characteristics of damaged rare accessories. Can be used on a item enchanted up to +8. If an enchantment is failed, the item doesn't disappear and keep the previous level of enchantment. Depending on the item type, activates special options from level +4 and higher. -->
@@ -1206,6 +1233,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51064" level="1" /> <!-- Balthus Knights' Shining Varnish -->
+		</skills>
 	</item>
 	<item id="90998" name="Balthus Knights' Glittering Varnish" type="EtcItem">
 		<!-- Enhances characteristics of damaged rare accessories. Can be used on a item enchanted up to +9. If an enchantment is failed, the item doesn't disappear and keep the previous level of enchantment. Depending on the item type, activates special options from level +4 and higher. -->
@@ -1213,6 +1245,11 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="is_sellable" val="false" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51065" level="1" /> <!-- Balthus Knights' Glittering Varnish -->
+		</skills>
 	</item>
 	<item id="90999" name="Rush's Supplies - Antharas" type="EtcItem">
 		<!-- Double-click to obtain the following items. -->
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91100-91199.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91100-91199.xml
index dcf41c4daa..dbca5fd178 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91100-91199.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91100-91199.xml
@@ -324,6 +324,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51097" level="1" /> <!-- Radiant Sayha's Cloak Enchantment Scroll -->
+		</skills>
 	</item>
 	<item id="91125" name="Ignis' Breath" type="EtcItem">
 		<!-- Can be exchanged for Agathion Ignis by Svein. -->
@@ -725,7 +730,7 @@
 		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
 		<set name="handler" val="EnchantScrolls" />
 		<skills>
-			<skill id="51121" level="1" /> <!-- Scroll: Enchant Death Knight's Flame Sword (Exchangeable) -->
+			<skill id="51121" level="1" /> <!-- Sibi's Weapon Enchant Scroll -->
 		</skills>
 	</item>
 	<item id="91156" name="Fisherman's Blessing (24 hr.)" type="EtcItem">
@@ -1078,6 +1083,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51128" level="1" /> <!-- Spirit's Varnish -->
+		</skills>
 	</item>
 	<item id="91188" name="Blessed Spirit's Varnish" type="EtcItem">
 		<!-- For spirit accessories. When enchant value is higher than +1, additional special effects are applied depending on the accessory type. If the enchanting fails, the item is not crystallized but its enchant value is reset to 0. -->
@@ -1087,6 +1097,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51129" level="1" /> <!-- Blessed Spirit's Varnish -->
+		</skills>
 	</item>
 	<item id="91189" name="Fire Attribute Attack Potion" type="EtcItem">
 		<!-- Applies a buff when used. <Buff effect>. Fire Attack +50. Duration: 20 min. -->
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91200-91299.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91200-91299.xml
index c14bcd0b1b..dbee164366 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91200-91299.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91200-91299.xml
@@ -195,7 +195,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="etcitem_type" val="ENCHT_AM" /> 	<!-- BLESS_ENCHT_AM -->
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
 		<set name="handler" val="EnchantScrolls" />
 		<skills>
 			<skill id="51143" level="1" /> <!-- Radiant Sayha's Cloak Enchantment Scroll -->
@@ -209,7 +209,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="etcitem_type" val="ENCHT_AM" /> 	<!-- BLESS_ENCHT_AM -->
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
 		<set name="handler" val="EnchantScrolls" />
 		<skills>
 			<skill id="51144" level="1" /> <!-- Shining Sayha's Cloak Enchantment Scroll -->
@@ -605,6 +605,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51159" level="1" /> <!-- Dragon Varnish -->
+		</skills>
 	</item>
 	<item id="91250" name="Radiant Dragon Varnish" type="EtcItem">
 		<!-- Required for enchanting Dragon Pendant. The maximum enchant value is +5. In case of failure the enchant value remains the same. -->
@@ -614,6 +619,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51160" level="1" /> <!-- Radiant Dragon Varnish -->
+		</skills>
 	</item>
 	<item id="91251" name="Quality Quick Healing Potion" type="EtcItem">
 		<!-- Momentarily recovers 800 HP. If HP is full, CP is recovered. -->
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91500-91599.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91500-91599.xml
index a0c1c3b0c1..1f717c2f3b 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91500-91599.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91500-91599.xml
@@ -1086,6 +1086,11 @@
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="etcitem_type" val="ENCHT_WP" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="2019" level="1" /> <!-- Scroll: Enchant Weapon -->
+		</skills>
 	</item>
 	<item id="91576" name="Jewel Chest" type="EtcItem">
 		<!-- Double-click to obtain a jewel of grade D-S. -->
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91600-91699.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91600-91699.xml
index 4d08b6b4c1..85642d56b9 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91600-91699.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91600-91699.xml
@@ -270,6 +270,11 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51049" level="1" /> <!-- Stable Scroll: Enchant Agathion -->
+		</skills>
 	</item>
 	<item id="91624" name="Agathion Gift Box" type="EtcItem">
 		<!-- Double-click to obtain various S-grade items, special items and materials, materials for Agathion enchantment. -->
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91700-91799.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91700-91799.xml
index 7652cc5fbf..d9a4412c59 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91700-91799.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91700-91799.xml
@@ -294,7 +294,7 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="etcitem_type" val="ENCHT_AM" /> 	<!-- BLESS_ENCHT_AM -->
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
 		<set name="handler" val="EnchantScrolls" />
 		<skills>
 			<skill id="51439" level="1" /> <!-- Radiant Sayha's Cloak Enchantment Scroll -->
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91800-91899.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91800-91899.xml
index 4dbb18b847..0156afc706 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91800-91899.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91800-91899.xml
@@ -836,6 +836,11 @@
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="ENCHT_WP" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51046" level="1" /> <!-- Special Enchant Scroll (PA Event) -->
+		</skills>
 	</item>
 	<item id="91868" name="Special Enchant Scroll (PA Event)" type="EtcItem">
 		<!-- Required to enchant Caliburs (PA Event). In case of failure the item is not crystallized, its enchant value remains the same. Cannot be used for weapons enchanted to +7 or higher. -->
@@ -848,6 +853,11 @@
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="50146" level="1" /> <!-- Special Enchant Scroll (PA Event) -->
+		</skills>
 	</item>
 	<item id="91869" name="Support Box (Siege Event)" type="EtcItem">
 		<!-- Contains items for the Siege Event. -->
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91900-91999.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91900-91999.xml
index 5cc5370db7..2b534e73d6 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91900-91999.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/91900-91999.xml
@@ -768,7 +768,7 @@
 			<stat type="pAtkRange">40</stat>
 		</stats>
 	</item>
-		<item id="91951" name="Scroll: Enchant Talisman of Baium" type="EtcItem">
+	<item id="91951" name="Scroll: Enchant Talisman of Baium" type="EtcItem">
 		<!-- Required to enchant Talisman of Baium. The maximum enchant value is +5. In case of failure the item disappears. -->
 		<set name="icon" val="icon.etc_charm_of_courage_i05" />
 		<set name="default_action" val="SKILL_REDUCE" />
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93200-93299.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93200-93299.xml
index 9df0cfbf95..508f9fe6de 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93200-93299.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93200-93299.xml
@@ -819,23 +819,35 @@
 		<!-- <font color=bbaa88><When enchanted from +1 to +3></font>. One-handed sword/ blunt weapon, dagger, spear: P. Atk. +10, M. Atk. +6. Two-handed blunt weapons, dual swords, fist weapon: P. Atk. +12, M. Atk. +6. Bow: P. Atk. +16, M. Atk. +6. <font color=bbaa88><When enchanted to +4 or higher></font>. One-handed sword/ blunt weapon, dagger, spear: P. Atk. +30, M. Atk. +18. Two-handed blunt weapons, dual swords, fist weapon: P. Atk. +36, M. Atk. +18. Bow: P. Atk. +48, M. Atk. +18. <font color=eeaa22>Safe enchanting to +4. If the enchant value is +5 or lower, the enchanting is random from +1 to +2. If the enchant value is +6 or higher, the enchanting is +1.</font> -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_a_i04" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="GIANT_ENCHT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
-		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<set name="is_sellable" val="true" />
+		<skills>
+			<skill id="40109" level="1" /> <!-- Blessed Scroll: Enchant A-grade Weapon -->
+		</skills>
 	</item>
 	<item id="93269" name="Improved Scroll: Enchant A-grade Armor" type="EtcItem">
 		<!-- <font color=bbaa88><When enchanted from +1 to +3></font>. Armor: P. Def. +4. Accessories: M. Def. +3. <font color=bbaa88><When enchanted to +4 or higher></font>. Armor: P. Def. +9. Accessories: M. Def. +7. <font color=eeaa22>Safe enchanting to +4. If the enchant value is +5 or lower, the enchanting is random from +1 to +2. If the enchant value is +6 or higher, the enchanting is +1.</font> -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_a_i04" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="GIANT_ENCHT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
-		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<set name="is_sellable" val="true" />
+		<skills>
+			<skill id="40110" level="1" /> <!-- Blessed Scroll: Enchant A-grade Armor -->
+		</skills>
 	</item>
 	<item id="93270" name="Cursed Scroll: Enchant A-grade Weapon" type="EtcItem">
 		<!-- When used, enchant value -1. <font color=eeaa22>Only for items enchanted to +2 and higher.</font> -->
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93900-93999.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93900-93999.xml
index 42824d4715..01579831d4 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93900-93999.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93900-93999.xml
@@ -338,7 +338,7 @@
 		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
 		<set name="handler" val="EnchantScrolls" />
 		<skills>
-			<skill id="40193" level="1" /> <!-- Scroll: Enchant Death Knight's Flame Sword (Exchangeable) -->
+			<skill id="40193" level="1" /> <!-- Scroll: Enchant Death Knight's Flame Sword (Unexchangeable) -->
 		</skills>
 	</item>
 	<item id="93933" name="Rare Accessory Pack Lv. 1" type="EtcItem">
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/39200-39299.xml
index df4cb1ff6d..48a26c684e 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/39200-39299.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/39200-39299.xml
@@ -192,9 +192,21 @@
 	</skill>
 	<skill id="39208" toLevel="1" name="Matte Pendant Polish">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="39209" toLevel="1" name="Glittering Pendant Polish">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="39210" toLevel="1" name="White Assassin Transformation">
 		<!-- You are transformed into White Assassin. For 20 min., Max HP/ MP +7%, P./ M. Accuracy +2, P./ M. Atk. +3%, P./ M. Def. +3%, Atk. Spd. +5%, M. Skill Critical Rate +20, Speed +5. The effect remains after death. -->
@@ -223,6 +235,12 @@
 		<!-- Can only be used together with weapons of Savior. Does not disappear after an unsuccessful Enchant. -->
 		<icon>icon.yogi_scroll_of_enchant_weapon_grade_i00</icon>
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="39214" toLevel="1" name="Savior's Cube">
 		<icon>icon.etc_crystal_cube_event_i00</icon>
@@ -738,7 +756,7 @@
 		<coolTime>500</coolTime>
 		<reuseDelay>3000</reuseDelay>
 	</skill>
-	<skill id="39233" toLevel="1" name="Glowing  Whale">
+	<skill id="39233" toLevel="1" name="Glowing Whale">
 		<icon>icon.fish_huge_i15</icon>
 		<operateType>A1</operateType>
 		<reuseDelay>1000</reuseDelay>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/39300-39399.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/39300-39399.xml
index 38d76015c9..c387b23f72 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/39300-39399.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/39300-39399.xml
@@ -686,9 +686,21 @@
 	<skill id="39365" toLevel="1" name="Scroll: Enchant Fishing Weapon">
 		<!-- Can only be used together with fishing weapons. Does not disappear after an unsuccessful Enchant. -->
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="39366" toLevel="1" name="Improved Scroll: Enchant Fishing Weapon">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="39367" toLevel="1" name="Transformation into Teddy Bear">
 		<!-- Teddy Bear transformation. Max HP/ MP +20%, Acquired XP/ SP +20% while Sayha's Grace is active. The effect remains after death. -->
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/40100-40199.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/40100-40199.xml
index 27d6d483ce..8d58e530cc 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/40100-40199.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/40100-40199.xml
@@ -600,19 +600,31 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="40161" toLevel="1" name="(Test) Emerald Weapon Appearance Stone: One-handed Sword">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLevel>1</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="40162" toLevel="1" name="Emerald Weapon Appearance Stone">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLevel>1</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="40163" toLevel="1" name="Appearance Stone: Dark Assassin Suit">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLevel>1</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="40164" toLevel="1" name="Spellbook: Ability of Glory">
 		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
@@ -795,18 +807,18 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="40192" toLevel="1" name="Scroll: Enchant Death Knight's Flame Sword (Exchangeable)">
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="40193" toLevel="1" name="Scroll: Enchant Death Knight's Flame Sword (Unexchangeable)">
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/50100-50199.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/50100-50199.xml
index 8e35b8fbe9..1f362e0b5c 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/50100-50199.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/50100-50199.xml
@@ -416,6 +416,12 @@
 	</skill>
 	<skill id="50146" toLevel="1" name="Special Enchant Scroll (PA Event)">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="50147" toLevel="1" name="Energy Rune">
 		<!-- When in inventory, recovers Sayha's Grace points. -->
@@ -641,7 +647,6 @@
 		<reuseDelay>500</reuseDelay>
 	</skill>
 	<skill id="50166" toLevel="1" name="Scroll: Enchant Talisman of Baium">
-		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
@@ -651,18 +656,18 @@
 		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="50167" toLevel="1" name="Scroll: Enchant Ring of Insolence">
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="50168" toLevel="1" name="Scroll: Enchant Dragon Valley's Earring">
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/51000-51099.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/51000-51099.xml
index 96cad24d93..6ddec5f33d 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/51000-51099.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/51000-51099.xml
@@ -612,9 +612,9 @@
 	</skill>
 	<skill id="51047" toLevel="1" name="Scroll: Enchant Agathion">
 		<icon>icon.star_scrl_of_ench_ag</icon>
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
@@ -622,9 +622,9 @@
 	</skill>
 	<skill id="51048" toLevel="1" name="Quality Agathion Enchant Scroll">
 		<icon>icon.star_giantscrl_of_ench_ag</icon>
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
@@ -632,9 +632,9 @@
 	</skill>
 	<skill id="51049" toLevel="1" name="Stable Scroll: Enchant Agathion">
 		<icon>icon.star_giantscrl_of_ench_ag</icon>
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
@@ -776,6 +776,12 @@
 	<skill id="51059" toLevel="1" name="Scroll: Enchant Savior's Earring">
 		<!-- Enchants Savior's Earring. -->
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51060" toLevel="1" name="Savior's Earring Box">
 		<icon>icon.etc_treasure_box_i07</icon>
@@ -795,15 +801,39 @@
 	</skill>
 	<skill id="51062" toLevel="1" name="Balthus Knights' Varnish">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51063" toLevel="1" name="Balthus Knights' Matte Varnish">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51064" toLevel="1" name="Balthus Knights' Shining Varnish">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51065" toLevel="1" name="Balthus Knights' Glittering Varnish">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51066" toLevel="1" name="Rash's Supplies - Antharas">
 		<operateType>A1</operateType>
@@ -1177,6 +1207,12 @@
 	<skill id="51097" toLevel="1" name="Radiant Spirit's Varnish">
 		<icon>icon.ev_charge_scroll</icon>
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51098" toLevel="1" name="Blue Dynasty Transformation">
 		<!-- Blue Dynasty outfit. Max HP/ MP +20%, Acquired XP/ SP +20% while Sayha's Grace is active. The effect remains after death. -->
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/51100-51199.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/51100-51199.xml
index 014760bbe4..113ceac055 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/51100-51199.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/skills/51100-51199.xml
@@ -181,9 +181,9 @@
 	<skill id="51121" toLevel="1" name="Sibi's Weapon Enchant Scroll">
 		<!-- Enchants Sibi's Samurai Black Long Sword. -->
 		<icon>icon.yogi_scroll_of_enchant_weapon_grade_i00</icon>
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
@@ -264,10 +264,22 @@
 	<skill id="51128" toLevel="1" name="Spirit's Varnish">
 		<icon>icon.ev_charge_scroll</icon>
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51129" toLevel="1" name="Blessed Spirit's Varnish">
 		<icon>icon.ev_charge_scroll</icon>
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51130" toLevel="1" name="Fire Attack Potion">
 		<!-- For 20 min., Fire Attack +50. Cooldown: 1 min. -->
@@ -498,9 +510,21 @@
 	</skill>
 	<skill id="51159" toLevel="1" name="Dragon Varnish">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51160" toLevel="1" name="Radiant Dragon Varnish">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51161" toLevel="1" name="Highest-grade HP Recovery Potion">
 		<!-- Instantly recovers 800 HP. -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/EnchantItemData.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/EnchantItemData.xml
index d9d25b5b52..c180dca8f1 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/EnchantItemData.xml
@@ -99,6 +99,86 @@
 		<item id="49467" />
 		<item id="49468" />
 	</enchant>
+	<!-- Pendant Matte Varnish -->
+	<enchant id="90137" maxEnchant="6" safeEnchant="3">
+		<item id="49467" />
+		<item id="49468" />
+	</enchant>
+	<!-- Pendant Shiny Varnish -->
+	<enchant id="90138" maxEnchant="9" safeEnchant="3">
+		<item id="49467" />
+		<item id="49468" />
+	</enchant>
+
+	<!-- Savior Scroll: Enchant Weapon -->
+	<enchant id="90149" targetGrade="C" maxEnchant="10">
+		<item id="90150" />
+		<item id="90151" />
+		<item id="90152" />
+		<item id="90153" />
+		<item id="90154" />
+		<item id="90867" />
+		<item id="90868" />
+		<item id="90869" />
+		<item id="90870" />
+		<item id="90871" />
+	</enchant>
+
+	<!-- Scroll: Enchant Fishing Weapon -->
+	<enchant id="90958" maxEnchant="17">
+		<item id="90957" />
+	</enchant>
+
+	<!-- Improved Scroll: Enchant Fishing Weapon -->
+	<enchant id="90959" maxEnchant="17" randomEnchantMin="1" randomEnchantMax="3">
+		<item id="90957" />
+	</enchant>
+
+	<!-- Scroll: Enchant Savior's Earring -->
+	<enchant id="90990" maxEnchant="7">
+		<item id="90987" />
+		<item id="90988" />
+		<item id="91243" />
+	</enchant>
+
+	<!-- Balthus Knights' Varnish -->
+	<enchant id="90995" maxEnchant="10">
+		<item id="90993" />
+		<item id="90994" />
+		<item id="91006" />
+	</enchant>
+	<!-- Balthus Knights' Shining Varnish -->
+	<enchant id="90997" maxEnchant="8">
+		<item id="90993" />
+		<item id="90994" />
+		<item id="91006" />
+	</enchant>
+	<!-- Balthus Knights' Glittering Varnish -->
+	<enchant id="90998" maxEnchant="9">
+		<item id="90993" />
+		<item id="90994" />
+		<item id="91006" />
+	</enchant>
+
+	<!-- Sibi's Weapon Enchant Scroll -->
+	<enchant id="91155" maxEnchant="23">
+		<item id="91154" />
+	</enchant>
+
+	<!-- Radiant Spirit's Varnish -->
+	<enchant id="91124" maxEnchant="9">
+		<item id="94682" />
+	</enchant>
+
+	<!-- Spirit's Varnish -->
+	<enchant id="91187" maxEnchant="10">
+		<item id="94682" />
+	</enchant>
+
+	<!-- Blessed Spirit's Varnish -->
+	<enchant id="91188" maxEnchant="10">
+		<item id="94682" />
+	</enchant>
 
 	<!-- Sayha's Cloak -->
 	<enchant id="91213" maxEnchant="10">
@@ -116,12 +196,32 @@
 
 	<!-- Sayha's Cloak -->
 	<enchant id="91215" maxEnchant="7">
-		<item id="49467" />
-		<item id="49467" />
-		<item id="49468" />
+		<item id="91210" />
+		<item id="91211" />
+		<item id="91212" />
 	</enchant>
 
-	<!-- Special Sayha's Cloak -->
+	<!-- Dragon Varnish -->
+	<enchant id="91249" maxEnchant="5">
+		<item id="91244" />
+		<item id="91245" />
+		<item id="91246" />
+		<item id="91247" />
+	</enchant>
+	<!-- Radiant Dragon Varnish -->
+	<enchant id="91250" maxEnchant="5">
+		<item id="91244" />
+		<item id="91245" />
+		<item id="91246" />
+		<item id="91247" />
+	</enchant>
+
+	<!-- Scroll: Enchant Excalibur -->
+	<enchant id="91575" maxEnchant="15">
+		<item id="91574" />
+	</enchant>
+
+	<!-- Scroll: Enchant Special Sayha's Cloak -->
 	<enchant id="91722" maxEnchant="10">
 		<item id="91719" />
 		<item id="91720" />
@@ -137,8 +237,50 @@
 	<enchant id="91863" maxEnchant="10">
 		<item id="91862" />
 	</enchant>
+	<!-- Scroll: Enchant Dragon Belt -->
+	<enchant id="95596" maxEnchant="9">
+		<item id="91862" />
+	</enchant>
 
-	<!-- Talisman of Eva -->
+	<!-- Enchant Scroll (PA Event) -->
+	<enchant id="91867" maxEnchant="10">
+		<item id="91866" />
+	</enchant>
+
+	<!-- Special Enchant Scroll (PA Event) -->
+	<enchant id="91868" maxEnchant="7">
+		<item id="91866" />
+	</enchant>
+
+	<!-- Talisman of Baium -->
+	<enchant id="91951" maxEnchant="5">
+		<item id="49683" />
+		<item id="94119" />
+	</enchant>
+
+	<!-- Scroll: Enchant Ring of Insolence -->
+	<enchant id="91966" maxEnchant="10">
+		<item id="91952" />
+		<item id="95718" />
+	</enchant>
+	<!-- Scroll: Enchant Ring of Insolence - Sealed -->
+	<enchant id="95720" maxEnchant="10">
+		<item id="91952" />
+		<item id="95718" />
+	</enchant>
+
+	<!-- Scroll: Enchant Dragon Valley's Earring -->
+	<enchant id="91967" maxEnchant="10">
+		<item id="91953" />
+		<item id="95719" />
+	</enchant>
+	<!-- Scroll: Enchant Dragon Valley's Earring - Sealed -->
+	<enchant id="95721" maxEnchant="10">
+		<item id="91953" />
+		<item id="95719" />
+	</enchant>
+
+	<!-- Scroll: Enchant Talisman of Eva -->
 	<enchant id="92017" maxEnchant="10">
 		<item id="92018" />
 	</enchant>
@@ -182,25 +324,36 @@
 		<item id="93042" />
 	</enchant>
 
-	<!-- Adventurer's Talisman -->
-	<enchant id="95688" maxEnchant="10" safeEnchant="1">
-		<item id="91937" />
-	</enchant>
-
 	<!-- Cloak of Protection -->
 	<enchant id="93302" maxEnchant="10">
 		<item id="93301" />
 	</enchant>
+	<!-- Cloak of Protection -->
+	<enchant id="95597" maxEnchant="9">
+		<item id="93301" />
+	</enchant>
 
 	<!-- Talisman of Authority -->
 	<enchant id="93329" maxEnchant="10">
 		<item id="91061" />
 	</enchant>
 
+	<!-- Scroll: Enchant Death Knight's Flame Sword -->
+	<enchant id="93931" targetGrade="A" maxEnchant="10">
+		<item id="93864" /> <!-- Death Knight's Flame Sword-->
+	</enchant>
+	<enchant id="93932" targetGrade="A" maxEnchant="10">
+		<item id="93864" /> <!-- Death Knight's Flame Sword -->
+	</enchant>
+
 	<!-- Circlet of Hero -->
 	<enchant id="94169" maxEnchant="10">
 		<item id="94166" />
 	</enchant>
+	<!-- Scroll: Enchant Circlet of Hero -->
+	<enchant id="95598" maxEnchant="9">
+		<item id="94166" />
+	</enchant>
 
 	<!-- Scroll: Enchant Rare Accessories -->
 	<enchant id="94383" maxEnchant="5" safeEnchant="1">
@@ -238,6 +391,27 @@
 		<item id="91550" /> <!-- Frintezza's Necklace -->
 	</enchant>
 
+	<!-- Scroll: Enchant Necklace of Spirits -->
+	<enchant id="94683" maxEnchant="10" safeEnchant="1">
+		<item id="94682" />
+	</enchant>
+
+	<!-- Enchannt Hellbound Ring -->
+	<enchant id="94719" maxEnchant="10">
+		<item id="94718" /> <!-- Hellbound Ring -->
+	</enchant>
+
+	<!-- Scroll: Enchant Clan Equipment -->
+	<enchant id="95638" maxEnchant="10">
+		<item id="95636" />
+		<item id="95637" />
+	</enchant>
+
+	<!-- Adventurer's Talisman -->
+	<enchant id="95688" maxEnchant="10" safeEnchant="1">
+		<item id="91937" />
+	</enchant>
+
 	<!-- Enchant Spirit - Zodiac Agathion -->
 	<enchant id="48046" maxEnchant="10" safeEnchant="3">
 		<item id="93128" /> <!-- Agathion Ignis -->
@@ -255,6 +429,58 @@
 		<item id="48056" /> <!-- Agathion Aquarius -->
 		<item id="48058" /> <!-- Agathion Sagittarius -->
 	</enchant>
+	<!-- Quality Agathion Enchant Scroll -->
+	<enchant id="48047" maxEnchant="8" safeEnchant="3" randomEnchantMin="1" randomEnchantMax="3">
+		<item id="93128" /> <!-- Agathion Ignis -->
+		<item id="93129" /> <!-- Agathion Nebula -->
+		<item id="93130" /> <!-- Agathion Procella -->
+		<item id="93131" /> <!-- Agathion Petram -->
+		<item id="93132" /> <!-- Agathion Joy -->
+		<item id="48048" /> <!-- Agathion Virgo -->
+		<item id="48049" /> <!-- Agathion Capricorn -->
+		<item id="48050" /> <!-- Agathion Libra -->
+		<item id="48052" /> <!-- Agathion Taurus -->
+		<item id="48053" /> <!-- Agathion Leo -->
+		<item id="48054" /> <!-- Agathion Gemini -->
+		<item id="48055" /> <!-- Agathion Scorpio -->
+		<item id="48056" /> <!-- Agathion Aquarius -->
+		<item id="48058" /> <!-- Agathion Sagittarius -->
+	</enchant>
+	<!-- Solid Scroll: Enchant Agathion -->
+	<enchant id="90963" maxEnchant="10" safeEnchant="3">
+		<item id="93128" /> <!-- Agathion Ignis -->
+		<item id="93129" /> <!-- Agathion Nebula -->
+		<item id="93130" /> <!-- Agathion Procella -->
+		<item id="93131" /> <!-- Agathion Petram -->
+		<item id="93132" /> <!-- Agathion Joy -->
+		<item id="48048" /> <!-- Agathion Virgo -->
+		<item id="48049" /> <!-- Agathion Capricorn -->
+		<item id="48050" /> <!-- Agathion Libra -->
+		<item id="48052" /> <!-- Agathion Taurus -->
+		<item id="48053" /> <!-- Agathion Leo -->
+		<item id="48054" /> <!-- Agathion Gemini -->
+		<item id="48055" /> <!-- Agathion Scorpio -->
+		<item id="48056" /> <!-- Agathion Aquarius -->
+		<item id="48058" /> <!-- Agathion Sagittarius -->
+	</enchant>
+	<!-- Stable Scroll: Enchant High Quality Agathion -->
+	<enchant id="91623" maxEnchant="10" safeEnchant="3">
+		<item id="93128" /> <!-- Agathion Ignis -->
+		<item id="93129" /> <!-- Agathion Nebula -->
+		<item id="93130" /> <!-- Agathion Procella -->
+		<item id="93131" /> <!-- Agathion Petram -->
+		<item id="93132" /> <!-- Agathion Joy -->
+		<item id="48048" /> <!-- Agathion Virgo -->
+		<item id="48049" /> <!-- Agathion Capricorn -->
+		<item id="48050" /> <!-- Agathion Libra -->
+		<item id="48052" /> <!-- Agathion Taurus -->
+		<item id="48053" /> <!-- Agathion Leo -->
+		<item id="48054" /> <!-- Agathion Gemini -->
+		<item id="48055" /> <!-- Agathion Scorpio -->
+		<item id="48056" /> <!-- Agathion Aquarius -->
+		<item id="48058" /> <!-- Agathion Sagittarius -->
+	</enchant>
+	<!-- Scroll: Enchant Agathion -->
 	<enchant id="93133" maxEnchant="10" safeEnchant="3">
 		<item id="93128" /> <!-- Agathion Ignis -->
 		<item id="93129" /> <!-- Agathion Nebula -->
@@ -271,28 +497,4 @@
 		<item id="48056" /> <!-- Agathion Aquarius -->
 		<item id="48058" /> <!-- Agathion Sagittarius -->
 	</enchant>
-
-	<!-- Talisman of Baium -->
-	<enchant id="91951" maxEnchant="5">
-		<item id="49683" />
-	</enchant>
-
-	<!-- Sibi's Weapon Enchant Scroll -->
-	<enchant id="91155" maxEnchant="23">
-		<item id="91154" />
-	</enchant>
-
-	<!-- Scroll: Enchant Death Knight's Flame Sword -->
-	<enchant id="93931" targetGrade="A" maxEnchant="10">
-		<item id="93864" /> <!-- Death Knight's Flame Sword-->
-	</enchant>
-
-	<enchant id="93932" targetGrade="A" maxEnchant="10">
-		<item id="93864" /> <!-- Death Knight's Flame Sword -->
-	</enchant>
-
-	<!-- Enchannt Hellbound Ring -->
-	<enchant id="94719" maxEnchant="10">
-		<item id="94718" /> <!-- Hellbound Ring -->
-	</enchant>
 </list>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/48000-48099.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/48000-48099.xml
index 36ec8cf8a5..5e0707e9ae 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/48000-48099.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/48000-48099.xml
@@ -71,13 +71,13 @@
 	<item id="48046" name="Agathion Enchant Scroll" type="EtcItem">
 		<!-- Only for Zodiac agathions. Increases M. Def. The enchanting is safe up to +3, the maximum enchant value is +10. Starting from +1, the agathion's secondary skills are enhanced with each enchant value. -->
 		<set name="icon" val="icon.star_scrl_of_ench_ag" />
-		<set name="etcitem_type" val="ENCHT_AM" /> <!-- BLESS_ENCHT_AM -->
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="handler" val="EnchantScrolls" />
 		<skills>
-			<skill id="51047" level="1" /> <!-- Agathion Enchant Scroll Lv.1 -->
+			<skill id="51047" level="1" /> <!-- Scroll: Enchant Agathion -->
 		</skills>
 	</item>
 	<item id="48047" name="Quality Agathion Enchant Scroll" type="EtcItem">
@@ -86,9 +86,10 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="handler" val="EnchantScrolls" />
 		<skills>
-			<skill id="51048" level="1" /> <!-- Agathion Enchant Scroll Lv.1 -->
+			<skill id="51048" level="1" /> <!-- Scroll: Enchant High-grade Agathion-->
 		</skills>
 	</item>
 	<item id="48048" name="Agathion - Virgo" type="Armor">
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/49400-49499.xml
index 3debf01410..a09534f45f 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/49400-49499.xml
@@ -1105,7 +1105,7 @@
 		<!-- Enhances pendants' parameters. Up to +3, the enchanting chance is 100%. The maximum enchantment level is +10. Starting from +4, activates special effects depending on the item type. -->
 		<set name="icon" val="icon.bm_pendant_varnish" />
 		<set name="default_action" val="SKILL_REDUCE" />
-		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="etcitem_type" val="ENCHT_AM" />
 		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="price" val="0" />
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/49600-49699.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/49600-49699.xml
index 681dd139f2..d62a698058 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/49600-49699.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/49600-49699.xml
@@ -989,7 +989,7 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="120" />
 		<set name="is_sellable" val="false" />
-        <set name="enchant_enabled" val="true" />
+ 		<set name="enchant_enabled" val="true" />
 		<set name="enchant_limit" val="5" />
 		<cond msgId="113" addName="1">
 			<player level="60" />
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/90100-90199.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/90100-90199.xml
index 853c561349..508bd6fbe2 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/90100-90199.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/90100-90199.xml
@@ -286,6 +286,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="39208" level="1" /> <!-- Matte Pendant Polish -->
+		</skills>
 	</item>
 	<item id="90138" name="Pendant Shiny Varnish" type="EtcItem">
 		<!-- Enhances pendants' parameters. Can be used with Fire/ Earth Dragon Pendant up to +9. In case of failure, the pendant does not disappear, and its enchant value remains the same. Starting from +4, activates special effects depending on the item type. -->
@@ -296,6 +301,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="39209" level="1" /> <!-- Glittering Pendant Polish -->
+		</skills>
 	</item>
 	<item id="90139" name="Silver Bait" type="EtcItem">
 		<!-- Fishing Bait. Can be used for fishing Whales. -->
@@ -412,12 +422,19 @@
 		<!-- Only for Savior s weapons. In the case of failure, the item does not disappear, and its enchantment level remains the same. -->
 		<set name="icon" val="icon.yogi_scroll_of_enchant_weapon_grade_i00" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="39213" level="1" /> <!-- Radiant Sayha's Cloak Enchantment Scroll -->
+		</skills>
 	</item>
 	<item id="90150" name="Savior’s Dualsword" additionalName="30-day" type="Weapon">
 		<!-- Available for 30 days. <Soul Crystal Enhancement>. Atk. Spd. +5%. -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/90900-90999.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/90900-90999.xml
index fcdfcac923..c69643d2fc 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/90900-90999.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/90900-90999.xml
@@ -688,6 +688,7 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="weight" val="2530" />
+		<set name="enchant_enabled" val="true" />
 		<stats>
 			<stat type="pAtk">38</stat>
 			<stat type="mAtk">21</stat>
@@ -704,6 +705,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="39365" level="1" /> <!-- Scroll: Enchant Fishing Weapon -->
+		</skills>
 	</item>
 	<item id="90959" name="Improved Scroll: Enchant Fishing Weapon" type="EtcItem">
 		<!-- For Blue Mackerel: Dual Swords. The enchanting is random from +1 to +3. Cannot be used on weapons enchanted to +17 or higher. Blue Mackerel: Dual Swords can be obtainned through the Fishing Guild. -->
@@ -712,6 +718,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="39366" level="1" /> <!-- Improved Scroll: Enchant Fishing Weapon -->
+		</skills>
 	</item>
 	<item id="90960" name="Transformation Scroll: Teddy Bear" type="EtcItem">
 		<!-- Changes the appearance to that of a teddy bear. <Transformation effect>. Max HP +20%. Max MP +20%. Acquired XP +20%. Acquired SP +20%. Duration: 20 min. Cooldown: 1 min. The effect remains after death. <font color=ff6666>(When Sayha's Grace is active, acquired XP/ SP are increased.)</font>. <font color=eeaa22>(The effect is cancelled when transforming into Kat the Cat/ cat/ panda, or changing the armor appearance to that of Blue Dynasty.)</font> -->
@@ -766,9 +777,10 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
 		<set name="handler" val="EnchantScrolls" />
 		<skills>
-			<skill id="51049" level="1" /> <!-- Stable Scroll: Agathion Enchant Scroll Lv.1 -->
+			<skill id="51049" level="1" /> <!-- Stable Scroll: Enchant Agathion -->
 		</skills>
 	</item>
 	<item id="90964" name="Sealed Doll of Border Box" type="EtcItem">
@@ -1120,6 +1132,11 @@
 		<set name="is_stackable" val="true" />
 		<set name="is_freightable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51059" level="1" /> <!-- Scroll: Enchant Savior's Earring -->
+		</skills>
 	</item>
 	<item id="90991" name="Lucky Hat" additionalName="30-day" type="Armor">
 		<!-- A leather hat. Available for 30 days. Allows use of the Burglar's Blessing and Burglar's Luck skills. Occupies 2 hair accessory slots. -->
@@ -1190,6 +1207,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51062" level="1" /> <!-- Balthus Knights' Varnish -->
+		</skills>
 	</item>
 	<item id="90996" name="Balthus Knights' Matte Varnish" additionalName="Not Available" type="EtcItem">
 		<!-- Enhances characteristics of damaged rare accessories. Can be used on a item enchanted up to +6. If an enchantment is failed, the item doesn't disappear and keep the previous level of enchantment. Depending on the item type, activates special options from level +4 and higher. -->
@@ -1198,6 +1220,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51063" level="1" /> <!-- Balthus Knights' Matte Varnish -->
+		</skills>
 	</item>
 	<item id="90997" name="Balthus Knights' Shining Varnish" type="EtcItem">
 		<!-- Enhances characteristics of damaged rare accessories. Can be used on a item enchanted up to +8. If an enchantment is failed, the item doesn't disappear and keep the previous level of enchantment. Depending on the item type, activates special options from level +4 and higher. -->
@@ -1206,6 +1233,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51064" level="1" /> <!-- Balthus Knights' Shining Varnish -->
+		</skills>
 	</item>
 	<item id="90998" name="Balthus Knights' Glittering Varnish" type="EtcItem">
 		<!-- Enhances characteristics of damaged rare accessories. Can be used on a item enchanted up to +9. If an enchantment is failed, the item doesn't disappear and keep the previous level of enchantment. Depending on the item type, activates special options from level +4 and higher. -->
@@ -1213,6 +1245,11 @@
 		<set name="default_action" val="SKILL_REDUCE" />
 		<set name="is_sellable" val="false" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51065" level="1" /> <!-- Balthus Knights' Glittering Varnish -->
+		</skills>
 	</item>
 	<item id="90999" name="Rush's Supplies - Antharas" type="EtcItem">
 		<!-- Double-click to obtain the following items. -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91100-91199.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91100-91199.xml
index dcf41c4daa..dbca5fd178 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91100-91199.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91100-91199.xml
@@ -324,6 +324,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51097" level="1" /> <!-- Radiant Sayha's Cloak Enchantment Scroll -->
+		</skills>
 	</item>
 	<item id="91125" name="Ignis' Breath" type="EtcItem">
 		<!-- Can be exchanged for Agathion Ignis by Svein. -->
@@ -725,7 +730,7 @@
 		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
 		<set name="handler" val="EnchantScrolls" />
 		<skills>
-			<skill id="51121" level="1" /> <!-- Scroll: Enchant Death Knight's Flame Sword (Exchangeable) -->
+			<skill id="51121" level="1" /> <!-- Sibi's Weapon Enchant Scroll -->
 		</skills>
 	</item>
 	<item id="91156" name="Fisherman's Blessing (24 hr.)" type="EtcItem">
@@ -1078,6 +1083,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51128" level="1" /> <!-- Spirit's Varnish -->
+		</skills>
 	</item>
 	<item id="91188" name="Blessed Spirit's Varnish" type="EtcItem">
 		<!-- For spirit accessories. When enchant value is higher than +1, additional special effects are applied depending on the accessory type. If the enchanting fails, the item is not crystallized but its enchant value is reset to 0. -->
@@ -1087,6 +1097,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51129" level="1" /> <!-- Blessed Spirit's Varnish -->
+		</skills>
 	</item>
 	<item id="91189" name="Fire Attribute Attack Potion" type="EtcItem">
 		<!-- Applies a buff when used. <Buff effect>. Fire Attack +50. Duration: 20 min. -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91200-91299.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91200-91299.xml
index c14bcd0b1b..dbee164366 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91200-91299.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91200-91299.xml
@@ -195,7 +195,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="etcitem_type" val="ENCHT_AM" /> 	<!-- BLESS_ENCHT_AM -->
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
 		<set name="handler" val="EnchantScrolls" />
 		<skills>
 			<skill id="51143" level="1" /> <!-- Radiant Sayha's Cloak Enchantment Scroll -->
@@ -209,7 +209,7 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="etcitem_type" val="ENCHT_AM" /> 	<!-- BLESS_ENCHT_AM -->
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
 		<set name="handler" val="EnchantScrolls" />
 		<skills>
 			<skill id="51144" level="1" /> <!-- Shining Sayha's Cloak Enchantment Scroll -->
@@ -605,6 +605,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="BLESS_ENCHT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51159" level="1" /> <!-- Dragon Varnish -->
+		</skills>
 	</item>
 	<item id="91250" name="Radiant Dragon Varnish" type="EtcItem">
 		<!-- Required for enchanting Dragon Pendant. The maximum enchant value is +5. In case of failure the enchant value remains the same. -->
@@ -614,6 +619,11 @@
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51160" level="1" /> <!-- Radiant Dragon Varnish -->
+		</skills>
 	</item>
 	<item id="91251" name="Quality Quick Healing Potion" type="EtcItem">
 		<!-- Momentarily recovers 800 HP. If HP is full, CP is recovered. -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91500-91599.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91500-91599.xml
index 4203c19a81..6cf697e5b1 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91500-91599.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91500-91599.xml
@@ -1086,6 +1086,11 @@
 		<set name="is_stackable" val="true" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
+		<set name="etcitem_type" val="ENCHT_WP" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="2019" level="1" /> <!-- Scroll: Enchant Weapon -->
+		</skills>
 	</item>
 	<item id="91576" name="Jewel Chest" type="EtcItem">
 		<!-- Double-click to obtain a jewel of grade D-S. -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91600-91699.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91600-91699.xml
index 4d08b6b4c1..85642d56b9 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91600-91699.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91600-91699.xml
@@ -270,6 +270,11 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51049" level="1" /> <!-- Stable Scroll: Enchant Agathion -->
+		</skills>
 	</item>
 	<item id="91624" name="Agathion Gift Box" type="EtcItem">
 		<!-- Double-click to obtain various S-grade items, special items and materials, materials for Agathion enchantment. -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91700-91799.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91700-91799.xml
index 7652cc5fbf..d9a4412c59 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91700-91799.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91700-91799.xml
@@ -294,7 +294,7 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="etcitem_type" val="ENCHT_AM" /> 	<!-- BLESS_ENCHT_AM -->
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
 		<set name="handler" val="EnchantScrolls" />
 		<skills>
 			<skill id="51439" level="1" /> <!-- Radiant Sayha's Cloak Enchantment Scroll -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91800-91899.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91800-91899.xml
index 4dbb18b847..0156afc706 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91800-91899.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91800-91899.xml
@@ -836,6 +836,11 @@
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="ENCHT_WP" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="51046" level="1" /> <!-- Special Enchant Scroll (PA Event) -->
+		</skills>
 	</item>
 	<item id="91868" name="Special Enchant Scroll (PA Event)" type="EtcItem">
 		<!-- Required to enchant Caliburs (PA Event). In case of failure the item is not crystallized, its enchant value remains the same. Cannot be used for weapons enchanted to +7 or higher. -->
@@ -848,6 +853,11 @@
 		<set name="is_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="50146" level="1" /> <!-- Special Enchant Scroll (PA Event) -->
+		</skills>
 	</item>
 	<item id="91869" name="Support Box (Siege Event)" type="EtcItem">
 		<!-- Contains items for the Siege Event. -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91900-91999.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91900-91999.xml
index 5cc5370db7..2b534e73d6 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91900-91999.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/91900-91999.xml
@@ -768,7 +768,7 @@
 			<stat type="pAtkRange">40</stat>
 		</stats>
 	</item>
-		<item id="91951" name="Scroll: Enchant Talisman of Baium" type="EtcItem">
+	<item id="91951" name="Scroll: Enchant Talisman of Baium" type="EtcItem">
 		<!-- Required to enchant Talisman of Baium. The maximum enchant value is +5. In case of failure the item disappears. -->
 		<set name="icon" val="icon.etc_charm_of_courage_i05" />
 		<set name="default_action" val="SKILL_REDUCE" />
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/93200-93299.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/93200-93299.xml
index 38a2df2c84..c768a3494d 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/93200-93299.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/93200-93299.xml
@@ -820,23 +820,35 @@
 		<!-- <font color=bbaa88><When enchanted from +1 to +3></font>. One-handed sword/ blunt weapon, dagger, spear: P. Atk. +10, M. Atk. +6. Two-handed blunt weapons, dual swords, fist weapon: P. Atk. +12, M. Atk. +6. Bow: P. Atk. +16, M. Atk. +6. <font color=bbaa88><When enchanted to +4 or higher></font>. One-handed sword/ blunt weapon, dagger, spear: P. Atk. +30, M. Atk. +18. Two-handed blunt weapons, dual swords, fist weapon: P. Atk. +36, M. Atk. +18. Bow: P. Atk. +48, M. Atk. +18. <font color=eeaa22>Safe enchanting to +4. If the enchant value is +5 or lower, the enchanting is random from +1 to +2. If the enchant value is +6 or higher, the enchanting is +1.</font> -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_a_i04" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="GIANT_ENCHT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
-		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<set name="is_sellable" val="true" />
+		<skills>
+			<skill id="40109" level="1" /> <!-- Blessed Scroll: Enchant A-grade Weapon -->
+		</skills>
 	</item>
 	<item id="93269" name="Improved Scroll: Enchant A-grade Armor" type="EtcItem">
 		<!-- <font color=bbaa88><When enchanted from +1 to +3></font>. Armor: P. Def. +4. Accessories: M. Def. +3. <font color=bbaa88><When enchanted to +4 or higher></font>. Armor: P. Def. +9. Accessories: M. Def. +7. <font color=eeaa22>Safe enchanting to +4. If the enchant value is +5 or lower, the enchanting is random from +1 to +2. If the enchant value is +6 or higher, the enchanting is +1.</font> -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_a_i04" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="GIANT_ENCHT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_tradable" val="false" />
-		<set name="is_dropable" val="false" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
-		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<set name="is_sellable" val="true" />
+		<skills>
+			<skill id="40110" level="1" /> <!-- Blessed Scroll: Enchant A-grade Armor -->
+		</skills>
 	</item>
 	<item id="93270" name="Cursed Scroll: Enchant A-grade Weapon" type="EtcItem">
 		<!-- When used, enchant value -1. <font color=eeaa22>Only for items enchanted to +2 and higher.</font> -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/93900-93999.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/93900-93999.xml
index 42824d4715..01579831d4 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/93900-93999.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/93900-93999.xml
@@ -338,7 +338,7 @@
 		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
 		<set name="handler" val="EnchantScrolls" />
 		<skills>
-			<skill id="40193" level="1" /> <!-- Scroll: Enchant Death Knight's Flame Sword (Exchangeable) -->
+			<skill id="40193" level="1" /> <!-- Scroll: Enchant Death Knight's Flame Sword (Unexchangeable) -->
 		</skills>
 	</item>
 	<item id="93933" name="Rare Accessory Pack Lv. 1" type="EtcItem">
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95500-95599.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95500-95599.xml
index d3c0bac626..146ff38ebd 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95500-95599.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95500-95599.xml
@@ -1156,7 +1156,7 @@
 		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
 		<set name="handler" val="EnchantScrolls" />
 		<skills>
-			<skill id="40210" level="1" /> <!-- Scroll: Enchant Circlet of Hero -->
+			<skill id="40228" level="1" /> <!-- Scroll: Enchant Circlet of Hero -->
 		</skills>
 	</item>
 	<item id="95599" name="Random Craft: Create +7 Kite Shield" type="EtcItem">
@@ -1169,10 +1169,5 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
-		<set name="handler" val="EnchantScrolls" />
-		<skills>
-			<skill id="40228" level="1" /> <!-- 17th Anniversary Scroll: Enchant Circlet of Hero -->
-		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95600-95699.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95600-95699.xml
index b5ec8b439f..134d35275d 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95600-95699.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95600-95699.xml
@@ -388,6 +388,12 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="ENCHT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="40337" level="1" /> <!-- Scroll: Enchant Clan Equipment -->
+		</skills>
 	</item>
 	<item id="95639" name="PA Blessing" type="EtcItem">
 		<!-- Grants various effects when added to the PA collection. -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95700-95799.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95700-95799.xml
index d4e5de7d6f..0be5ceaf5d 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95700-95799.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/95700-95799.xml
@@ -335,6 +335,12 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="ENCHT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="50167" level="1" /> <!-- Scroll: Enchant Ring of Insolence -->
+		</skills>
 	</item>
 	<item id="95721" name="Scroll: Enchant Dragon Valley's Earring" additionalName="Sealed" type="EtcItem">
 		<!-- Required for enchanting Dragon Valley's Earring. The maximum enchant value is +10. -->
@@ -344,6 +350,12 @@
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="etcitem_type" val="ENCHT_AM" />
+		<set name="handler" val="EnchantScrolls" />
+		<skills>
+			<skill id="50168" level="1" /> <!-- Scroll: Enchant Dragon Valley's Earring -->
+		</skills>
 	</item>
 	<item id="95722" name="Enchant Package: Ring of Insolence" additionalName="Sealed" type="EtcItem">
 		<!-- Double-click to obtain the following items. -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/39200-39299.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/39200-39299.xml
index e84047e914..d9cd750718 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/39200-39299.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/39200-39299.xml
@@ -192,9 +192,21 @@
 	</skill>
 	<skill id="39208" toLevel="1" name="Matte Pendant Polish">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="39209" toLevel="1" name="Glittering Pendant Polish">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="39210" toLevel="1" name="White Assassin Transformation">
 		<!-- You are transformed into White Assassin. For 20 min., Max HP/ MP +7%, P./ M. Accuracy +2, P./ M. Atk. +3%, P./ M. Def. +3%, Atk. Spd. +5%, M. Skill Critical Rate +20, Speed +5. The effect remains after death. -->
@@ -211,7 +223,7 @@
 		<reuseDelay>7200000</reuseDelay>
 		<effectPoint>1</effectPoint>
 	</skill>
-	<skill id="39212" toLevel="1" name="Einhasad s Protection">
+	<skill id="39212" toLevel="1" name="Einhasad's Protection">
 		<!-- For 1 h., Acquired XP/ SP +100%. Cooldown: 1 min. The effect remains after death. -->
 		<icon>icon.etc_dragons_blood_i03</icon>
 		<operateType>A1</operateType>
@@ -223,8 +235,14 @@
 		<!-- Can only be used together with weapons of Savior. Does not disappear after an unsuccessful Enchant. -->
 		<icon>icon.yogi_scroll_of_enchant_weapon_grade_i00</icon>
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
-	<skill id="39214" toLevel="1" name="Savior s Cube">
+	<skill id="39214" toLevel="1" name="Savior's Cube">
 		<icon>icon.etc_crystal_cube_event_i00</icon>
 		<operateType>A1</operateType>
 	</skill>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/39300-39399.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/39300-39399.xml
index bc90a1b648..f48a8f249d 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/39300-39399.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/39300-39399.xml
@@ -686,9 +686,21 @@
 	<skill id="39365" toLevel="1" name="Scroll: Enchant Fishing Weapon">
 		<!-- Can only be used together with fishing weapons. Does not disappear after an unsuccessful Enchant. -->
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="39366" toLevel="1" name="Improved Scroll: Enchant Fishing Weapon">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="39367" toLevel="1" name="Transformation into Teddy Bear">
 		<!-- Teddy Bear transformation. Max HP/ MP +20%, Acquired XP/ SP +20% while Sayha's Grace is active. The effect remains after death. -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40100-40199.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40100-40199.xml
index 365be13e75..7619ed736b 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40100-40199.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40100-40199.xml
@@ -600,19 +600,31 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="40161" toLevel="1" name="(Test) Emerald Weapon Appearance Stone: One-handed Sword">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLevel>1</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="40162" toLevel="1" name="Emerald Weapon Appearance Stone">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLevel>1</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="40163" toLevel="1" name="Appearance Stone: Dark Assassin Suit">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<magicLevel>1</magicLevel>
+		<isMagic>2</isMagic>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="40164" toLevel="1" name="Spellbook: Glorious Warrior's Ability">
 		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
@@ -795,18 +807,18 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="40192" toLevel="1" name="Scroll: Enchant Death Knight's Flame Sword (Exchangeable)">
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="40193" toLevel="1" name="Scroll: Enchant Death Knight's Flame Sword (Unexchangeable)">
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40200-40299.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40200-40299.xml
index 312b575871..f427a810f1 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40200-40299.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40200-40299.xml
@@ -494,20 +494,18 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="40252" toLevel="1" name="Scroll: Enchant Necklace of Spirits">
-		<icon>icon.skill0000</icon>
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="40253" toLevel="1" name="Scroll: Enchant Hellbound Ring">
-		<icon>icon.skill0000</icon>
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40300-40399.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40300-40399.xml
index c0bcc15f30..337a0ba286 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40300-40399.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/40300-40399.xml
@@ -261,19 +261,31 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="40328" toLevel="1" name="17th Anniversary Scroll: Enchant Circlet of Hero">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="40329" toLevel="1" name="17th Anniversary Scroll: Enchant Cloak of Protection">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="40330" toLevel="1" name="17th Anniversary Scroll: Enchant Dragon Belt">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="40331" toLevel="1" name="Scroll of Escape: Ruins of Agony">
 		<icon>icon.skill0000</icon>
@@ -325,9 +337,13 @@
 		<operateType>A1</operateType>
 	</skill>
 	<skill id="40337" toLevel="1" name="Scroll: Enchant Clan Equipment">
-		<!-- AUTO GENERATED SKILL TODO: FIX IT -->
-		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="40338" toLevel="1" name="Scroll: Enchant Adventurer's Talisman">
 		<icon>icon.giant_item_equip</icon>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/50100-50199.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/50100-50199.xml
index f78a87b18d..eac76d1b7e 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/50100-50199.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/50100-50199.xml
@@ -416,6 +416,12 @@
 	</skill>
 	<skill id="50146" toLevel="1" name="Special Enchant Scroll (PA Event)">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="50147" toLevel="1" name="Energy Rune">
 		<!-- When in inventory, recovers Sayha's Grace points. -->
@@ -641,7 +647,6 @@
 		<reuseDelay>500</reuseDelay>
 	</skill>
 	<skill id="50166" toLevel="1" name="Scroll: Enchant Talisman of Baium">
-		<icon>icon.skill0000</icon>
 		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
@@ -651,18 +656,18 @@
 		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="50167" toLevel="1" name="Scroll: Enchant Ring of Insolence">
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
 		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="50168" toLevel="1" name="Scroll: Enchant Dragon Valley's Earring">
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/51000-51099.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/51000-51099.xml
index 46ea25f565..ec08b320db 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/51000-51099.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/51000-51099.xml
@@ -612,9 +612,9 @@
 	</skill>
 	<skill id="51047" toLevel="1" name="Scroll: Enchant Agathion">
 		<icon>icon.star_scrl_of_ench_ag</icon>
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
@@ -622,9 +622,9 @@
 	</skill>
 	<skill id="51048" toLevel="1" name="Scroll: Enchant High-grade Agathion">
 		<icon>icon.star_giantscrl_of_ench_ag</icon>
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
@@ -632,9 +632,9 @@
 	</skill>
 	<skill id="51049" toLevel="1" name="Stable Scroll: Enchant Agathion">
 		<icon>icon.star_giantscrl_of_ench_ag</icon>
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
@@ -776,6 +776,12 @@
 	<skill id="51059" toLevel="1" name="Scroll: Enchant Savior's Earring">
 		<!-- Enchants Savior's Earring. -->
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51060" toLevel="1" name="Savior's Earring Box">
 		<icon>icon.etc_treasure_box_i07</icon>
@@ -795,15 +801,39 @@
 	</skill>
 	<skill id="51062" toLevel="1" name="Balthus Knights' Varnish">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51063" toLevel="1" name="Balthus Knights' Matte Varnish">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51064" toLevel="1" name="Balthus Knights' Shining Varnish">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51065" toLevel="1" name="Balthus Knights' Glittering Varnish">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51066" toLevel="1" name="Rash's Supplies - Antharas">
 		<operateType>A1</operateType>
@@ -1177,6 +1207,12 @@
 	<skill id="51097" toLevel="1" name="Radiant Spirit's Varnish">
 		<icon>icon.ev_charge_scroll</icon>
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51098" toLevel="1" name="Blue Dynasty Transformation">
 		<!-- Blue Dynasty outfit. Max HP/ MP +20%, Acquired XP/ SP +20% while Sayha's Grace is active. The effect remains after death. -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/51100-51199.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/51100-51199.xml
index 3b6e60016f..051ac3d1da 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/51100-51199.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/skills/51100-51199.xml
@@ -181,9 +181,9 @@
 	<skill id="51121" toLevel="1" name="Sibi's Weapon Enchant Scroll">
 		<!-- Enchants Sibi's Samurai Black Long Sword. -->
 		<icon>icon.yogi_scroll_of_enchant_weapon_grade_i00</icon>
+		<operateType>A1</operateType>
 		<isMagic>2</isMagic> <!-- Static Skill -->
 		<magicLevel>1</magicLevel>
-		<operateType>A1</operateType>
 		<magicCriticalRate>5</magicCriticalRate>
 		<hitCancelTime>0</hitCancelTime>
 		<targetType>ITEM</targetType>
@@ -264,10 +264,22 @@
 	<skill id="51128" toLevel="1" name="Spirit's Varnish">
 		<icon>icon.ev_charge_scroll</icon>
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51129" toLevel="1" name="Blessed Spirit's Varnish">
 		<icon>icon.ev_charge_scroll</icon>
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51130" toLevel="1" name="Fire Attack Potion">
 		<!-- For 20 min., Fire Attack +50. Cooldown: 1 min. -->
@@ -498,9 +510,21 @@
 	</skill>
 	<skill id="51159" toLevel="1" name="Dragon Varnish">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51160" toLevel="1" name="Radiant Dragon Varnish">
 		<operateType>A1</operateType>
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLevel>1</magicLevel>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51161" toLevel="1" name="Highest-grade HP Recovery Potion">
 		<!-- Instantly recovers 800 HP. -->