diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/EnchantItemData.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/EnchantItemData.xml
index b2b16531e7..d450eba4d8 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/EnchantItemData.xml
@@ -60,6 +60,14 @@
 	<enchant id="33813" targetGrade="C" maxEnchant="16" />
 	<enchant id="33812" targetGrade="D" maxEnchant="16" />
 
+	<!-- Improved Scrolls: Enchant Armor -->
+	<enchant id="93269" targetGrade="A" maxEnchant="16" />
+	<enchant id="93256" targetGrade="A" maxEnchant="16" />
+
+	<!-- Improved Scrolls: Enchant Weapon -->
+	<enchant id="93268" targetGrade="A" maxEnchant="16" />
+	<enchant id="93255" targetGrade="A" maxEnchant="16" />
+
 	<!-- Cursed Scrolls: Enchant Weapon -->
 	<enchant id="93257" targetGrade="A" minEnchant="2"/>
 	<enchant id="93270" targetGrade="A" minEnchant="2"/>
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/Recipes.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/Recipes.xml
index f6a10e5392..17e53ab0eb 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/Recipes.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/Recipes.xml
@@ -5801,7 +5801,6 @@
 		<ingredient id="92476" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92863" count="25" />
 		<production id="6364" count="1" />
 		<statUse name="MP" value="225" />
@@ -5811,7 +5810,6 @@
 		<ingredient id="92476" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92864" count="25" />
 		<production id="6365" count="1" />
 		<statUse name="MP" value="225" />
@@ -5821,7 +5819,6 @@
 		<ingredient id="92477" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92865" count="25" />
 		<production id="6366" count="1" />
 		<statUse name="MP" value="225" />
@@ -5831,7 +5828,6 @@
 		<ingredient id="92476" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92866" count="25" />
 		<production id="6367" count="1" />
 		<statUse name="MP" value="225" />
@@ -5841,7 +5837,6 @@
 		<ingredient id="92476" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92867" count="25" />
 		<production id="6369" count="1" />
 		<statUse name="MP" value="225" />
@@ -5851,7 +5846,6 @@
 		<ingredient id="92477" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92868" count="25" />
 		<production id="6370" count="1" />
 		<statUse name="MP" value="225" />
@@ -5861,7 +5855,6 @@
 		<ingredient id="92476" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92869" count="25" />
 		<production id="6371" count="1" />
 		<statUse name="MP" value="225" />
@@ -5871,7 +5864,6 @@
 		<ingredient id="92476" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92870" count="25" />
 		<production id="6372" count="1" />
 		<statUse name="MP" value="225" />
@@ -5881,7 +5873,6 @@
 		<ingredient id="92477" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92871" count="25" />
 		<production id="6579" count="1" />
 		<statUse name="MP" value="225" />
@@ -6044,7 +6035,6 @@
 		<ingredient id="92477" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92889" count="25" />
 		<production id="7575" count="1" />
 		<statUse name="MP" value="225" />
diff --git a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93200-93299.xml b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93200-93299.xml
index 33edbf7ec9..9df0cfbf95 100644
--- a/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93200-93299.xml
+++ b/L2J_Mobius_Essence_4.0_DwellingOfSpirits/dist/game/data/stats/items/93200-93299.xml
@@ -609,19 +609,35 @@
 		<!-- <font color=bbaa88><When enchanted from +1 to +3></font>. One-handed sword/ blunt weapon, dagger, spear: P. Atk. +10, M. Atk. +6. Two-handed blunt weapons, dual swords, fist weapon: P. Atk. +12, M. Atk. +6. Bow: P. Atk. +16, M. Atk. +6. <font color=bbaa88><When enchanted to +4 or higher></font>. One-handed sword/ blunt weapon, dagger, spear: P. Atk. +30, M. Atk. +18. Two-handed blunt weapons, dual swords, fist weapon: P. Atk. +36, M. Atk. +18. Bow: P. Atk. +48, M. Atk. +18. <font color=eeaa22>Safe enchanting to +4. If the enchant value is +5 or lower, the enchanting is random from +1 to +2. If the enchant value is +6 or higher, the enchanting is +1.</font> -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_a_i04" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="GIANT_ENCHT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_tradable" val="true" />
-		<set name="is_dropable" val="false" />
-		<set name="is_sellable" val="true" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
-		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<set name="is_sellable" val="true" />
+		<skills>
+			<skill id="9250" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="93256" name="Improved Scroll: Enchant A-grade Armor (Exchangeable)" type="EtcItem">
 		<!-- <font color=bbaa88><When enchanted from +1 to +3></font>. Armor: P. Def. +4. Accessories: M. Def. +3. <font color=bbaa88><When enchanted to +4 or higher></font>. Armor: P. Def. +9. Accessories: M. Def. +7. <font color=eeaa22>Safe enchanting to +4. If the enchant value is +5 or lower, the enchanting is random from +1 to +2. If the enchant value is +6 or higher, the enchanting is +1.</font> -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_a_i04" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="GIANT_ENCHT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="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" />
