diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/EnchantItemData.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/EnchantItemData.xml
index 85c6821790..ea640b9d0e 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/EnchantItemData.xml
@@ -17,10 +17,30 @@
 	<enchant id="6571" targetGrade="B" maxEnchant="16" />
 	<enchant id="6573" targetGrade="C" maxEnchant="16" />
 	<enchant id="6575" targetGrade="D" maxEnchant="16" />
+	<enchant id="22223" targetGrade="A" maxEnchant="7" />
+	<enchant id="49486" targetGrade="B" maxEnchant="7" />
+	<enchant id="49484" targetGrade="C" maxEnchant="7" />
+	<enchant id="49482" targetGrade="D" maxEnchant="7" />
 
 	<!-- Blessed Scrolls: Enchant Armor -->
 	<enchant id="6570" targetGrade="A" maxEnchant="16" />
 	<enchant id="6572" targetGrade="B" maxEnchant="16" />
 	<enchant id="6574" targetGrade="C" maxEnchant="16" />
 	<enchant id="6576" targetGrade="D" maxEnchant="16" />
+	<enchant id="22224" targetGrade="A" maxEnchant="6" />
+	<enchant id="49485" targetGrade="B" maxEnchant="6" />
+	<enchant id="49483" targetGrade="C" maxEnchant="6" />
+	<enchant id="49481" targetGrade="D" maxEnchant="6" />
+	
+	<!-- Improved Scrolls: Enchant Weapon -->
+	<enchant id="33809" targetGrade="A" maxEnchant="16" />
+	<enchant id="33808" targetGrade="B" maxEnchant="16" />
+	<enchant id="33807" targetGrade="C" maxEnchant="16" />
+	<enchant id="33806" targetGrade="D" maxEnchant="16" />
+
+	<!-- Improved Scrolls: Enchant Armor -->
+	<enchant id="33815" targetGrade="A" maxEnchant="16" />
+	<enchant id="33814" targetGrade="B" maxEnchant="16" />
+	<enchant id="33813" targetGrade="C" maxEnchant="16" />
+	<enchant id="33812" targetGrade="D" maxEnchant="16" />	
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/22200-22299.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/22200-22299.xml
index 2e6be583dc..da137f4173 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/22200-22299.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/22200-22299.xml
@@ -4,14 +4,34 @@
 		<!-- When enchanted, P. Atk. +4 for A-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dualswords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk. / M. Atk. bonus double. Safe Enchant: +3. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_a" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="22361" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="22224" name="Solid Scroll: Enchant Armor (A-grade)" type="EtcItem">
 		<!-- P. Def. +1 for A-grade armor and accessories. Starting from +4, P. Def. +3. If an armor is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 7 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_a" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="22362" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/33800-33899.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/33800-33899.xml
