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 85c6821790..8bfa43c10b 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
@@ -5,22 +5,26 @@
 	<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="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="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" />
 
 	<!-- 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="6578" targetGrade="S" maxEnchant="16" />
 </list>
\ No newline at end of file
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/buylists/custom/0009931.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/buylists/custom/0009931.xml
index 62a266dfd3..49ba898ee2 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/buylists/custom/0009931.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/buylists/custom/0009931.xml
@@ -16,4 +16,8 @@
 	<item id="730" price="0" /> <!-- Scroll: Enchant Armor (A-Grade) -->
 	<item id="6569" price="0" /> <!-- Blessed Scroll: Enchant Weapon (A-Grade) -->
 	<item id="6570" price="0" /> <!-- Blessed Scroll: Enchant Armor (A-Grade) -->
+	<item id="959" price="0" /> <!-- Scroll: Enchant Weapon (S-Grade) -->
+	<item id="960" price="0" /> <!-- Scroll: Enchant Armor (S-Grade) -->
+	<item id="6577" price="0" /> <!-- Blessed Scroll: Enchant Weapon (S-Grade) -->
+	<item id="6578" price="0" /> <!-- Blessed Scroll: Enchant Armor (S-Grade) -->
 </list>
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/00900-00999.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/00900-00999.xml
index 6112beef18..eb9a31392c 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/00900-00999.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/00900-00999.xml
@@ -659,19 +659,35 @@
 		<!-- 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. -->
 		<set name="icon" val="icon.etc_scroll_of_enchant_weapon_i05" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="5000000" />
 		<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="2021" level="1" /> <!-- Scroll: Enchant Weapon (S-grade) -->
+		</skills>
 	</item>
 	<item id="960" name="Scroll: Enchant Armor (S-grade)" type="EtcItem">
 		<!-- P. Def. +2 for S-grade armor and accessories. Starting from +4, P. Def. +8. Ordinary armor can be safely enchanted up to +3. One-piece armor can be safely enchanted up to +4. After +4 increases HP. -->
 		<set name="icon" val="icon.etc_scroll_of_enchant_armor_i05" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="ENCHT_AM" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="500000" />
 		<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="2022" level="1" /> <!-- Scroll: Enchant Armor (S-grade) -->
+		</skills>
 	</item>
 	<item id="963" name="Orc Arrowhead" type="EtcItem">
 		<!-- Arrowhead that Turath orc marksmen use on Talking Island. Collect these and take to Master Minia. -->
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/06500-06599.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/06500-06599.xml
index 0e8c400f31..5a5bc67a54 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/06500-06599.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/items/06500-06599.xml
@@ -140,19 +140,35 @@
 		<!-- 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. If enchanting fails, the item will not be crystallized, but the enchant value will be reset to 0. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_wp_s_i05" />
 		<set name="default_action" val="SKILL_REDUCE" />
+		<set name="etcitem_type" val="BLESS_ENCHT_WP" />
+		<set name="immediate_effect" val="true" />
 		<set name="material" val="PAPER" />
 		<set name="weight" val="120" />
 		<set name="price" val="30000000" />
 		<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="51291" level="1" /> <!-- Blessed Scroll: Enchant Weapon (S-grade) -->
+		</skills>
 	</item>
 	<item id="6578" name="Blessed 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. If enchanting fails, the item will not be crystallized but the enchant value will be reset to 0. Starting at +4 HP bonus is granted depending on the enchantment value. -->
 		<set name="icon" val="icon.etc_blessed_scrl_of_ench_am_s_i05" />
 		<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="weight" val="120" />
 		<set name="price" val="4500000" />
 		<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="51292" level="1" /> <!-- Blessed Scroll: Enchant Armor (S-grade) -->
+		</skills>
 	</item>
 		<item id="6579" name="Arcana Mace" type="Weapon">
 		<set name="icon" val="icon.weapon_arcana_mace_i00" />
diff --git a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/51200-51299.xml b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/51200-51299.xml
index 76c9846512..d657112da7 100644
--- a/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/51200-51299.xml
+++ b/L2J_Mobius_Classic_2.4_SecretOfEmpire/dist/game/data/stats/skills/51200-51299.xml
@@ -578,10 +578,22 @@
 		<reuseDelay>1000</reuseDelay>
 	</skill>
 	<skill id="51291" toLevel="1" name="Blessed Scroll: Enchant Weapon (S-grade)">
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51292" toLevel="1" name="Blessed Scroll: Enchant Armor (S-grade)">
+		<isMagic>2</isMagic> <!-- Static Skill -->
+		<magicLvl>1</magicLvl>
 		<operateType>A1</operateType>
+		<magicCriticalRate>5</magicCriticalRate>
+		<hitCancelTime>0</hitCancelTime>
+		<targetType>ITEM</targetType>
+		<affectScope>SINGLE</affectScope>
 	</skill>
 	<skill id="51293" toLevel="1" name="Solid Scroll: Enchant Weapon (S-grade)">
 		<operateType>A1</operateType>