+		<set name="is_sellable" val="true" />
+		<skills>
+			<skill id="9251" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="93257" name="Cursed Scroll: Enchant A-grade Weapon (Exchangeable)" type="EtcItem">
 		<!-- When used, enchant value -1. <font color=eeaa22>Only for items enchanted to +2 and higher.</font> -->
@@ -713,9 +729,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="handler" val="ExtractableItems" />
 		<set name="extractableCountMin" val="1" />
 		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
 		<capsuled_items>
 			<item id="92404" min="1" max="1" minEnchant="5" maxEnchant="5" chance="20" />
 			<item id="92405" min="1" max="1" minEnchant="5" maxEnchant="5" chance="20" />
@@ -760,6 +776,23 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="default_action" val="PEEL" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="FISH" />
+		<set name="is_tradable" val="false" />
+		<set name="is_dropable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="93128" min="1" max="1" chance="20" /> 
+			<item id="93129" min="1" max="1" chance="20" /> 
+			<item id="93130" min="1" max="1" chance="20" /> 
+			<item id="93131" min="1" max="1" chance="20" /> 
+			<item id="93132" min="1" max="1" chance="20" /> 
+		</capsuled_items>
 	</item>
 	<item id="93266" name="PA Treasure Chest" type="EtcItem">
 		<!-- Double-click to obtain one of the items: Unknown Resources, Charging Stone of Random Craft - 1 charge, PA Coin, Agathion Box containing Talisman of Speed/ Eva/ Aden/ Baium, A-grade Weapon Pack, A-grade Armor Pack. -->
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/EnchantItemData.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/EnchantItemData.xml
index bd935d3d73..5a80287cff 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/EnchantItemData.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/EnchantItemData.xml
@@ -60,6 +60,14 @@
 	<enchant id="33813" targetGrade="C" maxEnchant="16" />
 	<enchant id="33812" targetGrade="D" maxEnchant="16" />
 
+	<!-- Improved Scrolls: Enchant Armor -->
+	<enchant id="93269" targetGrade="A" maxEnchant="16" />
+	<enchant id="93256" targetGrade="A" maxEnchant="16" />
+
+	<!-- Improved Scrolls: Enchant Weapon -->
+	<enchant id="93268" targetGrade="A" maxEnchant="16" />
+	<enchant id="93255" targetGrade="A" maxEnchant="16" />
+
 	<!-- Cursed Scrolls: Enchant Weapon -->
 	<enchant id="93257" targetGrade="A" minEnchant="2"/>
 	<enchant id="93270" targetGrade="A" minEnchant="2"/>
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/Recipes.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/Recipes.xml
index f6a10e5392..17e53ab0eb 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/Recipes.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/Recipes.xml
@@ -5801,7 +5801,6 @@
 		<ingredient id="92476" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92863" count="25" />
 		<production id="6364" count="1" />
 		<statUse name="MP" value="225" />
@@ -5811,7 +5810,6 @@
 		<ingredient id="92476" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92864" count="25" />
 		<production id="6365" count="1" />
 		<statUse name="MP" value="225" />
@@ -5821,7 +5819,6 @@
 		<ingredient id="92477" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92865" count="25" />
 		<production id="6366" count="1" />
 		<statUse name="MP" value="225" />
@@ -5831,7 +5828,6 @@
 		<ingredient id="92476" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92866" count="25" />
 		<production id="6367" count="1" />
 		<statUse name="MP" value="225" />
@@ -5841,7 +5837,6 @@
 		<ingredient id="92476" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92867" count="25" />
 		<production id="6369" count="1" />
 		<statUse name="MP" value="225" />
@@ -5851,7 +5846,6 @@
 		<ingredient id="92477" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92868" count="25" />
 		<production id="6370" count="1" />
 		<statUse name="MP" value="225" />
@@ -5861,7 +5855,6 @@
 		<ingredient id="92476" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92869" count="25" />
 		<production id="6371" count="1" />
 		<statUse name="MP" value="225" />
@@ -5871,7 +5864,6 @@
 		<ingredient id="92476" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92870" count="25" />
 		<production id="6372" count="1" />
 		<statUse name="MP" value="225" />
@@ -5881,7 +5873,6 @@
 		<ingredient id="92477" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92871" count="25" />
 		<production id="6579" count="1" />
 		<statUse name="MP" value="225" />
@@ -6044,7 +6035,6 @@
 		<ingredient id="92477" count="12828" />
 		<ingredient id="1462" count="283" />
 		<ingredient id="2134" count="33" />