index b216126194..197f3a8903 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/33800-33899.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/33800-33899.xml
@@ -4,72 +4,136 @@
 		<!-- When enchanted, P. Atk. +4 for D-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dualswords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk. / M. Atk. bonus double. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_d_i01" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9244" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33807" name="Improved Scroll: Enchant Weapon (C-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for C-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dualswords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk. / M. Atk. bonus double. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_c_i02" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9246" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33808" name="Improved Scroll: Enchant Weapon (B-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for B-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dualswords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk. / M. Atk. bonus double. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_b_i03" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9248" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33809" name="Improved Scroll: Enchant Weapon (A-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for A-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dualswords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk. / M. Atk. bonus double. Safe Enchant: +3. -->
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9250" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33812" name="Improved Scroll: Enchant Armor (D-grade)" type="EtcItem">
 		<!-- P. Def. +1 for D-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_d_i01" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9245" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33813" name="Improved Scroll: Enchant Armor (C-grade)" type="EtcItem">
 		<!-- P. Def. +1 for C-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_c_i02" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9247" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33814" name="Improved Scroll: Enchant Armor (B-grade)" type="EtcItem">
 		<!-- P. Def. +1 for B-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_b_i03" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9249" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33815" name="Improved Scroll: Enchant Armor (A-grade)" type="EtcItem">
 		<!-- P. Def. +1 for A-grade armor and accessories. Starting from +4, P. Def. +3. Can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. -->
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9251" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49400-49499.xml
index c25170d7ab..accb8450a0 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/stats/items/49400-49499.xml
@@ -1106,7 +1106,8 @@
 		<set name="material" val="CRYSTAL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
+		<set name="is_clan_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="enchant_enabled" val="10" />
 		<stats>
@@ -1133,17 +1134,35 @@
 		<!-- Polish that enhances characteristics of a Pendant. Can be enchanted to +3 with 100% probability. Maximum Enchant Level is +10. Grants special characteristics starting from level +4, depending on Pendant 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="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="2209" level="1" /> <!-- Blessed Scroll: Enchant Armor (A-grade) -->
+		</skills>
 	</item>
 	<item id="49470" name="Shining Pendant Polish" type="EtcItem">
 		<!-- Shiny Polish, enhancing pendants characteristics. Can be used on a pendant enchanted up to +8. If an enchantment is failed, the pendent doesn't disappear and has the previous level of enchantment. -->
 		<set name="icon" val="icon.bm_pendant_varnish_premium" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39063" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49471" name="Fire Dragon Pendant Chest" type="EtcItem">
 		<!-- Double-click the chest to get 1 Fire Dragon Pendant and 10 Pendant Polishes. -->
@@ -1266,49 +1285,103 @@
 		<!-- P. Def. +1 for D-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_d" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39063" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49482" name="Solid Scroll: Enchant Weapon (D-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for D-grade one-handed swords, one-handed blunts, daggers, and spears. P. Atk. +5 for two-handed swords, two-handed blunts, dualswords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk. / M. Atk. bonus double. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_d" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39064" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49483" name="Solid Scroll: Enchant Armor (C-grade)" type="EtcItem">
 		<!-- P. Def. +1 for C-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_c" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39065" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49484" name="Solid Scroll: Enchant Weapon (C-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for C-grade one-handed swords, one-handed blunts, daggers, and spears. P. Atk. +5 for two-handed swords, two-handed blunts, dualswords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk. / M. Atk. bonus double. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_c" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39066" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49485" name="Solid Scroll: Enchant Armor (B-grade)" type="EtcItem">
 		<!-- P. Def. +1 for B-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_b" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39067" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49486" name="Solid Scroll: Enchant Weapon (B-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +2 for B-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +2 for two-handed swords, two-handed blunts, dualswords, and two-handed fist weapons. P. Atk. +4 for bows. M. Atk. +2 for all weapons. Starting at +4, P. Atk. / M. Atk. bonus double. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_b" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39068" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49487" name="Soulshot Ticket" type="EtcItem">
 		<!-- Can be exchanged through Dimensional Merchant to get Soulshot, Spiritshot, Blessed Spiritshot (No-grade/D-grade/C-grade).Cannot be exchanged, dropped, sold, or stored in private warehouse. Can be stored in a private warehouse. -->
diff --git a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/EnchantItemData.xsd b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/EnchantItemData.xsd
index fa9af50a1b..115c7e5b6b 100644
--- a/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/EnchantItemData.xsd
+++ b/L2J_Mobius_Classic_2.0_Saviors/dist/game/data/xsd/EnchantItemData.xsd
@@ -6,7 +6,7 @@
 					<xs:complexType>
 						<xs:simpleContent>
 							<xs:extension base="xs:string">
-								<xs:attribute type="xs:short" name="id" use="optional"/>
+								<xs:attribute type="xs:int" name="id" use="optional"/>
 								<xs:attribute type="xs:string" name="targetGrade" use="optional"/>
 								<xs:attribute type="xs:byte" name="scrollGroupId" use="optional"/>
 								<xs:attribute type="xs:int" name="maxEnchant" use="optional"/> <!-- enchant limit -->
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/EnchantItemData.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/EnchantItemData.xml
index 85c6821790..ea640b9d0e 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/EnchantItemData.xml
@@ -17,10 +17,30 @@
 	<enchant id="6571" targetGrade="B" maxEnchant="16" />
 	<enchant id="6573" targetGrade="C" maxEnchant="16" />
 	<enchant id="6575" targetGrade="D" maxEnchant="16" />
+	<enchant id="22223" targetGrade="A" maxEnchant="7" />
+	<enchant id="49486" targetGrade="B" maxEnchant="7" />
+	<enchant id="49484" targetGrade="C" maxEnchant="7" />
+	<enchant id="49482" targetGrade="D" maxEnchant="7" />
 
 	<!-- Blessed Scrolls: Enchant Armor -->
 	<enchant id="6570" targetGrade="A" maxEnchant="16" />
 	<enchant id="6572" targetGrade="B" maxEnchant="16" />
 	<enchant id="6574" targetGrade="C" maxEnchant="16" />
 	<enchant id="6576" targetGrade="D" maxEnchant="16" />
+	<enchant id="22224" targetGrade="A" maxEnchant="6" />
+	<enchant id="49485" targetGrade="B" maxEnchant="6" />
+	<enchant id="49483" targetGrade="C" maxEnchant="6" />
+	<enchant id="49481" targetGrade="D" maxEnchant="6" />
+	
+	<!-- Improved Scrolls: Enchant Weapon -->
+	<enchant id="33809" targetGrade="A" maxEnchant="16" />
+	<enchant id="33808" targetGrade="B" maxEnchant="16" />
+	<enchant id="33807" targetGrade="C" maxEnchant="16" />
+	<enchant id="33806" targetGrade="D" maxEnchant="16" />
+
+	<!-- Improved Scrolls: Enchant Armor -->
+	<enchant id="33815" targetGrade="A" maxEnchant="16" />
+	<enchant id="33814" targetGrade="B" maxEnchant="16" />
+	<enchant id="33813" targetGrade="C" maxEnchant="16" />
+	<enchant id="33812" targetGrade="D" maxEnchant="16" />	
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/22200-22299.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/22200-22299.xml
index 3649f867c5..ce53fb7d5d 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/22200-22299.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/22200-22299.xml
@@ -4,14 +4,34 @@
 		<!-- When enchanted, P. Atk. +4 for A-grade one-handed swords, one-handed blunts, daggers, and spears. P. Atk. +5 for two-handed swords, two-handed blunts, dualswords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk. / M. Atk. bonus double. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_a" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="22361" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="22224" name="Solid Scroll: Enchant Armor (A-grade)" type="EtcItem">
 		<!-- P. Def. +1 for A-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased according to the enchant value. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by +6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_a" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="22362" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
-</list>
+</list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/33800-33899.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/33800-33899.xml
index d5004a7a0d..ca45d53b37 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/33800-33899.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/33800-33899.xml
@@ -4,72 +4,136 @@
 		<!-- When enchanted, P. Atk. +4 for D-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dualswords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk. / M. Atk. bonus double. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_d_i01" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9244" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33807" name="Improved Scroll: Enchant Weapon (C-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for C-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dualswords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk. / M. Atk. bonus double. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_c_i02" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9246" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33808" name="Improved Scroll: Enchant Weapon (B-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for B-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dualswords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk. / M. Atk. bonus double. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_b_i03" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9248" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33809" name="Improved Scroll: Enchant Weapon (A-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for A-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dualswords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk. / M. Atk. bonus double. Random enchantment from +1 to +3. Safe Enchant: +3. -->
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9250" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33812" name="Improved Scroll: Enchant Armor (D-grade)" type="EtcItem">
 		<!-- P. Def. +1 for D-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_d_i01" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9245" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33813" name="Improved Scroll: Enchant Armor (C-grade)" type="EtcItem">
 		<!-- P. Def. +1 for C-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_c_i02" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9247" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33814" name="Improved Scroll: Enchant Armor (B-grade)" type="EtcItem">
 		<!-- P. Def. +1 for B-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_b_i03" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9249" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33815" name="Improved Scroll: Enchant Armor (A-grade)" type="EtcItem">
 		<!-- P. Def. for A-grade armor and accessories increases by 1, and by 3 starting from +4. Armor and accessories can be safely enchanted up to +3. One-piece armor can be safely enchanted up to +4. When armor is enchanted to +4 or above, HP also increases according to the enchant value. Armor and accessories are randomly enchanted between +1 and +3. -->
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9251" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/49400-49499.xml
index d0b125a0a9..397339b209 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/stats/items/49400-49499.xml
@@ -1106,7 +1106,8 @@
 		<set name="material" val="CRYSTAL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
+		<set name="is_clan_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="enchant_enabled" val="10" />
 		<stats>
@@ -1133,17 +1134,35 @@
 		<!-- Polish that enhances characteristics of a Pendant. Maximum Enchant Level is +10. If the enchant fails, pendant disappears. -->
 		<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="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="2209" level="1" /> <!-- Blessed Scroll: Enchant Armor (A-grade) -->
+		</skills>
 	</item>
 	<item id="49470" name="Shining Pendant Polish" type="EtcItem">
 		<!-- Shiny Polish, enhancing pendants characteristics. Can be used on a pendant enchanted up to +8. If an enchantment is failed, the pendent doesn't disappear and has the previous level of enchantment. -->
 		<set name="icon" val="icon.bm_pendant_varnish_premium" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39063" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49471" name="Fire Dragon Pendant Chest" type="EtcItem">
 		<!-- Double-click the chest to get 1 Fire Dragon Pendant and 10 Pendant Polishes. -->
@@ -1217,10 +1236,10 @@
 		<set name="material" val="GOLD" />
 		<set name="weight" val="150" />
 		<set name="is_clan_depositable" val="false" />
-		<set name="is_private_storeable" val="true" />
+		<set name="is_private_storeable" val="false" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="false" />
 		<set name="commissionItemType" val="RING" />
@@ -1266,49 +1285,103 @@
 		<!-- P. Def. +1 for D-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_d" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39063" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49482" name="Solid Scroll: Enchant Weapon (D-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for D-grade one-handed swords, one-handed blunts, daggers, and spears. P. Atk. +5 for two-handed swords, two-handed blunts, dualswords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk. / M. Atk. bonus double. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_d" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39064" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49483" name="Solid Scroll: Enchant Armor (C-grade)" type="EtcItem">
 		<!-- P. Def. +1 for C-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_c" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39065" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49484" name="Solid Scroll: Enchant Weapon (C-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for C-grade one-handed swords, one-handed blunts, daggers, and spears. P. Atk. +5 for two-handed swords, two-handed blunts, dualswords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk. / M. Atk. bonus double. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_c" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39066" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49485" name="Solid Scroll: Enchant Armor (B-grade)" type="EtcItem">
 		<!-- P. Def. +1 for B-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_b" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39067" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49486" name="Solid Scroll: Enchant Weapon (B-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +2 for B-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +2 for two-handed swords, two-handed blunts, dualswords, and two-handed fist weapons. P. Atk. +4 for bows. M. Atk. +2 for all weapons. Starting at +4, P. Atk. / M. Atk. bonus double. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_b" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39068" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49487" name="Soulshot Ticket" type="EtcItem">
 		<!-- Can be exchanged through Dimensional Merchant to get Soulshot, Spiritshot, Blessed Spiritshot (No-grade/D-grade/C-grade).Cannot be exchanged, dropped, sold, or stored in private warehouse. Can be stored in a private warehouse. Can be shared within account through Dimensional Merchant. -->
diff --git a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/EnchantItemData.xsd b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/EnchantItemData.xsd
index fa9af50a1b..115c7e5b6b 100644
--- a/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/EnchantItemData.xsd
+++ b/L2J_Mobius_Classic_2.1_Zaken/dist/game/data/xsd/EnchantItemData.xsd
@@ -6,7 +6,7 @@
 					<xs:complexType>
 						<xs:simpleContent>
 							<xs:extension base="xs:string">
-								<xs:attribute type="xs:short" name="id" use="optional"/>
+								<xs:attribute type="xs:int" name="id" use="optional"/>
 								<xs:attribute type="xs:string" name="targetGrade" use="optional"/>
 								<xs:attribute type="xs:byte" name="scrollGroupId" use="optional"/>
 								<xs:attribute type="xs:int" name="maxEnchant" use="optional"/> <!-- enchant limit -->
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/EnchantItemData.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/EnchantItemData.xml
index 85c6821790..ea640b9d0e 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/EnchantItemData.xml
@@ -17,10 +17,30 @@
 	<enchant id="6571" targetGrade="B" maxEnchant="16" />
 	<enchant id="6573" targetGrade="C" maxEnchant="16" />
 	<enchant id="6575" targetGrade="D" maxEnchant="16" />
+	<enchant id="22223" targetGrade="A" maxEnchant="7" />
+	<enchant id="49486" targetGrade="B" maxEnchant="7" />
+	<enchant id="49484" targetGrade="C" maxEnchant="7" />
+	<enchant id="49482" targetGrade="D" maxEnchant="7" />
 
 	<!-- Blessed Scrolls: Enchant Armor -->
 	<enchant id="6570" targetGrade="A" maxEnchant="16" />
 	<enchant id="6572" targetGrade="B" maxEnchant="16" />
 	<enchant id="6574" targetGrade="C" maxEnchant="16" />
 	<enchant id="6576" targetGrade="D" maxEnchant="16" />
+	<enchant id="22224" targetGrade="A" maxEnchant="6" />
+	<enchant id="49485" targetGrade="B" maxEnchant="6" />
+	<enchant id="49483" targetGrade="C" maxEnchant="6" />
+	<enchant id="49481" targetGrade="D" maxEnchant="6" />
+	
+	<!-- Improved Scrolls: Enchant Weapon -->
+	<enchant id="33809" targetGrade="A" maxEnchant="16" />
+	<enchant id="33808" targetGrade="B" maxEnchant="16" />
+	<enchant id="33807" targetGrade="C" maxEnchant="16" />
+	<enchant id="33806" targetGrade="D" maxEnchant="16" />
+
+	<!-- Improved Scrolls: Enchant Armor -->
+	<enchant id="33815" targetGrade="A" maxEnchant="16" />
+	<enchant id="33814" targetGrade="B" maxEnchant="16" />
+	<enchant id="33813" targetGrade="C" maxEnchant="16" />
+	<enchant id="33812" targetGrade="D" maxEnchant="16" />	
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/22200-22299.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/22200-22299.xml
index 30dfad07b2..e537714417 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/22200-22299.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/22200-22299.xml
@@ -4,14 +4,34 @@
 		<!-- When enchanted, P. Atk. +4 for A-grade one-handed swords, one-handed blunts, daggers, and spears. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus double. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_a" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="22361" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="22224" name="Solid Scroll: Enchant Armor (A-grade)" type="EtcItem">
 		<!-- P. Def. +1 for A-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased according to the enchant value. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by +6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_a" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="22362" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/33800-33899.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/33800-33899.xml
index 35ed7c82eb..e85c8999c8 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/33800-33899.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/33800-33899.xml
@@ -4,72 +4,136 @@
 		<!-- When enchanted, P. Atk. +4 for D-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus double. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_d_i01" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9244" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33807" name="Improved Scroll: Enchant Weapon (C-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for C-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus double. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_c_i02" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9246" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33808" name="Improved Scroll: Enchant Weapon (B-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for B-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus double. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_b_i03" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9248" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33809" name="Improved Scroll: Enchant Weapon (A-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for A-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus double. Random enchantment from +1 to +3. Safe Enchant: +3. -->
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9250" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33812" name="Improved Scroll: Enchant Armor (D-grade)" type="EtcItem">
 		<!-- P. Def. +1 for D-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_d_i01" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9245" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33813" name="Improved Scroll: Enchant Armor (C-grade)" type="EtcItem">
 		<!-- P. Def. +1 for C-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_c_i02" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9247" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33814" name="Improved Scroll: Enchant Armor (B-grade)" type="EtcItem">
 		<!-- P. Def. +1 for B-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_b_i03" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9249" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33815" name="Improved Scroll: Enchant Armor (A-grade)" type="EtcItem">
 		<!-- P. Def. for A-grade armor and accessories increases by 1, and by 3 starting from +4. Armor and accessories can be safely enchanted up to +3. One-piece armor can be safely enchanted up to +4. When armor is enchanted to +4 or above, HP also increases according to the enchant value. Armor and accessories are randomly enchanted between +1 and +3. -->
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9251" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/49400-49499.xml
index 6f947f5fbd..2ccec8106d 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/stats/items/49400-49499.xml
@@ -1106,7 +1106,8 @@
 		<set name="material" val="CRYSTAL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
+		<set name="is_clan_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="enchant_enabled" val="10" />
 		<stats>
@@ -1133,17 +1134,35 @@
 		<!-- Polish that enhances characteristics of a Pendant. Maximum Enchant Level is +10. If the enchant fails, pendant disappears. -->
 		<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="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="2209" level="1" /> <!-- Blessed Scroll: Enchant Armor (A-grade) -->
+		</skills>
 	</item>
 	<item id="49470" name="Shining Pendant Polish" type="EtcItem">
 		<!-- Shiny Polish, enhancing pendants characteristics. Can be used on a pendant enchanted up to +8. If an enchantment is failed, the pendent doesn't disappear and has the previous level of enchantment. -->
 		<set name="icon" val="icon.bm_pendant_varnish_premium" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39063" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49471" name="Fire Dragon Pendant Chest" type="EtcItem">
 		<!-- Double-click the chest to get 1 Fire Dragon Pendant and 10 Pendant Polishes. -->
@@ -1266,49 +1285,103 @@
 		<!-- P. Def. +1 for D-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_d" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39063" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49482" name="Solid Scroll: Enchant Weapon (D-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for D-grade one-handed swords, one-handed blunts, daggers, and spears. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus double. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_d" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39064" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49483" name="Solid Scroll: Enchant Armor (C-grade)" type="EtcItem">
 		<!-- P. Def. +1 for C-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_c" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39065" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49484" name="Solid Scroll: Enchant Weapon (C-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for C-grade one-handed swords, one-handed blunts, daggers, and spears. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus double. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_c" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39066" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49485" name="Solid Scroll: Enchant Armor (B-grade)" type="EtcItem">
 		<!-- P. Def. +1 for B-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_b" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39067" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49486" name="Solid Scroll: Enchant Weapon (B-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +2 for B-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +2 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +4 for bows. M. Atk. +2 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus double. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_b" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39068" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49487" name="Soulshot Ticket" type="EtcItem">
 		<!-- Can be exchanged through Dimensional Merchant to get Soulshot, Spiritshot, Blessed Spiritshot (No-grade/D-grade/C-grade).Cannot be exchanged, dropped, sold, or stored in private warehouse. Can be stored in a private warehouse. Can be shared within account through Dimensional Merchant. -->
diff --git a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/EnchantItemData.xsd b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/EnchantItemData.xsd
index fa9af50a1b..115c7e5b6b 100644
--- a/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/EnchantItemData.xsd
+++ b/L2J_Mobius_Classic_2.2_Antharas/dist/game/data/xsd/EnchantItemData.xsd
@@ -6,7 +6,7 @@
 					<xs:complexType>
 						<xs:simpleContent>
 							<xs:extension base="xs:string">
-								<xs:attribute type="xs:short" name="id" use="optional"/>
+								<xs:attribute type="xs:int" name="id" use="optional"/>
 								<xs:attribute type="xs:string" name="targetGrade" use="optional"/>
 								<xs:attribute type="xs:byte" name="scrollGroupId" use="optional"/>
 								<xs:attribute type="xs:int" name="maxEnchant" use="optional"/> <!-- enchant limit -->
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/EnchantItemData.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/EnchantItemData.xml
index 85c6821790..ea640b9d0e 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/EnchantItemData.xml
@@ -17,10 +17,30 @@
 	<enchant id="6571" targetGrade="B" maxEnchant="16" />
 	<enchant id="6573" targetGrade="C" maxEnchant="16" />
 	<enchant id="6575" targetGrade="D" maxEnchant="16" />
+	<enchant id="22223" targetGrade="A" maxEnchant="7" />
+	<enchant id="49486" targetGrade="B" maxEnchant="7" />
+	<enchant id="49484" targetGrade="C" maxEnchant="7" />
+	<enchant id="49482" targetGrade="D" maxEnchant="7" />
 
 	<!-- Blessed Scrolls: Enchant Armor -->
 	<enchant id="6570" targetGrade="A" maxEnchant="16" />
 	<enchant id="6572" targetGrade="B" maxEnchant="16" />
 	<enchant id="6574" targetGrade="C" maxEnchant="16" />
 	<enchant id="6576" targetGrade="D" maxEnchant="16" />
+	<enchant id="22224" targetGrade="A" maxEnchant="6" />
+	<enchant id="49485" targetGrade="B" maxEnchant="6" />
+	<enchant id="49483" targetGrade="C" maxEnchant="6" />
+	<enchant id="49481" targetGrade="D" maxEnchant="6" />
+	
+	<!-- Improved Scrolls: Enchant Weapon -->
+	<enchant id="33809" targetGrade="A" maxEnchant="16" />
+	<enchant id="33808" targetGrade="B" maxEnchant="16" />
+	<enchant id="33807" targetGrade="C" maxEnchant="16" />
+	<enchant id="33806" targetGrade="D" maxEnchant="16" />
+
+	<!-- Improved Scrolls: Enchant Armor -->
+	<enchant id="33815" targetGrade="A" maxEnchant="16" />
+	<enchant id="33814" targetGrade="B" maxEnchant="16" />
+	<enchant id="33813" targetGrade="C" maxEnchant="16" />
+	<enchant id="33812" targetGrade="D" maxEnchant="16" />	
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/22200-22299.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/22200-22299.xml
index 1882a39254..28fcf926d4 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/22200-22299.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/22200-22299.xml
@@ -4,14 +4,34 @@
 		<!-- When enchanted, P. Atk. +4 for A-grade one-handed swords, one-handed blunts, daggers, and spears. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_a" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="22361" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="22224" name="Solid Scroll: Enchant Armor (A-grade)" type="EtcItem">
 		<!-- P. Def. +1 for A-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased according to the enchant value. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by +6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_a" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="22362" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/33800-33899.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/33800-33899.xml
index 83d46cbc2c..336a66521a 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/33800-33899.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/33800-33899.xml
@@ -4,72 +4,136 @@
 		<!-- When enchanted, P. Atk. +4 for D-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_d_i01" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9244" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33807" name="Improved Scroll: Enchant Weapon (C-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for C-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_c_i02" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9246" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33808" name="Improved Scroll: Enchant Weapon (B-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for B-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_b_i03" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9248" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33809" name="Improved Scroll: Enchant Weapon (A-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for A-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Random enchantment from +1 to +3. Safe Enchant: +3. -->
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9250" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33812" name="Improved Scroll: Enchant Armor (D-grade)" type="EtcItem">
 		<!-- P. Def. +1 for D-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_d_i01" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9245" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33813" name="Improved Scroll: Enchant Armor (C-grade)" type="EtcItem">
 		<!-- P. Def. +1 for C-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_c_i02" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9247" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33814" name="Improved Scroll: Enchant Armor (B-grade)" type="EtcItem">
 		<!-- P. Def. +1 for B-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_b_i03" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9249" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33815" name="Improved Scroll: Enchant Armor (A-grade)" type="EtcItem">
 		<!-- P. Def. for A-grade armor and accessories increases by 1, and by 3 starting from +4. Armor and accessories can be safely enchanted up to +3. One-piece armor can be safely enchanted up to +4. When armor is enchanted to +4 or above, HP also increases according to the enchant value. Armor and accessories are randomly enchanted between +1 and +3. -->
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9251" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/49400-49499.xml
index b274242fd6..39ae39507b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/stats/items/49400-49499.xml
@@ -1106,7 +1106,8 @@
 		<set name="material" val="CRYSTAL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
+		<set name="is_clan_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="enchant_enabled" val="10" />
 		<stats>
@@ -1133,17 +1134,35 @@
 		<!-- Polish that enhances characteristics of a Pendant. Maximum Enchant Level is +10. If the enchant fails, pendant disappears. -->
 		<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="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="2209" level="1" /> <!-- Blessed Scroll: Enchant Armor (A-grade) -->
+		</skills>
 	</item>
 	<item id="49470" name="Shining Pendant Polish" type="EtcItem">
 		<!-- Shiny Polish, enhancing pendants characteristics. Can be used on a pendant enchanted up to +8. If an enchantment is failed, the pendent doesn't disappear and has the previous level of enchantment. -->
 		<set name="icon" val="icon.bm_pendant_varnish_premium" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39063" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49471" name="Fire Dragon Pendant Chest" type="EtcItem">
 		<!-- Double-click the chest to get 1 Fire Dragon Pendant and 10 Pendant Polishes. -->
@@ -1266,49 +1285,103 @@
 		<!-- P. Def. +1 for D-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_d" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39063" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49482" name="Solid Scroll: Enchant Weapon (D-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for D-grade one-handed swords, one-handed blunts, daggers, and spears. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_d" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39064" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49483" name="Solid Scroll: Enchant Armor (C-grade)" type="EtcItem">
 		<!-- P. Def. +1 for C-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_c" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39065" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49484" name="Solid Scroll: Enchant Weapon (C-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for C-grade one-handed swords, one-handed blunts, daggers, and spears. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_c" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39066" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49485" name="Solid Scroll: Enchant Armor (B-grade)" type="EtcItem">
 		<!-- P. Def. +1 for B-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_b" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39067" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49486" name="Solid Scroll: Enchant Weapon (B-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +2 for B-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +2 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +4 for bows. M. Atk. +2 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_b" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39068" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49487" name="Soulshot Ticket" type="EtcItem">
 		<!-- Can be exchanged through Dimensional Merchant to get Soulshot (No-grade/D-grade/C-grade/ B-grade), Spiritshot, Blessed Soulshot, Blessed Spiritshot, Beast Soulshot. Cannot be exchanged, dropped, sold, or stored in private warehouse. Can be stored in a private warehouse. Can be shared within account through Dimensional Merchant. -->
diff --git a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/EnchantItemData.xsd b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/EnchantItemData.xsd
index fa9af50a1b..115c7e5b6b 100644
--- a/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/EnchantItemData.xsd
+++ b/L2J_Mobius_Classic_2.3_SevenSigns/dist/game/data/xsd/EnchantItemData.xsd
@@ -6,7 +6,7 @@
 					<xs:complexType>
 						<xs:simpleContent>
 							<xs:extension base="xs:string">
-								<xs:attribute type="xs:short" name="id" use="optional"/>
+								<xs:attribute type="xs:int" name="id" use="optional"/>
 								<xs:attribute type="xs:string" name="targetGrade" use="optional"/>
 								<xs:attribute type="xs:byte" name="scrollGroupId" use="optional"/>
 								<xs:attribute type="xs:int" name="maxEnchant" use="optional"/> <!-- enchant limit -->
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/EnchantItemData.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/EnchantItemData.xml
index 8bfa43c10b..78e6e7c658 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/EnchantItemData.xml
@@ -1,30 +1,54 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EnchantItemData.xsd">
 	<!-- Scrolls: Enchant Weapon -->
+	<enchant id="959" targetGrade="S" maxEnchant="16" />
 	<enchant id="729" targetGrade="A" maxEnchant="16" />
 	<enchant id="947" targetGrade="B" maxEnchant="16" />
 	<enchant id="951" targetGrade="C" maxEnchant="16" />
 	<enchant id="955" targetGrade="D" maxEnchant="16" />
-	<enchant id="959" targetGrade="S" maxEnchant="16" />
 
 	<!-- Scrolls: Enchant Armor -->
+	<enchant id="960" targetGrade="S" maxEnchant="16" />
 	<enchant id="730" targetGrade="A" maxEnchant="16" />
 	<enchant id="948" targetGrade="B" maxEnchant="16" />
 	<enchant id="952" targetGrade="C" maxEnchant="16" />
 	<enchant id="956" targetGrade="D" maxEnchant="16" scrollGroupId="0" /> <!-- Default scroll groups binding. -->
-	<enchant id="960" targetGrade="S" maxEnchant="16" />
 
 	<!-- Blessed Scrolls: Enchant Weapon -->
+	<enchant id="6577" targetGrade="S" maxEnchant="16" />
 	<enchant id="6569" targetGrade="A" maxEnchant="16" />
 	<enchant id="6571" targetGrade="B" maxEnchant="16" />
 	<enchant id="6573" targetGrade="C" maxEnchant="16" />
 	<enchant id="6575" targetGrade="D" maxEnchant="16" />
-	<enchant id="6577" targetGrade="S" maxEnchant="16" />
+	<!-- TODO: S -->
+	<enchant id="22223" targetGrade="A" maxEnchant="7" />
+	<enchant id="49486" targetGrade="B" maxEnchant="7" />
+	<enchant id="49484" targetGrade="C" maxEnchant="7" />
+	<enchant id="49482" targetGrade="D" maxEnchant="7" />
 
 	<!-- Blessed Scrolls: Enchant Armor -->
+	<enchant id="6578" targetGrade="S" maxEnchant="16" />
 	<enchant id="6570" targetGrade="A" maxEnchant="16" />
 	<enchant id="6572" targetGrade="B" maxEnchant="16" />
 	<enchant id="6574" targetGrade="C" maxEnchant="16" />
 	<enchant id="6576" targetGrade="D" maxEnchant="16" />
-	<enchant id="6578" targetGrade="S" maxEnchant="16" />
-</list>
\ No newline at end of file
+	<!-- TODO: S -->
+	<enchant id="22224" targetGrade="A" maxEnchant="6" />
+	<enchant id="49485" targetGrade="B" maxEnchant="6" />
+	<enchant id="49483" targetGrade="C" maxEnchant="6" />
+	<enchant id="49481" targetGrade="D" maxEnchant="6" />
+
+	<!-- Improved Scrolls: Enchant Weapon -->
+	<!-- TODO: S -->
+	<enchant id="33809" targetGrade="A" maxEnchant="16" />
+	<enchant id="33808" targetGrade="B" maxEnchant="16" />
+	<enchant id="33807" targetGrade="C" maxEnchant="16" />
+	<enchant id="33806" targetGrade="D" maxEnchant="16" />
+
+	<!-- Improved Scrolls: Enchant Armor -->
+	<!-- TODO: S -->
+	<enchant id="33815" targetGrade="A" maxEnchant="16" />
+	<enchant id="33814" targetGrade="B" maxEnchant="16" />
+	<enchant id="33813" targetGrade="C" maxEnchant="16" />
+	<enchant id="33812" targetGrade="D" maxEnchant="16" />
+</list>
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/22200-22299.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/22200-22299.xml
index e40c778bb3..bd05527adc 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/22200-22299.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/22200-22299.xml
@@ -18,14 +18,34 @@
 		<!-- When enchanted, P. Atk. +4 for A-grade one-handed swords, one-handed blunts, daggers, and spears. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_a" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="22361" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="22224" name="Solid Scroll: Enchant Armor (A-grade)" type="EtcItem">
 		<!-- P. Def. +1 for A-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased according to the enchant value. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by +6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_a" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="22362" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/33800-33899.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/33800-33899.xml
index 326c405720..96c4db9215 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/33800-33899.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/33800-33899.xml
@@ -4,37 +4,69 @@
 		<!-- When enchanted, P. Atk. +4 for D-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_d_i01" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9244" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33807" name="Improved Scroll: Enchant Weapon (C-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for C-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_c_i02" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9246" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33808" name="Improved Scroll: Enchant Weapon (B-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for B-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_b_i03" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9248" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33809" name="Improved Scroll: Enchant Weapon (A-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for A-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Random enchantment from +1 to +3. Safe Enchant: +3. -->
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9250" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33810" name="Improved Scroll: Enchant Weapon (S-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +5 for S-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +6 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +10 for bows. M. Atk. +4 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Random enchantment from +1 to +3. -->
@@ -52,37 +84,69 @@
 		<!-- P. Def. +1 for D-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_d_i01" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9245" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33813" name="Improved Scroll: Enchant Armor (C-grade)" type="EtcItem">
 		<!-- P. Def. +1 for C-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_c_i02" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9247" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33814" name="Improved Scroll: Enchant Armor (B-grade)" type="EtcItem">
 		<!-- P. Def. +1 for B-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_b_i03" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9249" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33815" name="Improved Scroll: Enchant Armor (A-grade)" type="EtcItem">
 		<!-- P. Def. for A-grade armor and accessories increases by 1, and by 3 starting from +4. Armor and accessories can be safely enchanted up to +3. One-piece armor can be safely enchanted up to +4. When armor is enchanted to +4 or above, HP also increases according to the enchant value. Armor and accessories are randomly enchanted between +1 and +3. -->
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9251" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33816" name="Improved Scroll: Enchant Armor (S-grade)" type="EtcItem">
 		<!-- When enchanted, P. Def. +2 for S-grade armor and accessories. Starting at +4, P. Def. +8. Enchanting is safe up to +3, but one-piece body armor can be safely enchanted up to +4. Starting at +4 HP bonus is granted. Random enchantment from +1 to +3. -->
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/49400-49499.xml
index b274242fd6..39ae39507b 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/49400-49499.xml
@@ -1106,7 +1106,8 @@
 		<set name="material" val="CRYSTAL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
+		<set name="is_clan_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="enchant_enabled" val="10" />
 		<stats>
@@ -1133,17 +1134,35 @@
 		<!-- Polish that enhances characteristics of a Pendant. Maximum Enchant Level is +10. If the enchant fails, pendant disappears. -->
 		<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="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="2209" level="1" /> <!-- Blessed Scroll: Enchant Armor (A-grade) -->
+		</skills>
 	</item>
 	<item id="49470" name="Shining Pendant Polish" type="EtcItem">
 		<!-- Shiny Polish, enhancing pendants characteristics. Can be used on a pendant enchanted up to +8. If an enchantment is failed, the pendent doesn't disappear and has the previous level of enchantment. -->
 		<set name="icon" val="icon.bm_pendant_varnish_premium" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39063" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49471" name="Fire Dragon Pendant Chest" type="EtcItem">
 		<!-- Double-click the chest to get 1 Fire Dragon Pendant and 10 Pendant Polishes. -->
@@ -1266,49 +1285,103 @@
 		<!-- P. Def. +1 for D-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_d" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39063" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49482" name="Solid Scroll: Enchant Weapon (D-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for D-grade one-handed swords, one-handed blunts, daggers, and spears. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_d" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39064" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49483" name="Solid Scroll: Enchant Armor (C-grade)" type="EtcItem">
 		<!-- P. Def. +1 for C-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_c" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39065" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49484" name="Solid Scroll: Enchant Weapon (C-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for C-grade one-handed swords, one-handed blunts, daggers, and spears. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_c" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39066" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49485" name="Solid Scroll: Enchant Armor (B-grade)" type="EtcItem">
 		<!-- P. Def. +1 for B-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_b" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39067" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49486" name="Solid Scroll: Enchant Weapon (B-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +2 for B-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +2 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +4 for bows. M. Atk. +2 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_b" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39068" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49487" name="Soulshot Ticket" type="EtcItem">
 		<!-- Can be exchanged through Dimensional Merchant to get Soulshot (No-grade/D-grade/C-grade/ B-grade), Spiritshot, Blessed Soulshot, Blessed Spiritshot, Beast Soulshot. Cannot be exchanged, dropped, sold, or stored in private warehouse. Can be stored in a private warehouse. Can be shared within account through Dimensional Merchant. -->
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/EnchantItemData.xsd b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/EnchantItemData.xsd
index fa9af50a1b..115c7e5b6b 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/EnchantItemData.xsd
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/xsd/EnchantItemData.xsd
@@ -6,7 +6,7 @@
 					<xs:complexType>
 						<xs:simpleContent>
 							<xs:extension base="xs:string">
-								<xs:attribute type="xs:short" name="id" use="optional"/>
+								<xs:attribute type="xs:int" name="id" use="optional"/>
 								<xs:attribute type="xs:string" name="targetGrade" use="optional"/>
 								<xs:attribute type="xs:byte" name="scrollGroupId" use="optional"/>
 								<xs:attribute type="xs:int" name="maxEnchant" use="optional"/> <!-- enchant limit -->
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/EnchantItemData.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/EnchantItemData.xml
index f1a04d1db0..b06a6c1338 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/EnchantItemData.xml
@@ -1,35 +1,59 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <list xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="xsd/EnchantItemData.xsd">
 	<!-- Scrolls: Enchant Weapon -->
+	<enchant id="959" targetGrade="S" maxEnchant="16" />
 	<enchant id="729" targetGrade="A" maxEnchant="16" />
 	<enchant id="947" targetGrade="B" maxEnchant="16" />
 	<enchant id="951" targetGrade="C" maxEnchant="16" />
 	<enchant id="955" targetGrade="D" maxEnchant="16" />
-	<enchant id="959" targetGrade="S" maxEnchant="16" />
 
 	<!-- Scrolls: Enchant Armor -->
+	<enchant id="960" targetGrade="S" maxEnchant="16" />
 	<enchant id="730" targetGrade="A" maxEnchant="16" />
 	<enchant id="948" targetGrade="B" maxEnchant="16" />
 	<enchant id="952" targetGrade="C" maxEnchant="16" />
 	<enchant id="956" targetGrade="D" maxEnchant="16" scrollGroupId="0" /> <!-- Default scroll groups binding. -->
-	<enchant id="960" targetGrade="S" maxEnchant="16" />
 
 	<!-- Blessed Scrolls: Enchant Weapon -->
+	<enchant id="6577" targetGrade="S" maxEnchant="16" />
 	<enchant id="6569" targetGrade="A" maxEnchant="16" />
 	<enchant id="6571" targetGrade="B" maxEnchant="16" />
 	<enchant id="6573" targetGrade="C" maxEnchant="16" />
 	<enchant id="6575" targetGrade="D" maxEnchant="16" />
-	<enchant id="6577" targetGrade="S" maxEnchant="16" />
+	<!-- TODO: S -->
+	<enchant id="22223" targetGrade="A" maxEnchant="7" />
+	<enchant id="49486" targetGrade="B" maxEnchant="7" />
+	<enchant id="49484" targetGrade="C" maxEnchant="7" />
+	<enchant id="49482" targetGrade="D" maxEnchant="7" />
 
 	<!-- Blessed Scrolls: Enchant Armor -->
+	<enchant id="6578" targetGrade="S" maxEnchant="16" />
 	<enchant id="6570" targetGrade="A" maxEnchant="16" />
 	<enchant id="6572" targetGrade="B" maxEnchant="16" />
 	<enchant id="6574" targetGrade="C" maxEnchant="16" />
 	<enchant id="6576" targetGrade="D" maxEnchant="16" />
-	<enchant id="6578" targetGrade="S" maxEnchant="16" />
-	
+	<!-- TODO: S -->
+	<enchant id="22224" targetGrade="A" maxEnchant="6" />
+	<enchant id="49485" targetGrade="B" maxEnchant="6" />
+	<enchant id="49483" targetGrade="C" maxEnchant="6" />
+	<enchant id="49481" targetGrade="D" maxEnchant="6" />
+
+	<!-- Improved Scrolls: Enchant Weapon -->
+	<!-- TODO: S -->
+	<enchant id="33809" targetGrade="A" maxEnchant="16" />
+	<enchant id="33808" targetGrade="B" maxEnchant="16" />
+	<enchant id="33807" targetGrade="C" maxEnchant="16" />
+	<enchant id="33806" targetGrade="D" maxEnchant="16" />
+
+	<!-- Improved Scrolls: Enchant Armor -->
+	<!-- TODO: S -->
+	<enchant id="33815" targetGrade="A" maxEnchant="16" />
+	<enchant id="33814" targetGrade="B" maxEnchant="16" />
+	<enchant id="33813" targetGrade="C" maxEnchant="16" />
+	<enchant id="33812" targetGrade="D" maxEnchant="16" />
+
 	<!-- Talisman of Aden -->
 	<enchant id="91756" maxEnchant="10" >
 		<item id="91745" />
 	</enchant>
-</list>
\ No newline at end of file
+</list>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/22200-22299.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/22200-22299.xml
index e40c778bb3..bd05527adc 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/22200-22299.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/22200-22299.xml
@@ -18,14 +18,34 @@
 		<!-- When enchanted, P. Atk. +4 for A-grade one-handed swords, one-handed blunts, daggers, and spears. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_a" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="22361" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="22224" name="Solid Scroll: Enchant Armor (A-grade)" type="EtcItem">
 		<!-- P. Def. +1 for A-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased according to the enchant value. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by +6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_a" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="22362" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 </list>
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/33800-33899.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/33800-33899.xml
index 326c405720..96c4db9215 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/33800-33899.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/33800-33899.xml
@@ -4,37 +4,69 @@
 		<!-- When enchanted, P. Atk. +4 for D-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_d_i01" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9244" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33807" name="Improved Scroll: Enchant Weapon (C-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for C-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_c_i02" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9246" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33808" name="Improved Scroll: Enchant Weapon (B-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for B-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_b_i03" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9248" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33809" name="Improved Scroll: Enchant Weapon (A-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for A-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Random enchantment from +1 to +3. Safe Enchant: +3. -->
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="9250" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33810" name="Improved Scroll: Enchant Weapon (S-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +5 for S-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +6 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +10 for bows. M. Atk. +4 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Random enchantment from +1 to +3. -->
@@ -52,37 +84,69 @@
 		<!-- P. Def. +1 for D-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_d_i01" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9245" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33813" name="Improved Scroll: Enchant Armor (C-grade)" type="EtcItem">
 		<!-- P. Def. +1 for C-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_c_i02" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9247" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33814" name="Improved Scroll: Enchant Armor (B-grade)" type="EtcItem">
 		<!-- P. Def. +1 for B-grade armor and accessories. Increases by 3 starting from +4. It can be safely enchanted up to +3. For one-piece armor, it can be safely enchanted up to +4. Random enchantment from +1 to +3. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_b_i03" />
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9249" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33815" name="Improved Scroll: Enchant Armor (A-grade)" type="EtcItem">
 		<!-- P. Def. for A-grade armor and accessories increases by 1, and by 3 starting from +4. Armor and accessories can be safely enchanted up to +3. One-piece armor can be safely enchanted up to +4. When armor is enchanted to +4 or above, HP also increases according to the enchant value. Armor and accessories are randomly enchanted between +1 and +3. -->
 		<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="weight" val="100" />
-		<set name="is_sellable" val="false" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="9251" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="33816" name="Improved Scroll: Enchant Armor (S-grade)" type="EtcItem">
 		<!-- When enchanted, P. Def. +2 for S-grade armor and accessories. Starting at +4, P. Def. +8. Enchanting is safe up to +3, but one-piece body armor can be safely enchanted up to +4. Starting at +4 HP bonus is granted. Random enchantment from +1 to +3. -->
diff --git a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49400-49499.xml b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49400-49499.xml
index b274242fd6..39ae39507b 100644
--- a/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49400-49499.xml
+++ b/L2J_Mobius_Classic_3.0_TheKamael/dist/game/data/stats/items/49400-49499.xml
@@ -1106,7 +1106,8 @@
 		<set name="material" val="CRYSTAL" />
 		<set name="is_tradable" val="false" />
 		<set name="is_dropable" val="false" />
-		<set name="is_depositable" val="false" />
+		<set name="is_depositable" val="true" />
+		<set name="is_clan_depositable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="enchant_enabled" val="10" />
 		<stats>
@@ -1133,17 +1134,35 @@
 		<!-- Polish that enhances characteristics of a Pendant. Maximum Enchant Level is +10. If the enchant fails, pendant disappears. -->
 		<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="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="2209" level="1" /> <!-- Blessed Scroll: Enchant Armor (A-grade) -->
+		</skills>
 	</item>
 	<item id="49470" name="Shining Pendant Polish" type="EtcItem">
 		<!-- Shiny Polish, enhancing pendants characteristics. Can be used on a pendant enchanted up to +8. If an enchantment is failed, the pendent doesn't disappear and has the previous level of enchantment. -->
 		<set name="icon" val="icon.bm_pendant_varnish_premium" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39063" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49471" name="Fire Dragon Pendant Chest" type="EtcItem">
 		<!-- Double-click the chest to get 1 Fire Dragon Pendant and 10 Pendant Polishes. -->
@@ -1266,49 +1285,103 @@
 		<!-- P. Def. +1 for D-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_d" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39063" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49482" name="Solid Scroll: Enchant Weapon (D-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for D-grade one-handed swords, one-handed blunts, daggers, and spears. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_d" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39064" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49483" name="Solid Scroll: Enchant Armor (C-grade)" type="EtcItem">
 		<!-- P. Def. +1 for C-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_c" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39065" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49484" name="Solid Scroll: Enchant Weapon (C-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +4 for C-grade one-handed swords, one-handed blunts, daggers, and spears. P. Atk. +5 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +8 for bows. M. Atk. +3 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_c" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39066" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49485" name="Solid Scroll: Enchant Armor (B-grade)" type="EtcItem">
 		<!-- P. Def. +1 for B-grade armor and accessories. Starting from +4, P. Def. +3. If an item is enchanted up to more than +4, HP is increased proportionally. Safe enchantment. If enchantment is failed, the item is not broken into crystals and preserves the enchantment level. Cannot be applied to armor enchanted by 6 and higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_am_b" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_ARMOR" />
+		<skills>
+			<skill id="39067" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49486" name="Solid Scroll: Enchant Weapon (B-grade)" type="EtcItem">
 		<!-- When enchanted, P. Atk. +2 for B-grade one-handed swords, one-handed blunts, daggers, spears, and other weapons. P. Atk. +2 for two-handed swords, two-handed blunts, dual swords, and two-handed fist weapons. P. Atk. +4 for bows. M. Atk. +2 for all weapons. Starting at +4, P. Atk./ M. Atk. bonus is doubled. Enchanting is safe. If enchanting is failed, items are not broken into crystals and remain enchanted to prior level. Cannot be applied to items enchanted to +7 or higher. -->
 		<set name="icon" val="icon.giant_scrl_of_ench_wp_b" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_ATTR_ANCIENT_CRYSTAL_ENCHANT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_sellable" val="false" />
+		<set name="weight" val="0" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<skills>
+			<skill id="39068" level="1" /> <!-- Solid Scroll -->
+		</skills>
 	</item>
 	<item id="49487" name="Soulshot Ticket" type="EtcItem">
 		<!-- Can be exchanged through Dimensional Merchant to get Soulshot (No-grade/D-grade/C-grade/ B-grade), Spiritshot, Blessed Soulshot, Blessed Spiritshot, Beast Soulshot. Cannot be exchanged, dropped, sold, or stored in private warehouse. Can be stored in a private warehouse. Can be shared within account through Dimensional Merchant. -->