-		<ingredient id="6881" count="1" />
 		<ingredient id="92889" count="25" />
 		<production id="7575" count="1" />
 		<statUse name="MP" value="225" />
diff --git a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/93200-93299.xml b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/93200-93299.xml
index fbdf33bd7a..33fcc3437d 100644
--- a/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/93200-93299.xml
+++ b/L2J_Mobius_Essence_5.0_Sylph/dist/game/data/stats/items/93200-93299.xml
@@ -609,19 +609,35 @@
 		<!-- <font color=bbaa88><When enchanted from +1 to +3></font>. One-handed sword/ blunt weapon, dagger, spear: P. Atk. +10, M. Atk. +6. Two-handed blunt weapons, dual swords, fist weapon: P. Atk. +12, M. Atk. +6. Bow: P. Atk. +16, M. Atk. +6. <font color=bbaa88><When enchanted to +4 or higher></font>. One-handed sword/ blunt weapon, dagger, spear: P. Atk. +30, M. Atk. +18. Two-handed blunt weapons, dual swords, fist weapon: P. Atk. +36, M. Atk. +18. Bow: P. Atk. +48, M. Atk. +18. <font color=eeaa22>Safe enchanting to +4. If the enchant value is +5 or lower, the enchanting is random from +1 to +2. If the enchant value is +6 or higher, the enchanting is +1.</font> -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_a_i04" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="GIANT_ENCHT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
-		<set name="is_tradable" val="true" />
-		<set name="is_dropable" val="false" />
-		<set name="is_sellable" val="true" />
+		<set name="price" val="0" />
 		<set name="is_stackable" val="true" />
-		<set name="is_freightable" val="true" />
+		<set name="is_oly_restricted" val="true" />
+		<set name="handler" val="EnchantScrolls" />
+		<set name="commissionItemType" val="SCROLL_ENCHANT_WEAPON" />
+		<set name="is_sellable" val="true" />
+		<skills>
+			<skill id="9250" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="93256" name="Improved Scroll: Enchant A-grade Armor (Exchangeable)" type="EtcItem">
 		<!-- <font color=bbaa88><When enchanted from +1 to +3></font>. Armor: P. Def. +4. Accessories: M. Def. +3. <font color=bbaa88><When enchanted to +4 or higher></font>. Armor: P. Def. +9. Accessories: M. Def. +7. <font color=eeaa22>Safe enchanting to +4. If the enchant value is +5 or lower, the enchanting is random from +1 to +2. If the enchant value is +6 or higher, the enchanting is +1.</font> -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_a_i04" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="GIANT_ENCHT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
+		<set name="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" />
+		<set name="is_sellable" val="true" />
+		<skills>
+			<skill id="9251" level="1" /> <!-- Improved Scroll -->
+		</skills>
 	</item>
 	<item id="93257" name="Cursed Scroll: Enchant A-grade Weapon (Exchangeable)" type="EtcItem">
 		<!-- When used, enchant value -1. <font color=eeaa22>Only for items enchanted to +2 and higher.</font> -->
@@ -713,9 +729,9 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
-		<set name="handler" val="ExtractableItems" />
 		<set name="extractableCountMin" val="1" />
 		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
 		<capsuled_items>
 			<item id="92404" min="1" max="1" minEnchant="5" maxEnchant="5" chance="16.66" />
 			<item id="92405" min="1" max="1" minEnchant="5" maxEnchant="5" chance="16.66" />
@@ -761,6 +777,23 @@
 		<set name="is_dropable" val="false" />
 		<set name="is_sellable" val="false" />
 		<set name="is_stackable" val="true" />
+		<set name="default_action" val="PEEL" />
+		<set name="immediate_effect" val="true" />
+		<set name="material" val="FISH" />
+		<set name="is_tradable" val="false" />
+		<set name="is_dropable" val="false" />
+		<set name="is_sellable" val="false" />
+		<set name="is_stackable" val="true" />
+		<set name="extractableCountMin" val="1" />
+		<set name="extractableCountMax" val="1" />
+		<set name="handler" val="ExtractableItems" />
+		<capsuled_items>
+			<item id="93128" min="1" max="1" chance="20" /> 
+			<item id="93129" min="1" max="1" chance="20" /> 
+			<item id="93130" min="1" max="1" chance="20" /> 
+			<item id="93131" min="1" max="1" chance="20" /> 
+			<item id="93132" min="1" max="1" chance="20" /> 
+		</capsuled_items>
 	</item>
 	<item id="93266" name="PA Treasure Chest" type="EtcItem">
 		<!-- Double-click to obtain one of the items: Unknown Resources, Charging Stone of Random Craft - 1 charge, PA Coin, Agathion Box containing Talisman of Speed/ Eva/ Aden/ Baium, A-grade Weapon Pack, A-grade Armor Pack. -->